合并版本去除贴地

Author: zhaokai

src/service/2DPlot/PlotCanvas.js

@@ -4,7 +4,7 @@
  * @Author: zk
  * @Date: 2022-05-13 10:34:57
  * @LastEditors: zk
- * @LastEditTime: 2022-05-16 19:10:38
+ * @LastEditTime: 2022-05-19 11:28:26
  */
 
 import { DrawPlotObjectFactory2D } from './Draw/DrawPlotObjectFactory2D';
@@ -17,15 +17,15 @@ export default class PlotCanvas {
     constructor() {
         // 标绘对象
         this.m_plotObjects = [];
-        // fabricCanvas 
+        // fabricCanvas
         this._fabricCanvas = null;
         // uuid
         this._layerId = createGuid();
         //  visible
         this._visible = true;
         // event
         this._objectModifiedEventAction = this._objectModifiedEventAction.bind(this);
-        this._eventHandlers=[]
+        this._eventHandlers = [];
     }
 
     /**
@@ -66,6 +66,9 @@ export default class PlotCanvas {
     removeEvent() {
         this._fabricCanvas && this._fabricCanvas.off('object:modified', this._objectModifiedEventAction);
     }
+    /**
+     * @param {{ target: any; action: string; }} event
+     */
     _objectModifiedEventAction(event) {
         const target = event.target;
         if (this.m_plotObjects.indexOf(target) === -1) {
@@ -92,37 +95,37 @@ export default class PlotCanvas {
      * @param {String} eventName 事件名，参考fabricjs Canvas类事件
      * @param {Function} handler 绑定函数
      */
-    on(eventName,handler){
-        this._eventHandlers.push({eventName,handler})
-        this._fabricCanvas.on(eventName,handler)
+    on(eventName, handler) {
+        this._eventHandlers.push({ eventName, handler });
+        this._fabricCanvas.on(eventName, handler);
     }
     /**
      * @function: Module:PlotCanvas.prototype.off
      * @description: 移除监听事件
      * @param {String} eventName 事件名
      * @return {*}
      */
-    off(eventName){
-       this._eventHandlers.forEach((s)=>{
-        if(s.eventName===eventName){
-            this._fabricCanvas.off(s.eventName,s.handler)
-        } 
-       })
+    off(eventName) {
+        this._eventHandlers.forEach((s) => {
+            if (s.eventName === eventName) {
+                this._fabricCanvas.off(s.eventName, s.handler);
+            }
+        });
     }
     /**
      * @function: Module:PlotCanvas.prototype._createHandler
      * @description: 监听函数包装
      * @param {*} handler
      * @return {*}
      */
-    _createHandler(handler){
-        return (event)=>{
+    _createHandler(handler) {
+        return (/** @type {{ target: any; }} */ event) => {
             const target = event.target;
             if (this.m_plotObjects.indexOf(target) === -1) {
                 return;
             }
-            handler(event)
-        }
+            handler(event);
+        };
     }
     /**
      * @function: Module:PlotCanvas.prototype.setCoordSys
@@ -255,7 +258,7 @@ export default class PlotCanvas {
     fromGeoJSON(geoJson) {
         if (geoJson.type === 'FeatureCollection') {
             const { features } = geoJson;
-            features.forEach((s) => {
+            features.forEach((/** @type {any} */ s) => {
                 this.addGeoJSONObject(s);
             });
         } else {
@@ -307,7 +310,7 @@ export default class PlotCanvas {
     /**
      * @function: Module:PlotCanvas.prototype.getPlotObjects
      * @description: 获取标绘对象列表
-     * @return {Array<Object>} 
+     * @return {Array<Object>}
      */
     getPlotObjects() {
         return this.m_plotObjects;
@@ -338,11 +341,69 @@ export default class PlotCanvas {
         }
         this._fabricCanvas.requestRenderAll();
     }
+
+    /**
+     * @function: Module:PlotCanvas.prototype.queryPlotByPoint
+     * @description: 点选标绘对象
+     * @param {{ x: number; y: number; } | [number,number]} point
+     * @return {null | Object} 标绘对象
+     */
+    queryPlotByPoint(point) {
+        const p = Array.isArray(point) ? point : [point.x, point.y];
+        for (let i = 0; i < this.m_plotObjects.length; i++) {
+            const plot = this.m_plotObjects[i];
+            const element = plot.getElement();
+            const bounds = element.getBounds();
+            if (!this._isInBounds(p, bounds)) {
+                return plot;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @function: Module:PlotCanvas.prototype.queryPlotsByBounds
+     * @description: 矩阵选查询
+     * @param {{ left: number; right: number; bottom: number; top: number; }} bounds
+     * @return {*}
+     */
+    queryPlotsByBounds(bounds) {
+        const expPlots = [];
+        const p1 = [bounds.left, bounds.right];
+        const p2 = [bounds.bottom, bounds.top];
+        for (let i = 0; i < this.m_plotObjects.length; i++) {
+            const plot = this.m_plotObjects[i];
+            const element = plot.getElement();
+            const ebounds = element.getBounds();
+            if (!this._isInBounds(p1, ebounds)) {
+                expPlots.push(plot);
+            }
+            if (!this._isInBounds(p2, ebounds)) {
+                expPlots.push(plot);
+            }
+        }
+        return expPlots;
+    }
+    /**
+     * @param {any[]} p
+     * @param {{ left: any; bottom: any; top: any; right: any; }} bounds
+     */
+    _isInBounds(p, bounds) {
+        const left = bounds.left;
+        const bottom = bounds.bottom;
+        const top = bounds.top;
+        const right = bounds.right;
+        if (left < p[0] && p[0] < right && bottom < p[1] && p[1] < top) {
+            return false;
+        }
+        return false;
+    }
+
     /**
      * @function: Module:PlotCanvas.prototype.requestRenderAll
      * @description: 请求渲染
      */
-    requestRenderAll(){
-        this._fabricCanvas.requestRenderAll()
+    requestRenderAll() {
+        this._fabricCanvas.requestRenderAll();
     }
 }

src/service/2DPlot/PlotCanvasGroup.js

@@ -4,7 +4,7 @@
  * @Author: zk
  * @Date: 2022-05-13 11:01:10
  * @LastEditors: zk
- * @LastEditTime: 2022-05-18 14:52:57
+ * @LastEditTime: 2022-05-19 14:54:49
  */
 
 import { fabric } from 'fabric';
@@ -199,35 +199,20 @@ export const PlotCanvasGroup = fabric.util.createClass(fabric.Canvas, {
     /**
      * @function: Module:PlotCanvasGroup.prototype.getPlotObjectById
      * @description: 根据要素id获取要素对象
-     * @param {*} uid
+     * @param {String} uid
      * @return {*}
      */
     getPlotObjectById(uid) {
-        let t;
-        this._objects.forEach((s) => {
-            const elem = s.getElement();
+        let t=null;
+        for(let i =0;i<this._objects.length;i++){
+            const object = this._objects[i]
+            const elem = object.getElement();
             if (elem && elem.getFeatureId() === uid) {
-                t = s;
-            }
-        });
-        return t;
-    },
-    _isInMapBounds(positions, mapBounds) {
-        let flag = false;
-
-        const nw = mapBounds[0];
-        const es = mapBounds[1];
-
-        for (let i = 0; i < positions.length; i++) {
-            const x = positions[i].x;
-            const y = positions[i].y;
-
-            if (x > nw[0] && x < es[0] && y < es[1] && y > nw[1]) {
-                flag = true;
-                break;
-            }
+                t = object;
+                break
+            }  
         }
-        return flag;
+        return t;
     },
     /**
      * @function: Module:PlotCanvasGroup.prototype._renderObjects
@@ -236,12 +221,20 @@ export const PlotCanvasGroup = fabric.util.createClass(fabric.Canvas, {
      * @param {Array<Object>} objects
      */
     _renderObjects(ctx, objects) {
-        const mapBounds = this.getCoordSys().getBounds();
         var i, len;
         for (i = 0, len = objects.length; i < len; ++i) {
             const object = objects[i];
             const element = object.getElement();
-            const flag = element ? this._isInMapBounds(element.positions, mapBounds) : false;
+            const bounds  = element.getBounds()
+            const left = bounds.left
+            const bottom= bounds.bottom
+            const top= bounds.top
+            const right= bounds.right
+            
+            let flag = true
+            if((this.width<left && this.height<bottom) || (top<0 && right<0 ) ){
+                flag=false                
+            }
             flag && object && object.render(ctx);
         }
     }

src/service/2DPlot/Shapes/RegularShapes/PlotRegularObject.js

@@ -3,7 +3,7 @@
  * @Author: zk
  * @Date: 2021-11-17 16:12:55
  * @LastEditors: zk
- * @LastEditTime: 2022-05-18 14:49:44
+ * @LastEditTime: 2022-05-19 14:03:41
  */
 
 import { fabric } from 'fabric';

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

@@ -47,7 +47,6 @@ 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) => {
@@ -63,7 +62,6 @@ 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,6 +271,20 @@ 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,14 +10,9 @@ 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,
-      dimModHeight
+      options.dimModHeight
     );
     this._rotatePart(elem, cesgeo, options);
   }

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

@@ -1,8 +1,8 @@
 /*
  * @Author: your name
  * @Date: 2021-10-25 10:26:48
- * @LastEditTime: 2022-05-18 20:29:50
- * @LastEditors: zk
+ * @LastEditTime: 2022-03-31 14:41:20
+ * @LastEditors: Do not edit
  * @Description: In User Settings Edit
  * @FilePath: \MapGISPlotBase\src\3DPlot\Primitive\ElementInstance\RegularLine1ElementInstance.js
  */
@@ -12,21 +12,21 @@ import MainElement from "../../../../service/PlotBase/SvgLoader/element/extend/M
 import RegularLineElementInstance from "./RegularLineElementInstance";
 
 export default class RegularLine1ElementInstance extends RegularLineElementInstance {
-  pathElemToWallGeomInstance(pathElem, options, sampleHeights) {
+  pathElemToWallGeomInstance(pathElem, options) {
     if (!(pathElem instanceof MainElement)) return undefined;
-    return super.pathElemToWallGeomInstance(pathElem, options, sampleHeights);
+    return super.pathElemToWallGeomInstance(pathElem, options);
   }
 
   transfromGeoCesium(elem, cesgeo, options) {
     super.transfromGeoCesium(elem, cesgeo, options);
     const {dimModAttitude}=options
-    if (dimModAttitude === 1 && elem.getAttitude()){
+    if (dimModAttitude === 1){
       this._rotatePart(elem, cesgeo, options);
     }
   }
 
   _rotatePart(ele, cesGeom, options) {
-    let { dimModHeight } = options;
+    const { dimModHeight } = options;
     if (ele instanceof MainElement) return;
 
     if (!ele._dimModal.is3DTran()) return;
@@ -42,10 +42,6 @@ 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,