hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

make map tile layer configurable

Browse Source
This commit is contained in:
Marc Tobias Metten
2016-01-27 19:42:49 +01:00
parent 4cade95b24
commit 21385f5e51
8 changed files with 49 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/details.php
View File

@@ -127,4 +127,7 @@
logEnd($oDB, $hLog, 1);
$sTileURL = CONST_Map_Tile_URL;
$sTileAttribution = CONST_Map_Tile_Attribution;
include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');

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

@@ -10,30 +10,23 @@ jQuery(document).on('ready', function(){
$('#q').focus();
map = new L.map('map', {
attributionControl: false, // moved to page footer
attributionControl: (nominatim_map_init.tile_attribution && nominatim_map_init.tile_attribution.length),
scrollWheelZoom: !L.Browser.touch,
touchZoom: false
});
L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
noWrap: true // otherwise we end up with click coordinates like latitude -728
L.tileLayer(nominatim_map_init.tile_url, {
noWrap: true, // otherwise we end up with click coordinates like latitude -728
// moved to footer
// attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
attribution: (nominatim_map_init.tile_attribution || null ) //'&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
}).addTo(map);
if ( nominatim_map_init.lat ){
map.setView([nominatim_map_init.lat || 0, nominatim_map_init.lon], nominatim_map_init.zoom);
map.setView([nominatim_map_init.lat, nominatim_map_init.lon], nominatim_map_init.zoom);
if ( is_reverse_search ){
// not really a market, but the .circle changes radius once you zoom in/out
var cm = L.circleMarker([nominatim_map_init.lat,nominatim_map_init.lon], { radius: 5, weight: 2, fillColor: '#ff7800', color: 'red', opacity: 0.75, clickable: false});
cm.addTo(map);
}
} else {
map.setView([0,0],2);
if ( is_reverse_search ){
// We don't need a marker, but an L.circle instance changes radius once you zoom in/out
var cm = L.circleMarker([nominatim_map_init.lat,nominatim_map_init.lon], { radius: 5, weight: 2, fillColor: '#ff7800', color: 'red', opacity: 0.75, clickable: false});
cm.addTo(map);
}
@@ -188,16 +181,18 @@ jQuery(document).on('ready', function(){
map = new L.map('map', {
// center: [nominatim_map_init.lat, nominatim_map_init.lon],
// zoom: nominatim_map_init.zoom,
attributionControl: false,
attributionControl: (nominatim_map_init.tile_attribution && nominatim_map_init.tile_attribution.length),
scrollWheelZoom: false,
touchZoom: false,
});
L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
L.tileLayer(nominatim_map_init.tile_url, {
// moved to footer
// attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
attribution: (nominatim_map_init.tile_attribution || null ) //'&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
}).addTo(map);
var layerGroup = new L.layerGroup().addTo(map);
var circle = L.circleMarker([nominatim_result.lat,nominatim_result.lon], { radius: 10, weight: 2, fillColor: '#ff7800', color: 'blue', opacity: 0.75});

2
website/reverse.php
View File

@@ -76,4 +76,6 @@
exit;
}
$sTileURL = CONST_Map_Tile_URL;
$sTileAttribution = CONST_Map_Tile_Attribution;
include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');

2
website/search.php
View File

@@ -13,6 +13,8 @@
$fLat = CONST_Default_Lat;
$fLon = CONST_Default_Lon;
$iZoom = CONST_Default_Zoom;
$sTileURL = CONST_Map_Tile_URL;
$sTileAttribution = CONST_Map_Tile_Attribution;
$oGeocode =& new Geocode($oDB);