routess 1.123.0 → 1.124.0

package/dist/index.js

@@ -2183,8 +2183,90 @@ var require_history = __commonJS((exports) => {
   }
 });
 
-// ../../packages/core/dist/types/index.js
+// ../../packages/core/dist/routing/types.js
 var require_types = __commonJS((exports) => {
+  Object.defineProperty(exports, "__esModule", { value: true });
+  exports.PROVENANCES = exports.SURFACE_BUCKETS = exports.SURFACE_TYPES = undefined;
+  exports.isSurfaceType = isSurfaceType;
+  exports.isSurfaceBucket = isSurfaceBucket;
+  exports.isProvenance = isProvenance;
+  exports.SURFACE_TYPES = ["paved", "mixed", "unpaved"];
+  exports.SURFACE_BUCKETS = ["paved", "compacted", "unpaved", "path"];
+  exports.PROVENANCES = ["valhalla", "mapbox-legacy", "gpx-import", "generation"];
+  function isSurfaceType(value) {
+    return exports.SURFACE_TYPES.includes(value);
+  }
+  function isSurfaceBucket(value) {
+    return exports.SURFACE_BUCKETS.includes(value);
+  }
+  function isProvenance(value) {
+    return exports.PROVENANCES.includes(value);
+  }
+});
+
+// ../../packages/core/dist/routing/preferences.js
+var require_preferences = __commonJS((exports) => {
+  Object.defineProperty(exports, "__esModule", { value: true });
+  exports.DEFAULT_ROUTING_DEFAULTS = exports.DEFAULT_WALK_PREFERENCES = exports.DEFAULT_RUN_PREFERENCES = exports.DEFAULT_CYCLE_PREFERENCES = undefined;
+  exports.defaultPreferencesForActivity = defaultPreferencesForActivity;
+  exports.normalizeRoutingPreferences = normalizeRoutingPreferences;
+  exports.normalizeRoutingDefaults = normalizeRoutingDefaults;
+  exports.mergeRoutingDefaults = mergeRoutingDefaults;
+  var types_1 = require_types();
+  exports.DEFAULT_CYCLE_PREFERENCES = {
+    surfacePreference: "mixed",
+    avoidFerries: true,
+    avoidHighways: true
+  };
+  exports.DEFAULT_RUN_PREFERENCES = {
+    surfacePreference: "mixed",
+    avoidFerries: true,
+    avoidHighways: true
+  };
+  exports.DEFAULT_WALK_PREFERENCES = {
+    surfacePreference: "mixed",
+    avoidFerries: true,
+    avoidHighways: true
+  };
+  exports.DEFAULT_ROUTING_DEFAULTS = {
+    cycle: exports.DEFAULT_CYCLE_PREFERENCES,
+    run: exports.DEFAULT_RUN_PREFERENCES,
+    walk: exports.DEFAULT_WALK_PREFERENCES
+  };
+  function defaultPreferencesForActivity(activity) {
+    return { ...exports.DEFAULT_ROUTING_DEFAULTS[activity] };
+  }
+  function normalizeRoutingPreferences(activity, input) {
+    const base = defaultPreferencesForActivity(activity);
+    if (!input)
+      return base;
+    return {
+      surfacePreference: (0, types_1.isSurfaceType)(input.surfacePreference) ? input.surfacePreference : base.surfacePreference,
+      avoidFerries: typeof input.avoidFerries === "boolean" ? input.avoidFerries : base.avoidFerries,
+      avoidHighways: typeof input.avoidHighways === "boolean" ? input.avoidHighways : base.avoidHighways
+    };
+  }
+  function normalizeRoutingDefaults(input) {
+    return {
+      cycle: normalizeRoutingPreferences("cycle", input?.cycle),
+      run: normalizeRoutingPreferences("run", input?.run),
+      walk: normalizeRoutingPreferences("walk", input?.walk)
+    };
+  }
+  function mergeRoutingDefaults(current, update) {
+    const base = normalizeRoutingDefaults(current);
+    if (!update)
+      return base;
+    return {
+      cycle: normalizeRoutingPreferences("cycle", { ...base.cycle, ...update.cycle }),
+      run: normalizeRoutingPreferences("run", { ...base.run, ...update.run }),
+      walk: normalizeRoutingPreferences("walk", { ...base.walk, ...update.walk })
+    };
+  }
+});
+
+// ../../packages/core/dist/types/index.js
+var require_types2 = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.ROUTE_VISIBILITIES = exports.ROUTE_ACTIVITIES = undefined;
   exports.ROUTE_ACTIVITIES = ["run", "cycle", "walk"];
