Merge pull request #278 from conveyal/dev

Release

pom.xml

@@ -205,15 +205,12 @@
   </build>
 
   <repositories>
-    <repository>
-      <id>conveyal</id>
-      <name>Conveyal Maven Repository</name>
-       <url>https://maven.conveyal.com/</url>
-    </repository>
     <repository>
       <id>osgeo</id>
-      <name>Open Source Geospatial Foundation Repository</name>
-      <url>http://download.osgeo.org/webdav/geotools/</url>
+      <name>OSGeo Release Repository</name>
+      <url>https://repo.osgeo.org/repository/release/</url>
+      <snapshots><enabled>false</enabled></snapshots>
+      <releases><enabled>true</enabled></releases>
     </repository>
     <!--  used for importing java projects from github -->
     <repository>
@@ -331,12 +328,6 @@
       <artifactId>commons-cli</artifactId>
       <version>1.4</version>
     </dependency>
-    <!-- We should really find a way to do this without forking Jackson -->
-    <dependency>
-      <groupId>com.conveyal</groupId>
-      <artifactId>jackson2-geojson</artifactId>
-      <version>0.8</version>
-    </dependency>
     <!-- JDBC support for Postgres databases. More modules would need to be added to access H2, SQLite etc. -->
     <dependency>
       <groupId>org.postgresql</groupId>

src/main/java/com/conveyal/gtfs/GTFS.java

@@ -7,6 +7,7 @@
 import com.conveyal.gtfs.loader.JdbcGtfsSnapshotter;
 import com.conveyal.gtfs.loader.SnapshotResult;
 import com.conveyal.gtfs.util.InvalidNamespaceException;
+import com.conveyal.gtfs.validator.FeedValidatorCreator;
 import com.conveyal.gtfs.validator.ValidationResult;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.io.Files;
@@ -15,10 +16,10 @@
 import org.apache.commons.dbcp2.DriverManagerConnectionFactory;
 import org.apache.commons.dbcp2.PoolableConnectionFactory;
 import org.apache.commons.dbcp2.PoolingDataSource;
-import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import javax.sql.DataSource;
 import java.io.File;
 import java.io.IOException;
@@ -28,7 +29,6 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 
 import static com.conveyal.gtfs.util.Util.ensureValidNamespace;
 
@@ -94,9 +94,9 @@ public static SnapshotResult makeSnapshot (String feedId, DataSource dataSource)
     /**
      * Once a feed has been loaded into the database, examine its contents looking for various problems and errors.
      */
