Skip to content

Commit 1e52359

Browse files
author
xss
committed
station icon zoom levels
1 parent ed0029d commit 1e52359

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

js/app.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,7 @@ function check_version(){
10081008
.then(function(response){ return response.json()})
10091009
.then(function(response){
10101010
if (response['version'] != version) {
1011+
window.clearInterval(update_check)
10111012
reload_timer = window.setTimeout(update_site, response['refresh']*1000)
10121013
reload_end_time = new Date().getTime() +response['refresh']*1000
10131014
update_countdown();

js/station.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ function generateLaunchSites() {
806806
var burst_altitude = 26000;
807807
var burst_samples = "";
808808
var descent_samples = "";
809-
var marker = new L.circleMarker(latlon, {color: '#696969', fillColor: "white", radius: 8});
809+
var marker = new L.circleMarker(latlon, {color: '#696969', fillColor: "white", radius: Math.min(map.getZoom(),8)});
810810
var popup = new L.popup({ autoClose: false, closeOnClick: false });
811811
marker.title = key;
812812
marker.bindPopup(popup);

js/tracker.js

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,6 +1356,15 @@ function updateAltitude(vcallsign) {
13561356
}
13571357

13581358
function updateZoom() {
1359+
for(x in launches._layers){launches.getLayer(x).setRadius(Math.min(map.getZoom(),8))}
1360+
for(x in receivers){
1361+
var radius = 6;
1362+
if (receivers[x].name in pledges){
1363+
radius = radius * 1.3
1364+
}
1365+
1366+
receivers[x].marker.setRadius(Math.min(map.getZoom(),radius))
1367+
}
13591368
for(var vcallsign in vehicles) {
13601369
var vehicle = vehicles[vcallsign];
13611370

@@ -4239,29 +4248,29 @@ function updateReceiverMarker(receiver) {
42394248
if (pledges.hasOwnProperty(receiver.name)) {
42404249
if (pledges[receiver.name].icon == "bronze") {
42414250
receiver.marker = new L.CircleMarker(latlng, {
4242-
radius: 8,
4251+
radius: Math.min(map.getZoom(),6*1.3),
42434252
fillOpacity: 0.6,
42444253
color: "#CD7F32",
42454254
});
42464255
receiver.infobox = new L.popup({ autoClose: false, closeOnClick: false, className: "bronze" }).setContent(receiver.description);
42474256
} else if (pledges[receiver.name].icon == "silver") {
42484257
receiver.marker = new L.CircleMarker(latlng, {
4249-
radius: 8,
4258+
radius: Math.min(map.getZoom(),6*1.3),
42504259
fillOpacity: 0.6,
42514260
color: "#C0C0C0",
42524261
});
42534262
receiver.infobox = new L.popup({ autoClose: false, closeOnClick: false, className: "silver" }).setContent(receiver.description);
42544263
} else {
42554264
receiver.marker = new L.CircleMarker(latlng, {
4256-
radius: 8,
4265+
radius: Math.min(map.getZoom(),6*1.3),
42574266
fillOpacity: 0.6,
42584267
color: "#FFD700",
42594268
});
42604269
receiver.infobox = new L.popup({ autoClose: false, closeOnClick: false, className: "gold" }).setContent(receiver.description);
42614270
};
42624271
} else {
42634272
receiver.marker = new L.CircleMarker(latlng, {
4264-
radius: 6,
4273+
radius: Math.min(map.getZoom(),6),
42654274
fillOpacity: 0.6,
42664275
color: "#008000",
42674276
});

0 commit comments

Comments
 (0)