Merge branch 'webclient_plot' of github.com:MapGIS/WebClient-JavaScript into webclient_plot

Author: zhaokai

src/service/3DPlot/Draw/DrawPolyline.js

@@ -47,6 +47,7 @@ export default class DrawPolyline extends DrawObject {
     const viewer = this._viewer;
     const symbol = this._symbol;
     const handler = new Cesium.ScreenSpaceEventHandler(viewer.canvas);
+    const {classificationType} = symbol;
     let that = this;
 
     handler.setInputAction((event) => {
@@ -62,6 +63,7 @@ export default class DrawPolyline extends DrawObject {
           that._primitive = PrimitiveFactory.createInstance(symbol.type, {
             positions: that.m_coords,
             element: res,
+            classificationType: classificationType
           });
           that._isAdded = true;
           that._plotLayer._primitiveCollection.add(that._primitive);

src/service/3DPlot/PlotLayer3D.js

@@ -271,20 +271,6 @@ class PlotLayer3D extends Observable {
     }
     return plots;
   }
-
-  _mercatorTolonlat(mercator) {
-    let lonlat = {lon: 0, lat: 0};
-
-    let x = mercator.x / 20037508.34 * 180;
-    let y = mercator.y / 20037508.34 * 180;
-
-    y = 180 / Math.PI * (2 * Math.atan(Math.exp(y * Math.PI / 180)) - Math.PI / 2);
-
-    lonlat.lon = x;
-    lonlat.lat = y;
-
-    return lonlat;
-  };
 }
 
 Object.defineProperties(PlotLayer3D.prototype, {

src/service/3DPlot/Primitive/ElementInstance/KidneyAreaElementInstance.js

@@ -10,9 +10,14 @@ import RegularLine1ElementInstance from "./RegularLine1ElementInstance";
 import {CesiumGeomUtil} from "../../Utils/CesiumUtil";
 export default class KidneyAreaElementInstance extends RegularLine1ElementInstance {
   transfromGeoCesium(elem, cesgeo, options) {
+    let {dimModHeight} = options;
+    if(typeof this._classificationType === 'number' && this._classificationType >= 0){
+      dimModHeight = 0;
+    }
+
     CesiumGeomUtil.degreesWithHeightToWorldCoords(
         cesgeo,
-      options.dimModHeight
+      dimModHeight
     );
     this._rotatePart(elem, cesgeo, options);
   }

src/service/3DPlot/Primitive/ElementInstance/RegularLine1ElementInstance.js

@@ -12,9 +12,9 @@ import MainElement from "../../../../service/PlotBase/SvgLoader/element/extend/M
 import RegularLineElementInstance from "./RegularLineElementInstance";
 
 export default class RegularLine1ElementInstance extends RegularLineElementInstance {
-  pathElemToWallGeomInstance(pathElem, options) {
+  pathElemToWallGeomInstance(pathElem, options, sampleHeights) {
     if (!(pathElem instanceof MainElement)) return undefined;
-    return super.pathElemToWallGeomInstance(pathElem, options);
+    return super.pathElemToWallGeomInstance(pathElem, options, sampleHeights);
   }
 
   transfromGeoCesium(elem, cesgeo, options) {
@@ -26,7 +26,7 @@ export default class RegularLine1ElementInstance extends RegularLineElementInsta
   }
 
   _rotatePart(ele, cesGeom, options) {
-    const { dimModHeight } = options;
+    let { dimModHeight } = options;
     if (ele instanceof MainElement) return;
 
     if (!ele._dimModal.is3DTran()) return;
@@ -42,6 +42,10 @@ export default class RegularLine1ElementInstance extends RegularLineElementInsta
       translatePoint.y
     );
 
+    //这个地方控制抬起高度，贴地或贴模型时抬高高度为0
+    if(typeof this._classificationType === 'number' && this._classificationType >= 0){
+      dimModHeight = 0;
+    }
     const originPnt = Cesium.Cartesian3.fromDegreesArrayHeights([
       t.x,
       t.y,

src/service/3DPlot/Primitive/ElementInstance/RegularLineElementInstance.js

@@ -12,10 +12,12 @@ import MainElement from "../../../../service/PlotBase/SvgLoader/element/extend/M
 import { defined } from "../../../PlotUtilBase/Check";
 
 export default class RegularLineElementInstance extends SvgElementInstance {
-  svgToGeomInstances(elem, options) {
-    const instances = super.svgToGeomInstances(elem, options);
-    const wallGeomInstances = this.generateWallGeometryInstances(elem, options);
-    return { instances, wallGeomInstances };
+  svgToGeomInstances(elem, options, callback) {
+    let that = this;
+    super.svgToGeomInstances(elem, options, function (instances, sampleHeights) {
+      const wallGeomInstances = that.generateWallGeometryInstances(elem, options);
+      callback({ instances, wallGeomInstances });
+    });
   }
 
   /**
@@ -85,7 +87,7 @@ export default class RegularLineElementInstance extends SvgElementInstance {
     return instances;
   }
 
-  pathElemToGeomInstance(pathElem, options) {
+  pathElemToGeomInstance(pathElem, options, sampleHeights) {
     const instances = [];
     const style=pathElem.getContextStyle()
     const fill =style.fillStyle;
@@ -102,10 +104,21 @@ export default class RegularLineElementInstance extends SvgElementInstance {
 
       for (let i = 0; i < parts.length; i += 1) {
         const coords = parts[i];
-        const geometry = this._generateStrokeGeometry(
-          coords,
-          isMainElement ? strokeWidthSize - 5 : strokeWidthSize
-        );
+        let heights, geometry;
+        if(sampleHeights) {
+          heights = sampleHeights[i];
+          geometry = this._generateStrokeGeometry(
+            coords,
+            isMainElement ? strokeWidthSize - 5 : strokeWidthSize,
+            heights
+          );
+        }else {
+          geometry = this._generateStrokeGeometry(
+            coords,
+            isMainElement ? strokeWidthSize - 5 : strokeWidthSize
+          );
+        }
+
         const instance = this._generateCesiumGeometryInstance(
           pathElem,
           geometry,
@@ -155,9 +168,14 @@ export default class RegularLineElementInstance extends SvgElementInstance {
   }
 
   transfromGeoCesium(elem,cesGeom, options) {
+    let {dimModHeight} = options;
+    //这个地方控制抬起高度，贴地或贴模型时抬高高度为0
+    if(typeof this._classificationType === 'number' && this._classificationType >= 0){
+      dimModHeight = 0;
+    }
     CesiumGeomUtil.degreesWithHeightToWorldCoords(
       cesGeom,
-      options.dimModHeight
+      dimModHeight
     );
   }
 }

src/service/3DPlot/Primitive/ElementInstance/RegularSurfaceElementInstance.js

@@ -11,7 +11,7 @@ import {CesiumUtil} from "../../Utils/CesiumUtil";
 import SvgElementInstance from "./SvgElementInstance";
 
 export default class RegularSurfaceElementInstance extends SvgElementInstance {
-  svgToGeomInstances(elem,options) {
+  svgToGeomInstances(elem,options,callback) {
     const { surfaceBorderWidth }=options
     this.polylineOutInstance = null;
     this.polygonRect = new Bounds();
@@ -44,12 +44,12 @@ export default class RegularSurfaceElementInstance extends SvgElementInstance {
     });
 
     const exportInstance = instances.flat();
-    return {
+    callback({
       instances: exportInstance,
       polylineOutInstance: this.polylineOutInstance,
       polygonRect:this.polygonRect,
       borderColor:this._borderColor
-    };
+    });
   }
 
   pathElemToGeomInstance(elem) {