Merge pull request #1102 from mtmail/tests-for-tokenlist

[nominatim.git] / utils / specialphrases.php

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index 1a4a51d758e9b9ce7c1ece8280caeb11743f2c7a..8378b37339a1b1f64c7594d5b513a1888ce27d73 100755 (executable)
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -8,7 +8,7 @@ ini_set('display_errors', 'stderr');
 
 $aCMDOptions
 = array(
-   "Import and export special phrases",
+   'Import and export special phrases',
    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'),
@@ -27,7 +27,7 @@ if ($aCMDResult['wiki-import']) {
          'ia,is,it,ja,mk,nl,no,pl,ps,pt,ru,sk,sl,sv,uk,vi');
 
     foreach (explode(',', $sLanguageIn) as $sLanguage) {
-        $sURL = 'http://wiki.openstreetmap.org/wiki/Special:Export/Nominatim/Special_Phrases/'.strtoupper($sLanguage);
+        $sURL = 'https://wiki.openstreetmap.org/wiki/Special:Export/Nominatim/Special_Phrases/'.strtoupper($sLanguage);
         $sWikiPageXML = file_get_contents($sURL);
         if (preg_match_all('#\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([\\-YN])#', $sWikiPageXML, $aMatches, PREG_SET_ORDER)) {
             foreach ($aMatches as $aMatch) {
@@ -76,30 +76,30 @@ if ($aCMDResult['wiki-import']) {
         }
     }
 
-    echo "create index idx_placex_classtype on placex (class, type);";
+    echo 'create index idx_placex_classtype on placex (class, type);';
 
     foreach ($aPairs as $aPair) {
-        echo "create table place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1]);
+        echo 'create table place_classtype_'.pg_escape_string($aPair[0]).'_'.pg_escape_string($aPair[1]);
         if (CONST_Tablespace_Aux_Data)
-            echo " tablespace ".CONST_Tablespace_Aux_Data;
-        echo " as select place_id as place_id,st_centroid(geometry) as centroid from placex where ";
+            echo ' tablespace '.CONST_Tablespace_Aux_Data;
+        echo ' as 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])."'";
         echo ";\n";
 
-        echo "CREATE INDEX idx_place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])."_centroid ";
-        echo "ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." USING GIST (centroid)";
+        echo 'CREATE INDEX idx_place_classtype_'.pg_escape_string($aPair[0]).'_'.pg_escape_string($aPair[1]).'_centroid ';
+        echo 'ON place_classtype_'.pg_escape_string($aPair[0]).'_'.pg_escape_string($aPair[1]).' USING GIST (centroid)';
         if (CONST_Tablespace_Aux_Index)
-            echo " tablespace ".CONST_Tablespace_Aux_Index;
+            echo ' tablespace '.CONST_Tablespace_Aux_Index;
         echo ";\n";
 
-        echo "CREATE INDEX idx_place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])."_place_id ";
-        echo "ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." USING btree(place_id)";
+        echo 'CREATE INDEX idx_place_classtype_'.pg_escape_string($aPair[0]).'_'.pg_escape_string($aPair[1]).'_place_id ';
+        echo 'ON place_classtype_'.pg_escape_string($aPair[0]).'_'.pg_escape_string($aPair[1]).' USING btree(place_id)';
         if (CONST_Tablespace_Aux_Index)
-            echo " tablespace ".CONST_Tablespace_Aux_Index;
+            echo ' tablespace '.CONST_Tablespace_Aux_Index;
         echo ";\n";
 
-        echo "GRANT SELECT ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1]).' TO "'.CONST_Database_Web_User."\";\n";
+        echo 'GRANT SELECT ON place_classtype_'.pg_escape_string($aPair[0]).'_'.pg_escape_string($aPair[1]).' TO "'.CONST_Database_Web_User."\";\n";
     }
 
-    echo "drop index idx_placex_classtype;";
+    echo 'drop index idx_placex_classtype;';
 }