From: AntoJvlt Date: Sat, 20 Mar 2021 18:48:05 +0000 (+0100) Subject: Deleted specialphrases.php and phrase_settings.php X-Git-Tag: v3.7.0~10^2~9 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/d5acade4dbdc6acd9b9373d6150753cf8c283f60?ds=inline;hp=--cc Deleted specialphrases.php and phrase_settings.php --- d5acade4dbdc6acd9b9373d6150753cf8c283f60 diff --git a/lib-php/admin/specialphrases.php b/lib-php/admin/specialphrases.php deleted file mode 100644 index 8d2d9129..00000000 --- a/lib-php/admin/specialphrases.php +++ /dev/null @@ -1,163 +0,0 @@ -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('/("|")/', '', $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') - ); - } - - echo 'DROP INDEX idx_placex_classtype;'; -} diff --git a/settings/phrase_settings.php b/settings/phrase_settings.php deleted file mode 100644 index 945235bd..00000000 --- a/settings/phrase_settings.php +++ /dev/null @@ -1,20 +0,0 @@ - array('administrative'), - 'place' => array('house', 'houses'), - ); - -// If a class is in the white list then all types will -// be ignored except the ones given in the list. -// Also use this list to exclude an entire class from -// special phrases. -$aTagsWhitelist - = array( - 'highway' => array('bus_stop', 'rest_area', 'raceway'), - 'building' => array(), - );