Fares V2

.github/workflows/maven.yml

@@ -29,11 +29,11 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    # Install node 20.11.0 (LTS) for running maven-semantic-release.
-    - name: Use Node.js 20.X
+    # Install node 22.x (LTS) for running maven-semantic-release.
+    - name: Use Node.js 22.X
       uses: actions/setup-node@v1
       with:
-        node-version: 20.11.0
+        node-version: 22.x
     - name: Install maven-semantic-release
       # FIXME: Enable cache for node packages (add package.json?)
       run: |
@@ -64,10 +64,10 @@ jobs:
           #
       # The git commands get the commit hash of the HEAD commit and the commit just before HEAD.
     # Install node 14+ for running maven-semantic-release.
-    - name: Use Node.js 20.X
+    - name: Use Node.js 22.X
       uses: actions/setup-node@v1
       with:
-        node-version: 20.11.0
+        node-version: 22.x
     - name: Run maven-semantic-release
       env:
         GH_TOKEN: ${{ secrets.GH_TOKEN }}

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

@@ -41,6 +41,8 @@
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
+import static com.conveyal.gtfs.model.RouteNetwork.ROUTE_NETWORK_FILE_NAME;
+
 /**
  * All entities must be from a single feed namespace.
  * Composed of several GTFSTables.
@@ -62,6 +64,7 @@ public class GTFSFeed implements Cloneable, Closeable {
     // This is how you do a multimap in mapdb: https://github.com/jankotek/MapDB/blob/release-1.0/src/test/java/examples/MultiMap.java
     public final NavigableSet<Tuple2<String, Frequency>> frequencies;
     public final Map<String, Route> routes;
+    public final Map<String, StopArea> stop_areas;
     public final Map<String, Stop> stops;
     public final Map<String, Transfer> transfers;
     public final BTreeMap<String, Trip> trips;
@@ -110,6 +113,15 @@ public class GTFSFeed implements Cloneable, Closeable {
     /* A place to store an event bus that is passed through constructor. */
     public transient EventBus eventBus;
 
