Merge branch 'place-in-addressdetails' of https://github.com/lonvia/Nominatim

[nominatim.git] / utils / specialphrases.php

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index b2f336c7626b93596d471cf095783c04cf766641..f1a0d0d078035c75d4168922f2e9612cc7516592 100755 (executable)
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -10,11 +10,13 @@
                 array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
                 array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
                 array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
-                array('countries', '', 0, 1, 0, 0, 'bool', 'Create import script for coutry codes and names'),
+                array('countries', '', 0, 1, 0, 0, 'bool', 'Create import script for country codes and names'),
                 array('wiki-import', '', 0, 1, 0, 0, 'bool', 'Create import script for search phrases '),
         );
         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)
@@ -41,9 +42,9 @@
                        {
                                foreach($aMatches as $aMatch)
                                {
-                                       $sLabel = $aMatch[1];
-                                       $sClass = $aMatch[2];
-                                       $sType = $aMatch[3];
+                                       $sLabel = trim($aMatch[1]);
+                                       $sClass = trim($aMatch[2]);
+                                       $sType = trim($aMatch[3]);
                                        # hack around a bug where building=yes was imported with
                                        # quotes into the wiki
                                        $sType = preg_replace('/"/', '', $sType);
@@ -85,8 +86,6 @@
 
                foreach($aPairs as $aPair)
                {
-                       if ($aPair[1] == 'highway') continue;
-
                        echo "create table place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." as ";
                        echo "select place_id as place_id,st_centroid(geometry) as centroid from placex where ";
                        echo "class = '".pg_escape_string($aPair[0])."' and type = '".pg_escape_string($aPair[1])."';\n";