npm - @opentripplanner/core-utils - Versions diffs - 8.2.2 → 8.2.4 - Mend

@opentripplanner/core-utils 8.2.2 → 8.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/esm/query-gen.js +8 -5
package/esm/query-gen.js.map +1 -1
package/lib/query-gen.d.ts.map +1 -1
package/lib/query-gen.js +7 -4
package/lib/query-gen.js.map +1 -1
package/package.json +1 -1
package/src/__tests__/query-params.ts +24 -0
package/src/otpSchema.json +12940 -0
package/src/planQuery.graphql +109 -100
package/src/query-gen.ts +9 -3
package/tsconfig.tsbuildinfo +1 -1

package/src/planQuery.graphql CHANGED Viewed

@@ -1,4 +1,4 @@
-query PlanQuery(
+query Plan(
   $fromPlace: String!
   $toPlace: String!
   $modes: [TransportMode]
@@ -16,159 +16,168 @@ query PlanQuery(
   $numItineraries: Int
 ) {
   plan(
-    fromPlace: $fromPlace
-    toPlace: $toPlace
-    transportModes: $modes
-    # Currently only supporting EN locale, used for times and text
-    locale: "en"
-    time: $time
-    date: $date
-    wheelchair: $wheelchair
+    arriveBy: $arriveBy
+    banned: $banned
     bikeReluctance: $bikeReluctance
     carReluctance: $carReluctance
-    walkReluctance: $walkReluctance
-    arriveBy: $arriveBy
+    date: $date
+    fromPlace: $fromPlace
     intermediatePlaces: $intermediatePlaces
+    # Currently only supporting EN locale, used for times and text
+    locale: "en"
+    numItineraries: $numItineraries
     preferred: $preferred
+    time: $time
+    toPlace: $toPlace
+    transportModes: $modes
     unpreferred: $unpreferred
-    banned: $banned
-    numItineraries: $numItineraries
+    walkReluctance: $walkReluctance
+    wheelchair: $wheelchair
   ) {
-    routingErrors {
-      code
-      inputField
-      description
-    }
     itineraries {
+      accessibilityScore
       duration
       endTime
-      startTime
-      waitingTime
-      walkTime
-      legs {
-        pickupType
-        dropoffType
-        pickupBookingInfo {
-          earliestBookingTime {
-            daysPrior
+        legs {
+        accessibilityScore
+        agency {
+          alerts {
+            alertDescriptionText
+            alertHeaderText
+            alertUrl
+            effectiveStartDate
+            id
           }
+          id
+          name
+          timezone
+          url
         }
-        rentedBike
-        interlineWithPreviousLeg
-        departureDelay
         arrivalDelay
+        departureDelay
         distance
+        dropoffType
         duration
         endTime
-        mode
-        realTime
-        realtimeState
-        startTime
-        transitLeg
-        trip {
-          id
-          gtfsId
-          tripHeadsign
-        }
-        agency {
+        from {
+          lat
+          lon
           name
-          id
-          timezone
-          url
-          alerts {
-            alertHeaderText
-            alertDescriptionText
-            alertUrl
-            effectiveStartDate
+          rentalVehicle {
+            id
+            network
           }
+          stop {
+            alerts {
+              alertDescriptionText
+              alertHeaderText
+              alertUrl
+              effectiveStartDate
+              id
+            }
+            code
+            gtfsId
+            id
+          }
+          vertexType
         }
-        legGeometry {
-          length
-          points
-        }
+        interlineWithPreviousLeg
         intermediateStops {
           lat
+          locationType
           lon
           name
           stopCode: code
           stopId: id
-          locationType
         }
+        legGeometry {
+          length
+          points
+        }
+        mode
+        pickupBookingInfo {
+          earliestBookingTime {
+            daysPrior
+          }
+        }
+        pickupType
+        realTime
+        realtimeState
+        rentedBike
         route {
-          shortName
-          longName
+          alerts {
+            alertDescriptionText
+            alertHeaderText
+            alertUrl
+            effectiveStartDate
+            id
+          }
           color
-          textColor
           id
+          longName
+          shortName
+          textColor
           type
+        }
+        startTime
+        steps {
+          absoluteDirection
           alerts {
-            alertHeaderText
             alertDescriptionText
+            alertHeaderText
             alertUrl
             effectiveStartDate
+            id
+          }
+          area
+          distance
+          elevationProfile {
+            distance
+            elevation
           }
-        }
-        from {
           lat
           lon
-          name
-          vertexType
-          rentalVehicle {
-            network
-          }
-          stop {
-            id
-            code
-            gtfsId
-            alerts {
-              alertHeaderText
-              alertDescriptionText
-              alertUrl
-              effectiveStartDate
-            }
-          }
+        relativeDirection
+          stayOn
+          streetName
         }
         to {
           lat
           lon
           name
-          vertexType
           rentalVehicle {
+            id
             network
           }
           stop {
-            id
-            code
-            gtfsId
             alerts {
-              alertHeaderText
               alertDescriptionText
+              alertHeaderText
               alertUrl
               effectiveStartDate
+              id
             }
+            code
+            gtfsId
+            id
           }
+          vertexType
         }
-        steps {
-          distance
-          lat
-          lon
-          relativeDirection
-          absoluteDirection
-          stayOn
-          streetName
-          area
-          alerts {
-            alertHeaderText
-            alertDescriptionText
-            alertUrl
-            effectiveStartDate
-          }
-          elevationProfile {
-            distance
-            elevation
-          }
+        transitLeg
+        trip {
+          gtfsId
+          id
+          tripHeadsign
         }
       }
+      startTime
+      waitingTime
+      walkTime
+    }
+    routingErrors {
+      code
+      description
+      inputField
     }
   }
 }

package/src/query-gen.ts CHANGED Viewed

@@ -58,7 +58,11 @@ export function extractAdditionalModes(
     }
     // In checkboxes, mode must be enabled and have a transport mode in it
-    if (cur.type === "CHECKBOX" && cur.addTransportMode && cur.value) {
+    if (
+      (cur.type === "CHECKBOX" || cur.type === "SUBMODE") &&
+      cur.addTransportMode &&
+      cur.value
+    ) {
       return [...prev, cur.addTransportMode];
     }
     if (cur.type === "DROPDOWN") {
@@ -123,7 +127,7 @@ const VALID_COMBOS = [
   ["TRANSIT", "CAR"]
 ];
-const BANNED_TOGETHER = ["SCOOTER", "BICYCLE"];
+const BANNED_TOGETHER = ["SCOOTER", "BICYCLE", "CAR"];
 export const TRANSIT_SUBMODES = Object.keys(SIMPLIFICATIONS).filter(
   mode => SIMPLIFICATIONS[mode] === "TRANSIT" && mode !== "TRANSIT"
@@ -164,7 +168,9 @@ function isCombinationValid(
   }
   // OTP doesn't support multiple non-walk modes
-  if (BANNED_TOGETHER.every(m => combo.find(c => c.mode === m))) return false;
+  if (BANNED_TOGETHER.filter(m => combo.find(c => c.mode === m)).length > 1) {
+    return false;
+  }
   return !!VALID_COMBOS.find(
     vc =>