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

package/README.md

@@ -50,6 +50,7 @@ body {
   --HEYCAR_MAP_SVG_VAR_end-point_linearGradient_stop_2_color: #ff4040;
   --HEYCAR_MAP_SVG_VAR_end-point_linearGradient_stop_3_color: #ff4040;
   --HEYCAR_MAP_SVG_VAR_end-point_path_fill: rgba(0, 0, 0, 0.5);
+  --HEYCAR_MAP_SVG_VAR_waypoint_path_fill: #ff4040;
   --HEYCAR_MAP_SVG_VAR_passenger-circle_circle_fill: #1e1e1e;
   --HEYCAR_MAP_SVG_VAR_passenger-circle_outerCircle_fill: #4471ff;
   --HEYCAR_MAP_SVG_VAR_passenger-circle_outerCircle_stroke: #003dff;
@@ -151,6 +152,31 @@ export interface BusinessGeolocationPositionError extends GeolocationPositionErr
 
 // Restricted（绿区）Forbidden（红区）Recommend（推荐点）
 export type RecommendType = "Restricted" | "Forbidden" | "Recommend";
+
+export type DriverStatus =
+  | "dispatching"
+  | "book-dispatching"
+  | "dispatched"
+  | "driverStartService"
+  | "driverStartRelayService"
+  | "book-driverStartService"
+  | "book-dispatched"
+  | "driverArrived"
+  | "inService"
+  | "canceled"
+  | "endService"
+  | "completed"
+  | "canceling"
+  | "banlanceRefund"
+  | "waitBanlanceRefund"
+  | "rechargePayed"
+  | "waitRechargePay"
+  | "payed"
+  | "waitpay"
+  | "refund"
+  | "confirmed"
+  | "assign"
+  | "orderReassigned";
 ```
 
 #### 在 入口文件添加 `MapProvider`
@@ -200,6 +226,15 @@ export type RecommendType = "Restricted" | "Forbidden" | "Recommend";
       // ZONE_RESTRICTED_BORDER_COLOR: "#1E1E1E",
       // ZONE_FORBIDDEN_BACKGROUND_COLOR: "#F27878",
       // ZONE_FORBIDDEN_BORDER_COLOR: "#F41717",
+      //
+      // 支付宝迁移主题-图标
+      // ICON_START_POINT_EN_URL: "https://<支付宝oss域名>/heycar-map/svg/0.12/start-point-en.svg";
+      // ICON_END_POINT_EN_URL: "https://<支付宝oss域名>/heycar-map/svg/0.12/end-point-en.svg";
+      // ICON_END_POINT_ZH_TW_URL: "https://<支付宝oss域名>/heycar-map/svg/0.12/end-point-zh-TW.svg";
+      // ICON_TAXI_CAR_URL: "https://<支付宝oss域名>/heycar-map/svg/taxi-car.svg";
+      // ICON_DOT_LOADING_URL: "https://<支付宝oss域名>/heycar-map/gif/dot-loading.gif";
+      // ICON_LOAD_FAILED_URL: "https://<支付宝oss域名>/heycar-map/svg/load-failed.svg";
+      // ICON_WAYPOINT_URL: "https://<支付宝oss域名>/heycar-map/svg/0.12/waypoint.svg";
     }
   }
   // 地图加载失败时显示的标题

package/dist/v2/api/cdn.d.ts

@@ -1,9 +1,8 @@
 export declare const AMAP_DEFAULT_MARKER_ICON_URL = "https://webapi.amap.com/theme/v1.3/markers/b/mark_bs.png";
-export declare const ICON_FULL_SCREEN_URL = "https://overseas-oss.heycars.cn/heycar-map/png/fullscreen.png";
 export declare const ICON_START_POINT_EN_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/start-point-en.svg";
 export declare const ICON_END_POINT_EN_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/end-point-en.svg";
 export declare const ICON_END_POINT_ZH_TW_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/end-point-zh-TW.svg";
 export declare const ICON_TAXI_CAR_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/taxi-car.svg";
 export declare const ICON_DOT_LOADING_URL = "https://overseas-oss.heycars.cn/heycar-map/gif/dot-loading.gif";
 export declare const ICON_LOAD_FAILED_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/load-failed.svg";
-export declare const ICON_WAYPOINT_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/waypoint.svg";
+export declare const ICON_WAYPOINT_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/waypoint.svg";

package/dist/v2/api/cdn.js

@@ -1,18 +1,16 @@
 const AMAP_DEFAULT_MARKER_ICON_URL = "https://webapi.amap.com/theme/v1.3/markers/b/mark_bs.png";
-const ICON_FULL_SCREEN_URL = "https://overseas-oss.heycars.cn/heycar-map/png/fullscreen.png";
 const ICON_START_POINT_EN_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/start-point-en.svg";
 const ICON_END_POINT_EN_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/end-point-en.svg";
 const ICON_END_POINT_ZH_TW_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/end-point-zh-TW.svg";
 const ICON_TAXI_CAR_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/taxi-car.svg";
 const ICON_DOT_LOADING_URL = "https://overseas-oss.heycars.cn/heycar-map/gif/dot-loading.gif";
 const ICON_LOAD_FAILED_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/load-failed.svg";
-const ICON_WAYPOINT_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/waypoint.svg";
+const ICON_WAYPOINT_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/waypoint.svg";
 export {
   AMAP_DEFAULT_MARKER_ICON_URL,
   ICON_DOT_LOADING_URL,
   ICON_END_POINT_EN_URL,
   ICON_END_POINT_ZH_TW_URL,
-  ICON_FULL_SCREEN_URL,
   ICON_LOAD_FAILED_URL,
   ICON_START_POINT_EN_URL,
   ICON_TAXI_CAR_URL,

package/dist/v2/api/contants.d.ts

@@ -5,7 +5,10 @@ export declare const ANIMATION_DURATION_FOR_100VW = 100;
 export declare const ANIMATION_DURATION_PER_ZOOM = 200;
 export declare const BEIJIN_POINT: Point;
 export declare const MAX_DEVIATION_DISTANCE = 30;
+export declare const MAX_DEVIATION_DISTANCE_WALKING = 5;
 export declare const CAR_DISTANCE_MIN = 20;
+export declare const PASSENGER_DISTANCE_MAX = 2000;
+export declare const PASSENGER_DISTANCE_MIN = 20;
 export declare const ZINDEX_BUBBLE_LAYER = 50;
 export declare const ZINDEX_START_END_LOGO_LAYER = 40;
 export declare const ZINDEX_PLACE_LAYER = 30;

package/dist/v2/api/contants.js

@@ -4,7 +4,10 @@ const ANIMATION_DURATION_FOR_100VW = 100;
 const ANIMATION_DURATION_PER_ZOOM = 200;
 const BEIJIN_POINT = [116.2317, 39.5427];
 const MAX_DEVIATION_DISTANCE = 30;
+const MAX_DEVIATION_DISTANCE_WALKING = 5;
 const CAR_DISTANCE_MIN = 20;
+const PASSENGER_DISTANCE_MAX = 2e3;
+const PASSENGER_DISTANCE_MIN = 20;
 const ZINDEX_BUBBLE_LAYER = 50;
 const ZINDEX_START_END_LOGO_LAYER = 40;
 const ZINDEX_PLACE_LAYER = 30;
@@ -30,7 +33,10 @@ export {
   GET_RECOMMEND_PLACE_TIMEOUT,
   MAX_ANIMATION_DISTANCE_VW,
   MAX_DEVIATION_DISTANCE,
+  MAX_DEVIATION_DISTANCE_WALKING,
   MIN_ANIMATION_DURATION,
+  PASSENGER_DISTANCE_MAX,
+  PASSENGER_DISTANCE_MIN,
   REGEO_TIMEOUT,
   TRACKS_MATCH_MAX_LENGTH,
   ZINDEX_AUXILIARY_GRASP,

package/dist/v2/business-components/AbsoluteAddressBox/AbsoluteAddressBox.js

@@ -5,6 +5,7 @@ import { ICON_DOT_LOADING_URL } from "../../api/cdn.js";
 import { i as imgAddressLocator } from "../../chunks/address-locator.4acf83cd.js";
 import { i as imgArrowRight } from "../../chunks/arrow-right.2c34874e.js";
 import { SvgInlineWebComponentTag } from "../../components/SvgInline/SvgInline.web-component.js";
+import { useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup } from "../../types/helper.js";
 import { c as createRuntimeFn } from "../../chunks/vanilla-extract-recipes-createRuntimeFn.esm.bd6fc290.js";
 const imgBubbleRightArc = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTgiIGhlaWdodD0iMzIiIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIG1lZXQiIHZpZXdCb3g9IjAgMCAxOCAzMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNMCAwaDIuMTMxYTEwIDEwIDAgMDE5LjY5NiA3LjU1MkwxOCAzMkguMDQyTDAgMHoiIGZpbGw9InZhcigtLUhFWUNBUl9NQVBfQ1NTX1ZBUl9BYnNvbHV0ZUFkZHJlc3NCb3hfYm94SGVhZGVyX2JhY2tncm91bmQsICMyNTNFN0EpIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiLz48L3N2Zz4=";
@@ -42,8 +43,13 @@ const MultilineTitle = defineSetup("MultilineTitle", function(props, {
 const AbsoluteAddressBox = defineSetup("AbsoluteAddressBox", function(props, {
   emit
 }) {
+  var _a;
   const handleClickText = () => emit("clickText");
   const handleClickPhoto = () => emit("clickPhoto");
+  const {
+    themeVariables
+  } = useMapSupplier();
+  const iconLoading = (_a = themeVariables == null ? void 0 : themeVariables.ICON_DOT_LOADING_URL) != null ? _a : ICON_DOT_LOADING_URL;
   return () => {
     const {
       type,
@@ -72,7 +78,7 @@ const AbsoluteAddressBox = defineSetup("AbsoluteAddressBox", function(props, {
       }, [h("img", {
         "class": imgDotLoading,
         "attrs": {
-          "src": ICON_DOT_LOADING_URL
+          "src": iconLoading
         }
       })]), h("i", {
         "class": straightLine

package/dist/v2/business-components/AuxiliaryPassanger/AuxiliaryPassanger.d.ts

@@ -0,0 +1,6 @@
+import type { DriverStatus, Point } from "../../types/interface";
+export interface AuxiliaryPassangerProps {
+    status: DriverStatus;
+    passengerPosition?: Point;
+}
+export declare const AuxiliaryPassanger: import("vue-demi").DefineComponent<import("vue3").ComponentObjectPropsOptions<AuxiliaryPassangerProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<AuxiliaryPassangerProps, Required<AuxiliaryPassangerProps>>, never, AuxiliaryPassangerProps>;

package/dist/v2/business-components/AuxiliaryPassanger/AuxiliaryPassanger.js

@@ -0,0 +1,50 @@
+import { h } from "vue";
+import { ref } from "vue-demi";
+import { MAX_DEVIATION_DISTANCE_WALKING } from "../../api/contants.js";
+import { defineSetup } from "../../types/helper.js";
+import { watchEffectForDeepOption } from "../../utils/compare.js";
+import { AuxiliaryCircle } from "../AuxiliaryCircle/AuxiliaryCircle.js";
+import { AuxiliaryLine } from "../AuxiliaryLine/AuxiliaryLine.js";
+const usePositionHistory = (source, capacity) => {
+  const history = ref([]);
+  watchEffectForDeepOption(source, (point) => {
+    if (!point)
+      return;
+    history.value.push([...point]);
+    if (history.value.length > capacity) {
+      history.value.shift();
+    }
+  });
+  return history;
+};
+const AuxiliaryPassanger = defineSetup("AuxiliaryPassanger", function(props) {
+  const passengerPositionHistory = usePositionHistory(() => props.passengerPosition, 20);
+  return () => {
+    const {
+      status,
+      passengerPosition
+    } = props;
+    console.log("passengerPositionHistory = ", passengerPositionHistory.value);
+    const prevPositions = passengerPositionHistory.value.slice(0, -1);
+    if (status !== "assign" && status !== "confirmed" && status !== "driverStartRelayService" && status !== "dispatched" && status !== "driverStartService" && status !== "book-driverStartService" && status !== "book-dispatched" && status !== "driverArrived")
+      return;
+    return h("div", [!!passengerPosition && h(AuxiliaryCircle, {
+      "attrs": {
+        "center": passengerPosition,
+        "radius": MAX_DEVIATION_DISTANCE_WALKING,
+        "opacity": 0.2
+      }
+    }), prevPositions.length > 0 && h(AuxiliaryLine, {
+      "attrs": {
+        "path": prevPositions,
+        "type": "circle",
+        "color": "purple",
+        "scale": MAX_DEVIATION_DISTANCE_WALKING,
+        "opacity": 0.2
+      }
+    })]);
+  };
+});
+export {
+  AuxiliaryPassanger
+};

package/dist/v2/business-components/AuxiliaryPassanger/index.d.ts

@@ -0,0 +1 @@
+export * from "./AuxiliaryPassanger";

package/dist/v2/business-components/AuxiliaryPassanger/index.js

@@ -0,0 +1,4 @@
+import { AuxiliaryPassanger } from "./AuxiliaryPassanger.js";
+export {
+  AuxiliaryPassanger
+};

package/dist/v2/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.js

@@ -14,6 +14,7 @@ import { createAbortable, assertNotEmptyArray } from "../../utils/helper.js";
 import { place2point, pipeDefer, lnglat2point } from "../../utils/transform.js";
 import { toCoordinatePlaceType, toCoordinateTrackPoint } from "../../utils/typeChecking.js";
 import { AuxiliaryGraspRoad } from "../AuxiliaryGraspRoad/AuxiliaryGraspRoad.js";
+import { AuxiliaryPassanger } from "../AuxiliaryPassanger/AuxiliaryPassanger.js";
 import { DeviceOrientation } from "../DeviceOrientation/DeviceOrientation.js";
 import { SectionDispatching, SectionConfirmed, SectionDriverStartRelayService, SectionDriverStartService, SectionBookDispatched, SectionInService, SectionDriverArrived, SectionCanceled, SectionEndService } from "./BusinessTaxiServiceSection.js";
 const STATUS_NEED_CAR_POSITION = ["book-driverStartService", "dispatched", "driverStartService", "driverStartRelayService", "inService", "driverArrived"];
@@ -247,6 +248,11 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
         "from": from,
         "to": to
       }
+    }), IS_ENABLE_AUXILIARY_GRASP_ROAD && h(AuxiliaryPassanger, {
+      "attrs": {
+        "status": driverStatus,
+        "passengerPosition": passengerPosition
+      }
     })]);
   };
 });

package/dist/v2/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceSection.js

@@ -1,6 +1,6 @@
 import { h } from "vue";
 import { apiGetAuxiliaryGrapStatus } from "../../api/browser.js";
-import { MAX_DEVIATION_DISTANCE, CAR_DISTANCE_MIN } from "../../api/contants.js";
+import { PASSENGER_DISTANCE_MAX, MAX_DEVIATION_DISTANCE, PASSENGER_DISTANCE_MIN, CAR_DISTANCE_MIN } from "../../api/contants.js";
 import { useMapGeometry } from "../../hooks/useMapGeometry.js";
 import { useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup } from "../../types/helper.js";
@@ -19,8 +19,6 @@ import { WalkingLine } from "../WalkingLine/WalkingLine.js";
 import { WalkingRoute } from "../WalkingRoute/WalkingRoute.js";
 import { WaveCircle } from "../WaveCircle/WaveCircle.js";
 const IS_ENABLE_AUXILIARY_GRASP_ROAD = apiGetAuxiliaryGrapStatus();
-const PASSENGER_DISTANCE_MAX = 2e3;
-const PASSENGER_DISTANCE_MIN = 20;
 const AUTO_FIT_VIEW_INTERVAL = IS_ENABLE_AUXILIARY_GRASP_ROAD ? 24 * 3600 * 1e3 : 15e3;
 const carDurationWithinMinDistance = (distance) => Math.floor(distance / 5);
 const SectionDispatching = defineSetup("SectionDispatching", function(props) {

package/dist/v2/business-components/StartEndPoint/StartEndPoint.d.ts

@@ -1,5 +1,6 @@
 import type { GmapOverlay, MapRegisterOverlayProps } from "../../hooks/useOverlay";
-import type { Language, Point } from "../../types/interface";
+import type { Language, MapThemeVariables, Point } from "../../types/interface";
+type StartEndPointIcons = Pick<MapThemeVariables, "ICON_START_POINT_EN_URL" | "ICON_END_POINT_EN_URL" | "ICON_END_POINT_ZH_TW_URL" | "ICON_WAYPOINT_URL">;
 export interface StartEndPointProps<T> extends MapRegisterOverlayProps<T> {
     language: Language;
     type: "start" | "end" | "waypoint";
@@ -7,6 +8,7 @@ export interface StartEndPointProps<T> extends MapRegisterOverlayProps<T> {
     title?: string;
     description?: string;
     withArrow?: boolean;
+    icons?: StartEndPointIcons;
     onClick?: (value: Point) => void;
 }
 export declare const AStartEndPoint: import("vue-demi").DefineComponent<import("vue3").ComponentObjectPropsOptions<StartEndPointProps<{
@@ -18916,3 +18918,4 @@ export declare const StartEndPoint: import("vue-demi").DefineComponent<import("v
     emit(type: AMap.EventType, data?: any): any;
     getEvents(): Record<string, any[]>;
 }) & GmapOverlay>>;
+export {};

package/dist/v2/business-components/StartEndPoint/StartEndPoint.js

@@ -1,6 +1,6 @@
 import { h } from "vue";
 import { computed } from "vue-demi";
-import { ICON_WAYPOINT_URL, ICON_START_POINT_EN_URL, ICON_END_POINT_ZH_TW_URL, ICON_END_POINT_EN_URL } from "../../api/cdn.js";
+import { ICON_START_POINT_EN_URL, ICON_END_POINT_EN_URL, ICON_END_POINT_ZH_TW_URL, ICON_WAYPOINT_URL } from "../../api/cdn.js";
 import { ZINDEX_START_END_LOGO_LAYER } from "../../api/contants.js";
 import { i as imgArrowRight } from "../../chunks/arrow-right.2c34874e.js";
 import { AmapMarker } from "../../components/AmapMarker/AmapMarker.js";
@@ -10,10 +10,16 @@ import { createElement } from "../../demi-polyfill/demi-polyfill.js";
 import { useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup } from "../../types/helper.js";
 import { createDom } from "../../utils/dom.js";
-import { decodeAsterisk, vec2lnglat } from "../../utils/transform.js";
+import { mergeDefaultProps, decodeAsterisk, vec2lnglat } from "../../utils/transform.js";
 import { p as pointInfoBoxEmphasize, a as pointIcon, b as pointLayout, c as pointSingleInfoBox, d as pointInfoBoxTitle, t as textLayout, e as arrowRight, f as pointInfoBox, g as pointInfoBoxDescription } from "../../chunks/StartEndPoint.css.4d9c0791.js";
 const imgEndPoint = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMzEiIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIG1lZXQiIHZpZXdCb3g9IjAgMCAyNCAzMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48ZGVmcz48bGluZWFyR3JhZGllbnQgeDE9IjcyLjMzOSUiIHkxPSI1MCUiIHgyPSIwJSIgeTI9IjUwJSIgaWQ9ImVuZC1wb2ludF9wcmVmaXhfX2EiPjxzdG9wIHN0b3AtY29sb3I9InZhcigtLUhFWUNBUl9NQVBfU1ZHX1ZBUl9lbmQtcG9pbnRfbGluZWFyR3JhZGllbnRfc3RvcF8xX2NvbG9yLCAjRkY4NDQ3KSIgb2Zmc2V0PSIwJSIvPjxzdG9wIHN0b3AtY29sb3I9InZhcigtLUhFWUNBUl9NQVBfU1ZHX1ZBUl9lbmQtcG9pbnRfbGluZWFyR3JhZGllbnRfc3RvcF8yX2NvbG9yLCAjRkY4QjRBKSIgb2Zmc2V0PSI1MC41OTYlIi8+PHN0b3Agc3RvcC1jb2xvcj0idmFyKC0tSEVZQ0FSX01BUF9TVkdfVkFSX2VuZC1wb2ludF9saW5lYXJHcmFkaWVudF9zdG9wXzNfY29sb3IsICNGRkE5NUEpIiBvZmZzZXQ9IjEwMCUiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGQ9Ik0xMiAzMC4yMTVjMi4xMzQgMCAzLjg2My0uODkzIDMuODYzLTEuOTk1IDAtMS4xLTEuNzMtMS45OTQtMy44NjMtMS45OTQtMi4xMzQgMC0zLjg2My44OTMtMy44NjMgMS45OTQgMCAxLjEwMiAxLjczIDEuOTk1IDMuODYzIDEuOTk1eiIgZmlsbC1vcGFjaXR5PSIuNSIgZmlsbD0idmFyKC0tSEVZQ0FSX01BUF9TVkdfVkFSX2VuZC1wb2ludF9wYXRoX2ZpbGwsICM0MzQ4NUEpIi8+PHBhdGggZD0iTTExIDI3LjAwNmMyLjEyOCAwLS45LTMuNzQzIDUuNjIxLTYuNjQzQzE5Ljg0MiAxOC40NTMgMjIgMTQuOTUzIDIyIDEwLjk1IDIyIDQuOTAyIDE3LjA3NSAwIDExIDBTMCA0LjkwMiAwIDEwLjk1YzAgMy45MTggMi4wNjggNy4zNTYgNS4xNzcgOS4yOUMxMS43NSAyMy4yODQgOS4wNiAyNy4wMDcgMTEgMjcuMDA3eiIgc3Ryb2tlPSIjRkZGIiBmaWxsPSJ1cmwoI2VuZC1wb2ludF9wcmVmaXhfX2EpIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxIDEuMjE1KSIvPjx0ZXh0IGZvbnQtZmFtaWx5PSJQaW5nRmFuZ1NDLVNlbWlib2xkLCBQaW5nRmFuZyBTQyIgZm9udC1zaXplPSIxMiIgZm9udC13ZWlnaHQ9IjUwMCIgZmlsbD0iI0ZGRiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMSAxLjIxNSkiPjx0c3BhbiB4PSI1IiB5PSIxNS40NDkiPue7iDwvdHNwYW4+PC90ZXh0PjwvZz48L3N2Zz4=";
 const imgStartPoint = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMzEiIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIG1lZXQiIHZpZXdCb3g9IjAgMCAyNCAzMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48ZGVmcz48bGluZWFyR3JhZGllbnQgeDE9IjAlIiB5MT0iNTAlIiB4Mj0iMTI5LjU5OSUiIHkyPSI1MCUiIGlkPSJzdGFydC1wb2ludF9wcmVmaXhfX2EiPjxzdG9wIHN0b3AtY29sb3I9InZhcigtLUhFWUNBUl9NQVBfU1ZHX1ZBUl9zdGFydC1wb2ludF9saW5lYXJHcmFkaWVudF9zdG9wXzFfY29sb3IsICMzNkE4RkYpIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0idmFyKC0tSEVZQ0FSX01BUF9TVkdfVkFSX3N0YXJ0LXBvaW50X2xpbmVhckdyYWRpZW50X3N0b3BfMl9jb2xvciwgIzQ4NzFGMSkiIG9mZnNldD0iMTAwJSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+PHBhdGggZD0iTTEyIDMwLjIxNWMxLjk1IDAgMy41MzItLjgxNiAzLjUzMi0xLjgyMyAwLTEuMDA3LTEuNTgxLTEuODIzLTMuNTMyLTEuODIzLTEuOTUgMC0zLjUzMi44MTYtMy41MzIgMS44MjMgMCAxLjAwNyAxLjU4MSAxLjgyMyAzLjUzMiAxLjgyM3oiIGZpbGwtb3BhY2l0eT0iLjUiIGZpbGw9InZhcigtLUhFWUNBUl9NQVBfU1ZHX1ZBUl9zdGFydC1wb2ludF9wYXRoX2ZpbGwsICM0MzQ4NUEpIi8+PHBhdGggZD0iTTExIDI3YzIuMTI4IDAtLjktMy43NDIgNS42MjEtNi42NDEgMy4yMjEtMS45MSA1LjM3OS01LjQxIDUuMzc5LTkuNDEyQzIyIDQuOTAxIDE3LjA3NSAwIDExIDBTMCA0LjkwMSAwIDEwLjk0N2MwIDMuOTE4IDIuMDY4IDcuMzU1IDUuMTc3IDkuMjlDMTEuNzUgMjMuMjc3IDkuMDYgMjcgMTEgMjd6IiBzdHJva2U9IiNGRkYiIGZpbGw9InVybCgjc3RhcnQtcG9pbnRfcHJlZml4X19hKSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMSAxLjIxNSkiLz48dGV4dCBmb250LWZhbWlseT0iUGluZ0ZhbmdTQy1TZW1pYm9sZCwgUGluZ0ZhbmcgU0MiIGZvbnQtc2l6ZT0iMTIiIGZvbnQtd2VpZ2h0PSI1MDAiIGZpbGw9IiNGRkYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEgMS4yMTUpIj48dHNwYW4geD0iNSIgeT0iMTUuNjI0Ij7otbc8L3RzcGFuPjwvdGV4dD48L2c+PC9zdmc+";
+const defaultIcons = {
+  ICON_START_POINT_EN_URL,
+  ICON_END_POINT_EN_URL,
+  ICON_END_POINT_ZH_TW_URL,
+  ICON_WAYPOINT_URL
+};
 const AStartEndPoint = defineSetup("AStartEndPoint", function(props, {
   emit
 }) {
@@ -25,7 +31,8 @@ const AStartEndPoint = defineSetup("AStartEndPoint", function(props, {
       type,
       language
     } = props;
-    const icon = type === "waypoint" ? ICON_WAYPOINT_URL : type === "start" ? language === "zh" || language === "zh-TW" ? imgStartPoint : ICON_START_POINT_EN_URL : language === "zh" ? imgEndPoint : language === "zh-TW" ? ICON_END_POINT_ZH_TW_URL : ICON_END_POINT_EN_URL;
+    const icons = mergeDefaultProps(defaultIcons, props.icons);
+    const icon = type === "waypoint" ? icons.ICON_WAYPOINT_URL : type === "start" ? language === "zh" || language === "zh-TW" ? imgStartPoint : icons.ICON_START_POINT_EN_URL : language === "zh" ? imgEndPoint : language === "zh-TW" ? icons.ICON_END_POINT_ZH_TW_URL : icons.ICON_END_POINT_EN_URL;
     const titleRow = !title ? "" : decodeAsterisk(title).map((item) => item.type === "normal" ? item.value : `<span class="${pointInfoBoxEmphasize}">${item.value}</span>`).join("");
     const descriptionRow = !description ? "" : decodeAsterisk(description).map((item) => item.type === "normal" ? item.value : `<span class="${pointInfoBoxEmphasize}">${item.value}</span>`).join("");
     if (!description && !title)
@@ -94,7 +101,8 @@ const GStartEndPoint = defineSetup("GStartEndPoint", function(props, {
       type,
       language = "zh"
     } = props;
-    const icon = type === "waypoint" ? ICON_WAYPOINT_URL : type === "start" ? language === "zh" || language === "zh-TW" ? imgStartPoint : ICON_START_POINT_EN_URL : language === "zh" || language === "zh-TW" ? imgEndPoint : ICON_END_POINT_EN_URL;
+    const icons = mergeDefaultProps(defaultIcons, props.icons);
+    const icon = type === "waypoint" ? icons.ICON_WAYPOINT_URL : type === "start" ? language === "zh" || language === "zh-TW" ? imgStartPoint : icons.ICON_START_POINT_EN_URL : language === "zh" || language === "zh-TW" ? imgEndPoint : icons.ICON_END_POINT_EN_URL;
     const titleRow = !title ? "" : decodeAsterisk(title).map((item) => item.type === "normal" ? item.value : `<span class="${pointInfoBoxEmphasize}">${item.value}</span>`).join("");
     const descriptionRow = !description ? "" : decodeAsterisk(description).map((item) => item.type === "normal" ? item.value : `<span class="${pointInfoBoxEmphasize}">${item.value}</span>`).join("");
     if (!description && !title)
@@ -161,8 +169,15 @@ const StartEndPoint = defineSetup("StartEndPoint", function(props, {
 }) {
   const payload = useMapSupplier();
   return () => {
+    const icons = {
+      ...payload.themeVariables,
+      ...props.icons
+    };
     return createElement(payload.supplier === "gmap" ? GStartEndPoint : AStartEndPoint, {
-      attrs: props,
+      attrs: {
+        ...props,
+        icons
+      },
       on: {
         click: (value) => emit("click", value)
       }

package/dist/v2/business-components/TaxiCar/TaxiCar.d.ts

@@ -4,6 +4,7 @@ export interface TaxiCarProps<T> extends MapRegisterOverlayProps<T> {
     angle?: number;
     title?: string;
     opacity?: number;
+    icon?: string;
 }
 export declare const ATaxiCar: import("vue-demi").DefineComponent<import("vue3").ComponentObjectPropsOptions<TaxiCarProps<{
     _needUpdate: boolean;

package/dist/v2/business-components/TaxiCar/TaxiCar.js

@@ -19,11 +19,14 @@ var taxiCarTitle = "_65j3sr4";
 const ATaxiCar = defineSetup("ATaxiCar", function(props) {
   const contentRef = computed(() => {
     var _a, _b;
+    const {
+      icon = ICON_TAXI_CAR_URL
+    } = props;
     const titleRow = !props.title ? "" : decodeAsterisk(props.title).map((item) => item.type === "normal" ? item.value : `<span class="${pointInfoBoxEmphasize}">${item.value}</span>`).join("");
     const carStyle = `transform:rotate(${(_a = props.angle) != null ? _a : 0}deg); opacity: ${(_b = props.opacity) != null ? _b : 1}`;
     if (!props.title)
       return {
-        img: `<img class="ATaxiCar ${carIcon}" src="${ICON_TAXI_CAR_URL}" style="${carStyle}">`
+        img: `<img class="ATaxiCar ${carIcon}" src="${icon}" style="${carStyle}">`
       };
     const content = (hide$1) => `
       <div class="ATaxiCar ${pointLayout}">
@@ -32,7 +35,7 @@ const ATaxiCar = defineSetup("ATaxiCar", function(props) {
     })}">
           <div class="${taxiCarTitle}">${titleRow}</div>
         </div>
