joachim
/
openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

always add OSM source, switch when no google maps key is present.

This commit is contained in:
Jakob Ketterl 2020-03-13 23:53:14 +01:00
parent 3852f28fd4
commit ede40e4a68
1 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/map.js
View File

@ -215,20 +215,7 @@
case "config": case "config":
var config = json.value; var config = json.value;
if (!map) $.getScript("https://maps.googleapis.com/maps/api/js?key=" + config.google_maps_api_key).done(function(){ if (!map) $.getScript("https://maps.googleapis.com/maps/api/js?key=" + config.google_maps_api_key).done(function(){
if (config.google_maps_api_key){ var mapTypeId = config.google_maps_api_key ? 'roadmap' : 'OSM';
map = new google.maps.Map($('.openwebrx-map')[0], {
center: {
lat: config.receiver_gps[0],
lng: config.receiver_gps[1]
},
zoom: 5
});
} else {
var mapTypeIds = [];
for(var type in google.maps.MapTypeId) {
mapTypeIds.push(google.maps.MapTypeId[type]);
}
mapTypeIds.push("OSM");
map = new google.maps.Map($('.openwebrx-map')[0], { map = new google.maps.Map($('.openwebrx-map')[0], {
center: { center: {
@ -236,7 +223,7 @@
lng: config.receiver_gps[1] lng: config.receiver_gps[1]
}, },
zoom: 5, zoom: 5,
mapTypeId: "OSM" mapTypeId: mapTypeId
}); });
map.mapTypes.set("OSM", new google.maps.ImageMapType({ map.mapTypes.set("OSM", new google.maps.ImageMapType({
@ -247,7 +234,7 @@
name: "OpenStreetMap", name: "OpenStreetMap",
maxZoom: 18 maxZoom: 18
})); }));
}
$.getScript("static/lib/nite-overlay.js").done(function(){ $.getScript("static/lib/nite-overlay.js").done(function(){
nite.init(map); nite.init(map);
setInterval(function() { nite.refresh() }, 10000); // every 10s setInterval(function() { nite.refresh() }, 10000); // every 10s