add instructions to enable use of Tiger data

[nominatim.git] / utils / specialphrases.php

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index 28d550106f7ff3a0d890928b714d6507bebcdabd..189a7a3e00fef086a0d002dc69665e6a58c380c3 100755 (executable)
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -1,21 +1,22 @@
 #!/usr/bin/php -Cq
 <?php
 
-        require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
-        ini_set('memory_limit', '800M');
-        ini_set('display_errors', 'stderr');
+       require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+       require_once(CONST_BasePath.'/lib/init-cmd.php');
+       ini_set('memory_limit', '800M');
+       ini_set('display_errors', 'stderr');
 
         $aCMDOptions = array(
                 "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'),
-                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');
+               include(CONST_InstallPath.'/settings/phrase_settings.php');
 
 
     if ($aCMDResult['countries']) {
@@ -42,9 +43,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('/&quot;/', '', $sType);
@@ -86,22 +87,26 @@
 
                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 ";
-                       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";
+                       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 "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);\n";
+                       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 ";\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);\n";
+                       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 ";\n";
 
-            echo "GRANT SELECT ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." TO \"www-data\";";
+            echo "GRANT SELECT ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1]).' TO "'.CONST_Database_Web_User."\";\n";
 
                }