From 9712decefed0d5a25a636e8f807d30050b1a7b95 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Fri, 5 Jan 2018 22:38:51 +0100 Subject: [PATCH] update URLs in code and documentation Use https for all openstreetmap addresses, remove defunct mapquest link and redirect documentation links to nominatim.org. --- README.md | 6 +++--- VAGRANT.md | 2 +- utils/country_languages.php | 2 +- utils/specialphrases.php | 2 +- utils/update.php | 14 +++++++------- website/js/nominatim-ui.js | 2 +- website/polygons.php | 10 ++-------- 7 files changed, 16 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 42c4d72c..30fb7555 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Nominatim Nominatim (from the Latin, 'by name') is a tool to search OpenStreetMap data by name and address (geocoding) and to generate synthetic addresses of OSM points (reverse geocoding). An instance with up-to-date data can be found -at http://nominatim.openstreetmap.org. Nominatim is also used as one of the +at https://nominatim.openstreetmap.org. Nominatim is also used as one of the sources for the Search box on the OpenStreetMap home page and powers the search on the MapQuest Open Initiative websites. @@ -16,7 +16,7 @@ Documentation More information about Nominatim, including usage and installation instructions, can be found in the docs/ subdirectory and in the OSM wiki at: -http://wiki.openstreetmap.org/wiki/Nominatim +http://nominatim.org Installation ============ @@ -52,7 +52,7 @@ Contact and Bug reports ====================== For questions you can join the geocoding mailinglist, see -http://lists.openstreetmap.org/listinfo/geocoding +https://lists.openstreetmap.org/listinfo/geocoding Bugs may be reported on the github project site: https://github.com/openstreetmap/Nominatim diff --git a/VAGRANT.md b/VAGRANT.md index 41d3024e..de36bc57 100644 --- a/VAGRANT.md +++ b/VAGRANT.md @@ -128,7 +128,7 @@ No. Long running Nominatim installations will differ once new import features (o bug fixes) get added since those usually only get applied to new/changed data. Also this document skips the optional Wikipedia data import which affects ranking -of search results. See [Nominatim installation](http://wiki.openstreetmap.org/wiki/Nominatim/Installation) for details. +of search results. See [Nominatim installation](http://nominatim.org/release-docs/latest/Installation) for details. ##### Why Ubuntu and CentOS, can I test CentOS/CoreOS/FreeBSD? diff --git a/utils/country_languages.php b/utils/country_languages.php index 5ca61184..19ad25b8 100755 --- a/utils/country_languages.php +++ b/utils/country_languages.php @@ -19,7 +19,7 @@ getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true); include(CONST_InstallPath.'/settings/phrase_settings.php'); if (true) { - $sURL = 'http://wiki.openstreetmap.org/wiki/Special:Export/Nominatim/Country_Codes'; + $sURL = 'https://wiki.openstreetmap.org/wiki/Special:Export/Nominatim/Country_Codes'; $sWikiPageXML = file_get_contents($sURL); if (preg_match_all('#\\| ([a-z]{2}) \\|\\| [^|]+\\|\\| ([a-z,]+)#', $sWikiPageXML, $aMatches, PREG_SET_ORDER)) { foreach ($aMatches as $aMatch) { diff --git a/utils/specialphrases.php b/utils/specialphrases.php index ec00cb62..8378b373 100755 --- a/utils/specialphrases.php +++ b/utils/specialphrases.php @@ -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) { diff --git a/utils/update.php b/utils/update.php index c5b5e4de..2fc3dba2 100755 --- a/utils/update.php +++ b/utils/update.php @@ -130,25 +130,25 @@ $bUseOSMApi = isset($aResult['import-from-main-api']) && $aResult['import-from-m $sContentURL = ''; if (isset($aResult['import-node']) && $aResult['import-node']) { if ($bUseOSMApi) { - $sContentURL = 'http://www.openstreetmap.org/api/0.6/node/'.$aResult['import-node']; + $sContentURL = 'https://www.openstreetmap.org/api/0.6/node/'.$aResult['import-node']; } else { - $sContentURL = 'http://overpass-api.de/api/interpreter?data=node('.$aResult['import-node'].');out%20meta;'; + $sContentURL = 'https://overpass-api.de/api/interpreter?data=node('.$aResult['import-node'].');out%20meta;'; } } if (isset($aResult['import-way']) && $aResult['import-way']) { if ($bUseOSMApi) { - $sContentURL = 'http://www.openstreetmap.org/api/0.6/way/'.$aResult['import-way'].'/full'; + $sContentURL = 'https://www.openstreetmap.org/api/0.6/way/'.$aResult['import-way'].'/full'; } else { - $sContentURL = 'http://overpass-api.de/api/interpreter?data=(way('.$aResult['import-way'].');node(w););out%20meta;'; + $sContentURL = 'https://overpass-api.de/api/interpreter?data=(way('.$aResult['import-way'].');node(w););out%20meta;'; } } if (isset($aResult['import-relation']) && $aResult['import-relation']) { if ($bUseOSMApi) { - $sContentURLsModifyXMLstr = 'http://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full'; + $sContentURLsModifyXMLstr = 'https://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full'; } else { - $sContentURL = 'http://overpass-api.de/api/interpreter?data=((rel('.$aResult['import-relation'].');way(r);node(w));node(r));out%20meta;'; + $sContentURL = 'https://overpass-api.de/api/interpreter?data=((rel('.$aResult['import-relation'].');way(r);node(w));node(r));out%20meta;'; } } @@ -251,7 +251,7 @@ if ($aResult['index']) { if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { // if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) { - fail("Error: Update interval too low for download.geofabrik.de. Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n"); + fail("Error: Update interval too low for download.geofabrik.de. Please check install documentation (http://nominatim.org/release-docs/latest/Import-and-Update#setting-up-the-update-process)\n"); } $sImportFile = CONST_InstallPath.'/osmosischange.osc'; diff --git a/website/js/nominatim-ui.js b/website/js/nominatim-ui.js index ccd403fa..64160c84 100644 --- a/website/js/nominatim-ui.js +++ b/website/js/nominatim-ui.js @@ -143,7 +143,7 @@ jQuery(document).ready(function(){ ].join(','); } function map_link_to_osm(){ - return "http://openstreetmap.org/#map=" + map.getZoom() + "/" + map.getCenter().lat + "/" + map.getCenter().lng; + return "https://openstreetmap.org/#map=" + map.getZoom() + "/" + map.getCenter().lat + "/" + map.getCenter().lng; } function get_result_element(position){ diff --git a/website/polygons.php b/website/polygons.php index b249ae03..4c1401ef 100755 --- a/website/polygons.php +++ b/website/polygons.php @@ -102,7 +102,6 @@ foreach ($aPolygons[0] as $sCol => $sVal) { echo ''.$sCol.''; } echo ' '; -echo ' '; echo ''; $aSeen = array(); foreach ($aPolygons as $aRow) { @@ -115,7 +114,7 @@ foreach ($aPolygons as $aRow) { if (preg_match('/Self-intersection\\[([0-9.\\-]+) ([0-9.\\-]+)\\]/', $sVal, $aMatch)) { $aRow['lat'] = $aMatch[2]; $aRow['lon'] = $aMatch[1]; - echo ''.($sVal?$sVal:' ').''; + echo ''.($sVal?$sVal:' ').''; } else { echo ''.($sVal?$sVal:' ').''; } @@ -128,12 +127,7 @@ foreach ($aPolygons as $aRow) { break; } } - echo 'josm'; - if (isset($aRow['lat'])) { - echo 'P2'; - } else { - echo ' '; - } + echo 'josm'; echo ''; } echo ''; -- 2.39.5