Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Buffer implied pointsets, and allow sub-pointsets to be uncontained b… #225

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Buffer implied pointsets, and allow sub-pointsets to be uncontained b… #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c9496b
Buffer implied pointsets, and allow sub-pointsets to be uncontained b…
mattwigway Jan 30, 2017
062a1a1
Use max offstreet walk not distance table size to buffer implied poin…
mattwigway Jan 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/main/java/com/conveyal/r5/analyst/WebMercatorGridPointSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
package com.conveyal.r5.analyst;

import com.conveyal.r5.common.SphericalDistanceLibrary;
import com.conveyal.r5.profile.StreetMode;
import com.conveyal.r5.streets.LinkedPointSet;
import com.conveyal.r5.streets.Split;
import com.conveyal.r5.streets.StreetLayer;
import com.conveyal.r5.transit.TransitLayer;
import com.conveyal.r5.transit.TransportNetwork;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Envelope;
import org.mapdb.Fun;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -50,10 +54,15 @@ public WebMercatorGridPointSet(TransportNetwork transportNetwork) {
LOG.info("Creating web mercator pointset for transport network with extents {}", transportNetwork.streetLayer.envelope);

this.zoom = DEFAULT_ZOOM;
int west = lonToPixel(transportNetwork.streetLayer.envelope.getMinX());
int east = lonToPixel(transportNetwork.streetLayer.envelope.getMaxX());
int north = latToPixel(transportNetwork.streetLayer.envelope.getMaxY());
int south = latToPixel(transportNetwork.streetLayer.envelope.getMinY());

double latBuffer = SphericalDistanceLibrary.metersToDegreesLatitude(LinkedPointSet.MAX_OFFSTREET_WALK_METERS);
double lonBuffer = SphericalDistanceLibrary
.metersToDegreesLongitude(LinkedPointSet.MAX_OFFSTREET_WALK_METERS, transportNetwork.streetLayer.envelope.centre().y);

int west = lonToPixel(transportNetwork.streetLayer.envelope.getMinX() - lonBuffer);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could also be done with

        Envelope envelope = new Envelope(transportNetwork.streetLayer.envelope);
        envelope.expandBy(lonBuffer, latBuffer);

int east = lonToPixel(transportNetwork.streetLayer.envelope.getMaxX() + lonBuffer);
int north = latToPixel(transportNetwork.streetLayer.envelope.getMaxY() + latBuffer);
int south = latToPixel(transportNetwork.streetLayer.envelope.getMinY() - latBuffer);

this.west = west;
this.north = north;
Expand Down
16 changes: 15 additions & 1 deletion src/main/java/com/conveyal/r5/streets/LinkedPointSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,9 @@ public LinkedPointSet(LinkedPointSet sourceLinkage, WebMercatorGridPointSet subG
}
if (superGrid.west > subGrid.west || superGrid.west + superGrid.width < subGrid.west + subGrid.width ||
superGrid.north > subGrid.north || superGrid.north + superGrid.height < subGrid.north + subGrid.height) {
throw new IllegalArgumentException("Sub-grid must lie fully inside the super-grid.");
// we simply warn if it does not lie within the super grid. This used to throw an error but that prevents
// analyses with origins near the edge of the graph.
LOG.warn("Part of sub-grid does not lie with super grid");
}

// Initialize the fields of the new LinkedPointSet instance
Expand All @@ -174,10 +176,22 @@ public LinkedPointSet(LinkedPointSet sourceLinkage, WebMercatorGridPointSet subG
distances0_mm = new int[nCells];
distances1_mm = new int[nCells];

// mark all points as unlinked, in case part of the subGrid lies outside the super grid. Points within the super
// grid will be overwritten below
Arrays.fill(edges, -1);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should be using a symbolic constant like UNLINKED for this, but I guess we have hard-coded -1s all over.


// Copy values over from the source linkage to the new sub-linkage
// x, y, and pixel are relative to the new linkage
for (int y = 0, pixel = 0; y < subGrid.height; y++) {
int row = subGrid.north + y;
boolean rowWithinSuperGrid = row >= superGrid.north && row < superGrid.north + superGrid.height;
if (!rowWithinSuperGrid) continue;

for (int x = 0; x < subGrid.width; x++, pixel++) {
int col = subGrid.west + x;
boolean colWithinSuperGrid = col >= superGrid.west && col < superGrid.west + superGrid.width;
if (!colWithinSuperGrid) continue;

int sourceColumn = subGrid.west + x - superGrid.west;
int sourceRow = subGrid.north + y - superGrid.north;
int sourcePixel = sourceRow * superGrid.width + sourceColumn;
Expand Down