几何查询测试

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-19 11:28:26
+ * @LastEditTime: 2022-05-24 11:12:29
  */
 
 import { DrawPlotObjectFactory2D } from './Draw/DrawPlotObjectFactory2D';
@@ -342,6 +342,18 @@ export default class PlotCanvas {
         this._fabricCanvas.requestRenderAll();
     }
 
+    /**
+     * @function: Module:PlotCanvas.prototype.queryPlotByLatLng
+     * @description: 点选标绘对象
+     * @param {{lng:number,lat:number}|[number,number]} latlng
+     * @return {*}
+     */
+    queryPlotByLatLng(latlng) {
+        const latlngArr = Array.isArray(latlng) ? latlng : [latlng.lng, latlng.lat];
+        const point = this.getCoordSys().dataToPoint(latlngArr);
+        return this.queryPlotByPoint(point);
+    }
+
     /**
      * @function: Module:PlotCanvas.prototype.queryPlotByPoint
      * @description: 点选标绘对象
@@ -354,13 +366,27 @@ export default class PlotCanvas {
             const plot = this.m_plotObjects[i];
             const element = plot.getElement();
             const bounds = element.getBounds();
-            if (!this._isInBounds(p, bounds)) {
+            if (this._isInBounds(p, bounds)) {
                 return plot;
             }
         }
         return null;
     }
 
+    /**
+     * @function: Module:PlotCanvas.prototype.queryPlotsByLatlngBounds
+     * @description: 矩阵选查询
+     * @param {{ left: number; right: number; bottom: number; top: number; }} bounds
+     * @return {*}
+     */
+    queryPlotsByLatlngBounds(bounds) {
+        const p1 = [bounds.left, bounds.bottom];
+        const p2 = [bounds.right, bounds.top];
+        const coordSys = this.getCoordSys();
+        const leftBottom = coordSys.dataToPoint(p1);
+        const rightTop = coordSys.dataToPoint(p2);
+        return this.queryPlotsByBounds({ left: leftBottom[0], top: leftBottom[1], bottom: rightTop[1], right: rightTop[0] });
+    }
     /**
      * @function: Module:PlotCanvas.prototype.queryPlotsByBounds
      * @description: 矩阵选查询
@@ -369,16 +395,14 @@ export default class PlotCanvas {
      */
     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)) {
+
+            const p1 = [ebounds.left, ebounds.bottom];
+            const p2 = [ebounds.right, ebounds.bottom];
+            if (this._isInBounds(p1, bounds) && this._isInBounds(p2, bounds)) {
                 expPlots.push(plot);
             }
         }
@@ -393,12 +417,18 @@ export default class PlotCanvas {
         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;
+        if (left <= p[0] && p[0] <= right && bottom <= p[1] && p[1] <= top) {
+            return true;
         }
         return false;
     }
 
+    initCoords(){
+        this.m_plotObjects.forEach((s)=>{
+             s.dataToPoint&&s.dataToPoint()
+        })
+    }
+
     /**
      * @function: Module:PlotCanvas.prototype.requestRenderAll
      * @description: 请求渲染

src/service/2DPlot/PlotCanvasGroup.js

@@ -4,7 +4,7 @@
  * @Author: zk
  * @Date: 2022-05-13 11:01:10
  * @LastEditors: zk
- * @LastEditTime: 2022-05-19 14:54:49
+ * @LastEditTime: 2022-05-24 11:15:30
  */
 
 import { fabric } from 'fabric';
@@ -214,13 +214,19 @@ export const PlotCanvasGroup = fabric.util.createClass(fabric.Canvas, {
         }
         return t;
     },
+    initLayerCoords(){
+        this._plotCanvasLayers.forEach(layer => {
+            layer.initCoords()
+        });
+    },
     /**
      * @function: Module:PlotCanvasGroup.prototype._renderObjects
      * @description: 渲染标绘对象代码
      * @param {CanvasRenderingContext2D} ctx
      * @param {Array<Object>} objects
      */
     _renderObjects(ctx, objects) {
+        this.initLayerCoords()
         var i, len;
         for (i = 0, len = objects.length; i < len; ++i) {
             const object = objects[i];

src/service/2DPlot/Shapes/PlotObject.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-05 11:32:52
- * @LastEditTime: 2022-05-16 18:53:37
+ * @LastEditTime: 2022-05-24 11:10:01
  * @LastEditors: zk
  * @Description: In User Settings Edit
  * @FilePath: \MapGISPlot\src\js\Shapes\PlotObject.js
@@ -41,10 +41,9 @@ const PlotObject = fabric.util.createClass(fabric.Object, {
         }
     },
     render: function render(ctx) {
-      if (this.isNotVisible()) {
-        return;
-    }
-        this.dataToPoint();
+        if (this.isNotVisible()) {
+            return;
+        }
         this.setBounds(ctx);
         this.callSuper('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-19 14:03:41
+ * @LastEditTime: 2022-05-24 11:19:36
  */
 
 import { fabric } from 'fabric';