map-ol-utils 0.0.12 → 0.0.14

package/dist/index.cjs

@@ -206,9 +206,8 @@ var resetActiveMarker = () => {
     }
   });
 };
-var activeMarkerByUid = (uid, setFitView = true) => {
+var activeMarkerByUid = (uid) => {
   var _a;
-  console.log(setFitView);
   const massMarksLayers = instance.getLayers().getArray().filter((layer) => layer.get("_isMassMarksLayer"));
   if (massMarksLayers.length) {
     const targetLayer = massMarksLayers.find(
@@ -302,8 +301,18 @@ var createSelectByLayer = (vectorLayer) => {
       vectorLayer.set("_hasActive", true);
       if (vectorLayer.get("_isDynamic")) {
         const activeImage = activeStyle.getImage();
-        emitter_default.emit("dynamic-marker", Object.assign({}, data.rawData || {}, { lnglat: data.lnglat, style: data.style, width: activeImage.getWidth(), height: activeImage.getHeight() }));
+        emitter_default.emit(
+          "dynamic-marker",
+          Object.assign({}, data.rawData || {}, {
+            lnglat: data.lnglat,
+            style: data.style,
+            width: activeImage.getWidth(),
+            height: activeImage.getHeight()
+          })
+        );
       }
+      const view = instance.getView();
+      view.animate({ zoom: 12, center: [+data.lnglat[0], +data.lnglat[1]], duration: 1e3 });
     }
     if (deselected.length) {
       const feature = deselected[0];
@@ -385,6 +394,7 @@ var addMassMarksLayer = (getImgUrlFn) => {
       instance.addLayer(vectorLayer);
     }
     massMarksLayer.setProperties({
+      _isCustom: true,
       _hasLine: hasLine,
       _hasFace: hasFace,
       _isDynamic: isDynamic
@@ -400,43 +410,47 @@ var updateMarksLayersByStatus = (checkedStatusList = []) => {
 // src/create-map.ts
 var import_interaction2 = require("ol/interaction");
 var instance;
+var mapCenter = [119.71512016971076, 30.122490541963536];
 var createMapInstance = (config = {}) => {
   const innerConfig = Object.assign(
     {
       zoom: 9.4,
       maxZoom: 18,
       minZoom: 9.4,
+      center: mapCenter,
       baseLayer: "vec-layer",
       projection: "EPSG:4326",
       layers: [createBaseLayer()],
       smoothExtentConstraint: false,
-      tk: "c77eddc667c5bed016fded560baf93e7",
-      center: [119.5326450625435, 29.8845606679097]
+      tk: "c77eddc667c5bed016fded560baf93e7"
     },
     config || {}
   );
-  if (!instance) {
-    instance = new import_Map.default({
-      view: new import_View.default(innerConfig),
-      controls: (0, import_control.defaults)({
-        zoom: false,
-        rotate: false,
-        attribution: false
-      }),
-      interactions: (0, import_interaction2.defaults)({
-        doubleClickZoom: false
-      }),
-      layers: innerConfig.layers || [createBaseLayer()]
-    });
-    instance.activeBaseLayer = innerConfig.baseLayer;
-    instance.getLayerByName = getLayerByName;
-    instance.removeLayerByName = removeLayerByName;
-    instance.changeLayersByNames = changeLayersByNames;
-    instance.on("pointermove", (evt) => {
-      instance.getTargetElement().style.cursor = instance.hasFeatureAtPixel(evt.pixel) ? "pointer" : "";
-    });
+  if (instance) {
     return instance;
   }
+  instance = new import_Map.default({
+    view: new import_View.default(innerConfig),
+    controls: (0, import_control.defaults)({
+      zoom: false,
+      rotate: false,
+      attribution: false
+    }),
+    interactions: (0, import_interaction2.defaults)({
+      doubleClickZoom: false
+    }),
+    layers: innerConfig.layers || [createBaseLayer()]
+  });
+  mapCenter = innerConfig.center || mapCenter;
+  instance.activeBaseLayer = innerConfig.baseLayer;
+  instance.getLayerByName = getLayerByName;
+  instance.removeLayerByName = removeLayerByName;
+  instance.changeLayersByNames = changeLayersByNames;
+  instance.on("pointermove", (evt) => {
+    instance.getTargetElement().style.cursor = instance.hasFeatureAtPixel(
+      evt.pixel
+    ) ? "pointer" : "";
+  });
   return instance;
 };
 var disposeMap = () => {
@@ -448,11 +462,17 @@ var disposeMap = () => {
   instance = void 0;
 };
 var getMapInstance = () => instance;
+var resetZoomAndCenter = (center = mapCenter) => {
+  const view = instance.getView();
+  view.animate({
+    zoom: 9.4,
+    center,
+    duration: 1e3
+  });
+};
 var resetMap = () => {
   removeAllLayers();
 };
-var resetZoomAndCenter = () => {
-};
 
 // src/base-layer.ts
 var import_WMTS = __toESM(require("ol/tilegrid/WMTS"), 1);
@@ -480,7 +500,12 @@ var createBaseLayer = (isDark = true) => {
           134089306640625e-20
         ],
         origin: [118.122911693886, 31.2869311022836],
-        extent: [118.340502132662, 29.2073269598186, 120.724787992425, 30.5617943760008]
+        extent: [
+          118.340502132662,
+          29.2073269598186,
+          120.724787992425,
+          30.5617943760008
+        ]
       }),
       projection: "EPSG:4326",
       urls: isDark ? [

package/dist/index.d.cts

@@ -92,8 +92,8 @@ declare let instance: CustomMap;
 declare const createMapInstance: (config?: {}) => CustomMap;
 declare const disposeMap: () => void;
 declare const getMapInstance: () => CustomMap;
+declare const resetZoomAndCenter: (center?: [number, number]) => void;
 declare const resetMap: () => void;
-declare const resetZoomAndCenter: () => void;
 
 declare const createAnimationMarker: (imgUrl: string, data: MassData) => void;
 /**
@@ -125,9 +125,8 @@ declare const resetActiveMarker: () => void;
 /**
  * 激活标注点
  * @param uid
- * @param setFitView
  */
-declare const activeMarkerByUid: (uid: string, setFitView?: boolean) => void;
+declare const activeMarkerByUid: (uid: string) => void;
 /**
  * 构建MassMarks样式数组
  */

package/dist/index.d.ts

@@ -92,8 +92,8 @@ declare let instance: CustomMap;
 declare const createMapInstance: (config?: {}) => CustomMap;
 declare const disposeMap: () => void;
 declare const getMapInstance: () => CustomMap;
+declare const resetZoomAndCenter: (center?: [number, number]) => void;
 declare const resetMap: () => void;
-declare const resetZoomAndCenter: () => void;
 
 declare const createAnimationMarker: (imgUrl: string, data: MassData) => void;
 /**
@@ -125,9 +125,8 @@ declare const resetActiveMarker: () => void;
 /**
  * 激活标注点
  * @param uid
- * @param setFitView
  */
-declare const activeMarkerByUid: (uid: string, setFitView?: boolean) => void;
+declare const activeMarkerByUid: (uid: string) => void;
 /**
  * 构建MassMarks样式数组
  */

package/dist/index.js

@@ -152,9 +152,8 @@ var resetActiveMarker = () => {
     }
   });
 };
-var activeMarkerByUid = (uid, setFitView = true) => {
+var activeMarkerByUid = (uid) => {
   var _a;
-  console.log(setFitView);
   const massMarksLayers = instance.getLayers().getArray().filter((layer) => layer.get("_isMassMarksLayer"));
   if (massMarksLayers.length) {
     const targetLayer = massMarksLayers.find(
@@ -248,8 +247,18 @@ var createSelectByLayer = (vectorLayer) => {
       vectorLayer.set("_hasActive", true);
       if (vectorLayer.get("_isDynamic")) {
         const activeImage = activeStyle.getImage();
-        emitter_default.emit("dynamic-marker", Object.assign({}, data.rawData || {}, { lnglat: data.lnglat, style: data.style, width: activeImage.getWidth(), height: activeImage.getHeight() }));
+        emitter_default.emit(
+          "dynamic-marker",
+          Object.assign({}, data.rawData || {}, {
+            lnglat: data.lnglat,
+            style: data.style,
+            width: activeImage.getWidth(),
+            height: activeImage.getHeight()
+          })
+        );
       }
+      const view = instance.getView();
+      view.animate({ zoom: 12, center: [+data.lnglat[0], +data.lnglat[1]], duration: 1e3 });
     }
     if (deselected.length) {
       const feature = deselected[0];
@@ -331,6 +340,7 @@ var addMassMarksLayer = (getImgUrlFn) => {
       instance.addLayer(vectorLayer);
     }
     massMarksLayer.setProperties({
+      _isCustom: true,
       _hasLine: hasLine,
       _hasFace: hasFace,
       _isDynamic: isDynamic
@@ -346,43 +356,47 @@ var updateMarksLayersByStatus = (checkedStatusList = []) => {
 // src/create-map.ts
 import { defaults as interactionDefaults } from "ol/interaction";
 var instance;
+var mapCenter = [119.71512016971076, 30.122490541963536];
 var createMapInstance = (config = {}) => {
   const innerConfig = Object.assign(
     {
       zoom: 9.4,
       maxZoom: 18,
       minZoom: 9.4,
+      center: mapCenter,
       baseLayer: "vec-layer",
       projection: "EPSG:4326",
       layers: [createBaseLayer()],
       smoothExtentConstraint: false,
-      tk: "c77eddc667c5bed016fded560baf93e7",
-      center: [119.5326450625435, 29.8845606679097]
+      tk: "c77eddc667c5bed016fded560baf93e7"
     },
     config || {}
   );
-  if (!instance) {
-    instance = new Map({
-      view: new View(innerConfig),
-      controls: defaults({
-        zoom: false,
-        rotate: false,
-        attribution: false
-      }),
-      interactions: interactionDefaults({
-        doubleClickZoom: false
-      }),
-      layers: innerConfig.layers || [createBaseLayer()]
-    });
-    instance.activeBaseLayer = innerConfig.baseLayer;
-    instance.getLayerByName = getLayerByName;
-    instance.removeLayerByName = removeLayerByName;
-    instance.changeLayersByNames = changeLayersByNames;
-    instance.on("pointermove", (evt) => {
-      instance.getTargetElement().style.cursor = instance.hasFeatureAtPixel(evt.pixel) ? "pointer" : "";
-    });
+  if (instance) {
     return instance;
   }
+  instance = new Map({
+    view: new View(innerConfig),
+    controls: defaults({
+      zoom: false,
+      rotate: false,
+      attribution: false
+    }),
+    interactions: interactionDefaults({
+      doubleClickZoom: false
+    }),
+    layers: innerConfig.layers || [createBaseLayer()]
+  });
+  mapCenter = innerConfig.center || mapCenter;
+  instance.activeBaseLayer = innerConfig.baseLayer;
+  instance.getLayerByName = getLayerByName;
+  instance.removeLayerByName = removeLayerByName;
+  instance.changeLayersByNames = changeLayersByNames;
+  instance.on("pointermove", (evt) => {
+    instance.getTargetElement().style.cursor = instance.hasFeatureAtPixel(
+      evt.pixel
+    ) ? "pointer" : "";
+  });
   return instance;
 };
 var disposeMap = () => {
@@ -394,11 +408,17 @@ var disposeMap = () => {
   instance = void 0;
 };
 var getMapInstance = () => instance;
+var resetZoomAndCenter = (center = mapCenter) => {
+  const view = instance.getView();
+  view.animate({
+    zoom: 9.4,
+    center,
+    duration: 1e3
+  });
+};
 var resetMap = () => {
   removeAllLayers();
 };
-var resetZoomAndCenter = () => {
-};
 
 // src/base-layer.ts
 import WMTSTileGrid from "ol/tilegrid/WMTS";
@@ -426,7 +446,12 @@ var createBaseLayer = (isDark = true) => {
           134089306640625e-20
         ],
         origin: [118.122911693886, 31.2869311022836],
-        extent: [118.340502132662, 29.2073269598186, 120.724787992425, 30.5617943760008]
+        extent: [
+          118.340502132662,
+          29.2073269598186,
+          120.724787992425,
+          30.5617943760008
+        ]
       }),
       projection: "EPSG:4326",
       urls: isDark ? [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "map-ol-utils",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "type": "module",
   "description": "Openlayers utils library",
   "files": [