Merge branch 'master' of github.com:twain47/Nominatim

[nominatim.git] / utils / specialphrases.php

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index b2f336c7626b93596d471cf095783c04cf766641..28d550106f7ff3a0d890928b714d6507bebcdabd 100755 (executable)
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -15,6 +15,8 @@
         );
         getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
+               include(CONST_BasePath.'/settings/phrase_settings.php');
+
 
     if ($aCMDResult['countries']) {
         echo "select getorcreate_country(make_standard_name('uk'), 'gb');\n";
@@ -30,7 +32,6 @@
 
        if ($aCMDResult['wiki-import'])
        {
-               include(CONST_BasePath.'/settings/phrase_settings.php');
                $aPairs = array();
 
                foreach($aLanguageIn as $sLanguage)
@@ -85,6 +86,9 @@
 
                foreach($aPairs as $aPair)
                {
+                       if ($aPair[0] == 'yes') continue;
+                       if ($aPair[1] == 'yes') continue;
+                       if ($aPair[0] == 'highway') continue;
                        if ($aPair[1] == 'highway') continue;
 
                        echo "create table place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." as ";