@@ -2201,10 +2283,11 @@ var require_user_preferences = __commonJS((exports) => {
   exports.isRouteVisibility = isRouteVisibility;
   exports.normalizeUserPreferences = normalizeUserPreferences;
   exports.mergeUserPreferences = mergeUserPreferences;
+  var preferences_1 = require_preferences();
   exports.ACTIVITIES = ["run", "cycle", "walk"];
   exports.UNITS = ["km", "mi"];
   exports.MAP_STYLES = ["streets", "outdoors", "satellite"];
-  var types_1 = require_types();
+  var types_1 = require_types2();
   Object.defineProperty(exports, "ROUTE_VISIBILITIES", { enumerable: true, get: function() {
     return types_1.ROUTE_VISIBILITIES;
   } });
@@ -2235,7 +2318,8 @@ var require_user_preferences = __commonJS((exports) => {
       surface: false,
       wind: false
     },
-    defaultRouteVisibility: "private"
+    defaultRouteVisibility: "private",
+    routingDefaults: (0, preferences_1.normalizeRoutingDefaults)(null)
   };
   function isActivity(value) {
     return exports.ACTIVITIES.includes(value);
@@ -2317,7 +2401,8 @@ var require_user_preferences = __commonJS((exports) => {
       sportSpeeds: normalizeSportSpeeds(input?.sportSpeeds),
       mapStyle: isMapStyle(input?.mapStyle) ? input.mapStyle : exports.DEFAULT_USER_PREFERENCES.mapStyle,
       overlays: normalizeOverlays(input?.overlays),
-      defaultRouteVisibility: isRouteVisibility(input?.defaultRouteVisibility) ? input.defaultRouteVisibility : exports.DEFAULT_USER_PREFERENCES.defaultRouteVisibility
+      defaultRouteVisibility: isRouteVisibility(input?.defaultRouteVisibility) ? input.defaultRouteVisibility : exports.DEFAULT_USER_PREFERENCES.defaultRouteVisibility,
+      routingDefaults: (0, preferences_1.normalizeRoutingDefaults)(input?.routingDefaults)
     };
   }
   function mergeUserPreferences(current, update) {
@@ -2332,11 +2417,134 @@ var require_user_preferences = __commonJS((exports) => {
       overlays: {
         ...base.overlays,
         ...update.overlays ?? {}
-      }
+      },
+      routingDefaults: (0, preferences_1.mergeRoutingDefaults)(base.routingDefaults, update.routingDefaults)
     });
   }
 });
 
