From 13469e1576e29f24b220ed1749ae143a0094d204 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Thu, 11 Jan 2018 23:05:28 +0100 Subject: [PATCH] convert remaining http links and shorten copyright URL --- README.md | 6 +++--- docs/Faq.md | 2 +- docs/Import-and-Update.md | 4 ++-- lib/Geocode.php | 4 ++-- lib/template/address-json.php | 2 +- lib/template/address-jsonv2.php | 2 +- lib/template/includes/html-footer.php | 2 +- lib/template/includes/report-errors.php | 2 +- lib/template/search-batch-json.php | 2 +- lib/template/search-json.php | 2 +- lib/template/search-jsonv2.php | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 30fb7555..fae9b72d 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,13 @@ Documentation More information about Nominatim, including usage and installation instructions, can be found in the docs/ subdirectory and in the OSM wiki at: -http://nominatim.org +https://nominatim.org Installation ============ -The latest stable release can be downloaded from http://nominatim.org. -There you can also find [installation instructions for the release](http://nominatim.org/release-docs/latest/Installation). +The latest stable release can be downloaded from https://nominatim.org. +There you can also find [installation instructions for the release](https://nominatim.org/release-docs/latest/Installation). Detailed installation instructions for the development version can be found in the `/docs` directory, see [docs/Installation.md](docs/Installation.md). diff --git a/docs/Faq.md b/docs/Faq.md index ed26f7b8..cb69effb 100644 --- a/docs/Faq.md +++ b/docs/Faq.md @@ -6,7 +6,7 @@ Running Your Own Instance ### Can I import only a few countries and also keep them up to date? -You should use the extracts and updates from http://download.geofabrik.de. +You should use the extracts and updates from https://download.geofabrik.de. For the intial import, download the countries you need and merge them. See [OSM Help](https://help.openstreetmap.org/questions/48843/merging-two-or-more-geographical-areas-to-import-two-or-more-osm-files-in-nominatim) for examples how to do that. Use the resulting single osm file when diff --git a/docs/Import-and-Update.md b/docs/Import-and-Update.md index d99c878c..b523f65d 100644 --- a/docs/Import-and-Update.md +++ b/docs/Import-and-Update.md @@ -55,7 +55,7 @@ Initial import of the data -------------------------- **Important:** first try the import with a small excerpt, for example from -[Geofabrik](http://download.geofabrik.de). +[Geofabrik](https://download.geofabrik.de). Download the data to import and load the data with the following command: @@ -164,7 +164,7 @@ to `settings/local.php`. For example, to use the daily country extracts diffs for Ireland from geofabrik add the following: // base URL of the replication service - @define('CONST_Replication_Url', 'http://download.geofabrik.de/europe/ireland-and-northern-ireland-updates'); + @define('CONST_Replication_Url', 'https://download.geofabrik.de/europe/ireland-and-northern-ireland-updates'); // How often upstream publishes diffs @define('CONST_Replication_Update_Interval', '86400'); // How long to sleep if no update found yet diff --git a/lib/Geocode.php b/lib/Geocode.php index 7566d18b..6c5fb23e 100644 --- a/lib/Geocode.php +++ b/lib/Geocode.php @@ -479,9 +479,9 @@ class Geocode osm_id: id of corresponding OSM object class: general object class (corresponds to tag key of primary OSM tag) type: subclass of object (corresponds to tag value of primary OSM tag) - admin_level: see http://wiki.openstreetmap.org/wiki/Admin_level + admin_level: see https://wiki.openstreetmap.org/wiki/Admin_level rank_search: rank in search hierarchy - (see also http://wiki.openstreetmap.org/wiki/Nominatim/Development_overview#Country_to_street_level) + (see also https://wiki.openstreetmap.org/wiki/Nominatim/Development_overview#Country_to_street_level) rank_address: rank in address hierarchy (determines orer in address) place_id: internal key (may differ between different instances) country_code: ISO country code diff --git a/lib/template/address-json.php b/lib/template/address-json.php index 9cefe3ef..93abb601 100644 --- a/lib/template/address-json.php +++ b/lib/template/address-json.php @@ -12,7 +12,7 @@ if (!sizeof($aPlace)) else { if (isset($aPlace['place_id'])) $aFilteredPlaces['place_id'] = $aPlace['place_id']; - $aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright"; + $aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright"; $sOSMType = formatOSMType($aPlace['osm_type']); if ($sOSMType) { diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php index b157ed56..229303be 100644 --- a/lib/template/address-jsonv2.php +++ b/lib/template/address-jsonv2.php @@ -12,7 +12,7 @@ if (!sizeof($aPlace)) else { if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id']; - $aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright"; + $aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright"; $sOSMType = formatOSMType($aPlace['osm_type']); if ($sOSMType) { diff --git a/lib/template/includes/html-footer.php b/lib/template/includes/html-footer.php index 1746a532..e7d78cfa 100644 --- a/lib/template/includes/html-footer.php +++ b/lib/template/includes/html-footer.php @@ -3,7 +3,7 @@ Addresses and postcodes are approximate

- © OpenStreetMap contributors + © OpenStreetMap contributors

diff --git a/lib/template/includes/report-errors.php b/lib/template/includes/report-errors.php index 31877d4e..05a47c8b 100644 --- a/lib/template/includes/report-errors.php +++ b/lib/template/includes/report-errors.php @@ -10,7 +10,7 @@ Use Nominatim issues on github to report problems.

diff --git a/lib/template/search-batch-json.php b/lib/template/search-batch-json.php index 9fa83e2a..a3ced45b 100644 --- a/lib/template/search-batch-json.php +++ b/lib/template/search-batch-json.php @@ -1,7 +1,7 @@ $aPointDetails) { $aPlace = array( 'place_id'=>$aPointDetails['place_id'], - 'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright", + 'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. https://www.openstreetmap.org/copyright", ); $sOSMType = formatOSMType($aPointDetails['osm_type']); diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php index d550a7e6..5d2802af 100644 --- a/lib/template/search-jsonv2.php +++ b/lib/template/search-jsonv2.php @@ -5,7 +5,7 @@ foreach($aSearchResults as $iResNum => $aPointDetails) { $aPlace = array( 'place_id'=>$aPointDetails['place_id'], - 'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright", + 'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright", ); $sOSMType = formatOSMType($aPointDetails['osm_type']); -- 2.39.5