-    public static ValidationResult validate (String feedId, DataSource dataSource) {
+    public static ValidationResult validate (String feedId, DataSource dataSource, FeedValidatorCreator... additionalValidators) {
         Feed feed = new Feed(dataSource, feedId);
-        ValidationResult result = feed.validate();
+        ValidationResult result = feed.validate(additionalValidators);
         return result;
     }
 

src/main/java/com/conveyal/gtfs/GTFSMain.java

@@ -39,6 +39,7 @@ public static void main (String[] args) throws Exception {
 
         if(cmd.hasOption("validate")) {
             feed.validate();
+            // FIXME: See JsonManager.class for discussion about potential issues serializing GeoJSON.
             JsonManager<ValidationResult> json = new JsonManager(ValidationResult.class);
             ValidationResult result = new ValidationResult(arguments[0], feed);
             String resultString = json.writePretty(result);

src/main/java/com/conveyal/gtfs/error/NewGTFSErrorType.java

@@ -3,76 +3,81 @@
 import com.conveyal.gtfs.validator.model.Priority;
 
 public enum NewGTFSErrorType {
-
+    // Standard errors.
+    BOOLEAN_FORMAT(Priority.MEDIUM, "A GTFS boolean field must contain the value 1 or 0."),
+    COLOR_FORMAT(Priority.MEDIUM, "A color should be specified with six-characters (three two-digit hexadecimal numbers)."),
+    COLUMN_NAME_UNSAFE(Priority.HIGH, "Column header contains characters not safe in SQL, it was renamed."),
+    CURRENCY_UNKNOWN(Priority.MEDIUM, "The currency code was not recognized."),
     DATE_FORMAT(Priority.MEDIUM, "Date format should be YYYYMMDD."),
-    DATE_RANGE(Priority.MEDIUM, "Date should is extremely far in the future or past."),
     DATE_NO_SERVICE(Priority.MEDIUM, "No service_ids were active on a date within the range of dates with defined service."),
-    TIME_FORMAT(Priority.MEDIUM, "Time format should be HH:MM:SS."),
-    URL_FORMAT(Priority.MEDIUM, "URL format should be <scheme>://<authority><path>?<query>#<fragment>"),
-    LANGUAGE_FORMAT(Priority.LOW, "Language should be specified with a valid BCP47 tag."),
-    ILLEGAL_FIELD_VALUE(Priority.MEDIUM, "Fields may not contain tabs, carriage returns or new lines."),
-    INTEGER_FORMAT(Priority.MEDIUM, "Incorrect integer format."),
-    FARE_TRANSFER_MISMATCH(Priority.MEDIUM, "A fare that does not permit transfers has a non-zero transfer duration."),
-    FREQUENCY_PERIOD_OVERLAP(Priority.MEDIUM, "A frequency for a trip overlaps with another frequency defined for the same trip."),
-    FLOATING_FORMAT(Priority.MEDIUM, "Incorrect floating point number format."),
-    COLUMN_NAME_UNSAFE(Priority.HIGH, "Column header contains characters not safe in SQL, it was renamed."),
-    NUMBER_PARSING(Priority.MEDIUM, "Unable to parse number from value."),
-    NUMBER_NEGATIVE(Priority.MEDIUM, "Number was expected to be non-negative."),
-    NUMBER_TOO_SMALL(Priority.MEDIUM, "Number was below the allowed range."),
-    NUMBER_TOO_LARGE(Priority.MEDIUM, "Number was above the allowed range."),
+    DATE_RANGE(Priority.MEDIUM, "Date should is extremely far in the future or past."),
+    DEPARTURE_BEFORE_ARRIVAL(Priority.MEDIUM, "The vehicle departs from this stop before it arrives."),
+    DUPLICATE_HEADER(Priority.MEDIUM, "More than one column in a table had the same name in the header row."),
     DUPLICATE_ID(Priority.MEDIUM, "More than one entity in a table had the same ID."),
-    DUPLICATE_TRIP(Priority.MEDIUM, "More than one trip had an identical schedule and stops."),
     DUPLICATE_STOP(Priority.MEDIUM, "More than one stop was located in exactly the same place."),
-    DUPLICATE_HEADER(Priority.MEDIUM, "More than one column in a table had the same name in the header row."),
-    MISSING_TABLE(Priority.MEDIUM, "This table is required by the GTFS specification but is missing."),
+    DUPLICATE_TRIP(Priority.MEDIUM, "More than one trip had an identical schedule and stops."),
+    FARE_TRANSFER_MISMATCH(Priority.MEDIUM, "A fare that does not permit transfers has a non-zero transfer duration."),
+    FEED_TRAVEL_TIMES_ROUNDED(Priority.LOW, "All travel times in the feed are rounded to the minute, which may cause unexpected results in routing applications where travel times are zero."),
+    FLOATING_FORMAT(Priority.MEDIUM, "Incorrect floating point number format."),
+    FREQUENCY_PERIOD_OVERLAP(Priority.MEDIUM, "A frequency for a trip overlaps with another frequency defined for the same trip."),
+    ILLEGAL_FIELD_VALUE(Priority.MEDIUM, "Fields may not contain tabs, carriage returns or new lines."),
+    INTEGER_FORMAT(Priority.MEDIUM, "Incorrect integer format."),
+    LANGUAGE_FORMAT(Priority.LOW, "Language should be specified with a valid BCP47 tag."),
+    MISSING_ARRIVAL_OR_DEPARTURE(Priority.MEDIUM, "First and last stop times are required to have both an arrival and departure time."),
     MISSING_COLUMN(Priority.MEDIUM, "A required column was missing from a table."),
-    MISSING_SHAPE(Priority.MEDIUM, "???"),
     MISSING_FIELD(Priority.MEDIUM, "A required field was missing or empty in a particular row."),
+    MISSING_SHAPE(Priority.MEDIUM, "???"),
+    MISSING_TABLE(Priority.MEDIUM, "This table is required by the GTFS specification but is missing."),
     MULTIPLE_SHAPES_FOR_PATTERN(Priority.MEDIUM, "Multiple shapes found for a single unique sequence of stops (i.e, trip pattern)."),
-    WRONG_NUMBER_OF_FIELDS(Priority.MEDIUM, "A row did not have the same number of fields as there are headers in its table."),
     NO_SERVICE(Priority.HIGH, "There is no service defined on any day in this feed."),
+    NUMBER_NEGATIVE(Priority.MEDIUM, "Number was expected to be non-negative."),
+    NUMBER_PARSING(Priority.MEDIUM, "Unable to parse number from value."),
+    NUMBER_TOO_LARGE(Priority.MEDIUM, "Number was above the allowed range."),
+    NUMBER_TOO_SMALL(Priority.MEDIUM, "Number was below the allowed range."),
     OVERLAPPING_TRIP(Priority.MEDIUM, "Blocks?"),
-    SHAPE_REVERSED(Priority.MEDIUM, "A shape appears to be intended for vehicles running the opposite direction on the route."),
-    SHAPE_MISSING_COORDINATE(Priority.MEDIUM, "???"),
-    TABLE_IN_SUBDIRECTORY(Priority.HIGH, "Rather than being at the root of the zip file, a table was nested in a subdirectory."),
-    TABLE_MISSING_COLUMN_HEADERS(Priority.HIGH, "Table is missing column headers."),
-    TABLE_TOO_LONG(Priority.MEDIUM, "Table is too long to record line numbers with a 32-bit integer, overflow will occur."),
-    TIME_ZONE_FORMAT(Priority.MEDIUM, "Time zone format should match value from the Time Zone Database https://en.wikipedia.org/wiki/List_of_tz_database_time_zones."),
+    REFERENTIAL_INTEGRITY(Priority.HIGH, "This line references an ID that does not exist in the target table."),
     REQUIRED_TABLE_EMPTY(Priority.MEDIUM, "This table is required by the GTFS specification but is empty."),
-    FEED_TRAVEL_TIMES_ROUNDED(Priority.LOW, "All travel times in the feed are rounded to the minute, which may cause unexpected results in routing applications where travel times are zero."),
     ROUTE_DESCRIPTION_SAME_AS_NAME(Priority.LOW, "The description of a route is identical to its name, so does not add any information."),
     ROUTE_LONG_NAME_CONTAINS_SHORT_NAME(Priority.LOW, "The long name of a route should complement the short name, not include it."),
     ROUTE_SHORT_AND_LONG_NAME_MISSING(Priority.MEDIUM, "A route has neither a long nor a short name."),
     ROUTE_SHORT_NAME_TOO_LONG(Priority.MEDIUM, "The short name of a route is too long for display in standard GTFS consumer applications."),
+    ROUTE_UNUSED(Priority.HIGH, "This route is defined but has no trips."),
     SERVICE_NEVER_ACTIVE(Priority.MEDIUM, "A service code was defined, but is never active on any date."),
     SERVICE_UNUSED(Priority.MEDIUM, "A service code was defined, but is never referenced by any trips."),
     SHAPE_DIST_TRAVELED_NOT_INCREASING(Priority.MEDIUM, "Shape distance traveled must increase with stop times."),
+    SHAPE_MISSING_COORDINATE(Priority.MEDIUM, "???"),
+    SHAPE_REVERSED(Priority.MEDIUM, "A shape appears to be intended for vehicles running the opposite direction on the route."),
     STOP_DESCRIPTION_SAME_AS_NAME(Priority.LOW, "The description of a stop is identical to its name, so does not add any information."),
+    STOP_GEOGRAPHIC_OUTLIER(Priority.HIGH, "This stop is located very far from the middle 90% of stops in this feed."),
     STOP_LOW_POPULATION_DENSITY(Priority.HIGH, "A stop is located in a geographic area with very low human population density."),
     STOP_NAME_MISSING(Priority.MEDIUM, "A stop does not have a name."),
-    STOP_GEOGRAPHIC_OUTLIER(Priority.HIGH, "This stop is located very far from the middle 90% of stops in this feed."),
     STOP_TIME_UNUSED(Priority.LOW, "This stop time allows neither pickup nor drop off and is not a timepoint, so it serves no purpose and should be removed from trip."),
     STOP_UNUSED(Priority.MEDIUM, "This stop is not referenced by any trips."),
+    TABLE_IN_SUBDIRECTORY(Priority.HIGH, "Rather than being at the root of the zip file, a table was nested in a subdirectory."),
+    TABLE_MISSING_COLUMN_HEADERS(Priority.HIGH, "Table is missing column headers."),
+    TABLE_TOO_LONG(Priority.MEDIUM, "Table is too long to record line numbers with a 32-bit integer, overflow will occur."),
+    TIME_FORMAT(Priority.MEDIUM, "Time format should be HH:MM:SS."),
+    TIME_ZONE_FORMAT(Priority.MEDIUM, "Time zone format should match value from the Time Zone Database https://en.wikipedia.org/wiki/List_of_tz_database_time_zones."),
     TIMEPOINT_MISSING_TIMES(Priority.MEDIUM, "This stop time is marked as a timepoint, but is missing both arrival and departure times."),
+    TRAVEL_DISTANCE_ZERO(Priority.MEDIUM, "The vehicle does not cover any distance between the last stop and this one."),
+    TRAVEL_TIME_NEGATIVE(Priority.HIGH, "The vehicle arrives at this stop before it departs from the previous one."),
+    TRAVEL_TIME_ZERO(Priority.HIGH, "The vehicle arrives at this stop at the same time it departs from the previous stop."),
+    TRAVEL_TOO_FAST(Priority.MEDIUM, "The vehicle travels extremely fast to reach this stop from the previous one."),
+    TRAVEL_TOO_SLOW(Priority.MEDIUM, "The vehicle is traveling very slowly to reach this stop from the previous one."),
     TRIP_EMPTY(Priority.HIGH, "This trip is defined but has no stop times."),
     TRIP_HEADSIGN_CONTAINS_ROUTE_NAME(Priority.LOW, "A trip headsign contains the route name, but should only contain information to distinguish it from other trips for the route."),
     TRIP_HEADSIGN_SHOULD_DESCRIBE_DESTINATION_OR_WAYPOINTS(Priority.LOW, "A trip headsign begins with 'to' or 'towards', but should begin with destination or direction and optionally include waypoints with 'via'"),
     TRIP_NEVER_ACTIVE(Priority.MEDIUM, "A trip is defined, but its service is never running on any date."),
-    ROUTE_UNUSED(Priority.HIGH, "This route is defined but has no trips."),
-    TRAVEL_DISTANCE_ZERO(Priority.MEDIUM, "The vehicle does not cover any distance between the last stop and this one."),
-    TRAVEL_TIME_NEGATIVE(Priority.HIGH, "The vehicle arrives at this stop before it departs from the previous one."),
-    TRAVEL_TIME_ZERO(Priority.HIGH, "The vehicle arrives at this stop at the same time it departs from the previous stop."),
-    MISSING_ARRIVAL_OR_DEPARTURE(Priority.MEDIUM, "First and last stop times are required to have both an arrival and departure time."),
-    TRIP_TOO_FEW_STOP_TIMES(Priority.MEDIUM, "A trip must have at least two stop times to represent travel."),
     TRIP_OVERLAP_IN_BLOCK(Priority.MEDIUM, "A trip overlaps another trip and shares the same block_id."),
-    TRAVEL_TOO_SLOW(Priority.MEDIUM, "The vehicle is traveling very slowly to reach this stop from the previous one."),
-    TRAVEL_TOO_FAST(Priority.MEDIUM, "The vehicle travels extremely fast to reach this stop from the previous one."),
+    TRIP_TOO_FEW_STOP_TIMES(Priority.MEDIUM, "A trip must have at least two stop times to represent travel."),
+    URL_FORMAT(Priority.MEDIUM, "URL format should be <scheme>://<authority><path>?<query>#<fragment>"),
     VALIDATOR_FAILED(Priority.HIGH, "The specified validation stage failed due to an error encountered during loading. This is likely due to an error encountered during loading (e.g., a date or number field is formatted incorrectly.)."),
-    DEPARTURE_BEFORE_ARRIVAL(Priority.MEDIUM, "The vehicle departs from this stop before it arrives."),
-    REFERENTIAL_INTEGRITY(Priority.HIGH, "This line references an ID that does not exist in the target table."),
-    BOOLEAN_FORMAT(Priority.MEDIUM, "A GTFS boolean field must contain the value 1 or 0."),
-    COLOR_FORMAT(Priority.MEDIUM, "A color should be specified with six-characters (three two-digit hexadecimal numbers)."),
-    CURRENCY_UNKNOWN(Priority.MEDIUM, "The currency code was not recognized."),
+    WRONG_NUMBER_OF_FIELDS(Priority.MEDIUM, "A row did not have the same number of fields as there are headers in its table."),
+
+    // MTC-specific errors.
+    FIELD_VALUE_TOO_LONG(Priority.MEDIUM, "Field value has too many characters."),
+
+    // Unknown errors.
     OTHER(Priority.LOW, "Other errors.");
 
     public final Priority priority;