@heycar/heycars-map 2.13.0-relay1 → 2.14.0-walkOptimize1

package/dist/v3/hooks/useMapGeometry.d.ts

@@ -1,17 +1,17 @@
 import type { Point } from "../types/interface";
 export declare const apiLocalIsPointInRing: (point: Point, path: Point[]) => boolean;
 export declare const useAmapGeometry: () => {
-    apiMapDistance: (from: Point, to: Point) => number | undefined;
+    apiMapDistance: (from: Point, to: Point) => number;
     apiMapDistanceToLine: (from: Point, line: Point[]) => number | undefined;
     apiMapDistanceOfLine: (line: Point[]) => number | undefined;
 };
 export declare const useGmapGeometry: () => {
-    apiMapDistance: (from: Point, to: Point) => number | undefined;
+    apiMapDistance: (from: Point, to: Point) => number;
     apiMapDistanceToLine: (from: Point, line: Point[]) => 0 | undefined;
     apiMapDistanceOfLine: (line: Point[]) => number | undefined;
 };
 export declare const useMapGeometry: () => {
-    apiMapDistance: (from: Point, to: Point) => number | undefined;
+    apiMapDistance: (from: Point, to: Point) => number;
     apiMapDistanceToLine: (from: Point, line: Point[]) => number | undefined;
     apiMapDistanceOfLine: (line: Point[]) => number | undefined;
 };

package/dist/v3/hooks/useMapGeometry.js

@@ -1,4 +1,4 @@
-import { pointInPolygon } from "../utils/geometryPolygon.js";
+import { pointInPolygon, distanceBetweenTwoPoints } from "../utils/geometryPolygon.js";
 import { vec2lnglat } from "../utils/transform.js";
 import { Status } from "./useMapLoader.js";
 import { useMapSupplier } from "./useMapSupplier.js";
