Skip to content

Commit

Permalink
Merge pull request #334 from conveyal/dev
Browse files Browse the repository at this point in the history
Fix release Oct 8, 2021
  • Loading branch information
binh-dam-ibigroup authored Oct 8, 2021
2 parents 344498c + f37c1bd commit f26514c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/main/java/com/conveyal/gtfs/model/Route.java
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ public void loadOneRow() throws IOException {
r.route_long_name = getStringField("route_long_name", false);
r.route_desc = getStringField("route_desc", false);
r.route_type = getIntField("route_type", true, 0, 7);
r.route_sort_order = getIntField("route_type", false, 0, Integer.MAX_VALUE);
r.route_sort_order = getIntField("route_sort_order", false, 0, Integer.MAX_VALUE);
r.route_url = getUrlField("route_url", false);
r.route_color = getStringField("route_color", false);
r.route_text_color = getStringField("route_text_color", false);
r.route_branding_url = getUrlField("route_branding_url", false);
r.continuous_pickup = getIntField("continuous_pickup", true, 0, 3);
r.continuous_pickup = getIntField("continuous_drop_off", true, 0, 3);
r.continuous_pickup = getIntField("continuous_pickup", false, 0, 3, INT_MISSING);
r.continuous_drop_off = getIntField("continuous_drop_off", false, 0, 3, INT_MISSING);
r.feed = feed;
r.feed_id = feed.feedId;
// Attempting to put a null key or value will cause an NPE in BTreeMap
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/conveyal/gtfs/model/StopTime.java
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ public void loadOneRow() throws IOException {
st.stop_headsign = getStringField("stop_headsign", false);
st.pickup_type = getIntField("pickup_type", false, 0, 3); // TODO add ranges as parameters
st.drop_off_type = getIntField("drop_off_type", false, 0, 3);
st.continuous_pickup = getIntField("continuous_pickup", true, 0, 3);
st.continuous_drop_off = getIntField("continuous_drop_off", true, 0, 3);
st.continuous_pickup = getIntField("continuous_pickup", false, 0, 3, INT_MISSING);
st.continuous_drop_off = getIntField("continuous_drop_off", false, 0, 3, INT_MISSING);
st.shape_dist_traveled = getDoubleField("shape_dist_traveled", false, 0D, Double.MAX_VALUE); // FIXME using both 0 and NaN for "missing", define DOUBLE_MISSING
st.timepoint = getIntField("timepoint", false, 0, 1, INT_MISSING);
st.feed = null; // this could circular-serialize the whole feed
Expand Down

0 comments on commit f26514c

Please sign in to comment.