-        <img src="${ICON_TAXI_CAR_URL}" class="${carIcon} ${hide({
+        <img src="${icon}" class="${carIcon} ${hide({
       hide: hide$1
     })}" style="${carStyle}">
       </div>
@@ -63,13 +66,16 @@ const ATaxiCar = defineSetup("ATaxiCar", function(props) {
 const GTaxiCar = defineSetup("GTaxiCar", function(props) {
   const contentRef = computed(() => {
     var _a, _b;
+    const {
+      icon = ICON_TAXI_CAR_URL
+    } = props;
     const titleRow = !props.title ? "" : decodeAsterisk(props.title).map((item) => item.type === "normal" ? item.value : `<span class="${pointInfoBoxEmphasize}">${item.value}</span>`).join("");
     const carStyle = `transform:rotate(${(_a = props.angle) != null ? _a : 0}deg); opacity: ${(_b = props.opacity) != null ? _b : 1}`;
     if (!props.title)
       return {
         img: createDom("img", {
           class: `GTaxiCar ${carIcon}`,
-          src: ICON_TAXI_CAR_URL,
+          src: icon,
           style: carStyle
         })
       };
@@ -81,7 +87,7 @@ const GTaxiCar = defineSetup("GTaxiCar", function(props) {
     })}">
           <div class="${taxiCarTitle}">${titleRow}</div>
         </div>
-        <img src="${ICON_TAXI_CAR_URL}" class="${carIcon} ${hide({
+        <img src="${icon}" class="${carIcon} ${hide({
       hide: hide$1
     })}" style="${carStyle}">
       `);
@@ -111,8 +117,13 @@ const GTaxiCar = defineSetup("GTaxiCar", function(props) {
 const TaxiCar = defineSetup("TaxiCar", function(props) {
   const payload = useMapSupplier();
   return () => {
+    var _a, _b;
+    const icon = (_b = (_a = payload.themeVariables) == null ? void 0 : _a.ICON_TAXI_CAR_URL) != null ? _b : props.icon;
     return createElement(payload.supplier === "gmap" ? GTaxiCar : ATaxiCar, {
-      attrs: props
+      attrs: {
+        ...props,
+        icon
+      }
     });
   };
 });

package/dist/v2/chunks/{Loading.96f573fe.js → Loading.70dfc720.js}

@@ -2,6 +2,7 @@ import "../css/Loading-49e58ced.css";
 import { h } from "vue";
 import { ICON_LOAD_FAILED_URL } from "../api/cdn.js";
 import { AbsoluteAddressBox } from "../business-components/AbsoluteAddressBox/AbsoluteAddressBox.js";
+import { useMapSupplier } from "../hooks/useMapSupplier.js";
 import { defineSetup } from "../types/helper.js";
 import { SvgInlineWebComponentTag } from "../components/SvgInline/SvgInline.web-component.js";
 const imgGrid = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzg1IiBoZWlnaHQ9IjgxNyIgcHJlc2VydmVBc3BlY3RSYXRpbz0ieE1pZFlNaWQgbWVldCIgdmlld0JveD0iMCAwIDM4NSA4MTciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgc3Ryb2tlPSIjRDhEQkUyIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZS1kYXNoYXJyYXk9IjEiPjxwYXRoIGQ9Ik0uNSA4MTdWME0yNC41IDgxN1YwTTQ4LjUgODE3VjBNNzIuNSA4MTdWME05Ni41IDgxN1YwTTEyMC41IDgxN1YwTTE0NC41IDgxN1YwTTE2OC41IDgxN1YwTTE5Mi41IDgxN1YwTTIxNi41IDgxN1YwTTI0MC41IDgxN1YwTTI2NC41IDgxN1YwTTI4OC41IDgxN1YwTTMxMi41IDgxN1YwTTMzNi41IDgxN1YwTTM2MC41IDgxN1YwTTM4NC41IDgxN1YwTTAgLjVoMzg1TTAgMjQuNWgzODVNMCA0OC41aDM4NU0wIDcyLjVoMzg1TTAgOTYuNWgzODVNMCAxMjAuNWgzODVNMCAxNDQuNWgzODVNMCAxNjguNWgzODVNMCAxOTIuNWgzODVNMCAyMTYuNWgzODVNMCAyNDAuNWgzODVNMCAyNjQuNWgzODVNMCAyODguNWgzODVNMCAzMTIuNWgzODVNMCAzMzYuNWgzODVNMCAzNjAuNWgzODVNMCAzODQuNWgzODVNMCA0MDguNWgzODVNMCA0MzIuNWgzODVNMCA0NTYuNWgzODVNMCA0ODAuNWgzODVNMCA1MDQuNWgzODVNMCA1MjguNWgzODVNMCA1NTIuNWgzODVNMCA1NzYuNWgzODVNMCA2MDAuNWgzODVNMCA2MjQuNWgzODVNMCA2NDguNWgzODVNMCA2NzIuNWgzODVNMCA2OTYuNWgzODVNMCA3MjAuNWgzODVNMCA3NDQuNWgzODVNMCA3NjguNWgzODVNMCA3OTIuNWgzODVNMCA4MTYuNWgzODUiLz48L2c+PC9zdmc+";
@@ -29,6 +30,11 @@ const Loading = defineSetup("Loading", function() {
   })]);
 });
 const LoadFailed = defineSetup("LoadFailed", function(props) {
+  var _a, _b;
+  const {
+    themeVariables
+  } = useMapSupplier();
+  const icon = (_b = (_a = props.icon) != null ? _a : themeVariables == null ? void 0 : themeVariables.ICON_LOAD_FAILED_URL) != null ? _b : ICON_LOAD_FAILED_URL;
   return () => h("div", {
     "class": loadingLayout
   }, [h("img", {
@@ -41,7 +47,7 @@ const LoadFailed = defineSetup("LoadFailed", function(props) {
   }, [h(SvgInlineWebComponentTag, {
     "class": iconLoadFailed,
     "attrs": {
-      "src": ICON_LOAD_FAILED_URL
+      "src": icon
     }
   }), h("span", {
     "class": `${title} ${verticalGap}`

package/dist/v2/components/Loading/Loading.d.ts

@@ -2,6 +2,7 @@ export declare const Loading: import("vue").DefineComponent<import("vue3").Compo
 interface LoadFailedProps {
     title?: string;
     description?: string;
+    icon?: string;
 }
 export declare const LoadFailed: import("vue").DefineComponent<import("vue3").ComponentObjectPropsOptions<LoadFailedProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<LoadFailedProps, Required<LoadFailedProps>>, never, LoadFailedProps>;
 export {};

package/dist/v2/components/Loading/Loading.js

@@ -1,7 +1,8 @@
 import "vue";
 import "../../api/cdn.js";
-import { L, a } from "../../chunks/Loading.96f573fe.js";
+import { L, a } from "../../chunks/Loading.70dfc720.js";
 import "../../business-components/AbsoluteAddressBox/AbsoluteAddressBox.js";
+import "../../hooks/useMapSupplier.js";
 import "../../types/helper.js";
 import "../SvgInline/SvgInline.web-component.js";
 export {

package/dist/v2/components/Loading/index.js

@@ -1,4 +1,4 @@
-import { L, a } from "../../chunks/Loading.96f573fe.js";
+import { L, a } from "../../chunks/Loading.70dfc720.js";
 export {
   L as LoadFailed,
   a as Loading

package/dist/v2/components/MapProvider/MapProvider.js

@@ -1,7 +1,7 @@
 import "../../css/MapProvider-156bfd53.css";
 import { h } from "vue";
 import { reactive, toRefs } from "vue-demi";
-import { L as LoadFailed, a as Loading, i as imgGrid } from "../../chunks/Loading.96f573fe.js";
+import { L as LoadFailed, a as Loading, i as imgGrid } from "../../chunks/Loading.70dfc720.js";
 import { useMapLoader, Status } from "../../hooks/useMapLoader.js";
 import { provideMapSupplier, useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineLagecySetup } from "../../types/helper.js";

package/dist/v2/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/v2/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/v2/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/v2/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;
 };