+// ../../packages/core/dist/routing/surface.js
+var require_surface = __commonJS((exports) => {
+  Object.defineProperty(exports, "__esModule", { value: true });
+  exports.SURFACE_MISMATCH_THRESHOLD = undefined;
+  exports.bucketSurfaceType = bucketSurfaceType;
+  exports.bucketMatchesPreference = bucketMatchesPreference;
+  exports.surfaceMismatchFraction = surfaceMismatchFraction;
+  exports.isSurfaceMismatch = isSurfaceMismatch;
+  var BUCKET_TO_TYPE = {
+    paved: "paved",
+    compacted: "mixed",
+    unpaved: "unpaved",
+    path: "unpaved"
+  };
+  function bucketSurfaceType(bucket) {
+    return BUCKET_TO_TYPE[bucket];
+  }
+  function bucketMatchesPreference(bucket, pref) {
+    if (pref === "mixed")
+      return true;
+    return BUCKET_TO_TYPE[bucket] === pref;
+  }
+  function surfaceMismatchFraction(metersByBucket, pref) {
+    if (pref === "mixed")
+      return 0;
+    let total = 0;
+    let violating = 0;
+    for (const bucket of Object.keys(metersByBucket)) {
+      const m = metersByBucket[bucket];
+      total += m;
+      if (!bucketMatchesPreference(bucket, pref))
+        violating += m;
+    }
+    if (total <= 0)
+      return 0;
+    return violating / total;
+  }
+  exports.SURFACE_MISMATCH_THRESHOLD = 0.05;
+  function isSurfaceMismatch(metersByBucket, pref) {
+    return surfaceMismatchFraction(metersByBucket, pref) > exports.SURFACE_MISMATCH_THRESHOLD;
+  }
+});
+
+// ../../packages/core/dist/routing/valhalla-costing.js
+var require_valhalla_costing = __commonJS((exports) => {
+  Object.defineProperty(exports, "__esModule", { value: true });
+  exports.valhallaCostingModelForActivity = valhallaCostingModelForActivity;
+  exports.valhallaCostingFromPreferences = valhallaCostingFromPreferences;
+  function valhallaCostingModelForActivity(activity) {
+    return activity === "cycle" ? "bicycle" : "pedestrian";
+  }
+  var SURFACE_USE_TRACKS_BIKE = {
+    paved: 0,
+    mixed: 0.3,
+    unpaved: 0.8
+  };
+  var SURFACE_AVOID_BAD_BIKE = {
+    paved: 1,
+    mixed: 0.25,
+    unpaved: 0
+  };
+  var SURFACE_USE_TRACKS_PED = {
+    paved: 0,
+    mixed: 0.5,
+    unpaved: 1
+  };
+  function valhallaCostingFromPreferences(activity, prefs, options) {
+    if (activity === "cycle") {
+      const bicycle = {
+        use_ferry: prefs.avoidFerries ? 0 : 0.5,
+        use_roads: prefs.avoidHighways ? 0.2 : 0.5,
+        use_tracks: SURFACE_USE_TRACKS_BIKE[prefs.surfacePreference],
+        avoid_bad_surfaces: SURFACE_AVOID_BAD_BIKE[prefs.surfacePreference]
+      };
+      return {
+        costing: "bicycle",
+        costing_options: { bicycle }
+      };
+    }
+    const pedestrian = {
+      use_ferry: prefs.avoidFerries ? 0 : 0.5,
+      use_tracks: SURFACE_USE_TRACKS_PED[prefs.surfacePreference]
+    };
+    if (typeof options?.walkingSpeedMps === "number" && options.walkingSpeedMps > 0) {
+      pedestrian.walking_speed = options.walkingSpeedMps;
+    }
+    return {
+      costing: "pedestrian",
+      costing_options: { pedestrian }
+    };
+  }
+});
+
+// ../../packages/core/dist/routing/index.js
+var require_routing = __commonJS((exports) => {
+  var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
+    if (k2 === undefined)
+      k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() {
+        return m[k];
+      } };
+    }
+    Object.defineProperty(o, k2, desc);
+  } : function(o, m, k, k2) {
+    if (k2 === undefined)
+      k2 = k;
+    o[k2] = m[k];
+  });
+  var __exportStar = exports && exports.__exportStar || function(m, exports2) {
+    for (var p in m)
+      if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p))
+        __createBinding(exports2, m, p);
+  };
+  Object.defineProperty(exports, "__esModule", { value: true });
+  __exportStar(require_preferences(), exports);
+  __exportStar(require_surface(), exports);
+  __exportStar(require_types(), exports);
+  __exportStar(require_valhalla_costing(), exports);
+});
+
 // ../../node_modules/.bun/zustand@5.0.13+e55371ec98c955e9/node_modules/zustand/vanilla.js
 var require_vanilla = __commonJS((exports) => {
   var createStoreImpl = (createState) => {
@@ -3698,7 +3906,7 @@ var require_middleware = __commonJS((exports) => {
 });
 
 // ../../packages/core/dist/stores/routing.js
-var require_routing = __commonJS((exports) => {
+var require_routing2 = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.createRoutingStore = createRoutingStore;
   var zustand_1 = require_zustand();
@@ -3718,6 +3926,7 @@ var require_routing = __commonJS((exports) => {
     isMapLocked: false,
     mode: { kind: "unsaved" },
     activity: undefined,
+    routingPreferences: null,
     history: (0, history_1.emptyHistory)(),
     canUndo: false,
     canRedo: false
@@ -3774,7 +3983,7 @@ var require_routing = __commonJS((exports) => {
   function createRoutingStore(logger) {
     const persistConfig = {
       name: "routing-store",
-      version: 3,
+      version: 4,
       storage: (0, middleware_1.createJSONStorage)(() => createQuotaSafeStorage(logger)),
       migrate: (persisted, version) => {
         let next = persisted ?? {};
@@ -3799,6 +4008,7 @@ var require_routing = __commonJS((exports) => {
         isMapLocked: state.isMapLocked,
         mode: state.mode,
         activity: state.activity,
+        routingPreferences: state.routingPreferences,
         history: state.history,
         canUndo: state.canUndo,
         canRedo: state.canRedo
@@ -3909,6 +4119,9 @@ var require_routing = __commonJS((exports) => {
       setActivity: (activity) => {
         set({ activity });
       },
+      setRoutingPreferences: (prefs) => {
+        set({ routingPreferences: prefs });
+      },
       saveSnapshot: () => {
         set((state) => {
           const snapshot = state.waypoints.map((wp) => ({ ...wp }));
@@ -3986,7 +4199,7 @@ var require_stores = __commonJS((exports) => {
         __createBinding(exports2, m, p);
   };
   Object.defineProperty(exports, "__esModule", { value: true });
-  __exportStar(require_routing(), exports);
+  __exportStar(require_routing2(), exports);
 });
 
 // ../../packages/core/dist/utils/formatting.js
@@ -4336,8 +4549,9 @@ var require_dist = __commonJS((exports) => {
   __exportStar(require_errors(), exports);
   __exportStar(require_history(), exports);
   __exportStar(require_user_preferences(), exports);
+  __exportStar(require_routing(), exports);
   __exportStar(require_stores(), exports);
-  __exportStar(require_types(), exports);
+  __exportStar(require_types2(), exports);
   __exportStar(require_utils(), exports);
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "routess",
-  "version": "1.123.0",
+  "version": "1.124.0",
   "description": "Command-line interface for Routess, the route-planning product for cyclists, runners, and hikers.",
   "private": false,
   "type": "module",