xy-cesium3 0.0.42 → 0.0.44

package/package.json

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

package/xy-cesium3.es.js

@@ -2583,6 +2583,7 @@ function removeEntityLayer(viewer2, entity) {
 const defaultOptions$8 = {
   id: "point",
   data: [],
+  show: true,
   image: {
     image: "/img/marker.png",
     width: 30,
@@ -2615,13 +2616,14 @@ const addEntityPoint = (viewer2, option) => {
   const labelStyle = opt.text || {};
   const data = opt.data || [];
   const props = opt.props || {};
+  const show2 = opt.show === void 0 ? true : show2;
   const dataSource = new Cesium.CustomDataSource(opt.id);
   viewer2.dataSources.add(dataSource);
   data.forEach((item) => {
     if (item[props.lgtd] && item[props.lttd]) {
       var entity = new Cesium.Entity({
         name: item.id,
-        show: true,
+        show: show2,
         position: Cesium.Cartesian3.fromDegrees(
           Number(item[props.lgtd]),
           Number(item[props.lttd]),
@@ -3503,13 +3505,21 @@ const defaultOptions$7 = {
     lgtd: "lgtd",
     lttd: "lttd",
     image: "image",
-    scale: "scale"
+    scale: "scale",
+    name: "name"
+  },
+  style: {},
+  text: {
+    show: true,
+    style: {}
   }
 };
 const addEntityGif = (viewer2, option) => {
   let opt = Object.assign({}, defaultOptions$7, option);
   let props = opt.props;
   let data = opt.data || [];
+  const billboardStyle = opt.style || {};
+  const labelStyle = opt.text || {};
   let dataSource = new Cesium.CustomDataSource(opt.id);
   viewer2.dataSources.add(dataSource);
   data.forEach((item) => {
@@ -3527,10 +3537,28 @@ const addEntityGif = (viewer2, option) => {
           var entity = new Cesium.Entity({
             name: item.id,
             position: Cesium.Cartesian3.fromDegrees(item[props.lgtd], item[props.lttd]),
-            billboard: {
+            billboard: Object.assign({
               image: new Cesium.CallbackProperty(() => loader.get_canvas().toDataURL("image/png"), false),
-              scale: item[props.scale] || opt.scale
-            }
+              scale: item[props.scale] || opt.scale,
+              heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+              horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+              verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+              zIndex: 0
+            }, billboardStyle),
+            label: labelStyle.show ? Object.assign(
+              {
+                text: item[props.name],
+                font: "12px Helvetica",
+                fillColor: Cesium.Color.WHITE,
+                outlineColor: Cesium.Color.fromCssColorString("#000000").withAlpha(1),
+                outlineWidth: 1,
+                style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+                heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+                pixelOffset: new Cesium.Cartesian2(0, 5)
+              },
+              labelStyle.style
+            ) : null,
+            description: JSON.stringify(item)
           });
           dataSource.entities.add(entity);
         });
@@ -6145,6 +6173,7 @@ class FlowGradientMaterial extends Cesium.Material {
 const defaultOptions$5 = {
   id: "",
   data: [],
+  show: true,
   line: {},
   text: {
     show: true
@@ -6161,6 +6190,7 @@ const addEntityLine = (viewer2, option) => {
   let props = opt.props || {};
   let data = opt.data || [];
   data = data.filter((item) => item[props.lglt]);
+  const show2 = opt.show === void 0 ? true : show2;
   let dataSource = new Cesium.CustomDataSource(opt.id);
   viewer2.dataSources.add(dataSource);
   data.forEach((item) => {
@@ -6168,7 +6198,7 @@ const addEntityLine = (viewer2, option) => {
     let polylinePosition = Cesium.Cartesian3.fromDegreesArray(lglt);
     var entity = new Cesium.Entity({
       name: "line_" + item.id,
-      show: true,
+      show: show2,
       polyline: Object.assign({
         positions: polylinePosition,
         width: lineStyle.width || 5,
@@ -6183,7 +6213,7 @@ const addEntityLine = (viewer2, option) => {
       const centerPoint = computePolyLineCenter(polylinePosition);
       let label = {
         name: "line_text_" + item.id,
-        show: true,
+        show: show2,
         position: centerPoint,
         label: Object.assign({
           text: item[props.name],
@@ -6533,6 +6563,7 @@ const addPrimitiveRadar = (viewer2, option) => {
 const defaultOptions$2 = {
   id: "",
   data: [],
+  show: true,
   polygon: {
     extrudedHeight: 0,
     outline: false,
@@ -6552,6 +6583,7 @@ const addEntityPolygon = (viewer2, option) => {
   let labelStyle = opt.text || {};
   let props = opt.props || {};
   let data = opt.data || [];
+  const show2 = opt.show === void 0 ? true : show2;
   data = data.filter((item) => item[props.lglt]);
   let dataSource = new Cesium.CustomDataSource(opt.id);
   viewer2.dataSources.add(dataSource);
@@ -6564,6 +6596,7 @@ const addEntityPolygon = (viewer2, option) => {
     }
     if (!pStyle.extrudedHeight && pStyle.outline) {
       polyline = {
+        show: show2,
         positions: Cesium.Cartesian3.fromDegreesArray(lglt),
         width: pStyle.outlineWidth,
         material: pStyle.outlineColor,
@@ -6575,7 +6608,7 @@ const addEntityPolygon = (viewer2, option) => {
     let polygonPositions = Cesium.Cartesian3.fromDegreesArray(lglt);
     var entity = new Cesium.Entity({
       name: "polygon_" + item.id,
-      show: true,
+      show: show2,
       polygon: Object.assign({
         hierarchy: polygonPositions,
         material: Cesium.Color.RED,
@@ -6593,7 +6626,7 @@ const addEntityPolygon = (viewer2, option) => {
       const centerLat = Cesium.Math.toDegrees(centerCartographic.latitude);
       let label = {
         name: "polygon_text_" + item.id,
-        show: true,
+        show: show2,
         position: Cesium.Cartesian3.fromDegrees(centerLon, centerLat, 0),
         label: Object.assign({
           text: item[props.name],