@opentripplanner/core-utils 11.1.6 → 11.2.1

package/src/otpSchema.json

@@ -2013,7 +2013,7 @@
         {
           "kind": "OBJECT",
           "name": "DepartureRow",
-          "description": "Departure row is a location, which lists departures of a certain pattern from a\nstop. Departure rows are identified with the pattern, so querying departure rows\nwill return only departures from one stop per pattern",
+          "description": "Departure row is a combination of a pattern and a stop of that pattern.\n\nThey are de-duplicated so for each pattern there will only be a single departure row.\n\nThis is useful if you want to show a list of stop/pattern combinations but want each pattern to be\nlisted only once.",
           "fields": [
             {
               "name": "id",
@@ -2173,6 +2173,29 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "Emissions",
+          "description": null,
+          "fields": [
+            {
+              "name": "co2",
+              "description": "CO₂ emissions in grams.",
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Grams",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "FareMedium",
@@ -2586,6 +2609,16 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "SCALAR",
+          "name": "Grams",
+          "description": "",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "SCALAR",
           "name": "ID",
@@ -3149,6 +3182,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "emissionsPerPerson",
+              "description": "Emissions of this itinerary per traveler.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Emissions",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "legs",
               "description": "A list of Legs. Each Leg is either a walking (cycling, car) portion of the\nitinerary, or a transit leg on a particular vehicle. So a itinerary where the\nuser walks to the Q train, transfers to the 6, then walks to their\ndestination, has four legs.",
@@ -3237,6 +3282,22 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "numberOfTransfers",
+              "description": "How many transfers are part of this itinerary.\n\nNotes:\n - Interlined/stay-seated transfers do not increase this count.\n - Transferring from a flex to a fixed schedule trip and vice versa increases this count.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "fares",
               "description": "Information about the fares for this itinerary. This is primarily a GTFS Fares V1 interface\nwill be removed in the future.",
@@ -4201,6 +4262,65 @@
             }
           ]
         },
+        {
+          "kind": "ENUM",
+          "name": "OccupancyStatus",
+          "description": "Occupancy status of a vehicle.",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "NO_DATA_AVAILABLE",
+              "description": "Default. There is no occupancy-data on this departure.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "EMPTY",
+              "description": "The vehicle is considered empty by most measures, and has few or no passengers onboard, but is\nstill accepting passengers. There isn't a big difference between this and MANY_SEATS_AVAILABLE\nso it's possible to handle them as the same value, if one wants to limit the number of different\nvalues.\nSIRI nordic profile: merge these into `MANY_SEATS_AVAILABLE`.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "MANY_SEATS_AVAILABLE",
+              "description": "The vehicle or carriage has a large number of seats available. The amount of free seats out of\nthe total seats available to be considered large enough to fall into this category is\ndetermined at the discretion of the producer. There isn't a big difference between this and\nEMPTY so it's possible to handle them as the same value, if one wants to limit the number of\ndifferent values.\nSIRI nordic profile: more than ~50% of seats available.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "FEW_SEATS_AVAILABLE",
+              "description": "The vehicle or carriage has a small number of seats available. The amount of free seats out of\nthe total seats available to be considered small enough to fall into this category is\ndetermined at the discretion of the producer.\nSIRI nordic profile: less than ~50% of seats available.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "STANDING_ROOM_ONLY",
+              "description": "The vehicle or carriage can currently accommodate only standing passengers.\nSIRI nordic profile: less than ~10% of seats available.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "CRUSHED_STANDING_ROOM_ONLY",
+              "description": "The vehicle or carriage can currently accommodate only standing passengers and has limited\nspace for them. There isn't a big difference between this and FULL so it's possible to handle\nthem as the same value, if one wants to limit the number of different values.\nSIRI nordic profile: merge into `STANDING_ROOM_ONLY`.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "FULL",
+              "description": "The vehicle is considered full by most measures, but may still be allowing passengers to\nboard.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "NOT_ACCEPTING_PASSENGERS",
+              "description": "The vehicle or carriage is not accepting passengers.\nSIRI nordic profile: if vehicle/carriage is not in use / unavailable, or passengers are only allowed\nto alight due to e.g. crowding.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "OpeningHours",
@@ -5912,7 +6032,7 @@
                 },
                 {
                   "name": "filterByPlaceTypes",
-                  "description": "Only return places that are one of these types, e.g. `STOP` or `BICYCLE_RENT`",
+                  "description": "Only return places that are one of these types, e.g. `STOP` or `VEHICLE_RENT`",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -7684,6 +7804,24 @@
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "ENTER_STATION",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "EXIT_STATION",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "FOLLOW_SIGNS",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "possibleTypes": null
@@ -7838,6 +7976,57 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "RentalVehicleEntityCounts",
+          "description": null,
+          "fields": [
+            {
+              "name": "total",
+              "description": "The total number of entities (e.g. vehicles, spaces).",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "byType",
+              "description": "The number of entities by type",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "RentalVehicleTypeCount",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "RentalVehicleType",
@@ -7873,6 +8062,49 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "RentalVehicleTypeCount",
+          "description": null,
+          "fields": [
+            {
+              "name": "vehicleType",
+              "description": "The type of the rental vehicle (scooter, bicycle, car...)",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "RentalVehicleType",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "count",
+              "description": "The number of vehicles of this type",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "RideHailingEstimate",
@@ -10357,6 +10589,18 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "occupancy",
+              "description": "The latest realtime occupancy information for the latest occurance of this\ntrip.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "TripOccupancy",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,
@@ -10417,6 +10661,29 @@
           ],
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "TripOccupancy",
+          "description": "Occupancy of a vehicle on a trip. This should include the most recent occupancy information\navailable for a trip. Historic data might not be available.",
+          "fields": [
+            {
+              "name": "occupancyStatus",
+              "description": "Occupancy information mapped to a limited set of descriptive states.",
+              "args": [],
+              "type": {
+                "kind": "ENUM",
+                "name": "OccupancyStatus",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "Unknown",
@@ -11018,8 +11285,8 @@
                 "name": "Int",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "isDeprecated": true,
+              "deprecationReason": "Use `availableVehicles` instead, which also contains vehicle types"
             },
             {
               "name": "spacesAvailable",
@@ -11030,6 +11297,30 @@
                 "name": "Int",
                 "ofType": null
               },
+              "isDeprecated": true,
+              "deprecationReason": "Use `availableSpaces` instead, which also contains the space vehicle types"
+            },
+            {
+              "name": "availableVehicles",
+              "description": "Number of vehicles currently available on the rental station, grouped by vehicle type.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "RentalVehicleEntityCounts",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "availableSpaces",
+              "description": "Number of free spaces currently available on the rental station, grouped by vehicle type.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "RentalVehicleEntityCounts",
+                "ofType": null
+              },
               "isDeprecated": false,
               "deprecationReason": null
             },
@@ -12156,6 +12447,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "isOneOf",
+              "description": "This field is considered experimental because it has not yet been ratified in the graphql specification",
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "specifiedByURL",
               "description": null,
@@ -13057,6 +13360,12 @@
               "defaultValue": null
             }
           ]
+        },
+        {
+          "name": "oneOf",
+          "description": "Indicates an Input Object is a OneOf Input Object.",
+          "locations": ["INPUT_OBJECT"],
+          "args": []
         }
       ]
     }

package/src/planQuery.graphql

@@ -237,6 +237,7 @@ query Plan(
         }
       }
       startTime
