hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-09 03:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

update URLs in code and documentation

Browse Source 
Use https for all openstreetmap addresses, remove defunct
mapquest link and redirect documentation links to
nominatim.org.
This commit is contained in:
Sarah Hoffmann
2018-01-05 22:38:51 +01:00
parent 6ba87c37d6
commit 9712decefe
7 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -6,7 +6,7 @@ Nominatim
Nominatim (from the Latin, 'by name') is a tool to search OpenStreetMap data Nominatim (from the Latin, 'by name') is a tool to search OpenStreetMap data
by name and address (geocoding) and to generate synthetic addresses of 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 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 sources for the Search box on the OpenStreetMap home page and powers the search
on the MapQuest Open Initiative websites. on the MapQuest Open Initiative websites.
@@ -16,7 +16,7 @@ Documentation
More information about Nominatim, including usage and installation instructions, More information about Nominatim, including usage and installation instructions,
can be found in the docs/ subdirectory and in the OSM wiki at: can be found in the docs/ subdirectory and in the OSM wiki at:
http://wiki.openstreetmap.org/wiki/Nominatim http://nominatim.org
Installation Installation
============ ============
@@ -52,7 +52,7 @@ Contact and Bug reports
====================== ======================
For questions you can join the geocoding mailinglist, see 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: Bugs may be reported on the github project site:
https://github.com/openstreetmap/Nominatim https://github.com/openstreetmap/Nominatim

2
VAGRANT.md
View File

@@ -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. 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 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? ##### Why Ubuntu and CentOS, can I test CentOS/CoreOS/FreeBSD?

2
utils/country_languages.php
View File

@@ -19,7 +19,7 @@ getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
include(CONST_InstallPath.'/settings/phrase_settings.php'); include(CONST_InstallPath.'/settings/phrase_settings.php');
if (true) { 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); $sWikiPageXML = file_get_contents($sURL);
if (preg_match_all('#\\| ([a-z]{2}) \\|\\| [^|]+\\|\\| ([a-z,]+)#', $sWikiPageXML, $aMatches, PREG_SET_ORDER)) { if (preg_match_all('#\\| ([a-z]{2}) \\|\\| [^|]+\\|\\| ([a-z,]+)#', $sWikiPageXML, $aMatches, PREG_SET_ORDER)) {
foreach ($aMatches as $aMatch) { foreach ($aMatches as $aMatch) {

2
utils/specialphrases.php
View File

@@ -27,7 +27,7 @@ if ($aCMDResult['wiki-import']) {
'ia,is,it,ja,mk,nl,no,pl,ps,pt,ru,sk,sl,sv,uk,vi'); 'ia,is,it,ja,mk,nl,no,pl,ps,pt,ru,sk,sl,sv,uk,vi');
foreach (explode(',', $sLanguageIn) as $sLanguage) { 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); $sWikiPageXML = file_get_contents($sURL);
if (preg_match_all('#\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([\\-YN])#', $sWikiPageXML, $aMatches, PREG_SET_ORDER)) { if (preg_match_all('#\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([\\-YN])#', $sWikiPageXML, $aMatches, PREG_SET_ORDER)) {
foreach ($aMatches as $aMatch) { foreach ($aMatches as $aMatch) {

14
utils/update.php
View File

@@ -130,25 +130,25 @@ $bUseOSMApi = isset($aResult['import-from-main-api']) && $aResult['import-from-m
$sContentURL = ''; $sContentURL = '';
if (isset($aResult['import-node']) && $aResult['import-node']) { if (isset($aResult['import-node']) && $aResult['import-node']) {
if ($bUseOSMApi) { 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 { } 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 (isset($aResult['import-way']) && $aResult['import-way']) {
if ($bUseOSMApi) { 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 { } 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 (isset($aResult['import-relation']) && $aResult['import-relation']) {
if ($bUseOSMApi) { 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 { } 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 ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
// //
if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) { 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'; $sImportFile = CONST_InstallPath.'/osmosischange.osc';

2
website/js/nominatim-ui.js
View File

@@ -143,7 +143,7 @@ jQuery(document).ready(function(){
].join(','); ].join(',');
} }
function map_link_to_osm(){ 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){ function get_result_element(position){

10
website/polygons.php
View File

@@ -102,7 +102,6 @@ foreach ($aPolygons[0] as $sCol => $sVal) {
echo '<th>'.$sCol.'</th>'; echo '<th>'.$sCol.'</th>';
} }
echo '<th>&nbsp;</th>'; echo '<th>&nbsp;</th>';
echo '<th>&nbsp;</th>';
echo '</tr>'; echo '</tr>';
$aSeen = array(); $aSeen = array();
foreach ($aPolygons as $aRow) { foreach ($aPolygons as $aRow) {
@@ -115,7 +114,7 @@ foreach ($aPolygons as $aRow) {
if (preg_match('/Self-intersection\\[([0-9.\\-]+) ([0-9.\\-]+)\\]/', $sVal, $aMatch)) { if (preg_match('/Self-intersection\\[([0-9.\\-]+) ([0-9.\\-]+)\\]/', $sVal, $aMatch)) {
$aRow['lat'] = $aMatch[2]; $aRow['lat'] = $aMatch[2];
$aRow['lon'] = $aMatch[1]; $aRow['lon'] = $aMatch[1];
echo '<td><a href="http://www.openstreetmap.org/?lat='.$aMatch[2].'&lon='.$aMatch[1].'&zoom=18&layers=M&'.$sOSMType.'='.$aRow['id'].'">'.($sVal?$sVal:'&nbsp;').'</a></td>'; echo '<td><a href="https://www.openstreetmap.org/?lat='.$aMatch[2].'&lon='.$aMatch[1].'&zoom=18&layers=M&'.$sOSMType.'='.$aRow['id'].'">'.($sVal?$sVal:'&nbsp;').'</a></td>';
} else { } else {
echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>'; echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';
} }
@@ -128,12 +127,7 @@ foreach ($aPolygons as $aRow) {
break; break;
} }
} }
echo '<td><a href="http://localhost:8111/import?url=http://www.openstreetmap.org/api/0.6/'.$sOSMType.'/'.$aRow['id'].'/full" target="josm">josm</a></td>'; echo '<td><a href="http://localhost:8111/import?url=https://www.openstreetmap.org/api/0.6/'.$sOSMType.'/'.$aRow['id'].'/full" target="josm">josm</a></td>';
if (isset($aRow['lat'])) {
echo '<td><a href="http://open.mapquestapi.com/dataedit/index_flash.html?lat='.$aRow['lat'].'&lon='.$aRow['lon'].'&zoom=18" target="potlatch2">P2</a></td>';
} else {
echo '<td>&nbsp;</td>';
}
echo '</tr>'; echo '</tr>';
} }
echo '</table>'; echo '</table>';