rename SpeedSample to SegmentSpeedSample to avoid clash with com.conv…

…eyal.traffic class.

src/main/java/org/opentripplanner/api/resource/PlannerResource.java

@@ -12,15 +12,6 @@ the License, or (at your option) any later version.
  along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package org.opentripplanner.api.resource;
 
-import static org.opentripplanner.api.resource.ServerInfo.Q;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
 import org.opentripplanner.api.common.RoutingResource;
 import org.opentripplanner.api.model.TripPlan;
 import org.opentripplanner.api.model.error.PlannerError;
@@ -32,7 +23,15 @@ the License, or (at your option) any later version.
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.List;
+
+import static org.opentripplanner.api.resource.ServerInfo.Q;
 
 /**
  * This is the primary entry point for the trip planning web service.
@@ -43,7 +42,7 @@ the License, or (at your option) any later version.
  * rather than singleton-scoped (a single instance existing for the lifetime of the OTP server).
  */
 @Path("routers/{routerId}/plan") // final element needed here rather than on method to distinguish from routers API
-public class PlannerResource extends RoutingResource {
+public class    PlannerResource extends RoutingResource {
 
     private static final Logger LOG = LoggerFactory.getLogger(PlannerResource.class);
 

src/main/java/org/opentripplanner/traffic/SpeedSample.java → src/main/java/org/opentripplanner/traffic/SegmentSpeedSample.java

@@ -13,8 +13,8 @@
 /**
  * Represents speeds at particular times of day.
  */
-public class SpeedSample implements Serializable {
-    private static final Logger LOG = LoggerFactory.getLogger(SpeedSample.class);
+public class SegmentSpeedSample implements Serializable {
+    private static final Logger LOG = LoggerFactory.getLogger(SegmentSpeedSample.class);
 
     private static final double KMH_TO_MS = 1000d / 3600d;
 
@@ -68,7 +68,7 @@ private short encodeSpeed (double speed) {
     }
 
     /** Create a speed sample from an OpenTraffic stats object */
-    public SpeedSample(ExchangeFormat.BaselineStats stats) {
+    public SegmentSpeedSample(ExchangeFormat.BaselineStats stats) {
         float avg = stats.getAverageSpeed();
 
         if (Float.isNaN(avg)) {
@@ -101,7 +101,7 @@ public SpeedSample(ExchangeFormat.BaselineStats stats) {
     }
 
     /** create a speed sample using a function */
-    public SpeedSample (double averageSpeed, double[] hourBins) {
+    public SegmentSpeedSample(double averageSpeed, double[] hourBins) {
         this.average = encodeSpeed(averageSpeed);
         this.hourBins = new short[hourBins.length];
 

src/main/java/org/opentripplanner/traffic/StreetSpeedSource.java

@@ -9,22 +9,22 @@
  * A source of speeds for traversing streets.
  */
 public class StreetSpeedSource {
-    private Map<Segment, SpeedSample> samples;
+    private Map<Segment, SegmentSpeedSample> samples;
 
     /** Get the speed for traversing the given edge with the given mode at the given time. Returns NaN if there is no speed information available. */
     public double getSpeed (StreetEdge edge, TraverseMode traverseMode, long timeMillis) {
         if (traverseMode != TraverseMode.CAR)
             return Double.NaN;
 
-        SpeedSample sample = samples.get(new Segment(edge));
+        SegmentSpeedSample sample = samples.get(new Segment(edge));
 
         if (sample == null) return Double.NaN;
 
         return sample.getSpeed(timeMillis);
     }
 
     /** Set the samples. For now this is a simple setter, in the future it may handle concurrency control, etc. */
-    public synchronized void setSamples (Map<Segment, SpeedSample> samples) {
+    public synchronized void setSamples (Map<Segment, SegmentSpeedSample> samples) {
         this.samples = samples;
     }
 }

src/main/java/org/opentripplanner/updater/traffic/OpenTrafficUpdater.java

@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.traffic.Segment;
-import org.opentripplanner.traffic.SpeedSample;
+import org.opentripplanner.traffic.SegmentSpeedSample;
 import org.opentripplanner.traffic.StreetSpeedSource;
 import org.opentripplanner.updater.GraphUpdaterManager;
 import org.opentripplanner.updater.PollingGraphUpdater;
@@ -45,7 +45,7 @@ protected void runPolling() throws Exception {
 
         // Build a speed index now while we're running in our own thread. We'll swap it out
         // at the appropriate time with a graphwriterrunnable, but no need to synchronize yet.
-        Map<Segment, SpeedSample> speedIndex = Maps.newHashMap();
+        Map<Segment, SegmentSpeedSample> speedIndex = Maps.newHashMap();
 
         // search through the tile directory
         for (File z : tileDirectory.listFiles()) {
@@ -65,9 +65,9 @@ protected void runPolling() throws Exception {
 
                     for (int i = 0; i < tile.getSegmentsCount(); i++) {
                         ExchangeFormat.BaselineStats stats = tile.getSegments(i);
-                        SpeedSample sample;
+                        SegmentSpeedSample sample;
                         try {
-                            sample = new SpeedSample(stats);
+                            sample = new SegmentSpeedSample(stats);
                         } catch (IllegalArgumentException e) {
                             continue;
                         }

src/test/java/org/opentripplanner/traffic/StreetSpeedSourceTest.java

@@ -24,9 +24,9 @@ public void testMatching () {
         se.wayId = 10;
 
         // create a speed sample
-        SpeedSample s = getSpeedSample();
+        SegmentSpeedSample s = getSpeedSample();
 
-        Map<Segment, SpeedSample> speeds = Maps.newHashMap();
+        Map<Segment, SegmentSpeedSample> speeds = Maps.newHashMap();
         Segment seg = new Segment(10l, 5l, 6l);
         speeds.put(seg, s);
 
@@ -58,7 +58,7 @@ public void testMatching () {
     }
 
     /** Make a speed sample */
-    private SpeedSample getSpeedSample() {
+    private SegmentSpeedSample getSpeedSample() {
         double[] hourBins = new double[7 * 24];
         for (int i = 0; i < hourBins.length; i++) {
             if (i == 8)
@@ -75,6 +75,6 @@ else if (i == 9)
         // ~4km/h
         double avg = 1.33;
 
-        return new SpeedSample(avg, hourBins);
+        return new SegmentSpeedSample(avg, hourBins);
     }
 }