From d5496a4a8b801b85363c45cac5978852e1c3744b Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Wed, 13 Nov 2024 13:23:41 +0200 Subject: [PATCH] Revert "Merge pull request #5144 from HSLdevcom/update-schema" This reverts commit 53d128ece199dc0040720f240993aebd66775909, reversing changes made to fe207ba40cb0e475a0a583daaadfe307aa5d1e7b. --- build/generate-schema.js | 2 +- build/schema.graphql | 20 ++----------------- .../schema/schema.graphql | 20 ++----------------- 3 files changed, 5 insertions(+), 37 deletions(-) diff --git a/build/generate-schema.js b/build/generate-schema.js index ae0153b6bc..2ccb4a3630 100644 --- a/build/generate-schema.js +++ b/build/generate-schema.js @@ -4,7 +4,7 @@ const http = require('https'); const graphqlSchemaSource = process.env.SCHEMA_SRC || - 'https://raw.githubusercontent.com/HSLdevcom/OpenTripPlanner/dev-2.x/application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls'; + 'https://raw.githubusercontent.com/HSLdevcom/OpenTripPlanner/dev-2.x/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls'; const outputGraphQLFilename = 'schema.graphql'; const outputGraphQLFileCopy = `../digitransit-search-util/packages/digitransit-search-util-query-utils/schema/${outputGraphQLFilename}`; diff --git a/build/schema.graphql b/build/schema.graphql index 28024656e2..9c3fc2cf73 100644 --- a/build/schema.graphql +++ b/build/schema.graphql @@ -1522,7 +1522,7 @@ type QueryType { walkSpeed: Float, "Whether the itinerary must be wheelchair accessible. Default value: false" wheelchair: Boolean - ): Plan @async @deprecated(reason : "Use `planConnection` instead.") + ): Plan @async """ Plan (itinerary) search that follows [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). @@ -1607,7 +1607,7 @@ type QueryType { number of itineraries in each search. """ searchWindow: Duration - ): PlanConnection @async + ): PlanConnection @async @deprecated(reason : "Experimental and can include breaking changes, use plan instead") "Get a single rental vehicle based on its ID, i.e. value of field `vehicleId`" rentalVehicle(id: String!): RentalVehicle "Get all rental vehicles" @@ -3081,12 +3081,6 @@ enum PlanAccessMode { """ BICYCLE_RENTAL """ - Driving to a stop and boarding a vehicle with the car. - Access can use driving only if the mode used for transfers - and egress is also `CAR`. - """ - CAR - """ Getting dropped off by a car to a location that is accessible with a car. Note, this can include walking after the drop-off. """ @@ -3196,11 +3190,6 @@ enum PlanEgressMode { """ BICYCLE_RENTAL """ - Driving from a stop to the destination. Egress can use driving only if the mode - used for access and transfers is also `CAR`. - """ - CAR - """ Getting picked up by a car from a location that is accessible with a car. Note, this can include walking before the pickup. """ @@ -3238,11 +3227,6 @@ enum PlanTransferMode { cycling if the mode used for access and egress is also `BICYCLE`. """ BICYCLE - """ - Driving between transit vehicles. Transfers can only use driving if the mode - used for access and egress is also `CAR`. - """ - CAR "Walking between transit vehicles (typically between stops)." WALK } diff --git a/digitransit-search-util/packages/digitransit-search-util-query-utils/schema/schema.graphql b/digitransit-search-util/packages/digitransit-search-util-query-utils/schema/schema.graphql index 28024656e2..9c3fc2cf73 100644 --- a/digitransit-search-util/packages/digitransit-search-util-query-utils/schema/schema.graphql +++ b/digitransit-search-util/packages/digitransit-search-util-query-utils/schema/schema.graphql @@ -1522,7 +1522,7 @@ type QueryType { walkSpeed: Float, "Whether the itinerary must be wheelchair accessible. Default value: false" wheelchair: Boolean - ): Plan @async @deprecated(reason : "Use `planConnection` instead.") + ): Plan @async """ Plan (itinerary) search that follows [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). @@ -1607,7 +1607,7 @@ type QueryType { number of itineraries in each search. """ searchWindow: Duration - ): PlanConnection @async + ): PlanConnection @async @deprecated(reason : "Experimental and can include breaking changes, use plan instead") "Get a single rental vehicle based on its ID, i.e. value of field `vehicleId`" rentalVehicle(id: String!): RentalVehicle "Get all rental vehicles" @@ -3081,12 +3081,6 @@ enum PlanAccessMode { """ BICYCLE_RENTAL """ - Driving to a stop and boarding a vehicle with the car. - Access can use driving only if the mode used for transfers - and egress is also `CAR`. - """ - CAR - """ Getting dropped off by a car to a location that is accessible with a car. Note, this can include walking after the drop-off. """ @@ -3196,11 +3190,6 @@ enum PlanEgressMode { """ BICYCLE_RENTAL """ - Driving from a stop to the destination. Egress can use driving only if the mode - used for access and transfers is also `CAR`. - """ - CAR - """ Getting picked up by a car from a location that is accessible with a car. Note, this can include walking before the pickup. """ @@ -3238,11 +3227,6 @@ enum PlanTransferMode { cycling if the mode used for access and egress is also `BICYCLE`. """ BICYCLE - """ - Driving between transit vehicles. Transfers can only use driving if the mode - used for access and egress is also `CAR`. - """ - CAR "Walking between transit vehicles (typically between stops)." WALK }