X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/248b6ec90fe72bb2b6817a5569d1888983b5eb2d..c41b6067fea669675209aebf7abf6bb8385fbbf3:/utils/specialphrases.php?ds=sidebyside

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index b2f336c7..4381bdfa 100755
--- 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,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 ";