xy-cesium3 0.0.177 → 0.0.178

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xy-cesium3",
-  "version": "0.0.177",
+  "version": "0.0.178",
   "description": "雄越cesium3",
   "main": "xy-cesium3.umd.js",
   "scripts": {

package/xy-cesium3.mjs

@@ -15193,7 +15193,19 @@ const defaultOptions$d = {
     levelCount: [20, 50, 100, 2e3],
     levelSize: [55, 60, 70, 80],
     imagePath: "/img/cluster/",
-    images: null
+    images: null,
+    label: {
+      show: true,
+      font: "bold 14px",
+      fillColor: Cesium.Color.WHITE,
+      outlineColor: Cesium.Color.BLACK,
+      outlineWidth: 2,
+      style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+      showBackground: false,
+      backgroundColor: "#000000",
+      backgroundOpacity: 0.5,
+      backgroundPadding: new Cesium.Cartesian2(5, 3)
+    }
   }
 };
 const addEntityPoint = (viewer2, option) => {
@@ -15217,19 +15229,20 @@ const addEntityPoint = (viewer2, option) => {
   viewer2.dataSources.add(dataSource);
   data2.forEach((item) => {
     if (item[props2.lgtd] && item[props2.lttd]) {
+      const itemImage = item.image || billboardStyle.image;
       var entity = new Cesium.Entity({
         name: item.id,
         show: show2,
         position: Cesium.Cartesian3.fromDegrees(Number(item[props2.lgtd]), Number(item[props2.lttd]), Number(item[props2.height] || 0)),
         billboard: Object.assign(
           {
-            image: item.image || billboardStyle.image,
             heightReference: billboardHeightReference,
             horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
             verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
             zIndex: 0
           },
-          billboardStyle
+          billboardStyle,
+          { image: itemImage }
         ),
         label: labelStyle.show ? Object.assign(
           {
@@ -15309,12 +15322,28 @@ const addClusterLayer = (viewer2, dataSource, clusterStyle = {}) => {
         cluster.billboard.horizontalOrigin = Cesium.HorizontalOrigin.CENTER;
         cluster.billboard.verticalOrigin = Cesium.VerticalOrigin.CENTER;
         cluster.billboard.image = clusterImage;
-        cluster.label.show = true;
+        const labelStyle = clusterStyle.label || {};
+        cluster.label.show = labelStyle.show !== false;
         cluster.label.text = clusteredEntities.length.toString();
-        cluster.label.font = "bold 12px";
-        cluster.label.horizontalOrigin = Cesium.HorizontalOrigin.CENTER;
-        cluster.label.verticalOrigin = Cesium.VerticalOrigin.CENTER;
-        cluster.label.eyeOffset = new Cesium.Cartesian3(0, 0, -10);
+        cluster.label.font = labelStyle.font || "bold 14px";
+        cluster.label.fillColor = labelStyle.fillColor || Cesium.Color.WHITE;
+        cluster.label.outlineColor = labelStyle.outlineColor || Cesium.Color.BLACK;
+        cluster.label.outlineWidth = labelStyle.outlineWidth ?? 2;
+        cluster.label.style = labelStyle.style ?? Cesium.LabelStyle.FILL_AND_OUTLINE;
+        cluster.label.horizontalOrigin = labelStyle.horizontalOrigin || Cesium.HorizontalOrigin.CENTER;
+        cluster.label.verticalOrigin = labelStyle.verticalOrigin || Cesium.VerticalOrigin.CENTER;
+        cluster.label.eyeOffset = labelStyle.eyeOffset || new Cesium.Cartesian3(0, 0, -1);
+        if (labelStyle.showBackground) {
+          const bgOpacity = labelStyle.backgroundOpacity ?? 0.5;
+          const bgColor = labelStyle.backgroundColor || "#000000";
+          const color = Cesium.Color.fromCssColorString(bgColor);
+          color.alpha = bgOpacity;
+          cluster.label.showBackground = true;
+          cluster.label.backgroundColor = color;
+          cluster.label.backgroundPadding = labelStyle.backgroundPadding || new Cesium.Cartesian2(5, 3);
+        } else {
+          cluster.label.showBackground = false;
+        }
       });
     }
   };
@@ -15364,19 +15393,20 @@ const addPrimitivePoint = (viewer2, option) => {
   billboards.layerId = opt2.id;
   data2.forEach((item) => {
     if (item[props2.lgtd] && item[props2.lttd]) {
+      const itemImage = item.image || billboardStyle.image;
       billboards.add(
         Object.assign(
           {
             id: Object.assign({ layerId: opt2.id }, item),
             show: show2,
             position: Cesium.Cartesian3.fromDegrees(item[props2.lgtd], item[props2.lttd], item[props2.height] || 0),
-            image: item.image || billboardStyle.image,
             horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
             verticalOrigin: Cesium.VerticalOrigin.CENTER,
             heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
             zIndex: 1
           },
-          billboardStyle
+          billboardStyle,
+          { image: itemImage }
         )
       );
     }