+    public final Map<String, Area> areas;
+    public final Map<String, FareProduct> fare_products;
+    public final Map<String, FareMedia> fare_medias;
+    public final Map<String, TimeFrame> time_frames;
+    public final Map<String, FareLegRule> fare_leg_rules;
+    public final Map<String, FareTransferRule> fare_transfer_rules;
+    public final Map<String, Network> networks;
+    public final Map<String, RouteNetwork> route_networks;
+
     /**
      * The order in which we load the tables is important for two reasons.
      * 1. We must load feed_info first so we know the feed ID before loading any other entities. This could be relaxed
@@ -170,13 +182,31 @@ else if (feedId == null || feedId.isEmpty()) {
         fares = null; // free memory
 
         new Pattern.Loader(this).loadTable(zip);
+        new RouteNetwork.Loader(this).loadTable(zip);
         new Route.Loader(this).loadTable(zip);
+        if (!route_networks.isEmpty()) {
+            Route.mergeRouteNetworks(routes, route_networks);
+        }
         new ShapePoint.Loader(this).loadTable(zip);
+        new StopArea.Loader(this).loadTable(zip);
         new Stop.Loader(this).loadTable(zip);
+        if (!stop_areas.isEmpty()) {
+            Stop.mergeStopAreas(stops, stop_areas);
+        }
         new Transfer.Loader(this).loadTable(zip);
         new Trip.Loader(this).loadTable(zip);
         new Frequency.Loader(this).loadTable(zip);
         new StopTime.Loader(this).loadTable(zip); // comment out this line for quick testing using NL feed
+
+        // Fares v2.
+        new Area.Loader(this).loadTable(zip);
+        new TimeFrame.Loader(this).loadTable(zip);
+        new Network.Loader(this).loadTable(zip);
+        new FareMedia.Loader(this).loadTable(zip);
+        new FareProduct.Loader(this).loadTable(zip);
+        new FareLegRule.Loader(this).loadTable(zip);
+        new FareTransferRule.Loader(this).loadTable(zip);
+
         LOG.info("{} errors", errors.size());
         for (GTFSError error : errors) {
             LOG.info("{}", error);
@@ -212,12 +242,30 @@ public void toFile (String file) {
             new FareRule.Writer(this).writeTable(zip);
             new Frequency.Writer(this).writeTable(zip);
             new Route.Writer(this).writeTable(zip);
+            if (!routes.isEmpty()) {
+                // Export route networks.
+                Entity.writeEntityToFile(zip, new ArrayList<>(routes.values()), ROUTE_NETWORK_FILE_NAME);
+            }
             new Stop.Writer(this).writeTable(zip);
+            if (!stops.isEmpty()) {
+                // Export stop areas.
+                Entity.writeEntityToFile(zip, new ArrayList<>(stops.values()), Stop.STOP_AREAS_FILE_NAME);
+            }
             new ShapePoint.Writer(this).writeTable(zip);
             new Transfer.Writer(this).writeTable(zip);
             new Trip.Writer(this).writeTable(zip);
             new StopTime.Writer(this).writeTable(zip);
             new Pattern.Writer(this).writeTable(zip);
+
+            // Fares v2.
+            new Area.Writer(this).writeTable(zip);
+            new TimeFrame.Writer(this).writeTable(zip);
+            new Network.Writer(this).writeTable(zip);
+            new FareMedia.Writer(this).writeTable(zip);
+            new FareProduct.Writer(this).writeTable(zip);
+            new FareLegRule.Writer(this).writeTable(zip);
+            new FareTransferRule.Writer(this).writeTable(zip);
+
             LOG.info("GTFS file written");
         } catch (Exception e) {
             LOG.error("Error saving GTFS: {}", e.getMessage());
@@ -605,16 +653,25 @@ private GTFSFeed (DB db) {
         this.db = db;
 
         agency = db.getTreeMap("agency");
+        areas = db.getTreeMap("area");
+        fare_leg_rules = db.getTreeMap("fare_leg_rules");
+        fare_medias = db.getTreeMap("fare_medias");
+        fare_products = db.getTreeMap("fare_products");
+        fare_transfer_rules = db.getTreeMap("fare_transfer_rules");
         feedInfo = db.getTreeMap("feed_info");
+        networks = db.getTreeMap("networks");
         routes = db.getTreeMap("routes");
+        route_networks = db.getTreeMap("route_networks");
         trips = db.getTreeMap("trips");
         stop_times = db.getTreeMap("stop_times");
         frequencies = db.getTreeSet("frequencies");
         transfers = db.getTreeMap("transfers");
+        stop_areas = db.getTreeMap("stop_areas");
         stops = db.getTreeMap("stops");
         fares = db.getTreeMap("fares");
         services = db.getTreeMap("services");
         shape_points = db.getTreeMap("shape_points");
+        time_frames = db.getTreeMap("time_frames");
         translations = db.getTreeMap("translations");
         attributions = db.getTreeMap("attributions");
 

src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsFaresV2Schema.java

@@ -0,0 +1,111 @@
+package com.conveyal.gtfs.graphql;
+
+import com.conveyal.gtfs.graphql.fetchers.MapFetcher;
+import com.conveyal.gtfs.model.Area;
+import com.conveyal.gtfs.model.FareLegRule;
+import com.conveyal.gtfs.model.FareMedia;
+import com.conveyal.gtfs.model.FareProduct;
+import com.conveyal.gtfs.model.FareTransferRule;
+import com.conveyal.gtfs.model.Network;
+import com.conveyal.gtfs.model.RouteNetwork;
+import com.conveyal.gtfs.model.TimeFrame;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLObjectType;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static com.conveyal.gtfs.graphql.GraphQLUtil.createFieldDefinition;
+import static graphql.Scalars.GraphQLInt;
+import static graphql.schema.GraphQLObjectType.newObject;
+
+public class GraphQLGtfsFaresV2Schema {
+
+    private static final String AREA_TYPE_NAME = "area";
+    private static final String TIME_FRAME_TYPE_NAME = "time_frame";
+    private static final String NETWORK_TYPE_NAME = "network";
+    private static final String FARE_MEDIA_TYPE_NAME = "fare_media";
+    private static final String FARE_PRODUCT_TYPE_NAME = "fare_product";
+    private static final String FARE_LEG_RULE_TYPE_NAME = "fare_leg_rule";
+    private static final String FARE_TRANSFER_RULE_TYPE_NAME = "fare_transfer_rule";
+
+    private GraphQLGtfsFaresV2Schema() {}
+
+    public static final GraphQLObjectType areaType = newObject().name(AREA_TYPE_NAME)
+        .description("A GTFS area object")
+        .field(MapFetcher.field("id", GraphQLInt))
+        .field(MapFetcher.field(Area.AREA_ID_NAME))
+        .field(MapFetcher.field(Area.AREA_NAME_NAME))
+        .build();
+
+    public static final GraphQLObjectType timeFrameType = newObject().name(TIME_FRAME_TYPE_NAME)
+        .description("A GTFS time frame object")
+        .field(MapFetcher.field("id", GraphQLInt))
+        .field(MapFetcher.field(TimeFrame.TIME_FRAME_GROUP_ID_NAME))
+        .field(MapFetcher.field(TimeFrame.START_TIME_NAME))
+        .field(MapFetcher.field(TimeFrame.END_TIME_NAME))
+        .field(MapFetcher.field(TimeFrame.SERVICE_ID_NAME))
+        .build();
+
+    public static final GraphQLObjectType networkType = newObject().name(NETWORK_TYPE_NAME)
+        .description("A GTFS network object")
+        .field(MapFetcher.field("id", GraphQLInt))
+        .field(MapFetcher.field(Network.NETWORK_ID_NAME))
+        .field(MapFetcher.field(Network.NETWORK_NAME_NAME))
+        .build();
+
+    public static final GraphQLObjectType fareMediaType = newObject().name(FARE_MEDIA_TYPE_NAME)
+        .description("A GTFS fare media object")
+        .field(MapFetcher.field("id", GraphQLInt))
+        .field(MapFetcher.field(FareMedia.FARE_MEDIA_ID_NAME))
+        .field(MapFetcher.field(FareMedia.FARE_MEDIA_NAME_NAME))
+        .field(MapFetcher.field(FareMedia.FARE_MEDIA_TYPE_NAME))
+        .build();
+
+    public static final GraphQLObjectType fareProductType = newObject().name(FARE_PRODUCT_TYPE_NAME)
+        .description("A GTFS fare product object")
+        .field(MapFetcher.field("id", GraphQLInt))
+        .field(MapFetcher.field(FareProduct.FARE_PRODUCT_ID_NAME))
+        .field(MapFetcher.field(FareProduct.FARE_PRODUCT_NAME_NAME))
+        .field(MapFetcher.field(FareProduct.FARE_MEDIA_ID_NAME))
+        .field(MapFetcher.field(FareProduct.AMOUNT_NAME))
+        .field(MapFetcher.field(FareProduct.CURRENCY_NAME))
+        .build();
+
+    public static final GraphQLObjectType fareLegRuleType = newObject().name(FARE_LEG_RULE_TYPE_NAME)
+        .description("A GTFS fare leg rule object")
+        .field(MapFetcher.field("id", GraphQLInt))
+        .field(MapFetcher.field(FareLegRule.LEG_GROUP_ID_NAME))
+        .field(MapFetcher.field(FareLegRule.NETWORK_ID_NAME))
+        .field(MapFetcher.field(FareLegRule.FROM_AREA_ID_NAME))
+        .field(MapFetcher.field(FareLegRule.TO_AREA_ID_NAME))
+        .field(MapFetcher.field(FareLegRule.FROM_TIMEFRAME_GROUP_ID_NAME))
+        .field(MapFetcher.field(FareLegRule.TO_TIMEFRAME_GROUP_ID_NAME))
+        .field(MapFetcher.field(FareLegRule.FARE_PRODUCT_ID_NAME))
+        .field(MapFetcher.field(FareLegRule.RULE_PRIORITY_NAME))
+        .build();
+
+    public static final GraphQLObjectType fareTransferRuleType = newObject().name(FARE_TRANSFER_RULE_TYPE_NAME)
+        .description("A GTFS fare transfer rule object")
+        .field(MapFetcher.field("id", GraphQLInt))
+        .field(MapFetcher.field(FareTransferRule.FROM_LEG_GROUP_ID_NAME))
+        .field(MapFetcher.field(FareTransferRule.TO_LEG_GROUP_ID_NAME))
+        .field(MapFetcher.field(FareTransferRule.TRANSFER_COUNT_NAME))
+        .field(MapFetcher.field(FareTransferRule.DURATION_LIMIT_NAME))
+        .field(MapFetcher.field(FareTransferRule.DURATION_LIMIT_TYPE_NAME))
+        .field(MapFetcher.field(FareTransferRule.FARE_TRANSFER_TYPE_NAME))
+        .field(MapFetcher.field(FareTransferRule.FARE_PRODUCT_ID_NAME))
+        .build();
+
+    public static List<GraphQLFieldDefinition> getFaresV2FieldDefinitions() {
+        return Arrays.asList(
+            createFieldDefinition(AREA_TYPE_NAME, areaType, Area.TABLE_NAME),
+            createFieldDefinition(FARE_LEG_RULE_TYPE_NAME, fareLegRuleType, FareLegRule.TABLE_NAME),
+            createFieldDefinition(FARE_MEDIA_TYPE_NAME, fareMediaType, FareMedia.TABLE_NAME),
+            createFieldDefinition(FARE_PRODUCT_TYPE_NAME, fareProductType, FareProduct.TABLE_NAME),
+            createFieldDefinition(FARE_TRANSFER_RULE_TYPE_NAME, fareTransferRuleType, FareTransferRule.TABLE_NAME),
+            createFieldDefinition(NETWORK_TYPE_NAME, networkType, Network.TABLE_NAME),
+            createFieldDefinition(TIME_FRAME_TYPE_NAME, timeFrameType, TimeFrame.TABLE_NAME)
+        );
+    }
+}