summarylogtreecommitdiffstats
path: root/01-gridpointset-extent-post-v6.4.patch
blob: 797e6d26150f8abe62eecd19a96b3bfae2a04122 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
diff --unified --recursive --text a/src/org/ipea/r5r/R5RCore.java b/src/org/ipea/r5r/R5RCore.java
--- a/src/org/ipea/r5r/R5RCore.java	2022-02-11 18:35:04.000000000 +0200
+++ b/src/org/ipea/r5r/R5RCore.java	2022-02-15 15:21:36.451340481 +0200
@@ -467,16 +467,16 @@
         if (!dropGeometry) { gridTable.addStringColumn("geometry", ""); }
 
         for (int index = 0; index < gridPointSet.featureCount(); index++) {
-            int x = index % gridPointSet.width;
-            int y = index / gridPointSet.width;
+            int x = index % gridPointSet.extents.width;
+            int y = index / gridPointSet.extents.width;
 
             gridTable.append();
             gridTable.set("id", String.valueOf(index));
-            gridTable.set("lat", Grid.pixelToCenterLat(y + gridPointSet.north, resolution));
-            gridTable.set("lon", Grid.pixelToCenterLon(x + gridPointSet.west, resolution));
+            gridTable.set("lat", Grid.pixelToCenterLat(y + gridPointSet.extents.north, resolution));
+            gridTable.set("lon", Grid.pixelToCenterLon(x + gridPointSet.extents.west, resolution));
 
             if (!dropGeometry) {
-                gridTable.set("geometry", Grid.getPixelGeometry(x + gridPointSet.west, y + gridPointSet.north, resolution).toString());
+                gridTable.set("geometry", Grid.getPixelGeometry(x, y, gridPointSet.extents).toString());
             }
         }