@kq_npm/client3d_webgl_vue 2.6.2-beta → 2.6.4-beta

package/index.js

@@ -611,7 +611,7 @@ class DrawManager {
         //图标宽度
         height: 32,
         //图标高度
-        clampToGround: false //是否贴地
+        clampToGround: true //是否贴地
 
       },
       //折线样式
@@ -783,6 +783,7 @@ class DrawManager {
     if (callback) {
       var that = this;
       var removeEventListener = this.drawFinishedEvent.addEventListener(shape => {
+        that._viewer.scene.globe.depthTestAgainstTerrain = false;
         var feature = that.shapeToGeoFeature(shape);
         callback(feature.geometry);
         removeEventListener();
@@ -824,6 +825,10 @@ class DrawManager {
   transformPosition(position) {
     // 转坐标
     if (position) {
+      if (position instanceof Array && position.length === 3) {
+        position = Cesium.Cartesian3.fromDegrees(position[0], position[1], position[2]);
+      }
+
       let ellipsoid = this._viewer.scene.globe.ellipsoid;
       let cartographic = ellipsoid.cartesianToCartographic(position);
       let lon = Cesium.Math.toDegrees(cartographic.longitude);
@@ -1000,6 +1005,85 @@ class DrawManager {
   clearAll() {
     this.clear();
     this.removeAll();
+  } //ShapeLayer的绘制要素转换为GeoFeature (普通点线面绘制接口使用)
+
+
+  drawToGeoFeature(shape) {
+    var geoFeature = null;
+    var that = this;
+
+    if (shape) {
+      if (shape.type === that._drawHandler.ShapeTypes.MARKER.type) {
+        geoFeature = window.turf.point(shape.latlng);
+        geoFeature.properties = {
+          image: shape.image,
+          width: shape.width,
+          height: shape.height
+        };
+      } else if (shape.type === that._drawHandler.ShapeTypes.CIRCLE.type) {
+        let center = that.transformPosition(shape.controlPoints[0]);
+        let point1 = Cesium.Cartesian3.fromDegrees(shape.controlPoints[0][0], shape.controlPoints[0][1], shape.controlPoints[0][2]);
+        let point2 = Cesium.Cartesian3.fromDegrees(shape.controlPoints[1][0], shape.controlPoints[1][1], shape.controlPoints[1][2]);
+        let radius = Cesium.Cartesian3.distance(point1, point2);
+        geoFeature = window.turf.circle(center, radius, {
+          steps: 64,
+          units: "meters"
+        });
+      } else if (shape.type === that._drawHandler.ShapeTypes.POLYLINE.type) {
+        let position = [[]];
+        shape.controlPoints.forEach(function (val) {
+          position[0].push(that.transformPosition(val));
+        });
+        geoFeature = window.turf.lineStrings(position).features[0];
+      } else if (shape.type === that._drawHandler.ShapeTypes.RECTANGLE.type) {
+        let point1 = that.transformPosition(shape.controlPoints[0]);
+        let point2 = that.transformPosition(shape.controlPoints[1]);
+        let minX = point1[0];
+        let maxX = point2[0];
+        let minY = point1[1];
+        let maxY = point2[1];
+        let positions1 = [[[minX, minY], [minX, maxY], [maxX, maxY], [maxX, minY], [minX, minY]]];
+        geoFeature = window.turf.polygon(positions1);
+      } else if (shape.type === that._drawHandler.ShapeTypes.POLYGON.type) {
+        let positions = [[]];
+        let posi;
+        shape.controlPoints.forEach(function (val, dex) {
+          // 存坐标
+          positions[0].push(that.transformPosition(val)); // 闭合坐标
+
+          if (dex === 0) {
+            posi = that.transformPosition(val);
+          }
+
+          if (dex === shape.controlPoints.length - 1) {
+            positions[0].push(posi);
+          }
+        });
+        geoFeature = window.turf.polygon(positions);
+      }
+    }
+
+    return geoFeature;
+  } // 获取所有绘制图层，geojson数据格式 (普通点线面绘制接口使用)
+
+
+  getAllGeometry() {
+    let features = [];
+
+    let shapes = this._drawLayer.toJSON();
+
+    if (shapes && shapes.draws && shapes.draws.length > 0) {
+      shapes.draws.forEach(shape => {
+        let feature = this.drawToGeoFeature(shape);
+        if (feature) features.push(feature);
+      }, this);
+    }
+
+    let geojson = {
+      type: "FeatureCollection",
+      features: features
+    };
+    return geojson;
   }
 
 }

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"2.6.2-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"@kq_npm/client_common_vue":"^2.9.5-beta","colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"^9.2.0-beta.36","xlsx":"^0.18.5","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"2.6.4-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"^9.2.0-beta.36","xlsx":"^0.18.5","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}

package/scenceview/index.js

@@ -136,7 +136,7 @@ class DrawManager {
         //图标宽度
         height: 32,
         //图标高度
-        clampToGround: false //是否贴地
+        clampToGround: true //是否贴地
 
       },
       //折线样式
@@ -308,6 +308,7 @@ class DrawManager {
     if (callback) {
       var that = this;
       var removeEventListener = this.drawFinishedEvent.addEventListener(shape => {
+        that._viewer.scene.globe.depthTestAgainstTerrain = false;
         var feature = that.shapeToGeoFeature(shape);
         callback(feature.geometry);
         removeEventListener();
@@ -349,6 +350,10 @@ class DrawManager {
   transformPosition(position) {
     // 转坐标
     if (position) {
+      if (position instanceof Array && position.length === 3) {
+        position = Cesium.Cartesian3.fromDegrees(position[0], position[1], position[2]);
+      }
+
       let ellipsoid = this._viewer.scene.globe.ellipsoid;
       let cartographic = ellipsoid.cartesianToCartographic(position);
       let lon = Cesium.Math.toDegrees(cartographic.longitude);
@@ -525,6 +530,85 @@ class DrawManager {
   clearAll() {
     this.clear();
     this.removeAll();
+  } //ShapeLayer的绘制要素转换为GeoFeature (普通点线面绘制接口使用)
+
+
+  drawToGeoFeature(shape) {
+    var geoFeature = null;
+    var that = this;
+
+    if (shape) {
+      if (shape.type === that._drawHandler.ShapeTypes.MARKER.type) {
+        geoFeature = window.turf.point(shape.latlng);
+        geoFeature.properties = {
+          image: shape.image,
+          width: shape.width,
+          height: shape.height
+        };
+      } else if (shape.type === that._drawHandler.ShapeTypes.CIRCLE.type) {
+        let center = that.transformPosition(shape.controlPoints[0]);
+        let point1 = Cesium.Cartesian3.fromDegrees(shape.controlPoints[0][0], shape.controlPoints[0][1], shape.controlPoints[0][2]);
+        let point2 = Cesium.Cartesian3.fromDegrees(shape.controlPoints[1][0], shape.controlPoints[1][1], shape.controlPoints[1][2]);
+        let radius = Cesium.Cartesian3.distance(point1, point2);
+        geoFeature = window.turf.circle(center, radius, {
+          steps: 64,
+          units: "meters"
+        });
+      } else if (shape.type === that._drawHandler.ShapeTypes.POLYLINE.type) {
+        let position = [[]];
+        shape.controlPoints.forEach(function (val) {
+          position[0].push(that.transformPosition(val));
+        });
+        geoFeature = window.turf.lineStrings(position).features[0];
+      } else if (shape.type === that._drawHandler.ShapeTypes.RECTANGLE.type) {
+        let point1 = that.transformPosition(shape.controlPoints[0]);
+        let point2 = that.transformPosition(shape.controlPoints[1]);
+        let minX = point1[0];
+        let maxX = point2[0];
+        let minY = point1[1];
+        let maxY = point2[1];
+        let positions1 = [[[minX, minY], [minX, maxY], [maxX, maxY], [maxX, minY], [minX, minY]]];
+        geoFeature = window.turf.polygon(positions1);
+      } else if (shape.type === that._drawHandler.ShapeTypes.POLYGON.type) {
+        let positions = [[]];
+        let posi;
+        shape.controlPoints.forEach(function (val, dex) {
+          // 存坐标
+          positions[0].push(that.transformPosition(val)); // 闭合坐标
+
+          if (dex === 0) {
+            posi = that.transformPosition(val);
+          }
+
+          if (dex === shape.controlPoints.length - 1) {
+            positions[0].push(posi);
+          }
+        });
+        geoFeature = window.turf.polygon(positions);
+      }
+    }
+
+    return geoFeature;
+  } // 获取所有绘制图层，geojson数据格式 (普通点线面绘制接口使用)
+
+
+  getAllGeometry() {
+    let features = [];
+
+    let shapes = this._drawLayer.toJSON();
+
+    if (shapes && shapes.draws && shapes.draws.length > 0) {
+      shapes.draws.forEach(shape => {
+        let feature = this.drawToGeoFeature(shape);
+        if (feature) features.push(feature);
+      }, this);
+    }
+
+    let geojson = {
+      type: "FeatureCollection",
+      features: features
+    };
+    return geojson;
   }
 
 }