@geospatial-sdk/openlayers 0.0.5-dev.20 → 0.0.5-dev.22

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

@@ -1 +1 @@
-{"version":3,"file":"apply-context-diff.d.ts","sourceRoot":"","sources":["../../lib/map/apply-context-diff.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,QAAQ,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAQtD;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,GAAG,CAAC,CAwFd"}
+{"version":3,"file":"apply-context-diff.d.ts","sourceRoot":"","sources":["../../lib/map/apply-context-diff.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,QAAQ,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAQtD;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,GAAG,CAAC,CA2Fd"}

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

@@ -63,8 +63,14 @@ export function applyContextDiffToMap(map, contextDiff) {
                 map.setView(createView(viewChanges, map));
                 return map;
             }
+            if (viewChanges.maxZoom) {
+                view.setMaxZoom(viewChanges.maxZoom);
+            }
             if ("geometry" in viewChanges) {
-                const geom = GEOJSON.readGeometry(viewChanges.geometry);
+                const geom = GEOJSON.readGeometry(viewChanges.geometry, {
+                    dataProjection: "EPSG:4326",
+                    featureProjection: projection,
+                });
                 view.fit(geom, {
                     size: map.getSize(),
                 });
@@ -81,9 +87,6 @@ export function applyContextDiffToMap(map, contextDiff) {
                     : [0, 0];
                 view.setCenter(center);
                 view.setZoom(zoom);
-                if (viewChanges.maxZoom) {
-                    view.setMaxZoom(viewChanges.maxZoom);
-                }
                 // TODO: factorize this better
                 // if (viewChanges.maxExtent) {
                 //   map.setView(new View({

package/dist/map/create-map.d.ts

@@ -2,6 +2,7 @@ import { MapContext, MapContextLayer, MapContextView } from "@geospatial-sdk/cor
 import Map from "ol/Map";
 import View from "ol/View";
 import Layer from "ol/layer/Layer";
+import "ol/ol.css";
 export declare function createLayer(layerModel: MapContextLayer): Promise<Layer>;
 export declare function createView(viewModel: MapContextView | null, map: Map): View;
 /**

package/dist/map/create-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-map.d.ts","sourceRoot":"","sources":["../../lib/map/create-map.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EACf,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,GAAG,MAAM,QAAQ,CAAC;AACzB,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,KAAK,MAAM,gBAAgB,CAAC;AA4BnC,wBAAsB,WAAW,CAAC,UAAU,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAuL7E;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CA+B3E;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,UAAU,EACnB,MAAM,CAAC,EAAE,MAAM,GAAG,WAAW,GAC5B,OAAO,CAAC,GAAG,CAAC,CAKd;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,GAAG,CAAC,CAQd"}
+{"version":3,"file":"create-map.d.ts","sourceRoot":"","sources":["../../lib/map/create-map.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EACf,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,GAAG,MAAM,QAAQ,CAAC;AACzB,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,KAAK,MAAM,gBAAgB,CAAC;AAwBnC,OAAO,WAAW,CAAC;AAKnB,wBAAsB,WAAW,CAAC,UAAU,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAuL7E;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CA+B3E;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,UAAU,EACnB,MAAM,CAAC,EAAE,MAAM,GAAG,WAAW,GAC5B,OAAO,CAAC,GAAG,CAAC,CAKd;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,GAAG,CAAC,CAQd"}

package/dist/map/create-map.js

@@ -26,6 +26,7 @@ import WMTS from "ol/source/WMTS";
 import MVT from "ol/format/MVT";
 import { OgcApiEndpoint, WfsEndpoint, WmtsEndpoint, } from "@camptocamp/ogc-client";
 import { MapboxVectorLayer } from "ol-mapbox-style";
+import "ol/ol.css";
 const GEOJSON = new GeoJSON();
 const WFS_MAX_FEATURES = 10000;
 export function createLayer(layerModel) {

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

@@ -229,11 +229,7 @@ describe("applyContextDiffToMap", () => {
   describe("view change", () => {
     describe("set to default view", () => {
       beforeEach(async () => {
-        context = {
-          ...SAMPLE_CONTEXT,
-          layers: [SAMPLE_LAYER1, SAMPLE_LAYER2, SAMPLE_LAYER3],
-        };
-        map = await createMapFromContext(context);
+        map = await createMapFromContext(SAMPLE_CONTEXT);
         diff = {
           layersAdded: [],
           layersChanged: [],
@@ -250,39 +246,56 @@ describe("applyContextDiffToMap", () => {
       });
     });
 
-    describe("four layers reordered", () => {
+    describe("set to view with extent", () => {
       beforeEach(async () => {
-        context = {
-          ...SAMPLE_CONTEXT,
-          layers: [SAMPLE_LAYER1, SAMPLE_LAYER3, SAMPLE_LAYER4, SAMPLE_LAYER2],
+        map = await createMapFromContext(SAMPLE_CONTEXT);
+        diff = {
+          layersAdded: [],
+          layersChanged: [],
+          layersRemoved: [],
+          layersReordered: [],
+          viewChanges: {
+            extent: [-10, -10, 20, 20],
+          },
         };
-        map = await createMapFromContext(context);
+        applyContextDiffToMap(map, diff);
+      });
+      it("set the view to the given extent, transformed to the view projection", () => {
+        const view = map.getView();
+        expect(view.getCenter()).toEqual([
+          556597.4539663679, 577070.4760648644,
+        ]);
+        expect(view.getZoom()).toEqual(2);
+      });
+    });
+
+    describe("set to view with geometry", () => {
+      beforeEach(async () => {
+        map = await createMapFromContext(SAMPLE_CONTEXT);
         diff = {
           layersAdded: [],
           layersChanged: [],
           layersRemoved: [],
-          layersReordered: [
-            {
-              layer: SAMPLE_LAYER4,
-              newPosition: 0,
-              previousPosition: 2,
-            },
-            {
-              layer: SAMPLE_LAYER1,
-              newPosition: 2,
-              previousPosition: 0,
+          layersReordered: [],
+          viewChanges: {
+            geometry: {
+              type: "LineString",
+              coordinates: [
+                [0, 0],
+                [10, 10],
+                [40, 10],
+              ],
             },
-          ],
+          },
         };
         applyContextDiffToMap(map, diff);
-        layersArray = map.getLayers().getArray();
       });
-      it("moves the layers accordingly", () => {
-        expect(layersArray.length).toEqual(4);
-        assertEqualsToModel(layersArray[0], SAMPLE_LAYER4);
-        assertEqualsToModel(layersArray[1], SAMPLE_LAYER3);
-        assertEqualsToModel(layersArray[2], SAMPLE_LAYER1);
-        assertEqualsToModel(layersArray[3], SAMPLE_LAYER2);
+      it("set the view to the given extent, transformed to the view projection", () => {
+        const view = map.getView();
+        expect(view.getCenter()).toEqual([
+          2226389.8158654715, 559444.9874289795,
+        ]);
+        expect(view.getZoom()).toEqual(1);
       });
     });
   });

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

@@ -74,8 +74,14 @@ export async function applyContextDiffToMap(
       map.setView(createView(viewChanges, map));
       return map;
     }
+    if (viewChanges.maxZoom) {
+      view.setMaxZoom(viewChanges.maxZoom);
+    }
     if ("geometry" in viewChanges) {
-      const geom = GEOJSON.readGeometry(viewChanges.geometry);
+      const geom = GEOJSON.readGeometry(viewChanges.geometry, {
+        dataProjection: "EPSG:4326",
+        featureProjection: projection,
+      });
       view.fit(geom as SimpleGeometry, {
         size: map.getSize(),
       });
@@ -90,9 +96,6 @@ export async function applyContextDiffToMap(
         : [0, 0];
       view.setCenter(center);
       view.setZoom(zoom);
-      if (viewChanges.maxZoom) {
-        view.setMaxZoom(viewChanges.maxZoom);
-      }
       // TODO: factorize this better
       // if (viewChanges.maxExtent) {
       //   map.setView(new View({

package/lib/map/create-map.ts

@@ -30,6 +30,7 @@ import {
   WmtsEndpoint,
 } from "@camptocamp/ogc-client";
 import { MapboxVectorLayer } from "ol-mapbox-style";
+import "ol/ol.css";
 
 const GEOJSON = new GeoJSON();
 const WFS_MAX_FEATURES = 10000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geospatial-sdk/openlayers",
-  "version": "0.0.5-dev.20+87e3bcf",
+  "version": "0.0.5-dev.22+e299e56",
   "description": "OpenLayers-related utilities",
   "keywords": [
     "ol",
@@ -37,10 +37,10 @@
     "ol": ">6.x"
   },
   "dependencies": {
-    "@geospatial-sdk/core": "^0.0.5-dev.20+87e3bcf",
+    "@geospatial-sdk/core": "^0.0.5-dev.22+e299e56",
     "chroma-js": "^2.4.2",
     "lodash.throttle": "^4.1.1",
     "ol-mapbox-style": "^12.3.5"
   },
-  "gitHead": "87e3bcfa08f4efbcd7ca4991d829bc165aa104db"
+  "gitHead": "e299e562a3b36fafdf548d2014dcb7319a641241"
 }