refactor(Feature): Feature.pushCoordinates() change in arguments order

BREAKING CHANGE: Feature.pushCoordinates() change in arguments order from pushCoordinates(coordIn, feature) to pushCoordinates(feature, coordIn)
iTowns · Aug 22, 2023 · 44e9532 · 44e9532
1 parent 284c46b
commit 44e9532
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/examples/js/plugins/CSVnVRTParser.js b/examples/js/plugins/CSVnVRTParser.js
@@ -124,7 +124,7 @@ const CSVnVRTParser = (function _() {
                         geometry.startSubGeometry(1, feature);
                         coord.crs = (layer.GeometryField.SRS && layer.GeometryField.SRS.value) || _crs;
                         coord.setFromValues(Number(line[x]), Number(line[y]), Number(line[z]) || 0);
-                        geometry.pushCoordinates(coord, feature);
+                        geometry.pushCoordinates(feature, coord);
 
                         geometry.updateExtent();
                         feature.updateExtent(geometry);

diff --git a/examples/misc_custom_label.html b/examples/misc_custom_label.html
@@ -132,7 +132,7 @@
         // add geometries to feature
         const geometry = feature.bindNewGeometry();
         geometry.startSubGeometry(1, feature);
-        geometry.pushCoordinates(coordinate, feature);
+        geometry.pushCoordinates(feature, coordinate);
         geometry.properties.position = coordinate;
 
         geometry.updateExtent();

diff --git a/src/Core/Feature.js b/src/Core/Feature.js
@@ -135,10 +135,15 @@ export class FeatureGeometry {
 
     /**
      * Push new coordinates in vertices buffer.
-     * @param {Coordinates} coordIn The coordinates to push.
      * @param {Feature} feature - the feature containing the geometry
+     * @param {Coordinates} coordIn The coordinates to push.
      */
-    pushCoordinates(coordIn, feature) {
+    pushCoordinates(feature, coordIn) {
+        if (feature.isCoordinates) {
+            console.warn('Deprecated: change in arguments order, use pushCoordinates(feature, coordIn) instead');
+            this.pushCoordinates(coordIn, feature);
+            return;
+        }
         coordIn.z = this.baseAltitude(feature, coordIn);
 
         coordIn.as(feature.crs, coordOut);

diff --git a/src/Parser/GeoJsonParser.js b/src/Parser/GeoJsonParser.js
@@ -42,7 +42,7 @@ const toFeature = {
         // or list of triplet [[x1, y1, z1], [x2, y2, z2], ..., [xn, yn, zn]]
         for (const triplet of coordinates) {
             coord.setFromValues(triplet[0], triplet[1], triplet[2]);
-            geometry.pushCoordinates(coord, feature);
+            geometry.pushCoordinates(feature, coord);
         }
         geometry.updateExtent();
     },
@@ -58,7 +58,7 @@ const toFeature = {
             coord.setFromValues(coordinates[i][0], coordinates[i][1], coordinates[i][2]);
             sum += (last.x - coord.x) * (last.y + coord.y);
             last.copy(coord);
-            geometry.pushCoordinates(coord, feature);
+            geometry.pushCoordinates(feature, coord);
         }
         sum += (last.x - first.x) * (last.y + first.y);
         geometry.getLastSubGeometry().ccw = sum < 0;

diff --git a/test/unit/feature.js b/test/unit/feature.js
@@ -55,9 +55,9 @@ describe('Feature', function () {
         const geometry = featureLine.bindNewGeometry();
 
         coord.setFromValues(-10, -10, 0);
-        geometry.pushCoordinates(coord, featureLine);
+        geometry.pushCoordinates(featureLine, coord);
         coord.setFromValues(10, 10, 0);
-        geometry.pushCoordinates(coord, featureLine);
+        geometry.pushCoordinates(featureLine, coord);
         geometry.closeSubGeometry(2, featureLine);
 
         featureLine.updateExtent(geometry);