update osm2pgsql to latest version

[nominatim.git] / utils / specialphrases.php

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index b8c49da0214acda48caf324da706514319fddd55..4381bdfa37b89f6f2f70c7e76c007f11b30773eb 100755 (executable)
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -10,7 +10,7 @@
                 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);
@@ -42,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);
@@ -86,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 ";