标注服务配置

public/jt3dSDK/jt3d.es.js

@@ -1282,10 +1282,7 @@ Object.assign(PointObject.prototype, {
           verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
           showBackground: label2.showBackground,
           backgroundColor: label2.backgroundColor,
-          backgroundPadding: label2.backgroundPadding,
-          disableDepthTestDistance: Number.POSITIVE_INFINITY,
-          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-          clampToGround: true
+          backgroundPadding: label2.backgroundPadding
         }
       });
       if (label2.pixelOffset) {
@@ -1293,6 +1290,12 @@ Object.assign(PointObject.prototype, {
         label2.pixelOffset.y = Cesium.defaultValue(label2.pixelOffset.y, 0);
         entity.label.pixelOffset = new Cesium.Cartesian2(label2.pixelOffset.x, label2.pixelOffset.y);
       }
+      if (label2.eyeOffset) {
+        label2.eyeOffset.x = Cesium.defaultValue(label2.eyeOffset.x, 0);
+        label2.eyeOffset.y = Cesium.defaultValue(label2.eyeOffset.y, 0);
+        label2.eyeOffset.z = Cesium.defaultValue(label2.eyeOffset.z, 0);
+        entity.label.eyeOffset = new Cesium.Cartesian3(label2.eyeOffset.x, label2.eyeOffset.y, label2.eyeOffset.z);
+      }
       if (label2.scaleByDistance) {
         label2.scaleByDistance.near = Cesium.defaultValue(label2.scaleByDistance.near, 0);
         label2.scaleByDistance.nearValue = Cesium.defaultValue(label2.scaleByDistance.nearValue, 0);
@@ -1300,6 +1303,15 @@ Object.assign(PointObject.prototype, {
         label2.scaleByDistance.farValue = Cesium.defaultValue(label2.scaleByDistance.farValue, 0);
         entity.label.scaleByDistance = new Cesium.NearFarScalar(label2.scaleByDistance.near, label2.scaleByDistance.nearValue, label2.scaleByDistance.far, label2.scaleByDistance.farValue);
       }
+      if (label2.distanceDisplayCondition) {
+        label2.distanceDisplayCondition.near = Cesium.defaultValue(label2.distanceDisplayCondition.near, 0);
+        label2.distanceDisplayCondition.far = Cesium.defaultValue(label2.distanceDisplayCondition.far, Number.MAX_VALUE);
+        entity.label.distanceDisplayCondition = new Cesium.DistanceDisplayCondition(label2.distanceDisplayCondition.near, label2.distanceDisplayCondition.far);
+      }
+      if (label2.disableDepthTestDistance) {
+        label2.disableDepthTestDistance = Cesium.defaultValue(label2.disableDepthTestDistance, 999);
+        entity.label.disableDepthTestDistance = label2.disableDepthTestDistance;
+      }
       resolve2(entity);
     });
   },
@@ -1397,6 +1409,7 @@ Object.assign(PointObject.prototype, {
           backgroundColor: label2.backgroundColor,
           backgroundPadding: new Cesium.Cartesian2(6, 6),
           disableDepthTestDistance: Number.POSITIVE_INFINITY,
+          eyeOffset: new Cesium.Cartesian3(0, 0, 1e4),
           clampToGround: true
         };
         if (label2.pixelOffset) {
@@ -1410,6 +1423,16 @@ Object.assign(PointObject.prototype, {
           label2.scaleByDistance.far = Cesium.defaultValue(label2.scaleByDistance.far, 1);
           label2.scaleByDistance.farValue = Cesium.defaultValue(label2.scaleByDistance.farValue, 0);
           entity.label.scaleByDistance = new Cesium.NearFarScalar(label2.scaleByDistance.near, label2.scaleByDistance.nearValue, label2.scaleByDistance.far, label2.scaleByDistance.farValue);
+          entity.label.distanceDisplayCondition = new Cesium.DistanceDisplayCondition(label2.scaleByDistance.near, label2.scaleByDistance.far);
+        }
+        if (label2.distanceDisplayCondition) {
+          label2.distanceDisplayCondition.near = Cesium.defaultValue(label2.distanceDisplayCondition.near, 0);
+          label2.distanceDisplayCondition.far = Cesium.defaultValue(label2.distanceDisplayCondition.far, Number.MAX_VALUE);
+          entity.label.distanceDisplayCondition = new Cesium.DistanceDisplayCondition(label2.distanceDisplayCondition.near, label2.distanceDisplayCondition.far);
+        }
+        if (label2.disableDepthTestDistance) {
+          label2.disableDepthTestDistance = Cesium.defaultValue(label2.disableDepthTestDistance, 999);
+          entity.label.disableDepthTestDistance = label2.disableDepthTestDistance;
         }
       }
       resolve2(entity);
@@ -1438,8 +1461,7 @@ Object.assign(PointObject.prototype, {
           image: billboard.image,
           horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
           verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-          scale: billboard.scale,
-          disableDepthTestDistance: Number.POSITIVE_INFINITY
+          scale: billboard.scale
         }
       });
       if (options2.properties) {
@@ -1456,6 +1478,16 @@ Object.assign(PointObject.prototype, {
         billboard.scaleByDistance.far = Cesium.defaultValue(billboard.scaleByDistance.far, 1);
         billboard.scaleByDistance.farValue = Cesium.defaultValue(billboard.scaleByDistance.farValue, 0);
         entity.billboard.scaleByDistance = new Cesium.NearFarScalar(billboard.scaleByDistance.near, billboard.scaleByDistance.nearValue, billboard.scaleByDistance.far, billboard.scaleByDistance.farValue);
+        entity.billboard.distanceDisplayCondition = new Cesium.DistanceDisplayCondition(billboard.scaleByDistance.near, billboard.scaleByDistance.far);
+      }
+      if (billboard.distanceDisplayCondition) {
+        billboard.distanceDisplayCondition.near = Cesium.defaultValue(billboard.distanceDisplayCondition.near, 0);
+        billboard.distanceDisplayCondition.far = Cesium.defaultValue(billboard.distanceDisplayCondition.far, Number.MAX_VALUE);
+        entity.billboard.distanceDisplayCondition = new Cesium.DistanceDisplayCondition(billboard.distanceDisplayCondition.near, billboard.distanceDisplayCondition.far);
+      }
+      if (billboard.disableDepthTestDistance) {
+        billboard.disableDepthTestDistance = Cesium.defaultValue(billboard.disableDepthTestDistance, 999);
+        entity.billboard.disableDepthTestDistance = billboard.disableDepthTestDistance;
       }
       if (options2.label) {
         let label2 = options2.label || {};
@@ -1504,7 +1536,8 @@ Object.assign(PointObject.prototype, {
           showBackground: label2.showBackground,
           backgroundColor: label2.backgroundColor,
           backgroundPadding: label2.backgroundPadding,
-          disableDepthTestDistance: Number.POSITIVE_INFINITY
+          clampToGround: true,
+          eyeOffset: new Cesium.Cartesian3(0, 0, 1e4)
         };
         if (label2.pixelOffset) {
           label2.pixelOffset.x = Cesium.defaultValue(label2.pixelOffset.x, 0);
@@ -1517,6 +1550,16 @@ Object.assign(PointObject.prototype, {
           label2.scaleByDistance.far = Cesium.defaultValue(label2.scaleByDistance.far, 1);
           label2.scaleByDistance.farValue = Cesium.defaultValue(label2.scaleByDistance.farValue, 0);
           entity.label.scaleByDistance = new Cesium.NearFarScalar(label2.scaleByDistance.near, label2.scaleByDistance.nearValue, label2.scaleByDistance.far, label2.scaleByDistance.farValue);
+          entity.label.distanceDisplayCondition = new Cesium.DistanceDisplayCondition(label2.scaleByDistance.near, label2.scaleByDistance.far);
+        }
+        if (label2.distanceDisplayCondition) {
+          label2.distanceDisplayCondition.near = Cesium.defaultValue(label2.distanceDisplayCondition.near, 0);
+          label2.distanceDisplayCondition.far = Cesium.defaultValue(label2.distanceDisplayCondition.far, Number.MAX_VALUE);
+          entity.label.distanceDisplayCondition = new Cesium.DistanceDisplayCondition(label2.distanceDisplayCondition.near, label2.distanceDisplayCondition.far);
+        }
+        if (label2.disableDepthTestDistance) {
+          label2.disableDepthTestDistance = Cesium.defaultValue(label2.disableDepthTestDistance, 999);
+          entity.label.disableDepthTestDistance = label2.disableDepthTestDistance;
         }
       }
       resolve2(entity);
@@ -1690,6 +1733,15 @@ Object.assign(PointObject.prototype, {
             label2.scaleByDistance.farValue = Cesium.defaultValue(label2.scaleByDistance.farValue, 0);
             entity.label.scaleByDistance = new Cesium.NearFarScalar(label2.scaleByDistance.near, label2.scaleByDistance.nearValue, label2.scaleByDistance.far, label2.scaleByDistance.farValue);
           }
+          if (label2.distanceDisplayCondition) {
+            label2.distanceDisplayCondition.near = Cesium.defaultValue(label2.distanceDisplayCondition.near, 0);
+            label2.distanceDisplayCondition.far = Cesium.defaultValue(label2.distanceDisplayCondition.far, Number.MAX_VALUE);
+            entity.label.distanceDisplayCondition = new Cesium.DistanceDisplayCondition(label2.distanceDisplayCondition.near, label2.distanceDisplayCondition.far);
+          }
+          if (label2.disableDepthTestDistance) {
+            label2.disableDepthTestDistance = Cesium.defaultValue(label2.disableDepthTestDistance, 999);
+            entity.label.disableDepthTestDistance = label2.disableDepthTestDistance;
+          }
         }
         resolve2(entity);
       });
@@ -1772,7 +1824,7 @@ Object.assign(PointObject.prototype, {
             showBackground: label2.showBackground,
             backgroundColor: label2.backgroundColor,
             backgroundPadding: new Cesium.Cartesian2(6, 6),
-            disableDepthTestDistance: Number.POSITIVE_INFINITY,
+            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
             scale: label2.scale
           };
           if (label2.scaleByDistance) {
@@ -1782,6 +1834,15 @@ Object.assign(PointObject.prototype, {
             label2.scaleByDistance.farValue = Cesium.defaultValue(label2.scaleByDistance.farValue, 0);
             entity.label.scaleByDistance = new Cesium.NearFarScalar(label2.scaleByDistance.near, label2.scaleByDistance.nearValue, label2.scaleByDistance.far, label2.scaleByDistance.farValue);
           }
+          if (label2.distanceDisplayCondition) {
+            label2.distanceDisplayCondition.near = Cesium.defaultValue(label2.distanceDisplayCondition.near, 0);
+            label2.distanceDisplayCondition.far = Cesium.defaultValue(label2.distanceDisplayCondition.far, Number.MAX_VALUE);
+            entity.label.distanceDisplayCondition = new Cesium.DistanceDisplayCondition(label2.distanceDisplayCondition.near, label2.distanceDisplayCondition.far);
+          }
+          if (label2.disableDepthTestDistance) {
+            label2.disableDepthTestDistance = Cesium.defaultValue(label2.disableDepthTestDistance, 999);
+            entity.label.disableDepthTestDistance = label2.disableDepthTestDistance;
+          }
         });
       });
     });
@@ -3118,6 +3179,7 @@ Object.assign(LoadMapData.prototype, {
     }
     options2 = options2 || {};
     let id = options2.id || this._guid();
+    let height2 = Cesium.defaultValue(options2.height, 0);
     viewer2.terrainProvider;
     fetch(options2.url).then((res) => {
       return res.json();
@@ -3138,12 +3200,11 @@ Object.assign(LoadMapData.prototype, {
               }
             }
           }
-          debugger;
           if (geometry2.type === "MultiPoint") {
             let coordinatesList = geometry2.coordinates;
             for (var j = 0; j < coordinatesList.length; j++) {
               let coordinates = coordinatesList[j];
-              let position2 = Cesium.Cartesian3.fromDegrees(coordinates[0], coordinates[1], coordinates[2] || 0);
+              let position2 = Cesium.Cartesian3.fromDegrees(coordinates[0], coordinates[1], coordinates[2] || height2);
               if (options2.billboard) {
                 _self._pointObject.addBillboard(position2, options2).then((entity) => {
                   dataSource.entities.add(entity);
@@ -3156,7 +3217,7 @@ Object.assign(LoadMapData.prototype, {
             }
           } else {
             let coordinates = geometry2.coordinates;
-            let position2 = Cesium.Cartesian3.fromDegrees(coordinates[0], coordinates[1], coordinates[2] || 0);
+            let position2 = Cesium.Cartesian3.fromDegrees(coordinates[0], coordinates[1], coordinates[2] || height2);
             if (options2.billboard) {
               let result = _self._pointObject.addBillboard(position2, options2);
               promiseList.push(result);