From b3fbf89f57e573ba8a7033e444e750a372a259df Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Mon, 30 Nov 2020 18:10:34 +0100 Subject: [PATCH 1/2] remove OSM fallback since it's broken --- htdocs/map.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/htdocs/map.js b/htdocs/map.js index 0d447e2..69be2ca 100644 --- a/htdocs/map.js +++ b/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 From 8710a2a1d34508d8f9427ec0e5b5a81b56f4b0fa Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Mon, 30 Nov 2020 18:30:33 +0100 Subject: [PATCH 2/2] update version and changelog --- CHANGELOG.md | 3 +++ debian/changelog | 6 ++++++ owrx/version.py | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c4e9db..453141a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +**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 diff --git a/debian/changelog b/debian/changelog index e0c9239..b2e2435 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openwebrx (0.20.1) buster focal; urgency=low + + * Remove broken OSM map fallback + + -- Jakob Ketterl 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 diff --git a/owrx/version.py b/owrx/version.py index cd89792..7b33bd5 100644 --- a/owrx/version.py +++ b/owrx/version.py @@ -1,5 +1,5 @@ from distutils.version import LooseVersion -_versionstring = "0.20.0" +_versionstring = "0.20.1" looseversion = LooseVersion(_versionstring) openwebrx_version = "v{0}".format(looseversion)