map-ol-utils 0.0.71 → 0.0.73

package/dist/index.cjs

@@ -75,6 +75,7 @@ __export(index_exports, {
   createAnimationMarker: () => createAnimationMarker,
   createBaseLayer: () => createBaseLayer,
   createBusinessLayer: () => createBusinessLayer,
+  createMap: () => createMap,
   createMapInstance: () => createMapInstance,
   createMapWorldLayer: () => createMapWorldLayer,
   createMassMarksLayer: () => createMassMarksLayer,
@@ -129,6 +130,7 @@ var import_gcoord = __toESM(require("gcoord"), 1);
 var import_Vector = __toESM(require("ol/layer/Vector"), 1);
 var import_Vector2 = __toESM(require("ol/source/Vector"), 1);
 var import_geom = require("ol/geom");
+var import_condition = require("ol/events/condition");
 var import_style = require("ol/style");
 var removeOverlays = (key = "") => {
   if (instance) {
@@ -409,20 +411,20 @@ var createSelectByLayer = (vectorLayer) => {
     style: null,
     multi: false,
     hitTolerance: 10,
-    layers: [vectorLayer]
-    // condition: (evt) => {
-    //   let hasFeature = false
-    //   instance.forEachFeatureAtPixel(
-    //     evt.pixel,
-    //     () => {
-    //       hasFeature = true
-    //     },
-    //     {
-    //       layerFilter: (layer) => layer === vectorLayer
-    //     }
-    //   )
-    //   return singleClick(evt) && hasFeature
-    // }
+    layers: [vectorLayer],
+    condition: (evt) => {
+      let hasFeature = false;
+      instance.forEachFeatureAtPixel(
+        evt.pixel,
+        () => {
+          hasFeature = true;
+        },
+        {
+          layerFilter: (layer) => layer === vectorLayer
+        }
+      );
+      return (0, import_condition.singleClick)(evt) && hasFeature;
+    }
   });
   interaction.on("select", (evt) => {
     const { selected, deselected, mapBrowserEvent } = evt;
@@ -756,6 +758,13 @@ var changeLayersByNames = (activeNames, allLayerNames) => {
 var instance;
 var mapCenter = [119.71512016971076, 30.122490541963536];
 var createMapInstance = (config = {}) => {
+  if (instance) {
+    return instance;
+  }
+  instance = createMap(config);
+  return instance;
+};
+var createMap = (config = {}) => {
   const innerConfig = Object.assign(
     {
       zoom: 9.4,
@@ -771,10 +780,7 @@ var createMapInstance = (config = {}) => {
     },
     config || {}
   );
-  if (instance) {
-    return instance;
-  }
-  instance = new import_Map.default({
+  const instance2 = new import_Map.default({
     view: new import_View.default(innerConfig),
     controls: (0, import_control.defaults)({
       zoom: false,
@@ -789,14 +795,16 @@ var createMapInstance = (config = {}) => {
     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" : "";
+  instance2.activeBaseLayer = innerConfig.baseLayer;
+  instance2.getLayerByName = getLayerByName;
+  instance2.removeLayerByName = removeLayerByName;
+  instance2.changeLayersByNames = changeLayersByNames;
+  instance2.on("pointermove", (evt) => {
+    instance2.getTargetElement().style.cursor = instance2.hasFeatureAtPixel(
+      evt.pixel
+    ) ? "pointer" : "";
   });
-  return instance;
+  return instance2;
 };
 var disposeMap = () => {
   const layers = instance.getAllLayers();
@@ -946,6 +954,7 @@ var createWmtsLayer = (serverUrl) => (config) => __async(null, null, function* (
   createAnimationMarker,
   createBaseLayer,
   createBusinessLayer,
+  createMap,
   createMapInstance,
   createMapWorldLayer,
   createMassMarksLayer,

package/dist/index.d.cts

@@ -117,6 +117,7 @@ declare const removeLayerByName: (name: string) => void;
 
 declare let instance: CustomMap;
 declare const createMapInstance: (config?: {}) => CustomMap;
+declare const createMap: (config?: {}) => CustomMap;
 declare const disposeMap: () => void;
 declare const getMapInstance: () => CustomMap;
 declare const resetZoomAndCenter: (center?: [number, number]) => void;
@@ -207,4 +208,4 @@ declare const updateMarksLayersByStatus: (checkedStatusList?: string[]) => MassD
  */
 declare const createOverlay: (config?: Options) => Overlay;
 
-export { type CustomMap, type GeometryCoordinates, GeometryType, type GetImgUrl, type GetImgUrlFn, type IconConfig, type MassData, type VectorConfig, type WmtsSourceOptions, activeFeatureByUid, addMassMarksLayer, appendFeaturesByLayer, buildMassMarksStyles, createAnimationMarker, createBaseLayer, createBusinessLayer, createMapInstance, createMapWorldLayer, createMassMarksLayer, createOverlay, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getLayersDataList, getMapInstance, instance, removeAllLayers, removeLayerByName, resetActiveFeature, resetActiveVector, resetMap, resetZoomAndCenter, setFitViewByGeom, setFitViewByLayer, updateMarksLayersByStatus };
+export { type CustomMap, type GeometryCoordinates, GeometryType, type GetImgUrl, type GetImgUrlFn, type IconConfig, type MassData, type VectorConfig, type WmtsSourceOptions, activeFeatureByUid, addMassMarksLayer, appendFeaturesByLayer, buildMassMarksStyles, createAnimationMarker, createBaseLayer, createBusinessLayer, createMap, createMapInstance, createMapWorldLayer, createMassMarksLayer, createOverlay, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getLayersDataList, getMapInstance, instance, removeAllLayers, removeLayerByName, resetActiveFeature, resetActiveVector, resetMap, resetZoomAndCenter, setFitViewByGeom, setFitViewByLayer, updateMarksLayersByStatus };

package/dist/index.d.ts

@@ -117,6 +117,7 @@ declare const removeLayerByName: (name: string) => void;
 
 declare let instance: CustomMap;
 declare const createMapInstance: (config?: {}) => CustomMap;
+declare const createMap: (config?: {}) => CustomMap;
 declare const disposeMap: () => void;
 declare const getMapInstance: () => CustomMap;
 declare const resetZoomAndCenter: (center?: [number, number]) => void;
@@ -207,4 +208,4 @@ declare const updateMarksLayersByStatus: (checkedStatusList?: string[]) => MassD
  */
 declare const createOverlay: (config?: Options) => Overlay;
 
-export { type CustomMap, type GeometryCoordinates, GeometryType, type GetImgUrl, type GetImgUrlFn, type IconConfig, type MassData, type VectorConfig, type WmtsSourceOptions, activeFeatureByUid, addMassMarksLayer, appendFeaturesByLayer, buildMassMarksStyles, createAnimationMarker, createBaseLayer, createBusinessLayer, createMapInstance, createMapWorldLayer, createMassMarksLayer, createOverlay, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getLayersDataList, getMapInstance, instance, removeAllLayers, removeLayerByName, resetActiveFeature, resetActiveVector, resetMap, resetZoomAndCenter, setFitViewByGeom, setFitViewByLayer, updateMarksLayersByStatus };
+export { type CustomMap, type GeometryCoordinates, GeometryType, type GetImgUrl, type GetImgUrlFn, type IconConfig, type MassData, type VectorConfig, type WmtsSourceOptions, activeFeatureByUid, addMassMarksLayer, appendFeaturesByLayer, buildMassMarksStyles, createAnimationMarker, createBaseLayer, createBusinessLayer, createMap, createMapInstance, createMapWorldLayer, createMassMarksLayer, createOverlay, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getLayersDataList, getMapInstance, instance, removeAllLayers, removeLayerByName, resetActiveFeature, resetActiveVector, resetMap, resetZoomAndCenter, setFitViewByGeom, setFitViewByLayer, updateMarksLayersByStatus };

package/dist/index.js

@@ -67,6 +67,7 @@ import gcoord from "gcoord";
 import VectorLayer from "ol/layer/Vector";
 import VectorSource from "ol/source/Vector";
 import { Point } from "ol/geom";
+import { singleClick } from "ol/events/condition";
 import { Fill, Icon, Stroke, Style } from "ol/style";
 var removeOverlays = (key = "") => {
   if (instance) {
@@ -347,20 +348,20 @@ var createSelectByLayer = (vectorLayer) => {
     style: null,
     multi: false,
     hitTolerance: 10,
-    layers: [vectorLayer]
-    // condition: (evt) => {
-    //   let hasFeature = false
-    //   instance.forEachFeatureAtPixel(
-    //     evt.pixel,
-    //     () => {
-    //       hasFeature = true
-    //     },
-    //     {
-    //       layerFilter: (layer) => layer === vectorLayer
-    //     }
-    //   )
-    //   return singleClick(evt) && hasFeature
-    // }
+    layers: [vectorLayer],
+    condition: (evt) => {
+      let hasFeature = false;
+      instance.forEachFeatureAtPixel(
+        evt.pixel,
+        () => {
+          hasFeature = true;
+        },
+        {
+          layerFilter: (layer) => layer === vectorLayer
+        }
+      );
+      return singleClick(evt) && hasFeature;
+    }
   });
   interaction.on("select", (evt) => {
     const { selected, deselected, mapBrowserEvent } = evt;
@@ -694,6 +695,13 @@ var changeLayersByNames = (activeNames, allLayerNames) => {
 var instance;
 var mapCenter = [119.71512016971076, 30.122490541963536];
 var createMapInstance = (config = {}) => {
+  if (instance) {
+    return instance;
+  }
+  instance = createMap(config);
+  return instance;
+};
+var createMap = (config = {}) => {
   const innerConfig = Object.assign(
     {
       zoom: 9.4,
@@ -709,10 +717,7 @@ var createMapInstance = (config = {}) => {
     },
     config || {}
   );
-  if (instance) {
-    return instance;
-  }
-  instance = new Map2({
+  const instance2 = new Map2({
     view: new View(innerConfig),
     controls: defaults({
       zoom: false,
@@ -727,14 +732,16 @@ var createMapInstance = (config = {}) => {
     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" : "";
+  instance2.activeBaseLayer = innerConfig.baseLayer;
+  instance2.getLayerByName = getLayerByName;
+  instance2.removeLayerByName = removeLayerByName;
+  instance2.changeLayersByNames = changeLayersByNames;
+  instance2.on("pointermove", (evt) => {
+    instance2.getTargetElement().style.cursor = instance2.hasFeatureAtPixel(
+      evt.pixel
+    ) ? "pointer" : "";
   });
-  return instance;
+  return instance2;
 };
 var disposeMap = () => {
   const layers = instance.getAllLayers();
@@ -883,6 +890,7 @@ export {
   createAnimationMarker,
   createBaseLayer,
   createBusinessLayer,
+  createMap,
   createMapInstance,
   createMapWorldLayer,
   createMassMarksLayer,

package/package.json

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