+      transfers: numberOfTransfers
       waitingTime
       walkTime
     }

package/src/query-gen.ts

@@ -114,6 +114,7 @@ export const SIMPLIFICATIONS = {
   RAIL: "TRANSIT",
   SCOOTER: "PERSONAL",
   SUBWAY: "TRANSIT",
+  TROLLEYBUS: "TRANSIT",
   TRAM: "TRANSIT",
   TRANSIT: "TRANSIT",
   WALK: "WALK"

package/src/route.ts

@@ -184,6 +184,7 @@ function getSortValues(
 const modeComparatorValue = {
   SUBWAY: 1,
   TRAM: 2,
+  TROLLEYBUS: 9,
   RAIL: 3,
   GONDOLA: 4,
   FERRY: 5,
@@ -207,7 +208,8 @@ const routeTypeComparatorValue = {
   // TODO: 11 and 12 are not a part of OTP as of 2019-02-14, but for now just
   // associate them with bus/rail.
   11: modeComparatorValue.BUS, // - Trolleybus.
-  12: modeComparatorValue.RAIL // - Monorail.
+  12: modeComparatorValue.RAIL, // - Monorail.
+  13: modeComparatorValue.TROLLEYBUS
 };
 
 // Gets a comparator value for a given route's type (OTP mode).