@@ -7,7 +7,7 @@ const useAmapGeometry = () => {
   const payload = useMapSupplier();
   const apiMapDistance = (from, to) => {
     if (payload.status !== Status.SUCCESS)
-      return void 0;
+      return distanceBetweenTwoPoints(from, to);
     return AMap.GeometryUtil.distance(from, to);
   };
   const apiMapDistanceToLine = (from, line) => {
@@ -26,7 +26,7 @@ const useGmapGeometry = () => {
   const payload = useMapSupplier();
   const apiMapDistance = (from, to) => {
     if (payload.status !== Status.SUCCESS)
-      return void 0;
+      return distanceBetweenTwoPoints(from, to);
     return google.maps.geometry.spherical.computeDistanceBetween(vec2lnglat(from), vec2lnglat(to));
   };
   const apiMapDistanceToLine = (from, line) => {

package/dist/v3/hooks/useWalkingRoute.js

@@ -1,15 +1,56 @@
 import { shallowRef } from "vue-demi";
+import { MAX_DEVIATION_DISTANCE_WALKING } from "../api/contants.js";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
 import { googleServiceApiWalkingRoute, amapJsApiWalkingRoute, gaodeServiceApiWalkingRoute, gmapJsApiWalkingRoute } from "../utils/compatibleWalkingRoute.js";
+import { findClosestPointInLine } from "../utils/geometry.js";
+import { distanceBetweenTwoPoints } from "../utils/geometryPolygon.js";
+import { spaceLog } from "../utils/log.js";
+import { createMemoizeWithTTL } from "../utils/ttlCache.js";
 import { inTaiwan, inKorean } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
+const WALKING_ROUTE_CACHE_TTL = 30 * 60 * 1e3;
+const findBestContinuation = (args, cacheEntries) => {
+  const [from, to] = args;
+  let bestPath;
+  for (const [[cacheFrom, cacheTo], path] of cacheEntries) {
+    if (!path || path.length < 2)
+      continue;
+    const deviationOfEndPoint = distanceBetweenTwoPoints(cacheTo, to);
+    if (deviationOfEndPoint > MAX_DEVIATION_DISTANCE_WALKING)
+      continue;
+    {
+      const { distance: deviationOfStartPoint } = findClosestPointInLine(
+        from,
+        [cacheFrom, ...path],
+        distanceBetweenTwoPoints
+      );
+      if (deviationOfStartPoint > MAX_DEVIATION_DISTANCE_WALKING)
+        continue;
+    }
+    const { point: projectedPoint, index } = findClosestPointInLine(
+      from,
+      path,
+      distanceBetweenTwoPoints
+    );
+    const trimmedPath = [projectedPoint, ...path.slice(index + 1)];
+    if (trimmedPath.length < 2)
+      continue;
+    if (!bestPath || trimmedPath.length < bestPath.length) {
+      bestPath = trimmedPath;
+    }
+  }
+  return bestPath;
+};
+const memoizeAmapWalkingRoute = createMemoizeWithTTL(WALKING_ROUTE_CACHE_TTL, findBestContinuation);
+const memoizeGmapWalkingRoute = createMemoizeWithTTL(WALKING_ROUTE_CACHE_TTL, findBestContinuation);
 const useAWalkingRoute = (props) => {
   const { googleRoutesProxyUrl } = useMapSupplier();
   const pathRef = shallowRef([]);
   const amapWalking = new AMap.Walking({});
-  const apiMapWalkingRoute = (from, to) => {
+  const apiMapWalkingRoute = memoizeAmapWalkingRoute((from, to) => {
+    spaceLog("apiMapWalkingRoute", `amap from = ${from} to = ${to}`);
     return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiWalkingRoute(from, to, googleRoutesProxyUrl) : amapJsApiWalkingRoute(from, to, amapWalking);
-  };
+  });
   watchPostEffectForDeepOption(
     () => {
       const { from, to } = props;
@@ -27,11 +68,12 @@ const useGWalkingRoute = (props) => {
   const { gaodeDirectionWalkingProxyUrl, googleRoutesProxyUrl } = useMapSupplier();
   const pathRef = shallowRef([]);
   const gmapDirectionsService = new google.maps.DirectionsService();
-  const apiMapWalkingRoute = (from, to) => {
+  const apiMapWalkingRoute = memoizeGmapWalkingRoute((from, to) => {
+    spaceLog("apiMapWalkingRoute", `gmap from = ${from} to = ${to}`);
     if (inKorean(from))
       return Promise.resolve([]);
     return gaodeDirectionWalkingProxyUrl && inKorean(from) ? gaodeServiceApiWalkingRoute(from, to, gaodeDirectionWalkingProxyUrl) : googleRoutesProxyUrl ? googleServiceApiWalkingRoute(from, to, googleRoutesProxyUrl) : gmapJsApiWalkingRoute(from, to, gmapDirectionsService);
-  };
+  });
   watchPostEffectForDeepOption(
     () => {
       const { from, to } = props;

package/dist/v3/types/interface.d.ts

@@ -129,4 +129,11 @@ export type MapThemeVariables = {
     ZONE_RESTRICTED_BORDER_COLOR?: string;
     ZONE_FORBIDDEN_BACKGROUND_COLOR?: string;
     ZONE_FORBIDDEN_BORDER_COLOR?: string;
+    ICON_START_POINT_EN_URL?: string;
+    ICON_END_POINT_EN_URL?: string;
+    ICON_END_POINT_ZH_TW_URL?: string;
+    ICON_TAXI_CAR_URL?: string;
+    ICON_DOT_LOADING_URL?: string;
+    ICON_LOAD_FAILED_URL?: string;
+    ICON_WAYPOINT_URL?: string;
 };

package/dist/v3/utils/geometry.d.ts

@@ -4,6 +4,7 @@ export declare const findClosestPointInSegment: (point: Point, segment: [Point,
 export declare const findClosestPointInLine: (point: Point, path: Point[], distanceFn: DistanceFn) => {
     point: Point;
     distance: number;
+    index: number;
 };
 export declare const isPointInSegment: (point: Point, segment: [Point, Point]) => boolean;
 export declare const isPointInHalfOpenSegment: (point: Point, segment: [Point, Point]) => boolean;

package/dist/v3/utils/geometry.js

@@ -23,9 +23,10 @@ const findClosestPointInLine = (point, path, distanceFn) => {
   var _a, _b;
   let min = Infinity;
   let target;
+  let idx;
   assertPropNoEmptyArray(path, "findClosestPointInLine", "path");
   if (path.length === 1)
-    return { point: path[0], distance: (_a = distanceFn(point, path[0])) != null ? _a : 0 };
+    return { point: path[0], distance: (_a = distanceFn(point, path[0])) != null ? _a : 0, index: 0 };
   for (let index = 0; index < path.length - 1; index++) {
     const closestPoint = findClosestPointInSegment(point, [path[index], path[index + 1]]);
     const distance = (_b = distanceFn(point, closestPoint)) != null ? _b : 0;
@@ -33,8 +34,9 @@ const findClosestPointInLine = (point, path, distanceFn) => {
       continue;
     target = closestPoint;
     min = distance;
+    idx = index;
   }
-  return { point: target, distance: min };
+  return { point: target, distance: min, index: idx };
 };
 const floatEqual = (x1, x2) => {
   return Math.abs(x1 - x2) < 1e4 * Number.EPSILON;

package/dist/v3/utils/geometryPolygon.d.ts

@@ -4,3 +4,8 @@ import type { Point } from "../types/interface";
  * @returns 1 在内部， 0 边界上 ， -1 在外部
  */
 export declare function pointInPolygon(point: Point, polygon: Point[]): 1 | 0 | -1;
+export declare const distanceBetweenTwoPoints: (from: Point, to: Point) => number;
+/**
+ * 计算折线（按顺序连接各点）总长度。
+ */
+export declare const computeLineLength: (line: Point[]) => number;

package/dist/v3/utils/geometryPolygon.js

@@ -22,6 +22,33 @@ function pointInPolygon(point, polygon) {
   }
   return inside ? 1 : -1;
 }
+const distanceBetweenTwoPoints = (from, to) => {
+  const [lng1, lat1] = from;
+  const [lng2, lat2] = to;
+  if (lng1 === lng2 && lat1 === lat2)
+    return 0;
+  const toRad = (deg) => deg * Math.PI / 180;
+  const R = 6378137;
+  const phi1 = toRad(lat1);
+  const phi2 = toRad(lat2);
+  const dPhi = toRad(lat2 - lat1);
+  const dLambda = toRad(lng2 - lng1);
+  const a = Math.sin(dPhi / 2) * Math.sin(dPhi / 2) + Math.cos(phi1) * Math.cos(phi2) * Math.sin(dLambda / 2) * Math.sin(dLambda / 2);
+  const c = 2 * Math.asin(Math.min(1, Math.sqrt(a)));
+  return R * c;
+};
+const computeLineLength = (line) => {
+  var _a;
+  if (!Array.isArray(line) || line.length < 2)
+    return 0;
+  let totalLength = 0;
+  for (let i = 1; i < line.length; i++) {
+    totalLength += (_a = distanceBetweenTwoPoints(line[i - 1], line[i])) != null ? _a : 0;
+  }
+  return totalLength;
+};
 export {
+  computeLineLength,
+  distanceBetweenTwoPoints,
   pointInPolygon
 };

package/dist/v3/utils/log.js

@@ -1,11 +1,19 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.13.0-relay1";
+const pkgVersion = "2.14.0-walkOptimize1";
+const spaceLogSessionKey = "wiajlf;jwiatitruiq3jrlw";
+const enableSessionLogKey = (key) => {
+  const sessionParam = new URLSearchParams(sessionStorage.getItem(spaceLogSessionKey) || void 0);
+  sessionParam.set(`log-${key}`, "true");
+  sessionStorage.setItem(spaceLogSessionKey, sessionParam.toString());
+};
 const isEnableLog = (name) => {
   const searchParam = new URLSearchParams(location.search);
-  return searchParam.has(`log-${name}`);
+  const sessionParam = new URLSearchParams(sessionStorage.getItem(spaceLogSessionKey) || void 0);
+  return searchParam.has(`log-${name}`) || sessionParam.has(`log-${name}`);
 };
-window.availableLogKeys = availableLogKeys;
+window.heycarMapAvailableLogKeys = availableLogKeys;
+window.heycarMapEnableSessionLogKey = enableSessionLogKey;
 const spaceLog = (logKey, ...args) => {
   availableLogKeys.add(logKey);
   if (!isEnableLog(logKey))

package/dist/v3/utils/ttlCache.d.ts

@@ -0,0 +1,34 @@
+export type Milliseconds = number;
+export interface TTLCache<K, V> {
+    get(key: K): V | undefined;
+    set(key: K, value: V): void;
+    delete(key: K): boolean;
+    clear(): void;
+    entries(): IterableIterator<[K, V]>;
+}
+/**
+ * 高性能 TTL Cache（固定 TTL，不支持动态变更）。
+ * - 仅提供最小接口：get/set/delete/clear/entries
+ * - 惰性过期：在访问时清理过期项，无额外定时器
+ */
+export declare function createTTLCache<K, V>(ttlMs: Milliseconds): TTLCache<K, V>;
+/**
+ * 异步函数的 TTL 记忆化工厂
+ *
+ * 命中策略（按顺序）：
+ * 1. 精确命中：用 `computeKey(args)` 查缓存。
+ * 2. 近似命中：用 `selectFromCache(args, entries)` 在当前有效条目中挑选。
+ * 3. 未命中：执行原函数，结果写入缓存。
+ *
+ * 过期策略：惰性按 `ttlMs` 过期；`ttlMs <= 0` 表示不缓存；传 `Infinity` 视为永不过期。
+ *
+ * 参数：
+ * - `ttlMs`：缓存有效期（毫秒）。
+ * - `selectFromCache`：近似命中选择器，入参为本次 `args` 与有效缓存条目的迭代器，返回命中值或 `undefined`。
+ * - `computeKey`：精确命中的 key 生成函数，默认 `JSON.stringify`。
+ *
+ * 返回：`memoize(fn)`，将异步函数包装为带缓存的版本。
+ *
+ * 说明：不做并发合并；仅实现 TTL 驱逐（无容量上限）；近似匹配会遍历有效条目。
+ */
+export declare function createMemoizeWithTTL<A extends any[], R>(ttlMs: Milliseconds, selectFromCache: (args: A, cacheEntries: IterableIterator<[A, R]>) => R | undefined, computeKey?: (args: A) => string): (fn: (...args: A) => Promise<R>) => (...args: A) => Promise<R>;

package/dist/v3/utils/ttlCache.js

@@ -0,0 +1,64 @@
+function createTTLCache(ttlMs) {
+  const store = /* @__PURE__ */ new Map();
+  const get = (key) => {
+    const record = store.get(key);
+    if (!record)
+      return void 0;
+    const now = Date.now();
+    if (record.expireAt !== Infinity && record.expireAt <= now) {
+      store.delete(key);
+      return void 0;
+    }
+    return record.value;
+  };
+  const set = (key, value) => {
+    const now = Date.now();
+    const expireAt = Number.isFinite(ttlMs) ? now + ttlMs : Infinity;
+    if (Number.isFinite(ttlMs) && ttlMs <= 0) {
+      store.delete(key);
+      return;
+    }
+    store.set(key, { value, expireAt });
+  };
+  const del = (key) => store.delete(key);
+  const clear = () => {
+    store.clear();
+  };
+  function* entries() {
+    const now = Date.now();
+    for (const [key, record] of store) {
+      if (record.expireAt !== Infinity && record.expireAt <= now) {
+        store.delete(key);
+        continue;
+      }
+      yield [key, record.value];
+    }
+  }
+  return { get, set, delete: del, clear, entries };
+}
+function createMemoizeWithTTL(ttlMs, selectFromCache, computeKey = JSON.stringify) {
+  const cache = createTTLCache(ttlMs);
+  function* cacheEntries() {
+    for (const [, record] of cache.entries()) {
+      yield [record.args, record.value];
+    }
+  }
+  return function memoize(fn) {
+    return async function memoizedTTLFn(...args) {
+      const key = computeKey(args);
+      const direct = cache.get(key);
+      if (direct !== void 0)
+        return direct.value;
+      const hit = selectFromCache(args, cacheEntries());
+      if (hit !== void 0)
+        return hit;
+      const result = await fn(...args);
+      cache.set(key, { args, value: result });
+      return result;
+    };
+  };
+}
+export {
+  createMemoizeWithTTL,
+  createTTLCache
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "2.13.0-relay1",
+  "version": "2.14.0-walkOptimize1",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js",