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

convert remaining http links and shorten copyright URL

Browse Source
This commit is contained in:
Sarah Hoffmann
2018-01-11 23:05:28 +01:00
parent 8f23ba076b
commit 13469e1576
11 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -16,13 +16,13 @@ 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://nominatim.org https://nominatim.org
Installation Installation
============ ============
The latest stable release can be downloaded from http://nominatim.org. The latest stable release can be downloaded from https://nominatim.org.
There you can also find [installation instructions for the release](http://nominatim.org/release-docs/latest/Installation). 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 Detailed installation instructions for the development version can be
found in the `/docs` directory, see [docs/Installation.md](docs/Installation.md). found in the `/docs` directory, see [docs/Installation.md](docs/Installation.md).

2
docs/Faq.md
View File

@@ -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. 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) 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 examples how to do that. Use the resulting single osm file when

4
docs/Import-and-Update.md
View File

@@ -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: diffs for Ireland from geofabrik add the following:
// base URL of the replication service // 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 // How often upstream publishes diffs
@define('CONST_Replication_Update_Interval', '86400'); @define('CONST_Replication_Update_Interval', '86400');
// How long to sleep if no update found yet // How long to sleep if no update found yet

4
lib/Geocode.php
View File

@@ -479,9 +479,9 @@ class Geocode
osm_id: id of corresponding OSM object osm_id: id of corresponding OSM object
class: general object class (corresponds to tag key of primary OSM tag) class: general object class (corresponds to tag key of primary OSM tag)
type: subclass of object (corresponds to tag value 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) rank_address: rank in address hierarchy (determines orer in address)
place_id: internal key (may differ between different instances) place_id: internal key (may differ between different instances)
country_code: ISO country code country_code: ISO country code

2
lib/template/address-json.php
View File

@@ -12,7 +12,7 @@ if (!sizeof($aPlace))
else else
{ {
if (isset($aPlace['place_id'])) $aFilteredPlaces['place_id'] = $aPlace['place_id']; 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']); $sOSMType = formatOSMType($aPlace['osm_type']);
if ($sOSMType) if ($sOSMType)
{ {

2
lib/template/address-jsonv2.php
View File

@@ -12,7 +12,7 @@ if (!sizeof($aPlace))
else else
{ {
if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id']; 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']); $sOSMType = formatOSMType($aPlace['osm_type']);
if ($sOSMType) if ($sOSMType)
{ {

2
lib/template/includes/html-footer.php
View File

@@ -3,7 +3,7 @@
Addresses and postcodes are approximate Addresses and postcodes are approximate
</p> </p>
<p class="copyright"> <p class="copyright">
&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://osm.org/copyright">OpenStreetMap</a> contributors
</p> </p>
</footer> </footer>

2
lib/template/includes/report-errors.php
View File

@@ -10,7 +10,7 @@
Use <a target="_blank" href="https://github.com/openstreetmap/nominatim/issues">Nominatim issues on github</a> Use <a target="_blank" href="https://github.com/openstreetmap/nominatim/issues">Nominatim issues on github</a>
to report problems. to report problems.
<!-- You can search for existing bug reports <!-- 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>

2
lib/template/search-batch-json.php
View File

@@ -1,7 +1,7 @@
<?php <?php
$aOutput = array(); $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(); $aOutput['batch'] = array();
foreach($aBatchResults as $aSearchResults) foreach($aBatchResults as $aSearchResults)

2
lib/template/search-json.php
View File

@@ -6,7 +6,7 @@ foreach($aSearchResults as $iResNum => $aPointDetails)
{ {
$aPlace = array( $aPlace = array(
'place_id'=>$aPointDetails['place_id'], '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']);

2
lib/template/search-jsonv2.php
View File

@@ -5,7 +5,7 @@ foreach($aSearchResults as $iResNum => $aPointDetails)
{ {
$aPlace = array( $aPlace = array(
'place_id'=>$aPointDetails['place_id'], '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']);