Added wrapper in specialphrases.php to call corresponding nominatim command.

diff --git a/lib-php/admin/specialphrases.php b/lib-php/admin/specialphrases.php
index 9b90387ab168c0cd58fef5550bb363bc14b8aaec..eb34cf0e4b6572303867d966b980b38183ed1933 100644 (file)
--- a/lib-php/admin/specialphrases.php
+++ b/lib-php/admin/specialphrases.php
@@ -1,163 +1,11 @@
+
 <?php
 @define('CONST_LibDir', dirname(dirname(__FILE__)));
 
 require_once(CONST_LibDir.'/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('wiki-import', '', 0, 1, 0, 0, 'bool', 'Create import script for search phrases '),
-   array('project-dir', '', 0, 1, 1, 1, 'realpath', 'Base directory of the Nominatim installation (default: .)'),
-  );
-getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
-
-loadSettings($aCMDResult['project-dir'] ?? getcwd());
-setupHTTPProxy();
-
-include(getSettingConfig('PHRASE_CONFIG', 'phrase_settings.php'));
-
-if ($aCMDResult['wiki-import']) {
-    $oNormalizer = Transliterator::createFromRules(getSetting('TERM_NORMALIZATION'));
-    $aPairs = array();
-
-    $sLanguageIn = getSetting(
-        'LANGUAGES',
-        'af,ar,br,ca,cs,de,en,es,et,eu,fa,fi,fr,gl,hr,hu,'.
-        'ia,is,it,ja,mk,nl,no,pl,ps,pt,ru,sk,sl,sv,uk,vi'
-    );
-
-    foreach (explode(',', $sLanguageIn) as $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
-        )) {
-            continue;
-        }
-
-        foreach ($aMatches as $aMatch) {
-            $sLabel = trim($aMatch[1]);
-            if ($oNormalizer !== null) {
-                $sTrans = pg_escape_string($oNormalizer->transliterate($sLabel));
-            } else {
-                $sTrans = null;
-            }
-            $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);
-            // sanity check, in case somebody added garbage in the wiki
-            if (preg_match('/^\\w+$/', $sClass) < 1
-                || preg_match('/^\\w+$/', $sType) < 1
-            ) {
-                trigger_error("Bad class/type for language $sLanguage: $sClass=$sType");
-                exit;
-            }
-            // blacklisting: disallow certain class/type combinations
-            if (isset($aTagsBlacklist[$sClass]) && in_array($sType, $aTagsBlacklist[$sClass])) {
-                // fwrite(STDERR, "Blacklisted: ".$sClass."/".$sType."\n");
-                continue;
-            }
-            // whitelisting: if class is in whitelist, allow only tags in the list
-            if (isset($aTagsWhitelist[$sClass]) && !in_array($sType, $aTagsWhitelist[$sClass])) {
-                // fwrite(STDERR, "Non-Whitelisted: ".$sClass."/".$sType."\n");
-                continue;
-            }
-            $aPairs[$sClass.'|'.$sType] = array($sClass, $sType);
-
-            switch (trim($aMatch[4])) {
-                case 'near':
-                    printf(
-                        "SELECT getorcreate_amenityoperator(make_standard_name('%s'), '%s', '%s', '%s', 'near');\n",
-                        pg_escape_string($sLabel),
-                        $sTrans,
-                        $sClass,
-                        $sType
-                    );
-                    break;
-                case 'in':
-                    printf(
-                        "SELECT getorcreate_amenityoperator(make_standard_name('%s'), '%s', '%s', '%s', 'in');\n",
-                        pg_escape_string($sLabel),
-                        $sTrans,
-                        $sClass,
-                        $sType
-                    );
-                    break;
-                default:
-                    printf(
-                        "SELECT getorcreate_amenity(make_standard_name('%s'), '%s', '%s', '%s');\n",
-                        pg_escape_string($sLabel),
-                        $sTrans,
-                        $sClass,
-                        $sType
-                    );
-                    break;
-            }
-        }
-    }
-
-    echo 'CREATE INDEX idx_placex_classtype ON placex (class, type);';
-
-    foreach ($aPairs as $aPair) {
-        $sql_tablespace = getSetting('TABLESPACE_AUX_DATA');
-        if ($sql_tablespace) {
-            $sql_tablespace = ' TABLESPACE '.$sql_tablespace;
-        }
-
-        printf(
-            'CREATE TABLE place_classtype_%s_%s'
-            . $sql_tablespace
-            . ' AS'
-            . ' SELECT place_id AS place_id,st_centroid(geometry) AS centroid FROM placex'
-            . " WHERE class = '%s' AND type = '%s'"
-            . ";\n",
-            pg_escape_string($aPair[0]),
-            pg_escape_string($aPair[1]),
-            pg_escape_string($aPair[0]),
-            pg_escape_string($aPair[1])
-        );
-
-        printf(
-            'CREATE INDEX idx_place_classtype_%s_%s_centroid'
-            . ' ON place_classtype_%s_%s USING GIST (centroid)'
-            . $sql_tablespace
-            . ";\n",
-            pg_escape_string($aPair[0]),
-            pg_escape_string($aPair[1]),
-            pg_escape_string($aPair[0]),
-            pg_escape_string($aPair[1])
-        );
-
-        printf(
-            'CREATE INDEX idx_place_classtype_%s_%s_place_id'
-            . ' ON place_classtype_%s_%s USING btree(place_id)'
-            . $sql_tablespace
-            . ";\n",
-            pg_escape_string($aPair[0]),
-            pg_escape_string($aPair[1]),
-            pg_escape_string($aPair[0]),
-            pg_escape_string($aPair[1])
-        );
 
-        printf(
-            'GRANT SELECT ON place_classtype_%s_%s TO "%s"'
-            . ";\n",
-            pg_escape_string($aPair[0]),
-            pg_escape_string($aPair[1]),
-            getSetting('DATABASE_WEBUSER')
-        );
-    }
+loadSettings(getcwd());
 
-    echo 'DROP INDEX idx_placex_classtype;';
-}
\ No newline at end of file
+(new \Nominatim\Shell(getSetting('NOMINATIM_TOOL')))
+    ->addParams('import-special-phrases', '--from-wiki')
+    ->run();
\ No newline at end of file