【fix】修复LineRing在点串中间有和起始点一样的点时会被忽略掉的问题 review by xiongjj

songyumeng · songyumeng · commit d6c95af45225 · 2025-03-26T16:02:35.000+08:00
diff --git a/src/common/commontypes/geometry/LinearRing.js b/src/common/commontypes/geometry/LinearRing.js
@@ -2,6 +2,7 @@
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import {LineString} from './LineString';
+import {Util} from '../Util';
 
 /**
  * @class  GeometryLinearRing
@@ -36,6 +37,20 @@ export class LinearRing extends LineString {
         this.geometryType = "LinearRing";
     }
 
+
+    addComponents(components) {
+        if (!(Util.isArray(components))) {
+            components = [components];
+        }
+        let len = components.length;
+        if (components[0].equals(components[components.length - 1])) {
+            len = components.length - 1;
+        }
+        for (var i = 0; i < len; i++) {
+            this.addComponent(components[i]);
+        }
+    }
+
     /**
      * @function GeometryLinearRing.prototype.addComponent
      * @description 添加一个点到几何图形数组中，如果这个点将要被添加到组件数组的末端，并且与数组中已经存在的最后一个点相同，
@@ -49,18 +64,17 @@ export class LinearRing extends LineString {
         var added = false;
 
         //remove last point
-        var lastPoint = this.components.pop();
+        this.components.pop();
 
         // given an index, add the point
         // without an index only add non-duplicate points
-        if (index != null || !point.equals(lastPoint)) {
+        if (index != null || !point.equals(this.components[this.components.length - 1])) {
             added = super.addComponent.apply(this, arguments);
         }
 
         //append copy of first point
         var firstPoint = this.components[0];
         super.addComponent.apply(this, [firstPoint]);
-
         return added;
     }
 
diff --git a/test/common/commontypes/geometry/LinearRingSpec.js b/test/common/commontypes/geometry/LinearRingSpec.js
@@ -47,4 +47,22 @@ describe('LinearRing', function () {
         expect(pointList2).not.toBeNull();
         expect(pointList2.length).toEqual(5);
     });
+     
+     it('addComponent_duplicate_points', function () {
+        // 第一个点和第4个点一样，但是应该正常渲染，不应该丢弃 ICL-1570
+        var pointsRing = [
+            new GeometryPoint(83.4923281624, 63.2826847261),// 1
+            new GeometryPoint(86.2710459516, 66.4473355416),// 2
+            new GeometryPoint(80.7522036759, 66.4473355416),// 3
+            new GeometryPoint(83.4923281624, 63.2826847261),// 4
+            new GeometryPoint(78.9383184524, 63.2826847261),// 5
+            new GeometryPoint(78.9383184524, 69.9979193833),// 6
+            new GeometryPoint(88.3936775961, 69.9979193833),// 7
+            new GeometryPoint(88.3936775961, 63.4370579366),// 8
+            new GeometryPoint(83.4923281624, 63.2826847261)
+        ];
+        var ring = new GeometryLinearRing(pointsRing);
+        expect(ring.components.length).toEqual(9);
+        expect(ring.components[3].x).toEqual(83.4923281624);
+    });
 });
