Merge pull request graphhopper#1018 from graphhopper/pt-merge

Public Transit

Author: michaz

.gitignore

@@ -43,3 +43,4 @@ local.properties
 /reader-overlay-data/nbproject/
 !malta-latest.osm.pbf
 /reader-json/nbproject/
+/graph-cache

core/pom.xml

@@ -75,12 +75,23 @@
             <version>2.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
             <version>${json.org.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.vividsolutions</groupId>
+            <artifactId>jts</artifactId>
+            <version>1.13</version>
+        </dependency>
+
     </dependencies>
 
     <build>

core/src/main/java/com/graphhopper/PathWrapper.java

@@ -21,6 +21,7 @@
 import com.graphhopper.util.PointList;
 import com.graphhopper.util.shapes.BBox;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -43,6 +44,10 @@ public class PathWrapper {
     private InstructionList instructions;
     private PointList waypointList = PointList.EMPTY;
     private PointList pointList = PointList.EMPTY;
+    private int numChanges;
+    private long firstPtLegDeparture;
+    private final List<Trip.Leg> legs = new ArrayList<>();
+    private BigDecimal fare;
 
     /**
      * @return the description of this route alternative to make it meaningful for the user e.g. it
@@ -265,4 +270,28 @@ public PathWrapper addErrors(List<Throwable> errors) {
         this.errors.addAll(errors);
         return this;
     }
+
+    public void setNumChanges(int numChanges) {
+        this.numChanges = numChanges;
+    }
+
+    public int getNumChanges() {
+        return numChanges;
+    }
+
+    public void setFirstPtLegDeparture(long firstPtLegDeparture) {
+        this.firstPtLegDeparture = firstPtLegDeparture;
+    }
+
+    public List<Trip.Leg> getLegs() {
+        return legs;
+    }
+
+    public void setFare(BigDecimal fare) {
+        this.fare = fare;
+    }
+
+    public BigDecimal getFare() {
+        return fare;
+    }
 }

core/src/main/java/com/graphhopper/Trip.java

@@ -0,0 +1,78 @@
+package com.graphhopper;
+
+import com.graphhopper.util.EdgeIteratorState;
+import com.graphhopper.util.InstructionList;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.Point;
+
+import java.util.Date;
+import java.util.List;
+
+public class Trip {
+    public static abstract class Leg {
+        public final String type;
+        public final String departureLocation;
+        public final List<EdgeIteratorState> edges;
+        public final Geometry geometry;
+
+        public final double distance;
+
+        public Leg(String type, String departureLocation, List<EdgeIteratorState> edges, Geometry geometry, double distance) {
+            this.type = type;
+            this.departureLocation = departureLocation;
+            this.edges = edges;
+            this.geometry = geometry;
+            this.distance = distance;
+        }
+
+        public double getDistance() {
+            return distance;
+        }
+    }
+
+    public static class Stop {
+        public final String stop_id;
+        public final String name;
+        public final Point geometry;
+
+        public Stop(String stop_id, String name, Point geometry) {
+            this.stop_id = stop_id;
+            this.name = name;
+            this.geometry = geometry;
+        }
+    }
+    public static class WalkLeg extends Leg {
+        public final InstructionList instructions;
+
+        public WalkLeg(String departureLocation, List<EdgeIteratorState> edges, Geometry geometry, double distance, InstructionList instructions) {
+            super("walk", departureLocation, edges, geometry, distance);
+            this.instructions = instructions;
+        }
+    }
+    public static class PtLeg extends Leg {
+        public final String feedId;
+        public final boolean isInSameVehicleAsPrevious;
+        public final String trip_headsign;
+        public final Date departureTime;  // TODO: Java 8: Should be LocalDateTime
+        public final long travelTime;
+        public final List<Stop> stops;
+        public final Stop boardStop;
+        public final String tripId;
+        public final String routeId;
+
+        public PtLeg(String feedId, boolean isInSameVehicleAsPrevious, Stop stop, String tripId, String routeId, List<EdgeIteratorState> edges, Date departureTime, List<Stop> stops, double distance, long travelTime, Geometry geometry) {
+            super("pt", stop.name, edges, geometry, distance);
+            this.feedId = feedId;
+            this.isInSameVehicleAsPrevious = isInSameVehicleAsPrevious;
+            this.boardStop = stop;
+            this.tripId = tripId;
+            this.routeId = routeId;
+            this.trip_headsign = edges.get(0).getName();
+            this.departureTime = departureTime;
+            this.travelTime = travelTime;
+            this.stops = stops;
+        }
+
+    }
+
+}