diff --git a/public_html/layers.js b/public_html/layers.js index 12b0d8d5..a8629144 100644 --- a/public_html/layers.js +++ b/public_html/layers.js @@ -5,33 +5,9 @@ function createBaseLayers() { var layers = []; - var world = []; var us = []; - // ------------------------------------------------------------ - // AKISSACK - DEFAULT MAPS ------------------- ref: AK2A starts - // ------------------------------------------------------------ - if (ShowAdditionalMaps) { - world.push(new ol.layer.Tile({ - source: new ol.source.OSM({ - "url" : "http://{a-c}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png" - }), - name: 'osm light', - title: 'OpenStreetMap Light', - type: 'base', - })); - } - // ------------------------------------------------------------ - // ---------------------------------------------- ref: AK2A ends - // ------------------------------------------------------------ - - world.push(new ol.layer.Tile({ - source: new ol.source.OSM(), - name: 'osm', - title: 'OpenStreetMap', - type: 'base', - })); // ------------------------------------------------------------ // AKISSACK - additional MAPS ---------------- ref: AK2B starts @@ -89,6 +65,30 @@ function createBaseLayers() { world.push(createMapzenLayer()); } + world.push(new ol.layer.Tile({ + source: new ol.source.OSM(), + name: 'osm', + title: 'OpenStreetMap', + type: 'base', + })); + + // ------------------------------------------------------------ + // AKISSACK - DEFAULT MAPS ------------------- ref: AK2A starts + // ------------------------------------------------------------ + if (ShowAdditionalMaps) { + world.push(new ol.layer.Tile({ + source: new ol.source.OSM({ + "url" : "http://{a-c}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png" + }), + name: 'osm light', + title: 'OpenStreetMap Light', + type: 'base', + })); + } + // ------------------------------------------------------------ + // ---------------------------------------------- ref: AK2A ends + // ------------------------------------------------------------ + // ------------------------------------------------------------ // AKISSACK - US Layers ---------------------- ref: AK3A starts // ------------------------------------------------------------ diff --git a/public_html/script.js b/public_html/script.js index fa1ecf8b..7d2806bc 100644 --- a/public_html/script.js +++ b/public_html/script.js @@ -140,7 +140,6 @@ function processReceiverUpdate(data) { evt.stopPropagation(); return; } - if (!$("#map_container").is(":visible")) { showMap(); } @@ -726,7 +725,7 @@ function initialize_map() { }); var airportLayer = new ol.layer.Vector({ - name: "airways", + name: "airports", type: "overlay", title: "Airports", source: new ol.source.Vector({ @@ -769,13 +768,13 @@ function initialize_map() { title: "UK", layers: [ ukairspaceLayer, - airwaysLayer, + navPointsLayer, airwaysMRCLayer, - airportLayer, - atzLayer, - ukCTALayer, vordmeLayer, - navPointsLayer, + airwaysLayer, + ukCTALayer, + atzLayer, + airportLayer, ], }) ); @@ -900,7 +899,7 @@ function initialize_map() { layers.push( new ol.layer.Group({ title: "UK Military", - layers: [matzLayer, matzafLayer, dangerLayer, ukmilLayer, AARLayer], + layers: [ukmilLayer,AARLayer,dangerLayer,matzLayer,matzafLayer], }) ); } @@ -1016,6 +1015,7 @@ function initialize_map() { features: StaticFeatures, }), }), + new ol.layer.Vector({ name: "ac_trail", type: "overlay", @@ -1024,12 +1024,13 @@ function initialize_map() { features: PlaneTrailFeatures, }), }), + SleafordRangeLayer, // Ref: AK8Y + iconsLayer, rangeLayer, - maxRangeLayer, // Ref: AK8D - midRangeLayer, // Ref: AK8D minRangeLayer, // Ref: AK8D - SleafordRangeLayer, // Ref: AK8Y - iconsLayer + midRangeLayer, // Ref: AK8D + maxRangeLayer, // Ref: AK8D + ], }) ); @@ -1900,8 +1901,7 @@ function refreshSelected() { var emerg = document.getElementById("selected_emergency"); if (selected.squawk in SpecialSquawks) { emerg.className = SpecialSquawks[selected.squawk].cssClass; - emerg.textContent = - NBSP + "Squawking: " + SpecialSquawks[selected.squawk].text + NBSP; + emerg.textContent = NBSP + "Squawking: " + SpecialSquawks[selected.squawk].text + NBSP; } else { emerg.className = "hidden"; } @@ -2532,6 +2532,7 @@ function selectAllPlanes() { // AKISSACK --------------- Ref: AK9G function selectMilPlanes() { // if mil planes are already selected, deselect them all + //console.log("mil "+SelectedMilPlanes); if (SelectedMilPlanes) { deselectMilPlanes(); } else { @@ -2605,6 +2606,7 @@ function deselectAllPlanes() { } SelectedPlane = null; SelectedAllPlanes = false; + deselectMilPlanes(); refreshSelected(); } @@ -2799,7 +2801,7 @@ function setColumnVisibility() { showColumn(infoTable, "#msgs", !mapIsVisible); showColumn(infoTable, "#seen", !mapIsVisible); showColumn(infoTable, "#vert_rate", !mapIsVisible); - showColumn(infoTable, "#rssi", !mapIsVisible); + showColumn(infoTable, "#rssi", !mapIsVisible); showColumn(infoTable, "#lat", !mapIsVisible); showColumn(infoTable, "#lon", !mapIsVisible); showColumn(infoTable, "#data_source", !mapIsVisible);