From ede40e4a688802e718ab608fc70c5dca5d2f40e6 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 13 Mar 2020 23:53:14 +0100
Subject: [PATCH] always add OSM source, switch when no google maps key is
 present.

---
 htdocs/map.js | 49 ++++++++++++++++++-------------------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/htdocs/map.js b/htdocs/map.js
index 12f295b..1fb2ec5 100644
--- a/htdocs/map.js
+++ b/htdocs/map.js
@@ -215,39 +215,26 @@
                     case "config":
                         var config = json.value;
                         if (!map) $.getScript("https://maps.googleapis.com/maps/api/js?key=" + config.google_maps_api_key).done(function(){
-                            if (config.google_maps_api_key){
-                                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");
+                            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,
-                                    mapTypeId: "OSM"
-                                });
+                            map = new google.maps.Map($('.openwebrx-map')[0], {
+                                center: {
+                                    lat: config.receiver_gps[0],
+                                    lng: config.receiver_gps[1]
+                                },
+                                zoom: 5,
+                                mapTypeId: mapTypeId
+                            });
+
+                            map.mapTypes.set("OSM", new google.maps.ImageMapType({
+                                getTileUrl: function(coord, zoom) {
+                                    return "https://maps.wikimedia.org/osm-intl/" + zoom + "/" + coord.x + "/" + coord.y + ".png";
+                                },
+                                tileSize: new google.maps.Size(256, 256),
+                                name: "OpenStreetMap",
+                                maxZoom: 18
+                            }));
 
-                                map.mapTypes.set("OSM", new google.maps.ImageMapType({
-                                    getTileUrl: function(coord, zoom) {
-                                        return "https://maps.wikimedia.org/osm-intl/" + zoom + "/" + coord.x + "/" + coord.y + ".png";
-                                    },
-                                    tileSize: new google.maps.Size(256, 256),
-                                    name: "OpenStreetMap",
-                                    maxZoom: 18
-                                }));
-                            }
                             $.getScript("static/lib/nite-overlay.js").done(function(){
                                 nite.init(map);
                                 setInterval(function() { nite.refresh() }, 10000); // every 10s