* Version 2.5.0 of protoc.exe has been used to generate this file. *
*/ + public final class GtfsRealtime { private GtfsRealtime() {} public static void registerAllExtensions( @@ -221,6 +223,10 @@ public FeedMessage parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { + // Increase input stream size limit to 2G (instead of the 64M default). + // Mimics a change that was supposed to be released in protobuf 2.7.0, + // see https://git.io/fjfg5. + input.setSizeLimit(Integer.MAX_VALUE); return new FeedMessage(input, extensionRegistry); } }; diff --git a/src/main/java/org/opensphere/geometry/algorithm/ConcaveHull.java b/src/main/java/org/opensphere/geometry/algorithm/ConcaveHull.java index 43819f21311..0b2bdef3da6 100644 --- a/src/main/java/org/opensphere/geometry/algorithm/ConcaveHull.java +++ b/src/main/java/org/opensphere/geometry/algorithm/ConcaveHull.java @@ -13,22 +13,22 @@ import org.opensphere.geometry.triangulation.model.Triangle; import org.opensphere.geometry.triangulation.model.Vertex; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.GeometryCollection; -import com.vividsolutions.jts.geom.GeometryFactory; -import com.vividsolutions.jts.geom.LineSegment; -import com.vividsolutions.jts.geom.LineString; -import com.vividsolutions.jts.geom.LinearRing; -import com.vividsolutions.jts.geom.Point; -import com.vividsolutions.jts.geom.Polygon; -import com.vividsolutions.jts.geom.impl.CoordinateArraySequence; -import com.vividsolutions.jts.operation.linemerge.LineMerger; -import com.vividsolutions.jts.triangulate.ConformingDelaunayTriangulationBuilder; -import com.vividsolutions.jts.triangulate.quadedge.QuadEdge; -import com.vividsolutions.jts.triangulate.quadedge.QuadEdgeSubdivision; -import com.vividsolutions.jts.triangulate.quadedge.QuadEdgeTriangle; -import com.vividsolutions.jts.util.UniqueCoordinateArrayFilter; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.GeometryCollection; +import org.locationtech.jts.geom.GeometryFactory; +import org.locationtech.jts.geom.LineSegment; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.LinearRing; +import org.locationtech.jts.geom.Point; +import org.locationtech.jts.geom.Polygon; +import org.locationtech.jts.geom.impl.CoordinateArraySequence; +import org.locationtech.jts.operation.linemerge.LineMerger; +import org.locationtech.jts.triangulate.ConformingDelaunayTriangulationBuilder; +import org.locationtech.jts.triangulate.quadedge.QuadEdge; +import org.locationtech.jts.triangulate.quadedge.QuadEdgeSubdivision; +import org.locationtech.jts.triangulate.quadedge.QuadEdgeTriangle; +import org.locationtech.jts.util.UniqueCoordinateArrayFilter; /** * Computes a concave hull of a {@link Geometry} which is @@ -179,11 +179,11 @@ private Geometry concaveHull() { CollectionThe set of modes that a user is willing to use, with qualifiers stating whether vehicles should be parked, rented, etc.
*The possible values of the comma-separated list are:
@@ -214,18 +214,18 @@ public abstract class RoutingResource { * to wait for preferred route. */ @QueryParam("otherThanPreferredRoutesPenalty") protected Integer otherThanPreferredRoutesPenalty; - + /** The comma-separated list of preferred agencies. */ @QueryParam("preferredAgencies") protected String preferredAgencies; - + /** * The list of unpreferred routes. The format is agency_[routename][_routeid], so TriMet_100 (100 is route short name) or Trimet__42 (two * underscores, 42 is the route internal ID). */ @QueryParam("unpreferredRoutes") protected String unpreferredRoutes; - + /** The comma-separated list of unpreferred agencies. */ @QueryParam("unpreferredAgencies") protected String unpreferredAgencies; @@ -243,14 +243,14 @@ public abstract class RoutingResource { */ @QueryParam("walkBoardCost") protected Integer walkBoardCost; - + /** * Prevents unnecessary transfers by adding a cost for boarding a vehicle. This is the cost that * is used when boarding while cycling. This is usually higher that walkBoardCost. */ @QueryParam("bikeBoardCost") protected Integer bikeBoardCost; - + /** * The comma-separated list of banned routes. The format is agency_[routename][_routeid], so TriMet_100 (100 is route short name) or Trimet__42 * (two underscores, 42 is the route internal ID). @@ -263,7 +263,7 @@ public abstract class RoutingResource { */ @QueryParam("whiteListedRoutes") protected String whiteListedRoutes; - + /** The comma-separated list of banned agencies. */ @QueryParam("bannedAgencies") protected String bannedAgencies; @@ -273,7 +273,7 @@ public abstract class RoutingResource { */ @QueryParam("whiteListedAgencies") protected String whiteListedAgencies; - + /** The comma-separated list of banned trips. The format is agency_trip[:stop*], so: * TriMet_24601 or TriMet_24601:0:1:2:17:18:19 */ @@ -288,7 +288,7 @@ public abstract class RoutingResource { */ @QueryParam("bannedStops") protected String bannedStops; - + /** A comma-separated list of banned stops. A stop is banned by ignoring its * pre-board and pre-alight edges. This means the stop will be reachable via the * street network. It is not possible to travel through the stop. @@ -298,7 +298,7 @@ public abstract class RoutingResource { */ @QueryParam("bannedStopsHard") protected String bannedStopsHard; - + /** * An additional penalty added to boardings after the first. The value is in OTP's * internal weight units, which are roughly equivalent to seconds. Set this to a high @@ -307,7 +307,7 @@ public abstract class RoutingResource { */ @QueryParam("transferPenalty") protected Integer transferPenalty; - + /** * An additional penalty added to boardings after the first when the transfer is not * preferred. Preferred transfers also include timed transfers. The value is in OTP's @@ -318,7 +318,7 @@ public abstract class RoutingResource { */ @QueryParam("nonpreferredTransferPenalty") protected Integer nonpreferredTransferPenalty; - + /** The maximum number of transfers (that is, one plus the maximum number of boardings) * that a trip will be allowed. Larger values will slow performance, but could give * better routes. This is limited on the server side by the MAX_TRANSFERS value in @@ -361,10 +361,10 @@ public abstract class RoutingResource { */ @QueryParam("reverseOptimizeOnTheFly") protected Boolean reverseOptimizeOnTheFly; - + @QueryParam("boardSlack") private Integer boardSlack; - + @QueryParam("alightSlack") private Integer alightSlack; @@ -384,6 +384,36 @@ public abstract class RoutingResource { @QueryParam("disableRemainingWeightHeuristic") protected Boolean disableRemainingWeightHeuristic; + /* + * Control the size of flag-stop buffer returned in API response. This parameter only applies + * to GTFS-Flex routing, which must be explicitly turned on via the useFlexService parameter in + * router-config.json. + */ + @QueryParam("flexFlagStopBufferSize") + protected Double flexFlagStopBufferSize; + + /** + * Whether to use reservation-based services + */ + @QueryParam("flexUseReservationServices") + protected Boolean flexUseReservationServices = true; + + /** + * Whether to use eligibility-based services + */ + @QueryParam("flexUseEligibilityServices") + protected Boolean flexUseEligibilityServices = true; + + /** + * Whether to ignore DRT time limits. + * + * According to the GTFS-flex spec, demand-response transit (DRT) service must be reserved + * at least `drt_advance_book_min` minutes in advance. OTP not allow DRT service to be used + * inside that time window, unless this parameter is set to true. + */ + @QueryParam("flexIgnoreDrtAdvanceBookMin") + protected Boolean flexIgnoreDrtAdvanceBookMin; + @QueryParam("maxHours") private Double maxHours; @@ -471,8 +501,8 @@ public abstract class RoutingResource { @QueryParam("maximumMicromobilitySpeed") private Double maximumMicromobilitySpeed; - /* - * somewhat ugly bug fix: the graphService is only needed here for fetching per-graph time zones. + /* + * somewhat ugly bug fix: the graphService is only needed here for fetching per-graph time zones. * this should ideally be done when setting the routing context, but at present departure/ * arrival time is stored in the request as an epoch time with the TZ already resolved, and other * code depends on this behavior. (AMB) @@ -526,6 +556,8 @@ protected RoutingRequest buildRequest() throws ParameterException { } else { request.setDateTime(date, time, tz); } + + request.resetClockTime(); } if (wheelchair != null) @@ -626,7 +658,7 @@ protected RoutingRequest buildRequest() throws ParameterException { request.setWhiteListedAgencies(whiteListedAgencies); HashMapWalk) used when traversing this leg.
*/
- @XmlAttribute
@JsonSerialize
public String mode = TraverseMode.WALK.toString();
@@ -82,30 +78,24 @@ public class Leg {
* For transit legs, the route of the bus or train being used. For non-transit legs, the name of
* the street being traversed.
*/
- @XmlAttribute
@JsonSerialize
public String route = "";
- @XmlAttribute
@JsonSerialize
public String agencyName;
- @XmlAttribute
@JsonSerialize
public String agencyUrl;
- @XmlAttribute
@JsonSerialize
public String agencyBrandingUrl;
- @XmlAttribute
@JsonSerialize
public int agencyTimeZoneOffset;
/**
* For transit leg, the route's (background) color (if one exists). For non-transit legs, null.
*/
- @XmlAttribute
@JsonSerialize
public String routeColor = null;
@@ -115,10 +105,9 @@ public class Leg {
* When equal or highter than 100, it is coded using the Hierarchical Vehicle Type (HVT) codes from the European TPEG standard
* Also see http://groups.google.com/group/gtfs-changes/msg/ed917a69cf8c5bef
*/
- @XmlAttribute
@JsonSerialize
public Integer routeType = null;
-
+
/**
* For transit legs, the ID of the route.
* For non-transit legs, null.
@@ -128,36 +117,31 @@ public class Leg {
/**
* For transit leg, the route's text color (if one exists). For non-transit legs, null.
*/
- @XmlAttribute
@JsonSerialize
public String routeTextColor = null;
/**
* For transit legs, if the rider should stay on the vehicle as it changes route names.
*/
- @XmlAttribute
@JsonSerialize
public Boolean interlineWithPreviousLeg;
-
+
/**
* For transit leg, the trip's short name (if one exists). For non-transit legs, null.
*/
- @XmlAttribute
@JsonSerialize
public String tripShortName = null;
/**
* For transit leg, the trip's block ID (if one exists). For non-transit legs, null.
*/
- @XmlAttribute
@JsonSerialize
public String tripBlockId = null;
-
+
/**
* For transit legs, the headsign of the bus or train being used. For non-transit legs, null.
*/
- @XmlAttribute
@JsonSerialize
public String headsign = null;
@@ -165,36 +149,33 @@ public class Leg {
* For transit legs, the ID of the transit agency that operates the service used for this leg.
* For non-transit legs, null.
*/
- @XmlAttribute
@JsonSerialize
public String agencyId = null;
-
+
/**
* For transit legs, the ID of the trip.
* For non-transit legs, null.
*/
public FeedScopedId tripId = null;
-
+
/**
* For transit legs, the service date of the trip.
* For non-transit legs, null.
*/
- @XmlAttribute
@JsonSerialize
public String serviceDate = null;
- /**
- * For transit leg, the route's branding URL (if one exists). For non-transit legs, null.
- */
- @XmlAttribute
- @JsonSerialize
- public String routeBrandingUrl = null;
+ /**
+ * For transit leg, the route's branding URL (if one exists). For non-transit legs, null.
+ */
+ @JsonSerialize
+ public String routeBrandingUrl = null;
- /**
+ /**
* The Place where the leg originates.
*/
public Place from = null;
-
+
/**
* The Place where the leg begins.
*/
@@ -205,7 +186,6 @@ public class Leg {
* For non-transit legs, null.
* This field is optional i.e. it is always null unless "showIntermediateStops" parameter is set to "true" in the planner request.
*/
- @XmlElementWrapper(name = "intermediateStops")
@JsonProperty(value="intermediateStops")
public Listdoubles
- *
- * @param coordinates
- * @param dimension
*/
public Float(double[] coordinates, int dimensions) {
this.coords = new float[coordinates.length];
@@ -386,8 +388,6 @@ public Float(Coordinate[] coordinates, int dimension) {
/**
* Constructs an empty packed coordinate sequence of a given size and dimension
- *
- * @param coordinates
*/
public Float(int size, int dimension) {
this.dimension = dimension;
@@ -395,7 +395,7 @@ public Float(int size, int dimension) {
}
/**
- * @see com.vividsolutions.jts.geom.CoordinateSequence#getCoordinate(int)
+ * @see org.locationtech.jts.geom.CoordinateSequence#getCoordinate(int)
*/
public Coordinate getCoordinateInternal(int i) {
double x = coords[i * dimension];
@@ -405,7 +405,7 @@ public Coordinate getCoordinateInternal(int i) {
}
/**
- * @see com.vividsolutions.jts.geom.CoordinateSequence#size()
+ * @see org.locationtech.jts.geom.CoordinateSequence#size()
*/
public int size() {
return coords.length / dimension;
@@ -421,7 +421,7 @@ public Object clone() {
}
/**
- * @see com.vividsolutions.jts.geom.CoordinateSequence#getOrdinate(int, int) Beware, for
+ * @see org.locationtech.jts.geom.CoordinateSequence#getOrdinate(int, int) Beware, for
* performace reasons the ordinate index is not checked, if it's over dimensions you
* may not get an exception but a meaningless value.
*/
@@ -430,7 +430,7 @@ public double getOrdinate(int index, int ordinate) {
}
/**
- * @see com.vividsolutions.jts.geom.PackedCoordinateSequence#setOrdinate(int, int, double)
+ * @see org.locationtech.jts.geom.CoordinateSequence#setOrdinate(int, int, double)
*/
public void setOrdinate(int index, int ordinate, double value) {
coordRef = null;
@@ -444,6 +444,12 @@ public Envelope expandEnvelope(Envelope env) {
return env;
}
+ @Override
+ public CoordinateSequence copy() {
+ Float clone = (Float) super.clone();
+ clone.coords = coords.clone();
+ return clone;
+ }
}
public String toString() {
diff --git a/src/main/java/org/opentripplanner/common/geometry/RecursiveGridIsolineBuilder.java b/src/main/java/org/opentripplanner/common/geometry/RecursiveGridIsolineBuilder.java
index e6a09d16b3f..d1b4483ec42 100644
--- a/src/main/java/org/opentripplanner/common/geometry/RecursiveGridIsolineBuilder.java
+++ b/src/main/java/org/opentripplanner/common/geometry/RecursiveGridIsolineBuilder.java
@@ -15,12 +15,12 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.vividsolutions.jts.algorithm.CGAlgorithms;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.Polygon;
+import org.locationtech.jts.algorithm.CGAlgorithms;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
/**
* Compute isoline based on a zFunc and a set of initial coverage points P0={(x,y)} to seed the
diff --git a/src/main/java/org/opentripplanner/common/geometry/ReversibleLineStringWrapper.java b/src/main/java/org/opentripplanner/common/geometry/ReversibleLineStringWrapper.java
index 04a9011d64a..94420a95a57 100644
--- a/src/main/java/org/opentripplanner/common/geometry/ReversibleLineStringWrapper.java
+++ b/src/main/java/org/opentripplanner/common/geometry/ReversibleLineStringWrapper.java
@@ -1,7 +1,7 @@
package org.opentripplanner.common.geometry;
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.LineString;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.LineString;
public class ReversibleLineStringWrapper {
diff --git a/src/main/java/org/opentripplanner/common/geometry/Serializable2DPackedCoordinateSequenceFactory.java b/src/main/java/org/opentripplanner/common/geometry/Serializable2DPackedCoordinateSequenceFactory.java
index 0aaab78fa85..9efd40c3b47 100644
--- a/src/main/java/org/opentripplanner/common/geometry/Serializable2DPackedCoordinateSequenceFactory.java
+++ b/src/main/java/org/opentripplanner/common/geometry/Serializable2DPackedCoordinateSequenceFactory.java
@@ -2,9 +2,9 @@
import java.io.Serializable;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.CoordinateSequenceFactory;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFactory;
public class Serializable2DPackedCoordinateSequenceFactory implements Serializable, CoordinateSequenceFactory {
@@ -13,7 +13,6 @@ public class Serializable2DPackedCoordinateSequenceFactory implements Serializab
@Override
public CoordinateSequence create(Coordinate[] coordinates) {
return new PackedCoordinateSequence.Double(coordinates, 2);
- //return new IntPackedCoordinateSequence(coordinates);
}
@Override
@@ -23,8 +22,7 @@ public CoordinateSequence create(CoordinateSequence coordSeq) {
@Override
public CoordinateSequence create(int size, int dimension) {
- throw new UnsupportedOperationException();
+ return new PackedCoordinateSequence.Double(size, dimension);
}
-
}
diff --git a/src/main/java/org/opentripplanner/common/geometry/SparseMatrixZSampleGrid.java b/src/main/java/org/opentripplanner/common/geometry/SparseMatrixZSampleGrid.java
index 20fd8cc538f..646b103be48 100644
--- a/src/main/java/org/opentripplanner/common/geometry/SparseMatrixZSampleGrid.java
+++ b/src/main/java/org/opentripplanner/common/geometry/SparseMatrixZSampleGrid.java
@@ -4,7 +4,7 @@
import java.util.Iterator;
import java.util.List;
-import com.vividsolutions.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Coordinate;
/**
* A generic indexed grid of Z samples.
diff --git a/src/main/java/org/opentripplanner/common/geometry/SphericalDistanceLibrary.java b/src/main/java/org/opentripplanner/common/geometry/SphericalDistanceLibrary.java
index 3e77a3030dd..50f570f37c1 100644
--- a/src/main/java/org/opentripplanner/common/geometry/SphericalDistanceLibrary.java
+++ b/src/main/java/org/opentripplanner/common/geometry/SphericalDistanceLibrary.java
@@ -10,10 +10,10 @@
import org.apache.commons.math3.util.FastMath;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.Point;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
public abstract class SphericalDistanceLibrary {
diff --git a/src/main/java/org/opentripplanner/common/geometry/Subgraph.java b/src/main/java/org/opentripplanner/common/geometry/Subgraph.java
index 6757ea1c1cd..5d9e1c964e5 100644
--- a/src/main/java/org/opentripplanner/common/geometry/Subgraph.java
+++ b/src/main/java/org/opentripplanner/common/geometry/Subgraph.java
@@ -8,10 +8,10 @@
import org.opentripplanner.routing.graph.Vertex;
import org.opentripplanner.routing.vertextype.TransitVertex;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.MultiPoint;
public class Subgraph {
diff --git a/src/main/java/org/opentripplanner/common/geometry/ZSampleGrid.java b/src/main/java/org/opentripplanner/common/geometry/ZSampleGrid.java
index 7d3d875879b..20dcdab3834 100644
--- a/src/main/java/org/opentripplanner/common/geometry/ZSampleGrid.java
+++ b/src/main/java/org/opentripplanner/common/geometry/ZSampleGrid.java
@@ -2,7 +2,7 @@
import org.opentripplanner.common.geometry.ZSampleGrid.ZSamplePoint;
-import com.vividsolutions.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Coordinate;
/**
* A generic indexed grid of TZ samples. TZ could be anything but is usually a vector of parameters.
diff --git a/src/main/java/org/opentripplanner/common/model/GenericLocation.java b/src/main/java/org/opentripplanner/common/model/GenericLocation.java
index abce800e442..fc7fe652b4f 100644
--- a/src/main/java/org/opentripplanner/common/model/GenericLocation.java
+++ b/src/main/java/org/opentripplanner/common/model/GenericLocation.java
@@ -4,7 +4,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.vividsolutions.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Coordinate;
/**
* Class describing a location provided by clients of routing. Used to describe end points (origin, destination) of a routing request as well as any
@@ -54,8 +54,10 @@ public class GenericLocation implements Cloneable, Serializable {
private static final String _doublePattern = "-{0,1}\\d+(\\.\\d+){0,1}";
// We want to ignore any number of non-digit characters at the beginning of the string, except
- // that signs are also non-digits. So ignore any number of non-(digit or sign or decimal point).
- private static final Pattern _latLonPattern = Pattern.compile("[^[\\d&&[-|+|.]]]*(" + _doublePattern
+ // that signs are also non-digits. So ignore any number of non-(digit or sign or decimal point).
+ // Regex has been rewritten following https://bugs.openjdk.java.net/browse/JDK-8189343
+ // from "[^[\\d&&[-|+|.]]]*(" to "[\\D&&[^-+.]]*("
+ private static final Pattern _latLonPattern = Pattern.compile("[\\D&&[^-+.]]*(" + _doublePattern
+ ")(\\s*,\\s*|\\s+)(" + _doublePattern + ")\\D*");
private static final Pattern _headingPattern = Pattern.compile("\\D*heading=("
diff --git a/src/main/java/org/opentripplanner/geocoder/AlternatingGeocoder.java b/src/main/java/org/opentripplanner/geocoder/AlternatingGeocoder.java
index b9d36adbe9f..506d6212504 100644
--- a/src/main/java/org/opentripplanner/geocoder/AlternatingGeocoder.java
+++ b/src/main/java/org/opentripplanner/geocoder/AlternatingGeocoder.java
@@ -1,6 +1,6 @@
package org.opentripplanner.geocoder;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
public class AlternatingGeocoder implements Geocoder {
diff --git a/src/main/java/org/opentripplanner/geocoder/BackupGeocoder.java b/src/main/java/org/opentripplanner/geocoder/BackupGeocoder.java
index 262a5c3a6fe..c865ed2ab3f 100644
--- a/src/main/java/org/opentripplanner/geocoder/BackupGeocoder.java
+++ b/src/main/java/org/opentripplanner/geocoder/BackupGeocoder.java
@@ -1,6 +1,6 @@
package org.opentripplanner.geocoder;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
/**
* Multiplexe two geocoders: a master and a backup.
diff --git a/src/main/java/org/opentripplanner/geocoder/Geocoder.java b/src/main/java/org/opentripplanner/geocoder/Geocoder.java
index b6a08dedebe..3fb093c8138 100644
--- a/src/main/java/org/opentripplanner/geocoder/Geocoder.java
+++ b/src/main/java/org/opentripplanner/geocoder/Geocoder.java
@@ -1,6 +1,6 @@
package org.opentripplanner.geocoder;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
public interface Geocoder {
diff --git a/src/main/java/org/opentripplanner/geocoder/GeocoderGeoZoneCropper.java b/src/main/java/org/opentripplanner/geocoder/GeocoderGeoZoneCropper.java
index cac20b40d9e..0bd563c4280 100644
--- a/src/main/java/org/opentripplanner/geocoder/GeocoderGeoZoneCropper.java
+++ b/src/main/java/org/opentripplanner/geocoder/GeocoderGeoZoneCropper.java
@@ -7,7 +7,7 @@
import org.opentripplanner.geocoder.GeocoderResult;
import org.opentripplanner.geocoder.GeocoderResults;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
/**
* Filter results of a geocoding request by removing elements outside of the covered geographical
diff --git a/src/main/java/org/opentripplanner/geocoder/GeocoderMultipleResultsStubImpl.java b/src/main/java/org/opentripplanner/geocoder/GeocoderMultipleResultsStubImpl.java
index bb67cb6bfe0..108a691d80f 100644
--- a/src/main/java/org/opentripplanner/geocoder/GeocoderMultipleResultsStubImpl.java
+++ b/src/main/java/org/opentripplanner/geocoder/GeocoderMultipleResultsStubImpl.java
@@ -2,7 +2,7 @@
import java.util.Collection;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
public class GeocoderMultipleResultsStubImpl implements Geocoder {
diff --git a/src/main/java/org/opentripplanner/geocoder/GeocoderNullImpl.java b/src/main/java/org/opentripplanner/geocoder/GeocoderNullImpl.java
index a9526cd8d8c..9296901528c 100644
--- a/src/main/java/org/opentripplanner/geocoder/GeocoderNullImpl.java
+++ b/src/main/java/org/opentripplanner/geocoder/GeocoderNullImpl.java
@@ -1,6 +1,6 @@
package org.opentripplanner.geocoder;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
public class GeocoderNullImpl implements Geocoder {
diff --git a/src/main/java/org/opentripplanner/geocoder/GeocoderResults.java b/src/main/java/org/opentripplanner/geocoder/GeocoderResults.java
index 46e19dd8804..dbaa784f725 100644
--- a/src/main/java/org/opentripplanner/geocoder/GeocoderResults.java
+++ b/src/main/java/org/opentripplanner/geocoder/GeocoderResults.java
@@ -3,14 +3,9 @@
import java.util.ArrayList;
import java.util.Collection;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
import com.fasterxml.jackson.annotation.JsonProperty;
-@XmlRootElement
public class GeocoderResults {
private String error;
@@ -26,7 +21,6 @@ public GeocoderResults(Collection results) {
this.results = results;
}
- @XmlElement(required=false)
public String getError() {
return error;
}
@@ -36,9 +30,6 @@ public void setError(String error) {
this.error = error;
}
-
- @XmlElementWrapper(name="results")
- @XmlElement(name="result")
@JsonProperty(value="results")
public Collection getResults() {
return results;
@@ -55,7 +46,6 @@ public void addResult(GeocoderResult result) {
results.add(result);
}
- @XmlElement(name="count")
public int getCount() {
return results != null ? results.size() : 0;
}
diff --git a/src/main/java/org/opentripplanner/geocoder/GeocoderStubImpl.java b/src/main/java/org/opentripplanner/geocoder/GeocoderStubImpl.java
index 3cb4ea7ca12..3886f5097ec 100644
--- a/src/main/java/org/opentripplanner/geocoder/GeocoderStubImpl.java
+++ b/src/main/java/org/opentripplanner/geocoder/GeocoderStubImpl.java
@@ -2,7 +2,7 @@
import java.util.Arrays;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
public class GeocoderStubImpl implements Geocoder {
diff --git a/src/main/java/org/opentripplanner/geocoder/GeocoderUSCSV.java b/src/main/java/org/opentripplanner/geocoder/GeocoderUSCSV.java
index 1b682b64750..d37c0433769 100644
--- a/src/main/java/org/opentripplanner/geocoder/GeocoderUSCSV.java
+++ b/src/main/java/org/opentripplanner/geocoder/GeocoderUSCSV.java
@@ -12,7 +12,7 @@
import javax.ws.rs.core.UriBuilder;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
public class GeocoderUSCSV implements Geocoder {
diff --git a/src/main/java/org/opentripplanner/geocoder/bano/BanoGeocoder.java b/src/main/java/org/opentripplanner/geocoder/bano/BanoGeocoder.java
index 61b66f8a29e..95a0ec3af10 100644
--- a/src/main/java/org/opentripplanner/geocoder/bano/BanoGeocoder.java
+++ b/src/main/java/org/opentripplanner/geocoder/bano/BanoGeocoder.java
@@ -2,7 +2,7 @@
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
import org.geojson.Feature;
import org.geojson.FeatureCollection;
import org.geojson.GeoJsonObject;
diff --git a/src/main/java/org/opentripplanner/geocoder/google/GoogleGeocoder.java b/src/main/java/org/opentripplanner/geocoder/google/GoogleGeocoder.java
index ce9a5eeffb4..4b7d35a938e 100644
--- a/src/main/java/org/opentripplanner/geocoder/google/GoogleGeocoder.java
+++ b/src/main/java/org/opentripplanner/geocoder/google/GoogleGeocoder.java
@@ -1,6 +1,6 @@
package org.opentripplanner.geocoder.google;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
import org.opentripplanner.geocoder.Geocoder;
import org.opentripplanner.geocoder.GeocoderResult;
import org.opentripplanner.geocoder.GeocoderResults;
diff --git a/src/main/java/org/opentripplanner/geocoder/nominatim/NominatimGeocoder.java b/src/main/java/org/opentripplanner/geocoder/nominatim/NominatimGeocoder.java
index 31285e4dcee..c11d34ecedc 100644
--- a/src/main/java/org/opentripplanner/geocoder/nominatim/NominatimGeocoder.java
+++ b/src/main/java/org/opentripplanner/geocoder/nominatim/NominatimGeocoder.java
@@ -1,6 +1,6 @@
package org.opentripplanner.geocoder.nominatim;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
import org.opentripplanner.geocoder.Geocoder;
import org.opentripplanner.geocoder.GeocoderResult;
import org.opentripplanner.geocoder.GeocoderResults;
diff --git a/src/main/java/org/opentripplanner/geocoder/reverse/MunicoderServer.java b/src/main/java/org/opentripplanner/geocoder/reverse/MunicoderServer.java
index 72aa28d7a73..01332c7a1b3 100644
--- a/src/main/java/org/opentripplanner/geocoder/reverse/MunicoderServer.java
+++ b/src/main/java/org/opentripplanner/geocoder/reverse/MunicoderServer.java
@@ -8,8 +8,8 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-/*import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;*/
+/*import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;*/
@Path("/municoder")
diff --git a/src/main/java/org/opentripplanner/geocoder/reverse/ShapefileBoundaryResolver.java b/src/main/java/org/opentripplanner/geocoder/reverse/ShapefileBoundaryResolver.java
index c14736ef869..d7840a29fab 100644
--- a/src/main/java/org/opentripplanner/geocoder/reverse/ShapefileBoundaryResolver.java
+++ b/src/main/java/org/opentripplanner/geocoder/reverse/ShapefileBoundaryResolver.java
@@ -11,10 +11,10 @@
import org.opengis.feature.Feature;
import org.opengis.feature.simple.SimpleFeature;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
public class ShapefileBoundaryResolver implements BoundaryResolver {
diff --git a/src/main/java/org/opentripplanner/geocoder/yahoo/YahooGeocoder.java b/src/main/java/org/opentripplanner/geocoder/yahoo/YahooGeocoder.java
index bdf9e396765..89f44b689e4 100644
--- a/src/main/java/org/opentripplanner/geocoder/yahoo/YahooGeocoder.java
+++ b/src/main/java/org/opentripplanner/geocoder/yahoo/YahooGeocoder.java
@@ -1,6 +1,6 @@
package org.opentripplanner.geocoder.yahoo;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
import org.opentripplanner.geocoder.Geocoder;
import org.opentripplanner.geocoder.GeocoderResult;
import org.opentripplanner.geocoder.GeocoderResults;
diff --git a/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java b/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java
index 6f1dcd5bc56..d8f338b5f3b 100644
--- a/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java
+++ b/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java
@@ -24,7 +24,6 @@
import org.opentripplanner.reflect.ReflectionLibrary;
import org.opentripplanner.routing.core.RoutingRequest;
import org.opentripplanner.routing.graph.Graph;
-import org.opentripplanner.routing.graph.Graph.LoadLevel;
import org.opentripplanner.standalone.CommandLineParameters;
import org.opentripplanner.standalone.GraphBuilderParameters;
import org.opentripplanner.standalone.OTPMain;
@@ -47,7 +46,7 @@
* It is modular: GraphBuilderModules are placed in a list and run in sequence.
*/
public class GraphBuilder implements Runnable {
-
+
private static Logger LOG = LoggerFactory.getLogger(GraphBuilder.class);
public static final String BUILDER_CONFIG_FILENAME = "build-config.json";
@@ -55,13 +54,13 @@ public class GraphBuilder implements Runnable {
private List _graphBuilderModules = new ArrayList();
private final File graphFile;
-
+
private boolean _alwaysRebuild = true;
private List modeList;
-
+
private String baseGraph = null;
-
+
private Graph graph = new Graph();
/** Should the graph be serialized to disk after being created or not? */
@@ -83,11 +82,11 @@ public void setGraphBuilders(List graphLoaders) {
public void setAlwaysRebuild(boolean alwaysRebuild) {
_alwaysRebuild = alwaysRebuild;
}
-
+
public void setBaseGraph(String baseGraph) {
this.baseGraph = baseGraph;
try {
- graph = Graph.load(new File(baseGraph), LoadLevel.FULL);
+ graph = Graph.load(new File(baseGraph));
} catch (Exception e) {
throw new RuntimeException("error loading base graph");
}
@@ -100,7 +99,7 @@ public void addMode(RoutingRequest mo) {
public void setModes(List modeList) {
this.modeList = modeList;
}
-
+
public Graph getGraph() {
return this.graph;
}
@@ -110,7 +109,7 @@ public void run() {
long startTime = System.currentTimeMillis();
if (serializeGraph) {
-
+
if (graphFile == null) {
throw new RuntimeException("graphBuilderTask has no attribute graphFile.");
}
@@ -119,7 +118,7 @@ public void run() {
LOG.info("graph already exists and alwaysRebuild=false => skipping graph build");
return;
}
-
+
try {
if (!graphFile.getParentFile().exists()) {
if (!graphFile.getParentFile().mkdirs()) {
@@ -193,24 +192,24 @@ public static GraphBuilder forDirectory(CommandLineParameters params, File dir)
for (File file : dir.listFiles()) {
switch (InputFileType.forFile(file)) {
- case GTFS:
- LOG.info("Found GTFS file {}", file);
- gtfsFiles.add(file);
- break;
- case OSM:
- LOG.info("Found OSM file {}", file);
- osmFiles.add(file);
- break;
- case DEM:
- if (!builderParams.fetchElevationUS && demFile == null) {
- LOG.info("Found DEM file {}", file);
- demFile = file;
- } else {
- LOG.info("Skipping DEM file {}", file);
- }
- break;
- case OTHER:
- LOG.warn("Skipping unrecognized file '{}'", file);
+ case GTFS:
+ LOG.info("Found GTFS file {}", file);
+ gtfsFiles.add(file);
+ break;
+ case OSM:
+ LOG.info("Found OSM file {}", file);
+ osmFiles.add(file);
+ break;
+ case DEM:
+ if (!builderParams.fetchElevationUS && demFile == null) {
+ LOG.info("Found DEM file {}", file);
+ demFile = file;
+ } else {
+ LOG.info("Skipping DEM file {}", file);
+ }
+ break;
+ case OTHER:
+ LOG.warn("Skipping unrecognized file '{}'", file);
}
}
boolean hasOSM = builderParams.streets && !osmFiles.isEmpty();
@@ -299,7 +298,8 @@ public static GraphBuilder forDirectory(CommandLineParameters params, File dir)
params.cacheDirectory,
builderParams.readCachedElevations,
builderParams.writeCachedElevations,
- builderParams.includeEllipsoidToGeoidDifference
+ builderParams.includeEllipsoidToGeoidDifference,
+ builderParams.elevationUnitMultiplier
)
);
}
diff --git a/src/main/java/org/opentripplanner/graph_builder/GraphStats.java b/src/main/java/org/opentripplanner/graph_builder/GraphStats.java
index 59e70e0dcb5..148ff5bb47e 100644
--- a/src/main/java/org/opentripplanner/graph_builder/GraphStats.java
+++ b/src/main/java/org/opentripplanner/graph_builder/GraphStats.java
@@ -29,10 +29,10 @@
import com.csvreader.CsvWriter;
import com.google.common.collect.Multiset;
import com.google.common.collect.TreeMultiset;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.linearref.LinearLocation;
-import com.vividsolutions.jts.linearref.LocationIndexedLine;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.linearref.LinearLocation;
+import org.locationtech.jts.linearref.LocationIndexedLine;
public class GraphStats {
@@ -95,7 +95,7 @@ private void run() {
/* open input graph (same for all commands) */
File graphFile = new File(graphPath);
try {
- graph = Graph.load(graphFile, Graph.LoadLevel.FULL);
+ graph = Graph.load(graphFile);
} catch (Exception e) {
LOG.error("Exception while loading graph from " + graphFile);
return;
diff --git a/src/main/java/org/opentripplanner/graph_builder/linking/SampleStopLinker.java b/src/main/java/org/opentripplanner/graph_builder/linking/SampleStopLinker.java
index 20db1478352..d9fef86d8c5 100644
--- a/src/main/java/org/opentripplanner/graph_builder/linking/SampleStopLinker.java
+++ b/src/main/java/org/opentripplanner/graph_builder/linking/SampleStopLinker.java
@@ -3,9 +3,9 @@
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Iterables;
import com.google.common.collect.Multimap;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
import org.opentripplanner.analyst.core.Sample;
import org.opentripplanner.analyst.request.SampleFactory;
import org.opentripplanner.common.geometry.GeometryUtils;
diff --git a/src/main/java/org/opentripplanner/graph_builder/linking/StreetSplitter.java b/src/main/java/org/opentripplanner/graph_builder/linking/StreetSplitter.java
index e5d10b21db7..ba6eac68692 100644
--- a/src/main/java/org/opentripplanner/graph_builder/linking/StreetSplitter.java
+++ b/src/main/java/org/opentripplanner/graph_builder/linking/StreetSplitter.java
@@ -1,13 +1,13 @@
package org.opentripplanner.graph_builder.linking;
import com.google.common.collect.Iterables;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.index.SpatialIndex;
-import com.vividsolutions.jts.linearref.LinearLocation;
-import com.vividsolutions.jts.linearref.LocationIndexedLine;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.index.SpatialIndex;
+import org.locationtech.jts.linearref.LinearLocation;
+import org.locationtech.jts.linearref.LocationIndexedLine;
import gnu.trove.map.TIntDoubleMap;
import gnu.trove.map.hash.TIntDoubleHashMap;
import jersey.repackaged.com.google.common.collect.Lists;
@@ -179,7 +179,9 @@ public StreetSplitter(Graph graph) {
*/
public void linkAllStationsToGraph() {
for (Vertex v : graph.getVertices()) {
- if (v instanceof TransitStop || v instanceof BikeRentalStationVertex || v instanceof BikeParkVertex)
+ if (v instanceof TransitStop || v instanceof BikeRentalStationVertex || v instanceof BikeParkVertex) {
+ boolean alreadyLinked = v.getOutgoing().stream().anyMatch(e -> e instanceof StreetTransitLink);
+ if (alreadyLinked) continue;
if (!linkToClosestWalkableEdge(v, DESTRUCTIVE_SPLIT, false)) {
if (v instanceof TransitStop)
LOG.warn(graph.addBuilderAnnotation(new StopUnlinked((TransitStop) v)));
@@ -188,6 +190,7 @@ else if (v instanceof BikeRentalStationVertex)
else if (v instanceof BikeParkVertex)
LOG.warn(graph.addBuilderAnnotation(new BikeParkUnlinked((BikeParkVertex) v)));
};
+ }
}
}
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/CheckGeometryModule.java b/src/main/java/org/opentripplanner/graph_builder/module/CheckGeometryModule.java
index adccb78eb72..51a6ff2ee51 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/CheckGeometryModule.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/CheckGeometryModule.java
@@ -16,8 +16,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
/**
* Check the geometry of every edge in the graph for any bogus geometry --
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/GraphStatisticsModule.java b/src/main/java/org/opentripplanner/graph_builder/module/GraphStatisticsModule.java
index 6d5a6539f43..798e489ecbd 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/GraphStatisticsModule.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/GraphStatisticsModule.java
@@ -16,7 +16,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.vividsolutions.jts.geom.LineString;
+import org.locationtech.jts.geom.LineString;
/**
* Print statistics on geometry and edge/vertices data for a graph (number of geometry, average
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java
index 492453e1c0c..4bcc6517f3c 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java
@@ -2,9 +2,9 @@
import com.beust.jcommander.internal.Lists;
import com.beust.jcommander.internal.Sets;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
import org.opentripplanner.api.resource.CoordinateArrayListSequence;
import org.opentripplanner.api.resource.SimpleIsochrone;
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/TransitStopsRegionsSourceImpl.java b/src/main/java/org/opentripplanner/graph_builder/module/TransitStopsRegionsSourceImpl.java
index a3ecd7e0ee6..a971905a8a5 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/TransitStopsRegionsSourceImpl.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/TransitStopsRegionsSourceImpl.java
@@ -10,8 +10,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
/**
* A rectangular region bounding a set of transit stops
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/TransitToTaggedStopsModule.java b/src/main/java/org/opentripplanner/graph_builder/module/TransitToTaggedStopsModule.java
index 3f12cf3ea25..2c4cc7bb1a6 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/TransitToTaggedStopsModule.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/TransitToTaggedStopsModule.java
@@ -1,7 +1,7 @@
package org.opentripplanner.graph_builder.module;
import com.google.common.collect.Iterables;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
import org.opentripplanner.common.geometry.SphericalDistanceLibrary;
import org.opentripplanner.graph_builder.services.GraphBuilderModule;
import org.opentripplanner.routing.edgetype.StreetTransitLink;
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/map/EndMatchState.java b/src/main/java/org/opentripplanner/graph_builder/module/map/EndMatchState.java
new file mode 100644
index 00000000000..aba731a4d79
--- /dev/null
+++ b/src/main/java/org/opentripplanner/graph_builder/module/map/EndMatchState.java
@@ -0,0 +1,22 @@
+package org.opentripplanner.graph_builder.module.map;
+
+import java.util.List;
+
+/**
+ * The end of a route's geometry, meaning that the search can quit
+ * @author novalis
+ *
+ */
+public class EndMatchState extends MatchState {
+
+ public EndMatchState(MatchState parent, double error, double distance) {
+ super(parent, null, distance);
+ this.currentError = error;
+ }
+
+ @Override
+ public List getNextStates() {
+ return null;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/map/LinearIterator.java b/src/main/java/org/opentripplanner/graph_builder/module/map/LinearIterator.java
new file mode 100644
index 00000000000..1abec894484
--- /dev/null
+++ b/src/main/java/org/opentripplanner/graph_builder/module/map/LinearIterator.java
@@ -0,0 +1,220 @@
+package org.opentripplanner.graph_builder.module.map;
+
+import java.util.Iterator;
+
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.linearref.LinearLocation;
+
+/**
+ * I copied this class from JTS but made a few changes.
+ *
+ * The JTS version of this class has several design decisions that don't work for me. In particular,
+ * hasNext() in the original should be "isValid", and if we start mid-segment, we should continue at
+ * the end of this segment rather than the end of the next segment.
+ */
+public class LinearIterator implements Iterable {
+
+ private Geometry linearGeom;
+
+ private final int numLines;
+
+ /**
+ * Invariant: currentLine <> null if the iterator is pointing at a valid coordinate
+ *
+ * @throws IllegalArgumentException if linearGeom is not lineal
+ */
+ private LineString currentLine;
+
+ private int componentIndex = 0;
+
+ private int vertexIndex = 0;
+
+ private double segmentFraction;
+
+ /**
+ * Creates an iterator initialized to the start of a linear {@link Geometry}
+ *
+ * @param linear the linear geometry to iterate over
+ * @throws IllegalArgumentException if linearGeom is not lineal
+ */
+ public LinearIterator(Geometry linear) {
+ this(linear, 0, 0);
+ }
+
+ /**
+ * Creates an iterator starting at a {@link LinearLocation} on a linear {@link Geometry}
+ *
+ * @param linear the linear geometry to iterate over
+ * @param start the location to start at
+ * @throws IllegalArgumentException if linearGeom is not lineal
+ */
+ public LinearIterator(Geometry linear, LinearLocation start) {
+ this(linear, start.getComponentIndex(), start.getSegmentIndex());
+ this.segmentFraction = start.getSegmentFraction();
+ }
+
+ /**
+ * Creates an iterator starting at a specified component and vertex in a linear {@link Geometry}
+ *
+ * @param linearGeom the linear geometry to iterate over
+ * @param componentIndex the component to start at
+ * @param vertexIndex the vertex to start at
+ * @throws IllegalArgumentException if linearGeom is not lineal
+ */
+ public LinearIterator(Geometry linearGeom, int componentIndex, int vertexIndex) {
+ if (!(linearGeom instanceof Lineal))
+ throw new IllegalArgumentException("Lineal geometry is required");
+ this.linearGeom = linearGeom;
+ numLines = linearGeom.getNumGeometries();
+ this.componentIndex = componentIndex;
+ this.vertexIndex = vertexIndex;
+ loadCurrentLine();
+ }
+
+ private void loadCurrentLine() {
+ if (componentIndex >= numLines) {
+ currentLine = null;
+ return;
+ }
+ currentLine = (LineString) linearGeom.getGeometryN(componentIndex);
+ }
+
+ /**
+ * Tests whether there are any vertices left to iterator over.
+ *
+ * @return true if there are more vertices to scan
+ */
+ public boolean hasNext() {
+ if (componentIndex >= numLines)
+ return false;
+ if (componentIndex == numLines - 1 && vertexIndex >= currentLine.getNumPoints() - 1)
+ return false;
+ return true;
+ }
+
+ public boolean isValidIndex() {
+ if (componentIndex >= numLines)
+ return false;
+ if (componentIndex == numLines - 1 && vertexIndex >= currentLine.getNumPoints())
+ return false;
+ return true;
+ }
+
+ /**
+ * Moves the iterator ahead to the next vertex and (possibly) linear component.
+ */
+ public void next() {
+ if (!hasNext())
+ return;
+ segmentFraction = 0.0;
+ vertexIndex++;
+ if (vertexIndex >= currentLine.getNumPoints()) {
+ componentIndex++;
+ if (componentIndex < linearGeom.getNumGeometries() - 1) {
+ loadCurrentLine();
+ vertexIndex = 0;
+ }
+ }
+ }
+
+ /**
+ * Checks whether the iterator cursor is pointing to the endpoint of a linestring.
+ *
+ * @return true if the iterator is at an endpoint
+ */
+ public boolean isEndOfLine() {
+ if (componentIndex >= numLines)
+ return false;
+ // LineString currentLine = (LineString) linear.getGeometryN(componentIndex);
+ if (vertexIndex < currentLine.getNumPoints() - 1)
+ return false;
+ return true;
+ }
+
+ /**
+ * The component index of the vertex the iterator is currently at.
+ *
+ * @return the current component index
+ */
+ public int getComponentIndex() {
+ return componentIndex;
+ }
+
+ /**
+ * The vertex index of the vertex the iterator is currently at.
+ *
+ * @return the current vertex index
+ */
+ public int getVertexIndex() {
+ return vertexIndex;
+ }
+
+ /**
+ * Gets the {@link LineString} component the iterator is current at.
+ *
+ * @return a linestring
+ */
+ public LineString getLine() {
+ return currentLine;
+ }
+
+ /**
+ * Gets the first {@link Coordinate} of the current segment. (the coordinate of the current
+ * vertex).
+ *
+ * @return a {@link Coordinate}
+ */
+ public Coordinate getSegmentStart() {
+ return currentLine.getCoordinateN(vertexIndex);
+ }
+
+ /**
+ * Gets the second {@link Coordinate} of the current segment. (the coordinate of the next
+ * vertex). If the iterator is at the end of a line, null is returned.
+ *
+ * @return a {@link Coordinate} or null
+ */
+ public Coordinate getSegmentEnd() {
+ if (vertexIndex < getLine().getNumPoints() - 1)
+ return currentLine.getCoordinateN(vertexIndex + 1);
+ return null;
+ }
+
+ public LinearLocation getLocation() {
+ return new LinearLocation(componentIndex, vertexIndex, segmentFraction);
+ }
+
+ class LinearIteratorIterator implements Iterator {
+
+ @Override
+ public boolean hasNext() {
+ return LinearIterator.this.hasNext();
+ }
+
+ @Override
+ public LinearLocation next() {
+ LinearLocation result = getLocation();
+ LinearIterator.this.next();
+ return result;
+ }
+
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+
+ }
+ @Override
+ public Iterator iterator() {
+ return new LinearIteratorIterator();
+ }
+
+ public static LinearLocation getEndLocation(Geometry linear) {
+ //the version in LinearLocation is broken
+
+ int lastComponentIndex = linear.getNumGeometries() - 1;
+ LineString lastLine = (LineString) linear.getGeometryN(lastComponentIndex);
+ int lastSegmentIndex = lastLine.getNumPoints() - 1;
+ return new LinearLocation(lastComponentIndex, lastSegmentIndex, 0.0);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/map/MatchState.java b/src/main/java/org/opentripplanner/graph_builder/module/map/MatchState.java
new file mode 100644
index 00000000000..b123919ca8a
--- /dev/null
+++ b/src/main/java/org/opentripplanner/graph_builder/module/map/MatchState.java
@@ -0,0 +1,115 @@
+package org.opentripplanner.graph_builder.module.map;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.opentripplanner.common.geometry.SphericalDistanceLibrary;
+import org.opentripplanner.routing.core.State;
+import org.opentripplanner.routing.core.TraverseMode;
+import org.opentripplanner.routing.core.RoutingRequest;
+import org.opentripplanner.routing.edgetype.StreetEdge;
+import org.opentripplanner.routing.graph.Edge;
+import org.opentripplanner.routing.graph.Vertex;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.linearref.LinearLocation;
+
+public abstract class MatchState {
+ private static final RoutingRequest traverseOptions = new RoutingRequest(TraverseMode.CAR);
+
+ protected static final double NEW_SEGMENT_PENALTY = 0.1;
+
+ protected static final double NO_TRAVERSE_PENALTY = 20;
+
+ public double currentError;
+
+ public double accumulatedError;
+
+ public MatchState parent;
+
+ protected Edge edge;
+
+ private double distanceAlongRoute = 0;
+
+ public MatchState(MatchState parent, Edge edge, double distanceAlongRoute) {
+ this.distanceAlongRoute = distanceAlongRoute;
+ this.parent = parent;
+ this.edge = edge;
+ if (parent != null) {
+ this.accumulatedError = parent.accumulatedError + parent.currentError;
+ this.distanceAlongRoute += parent.distanceAlongRoute;
+ }
+ }
+
+ public abstract List getNextStates();
+
+ public Edge getEdge() {
+ return edge;
+ }
+
+ public double getTotalError() {
+ return accumulatedError + currentError;
+ }
+
+ protected boolean carsCanTraverse(Edge edge) {
+ // should be done with a method on edge (canTraverse already exists on turnEdge)
+ State s0 = new State(edge.getFromVertex(), traverseOptions);
+ State s1 = edge.traverse(s0);
+ return s1 != null;
+ }
+
+ protected List getOutgoingMatchableEdges(Vertex vertex) {
+ List edges = new ArrayList();
+ for (Edge e : vertex.getOutgoing()) {
+ if (!(e instanceof StreetEdge))
+ continue;
+ if (e.getGeometry() == null)
+ continue;
+ edges.add(e);
+ }
+ return edges;
+ }
+
+
+ public double getDistanceAlongRoute() {
+ return distanceAlongRoute;
+ }
+
+ /* computes the distance, in meters, along a geometry */
+ protected static double distanceAlongGeometry(Geometry geometry, LinearLocation startIndex,
+ LinearLocation endIndex) {
+
+ if (endIndex == null) {
+ endIndex = LinearLocation.getEndLocation(geometry);
+ }
+ double total = 0;
+ LinearIterator it = new LinearIterator(geometry, startIndex);
+ LinearLocation index = startIndex;
+ Coordinate previousCoordinate = startIndex.getCoordinate(geometry);
+
+ it.next();
+ index = it.getLocation();
+ while (index.compareTo(endIndex) < 0) {
+ Coordinate thisCoordinate = index.getCoordinate(geometry);
+ double distance = SphericalDistanceLibrary.fastDistance(previousCoordinate, thisCoordinate);
+ total += distance;
+ previousCoordinate = thisCoordinate;
+ if (!it.hasNext())
+ break;
+ it.next();
+ index = it.getLocation();
+ }
+ //now, last bit of last segment
+ Coordinate finalCoordinate = endIndex.getCoordinate(geometry);
+ total += SphericalDistanceLibrary.distance(previousCoordinate, finalCoordinate);
+
+ return total;
+ }
+
+
+ protected static double distance(Coordinate from, Coordinate to) {
+ return SphericalDistanceLibrary.fastDistance(from, to);
+ }
+
+}
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/map/MidblockMatchState.java b/src/main/java/org/opentripplanner/graph_builder/module/map/MidblockMatchState.java
new file mode 100644
index 00000000000..e63816100e0
--- /dev/null
+++ b/src/main/java/org/opentripplanner/graph_builder/module/map/MidblockMatchState.java
@@ -0,0 +1,234 @@
+package org.opentripplanner.graph_builder.module.map;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.opentripplanner.routing.graph.Edge;
+import org.opentripplanner.routing.graph.Vertex;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.linearref.LinearLocation;
+import org.locationtech.jts.linearref.LocationIndexedLine;
+import org.locationtech.jts.util.AssertionFailedException;
+
+public class MidblockMatchState extends MatchState {
+
+ private static final double MAX_ERROR = 1000;
+
+ private LinearLocation edgeIndex;
+
+ public LinearLocation routeIndex;
+
+ Geometry routeGeometry;
+
+ private Geometry edgeGeometry;
+
+ private LocationIndexedLine indexedEdge;
+
+ public MidblockMatchState(MatchState parent, Geometry routeGeometry, Edge edge,
+ LinearLocation routeIndex, LinearLocation edgeIndex, double error,
+ double distanceAlongRoute) {
+ super(parent, edge, distanceAlongRoute);
+
+ this.routeGeometry = routeGeometry;
+ this.routeIndex = routeIndex;
+ this.edgeIndex = edgeIndex;
+
+ edgeGeometry = edge.getGeometry();
+ indexedEdge = new LocationIndexedLine(edgeGeometry);
+ currentError = error;
+ }
+
+ @Override
+ public List getNextStates() {
+ ArrayList nextStates = new ArrayList();
+ if (routeIndex.getSegmentIndex() == routeGeometry.getNumPoints() - 1) {
+ // this has either hit the end, or gone off the end. It's not real clear which.
+ // for now, let's assume it means that the ending is somewhere along this edge,
+ // so we return an end state
+ Coordinate pt = routeIndex.getCoordinate(routeGeometry);
+ double error = distance(pt, edgeIndex.getCoordinate(edgeGeometry));
+ nextStates.add(new EndMatchState(this, error, 0));
+ return nextStates;
+ }
+
+ LinearIterator it = new LinearIterator(routeGeometry, routeIndex);
+ if (it.hasNext()) {
+ it.next();
+ LinearLocation routeSuccessor = it.getLocation();
+
+ // now we want to see where this new point is in terms of the edge's geometry
+ Coordinate newRouteCoord = routeSuccessor.getCoordinate(routeGeometry);
+ LinearLocation newEdgeIndex = indexedEdge.project(newRouteCoord);
+
+ Coordinate edgeCoord = newEdgeIndex.getCoordinate(edgeGeometry);
+ if (newEdgeIndex.compareTo(edgeIndex) <= 0) {
+ // we must make forward progress along the edge... or go to the next edge
+ /* this should not require the try/catch, but there is a bug in JTS */
+ try {
+ LinearLocation projected2 = indexedEdge.indexOfAfter(edgeCoord, edgeIndex);
+ //another bug in JTS
+ if (Double.isNaN(projected2.getSegmentFraction())) {
+ // we are probably moving backwards
+ return Collections.emptyList();
+ } else {
+ newEdgeIndex = projected2;
+ if (newEdgeIndex.equals(edgeIndex)) {
+ return Collections.emptyList();
+ }
+ }
+ edgeCoord = newEdgeIndex.getCoordinate(edgeGeometry);
+ } catch (AssertionFailedException e) {
+ // we are not making progress, so just return an empty list
+ return Collections.emptyList();
+ }
+ }
+
+ if (newEdgeIndex.getSegmentIndex() == edgeGeometry.getNumPoints() - 1) {
+
+ // we might choose to continue from the end of the edge and a point mid-way
+ // along this route segment
+
+ // find nearest point that makes progress along the route
+ Vertex toVertex = edge.getToVertex();
+ Coordinate endCoord = toVertex.getCoordinate();
+ LocationIndexedLine indexedRoute = new LocationIndexedLine(routeGeometry);
+
+ // FIXME: it would be better to do this project/indexOfAfter in one step
+ // as the two-step version could snap to a bad place and be unable to escape.
+
+ LinearLocation routeProjectedEndIndex = indexedRoute.project(endCoord);
+ Coordinate routeProjectedEndCoord = routeProjectedEndIndex
+ .getCoordinate(routeGeometry);
+
+ if (routeProjectedEndIndex.compareTo(routeIndex) <= 0) {
+ try {
+ routeProjectedEndIndex = indexedRoute.indexOfAfter(routeProjectedEndCoord,
+ routeIndex);
+ if (Double.isNaN(routeProjectedEndIndex.getSegmentFraction())) {
+ // can't go forward
+ routeProjectedEndIndex = routeIndex; // this is bad, but not terrible
+ // since we are advancing along the edge
+ }
+ } catch (AssertionFailedException e) {
+ routeProjectedEndIndex = routeIndex;
+ }
+ routeProjectedEndCoord = routeProjectedEndIndex.getCoordinate(routeGeometry);
+ }
+
+ double positionError = distance(routeProjectedEndCoord, endCoord);
+ double travelAlongRoute = distanceAlongGeometry(routeGeometry, routeIndex,
+ routeProjectedEndIndex);
+ double travelAlongEdge = distanceAlongGeometry(edgeGeometry, edgeIndex,
+ newEdgeIndex);
+ double travelError = Math.abs(travelAlongEdge - travelAlongRoute);
+
+ double error = positionError + travelError;
+
+ if (error > MAX_ERROR) {
+ // we're not going to bother with states which are
+ // totally wrong
+ return nextStates;
+ }
+
+ for (Edge e : getOutgoingMatchableEdges(toVertex)) {
+ double cost = error + NEW_SEGMENT_PENALTY;
+ if (!carsCanTraverse(e)) {
+ cost += NO_TRAVERSE_PENALTY;
+ }
+ MatchState nextState = new MidblockMatchState(this, routeGeometry, e,
+ routeProjectedEndIndex, new LinearLocation(), cost, travelAlongRoute);
+ nextStates.add(nextState);
+ }
+
+ } else {
+
+ double travelAlongEdge = distanceAlongGeometry(edgeGeometry, edgeIndex,
+ newEdgeIndex);
+ double travelAlongRoute = distanceAlongGeometry(routeGeometry, routeIndex,
+ routeSuccessor);
+ double travelError = Math.abs(travelAlongRoute - travelAlongEdge);
+
+ double positionError = distance(edgeCoord, newRouteCoord);
+
+ double error = travelError + positionError;
+
+ MatchState nextState = new MidblockMatchState(this, routeGeometry, edge,
+ routeSuccessor, newEdgeIndex, error, travelAlongRoute);
+ nextStates.add(nextState);
+
+ // it's also possible that, although we have not yet reached the end of this edge,
+ // we are going to turn, because the route turns earlier than the edge. In that
+ // case, we jump to the corner, and our error is the distance from the route point
+ // and the corner
+
+ Vertex toVertex = edge.getToVertex();
+ double travelAlongOldEdge = distanceAlongGeometry(edgeGeometry, edgeIndex, null);
+
+ for (Edge e : getOutgoingMatchableEdges(toVertex)) {
+ Geometry newEdgeGeometry = e.getGeometry();
+ LocationIndexedLine newIndexedEdge = new LocationIndexedLine(newEdgeGeometry);
+ newEdgeIndex = newIndexedEdge.project(newRouteCoord);
+ Coordinate newEdgeCoord = newEdgeIndex.getCoordinate(newEdgeGeometry);
+ positionError = distance(newEdgeCoord, newRouteCoord);
+ travelAlongEdge = travelAlongOldEdge + distanceAlongGeometry(newEdgeGeometry, new LinearLocation(), newEdgeIndex);
+ travelError = Math.abs(travelAlongRoute - travelAlongEdge);
+
+ error = travelError + positionError;
+
+ if (error > MAX_ERROR) {
+ // we're not going to bother with states which are
+ // totally wrong
+ return nextStates;
+ }
+
+ double cost = error + NEW_SEGMENT_PENALTY;
+ if (!carsCanTraverse(e)) {
+ cost += NO_TRAVERSE_PENALTY;
+ }
+
+ nextState = new MidblockMatchState(this, routeGeometry, e, routeSuccessor,
+ new LinearLocation(), cost, travelAlongRoute);
+ nextStates.add(nextState);
+ }
+
+ }
+ return nextStates;
+
+ } else {
+ Coordinate routeCoord = routeIndex.getCoordinate(routeGeometry);
+ LinearLocation projected = indexedEdge.project(routeCoord);
+ double locationError = distance(projected.getCoordinate(edgeGeometry), routeCoord);
+
+ MatchState end = new EndMatchState(this, locationError, 0);
+ return Arrays.asList(end);
+ }
+
+ }
+
+ public String toString() {
+ return "MidblockMatchState(" + edge + ", " + edgeIndex.getSegmentIndex() + ", "
+ + edgeIndex.getSegmentFraction() + ") - " + currentError;
+ }
+
+ public int hashCode() {
+ return (edge.hashCode() * 1337 + hashCode(edgeIndex)) * 1337 + hashCode(routeIndex);
+ }
+
+ private int hashCode(LinearLocation location) {
+ return location.getComponentIndex() * 1000000 + location.getSegmentIndex() * 37
+ + new Double(location.getSegmentFraction()).hashCode();
+ }
+
+ public boolean equals(Object o) {
+ if (!(o instanceof MidblockMatchState)) {
+ return false;
+ }
+ MidblockMatchState other = (MidblockMatchState) o;
+ return other.edge == edge && other.edgeIndex.compareTo(edgeIndex) == 0
+ && other.routeIndex.compareTo(routeIndex) == 0;
+ }
+}
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/map/StreetMatcher.java b/src/main/java/org/opentripplanner/graph_builder/module/map/StreetMatcher.java
new file mode 100644
index 00000000000..07fcf2a5bc9
--- /dev/null
+++ b/src/main/java/org/opentripplanner/graph_builder/module/map/StreetMatcher.java
@@ -0,0 +1,160 @@
+package org.opentripplanner.graph_builder.module.map;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+
+import org.opentripplanner.routing.edgetype.StreetEdge;
+import org.opentripplanner.routing.graph.Edge;
+import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.routing.graph.Vertex;
+import org.opentripplanner.common.pqueue.BinHeap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.index.strtree.STRtree;
+import org.locationtech.jts.linearref.LinearLocation;
+import org.locationtech.jts.linearref.LocationIndexedLine;
+import org.locationtech.jts.simplify.DouglasPeuckerSimplifier;
+
+/**
+ * This Performs most of the work for the MapBuilder graph builder module.
+ * It determines which sequence of graph edges a GTFS shape probably corresponds to.
+ * Note that GTFS shapes are not in any way constrained to OSM edges or even roads.
+ */
+public class StreetMatcher {
+ private static final Logger log = LoggerFactory.getLogger(StreetMatcher.class);
+ private static final double DISTANCE_THRESHOLD = 0.0002;
+
+ Graph graph;
+
+ private STRtree index;
+
+ STRtree createIndex() {
+ STRtree edgeIndex = new STRtree();
+ for (Vertex v : graph.getVertices()) {
+ for (Edge e : v.getOutgoing()) {
+ if (e instanceof StreetEdge) {
+ Envelope envelope;
+ Geometry geometry = e.getGeometry();
+ envelope = geometry.getEnvelopeInternal();
+ edgeIndex.insert(envelope, e);
+ }
+ }
+ }
+ log.debug("Created index");
+ return edgeIndex;
+ }
+
+ public StreetMatcher(Graph graph) {
+ this.graph = graph;
+ index = createIndex();
+ index.build();
+ }
+
+ @SuppressWarnings("unchecked")
+ public List match(Geometry routeGeometry) {
+
+ routeGeometry = removeDuplicatePoints(routeGeometry);
+
+ if (routeGeometry == null)
+ return null;
+
+ routeGeometry = DouglasPeuckerSimplifier.simplify(routeGeometry, 0.00001);
+
+ // initial state: start midway along a block.
+ LocationIndexedLine indexedLine = new LocationIndexedLine(routeGeometry);
+
+ LinearLocation startIndex = indexedLine.getStartIndex();
+
+ Coordinate routeStartCoordinate = startIndex.getCoordinate(routeGeometry);
+ Envelope envelope = new Envelope(routeStartCoordinate);
+ double distanceThreshold = DISTANCE_THRESHOLD;
+ envelope.expandBy(distanceThreshold);
+
+ BinHeap states = new BinHeap();
+ List nearbyEdges = index.query(envelope);
+ while (nearbyEdges.isEmpty()) {
+ envelope.expandBy(distanceThreshold);
+ distanceThreshold *= 2;
+ nearbyEdges = index.query(envelope);
+ }
+
+ // compute initial states
+ for (Edge initialEdge : nearbyEdges) {
+ Geometry edgeGeometry = initialEdge.getGeometry();
+
+ LocationIndexedLine indexedEdge = new LocationIndexedLine(edgeGeometry);
+ LinearLocation initialLocation = indexedEdge.project(routeStartCoordinate);
+
+ double error = MatchState.distance(initialLocation.getCoordinate(edgeGeometry), routeStartCoordinate);
+ MidblockMatchState state = new MidblockMatchState(null, routeGeometry, initialEdge, startIndex, initialLocation, error, 0.01);
+ states.insert(state, 0); //make sure all initial states are visited by inserting them at 0
+ }
+
+ // search for best-matching path
+ int seen_count = 0, total = 0;
+ HashSet seen = new HashSet();
+ while (!states.empty()) {
+ double k = states.peek_min_key();
+ MatchState state = states.extract_min();
+ if (++total % 50000 == 0) {
+ log.debug("seen / total: " + seen_count + " / " + total);
+ }
+ if (seen.contains(state)) {
+ ++seen_count;
+ continue;
+ } else {
+ if (k != 0) {
+ //but do not mark states as closed if we start at them
+ seen.add(state);
+ }
+ }
+ if (state instanceof EndMatchState) {
+ return toEdgeList(state);
+ }
+ for (MatchState next : state.getNextStates()) {
+ if (seen.contains(next)) {
+ continue;
+ }
+ states.insert(next, next.getTotalError() - next.getDistanceAlongRoute());
+ }
+ }
+ return null;
+ }
+
+ private Geometry removeDuplicatePoints(Geometry routeGeometry) {
+ List coords = new ArrayList();
+ Coordinate last = null;
+ for (Coordinate c : routeGeometry.getCoordinates()) {
+ if (!c.equals(last)) {
+ last = c;
+ coords.add(c);
+ }
+ }
+ if (coords.size() < 2) {
+ return null;
+ }
+ Coordinate[] coordArray = new Coordinate[coords.size()];
+ return routeGeometry.getFactory().createLineString(coords.toArray(coordArray));
+ }
+
+ private List toEdgeList(MatchState next) {
+ ArrayList edges = new ArrayList();
+ Edge lastEdge = null;
+ while (next != null) {
+ Edge edge = next.getEdge();
+ if (edge != lastEdge) {
+ edges.add(edge);
+ lastEdge = edge;
+ }
+ next = next.parent;
+ }
+ Collections.reverse(edges);
+ return edges;
+ }
+}
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/DegreeGridNEDTileSource.java b/src/main/java/org/opentripplanner/graph_builder/module/ned/DegreeGridNEDTileSource.java
index 678d11c98a3..e9104897657 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/ned/DegreeGridNEDTileSource.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/ned/DegreeGridNEDTileSource.java
@@ -1,6 +1,6 @@
package org.opentripplanner.graph_builder.module.ned;
-import com.vividsolutions.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Coordinate;
import org.jets3t.service.S3Service;
import org.jets3t.service.S3ServiceException;
import org.jets3t.service.ServiceException;
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java b/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java
index bccbdaf97b2..2a30dfe51b3 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java
@@ -1,7 +1,7 @@
package org.opentripplanner.graph_builder.module.ned;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
import org.geotools.geometry.DirectPosition2D;
import org.opengis.coverage.Coverage;
import org.opengis.coverage.PointOutsideCoverageException;
@@ -67,6 +67,12 @@ public class ElevationModule implements GraphBuilderModule {
private final File cachedElevationsFile;
/* Whether or not to include geoid difference values in individual elevation calculations */
private final boolean includeEllipsoidToGeoidDifference;
+ /**
+ * Unit conversion multiplier for elevation values. No conversion needed if the elevation values
+ * are defined in meters in the source data. If, for example, decimetres are used in the source data,
+ * this should be set to 0.1 in build-config.json.
+ */
+ private double elevationUnitMultiplier = 1;
private HashMap cachedElevations;
@@ -104,13 +110,15 @@ public ElevationModule(
File cacheDirectory,
boolean readCachedElevations,
boolean writeCachedElevations,
- boolean includeEllipsoidToGeoidDifference
+ boolean includeEllipsoidToGeoidDifference,
+ double elevationUnitMultiplier
) {
gridCoverageFactory = factory;
cachedElevationsFile = new File(cacheDirectory, "cached_elevations.obj");
this.readCachedElevations = readCachedElevations;
this.writeCachedElevations = writeCachedElevations;
this.includeEllipsoidToGeoidDifference = includeEllipsoidToGeoidDifference;
+ this.elevationUnitMultiplier = elevationUnitMultiplier;
}
public List provides() {
@@ -290,7 +298,7 @@ class ElevationRepairState {
public double initialElevation;
public ElevationRepairState(StreetEdge backEdge, ElevationRepairState backState,
- Vertex vertex, double distance, double initialElevation) {
+ Vertex vertex, double distance, double initialElevation) {
this.backEdge = backEdge;
this.backState = backState;
this.vertex = vertex;
@@ -331,7 +339,7 @@ private void assignMissingElevations(
if (!elevations.containsKey(e.getFromVertex())) {
double firstElevation = profile.getOrdinate(0, 1);
ElevationRepairState state = new ElevationRepairState(null, null,
- e.getFromVertex(), 0, firstElevation);
+ e.getFromVertex(), 0, firstElevation);
pq.insert(state, 0);
elevations.put(e.getFromVertex(), firstElevation);
}
@@ -339,7 +347,7 @@ private void assignMissingElevations(
if (!elevations.containsKey(e.getToVertex())) {
double lastElevation = profile.getOrdinate(profile.size() - 1, 1);
ElevationRepairState state = new ElevationRepairState(null, null, e.getToVertex(),
- 0, lastElevation);
+ 0, lastElevation);
pq.insert(state, 0);
elevations.put(e.getToVertex(), lastElevation);
}
@@ -382,7 +390,7 @@ private void assignMissingElevations(
} else {
// continue
ElevationRepairState newState = new ElevationRepairState(edge, state, tov,
- e.getDistance() + state.distance, state.initialElevation);
+ e.getDistance() + state.distance, state.initialElevation);
pq.insert(newState, e.getDistance() + state.distance);
}
} // end loop over outgoing edges
@@ -405,7 +413,7 @@ private void assignMissingElevations(
} else {
// continue
ElevationRepairState newState = new ElevationRepairState(edge, state, fromv,
- e.getDistance() + state.distance, state.initialElevation);
+ e.getDistance() + state.distance, state.initialElevation);
pq.insert(newState, e.getDistance() + state.distance);
}
} // end loop over incoming edges
@@ -423,13 +431,13 @@ private void assignMissingElevations(
double totalDistance = bestDistance + state.distance;
// trace backwards, setting states as we go
while (true) {
- // watch out for division by 0 here, which will propagate NaNs
- // all the way out to edge lengths
+ // watch out for division by 0 here, which will propagate NaNs
+ // all the way out to edge lengths
if (totalDistance == 0)
elevations.put(state.vertex, bestElevation);
else {
- double elevation = (bestElevation * state.distance +
- state.initialElevation * bestDistance) / totalDistance;
+ double elevation = (bestElevation * state.distance +
+ state.initialElevation * bestDistance) / totalDistance;
elevations.put(state.vertex, elevation);
}
if (state.backState == null)
@@ -559,7 +567,7 @@ private void processEdge(StreetWithElevationEdge ee, Coverage coverage) {
// construct the PCS
Coordinate coordArr[] = new Coordinate[coordList.size()];
PackedCoordinateSequence elevPCS = new PackedCoordinateSequence.Double(
- coordList.toArray(coordArr));
+ coordList.toArray(coordArr));
setEdgeElevationProfile(ee, elevPCS, graph);
} catch (PointOutsideCoverageException | TransformException e) {
@@ -608,7 +616,9 @@ private double getElevation(Coverage coverage, double x, double y) throws PointO
throw e;
}
nPointsEvaluated.incrementAndGet();
- return values[0] - (includeEllipsoidToGeoidDifference ? getApproximateEllipsoidToGeoidDifference(y, x) : 0);
+ return values[0] * elevationUnitMultiplier - (
+ includeEllipsoidToGeoidDifference ? getApproximateEllipsoidToGeoidDifference(y, x) : 0
+ );
}
/**
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/NEDDownloader.java b/src/main/java/org/opentripplanner/graph_builder/module/ned/NEDDownloader.java
index e7f4a6b066d..6038156ec10 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/ned/NEDDownloader.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/ned/NEDDownloader.java
@@ -1,6 +1,6 @@
package org.opentripplanner.graph_builder.module.ned;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
import org.apache.axis.client.Call;
import org.apache.axis.client.Service;
import org.opentripplanner.graph_builder.services.ned.NEDTileSource;
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/UnifiedGridCoverage.java b/src/main/java/org/opentripplanner/graph_builder/module/ned/UnifiedGridCoverage.java
index 0a14b47b76a..1756fa35be6 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/ned/UnifiedGridCoverage.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/ned/UnifiedGridCoverage.java
@@ -1,12 +1,12 @@
package org.opentripplanner.graph_builder.module.ned;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.index.SpatialIndex;
-import com.vividsolutions.jts.index.strtree.STRtree;
import org.geotools.coverage.AbstractCoverage;
import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.index.SpatialIndex;
+import org.locationtech.jts.index.strtree.STRtree;
import org.opengis.coverage.CannotEvaluateException;
import org.opengis.coverage.Coverage;
import org.opengis.coverage.PointOutsideCoverageException;
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/Area.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/Area.java
index 34ad7c74209..52c4df8deb2 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/osm/Area.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/Area.java
@@ -12,8 +12,8 @@
import org.opentripplanner.openstreetmap.model.OSMWithTags;
import com.google.common.collect.ArrayListMultimap;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Polygon;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Polygon;
/**
* Stores information about an OSM area needed for visibility graph construction. Algorithm based on
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/AreaGroup.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/AreaGroup.java
index 5f10941ebfd..f732562bdd2 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/osm/AreaGroup.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/AreaGroup.java
@@ -19,12 +19,12 @@
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Multimap;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.Polygon;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Polygon;
/**
* A group of possibly-contiguous areas sharing the same level
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OSMDatabase.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OSMDatabase.java
index a04ba7bd135..d229cb43f6b 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/osm/OSMDatabase.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/OSMDatabase.java
@@ -3,7 +3,7 @@
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Iterables;
import com.google.common.collect.Multimap;
-import com.vividsolutions.jts.geom.*;
+import org.locationtech.jts.geom.*;
import org.opentripplanner.common.RepeatingTimePeriod;
import org.opentripplanner.common.TurnRestrictionType;
import org.opentripplanner.common.geometry.GeometryUtils;
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OSMFilter.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OSMFilter.java
index 47a9d0f7578..123abbb4794 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/osm/OSMFilter.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/OSMFilter.java
@@ -26,23 +26,30 @@ public class OSMFilter {
* (as well as ways where all access is specifically forbidden to the public).
* http://wiki.openstreetmap.org/wiki/Tag:highway%3Dproposed
*/
- public static boolean isWayRoutable(OSMWithTags way) {
- if (!isOsmEntityRoutable(way))
+ static boolean isWayRoutable(OSMWithTags way) {
+ if (!isOsmEntityRoutable(way)) {
return false;
+ }
String highway = way.getTag("highway");
- if (highway != null
- && (highway.equals("conveyer") || highway.equals("proposed")
- || highway.equals("construction") || highway.equals("raceway") || highway
- .equals("unbuilt")))
- return false;
+ if (highway != null) {
+ if(
+ highway.equals("conveyer") ||
+ highway.equals("proposed") ||
+ highway.equals("construction") ||
+ highway.equals("razed") ||
+ highway.equals("raceway") ||
+ highway.equals("unbuilt")
+ ) {
+ return false;
+ }
+ }
if (way.isGeneralAccessDenied()) {
// There are exceptions.
return (way.isMotorcarExplicitlyAllowed() || way.isBicycleExplicitlyAllowed() || way
.isPedestrianExplicitlyAllowed() || way.isMotorVehicleExplicitlyAllowed());
}
-
return true;
}
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OpenStreetMapModule.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OpenStreetMapModule.java
index 9bf84ab3bbd..6856fdc78ab 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/osm/OpenStreetMapModule.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/OpenStreetMapModule.java
@@ -3,12 +3,12 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Iterables;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.prep.PreparedGeometry;
-import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.prep.PreparedGeometry;
+import org.locationtech.jts.geom.prep.PreparedGeometryFactory;
import org.opentripplanner.analyst.UnsupportedGeometryException;
import org.opentripplanner.common.TurnRestriction;
import org.opentripplanner.common.geometry.GeometryUtils;
@@ -244,7 +244,7 @@ public void loadMicromobilityTravelRestrictions(GraphBuilderParameters params) {
* value is returned if that operation was unsuccessful in any way.
*/
private PreparedGeometry parseGeometry(String areaUrlOrFile) {
- if (areaUrlOrFile == null) {
+ if (areaUrlOrFile == null || areaUrlOrFile.equals("")) {
return null;
}
InputStream data = null;
@@ -307,7 +307,7 @@ public void buildGraph() {
}
for (Area area : Iterables.concat(osmdb.getWalkableAreas(),
- osmdb.getParkAndRideAreas(), osmdb.getBikeParkingAreas()))
+ osmdb.getParkAndRideAreas(), osmdb.getBikeParkingAreas()))
setWayName(area.parent);
// figure out which nodes that are actually intersections
@@ -350,7 +350,7 @@ private void processBikeRentalNodes() {
LOG.info("Processing bike rental nodes...");
int n = 0;
BikeRentalStationService bikeRentalService = graph.getService(
- BikeRentalStationService.class, true);
+ BikeRentalStationService.class, true);
graph.putService(BikeRentalStationService.class, bikeRentalService);
for (OSMNode node : osmdb.getBikeRentalNodes()) {
n++;
@@ -364,7 +364,7 @@ private void processBikeRentalNodes() {
capacity = node.getCapacity();
} catch (NumberFormatException e) {
LOG.warn("Capacity for osm node " + node.getId() + " (" + creativeName
- + ") is not a number: " + node.getTag("capacity"));
+ + ") is not a number: " + node.getTag("capacity"));
}
}
String networks = node.getTag("network");
@@ -376,7 +376,7 @@ private void processBikeRentalNodes() {
networkSet.addAll(Arrays.asList(operators.split(";")));
if (networkSet.isEmpty()) {
LOG.warn("Bike rental station at osm node " + node.getId() + " ("
- + creativeName + ") with no network; including as compatible-with-all.");
+ + creativeName + ") with no network; including as compatible-with-all.");
networkSet = null; // Special "catch-all" value
}
BikeRentalStation station = new BikeRentalStation();
@@ -405,7 +405,7 @@ private void processBikeParkAndRideNodes() {
LOG.info("Processing bike P+R nodes...");
int n = 0;
BikeRentalStationService bikeRentalService = graph.getService(
- BikeRentalStationService.class, true);
+ BikeRentalStationService.class, true);
for (OSMNode node : osmdb.getBikeParkingNodes()) {
n++;
I18NString creativeName = wayPropertySet.getCreativeNameForWay(node);
@@ -453,7 +453,7 @@ private void buildBikeParkAndRideAreas() {
*/
private void buildBikeParkAndRideForArea(Area area) {
BikeRentalStationService bikeRentalService = graph.getService(
- BikeRentalStationService.class, true);
+ BikeRentalStationService.class, true);
Envelope envelope = new Envelope();
long osmId = area.parent.getId();
I18NString creativeName = wayPropertySet.getCreativeNameForWay(area.parent);
@@ -482,7 +482,7 @@ private void buildWalkableAreas(boolean skipVisibility, boolean platformEntriesL
}
List areaGroups = groupAreas(osmdb.getWalkableAreas());
WalkableAreaBuilder walkableAreaBuilder = new WalkableAreaBuilder(graph, osmdb,
- wayPropertySet, edgeFactory, this);
+ wayPropertySet, edgeFactory, this);
if (skipVisibility) {
for (AreaGroup group : areaGroups) {
walkableAreaBuilder.buildWithoutVisibility(group);
@@ -494,8 +494,8 @@ private void buildWalkableAreas(boolean skipVisibility, boolean platformEntriesL
if(platformEntriesLinking){
List platforms = osmdb.getWalkableAreas().stream().
- filter(area -> "platform".equals(area.parent.getTag("public_transport"))).
- collect(Collectors.toList());
+ filter(area -> "platform".equals(area.parent.getTag("public_transport"))).
+ collect(Collectors.toList());
List platformGroups = groupAreas(platforms);
for (AreaGroup group : platformGroups) {
walkableAreaBuilder.buildWithoutVisibility(group);
@@ -543,7 +543,7 @@ private boolean buildParkAndRideAreasForGroup(AreaGroup group) {
envelope.expandToInclude(new Coordinate(node.lon, node.lat));
OsmVertex accessVertex = getVertexForOsmNode(node, area.parent);
if (accessVertex.getIncoming().isEmpty()
- || accessVertex.getOutgoing().isEmpty())
+ || accessVertex.getOutgoing().isEmpty())
continue;
accessVertexes.add(accessVertex);
}
@@ -551,9 +551,9 @@ private boolean buildParkAndRideAreasForGroup(AreaGroup group) {
}
// Check P+R accessibility by walking and driving.
TraversalRequirements walkReq = new TraversalRequirements(new RoutingRequest(
- TraverseMode.WALK));
+ TraverseMode.WALK));
TraversalRequirements driveReq = new TraversalRequirements(new RoutingRequest(
- TraverseMode.CAR));
+ TraverseMode.CAR));
boolean walkAccessibleIn = false;
boolean carAccessibleIn = false;
boolean walkAccessibleOut = false;
@@ -591,8 +591,8 @@ private boolean buildParkAndRideAreasForGroup(AreaGroup group) {
}
// Place the P+R at the center of the envelope
ParkAndRideVertex parkAndRideVertex = new ParkAndRideVertex(graph, "P+R" + osmId,
- "P+R_" + osmId, (envelope.getMinX() + envelope.getMaxX()) / 2,
- (envelope.getMinY() + envelope.getMaxY()) / 2, creativeName);
+ "P+R_" + osmId, (envelope.getMinX() + envelope.getMaxX()) / 2,
+ (envelope.getMinY() + envelope.getMaxY()) / 2, creativeName);
new ParkAndRideEdge(parkAndRideVertex);
for (OsmVertex accessVertex : accessVertexes) {
new ParkAndRideLinkEdge(parkAndRideVertex, accessVertex);
@@ -628,7 +628,7 @@ private void buildBasicGraph() {
setWayName(way);
StreetTraversalPermission permissions = OSMFilter.getPermissionsForWay(way,
- wayData.getPermission(), graph, banDiscouragedWalking, banDiscouragedBiking);
+ wayData.getPermission(), graph, banDiscouragedWalking, banDiscouragedBiking);
if (!OSMFilter.isWayRoutable(way) || permissions.allowsNothing())
continue;
@@ -654,7 +654,7 @@ private void buildBasicGraph() {
}
}
if (nodeId != last
- && (node.lat != lastLat || node.lon != lastLon || levelsDiffer))
+ && (node.lat != lastLat || node.lon != lastLon || levelsDiffer))
nodes.add(nodeId);
last = nodeId;
lastLon = node.lon;
@@ -704,14 +704,14 @@ private void buildBasicGraph() {
}
if (intersectionNodes.containsKey(endNode) || i == nodes.size() - 2
- || nodes.subList(0, i).contains(nodes.get(i))
- || osmEndNode.hasTag("ele")
- || osmEndNode.isStop()
- || osmEndNode.isBollard()) {
+ || nodes.subList(0, i).contains(nodes.get(i))
+ || osmEndNode.hasTag("ele")
+ || osmEndNode.isStop()
+ || osmEndNode.isBollard()) {
segmentCoordinates.add(getCoordinate(osmEndNode));
geometry = GeometryUtils.getGeometryFactory().createLineString(
- segmentCoordinates.toArray(new Coordinate[0]));
+ segmentCoordinates.toArray(new Coordinate[0]));
segmentCoordinates.clear();
} else {
segmentCoordinates.add(getCoordinate(osmEndNode));
@@ -743,7 +743,7 @@ private void buildBasicGraph() {
}
}
P2 streets = getEdgesForStreet(startEndpoint, endEndpoint,
- way, i, osmStartNode.getId(), osmEndNode.getId(), permissions, geometry);
+ way, i, osmStartNode.getId(), osmEndNode.getId(), permissions, geometry);
StreetEdge street = streets.first;
StreetEdge backStreet = streets.second;
@@ -795,7 +795,7 @@ private void applyMicromobilityRestrictions(StreetEdge streetEdge) {
// TODO Set this to private once WalkableAreaBuilder is gone
protected void applyWayProperties(StreetEdge street, StreetEdge backStreet,
- WayProperties wayData, OSMWithTags way) {
+ WayProperties wayData, OSMWithTags way) {
Set> notes = wayPropertySet.getNoteForWay(way);
float walkSafetyFactor = walkLTSGenerator.computeScore(way);
@@ -870,11 +870,11 @@ private void buildElevatorEdges(Graph graph) {
/*
* first, build FreeEdges to disconnect from the graph, GenericVertices to serve as attachment points, and ElevatorBoard and
* ElevatorAlight edges to connect future ElevatorHop edges to. After this iteration, graph will look like (side view): +==+~~X
- *
+ *
* +==+~~X
- *
+ *
* +==+~~X
- *
+ *
* + GenericVertex, X EndpointVertex, ~~ FreeEdge, == ElevatorBoardEdge/ElevatorAlightEdge Another loop will fill in the
* ElevatorHopEdges.
*/
@@ -889,15 +889,15 @@ private void buildElevatorEdges(Graph graph) {
String levelName = level.longName;
ElevatorOffboardVertex offboardVertex = new ElevatorOffboardVertex(graph,
- sourceVertexLabel + "_offboard", sourceVertex.getX(),
- sourceVertex.getY(), levelName);
+ sourceVertexLabel + "_offboard", sourceVertex.getX(),
+ sourceVertex.getY(), levelName);
new FreeEdge(sourceVertex, offboardVertex);
new FreeEdge(offboardVertex, sourceVertex);
ElevatorOnboardVertex onboardVertex = new ElevatorOnboardVertex(graph,
- sourceVertexLabel + "_onboard", sourceVertex.getX(),
- sourceVertex.getY(), levelName);
+ sourceVertexLabel + "_onboard", sourceVertex.getX(),
+ sourceVertex.getY(), levelName);
new ElevatorBoardEdge(offboardVertex, onboardVertex);
new ElevatorAlightEdge(onboardVertex, offboardVertex, level.longName);
@@ -1016,7 +1016,7 @@ private void unifyTurnRestrictions() {
}
private void applyEdgesToTurnRestrictions(OSMWay way, long startNode, long endNode,
- StreetEdge street, StreetEdge backStreet) {
+ StreetEdge street, StreetEdge backStreet) {
/* Check if there are turn restrictions starting on this segment */
Collection restrictionTags = osmdb.getFromWayTurnRestrictions(way.getId());
@@ -1079,7 +1079,7 @@ private void initIntersectionNodes() {
*/
private void applyBikeSafetyFactor(Graph graph) {
LOG.info(graph.addBuilderAnnotation(new Graphwide(
- "Multiplying all bike safety values by " + (1 / bestBikeSafety))));
+ "Multiplying all bike safety values by " + (1 / bestBikeSafety))));
HashSet seenEdges = new HashSet();
HashSet seenAreas = new HashSet();
for (Vertex vertex : graph.getVertices()) {
@@ -1091,7 +1091,7 @@ private void applyBikeSafetyFactor(Graph graph) {
seenAreas.add(areaEdgeList);
for (NamedArea area : areaEdgeList.getAreas()) {
area.setBicycleSafetyMultiplier(area.getBicycleSafetyMultiplier()
- / bestBikeSafety);
+ / bestBikeSafety);
}
}
if (!(e instanceof StreetEdge)) {
@@ -1153,8 +1153,8 @@ private double getGeometryLengthMeters(Geometry geometry) {
* @param startEndpoint
*/
private P2 getEdgesForStreet(OsmVertex startEndpoint,
- OsmVertex endEndpoint, OSMWay way, int index, long startNode, long endNode,
- StreetTraversalPermission permissions, LineString geometry) {
+ OsmVertex endEndpoint, OSMWay way, int index, long startNode, long endNode,
+ StreetTraversalPermission permissions, LineString geometry) {
// No point in returning edges that can't be traversed by anyone.
if (permissions.allowsNothing()) {
return new P2(null, null);
@@ -1165,17 +1165,17 @@ private P2 getEdgesForStreet(OsmVertex startEndpoint,
double length = this.getGeometryLengthMeters(geometry);
P2 permissionPair = OSMFilter.getPermissions(permissions,
- way);
+ way);
StreetTraversalPermission permissionsFront = permissionPair.first;
StreetTraversalPermission permissionsBack = permissionPair.second;
if (permissionsFront.allowsAnything()) {
street = getEdgeForStreet(startEndpoint, endEndpoint, way, index, startNode, endNode, length,
- permissionsFront, geometry, false);
+ permissionsFront, geometry, false);
}
if (permissionsBack.allowsAnything()) {
backStreet = getEdgeForStreet(endEndpoint, startEndpoint, way, index, endNode, startNode, length,
- permissionsBack, backGeometry, true);
+ permissionsBack, backGeometry, true);
}
if (street != null && backStreet != null) {
backStreet.shareData(street);
@@ -1193,8 +1193,8 @@ private P2 getEdgesForStreet(OsmVertex startEndpoint,
}
private StreetEdge getEdgeForStreet(OsmVertex startEndpoint, OsmVertex endEndpoint,
- OSMWay way, int index, long startNode, long endNode, double length,
- StreetTraversalPermission permissions, LineString geometry, boolean back) {
+ OSMWay way, int index, long startNode, long endNode, double length,
+ StreetTraversalPermission permissions, LineString geometry, boolean back) {
String label = "way " + way.getId() + " from " + index;
label = unique(label);
@@ -1209,7 +1209,7 @@ private StreetEdge getEdgeForStreet(OsmVertex startEndpoint, OsmVertex endEndpoi
float carSpeed = wayPropertySet.getCarSpeedForWay(way, back);
StreetEdge street = edgeFactory.createEdge(startEndpoint, endEndpoint, geometry, name, length,
- permissions, back);
+ permissions, back);
street.setCarSpeed(carSpeed);
street.setTNCStopSuitability(wayPropertySet.isSuitableForTNCStop(way));
street.setFloatingCarDropoffSuitability(wayPropertySet.isSuitableForStreetParking(way));
@@ -1219,12 +1219,12 @@ private StreetEdge getEdgeForStreet(OsmVertex startEndpoint, OsmVertex endEndpoi
if ("crossing".equals(highway) && !way.isTag("bicycle", "designated")) {
cls = StreetEdge.CLASS_CROSSING;
} else if ("footway".equals(highway) && way.isTag("footway", "crossing")
- && !way.isTag("bicycle", "designated")) {
+ && !way.isTag("bicycle", "designated")) {
cls = StreetEdge.CLASS_CROSSING;
} else if ("residential".equals(highway) || "tertiary".equals(highway)
- || "secondary".equals(highway) || "secondary_link".equals(highway)
- || "primary".equals(highway) || "primary_link".equals(highway)
- || "trunk".equals(highway) || "trunk_link".equals(highway)) {
+ || "secondary".equals(highway) || "secondary_link".equals(highway)
+ || "primary".equals(highway) || "primary_link".equals(highway)
+ || "trunk".equals(highway) || "trunk_link".equals(highway)) {
cls = StreetEdge.CLASS_STREET;
} else {
cls = StreetEdge.CLASS_OTHERPATH;
@@ -1240,7 +1240,7 @@ private StreetEdge getEdgeForStreet(OsmVertex startEndpoint, OsmVertex endEndpoi
/* TODO: This should probably generalized somehow? */
if (!ignoreWheelchairAccessibility
- && (way.isTagFalse("wheelchair") || (steps && !way.isTagTrue("wheelchair")))) {
+ && (way.isTagFalse("wheelchair") || (steps && !way.isTagTrue("wheelchair")))) {
street.setWheelchairAccessible(false);
}
@@ -1296,7 +1296,7 @@ private OsmVertex recordLevel(OSMNode node, OSMWithTags way) {
Coordinate coordinate = getCoordinate(node);
String label = this.getLevelNodeLabel(node, level);
OsmVertex vertex = new OsmVertex(graph, label, coordinate.x,
- coordinate.y, node.getId(), new NonLocalizedString(label));
+ coordinate.y, node.getId(), new NonLocalizedString(label));
vertices.put(level, vertex);
// multilevel nodes should also undergo turn-conversion
endpoints.add(vertex);
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/PlatformLinker.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/PlatformLinker.java
index 756c9bf3ca8..060eb7c19ee 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/osm/PlatformLinker.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/PlatformLinker.java
@@ -1,8 +1,8 @@
package org.opentripplanner.graph_builder.module.osm;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
import org.opentripplanner.common.geometry.GeometryUtils;
import org.opentripplanner.common.geometry.SphericalDistanceLibrary;
import org.opentripplanner.graph_builder.services.StreetEdgeFactory;
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/Ring.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/Ring.java
index 39765b6b43c..b27be031a13 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/osm/Ring.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/Ring.java
@@ -10,12 +10,12 @@
import org.opentripplanner.visibility.VLPoint;
import org.opentripplanner.visibility.VLPolygon;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.Polygon;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
public class Ring {
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/UKWayPropertySetSource.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/UKWayPropertySetSource.java
new file mode 100644
index 00000000000..aa11454c710
--- /dev/null
+++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/UKWayPropertySetSource.java
@@ -0,0 +1,72 @@
+package org.opentripplanner.graph_builder.module.osm;
+
+import org.opentripplanner.routing.edgetype.StreetTraversalPermission;
+
+/**
+ * OSM way properties for UK roads.
+ * The main differences compared to the default property set are:
+ * 1. In the UK there is no real distinction between trunk highways and primary highways, other than the
+ * body responsible for them. Most highway=trunk and highway=trunk_link will allow traversal by all modes.
+ * 2. Speeds have been set to reflect average free flow road speeds provided by UK DfT. In particular
+ * note that a distinction is made between tertiary and unclassified/residential roads. The default has these
+ * the same (25mph) but in the UK tertiary roads are considered by OSM tagging guidelines to be busy unclassified
+ * through roads wide enough to allow two cars to pass safely. The free flow speeds are therefore higher.
+ * These changes result in more realistic driving routes.
+ * https://www.gov.uk/government/statistical-data-sets/vehicle-speed-compliance-statistics-data-tables-spe
+ * https://wiki.openstreetmap.org/wiki/United_Kingdom_Tagging_Guidelines
+ *
+ * @author marcusyoung
+ * @see WayPropertySetSource
+ * @see DefaultWayPropertySetSource
+ */
+public class UKWayPropertySetSource implements WayPropertySetSource {
+
+ @Override
+ public void populateProperties(WayPropertySet props) {
+ // Replace existing matching properties as the logic is that the first statement registered takes precedence over later statements
+ props.setProperties("highway=trunk_link", StreetTraversalPermission.ALL, 2.06, 2.06);
+ props.setProperties("highway=trunk", StreetTraversalPermission.ALL, 7.47, 7.47);
+ props.setProperties("highway=trunk;cycleway=lane", StreetTraversalPermission.ALL, 1.5,
+ 1.5);
+ props.setProperties("highway=trunk_link;cycleway=lane", StreetTraversalPermission.ALL,
+ 1.15, 1.15);
+ props.setProperties("highway=trunk;cycleway=share_busway", StreetTraversalPermission.ALL,
+ 1.75, 1.75);
+ props.setProperties("highway=trunk_link;cycleway=share_busway",
+ StreetTraversalPermission.ALL,1.25, 1.25);
+ props.setProperties("highway=trunk;cycleway=opposite_lane", StreetTraversalPermission.ALL,
+ 7.47, 1.5);
+ props.setProperties("highway=trunk_link;cycleway=opposite_lane",
+ StreetTraversalPermission.ALL, 2.06, 1.15);
+ props.setProperties("highway=trunk;cycleway=track", StreetTraversalPermission.ALL, 0.95,
+ 0.95);
+ props.setProperties("highway=trunk_link;cycleway=track", StreetTraversalPermission.ALL,
+ 0.85, 0.85);
+ props.setProperties("highway=trunk;cycleway=opposite_track", StreetTraversalPermission.ALL,
+ 7.47, 0.95);
+ props.setProperties("highway=trunk_link;cycleway=opposite_track",
+ StreetTraversalPermission.ALL, 2.06, 0.85);
+ props.setProperties("highway=trunk;bicycle=designated", StreetTraversalPermission.ALL,
+ 7.25, 7.25);
+ props.setProperties("highway=trunk_link;bicycle=designated", StreetTraversalPermission.ALL,
+ 2, 2);
+
+ /*
+ * Automobile speeds in UK. Based on recorded free flow speeds for motorways, trunk and primary and
+ * my (marcusyoung) personal experience in obtaining realistic routes.
+ *
+ */
+ props.setCarSpeed("highway=motorway", 30.4f); // ~=68mph
+ props.setCarSpeed("highway=motorway_link", 22.4f); // ~= 50mph
+ props.setCarSpeed("highway=trunk", 22.4f); // ~=50mph
+ props.setCarSpeed("highway=trunk_link", 17.9f); // ~= 40mph
+ props.setCarSpeed("highway=primary", 22.4f); // ~=50mph
+ props.setCarSpeed("highway=primary_link", 17.9f); // ~= 40mph
+ props.setCarSpeed("highway=secondary", 17.9f); // ~= 40mph
+ props.setCarSpeed("highway=secondary_link", 13.4f); // ~= 30mph
+ props.setCarSpeed("highway=tertiary", 15.7f); // ~= 35mph
+
+ // Read the rest from the default set
+ new DefaultWayPropertySetSource().populateProperties(props);
+ }
+}
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java
index 12ae3cccf6e..998d0d2fe69 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java
@@ -39,15 +39,15 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
import org.opentripplanner.util.I18NString;
/**
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/WayPropertySetSource.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/WayPropertySetSource.java
index 3068b71fbcd..8e2adad4d93 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/osm/WayPropertySetSource.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/WayPropertySetSource.java
@@ -21,6 +21,8 @@ public static WayPropertySetSource fromConfig(String type) {
return new DefaultWayPropertySetSource();
} else if ("norway".equals(type)) {
return new NorwayWayPropertySetSource();
+ } else if ("uk".equals(type)) {
+ return new UKWayPropertySetSource();
} else {
throw new IllegalArgumentException(String.format("Unknown osmWayPropertySet: '%s'", type));
}
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/shapefile/ShapefileStreetModule.java b/src/main/java/org/opentripplanner/graph_builder/module/shapefile/ShapefileStreetModule.java
index 50dbf52a0ad..abadb63116a 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/shapefile/ShapefileStreetModule.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/shapefile/ShapefileStreetModule.java
@@ -38,10 +38,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
import org.opentripplanner.util.NonLocalizedString;
/**
diff --git a/src/main/java/org/opentripplanner/graph_builder/services/DefaultStreetEdgeFactory.java b/src/main/java/org/opentripplanner/graph_builder/services/DefaultStreetEdgeFactory.java
index 96b6d677d42..363b996b9d1 100644
--- a/src/main/java/org/opentripplanner/graph_builder/services/DefaultStreetEdgeFactory.java
+++ b/src/main/java/org/opentripplanner/graph_builder/services/DefaultStreetEdgeFactory.java
@@ -7,7 +7,7 @@
import org.opentripplanner.routing.edgetype.StreetWithElevationEdge;
import org.opentripplanner.routing.vertextype.IntersectionVertex;
-import com.vividsolutions.jts.geom.LineString;
+import org.locationtech.jts.geom.LineString;
import org.opentripplanner.util.I18NString;
public class DefaultStreetEdgeFactory implements StreetEdgeFactory {
diff --git a/src/main/java/org/opentripplanner/graph_builder/services/StreetEdgeFactory.java b/src/main/java/org/opentripplanner/graph_builder/services/StreetEdgeFactory.java
index 6e2723e5d3a..13238de574b 100644
--- a/src/main/java/org/opentripplanner/graph_builder/services/StreetEdgeFactory.java
+++ b/src/main/java/org/opentripplanner/graph_builder/services/StreetEdgeFactory.java
@@ -6,7 +6,7 @@
import org.opentripplanner.routing.edgetype.StreetTraversalPermission;
import org.opentripplanner.routing.vertextype.IntersectionVertex;
-import com.vividsolutions.jts.geom.LineString;
+import org.locationtech.jts.geom.LineString;
import org.opentripplanner.util.I18NString;
/**
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/AreaMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/AreaMapper.java
new file mode 100644
index 00000000000..dc79f9f49f3
--- /dev/null
+++ b/src/main/java/org/opentripplanner/gtfs/mapping/AreaMapper.java
@@ -0,0 +1,32 @@
+package org.opentripplanner.gtfs.mapping;
+
+import org.opentripplanner.model.FlexArea;
+import org.opentripplanner.util.MapUtils;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/** Map from the OBA model of GTFS-flex areas to the OTP internal model of areas. */
+class AreaMapper {
+
+ private final Map mappedAreas = new HashMap<>();
+
+ Collection map(Collection agencies) {
+ return MapUtils.mapToList(agencies, this::map);
+ }
+
+ /** Map from the OBA model of GTFS-flex areas to the OTP internal model of areas. */
+ FlexArea map(org.onebusaway.gtfs.model.Area orginal) {
+ return orginal == null ? null : mappedAreas.computeIfAbsent(orginal, this::doMap);
+ }
+
+ private FlexArea doMap(org.onebusaway.gtfs.model.Area rhs) {
+ FlexArea lhs = new FlexArea();
+
+ lhs.setId(AgencyAndIdMapper.mapAgencyAndId(rhs.getId()));
+ lhs.setWkt(rhs.getWkt());
+
+ return lhs;
+ }
+}
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java
index 2805052595e..92f1f208bb5 100644
--- a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java
+++ b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java
@@ -42,6 +42,8 @@ public class GTFSToOtpTransitServiceMapper {
routeMapper, fareAttributeMapper
);
+ private final AreaMapper areaMapper = new AreaMapper();
+
/**
* Map from GTFS data to the internal OTP model
*/
@@ -66,6 +68,7 @@ private OtpTransitService map(org.onebusaway.gtfs.services.GtfsRelationalDao dat
builder.getStopTimes().addAll(stopTimeMapper.map(data.getAllStopTimes()));
builder.getTransfers().addAll(transferMapper.map(data.getAllTransfers()));
builder.getTrips().addAll(tripMapper.map(data.getAllTrips()));
+ builder.getFlexAreas().addAll(areaMapper.map(data.getAllAreas()));
return builder.build();
}
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java
index a9108fd2818..bef952e95c7 100644
--- a/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java
+++ b/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java
@@ -42,6 +42,7 @@ private Route doMap(org.onebusaway.gtfs.model.Route rhs) {
lhs.setBikesAllowed(rhs.getBikesAllowed());
lhs.setSortOrder(rhs.getSortOrder());
lhs.setBrandingUrl(rhs.getBrandingUrl());
+ lhs.setEligibilityRestricted(rhs.getEligibilityRestricted());
return lhs;
}
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java
index 82412c33519..ab592f9069d 100644
--- a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java
+++ b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java
@@ -44,6 +44,12 @@ private StopTime doMap(org.onebusaway.gtfs.model.StopTime rhs) {
lhs.setDropOffType(rhs.getDropOffType());
lhs.setShapeDistTraveled(rhs.getShapeDistTraveled());
lhs.setFarePeriodId(rhs.getFarePeriodId());
+ lhs.setContinuousPickup(rhs.getContinuousPickup());
+ lhs.setContinuousDropOff(rhs.getContinuousDropOff());
+ lhs.setStartServiceArea(rhs.getStartServiceArea());
+ lhs.setEndServiceArea(rhs.getEndServiceArea());
+ lhs.setStartServiceAreaRadius(rhs.getStartServiceAreaRadius());
+ lhs.setEndServiceAreaRadius(rhs.getEndServiceAreaRadius());
// Skip mapping of proxy
// private transient StopTimeProxy proxy;
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java
index 848ebbdd58d..41ce89d9b35 100644
--- a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java
+++ b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java
@@ -42,6 +42,13 @@ private Trip doMap(org.onebusaway.gtfs.model.Trip rhs) {
lhs.setTripBikesAllowed(rhs.getTripBikesAllowed());
lhs.setBikesAllowed(rhs.getBikesAllowed());
lhs.setFareId(rhs.getFareId());
+ lhs.setDrtMaxTravelTime(rhs.getDrtMaxTravelTime());
+ lhs.setDrtAvgTravelTime(rhs.getDrtAvgTravelTime());
+ lhs.setDrtAdvanceBookMin(rhs.getDrtAdvanceBookMin());
+ lhs.setDrtPickupMessage(rhs.getDrtPickupMessage());
+ lhs.setDrtDropOffMessage(rhs.getDrtDropOffMessage());
+ lhs.setContinuousPickupMessage(rhs.getContinuousPickupMessage());
+ lhs.setContinuousDropOffMessage(rhs.getContinuousDropOffMessage());
return lhs;
}
diff --git a/src/main/java/org/opentripplanner/index/IndexAPI.java b/src/main/java/org/opentripplanner/index/IndexAPI.java
index 81343c806fd..236c1b42b75 100644
--- a/src/main/java/org/opentripplanner/index/IndexAPI.java
+++ b/src/main/java/org/opentripplanner/index/IndexAPI.java
@@ -6,8 +6,9 @@
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
import org.opentripplanner.model.Agency;
import org.opentripplanner.model.FeedScopedId;
import org.opentripplanner.model.FeedInfo;
@@ -17,6 +18,7 @@
import org.opentripplanner.model.calendar.ServiceDate;
import org.opentripplanner.common.geometry.SphericalDistanceLibrary;
import org.opentripplanner.gtfs.GtfsLibrary;
+import org.opentripplanner.index.model.AreaShort;
import org.opentripplanner.index.model.PatternDetail;
import org.opentripplanner.index.model.PatternShort;
import org.opentripplanner.index.model.RouteShort;
@@ -599,6 +601,29 @@ public Response getStopCluster (@PathParam("clusterId") String clusterIdString)
}
}
+ /**
+ * Return all GTFS-Flex area IDs. Areas are defined in GTFS-Flex to be a lat/lon polygon in
+ * which certain kinds of flex service take place (deviated-route and call-and-ride).
+ */
+ @GET
+ @Path("/flexAreas")
+ public Response getAllFlexAreas() {
+ List ids = new ArrayList<>(index.flexAreasById.keySet());
+ return Response.status(Status.OK).entity(ids).build();
+ }
+
+ /** Return a specific GTFS-Flex area given an ID in Agency:ID format. */
+ @GET
+ @Path("/flexAreas/{id}")
+ public Response getFlexAreaByFeedId(@PathParam("id") String areaIdString) {
+ FeedScopedId id = GtfsLibrary.convertIdFromString(areaIdString);
+ Geometry area = index.flexAreasById.get(id);
+ if (area == null) {
+ return Response.status(Status.NOT_FOUND).build();
+ }
+ return Response.status(Status.OK).entity(new AreaShort(id, area)).build();
+ }
+
@POST
@Path("/graphql")
@Consumes(MediaType.APPLICATION_JSON)
diff --git a/src/main/java/org/opentripplanner/index/IndexGraphQLSchema.java b/src/main/java/org/opentripplanner/index/IndexGraphQLSchema.java
index b9c1900b469..fd7bbcac4be 100644
--- a/src/main/java/org/opentripplanner/index/IndexGraphQLSchema.java
+++ b/src/main/java/org/opentripplanner/index/IndexGraphQLSchema.java
@@ -1,9 +1,9 @@
package org.opentripplanner.index;
import com.google.common.collect.ImmutableMap;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.LineString;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.LineString;
import graphql.Scalars;
import graphql.relay.Relay;
import graphql.relay.SimpleListConnection;
diff --git a/src/main/java/org/opentripplanner/index/model/AreaShort.java b/src/main/java/org/opentripplanner/index/model/AreaShort.java
new file mode 100644
index 00000000000..39bc530c18d
--- /dev/null
+++ b/src/main/java/org/opentripplanner/index/model/AreaShort.java
@@ -0,0 +1,16 @@
+package org.opentripplanner.index.model;
+
+import org.locationtech.jts.geom.Geometry;
+import org.opentripplanner.model.FeedScopedId;
+import org.opentripplanner.util.PolylineEncoder;
+import org.opentripplanner.util.model.EncodedPolylineBean;
+
+public class AreaShort {
+ public FeedScopedId areaId;
+ public EncodedPolylineBean polygon;
+
+ public AreaShort(FeedScopedId areaId, Geometry polygon) {
+ this.areaId = areaId;
+ this.polygon = PolylineEncoder.createEncodings(polygon.getBoundary());
+ }
+}
diff --git a/src/main/java/org/opentripplanner/index/model/TripTimeShort.java b/src/main/java/org/opentripplanner/index/model/TripTimeShort.java
index 8b030343c2a..a5e1754da43 100644
--- a/src/main/java/org/opentripplanner/index/model/TripTimeShort.java
+++ b/src/main/java/org/opentripplanner/index/model/TripTimeShort.java
@@ -31,6 +31,10 @@ public class TripTimeShort {
public FeedScopedId tripId;
public String blockId;
public String headsign;
+ public int continuousPickup;
+ public int continuousDropOff;
+ public double serviceAreaRadius;
+ public String serviceArea;
/**
* This is stop-specific, so the index i is a stop index, not a hop index.
@@ -50,6 +54,10 @@ public TripTimeShort(TripTimes tt, int i, Stop stop) {
realtimeState = tt.getRealTimeState();
blockId = tt.trip.getBlockId();
headsign = tt.getHeadsign(i);
+ continuousPickup = tt.getContinuousPickup(i);
+ continuousDropOff = tt.getContinuousDropOff(i);
+ serviceAreaRadius = tt.getServiceAreaRadius(i);
+ serviceArea = tt.getServiceArea(i);
}
public TripTimeShort(TripTimes tt, int i, Stop stop, ServiceDay sd) {
diff --git a/src/main/java/org/opentripplanner/inspector/EdgeVertexTileRenderer.java b/src/main/java/org/opentripplanner/inspector/EdgeVertexTileRenderer.java
index 06732e1757e..414aec4040b 100644
--- a/src/main/java/org/opentripplanner/inspector/EdgeVertexTileRenderer.java
+++ b/src/main/java/org/opentripplanner/inspector/EdgeVertexTileRenderer.java
@@ -19,18 +19,18 @@
import com.jhlabs.awt.ShapeStroke;
import com.jhlabs.awt.TextStroke;
-import com.vividsolutions.jts.awt.IdentityPointTransformation;
-import com.vividsolutions.jts.awt.PointShapeFactory;
-import com.vividsolutions.jts.awt.ShapeWriter;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.PrecisionModel;
-import com.vividsolutions.jts.operation.buffer.BufferParameters;
-import com.vividsolutions.jts.operation.buffer.OffsetCurveBuilder;
+import org.locationtech.jts.awt.IdentityPointTransformation;
+import org.locationtech.jts.awt.PointShapeFactory;
+import org.locationtech.jts.awt.ShapeWriter;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.operation.buffer.BufferParameters;
+import org.locationtech.jts.operation.buffer.OffsetCurveBuilder;
/**
* A TileRenderer implementation which get all edges/vertex in the bounding box of the tile, and
diff --git a/src/main/java/org/opentripplanner/inspector/TileRenderer.java b/src/main/java/org/opentripplanner/inspector/TileRenderer.java
index c27649a9ed6..2f529f8dda2 100644
--- a/src/main/java/org/opentripplanner/inspector/TileRenderer.java
+++ b/src/main/java/org/opentripplanner/inspector/TileRenderer.java
@@ -4,8 +4,8 @@
import org.opentripplanner.routing.graph.Graph;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.util.AffineTransformation;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.util.AffineTransformation;
/**
* Interface for a slippy map tile renderer.
diff --git a/src/main/java/org/opentripplanner/inspector/TileRendererManager.java b/src/main/java/org/opentripplanner/inspector/TileRendererManager.java
index c08b7939431..3d27a21cb49 100644
--- a/src/main/java/org/opentripplanner/inspector/TileRendererManager.java
+++ b/src/main/java/org/opentripplanner/inspector/TileRendererManager.java
@@ -13,8 +13,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.util.AffineTransformation;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.util.AffineTransformation;
/**
* Process slippy map tile rendering requests. Get the tile renderer for the given layer, setup a
diff --git a/src/main/java/org/opentripplanner/internals/AnalysisUtils.java b/src/main/java/org/opentripplanner/internals/AnalysisUtils.java
index 27395796c2e..5be2bc5693e 100644
--- a/src/main/java/org/opentripplanner/internals/AnalysisUtils.java
+++ b/src/main/java/org/opentripplanner/internals/AnalysisUtils.java
@@ -1,11 +1,11 @@
package org.opentripplanner.internals;
import com.google.common.collect.LinkedListMultimap;
-import com.vividsolutions.jts.algorithm.ConvexHull;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.Point;
+import org.locationtech.jts.algorithm.ConvexHull;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
import org.opentripplanner.common.DisjointSet;
import org.opentripplanner.common.geometry.GeometryUtils;
import org.opentripplanner.routing.core.RoutingRequest;
diff --git a/src/main/java/org/opentripplanner/kryo/HashBiMapSerializer.java b/src/main/java/org/opentripplanner/kryo/HashBiMapSerializer.java
new file mode 100644
index 00000000000..0b95c7534aa
--- /dev/null
+++ b/src/main/java/org/opentripplanner/kryo/HashBiMapSerializer.java
@@ -0,0 +1,19 @@
+package org.opentripplanner.kryo;
+
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.serializers.MapSerializer;
+import com.google.common.collect.HashBiMap;
+
+import java.util.Map;
+
+/**
+ * Created by abyrd on 2018-10-25
+ */
+public class HashBiMapSerializer extends MapSerializer {
+
+ protected Map create(Kryo kryo, Input input, Class