Skip to content

Commit 1b76f4a

Browse files
LukePriorLukePrior
committed
remove small icon support
1 parent 6ca370d commit 1b76f4a

File tree

3 files changed

+23
-75
lines changed

3 files changed

+23
-75
lines changed

‎index.html‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,6 @@ <h4>Other</h4>
219219
<input type="checkbox" id="opt_hilight_vehicle">
220220
</div>
221221
</div>
222-
<div class="row option">
223-
<span><b>Small icons</b></span>
224-
<div class="switch off" id="sw_small_icons">
225-
<span class="thumb"></span>
226-
<input type="checkbox" id="opt_small_icons">
227-
</div>
228-
</div>
229222
<h4>Overlays</h4>
230223
<hr/>
231224
<div class="row option">

‎js/app.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,6 @@ $(window).ready(function() {
722722
'#sw_hide_horizon',
723723
'#sw_hide_titles',
724724
'#sw_layers_launches',
725-
'#sw_small_icons',
726725
"#sw_nowelcome",
727726
"#sw_interpolate",
728727
];
@@ -809,9 +808,6 @@ $(window).ready(function() {
809808
hideHorizonRings();
810809
}
811810
break;
812-
case "opt_small_icons":
813-
updateIconSize(on);
814-
break;
815811
case "opt_hide_titles":
816812
if(on) {
817813
hideTitles();

‎js/tracker.js‎

Lines changed: 23 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -2699,10 +2699,6 @@ function drawLaunchPrediction(vcallsign) {
26992699
}
27002700

27012701
function redrawPrediction(vcallsign) {
2702-
var scale = 1;
2703-
if (offline.get("opt_small_icons")) {
2704-
scale = 0.5;
2705-
}
27062702
var vehicle = vehicles[vcallsign];
27072703
var data = vehicle.prediction.data;
27082704
if(data.warnings || data.errors) return;
@@ -2764,8 +2760,8 @@ function redrawPrediction(vcallsign) {
27642760
image_src = host_url + markers_url + "target-" + balloon_colors_name[vehicle.color_index] + ".png";
27652761
predictionIcon = new L.icon({
27662762
iconUrl: image_src,
2767-
iconSize: [20*scale,20*scale],
2768-
iconAnchor: [10*scale, 10*scale],
2763+
iconSize: [20,20],
2764+
iconAnchor: [10, 10],
27692765
});
27702766
vehicle.prediction_target = new L.Marker(latlng, {
27712767
zIndexOffset: Z_SHADOW,
@@ -2787,8 +2783,8 @@ function redrawPrediction(vcallsign) {
27872783
image_src = host_url + markers_url + "balloon-pop.png";
27882784
burstIcon = new L.icon({
27892785
iconUrl: image_src,
2790-
iconSize: [20*scale,20*scale],
2791-
iconAnchor: [10*scale, 10*scale],
2786+
iconSize: [20,20],
2787+
iconAnchor: [10, 10],
27922788
});
27932789
vehicle.prediction_burst = new L.Marker(latlng_burst, {
27942790
zIndexOffset: Z_SHADOW,
@@ -3267,10 +3263,6 @@ var array_unique = function(inarr) {
32673263

32683264
function addPosition(position) {
32693265
var vcallsign = position.vehicle;
3270-
var scale = 1
3271-
if (offline.get("opt_small_icons")) {
3272-
scale = 0.5;
3273-
}
32743266

32753267
// check if the vehicle is already in the list, if not create a new item
32763268
if(!vehicles.hasOwnProperty(vcallsign)) {
@@ -3291,8 +3283,8 @@ function addPosition(position) {
32913283
vehicle_type = "car";
32923284
color_index = car_index++ % car_colors.length;
32933285
image_src = host_url + markers_url + "car-" + car_colors[color_index] + ".png";
3294-
image_src_size = [55*scale,25*scale];
3295-
image_src_offset = [0*scale,-25*scale];
3286+
image_src_size = [55,25];
3287+
image_src_offset = [0,-25];
32963288

32973289
marker = new L.Marker(point, {
32983290
title: vcallsign,
@@ -3357,13 +3349,13 @@ function addPosition(position) {
33573349

33583350
image_src = host_url + markers_url + "balloon-" +
33593351
((vcallsign == "PIE") ? "rpi" : balloon_colors_name[color_index]) + ".png";
3360-
image_src_size = [46*scale,84*scale];
3361-
image_src_offset = [-35*scale,-46*scale];
3352+
image_src_size = [46,84];
3353+
image_src_offset = [-35,-46];
33623354

33633355
shadowIcon = new L.icon({
33643356
iconUrl: host_url + markers_url + "shadow.png",
3365-
iconSize: [24*scale,16*scale],
3366-
iconAnchor: [12*scale, 8*scale],
3357+
iconSize: [24,16],
3358+
iconAnchor: [12, 8],
33673359
});
33683360

33693361
marker_shadow = new L.Marker(point, {
@@ -3417,9 +3409,9 @@ function addPosition(position) {
34173409

34183410
img = new L.icon ({
34193411
iconUrl: host_url + markers_url + "payload-" + this.balloonColor + ".png",
3420-
iconSize: [17*scale,18*scale],
3421-
iconAnchor: [8*scale,14*scale],
3422-
tooltipAnchor: [0*scale,-20*scale],
3412+
iconSize: [17,18],
3413+
iconAnchor: [8,14],
3414+
tooltipAnchor: [0,-20],
34233415
});
34243416
} else {
34253417
map.addLayer(vehicle.marker.shadow);
@@ -3434,16 +3426,16 @@ function addPosition(position) {
34343426
if(mode == "parachute") {
34353427
img = new L.icon ({
34363428
iconUrl: host_url + markers_url + "parachute-" + this.balloonColor + ".png",
3437-
iconSize: [46*scale,84*scale],
3438-
tooltipAnchor: [0*scale,-98*scale],
3439-
iconAnchor: [23*scale,90*scale],
3429+
iconSize: [46,84],
3430+
tooltipAnchor: [0,-98],
3431+
iconAnchor: [23,90],
34403432
});
34413433
} else {
34423434
img = new L.icon ({
34433435
iconUrl: host_url + markers_url + "balloon-" + this.balloonColor + ".png",
3444-
iconSize: [46*scale,84*scale],
3445-
tooltipAnchor: [0*scale,-98*scale],
3446-
iconAnchor: [23*scale,90*scale],
3436+
iconSize: [46,84],
3437+
tooltipAnchor: [0,-98],
3438+
iconAnchor: [23,90],
34473439
});
34483440
}
34493441
}
@@ -3623,15 +3615,15 @@ function addPosition(position) {
36233615

36243616
nyanIcon = new L.icon ({
36253617
iconUrl: host_url + markers_url + nyan,
3626-
iconSize: [nyanw*scale,39*scale],
3627-
iconAnchor: [26*scale,20*scale],
3628-
tooltipAnchor: [0*scale,-29*scale],
3618+
iconSize: [nyanw,39],
3619+
iconAnchor: [26,20],
3620+
tooltipAnchor: [0,-29],
36293621
});
36303622

36313623
vehicle_info.marker.setIcon(nyanIcon);
36323624

36333625
vehicle_info.image_src = host_url + markers_url + "hab_nyan.gif";
3634-
vehicle_info.image_src_offset = [-34*scale,-70*scale];
3626+
vehicle_info.image_src_offset = [-34,-70];
36353627

36363628
var k;
36373629
for(k in vehicle_info.polyline) {
@@ -5402,39 +5394,6 @@ function showHorizonRings(){
54025394
}
54035395
}
54045396

5405-
function updateIconSize(on) {
5406-
if (on) {
5407-
scale = 0.5;
5408-
} else {
5409-
scale = 2;
5410-
}
5411-
for(var vcallsign in vehicles) {
5412-
var icon = vehicles[vcallsign].marker.options.icon;
5413-
icon.options.iconSize = [icon.options.iconSize[0]*scale, icon.options.iconSize[1]*scale];
5414-
icon.options.iconAnchor = [icon.options.iconAnchor[0]*scale, icon.options.iconAnchor[1]*scale];
5415-
icon.options.tooltipAnchor = [icon.options.tooltipAnchor[0]*scale, icon.options.tooltipAnchor[1]*scale];
5416-
vehicles[vcallsign].marker.setIcon(icon);
5417-
if (vehicles[vcallsign].marker_shadow != null) {
5418-
var shadowIcon = vehicles[vcallsign].marker_shadow.options.icon;
5419-
shadowIcon.options.iconSize = [shadowIcon.options.iconSize[0]*scale, shadowIcon.options.iconSize[1]*scale];
5420-
shadowIcon.options.iconAnchor = [shadowIcon.options.iconAnchor[0]*scale, shadowIcon.options.iconAnchor[1]*scale];
5421-
vehicles[vcallsign].marker_shadow.setIcon(shadowIcon);
5422-
}
5423-
if (vehicles[vcallsign].prediction_burst != null) {
5424-
var burstIcon = vehicles[vcallsign].prediction_burst.options.icon;
5425-
burstIcon.options.iconSize = [burstIcon.options.iconSize[0]*scale, burstIcon.options.iconSize[1]*scale];
5426-
burstIcon.options.iconAnchor = [burstIcon.options.iconAnchor[0]*scale, burstIcon.options.iconAnchor[1]*scale];
5427-
vehicles[vcallsign].prediction_burst.setIcon(burstIcon);
5428-
}
5429-
if (vehicles[vcallsign].prediction_target != null) {
5430-
var targetIcon = vehicles[vcallsign].prediction_target.options.icon;
5431-
targetIcon.options.iconSize = [targetIcon.options.iconSize[0]*scale, targetIcon.options.iconSize[1]*scale];
5432-
targetIcon.options.iconAnchor = [targetIcon.options.iconAnchor[0]*scale, targetIcon.options.iconAnchor[1]*scale];
5433-
vehicles[vcallsign].prediction_target.setIcon(targetIcon);
5434-
}
5435-
}
5436-
}
5437-
54385397
function hideTitles(){
54395398
for(var vcallsign in vehicles) {
54405399
if(vehicles[vcallsign].vehicle_type == "balloon" || vehicles[vcallsign].vehicle_type == "car"){

0 commit comments

Comments
 (0)