From 414d330aeaafbba9920a7525f31c5cefdfb77826 Mon Sep 17 00:00:00 2001 From: "Kasper D. Fischer" Date: Wed, 15 Jul 2020 18:41:07 +0200 Subject: [PATCH] updating English files --- www/index.html.en | 19 ++++++++----------- www/map.js.en | 47 ++++++++--------------------------------------- 2 files changed, 16 insertions(+), 50 deletions(-) diff --git a/www/index.html.en b/www/index.html.en index db07261..e84bc27 100755 --- a/www/index.html.en +++ b/www/index.html.en @@ -11,10 +11,10 @@ - - - - + + + + @@ -32,14 +32,11 @@ - - - - + + + - - - + diff --git a/www/map.js.en b/www/map.js.en index 28a6dd4..7e6070c 100644 --- a/www/map.js.en +++ b/www/map.js.en @@ -35,7 +35,7 @@ function addStationMarker(id, lat, lng, station) { radius: config['station']['markerSize'][id] || config['station']['markerSize']['defaultSize'], className: id+' stationMarker', }); - marker.bindLabel('Station '+station); + marker.bindTooltip('Station '+station); stationLayer.addLayer(marker); stationTable[id] = marker; }; @@ -141,16 +141,8 @@ $(document).ready(function() { // create a map in the "map" div, set the view to a given place and zoom - // create baselayer switch ( config['map']['baselayer'] ) { - case 'osmde': // add OpenStreetMap.DE tile layer - map = L.map('map', { zoomControl: false, worldCopyJump: true }).setView(config['map']['centerDefault'], config['map']['zoomDefault']); - L.tileLayer('https://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png', - { - attribution: '© OpenStreetMap contributors, CC-BY-SA', - }).addTo(map); - break; case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names) map = L.map('map', { zoomControl: false, worldCopyJump: true }).setView(config['map']['centerDefault'], config['map']['zoomDefault']); L.tileLayer('//server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}', @@ -166,39 +158,16 @@ $(document).ready(function() { attribution: 'Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community' }).addTo(map); break; - case 'komoot': // add OpenStreetMap.DE tile layer - map = L.map('map', { zoomControl: false, worldCopyJump: true }).setView(config['map']['centerDefault'], config['map']['zoomDefault']); - L.tileLayer('//www.komoot.de/tiles/{s}/{z}/{x}/{y}.png', - { - attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA | Tiles Courtesy of Komoot', - }).addTo(map); - break; - case 'mapquestgray': // add MapQuestOSM tile layer - null; - // map = L.map('map', { zoomControl: false, worldCopyJump: true, layers: mapLayer }).setView(config['map']['centerDefault'], config['map']['zoomDefault']); - // L.tileLayer.grayscale('https://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg', - // { - // subdomains: '1234', - // detectRetina: true, - // attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA | Tiles Courtesy of MapQuest ', - //}).addTo(map); - //break; - case 'mapquest': // add MapQuestOSM tile layer + case 'osmde': // add OpenStreetMap.DE tile layer, default null; default: - var mapLayer = MQ.mapLayer(); - map = L.map('map', { - zoomControl: false, - worldCopyJump: true, - layers: mapLayer, - }).setView(config['map']['centerDefault'], config['map']['zoomDefault']); - //L.tileLayer('https://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg', - //{ - //subdomains: '1234', - //detectRetina: true, - //attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA | Tiles Courtesy of MapQuest ', - //}).addTo(map); + map = L.map('map', { zoomControl: false, worldCopyJump: true }).setView(config['map']['centerDefault'], config['map']['zoomDefault']); + L.tileLayer('https://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png', + { + attribution: '© OpenStreetMap contributors, CC-BY-SA', + }).addTo(map); }; + // add controls new L.Control.Zoom({ position: 'topright' }).addTo(map); new L.control.scale({position: 'bottomright', imperial: false}).addTo(map);