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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Jakob Ketterl 2020-11-30 20:30:30 +01:00
commit e90b10abfd
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

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

6
debian/changelog vendored
View File

@ -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 -- 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 openwebrx (0.20.0) buster focal; urgency=low
* Added the ability to sign multiple keys in a single request, thus enabling * Added the ability to sign multiple keys in a single request, thus enabling

12
htdocs/map.js
View File

@ -223,26 +223,14 @@
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(){
var mapTypeId = config.google_maps_api_key ? 'roadmap' : 'OSM';
map = new google.maps.Map($('.openwebrx-map')[0], { map = new google.maps.Map($('.openwebrx-map')[0], {
center: { center: {
lat: config.receiver_gps.lat, lat: config.receiver_gps.lat,
lng: config.receiver_gps.lon lng: config.receiver_gps.lon
}, },
zoom: 5, 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(){ $.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