From d2007930ef96ed6c2ce71ed4697d0a4dfb400765 Mon Sep 17 00:00:00 2001 From: Bruce Schubert Date: Sun, 25 Feb 2018 04:20:45 -0800 Subject: [PATCH] Added EOX Sentinal2 with labels to LayerManager. - Changed sort order to sort new layers to the top. - Re: #75 --- root/js/model/globe/LayerManager.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/root/js/model/globe/LayerManager.js b/root/js/model/globe/LayerManager.js index 8f5899c1..4927acde 100644 --- a/root/js/model/globe/LayerManager.js +++ b/root/js/model/globe/LayerManager.js @@ -28,6 +28,7 @@ define([ 'worldwind', 'model/globe/layers/EoxOpenStreetMapLayer', 'model/globe/layers/EoxSentinal2CloudlessLayer', + 'model/globe/layers/EoxSentinal2WithLabelsLayer', 'model/globe/layers/UsgsContoursLayer', 'model/globe/layers/UsgsImageryTopoBaseMapLayer', 'model/globe/layers/UsgsTopoBaseMapLayer', @@ -43,6 +44,7 @@ define([ ww, EoxOpenStreetMapLayer, EoxSentinal2CloudlessLayer, + EoxSentinal2WithLabelsLayer, UsgsContoursLayer, UsgsImageryTopoBaseMapLayer, UsgsTopoBaseMapLayer, @@ -141,6 +143,7 @@ define([ this.addBaseLayer(new WorldWind.BMNGLandsatLayer(), {enabled: false, detailControl: config.imagerydetailControl}); this.addBaseLayer(new WorldWind.BingAerialWithLabelsLayer(null), {enabled: false, detailControl: config.imagerydetailControl}); this.addBaseLayer(new EoxSentinal2CloudlessLayer(), {enabled: false, detailControl: config.imagerydetailControl}); + this.addBaseLayer(new EoxSentinal2WithLabelsLayer(), {enabled: false, detailControl: config.imagerydetailControl}); this.addBaseLayer(new UsgsImageryTopoBaseMapLayer(), {enabled: false, detailControl: config.imagerydetailControl}); this.addBaseLayer(new UsgsTopoBaseMapLayer(), {enabled: false, detailControl: config.imagerydetailControl}); this.addBaseLayer(new WorldWind.BingRoadsLayer(null), {enabled: false, opacity: 0.7, detailControl: config.imagerydetailControl}); @@ -548,11 +551,11 @@ define([ if (a.order && !isNaN(a.order()) && b.order && !isNaN(b.order())) { return a.order() - b.order(); } else if (a.order && !isNaN(a.order())) { - return -1; - } else if (b.order && !isNaN(b.order())) { return 1; + } else if (b.order && !isNaN(b.order())) { + return -1; } else { - return 0; + return 0; //return a.name().localeCompare(b.name()); } };