Merge branch 'master' into develop

CHANGELOG.md

@@ -5,6 +5,9 @@
   - BBRF103 / RX666 / RX888 devices supported by libsddc
   - Devices using the EB200 protocol
 
+**0.20.1**
+- Remove broken OSM map fallback
+
 **0.20.0**
 - Added the ability to sign multiple keys in a single request, thus enabling multiple users to claim a single receiver
   on receiverbook.de

debian/changelog

@@ -9,6 +9,12 @@ openwebrx (0.21.0) UNRELEASED; urgency=low
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Sun, 11 Oct 2020 21:12:00 +0000
 
+openwebrx (0.20.1) buster focal; urgency=low
+
+  * Remove broken OSM map fallback
+
+ -- Jakob Ketterl <jakob.ketterl@gmx.de>  Mon, 30 Nov 2020 17:29:00 +0000
+
 openwebrx (0.20.0) buster focal; urgency=low
 
   * Added the ability to sign multiple keys in a single request, thus enabling

htdocs/map.js

@@ -223,26 +223,14 @@
                     case "config":
                         var config = json.value;
                         if (!map) $.getScript("https://maps.googleapis.com/maps/api/js?key=" + config.google_maps_api_key).done(function(){
-                            var mapTypeId = config.google_maps_api_key ? 'roadmap' : 'OSM';
-
                             map = new google.maps.Map($('.openwebrx-map')[0], {
                                 center: {
                                     lat: config.receiver_gps.lat,
                                     lng: config.receiver_gps.lon
                                 },
                                 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
-                            }));
-
                             $.getScript("static/lib/nite-overlay.js").done(function(){
                                 nite.init(map);
                                 setInterval(function() { nite.refresh() }, 10000); // every 10s