nakarte

commit f5abd26484a2f8e14900dc05ec5b0bbbf4f827b5
parent 6cd761ead034277cea3a6d42a9a094fbf93f8f6e
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Sat, 14 Jul 2018 18:25:19 +0300

[custom layers] fixed custom layers order for base layers and bottom overlays  #95

Diffstat:
M
src/layers.js
 | 
11
+++++++++--
M
src/lib/leaflet.control.layers.configure/index.js
 | 
2
+-

2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/layers.js b/src/layers.js
@@ -1057,6 +1057,7 @@ export default function getLayers() {
         'Norway UT map',
 
         // map overlays
+        '#custom-bottom',
         'Norway roads',
         'Eurasia 25km',
         'Topo 10km',
@@ -1078,9 +1079,9 @@ export default function getLayers() {
         'Slazav map',
         'Races',
         'O-sport',
+        '#custom-top',
 
         // line overlays
-        '#custom',
         'Waymarked Hiking Trails',
         'Waymarked Cycling Trails',
         'Norway summer trails',
@@ -1212,6 +1213,12 @@ export default function getLayers() {
         }
     }
 
-    return {layers: grouppedLayers, customLayersOrder: orderByTitle['#custom']};
+    return {
+        layers: grouppedLayers,
+        customLayersOrder: {
+            top: orderByTitle['#custom-top'],
+            bottom: orderByTitle['#custom-bottom'],
+
+        }};
 }
 
diff --git a/src/lib/leaflet.control.layers.configure/index.js b/src/lib/leaflet.control.layers.configure/index.js
@@ -400,7 +400,7 @@ function enableConfig(control, {layers, customLayersOrder}) {
                     isCustom: true,
                     serialized: serialized,
                     layer: tileLayer,
-                    order: (fieldValues.isTop ? customLayersOrder : -1),
+                    order: (fieldValues.isOverlay && fieldValues.isTop) ? customLayersOrder.top : customLayersOrder.bottom,
                     fieldValues: fieldValues,
                     enabled: true,
                     checked: ko.observable(true)