diff --git a/onebusaway-gtfs-transformer/pom.xml b/onebusaway-gtfs-transformer/pom.xml index 89c87dcd0..16f393287 100644 --- a/onebusaway-gtfs-transformer/pom.xml +++ b/onebusaway-gtfs-transformer/pom.xml @@ -12,26 +12,21 @@ 1.3.101-SNAPSHOT - - org.onebusaway onebusaway-gtfs 1.3.101-SNAPSHOT - org.onebusaway onebusaway-collections - org.json json 20090211 - junit junit @@ -47,7 +42,6 @@ mockito-core test - com.kurtraschke wsf-api @@ -58,6 +52,18 @@ onebusaway-cloud-noop 0.0.10 + + javax.xml.bind + jaxb-api + + + com.sun.xml.bind + jaxb-core + + + com.sun.xml.bind + jaxb-impl + @@ -72,6 +78,15 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + diff --git a/onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/impl/StopTimeArray.java b/onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/impl/StopTimeArray.java index c574800ed..74567e5e7 100644 --- a/onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/impl/StopTimeArray.java +++ b/onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/impl/StopTimeArray.java @@ -62,13 +62,13 @@ public class StopTimeArray extends AbstractList { private BookingRule[] dropOffBookingRules = new BookingRule[0]; - private int[] meanOffsets = new int[0]; + private double[] meanOffsets = new double[0]; - private int[] safeOffsets = new int[0]; + private double[] safeOffsets = new double[0]; - private int[] meanFactors = new int[0]; + private double[] meanFactors = new double[0]; - private int[] safeFactors = new int[0]; + private double[] safeFactors = new double[0]; public void trimToSize() { setLength(size); @@ -396,42 +396,42 @@ public void setDropOffBookingRule(BookingRule dropOffBookingRule) { } @Override - public int getMeanDurationFactor() { + public double getMeanDurationFactor() { return meanOffsets[index]; } @Override - public void setMeanDurationFactor(int meanDurationFactor) { + public void setMeanDurationFactor(double meanDurationFactor) { meanFactors[index] = meanDurationFactor; } @Override - public int getMeanDurationOffset() { + public double getMeanDurationOffset() { return meanOffsets[index]; } @Override - public void setMeanDurationOffset(int meanDurationOffset) { + public void setMeanDurationOffset(double meanDurationOffset) { meanOffsets[index] = meanDurationOffset; } @Override - public int getSafeDurationFactor() { + public double getSafeDurationFactor() { return safeFactors[index]; } @Override - public void setSafeDurationFactor(int safeDurationFactor) { + public void setSafeDurationFactor(double safeDurationFactor) { safeFactors[index] = safeDurationFactor; } @Override - public int getSafeDurationOffset() { + public double getSafeDurationOffset() { return safeOffsets[index]; } @Override - public void setSafeDurationOffset(int safeDurationOffset) { + public void setSafeDurationOffset(double safeDurationOffset) { safeOffsets[index] = safeDurationOffset; } diff --git a/onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/model/StopTime.java b/onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/model/StopTime.java index 3aa6621fb..7249d3fbe 100644 --- a/onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/model/StopTime.java +++ b/onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/model/StopTime.java @@ -136,16 +136,16 @@ public final class StopTime extends IdentityBean implements // See https://github.com/MobilityData/gtfs-flex/blob/master/spec/reference.md @CsvField(optional = true, name = "mean_duration_factor") - private int meanDurationFactor = MISSING_VALUE; + private double meanDurationFactor = MISSING_VALUE; - @CsvField(optional = true, name = "mean_duration_offset", mapping = StopTimeFieldMappingFactory.class) - private int meanDurationOffset = MISSING_VALUE; + @CsvField(optional = true, name = "mean_duration_offset") + private double meanDurationOffset = MISSING_VALUE; @CsvField(optional = true, name = "safe_duration_factor") - private int safeDurationFactor = MISSING_VALUE; + private double safeDurationFactor = MISSING_VALUE; - @CsvField(optional = true, name = "safe_duration_offset", mapping = StopTimeFieldMappingFactory.class) - private int safeDurationOffset = MISSING_VALUE; + @CsvField(optional = true, name = "safe_duration_offset") + private double safeDurationOffset = MISSING_VALUE; public StopTime() { @@ -650,30 +650,30 @@ public String toString() { + ")"; } - public int getMeanDurationFactor() { + public double getMeanDurationFactor() { return meanDurationFactor; } - public void setMeanDurationFactor(int meanDurationFactor) { + public void setMeanDurationFactor(double meanDurationFactor) { this.meanDurationFactor = meanDurationFactor; } - public int getMeanDurationOffset() { + public double getMeanDurationOffset() { return meanDurationOffset; } - public void setMeanDurationOffset(int meanDurationOffset) { + public void setMeanDurationOffset(double meanDurationOffset) { this.meanDurationOffset = meanDurationOffset; } - public int getSafeDurationFactor() { + public double getSafeDurationFactor() { if (proxy != null) { return proxy.getSafeDurationFactor(); } return this.safeDurationFactor; } - public void setSafeDurationFactor(int safeDurationFactor) { + public void setSafeDurationFactor(double safeDurationFactor) { if (proxy != null) { proxy.setSafeDurationFactor(safeDurationFactor); return; @@ -681,14 +681,14 @@ public void setSafeDurationFactor(int safeDurationFactor) { this.safeDurationFactor = safeDurationFactor; } - public int getSafeDurationOffset() { + public double getSafeDurationOffset() { if (proxy != null) { return proxy.getSafeDurationOffset(); } return this.safeDurationOffset; } - public void setSafeDurationOffset(int safeDurationOffset) { + public void setSafeDurationOffset(double safeDurationOffset) { if (proxy != null) { proxy.setSafeDurationOffset(safeDurationOffset); return; diff --git a/onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/model/StopTimeProxy.java b/onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/model/StopTimeProxy.java index ed693bafa..0ef6f4c71 100644 --- a/onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/model/StopTimeProxy.java +++ b/onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/model/StopTimeProxy.java @@ -103,19 +103,19 @@ public interface StopTimeProxy { public void setDropOffBookingRule(BookingRule dropOffBookingRule); - public int getMeanDurationFactor(); + public double getMeanDurationFactor(); - public void setMeanDurationFactor(int meanDurationFactor); + public void setMeanDurationFactor(double meanDurationFactor); - public int getMeanDurationOffset(); + public double getMeanDurationOffset(); - public void setMeanDurationOffset(int meanDurationOffset); + public void setMeanDurationOffset(double meanDurationOffset); - public int getSafeDurationFactor(); + public double getSafeDurationFactor(); - public void setSafeDurationFactor(int safeDurationFactor); + public void setSafeDurationFactor(double safeDurationFactor); - public int getSafeDurationOffset(); + public double getSafeDurationOffset(); - public void setSafeDurationOffset(int safeDurationOffset); + public void setSafeDurationOffset(double safeDurationOffset); } diff --git a/pom.xml b/pom.xml index 00f0b3c35..29213cd6a 100644 --- a/pom.xml +++ b/pom.xml @@ -110,32 +110,62 @@ 1.8.0 test + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - -Xdoclint:none - 8 - - - - - attach-javadocs - - jar - - - - - - + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.1 + + + -Xdoclint:none + 8 + false + + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.1 + + +