map-ol-utils 0.0.26 → 0.0.28

package/dist/index.cjs

@@ -162,6 +162,24 @@ var import_control = require("ol/control");
 // src/layer-utils.ts
 var import_gcoord = __toESM(require("gcoord"), 1);
 var import_geom = require("ol/geom");
+
+// src/helper.ts
+var hexToRgba = (hex, alpha) => {
+  if (hex.startsWith("#")) {
+    let tempHex = hex.replace("#", "");
+    if (tempHex.length === 3) {
+      tempHex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2];
+    }
+    const r = parseInt(tempHex.substring(0, 2), 16);
+    const g = parseInt(tempHex.substring(2, 4), 16);
+    const b = parseInt(tempHex.substring(4, 6), 16);
+    return `rgba(${r}, ${g}, ${b}, ${alpha})`;
+  } else {
+    return hex;
+  }
+};
+
+// src/layer-utils.ts
 var import_format2 = require("ol/format");
 var import_ol = require("ol");
 var import_interaction = require("ol/interaction");
@@ -224,7 +242,7 @@ var assembleGeoJson = (dataList, config) => {
   return import_gcoord.default.transform({ type: "FeatureCollection", features: tempList }, import_gcoord.default.GCJ02, import_gcoord.default.WGS84);
 };
 var createVectorStyle = (data, config) => {
-  const { isLine, colorMap, fillColor, colorKey, strokeColor, strokeWeight } = config || {};
+  const { isLine, colorMap, fillColor, colorKey, strokeColor, strokeWeight, fillOpacity } = config || {};
   const style = new import_style.Style({
     stroke: new import_style.Stroke({
       width: strokeWeight,
@@ -234,7 +252,7 @@ var createVectorStyle = (data, config) => {
   if (!isLine) {
     style.setFill(
       new import_style.Fill({
-        color: colorKey ? (colorMap == null ? void 0 : colorMap.get(data[colorKey])) || fillColor : fillColor
+        color: hexToRgba((colorKey ? (colorMap == null ? void 0 : colorMap.get(data[colorKey])) || fillColor : fillColor) || "", fillOpacity || 1)
       })
     );
   }
@@ -262,7 +280,7 @@ var removeAllLayers = (isClearAll = true) => {
   removeOverlays();
   console.log(isClearAll);
   if (instance) {
-    instance.getLayers().getArray().forEach((layer) => {
+    instance.getAllLayers().forEach((layer) => {
       if (!layer.get("_isBaseLayer")) {
         instance.removeLayer(layer);
       }

package/dist/index.d.cts

@@ -28,6 +28,7 @@ type VectorConfig = {
     layerName?: string;
     openClick?: boolean;
     fillColor?: string;
+    fillOpacity?: number;
     strokeColor?: string;
     strokeStyle?: string;
     strokeWeight?: number;

package/dist/index.d.ts

@@ -28,6 +28,7 @@ type VectorConfig = {
     layerName?: string;
     openClick?: boolean;
     fillColor?: string;
+    fillOpacity?: number;
     strokeColor?: string;
     strokeStyle?: string;
     strokeWeight?: number;

package/dist/index.js

@@ -107,6 +107,24 @@ import { defaults } from "ol/control";
 // src/layer-utils.ts
 import gcoord from "gcoord";
 import { Point } from "ol/geom";
+
+// src/helper.ts
+var hexToRgba = (hex, alpha) => {
+  if (hex.startsWith("#")) {
+    let tempHex = hex.replace("#", "");
+    if (tempHex.length === 3) {
+      tempHex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2];
+    }
+    const r = parseInt(tempHex.substring(0, 2), 16);
+    const g = parseInt(tempHex.substring(2, 4), 16);
+    const b = parseInt(tempHex.substring(4, 6), 16);
+    return `rgba(${r}, ${g}, ${b}, ${alpha})`;
+  } else {
+    return hex;
+  }
+};
+
+// src/layer-utils.ts
 import { GeoJSON } from "ol/format";
 import { Feature, Overlay } from "ol";
 import { Select } from "ol/interaction";
@@ -169,7 +187,7 @@ var assembleGeoJson = (dataList, config) => {
   return gcoord.transform({ type: "FeatureCollection", features: tempList }, gcoord.GCJ02, gcoord.WGS84);
 };
 var createVectorStyle = (data, config) => {
-  const { isLine, colorMap, fillColor, colorKey, strokeColor, strokeWeight } = config || {};
+  const { isLine, colorMap, fillColor, colorKey, strokeColor, strokeWeight, fillOpacity } = config || {};
   const style = new Style({
     stroke: new Stroke({
       width: strokeWeight,
@@ -179,7 +197,7 @@ var createVectorStyle = (data, config) => {
   if (!isLine) {
     style.setFill(
       new Fill({
-        color: colorKey ? (colorMap == null ? void 0 : colorMap.get(data[colorKey])) || fillColor : fillColor
+        color: hexToRgba((colorKey ? (colorMap == null ? void 0 : colorMap.get(data[colorKey])) || fillColor : fillColor) || "", fillOpacity || 1)
       })
     );
   }
@@ -207,7 +225,7 @@ var removeAllLayers = (isClearAll = true) => {
   removeOverlays();
   console.log(isClearAll);
   if (instance) {
-    instance.getLayers().getArray().forEach((layer) => {
+    instance.getAllLayers().forEach((layer) => {
       if (!layer.get("_isBaseLayer")) {
         instance.removeLayer(layer);
       }

package/package.json

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