@geospatial-sdk/core 0.0.5-dev.47 → 0.0.5-dev.49

package/dist/model/map-context-diff.d.ts

@@ -15,6 +15,14 @@ export interface MapContextLayerReordered {
     newPosition: number;
     previousPosition: number;
 }
+/**
+ * Describes a layer that was changed: both states before and after change are included
+ */
+export interface MapContextLayerChanged {
+    layer: MapContextLayer;
+    previousLayer: MapContextLayer;
+    position: number;
+}
 /**
  * Describes a delta between two contexts, in order to be
  * applied to an existing map.
@@ -26,7 +34,7 @@ export interface MapContextLayerReordered {
  * 4. change layers
  */
 export interface MapContextDiff {
-    layersChanged: MapContextLayerPositioned[];
+    layersChanged: MapContextLayerChanged[];
     layersReordered: MapContextLayerReordered[];
     layersRemoved: MapContextLayerPositioned[];
     layersAdded: MapContextLayerPositioned[];

package/dist/model/map-context-diff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-context-diff.d.ts","sourceRoot":"","sources":["../../lib/model/map-context-diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEnE;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,eAAe,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,eAAe,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,yBAAyB,EAAE,CAAC;IAC3C,eAAe,EAAE,wBAAwB,EAAE,CAAC;IAC5C,aAAa,EAAE,yBAAyB,EAAE,CAAC;IAC3C,WAAW,EAAE,yBAAyB,EAAE,CAAC;IACzC,WAAW,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;CACrC"}
+{"version":3,"file":"map-context-diff.d.ts","sourceRoot":"","sources":["../../lib/model/map-context-diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEnE;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,eAAe,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,eAAe,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,eAAe,CAAC;IACvB,aAAa,EAAE,eAAe,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,sBAAsB,EAAE,CAAC;IACxC,eAAe,EAAE,wBAAwB,EAAE,CAAC;IAC5C,aAAa,EAAE,yBAAyB,EAAE,CAAC;IAC3C,WAAW,EAAE,yBAAyB,EAAE,CAAC;IACzC,WAAW,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;CACrC"}

package/dist/utils/map-context-diff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-context-diff.d.ts","sourceRoot":"","sources":["../../lib/utils/map-context-diff.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,cAAc,EAIf,MAAM,mBAAmB,CAAC;AAG3B;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,UAAU,EACvB,eAAe,EAAE,UAAU,GAC1B,cAAc,CA0EhB"}
+{"version":3,"file":"map-context-diff.d.ts","sourceRoot":"","sources":["../../lib/utils/map-context-diff.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,cAAc,EAKf,MAAM,mBAAmB,CAAC;AAG3B;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,UAAU,EACvB,eAAe,EAAE,UAAU,GAC1B,cAAc,CA0EhB"}

package/dist/utils/map-context-diff.js

@@ -50,7 +50,7 @@ export function computeMapContextDiff(nextContext, previousContext) {
         else {
             const prevLayer = previousContext.layers[prevPosition];
             if (!isLayerSameAndUnchanged(layer, prevLayer)) {
-                layersChanged.push({ layer, position: i });
+                layersChanged.push({ layer, previousLayer: prevLayer, position: i });
             }
         }
     }

package/dist/utils/map-context-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-context-layer.d.ts","sourceRoot":"","sources":["../../lib/utils/map-context-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,wBAAgB,YAAY,CAC1B,KAAK,EAAE,eAAe,EACtB,aAAa,UAAQ,GACpB,MAAM,CAER;AAED,wBAAgB,WAAW,CACzB,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,GACtB,OAAO,CAKT;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,GACtB,OAAO,CAST;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAChC,eAAe,CAkBjB"}
+{"version":3,"file":"map-context-layer.d.ts","sourceRoot":"","sources":["../../lib/utils/map-context-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,wBAAgB,YAAY,CAC1B,KAAK,EAAE,eAAe,EACtB,aAAa,UAAQ,GACpB,MAAM,CAER;AAED,wBAAgB,WAAW,CACzB,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,GACtB,OAAO,CAKT;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,GACtB,OAAO,CAST;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAChC,eAAe,CAqBjB"}

package/dist/utils/map-context-layer.js

@@ -28,9 +28,11 @@ export function updateLayer(layer, updates) {
         ...layer,
         ...updates,
     };
+    const versionExplicitlyUpdated = "version" in updates && updates.version !== undefined;
     if ("id" in updatedLayer &&
         "version" in updatedLayer &&
-        typeof updatedLayer.version === "number") {
+        typeof updatedLayer.version === "number" &&
+        !versionExplicitlyUpdated) {
         updatedLayer.version = updatedLayer.version + 1;
     }
     for (const key in updatedLayer) {

package/dist/utils/map-context.d.ts

@@ -27,11 +27,14 @@ export declare function removeLayerFromContext(context: MapContext, layerModel:
  */
 export declare function replaceLayerInContext(context: MapContext, layerModel: MapContextLayer, replacement: MapContextLayer): MapContext;
 /**
- * Replaces a layer in the context with a new layer.
+ * Updates an existing layer in the context by applying partial changes.
+ *
+ * Note: setting a property to `undefined` in the partial layer updates will remove that
+ * property from the existing layer.
  *
  * @param context The current map context.
- * @param layerModel The layer to be replaced.
- * @param layerUpdates The new layer that will replace the old one.
+ * @param layerModel The layer to be updated.
+ * @param layerUpdates A partial layer object containing the properties to update on the existing layer.
  * @returns The new map context with the updated layer.
  */
 export declare function updateLayerInContext(context: MapContext, layerModel: MapContextLayer, layerUpdates: Partial<MapContextLayer>): MapContext;

package/dist/utils/map-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-context.d.ts","sourceRoot":"","sources":["../../lib/utils/map-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGhE,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,eAAe,GAC1B,MAAM,CAER;AAED;;;;;;;GAOG;AAEH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,eAAe,EAC3B,QAAQ,CAAC,EAAE,MAAM,GAChB,UAAU,CAQZ;AAED;;;;;;GAMG;AAEH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,eAAe,GAC1B,UAAU,CAOZ;AAED;;;;;;;GAOG;AAEH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,eAAe,EAC3B,WAAW,EAAE,eAAe,GAC3B,UAAU,CAOZ;AAED;;;;;;;GAOG;AAEH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,eAAe,EAC3B,YAAY,EAAE,OAAO,CAAC,eAAe,CAAC,GACrC,UAAU,CAUZ;AAED;;;;;;;GAOG;AAEH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,eAAe,EAC3B,QAAQ,EAAE,MAAM,GACf,UAAU,CAGZ"}
+{"version":3,"file":"map-context.d.ts","sourceRoot":"","sources":["../../lib/utils/map-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGhE,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,eAAe,GAC1B,MAAM,CAER;AAED;;;;;;;GAOG;AAEH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,eAAe,EAC3B,QAAQ,CAAC,EAAE,MAAM,GAChB,UAAU,CAQZ;AAED;;;;;;GAMG;AAEH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,eAAe,GAC1B,UAAU,CAOZ;AAED;;;;;;;GAOG;AAEH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,eAAe,EAC3B,WAAW,EAAE,eAAe,GAC3B,UAAU,CAOZ;AAED;;;;;;;;;;GAUG;AAEH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,eAAe,EAC3B,YAAY,EAAE,OAAO,CAAC,eAAe,CAAC,GACrC,UAAU,CAUZ;AAED;;;;;;;GAOG;AAEH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,eAAe,EAC3B,QAAQ,EAAE,MAAM,GACf,UAAU,CAGZ"}

package/dist/utils/map-context.js

@@ -52,17 +52,20 @@ export function replaceLayerInContext(context, layerModel, replacement) {
     return newContext;
 }
 /**
- * Replaces a layer in the context with a new layer.
+ * Updates an existing layer in the context by applying partial changes.
+ *
+ * Note: setting a property to `undefined` in the partial layer updates will remove that
+ * property from the existing layer.
  *
  * @param context The current map context.
- * @param layerModel The layer to be replaced.
- * @param layerUpdates The new layer that will replace the old one.
+ * @param layerModel The layer to be updated.
+ * @param layerUpdates A partial layer object containing the properties to update on the existing layer.
  * @returns The new map context with the updated layer.
  */
 export function updateLayerInContext(context, layerModel, layerUpdates) {
     const position = getLayerPosition(context, layerModel);
     if (position >= 0) {
-        const existing = context.layers[getLayerPosition(context, layerModel)];
+        const existing = context.layers[position];
         const updated = updateLayer(existing, layerUpdates);
         return replaceLayerInContext(context, layerModel, updated);
     }

package/lib/model/map-context-diff.ts

@@ -18,6 +18,15 @@ export interface MapContextLayerReordered {
   previousPosition: number;
 }
 
+/**
+ * Describes a layer that was changed: both states before and after change are included
+ */
+export interface MapContextLayerChanged {
+  layer: MapContextLayer;
+  previousLayer: MapContextLayer;
+  position: number;
+}
+
 /**
  * Describes a delta between two contexts, in order to be
  * applied to an existing map.
@@ -29,7 +38,7 @@ export interface MapContextLayerReordered {
  * 4. change layers
  */
 export interface MapContextDiff {
-  layersChanged: MapContextLayerPositioned[];
+  layersChanged: MapContextLayerChanged[];
   layersReordered: MapContextLayerReordered[];
   layersRemoved: MapContextLayerPositioned[];
   layersAdded: MapContextLayerPositioned[];

package/lib/utils/map-context-diff.test.ts

@@ -121,10 +121,12 @@ describe("Context diff utils", () => {
           layersChanged: [
             {
               layer: contextNew.layers[0],
+              previousLayer: contextOld.layers[0],
               position: 0,
             },
             {
               layer: contextNew.layers[1],
+              previousLayer: contextOld.layers[1],
               position: 1,
             },
           ],
@@ -356,6 +358,7 @@ describe("Context diff utils", () => {
           layersChanged: [
             {
               layer: changedLayer,
+              previousLayer: SAMPLE_LAYER3,
               position: 1,
             },
           ],

package/lib/utils/map-context-diff.ts

@@ -2,6 +2,7 @@ import {
   MapContext,
   MapContextDiff,
   MapContextLayer,
+  MapContextLayerChanged,
   MapContextLayerPositioned,
   MapContextLayerReordered,
 } from "../model/index.js";
@@ -42,7 +43,7 @@ export function computeMapContextDiff(
     return -1;
   }
 
-  const layersChanged: MapContextLayerPositioned[] = [];
+  const layersChanged: MapContextLayerChanged[] = [];
   const layersReordered: MapContextLayerReordered[] = [];
   const layersRemoved: MapContextLayerPositioned[] = [];
   const layersAdded: MapContextLayerPositioned[] = [];
@@ -66,7 +67,7 @@ export function computeMapContextDiff(
     } else {
       const prevLayer = previousContext.layers[prevPosition];
       if (!isLayerSameAndUnchanged(layer, prevLayer)) {
-        layersChanged.push({ layer, position: i });
+        layersChanged.push({ layer, previousLayer: prevLayer, position: i });
       }
     }
   }

package/lib/utils/map-context-layer.test.ts

@@ -347,5 +347,11 @@ describe("Map context layer utils", () => {
       const updated = updateLayer(layer, { opacity: 0.6 });
       expect(updated).not.toHaveProperty("version");
     });
+
+    it("does not change the version if it is explicitly specified in the partial changes", () => {
+      const layer = { ...SAMPLE_LAYER1, id: "123", version: 3 };
+      const updated = updateLayer(layer, { opacity: 0.6, version: 12 });
+      expect(updated.version).toBe(12);
+    });
   });
 });

package/lib/utils/map-context-layer.ts

@@ -47,10 +47,13 @@ export function updateLayer(
     ...layer,
     ...updates,
   } as MapContextLayer;
+  const versionExplicitlyUpdated =
+    "version" in updates && updates.version !== undefined;
   if (
     "id" in updatedLayer &&
     "version" in updatedLayer &&
-    typeof updatedLayer.version === "number"
+    typeof updatedLayer.version === "number" &&
+    !versionExplicitlyUpdated
   ) {
     updatedLayer.version = updatedLayer.version + 1;
   }

package/lib/utils/map-context.ts

@@ -74,11 +74,14 @@ export function replaceLayerInContext(
 }
 
 /**
- * Replaces a layer in the context with a new layer.
+ * Updates an existing layer in the context by applying partial changes.
+ *
+ * Note: setting a property to `undefined` in the partial layer updates will remove that
+ * property from the existing layer.
  *
  * @param context The current map context.
- * @param layerModel The layer to be replaced.
- * @param layerUpdates The new layer that will replace the old one.
+ * @param layerModel The layer to be updated.
+ * @param layerUpdates A partial layer object containing the properties to update on the existing layer.
  * @returns The new map context with the updated layer.
  */
 
@@ -89,7 +92,7 @@ export function updateLayerInContext(
 ): MapContext {
   const position = getLayerPosition(context, layerModel);
   if (position >= 0) {
-    const existing = context.layers[getLayerPosition(context, layerModel)];
+    const existing = context.layers[position];
     const updated = updateLayer(existing, layerUpdates);
     return replaceLayerInContext(context, layerModel, updated);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geospatial-sdk/core",
-  "version": "0.0.5-dev.47+37669e8",
+  "version": "0.0.5-dev.49+67854c5",
   "description": "Core functions and models for the SDK",
   "author": "Olivia <olivia.guyot@camptocamp.com>",
   "homepage": "",
@@ -22,7 +22,7 @@
     "test": "vitest",
     "build": "tsc"
   },
-  "gitHead": "37669e815765d751c4795a67e671ae19e3bf5a92",
+  "gitHead": "67854c5bbe5b473e1a8160f5e8e56fe162e1d427",
   "dependencies": {
     "proj4": "^2.9.2"
   },