Improve mode setting value casting, remove "default" mode settings

packages/trip-form/modeSettings.yml

@@ -1,25 +1 @@
-- applicableMode: CAR
-  default: 3
-  graphQLQueryParam: true
-  high: 5
-  inverseKey: carReluctance
-  key: carTolerance
-  low: 0
-  step: 0.1
-  type: SLIDER
-- applicableMode: BICYCLE
-  default: 2
-  graphQLQueryParam: true
-  high: 5
-  inverseKey: bikeReluctance
-  key: bikeTolerance
-  low: 0
-  step: 0.1
-  type: SLIDER
-- applicableMode: TRANSIT
-  default: false
-  graphQLQueryParam: true
-  id: walkReluctance
-  key: walkReluctance
-  truthValue: 5
-  type: CHECKBOX
+# Reserved for future use. Supply default mode settings here

packages/trip-form/package.json

@@ -10,7 +10,7 @@
   "types": "lib/index.d.ts",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^9.0.2",
+    "@opentripplanner/core-utils": "^10.0.0",
     "@floating-ui/react": "^0.19.2",
     "@styled-icons/bootstrap": "^10.34.0",
     "@styled-icons/boxicons-regular": "^10.38.0",

packages/trip-form/src/GeneralSettingsPanel/index.tsx

@@ -86,7 +86,7 @@ export default function GeneralSettingsPanel({
           .getCustomQueryParams(queryParamMessages)
           .find(qp => qp.name === param);
         // Check that the parameter applies to the specified routingType
-        if (!paramInfo.routingTypes.includes(query.routingType)) return null;
+        if (!paramInfo?.routingTypes.includes(query.routingType)) return null;
 
         // Check that the applicability test (if provided) is satisfied
         if (

packages/trip-form/src/MetroModeSelector/MetroModeSelector.story.tsx

@@ -18,8 +18,6 @@ import {
   setModeButtonEnabled
 } from "./utils";
 
-import modeSettingDefinitions from "../../modeSettings.yml";
-
 const getIcon = (iconName: string): JSX.Element | null => {
   switch (iconName) {
     case "bus":
@@ -67,8 +65,8 @@ const defaultModeButtonDefinitions = [
   }
 ];
 
+// TODO: add more test settings?
 const modeSettingDefinitionsWithDropdown = [
-  ...modeSettingDefinitions,
   {
     applicableMode: "TRANSIT",
     default: "blue",

packages/trip-form/src/MetroModeSelector/utils.ts

@@ -48,6 +48,19 @@ export function convertModeSettingValue(
   setting: ModeSetting,
   value: string | boolean | number
 ): string | boolean | number {
+  // Assume the type of the output value based on the type of the default value.
+  if (setting.default) {
+    switch (typeof setting.default) {
+      case "bigint":
+      case "number":
+        return Number(value);
+      case "boolean":
+        return value === "true" || value === true;
+      default:
+        return value;
+    }
+  }
+  // In case no default is provided.
   switch (setting.type) {
     case "CHECKBOX":
     case "SUBMODE":

packages/trip-form/src/SettingsSelectorPanel.story.tsx

@@ -92,8 +92,8 @@ const SettingsPanelTemplate = (args: StoryArgs, context: StoryContext) => {
         queryParamMessages={
           args.useCustomMessages
             ? {
-                walkSpeed: {
-                  label: "Custom walk speed label",
+                maxWalkDistance: {
+                  label: "Custom max walk distance label",
                   options: [
                     {
                       text: "3 kph custom speed value",

yarn.lock

@@ -3241,7 +3241,7 @@
   resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca"
   integrity sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==
 
-"@opentripplanner/core-utils@^9.0.3":
+"@opentripplanner/core-utils@^9.0.2", "@opentripplanner/core-utils@^9.0.3":
   version "9.0.3"
   resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-9.0.3.tgz#c1ebdcc3ad5999fb28427102c9be7d7268f6bd37"
   integrity sha512-8P3Bi41jF7z18P/soo6lEw+nrqarsyGMAxivsF1/kMJdRo4wnakp0zcrVZjDXTxoR6LPtj6Kkuxv3JQFO9jKiw==
@@ -3260,10 +3260,10 @@
     lodash.isequal "^4.5.0"
     qs "^6.9.1"
 
-"@opentripplanner/types@6.0.0-alpha.4":
-  version "6.0.0-alpha.4"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.0.0-alpha.4.tgz#dee3c06675e30c596159d182ed707e7710cd937c"
-  integrity sha512-FlYsHm/tk+x0ldrEG1X9Ph1R1k3way1oEdKX7XSnhu9lNTzL4lO0hfT1PLzNXMfBRar7TzK94PHNDibJsod8Kw==
+"@opentripplanner/types@7.0.0-alpha.2":
+  version "7.0.0-alpha.2"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-7.0.0-alpha.2.tgz#d10c69f99b2da6d1e80ab5989520bde8e558627b"
+  integrity sha512-IzQwBcxkoyM+r/W7u+nzICf/6QnreLKppkrZZNl0yVxFiT6RBOd0U2UxMxLPYuRd/3awQabI3/qQ3/6ZxMWPfA==
 
 "@peculiar/asn1-schema@^2.1.6", "@peculiar/asn1-schema@^2.3.0":
   version "2.3.3"