Skip to content

Commit f37c1bd

Browse files
Merge pull request #333 from conveyal/unrequire-continuous-fields
Make `continuous_pickup`/`drop_off` not required.
2 parents 5ccb9f3 + ba4dd36 commit f37c1bd

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ public void loadOneRow() throws IOException {
103103
r.route_long_name = getStringField("route_long_name", false);
104104
r.route_desc = getStringField("route_desc", false);
105105
r.route_type = getIntField("route_type", true, 0, 7);
106-
r.route_sort_order = getIntField("route_type", false, 0, Integer.MAX_VALUE);
106+
r.route_sort_order = getIntField("route_sort_order", false, 0, Integer.MAX_VALUE);
107107
r.route_url = getUrlField("route_url", false);
108108
r.route_color = getStringField("route_color", false);
109109
r.route_text_color = getStringField("route_text_color", false);
110110
r.route_branding_url = getUrlField("route_branding_url", false);
111-
r.continuous_pickup = getIntField("continuous_pickup", true, 0, 3);
112-
r.continuous_pickup = getIntField("continuous_drop_off", true, 0, 3);
111+
r.continuous_pickup = getIntField("continuous_pickup", false, 0, 3, INT_MISSING);
112+
r.continuous_drop_off = getIntField("continuous_drop_off", false, 0, 3, INT_MISSING);
113113
r.feed = feed;
114114
r.feed_id = feed.feedId;
115115
// Attempting to put a null key or value will cause an NPE in BTreeMap

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ public void loadOneRow() throws IOException {
8989
st.stop_headsign = getStringField("stop_headsign", false);
9090
st.pickup_type = getIntField("pickup_type", false, 0, 3); // TODO add ranges as parameters
9191
st.drop_off_type = getIntField("drop_off_type", false, 0, 3);
92-
st.continuous_pickup = getIntField("continuous_pickup", true, 0, 3);
93-
st.continuous_drop_off = getIntField("continuous_drop_off", true, 0, 3);
92+
st.continuous_pickup = getIntField("continuous_pickup", false, 0, 3, INT_MISSING);
93+
st.continuous_drop_off = getIntField("continuous_drop_off", false, 0, 3, INT_MISSING);
9494
st.shape_dist_traveled = getDoubleField("shape_dist_traveled", false, 0D, Double.MAX_VALUE); // FIXME using both 0 and NaN for "missing", define DOUBLE_MISSING
9595
st.timepoint = getIntField("timepoint", false, 0, 1, INT_MISSING);
9696
st.feed = null; // this could circular-serialize the whole feed

0 commit comments

Comments
 (0)