convert remaining http links and shorten copyright URL

diff --git a/README.md b/README.md
index 30fb75555a9186d9f0e7bbf8e1ec025ce5720fc3..fae9b72d141fdcc6071b3e708bc8b737304861d1 100644 (file)
--- 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:
 
 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
 ============
 
 
 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).
 
 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 ed26f7b877e6150677d2a8aa9d047b4f824cf28c..cb69effbb38bb491d36d8bd5e86aaf5a046bac0e 100644 (file)
--- 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?
 
 
 ### 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
 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 d99c878c3d482904c38b292e2d910885be846461..b523f65dcdf713edaf1984294aa097063acb1352 100644 (file)
--- 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
 --------------------------
 
 **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:
 
 
 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
 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
     // 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 7566d18b8f45e5ca613468cc71a508536c260aa7..6c5fb23e2c3c4cd8d9f2e3d7ae460dbc1ee54190 100644 (file)
--- 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)
             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
             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
             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 9cefe3ef15a6b6effab46118295f95d66c493f28..93abb6017308b485c7634bc9a89fe1d670a07f03 100644 (file)
--- 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'];
 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)
     {
     $sOSMType = formatOSMType($aPlace['osm_type']);
     if ($sOSMType)
     {

diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php
index b157ed56d5e75e9e5c27c0904f16170f1067be15..229303be6e7325bb19de208299b7323300c3c977 100644 (file)
--- 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'];
 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)
     {
     $sOSMType = formatOSMType($aPlace['osm_type']);
     if ($sOSMType)
     {

diff --git a/lib/template/includes/html-footer.php b/lib/template/includes/html-footer.php
index 1746a5328b1aff6d1679da68ec313aaebdd39a53..e7d78cfab16cd1d373ef4a7eb6770c54c7a3ce50 100644 (file)
--- a/lib/template/includes/html-footer.php
+++ b/lib/template/includes/html-footer.php
@@ -3,7 +3,7 @@
         Addresses and postcodes are approximate
     </p>
     <p class="copyright">
         Addresses and postcodes are approximate
     </p>
     <p class="copyright">

-        &copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors
+        &copy; <a href="https://osm.org/copyright">OpenStreetMap</a> contributors

     </p>
 </footer>
 
     </p>
 </footer>
 

diff --git a/lib/template/includes/report-errors.php b/lib/template/includes/report-errors.php
index 31877d4e74703608cea6de87444a5fe6ed998f55..05a47c8b28de1832b751f8539aceb4503a222bf7 100644 (file)
--- a/lib/template/includes/report-errors.php
+++ b/lib/template/includes/report-errors.php
@@ -10,7 +10,7 @@
     Use <a target="_blank" href="https://github.com/openstreetmap/nominatim/issues">Nominatim issues on github</a>
     to report problems.
 <!-- You can search for existing bug reports
     Use <a target="_blank" href="https://github.com/openstreetmap/nominatim/issues">Nominatim issues on github</a>
     to report problems.
 <!-- You can search for existing bug reports

-    <a href="http://trac.openstreetmap.org/query?status=new&amp;status=assigned&amp;status=reopened&amp;component=nominatim&amp;order=priority">here</a>.</p>
+    <a href="https://trac.openstreetmap.org/query?status=new&amp;status=assigned&amp;status=reopened&amp;component=nominatim&amp;order=priority">here</a>.</p>

  -->
 </p>
 <p>
  -->
 </p>
 <p>

diff --git a/lib/template/search-batch-json.php b/lib/template/search-batch-json.php
index 9fa83e2a22c854bb965dc43a2b2a69f7894861f3..a3ced45bc35bb46ec3fab5be00f04229a952a507 100644 (file)
--- a/lib/template/search-batch-json.php
+++ b/lib/template/search-batch-json.php
@@ -1,7 +1,7 @@
 <?php
 
 $aOutput = array();
 <?php
 
 $aOutput = array();

-$aOutput['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
+$aOutput['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright";

 $aOutput['batch'] = array();
 
 foreach($aBatchResults as $aSearchResults)
 $aOutput['batch'] = array();
 
 foreach($aBatchResults as $aSearchResults)

diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 50009bc375023e70982331bee7808844456ef900..846d654c5e3b5fb5da8b317ccb5cf9319d03a268 100644 (file)
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -6,7 +6,7 @@ foreach($aSearchResults as $iResNum => $aPointDetails)
 {
     $aPlace = array(
             'place_id'=>$aPointDetails['place_id'],
 {
     $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']);
         );
     
     $sOSMType = formatOSMType($aPointDetails['osm_type']);

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index d550a7e6706d19d6ea09f97031703b503657f089..5d2802afe60b36f8d5351410832adaf5a9feb4bf 100644 (file)
--- 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'],
 {
     $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']);
         );
 
     $sOSMType = formatOSMType($aPointDetails['osm_type']);