Merge pull request #894 from conveyal/mercator-pixel-center

Use pixel centers as points in web Mercator grids
conveyal · Nov 2, 2023 · 0cc9bdd · 0cc9bdd
2 parents 0052049 + 94ae3cc
commit 0cc9bdd
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/com/conveyal/r5/analyst/WebMercatorGridPointSet.java b/src/main/java/com/conveyal/r5/analyst/WebMercatorGridPointSet.java
@@ -12,6 +12,8 @@
 
 import static com.conveyal.r5.analyst.Grid.latToPixel;
 import static com.conveyal.r5.analyst.Grid.lonToPixel;
+import static com.conveyal.r5.analyst.Grid.pixelToCenterLat;
+import static com.conveyal.r5.analyst.Grid.pixelToCenterLon;
 import static com.conveyal.r5.analyst.Grid.pixelToLat;
 import static com.conveyal.r5.analyst.Grid.pixelToLon;
 import static com.conveyal.r5.common.GeometryUtils.checkWgsEnvelopeSize;
@@ -82,14 +84,14 @@ public double sumTotalOpportunities () {
 
     @Override
     public double getLat(int i) {
-        long y = i / extents.width + extents.north;
-        return pixelToLat(y, extents.zoom);
+        final int y = i / extents.width + extents.north;
+        return pixelToCenterLat(y, extents.zoom);
     }
 
     @Override
     public double getLon(int i) {
-        long x = i % extents.width + extents.west;
-        return pixelToLon(x, extents.zoom);
+        final int x = i % extents.width + extents.west;
+        return pixelToCenterLon(x, extents.zoom);
     }
 
     @Override