Merge branch 'dev' into check-stop-pop-density

src/main/java/com/conveyal/gtfs/model/Agency.java

@@ -39,7 +39,7 @@ protected boolean isRequired() {
         @Override
         public void loadOneRow() throws IOException {
             Agency a = new Agency();
-            a.sourceFileLine = row + 1; // offset line number by 1 to account for 0-based row index
+            a.sourceFileLine = row;
             a.agency_id    = getStringField("agency_id", false); // can only be absent if there is a single agency -- requires a special validator.
             a.agency_name  = getStringField("agency_name", true);
             a.agency_url   = getUrlField("agency_url", true);

src/main/java/com/conveyal/gtfs/model/Calendar.java

@@ -55,7 +55,7 @@ public void loadOneRow() throws IOException {
                 feed.errors.add(new DuplicateKeyError(tableName, row, "service_id", service_id));
             } else {
                 Calendar c = new Calendar();
-                c.sourceFileLine = row + 1; // offset line number by 1 to account for 0-based row index
+                c.sourceFileLine = row;
                 c.service_id = service.service_id;
                 c.monday = getIntField("monday", true, 0, 1);
                 c.tuesday = getIntField("tuesday", true, 0, 1);

src/main/java/com/conveyal/gtfs/model/CalendarDate.java

@@ -56,7 +56,7 @@ public void loadOneRow() throws IOException {
                 feed.errors.add(new DuplicateKeyError(tableName, row, "(service_id, date)", keyString));
             } else {
                 CalendarDate cd = new CalendarDate();
-                cd.sourceFileLine = row + 1; // offset line number by 1 to account for 0-based row index
+                cd.sourceFileLine = row;
                 cd.service_id = service_id;
                 cd.date = date;
                 cd.exception_type = getIntField("exception_type", true, 1, 2);

src/main/java/com/conveyal/gtfs/model/Entity.java

@@ -85,7 +85,11 @@ public static abstract class Loader<E extends Entity> {
         protected final Set<String> missingRequiredColumns = Sets.newHashSet();
 
         protected CsvReader reader;
-        protected int       row;
+
+        // Use one-based rows which are easier to understand in error messages.
+        // Line numbers are conventionally one-based even in IDEs and programming editors.
+        protected int row = 1;
+
         // TODO "String column" that is set before any calls to avoid passing around the column name
 
         public Loader(GTFSFeed feed, String tableName) {
@@ -289,18 +293,22 @@ public void loadTable (ZipFile zip) throws IOException {
             }
             CsvReader reader = new CsvReader(inStream, ',', Charset.forName("UTF8"));
             this.reader = reader;
+            // row number is already positioned at 1
             boolean hasHeaders = reader.readHeaders();
             if (!hasHeaders) {
                 feed.errors.add(new EmptyTableError(tableName));
             }
             while (reader.readRecord()) {
-                // reader.getCurrentRecord() is zero-based and does not include the header line, keep our own row count
-                if (++row % 500000 == 0) {
+                // reader.getCurrentRecord() is zero-based and does not include the header line,
+                // so we keep our own one-based row count that does include the header line.
+                // Advance row number before calling loadOneRow so the current value is available inside that function.
+                row += 1;
+                if (row % 500000 == 0) {
                     LOG.info("Record number {}", human(row));
                 }
                 loadOneRow(); // Call subclass method to produce an entity from the current row.
             }
-            if (row == 0) {
+            if (row < 2) {
                 feed.errors.add(new EmptyTableError(tableName));
             }
         }

src/main/java/com/conveyal/gtfs/model/FareAttribute.java

@@ -42,7 +42,7 @@ public void loadOneRow() throws IOException {
                 feed.errors.add(new DuplicateKeyError(tableName, row, "fare_id", fareId));
             } else {
                 FareAttribute fa = new FareAttribute();
-                fa.sourceFileLine = row + 1; // offset line number by 1 to account for 0-based row index
+                fa.sourceFileLine = row;
                 fa.fare_id = fareId;
                 fa.price = getDoubleField("price", true, 0, Integer.MAX_VALUE);
                 fa.currency_type = getStringField("currency_type", true);

src/main/java/com/conveyal/gtfs/model/FareRule.java

@@ -43,7 +43,7 @@ public void loadOneRow() throws IOException {
 
             Fare fare = fares.computeIfAbsent(fareId, Fare::new);
             FareRule fr = new FareRule();
-            fr.sourceFileLine = row + 1; // offset line number by 1 to account for 0-based row index
+            fr.sourceFileLine = row;
             fr.fare_id = fare.fare_id;
             fr.route_id = getStringField("route_id", false);
             fr.origin_id = getStringField("origin_id", false);

src/main/java/com/conveyal/gtfs/model/FeedInfo.java

@@ -41,7 +41,7 @@ protected boolean isRequired() {
         @Override
         public void loadOneRow() throws IOException {
             FeedInfo fi = new FeedInfo();
-            fi.sourceFileLine = row + 1; // offset line number by 1 to account for 0-based row index
+            fi.sourceFileLine = row;
             fi.feed_id = getStringField("feed_id", false);
             fi.feed_publisher_name = getStringField("feed_publisher_name", true);
             fi.feed_publisher_url = getUrlField("feed_publisher_url", true);

src/main/java/com/conveyal/gtfs/model/Frequency.java

@@ -57,7 +57,7 @@ protected boolean isRequired() {
         public void loadOneRow() throws IOException {
             Frequency f = new Frequency();
             Trip trip = getRefField("trip_id", true, feed.trips);
-            f.sourceFileLine = row + 1; // offset line number by 1 to account for 0-based row index
+            f.sourceFileLine = row;
             f.trip_id = trip.trip_id;
             f.start_time = getTimeField("start_time", true);
             f.end_time = getTimeField("end_time", true);

src/main/java/com/conveyal/gtfs/model/Route.java

@@ -51,7 +51,7 @@ protected boolean isRequired() {
         @Override
         public void loadOneRow() throws IOException {
             Route r = new Route();
-            r.sourceFileLine = row + 1; // offset line number by 1 to account for 0-based row index
+            r.sourceFileLine = row;
             r.route_id = getStringField("route_id", true);
             Agency agency = getRefField("agency_id", false, feed.agency);
 

src/main/java/com/conveyal/gtfs/model/ShapePoint.java

@@ -46,7 +46,7 @@ public void loadOneRow() throws IOException {
             double shape_dist_traveled = getDoubleField("shape_dist_traveled", false, 0D, Double.MAX_VALUE);
 
             ShapePoint s = new ShapePoint(shape_id, shape_pt_lat, shape_pt_lon, shape_pt_sequence, shape_dist_traveled);
-            s.sourceFileLine = row + 1; // offset line number by 1 to account for 0-based row index
+            s.sourceFileLine = row;
             feed.shape_points.put(new Tuple2<String, Integer>(s.shape_id, s.shape_pt_sequence), s);
         }
     }

src/main/java/com/conveyal/gtfs/model/Stop.java

@@ -45,7 +45,7 @@ protected boolean isRequired() {
         @Override
         public void loadOneRow() throws IOException {
             Stop s = new Stop();
-            s.sourceFileLine = row + 1; // offset line number by 1 to account for 0-based row index
+            s.sourceFileLine = row;
             s.stop_id   = getStringField("stop_id", true);
             s.stop_code = getStringField("stop_code", false);
             s.stop_name = getStringField("stop_name", true);

src/main/java/com/conveyal/gtfs/model/StopTime.java

@@ -50,7 +50,7 @@ protected boolean isRequired() {
         @Override
         public void loadOneRow() throws IOException {
             StopTime st = new StopTime();
-            st.sourceFileLine = row + 1; // offset line number by 1 to account for 0-based row index
+            st.sourceFileLine = row;
             st.trip_id        = getStringField("trip_id", true);
             // TODO: arrival_time and departure time are not required, but if one is present the other should be
             // also, if this is the first or last stop, they are both required

src/main/java/com/conveyal/gtfs/model/Transfer.java

@@ -31,7 +31,7 @@ protected boolean isRequired() {
         @Override
         public void loadOneRow() throws IOException {
             Transfer tr = new Transfer();
-            tr.sourceFileLine    = row + 1; // offset line number by 1 to account for 0-based row index
+            tr.sourceFileLine    = row;
             tr.from_stop_id      = getStringField("from_stop_id", true);
             tr.to_stop_id        = getStringField("to_stop_id", true);
             tr.transfer_type     = getIntField("transfer_type", true, 0, 3);
@@ -48,6 +48,7 @@ public void loadOneRow() throws IOException {
             getRefField("from_trip_id", false, feed.trips);
             getRefField("to_trip_id", false, feed.trips);
 
+            // row number used as an arbitrary unique string to give MapDB a key.
             feed.transfers.put(Long.toString(row), tr);
         }
 

src/main/java/com/conveyal/gtfs/model/Trip.java

@@ -40,7 +40,7 @@ protected boolean isRequired() {
         public void loadOneRow() throws IOException {
             Trip t = new Trip();
 
-            t.sourceFileLine  = row + 1; // offset line number by 1 to account for 0-based row index
+            t.sourceFileLine  = row;
             t.route_id        = getStringField("route_id", true);
             t.service_id      = getStringField("service_id", true);
             t.trip_id         = getStringField("trip_id", true);