【杨琨】【贴地代码】

Author: killer1992

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

@@ -35,6 +35,8 @@ export default class DrawPoint extends DrawObject {
       if (!worldPos) return;
 
       symbol.getElement().then(function (res) {
+        const {classificationType} = that._symbol;
+        res.classificationType = classificationType;
         that._primitive = PrimitiveFactory.createInstance(symbol.type, {
           positions: that.m_coords,
           element: res

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

@@ -59,6 +59,8 @@ export default class DrawPolyline extends DrawObject {
 
       symbol.getElement().then(function (res) {
         if (!that._isAdded) {
+          const {classificationType} = that._symbol;
+          res.classificationType = classificationType;
           that._primitive = PrimitiveFactory.createInstance(symbol.type, {
             positions: that.m_coords,
             element: res,

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

@@ -10,15 +10,15 @@ import RegularLineElementInstance from "./RegularLineElementInstance";
 import GeomUtil from "../../../../service/PlotUtilBase/Geometry/GeomUtil";
 
 export default class IrregularElementInstance extends RegularLineElementInstance {
-  svgToGeomInstances(elem, options) {
+  svgToGeomInstances(elem, options, callback) {
     const instances = this.pathElemToGeomInstance(elem, options);
     let wallGeomInstances;
     if (!options.isOpenWall) {
       wallGeomInstances = undefined;
     } else {
       wallGeomInstances = this.pathElemToWallGeomInstance(elem, options);
     }
-    return { instances, wallGeomInstances };
+    callback({ instances, wallGeomInstances });
   }
 
   pathElemToGeomInstance(elem, options) {

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

@@ -35,7 +35,7 @@ export default class RegularLineElementInstance extends SvgElementInstance {
     let instances = [], wallIndex = 0, wallOffsetHeightArray;
     for (let i = 0; i < paths.length; i += 1) {
       const {type} = paths[i];
-      if(type === 'extendline' || type === 'mainline'){
+      if(wallOffsetHeights instanceof Array && wallOffsetHeights.length > 0 && (type === 'extendline' || type === 'mainline')){
         wallOffsetHeightArray = wallOffsetHeights[wallIndex];
         wallIndex++;
       }

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

@@ -11,80 +11,80 @@ import {CesiumUtil} from "../../Utils/CesiumUtil";
 import SvgElementInstance from "./SvgElementInstance";
 
 export default class RegularSurfaceElementInstance extends SvgElementInstance {
-  svgToGeomInstances(elem,options) {
-    const { surfaceBorderWidth }=options
-    this.polylineOutInstance = null;
-    this.polygonRect = new Bounds();
-    this._borderColor = Cesium.Color.RED;
-    this._surfaceBorderWidth = surfaceBorderWidth;
-
-    const pathElements = [];
-    const instances = [];
-
-    elem.getPathElem(pathElements);
-
-    const styleObject = pathElements[0].getContextStyle();
-    if (styleObject) {
-      if (styleObject.strokeStyle !== "none") {
-        this._borderColor = Cesium.Color.fromCssColorString(
-          styleObject.strokeStyle
-        );
-      }
-
-      // 边线线宽为像素值，界面显示效果太差，因此边线宽度取固定值
-      // if(pathElements[0].getStyle('stroke-width').hasValue()){
-      //   const v=Math.round(pathElements[0].getStyle('stroke-width').getNumber())/2 
-      //   this._surfaceBorderWidth=v
-      // }
-
+    svgToGeomInstances(elem, options, callback) {
+        const {surfaceBorderWidth} = options
+        this.polylineOutInstance = null;
+        this.polygonRect = new Bounds();
+        this._borderColor = Cesium.Color.RED;
+        this._surfaceBorderWidth = surfaceBorderWidth;
+
+        const pathElements = [];
+        const instances = [];
+
+        elem.getPathElem(pathElements);
+
+        const styleObject = pathElements[0].getContextStyle();
+        if (styleObject) {
+            if (styleObject.strokeStyle !== "none") {
+                this._borderColor = Cesium.Color.fromCssColorString(
+                    styleObject.strokeStyle
+                );
+            }
+
+            // 边线线宽为像素值，界面显示效果太差，因此边线宽度取固定值
+            // if(pathElements[0].getStyle('stroke-width').hasValue()){
+            //   const v=Math.round(pathElements[0].getStyle('stroke-width').getNumber())/2
+            //   this._surfaceBorderWidth=v
+            // }
+
+        }
+
+        pathElements.forEach((s) => {
+            instances.push(this.pathElemToGeomInstance(s));
+        });
+
+        const exportInstance = instances.flat();
+        callback({
+            instances: exportInstance,
+            polylineOutInstance: this.polylineOutInstance,
+            polygonRect: this.polygonRect,
+            borderColor: this._borderColor
+        });
     }
 
-    pathElements.forEach((s) => {
-      instances.push(this.pathElemToGeomInstance(s));
-    });
-
-    const exportInstance = instances.flat();
-    return {
-      instances: exportInstance,
-      polylineOutInstance: this.polylineOutInstance,
-      polygonRect:this.polygonRect,
-      borderColor:this._borderColor
-    };
-  }
-
-  pathElemToGeomInstance(elem) {
-    const _parts = elem.cacheCoords || elem.getCoords();
-
-    const polygonparts = _parts
-      .flatMap((s) =>
-        s.map((t) => {
-          this.polygonRect.addPnt(t.x, t.y);
-          const latlng = CesiumUtil.WebMercatorUnProject(t.x, t.y);
-          return [latlng.x, latlng.y];
-        })
-      )
-      .flat();
-
-    const polygon = new Cesium.PolygonGeometry({
-      polygonHierarchy: new Cesium.PolygonHierarchy(
-        Cesium.Cartesian3.fromDegreesArray(polygonparts)
-      ),
-    });
-
-    const groundPolyline = new Cesium.GroundPolylineGeometry({
-      positions: Cesium.Cartesian3.fromDegreesArray(polygonparts),
-      width: this._surfaceBorderWidth,
-    });
-
-    const instance = new Cesium.GeometryInstance({
-      geometry: polygon,
-    });
-
-    this.polylineOutInstance = new Cesium.GeometryInstance({
-      geometry: groundPolyline,
-    });
-
-    return instance;
-  }
+    pathElemToGeomInstance(elem) {
+        const _parts = elem.cacheCoords || elem.getCoords();
+
+        const polygonparts = _parts
+            .flatMap((s) =>
+                s.map((t) => {
+                    this.polygonRect.addPnt(t.x, t.y);
+                    const latlng = CesiumUtil.WebMercatorUnProject(t.x, t.y);
+                    return [latlng.x, latlng.y];
+                })
+            )
+            .flat();
+
+        const polygon = new Cesium.PolygonGeometry({
+            polygonHierarchy: new Cesium.PolygonHierarchy(
+                Cesium.Cartesian3.fromDegreesArray(polygonparts)
+            ),
+        });
+
+        const groundPolyline = new Cesium.GroundPolylineGeometry({
+            positions: Cesium.Cartesian3.fromDegreesArray(polygonparts),
+            width: this._surfaceBorderWidth,
+        });
+
+        const instance = new Cesium.GeometryInstance({
+            geometry: polygon,
+        });
+
+        this.polylineOutInstance = new Cesium.GeometryInstance({
+            geometry: groundPolyline,
+        });
+
+        return instance;
+    }
 
 }