This repository has been archived by the owner on Nov 11, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #261 from conveyal/worker-accessibility
Worker-side single point accessibility
- Loading branch information
Showing
15 changed files
with
346 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
src/main/java/com/conveyal/r5/analyst/GridTransformWrapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| package com.conveyal.r5.analyst; | ||
|
|
||
| import org.locationtech.jts.geom.Envelope; | ||
|
|
||
| import static com.google.common.base.Preconditions.checkArgument; | ||
|
|
||
| /** | ||
| * This wraps a gridded destination pointset (the "source"), remapping its point indexes to match those of another grid. | ||
| * This can be used to stack pointsets of varying dimensions, or to calculate accessibility to pointsets of | ||
| * different dimensions than a travel time surface grid. | ||
| * | ||
| * These wrappers should not be used for linking as they don't have a BasePointSet. Another WebMercatorGridPointSet will | ||
| * be linked, and these will just serve as opportunity grids of identical dimensions during accessibility calculations. | ||
| */ | ||
| public class GridTransformWrapper extends PointSet { | ||
|
|
||
| /** Defer to this PointSet for everything but opportunity counts, including grid dimensions and lat/lon. */ | ||
| private WebMercatorGridPointSet targetGrid; | ||
|
|
||
| /** Defer to this PointSet to get opportunity counts (transforming indexes to those of targetPointSet). */ | ||
| private Grid sourceGrid; | ||
|
|
||
| /** | ||
| * Wraps the sourceGrid such that the opportunity count is read from the geographic locations of indexes in the | ||
| * targetGrid. For the time being, both pointsets must be at the same zoom level. Any opportunities outside the | ||
| * targetGrid cannot be indexed so are effectively zero for the purpose of accessibility calculations. | ||
| */ | ||
| public GridTransformWrapper (WebMercatorExtents targetGridExtents, Grid sourceGrid) { | ||
| checkArgument(targetGridExtents.zoom == sourceGrid.zoom, "Zoom levels must be identical."); | ||
| // Make a pointset for these extents so we can defer to its methods for lat/lon lookup, size, etc. | ||
| this.targetGrid = new WebMercatorGridPointSet(targetGridExtents); | ||
| this.sourceGrid = sourceGrid; | ||
| } | ||
|
|
||
| // Given an index in the targetPointSet, return the corresponding 1D index into the sourceGrid or -1 if the target | ||
| // index is for a point outside the source grid. | ||
| // This could certainly be made more efficient (but complex) by forcing sequential iteration over opportunity counts | ||
| // and disallowing random access, using a new PointSetIterator class that allows reading lat, lon, and counts. | ||
| private int transformIndex (int i) { | ||
| final int x = (i % targetGrid.width) + targetGrid.west - sourceGrid.west; | ||
| final int y = (i / targetGrid.width) + targetGrid.north - sourceGrid.north; | ||
| if (x < 0 || x >= sourceGrid.width || y < 0 || y >= sourceGrid.height) { | ||
| // Point in target grid lies outside source grid, there is no valid index. Return special value. | ||
| return -1; | ||
| } | ||
| return y * sourceGrid.width + x; | ||
| } | ||
|
|
||
| @Override | ||
| public double getLat (int i) { | ||
| return targetGrid.getLat(i); | ||
| } | ||
|
|
||
| @Override | ||
| public double getLon (int i) { | ||
| return targetGrid.getLon(i); | ||
| } | ||
|
|
||
| @Override | ||
| public int featureCount () { | ||
| return targetGrid.featureCount(); | ||
| } | ||
|
|
||
| @Override | ||
| public double sumTotalOpportunities() { | ||
| // Very inefficient compared to the other implementations as it does a lot of index math, but it should work. | ||
| double totalOpportunities = 0; | ||
| for (int i = 0; i < featureCount(); i++) { | ||
| totalOpportunities += getOpportunityCount(i); | ||
| } | ||
| return totalOpportunities; | ||
| } | ||
|
|
||
| @Override | ||
| public double getOpportunityCount (int targetIndex) { | ||
| int sourceindex = transformIndex(targetIndex); | ||
| if (sourceindex < 0) { | ||
| return 0; | ||
| } else { | ||
| return sourceGrid.getOpportunityCount(sourceindex); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public Envelope getWgsEnvelope () { | ||
| return targetGrid.getWgsEnvelope(); | ||
| } | ||
|
|
||
| @Override | ||
| public WebMercatorExtents getWebMercatorExtents () { | ||
| return targetGrid.getWebMercatorExtents(); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.