@provoly/dashboard 0.15.12 → 0.15.13

package/fesm2022/provoly-dashboard-widgets-widget-map.mjs

@@ -864,40 +864,51 @@ const geometryForLayer = (layer) => {
             return FieldType.POINT;
     }
 };
-const getLayerOrder = (layer, index, array) => {
-    if (layer.order && array[index - 1] && array[index - 1].order && layer.order < array[index - 1].order)
-        return array[index - 1].order + 1;
-    if (layer.order)
-        return layer.order;
-    if (index === 0 && !layer.order)
-        return 0;
-    let [distanceToFirstPreviousOrder, distanceToFirstNextOrder] = [
-        array
-            .slice(0, index + 1)
-            .reverse()
-            .findIndex((element) => !!element.order),
-        array.slice(index + 1).findIndex((element) => !!element.order)
-    ];
-    let [previousOrderIndex, nextOrderIndex] = [
-        distanceToFirstPreviousOrder > -1 ? index - distanceToFirstPreviousOrder : 0,
-        distanceToFirstNextOrder + index + 1
-    ];
-    let [previousOrder, nextOrder] = [
-        distanceToFirstPreviousOrder > -1 ? array[previousOrderIndex].order : 0,
-        distanceToFirstNextOrder > -1 ? array[nextOrderIndex].order : -1
-    ];
-    if (nextOrder > 0 && nextOrder < previousOrder) {
-        const newOrder = previousOrder + (nextOrderIndex - previousOrderIndex);
-        console.warn(`the order property of layer no ${index + 2} was preset but doesn't follow the order of the other layers`);
-        nextOrder = newOrder;
-    }
-    if (nextOrder > 0) {
-        let relativeIndex = index - previousOrderIndex;
-        return previousOrder + ((nextOrder - previousOrder) / (nextOrderIndex - previousOrderIndex)) * relativeIndex;
-    }
-    else {
-        return previousOrder + distanceToFirstPreviousOrder;
-    }
+const assignLayersOrder = (_layers) => {
+    const layers = JSON.parse(JSON.stringify(_layers));
+    layers.sort((l1, l2) => (l2.background ? 0 : 1) - (l1.background ? 0 : 1));
+    // Assign sure things
+    layers.forEach((layer, index) => {
+        if (layer.background) {
+            layer.order = BACKGROUND_ORDER;
+        }
+        if (index === 0 && !layer.order) {
+            layer.order = 0;
+        }
+    });
+    layers.forEach((layer, index) => {
+        if (layer.order === undefined) {
+            let [distanceToFirstPreviousOrder, distanceToFirstNextOrder] = [
+                layers
+                    .slice(0, index)
+                    .reverse()
+                    .findIndex((element) => element.order !== undefined) + 1,
+                layers.slice(index + 1).findIndex((element) => element.order !== undefined)
+            ];
+            let [previousOrderIndex, nextOrderIndex] = [
+                distanceToFirstPreviousOrder > -1 ? index - distanceToFirstPreviousOrder : 0,
+                distanceToFirstNextOrder + index + 1
+            ];
+            let [previousOrder, nextOrder] = [
+                distanceToFirstPreviousOrder > -1 ? layers[previousOrderIndex].order : 0,
+                distanceToFirstNextOrder > -1 ? layers[nextOrderIndex].order : -1
+            ];
+            if (nextOrder > 0 && nextOrder < previousOrder) {
+                const newOrder = previousOrder + (nextOrderIndex - previousOrderIndex);
+                console.warn(`the order property of layer no ${index + 2} was preset but doesn't follow the order of the other layers`);
+                nextOrder = newOrder;
+            }
+            if (nextOrder > 0) {
+                let relativeIndex = index - previousOrderIndex;
+                layer.order =
+                    previousOrder + ((nextOrder - previousOrder) / (nextOrderIndex - previousOrderIndex)) * relativeIndex;
+            }
+            else {
+                layer.order = previousOrder + distanceToFirstPreviousOrder;
+            }
+        }
+    });
+    return layers.sort((l1, l2) => (l1.order ?? 1) - (l2.order ?? 1));
 };
 const DEFAULT_HEATMAP_RADIUS = 25;
 const DEFAULT_RADIUS_INTENSITY_FACTOR = 10000;
@@ -905,6 +916,7 @@ const DEFAULT_ZOOM_MIN = 3;
 const DEFAULT_ZOOM_START = 10;
 const DEFAULT_ZOOM_MAX = 18;
 const DEFAULT_MAP_CENTER = [2.2827217347381525, 48.864706031557716];
+const BACKGROUND_ORDER = 9999;
 
 class XMLUtils {
     static find(childs, name) {
@@ -1210,10 +1222,7 @@ class WidgetMapComponent extends DataWidgetComponent {
                 autoOptions.tooltipMode = TooltipMode.CLICK;
             }
             autoOptions.layers = [
-                ...(autoOptions.layers ?? [])
-                    .sort((l1, l2) => l1.order - l2.order)
-                    .map((layer, i, array) => (autoOptions.layers[i] = { ...layer, order: getLayerOrder(layer, i, array) }))
-                    .filter((layer) => layer.type !== 'auto'),
+                ...(autoOptions.layers ?? []).filter((layer) => layer.type !== 'auto'),
                 ...(autoOptions.automaticLayers
                     ? autoDatasetLayers
                         .filter((layer) => !autoOptions.ignoreAutoLayer ||
@@ -1248,9 +1257,7 @@ class WidgetMapComponent extends DataWidgetComponent {
                         : { ...layer };
                 }),
                 ...geoLayers.filter((layer) => !actualLayerKeys.includes(layer.key))
-            ]
-                .filter((layer) => !!layer)
-                .sort((l1, l2) => l1.order - l2.order);
+            ].filter((layer) => !!layer);
             autoOptions.layers.forEach((layer) => {
                 this.setDefaultLayerTitle(layer, capabilities);
             });
@@ -1272,6 +1279,7 @@ class WidgetMapComponent extends DataWidgetComponent {
                     this.emitManifest();
                 }
             }
+            autoOptions.layers = assignLayersOrder(autoOptions.layers);
             return autoOptions;
         }), distinctUntilChanged((p, c) => equal(p, c)));
         this.subscriptions.add(this.options$.pipe(filter((opt) => !!opt)).subscribe((options) => {
@@ -1453,21 +1461,26 @@ class WidgetMapComponent extends DataWidgetComponent {
         })
             .pipe(map((extentResponse) => {
             const projBox = get(field.crs ?? DEFAULT_PROJECTION);
-            if (projBox && extentResponse.values.length > 0) {
+            const response = extentResponse.values;
+            if (projBox &&
+                response.length > 0 &&
+                response[0].value &&
+                response[0].value.top_left &&
+                response[0].value.top_left.lat !== undefined &&
+                response[0].value.top_left.lon !== undefined &&
+                response[0].value.bottom_right &&
+                response[0].value.bottom_right.lat !== undefined &&
+                response[0].value.bottom_right.lon !== undefined) {
                 return {
                     datasource: layer.datasourceId,
                     extent: [
                         transform([
-                            parseFloat(extentResponse.values[0].value
-                                .top_left.lon),
-                            parseFloat(extentResponse.values[0].value
-                                .top_left.lat)
+                            parseFloat(extentResponse.values[0].value.top_left.lon),
+                            parseFloat(extentResponse.values[0].value.top_left.lat)
                         ], projBox, this.map.getView().getProjection()),
                         transform([
-                            parseFloat(extentResponse.values[0].value
-                                .bottom_right.lon),
-                            parseFloat(extentResponse.values[0].value
-                                .bottom_right.lat)
+                            parseFloat(extentResponse.values[0].value.bottom_right.lon),
+                            parseFloat(extentResponse.values[0].value.bottom_right.lat)
                         ], projBox, this.map.getView().getProjection())
                     ]
                 };
@@ -2182,5 +2195,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.6", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { CqlUtils, DEFAULT_HEATMAP_RADIUS, DEFAULT_MAP_CENTER, DEFAULT_RADIUS_INTENSITY_FACTOR, DEFAULT_ZOOM_MAX, DEFAULT_ZOOM_MIN, DEFAULT_ZOOM_START, GeometryFieldsForPipe, InteractionManager, PryWidgetMapCssComponent, SelectionInteraction, TOOLTIP_PADDING, WidgetMapComponent, WidgetMapLayerService, WidgetMapLegendUrlPipe, WidgetMapModule, XMLUtils, exportMapAsImage, geometryForLayer, getCircleFeatureFromItem, getFeatureFromItem, getLayerOrder, getLinkFeature, getMapAsPng, populateIntensityAttribute, populateLocationAttribute };
+export { BACKGROUND_ORDER, CqlUtils, DEFAULT_HEATMAP_RADIUS, DEFAULT_MAP_CENTER, DEFAULT_RADIUS_INTENSITY_FACTOR, DEFAULT_ZOOM_MAX, DEFAULT_ZOOM_MIN, DEFAULT_ZOOM_START, GeometryFieldsForPipe, InteractionManager, PryWidgetMapCssComponent, SelectionInteraction, TOOLTIP_PADDING, WidgetMapComponent, WidgetMapLayerService, WidgetMapLegendUrlPipe, WidgetMapModule, XMLUtils, assignLayersOrder, exportMapAsImage, geometryForLayer, getCircleFeatureFromItem, getFeatureFromItem, getLinkFeature, getMapAsPng, populateIntensityAttribute, populateLocationAttribute };
 //# sourceMappingURL=provoly-dashboard-widgets-widget-map.mjs.map