@heycar/heycars-map 0.4.8 → 0.5.0

package/dist/api/contants.d.ts

@@ -1,2 +1,7 @@
 import type { Point } from "../types/interface";
 export declare const BEIJIN_POINT: Point;
+export declare const ZINDEX_BUBBLE_LAYER = 50;
+export declare const ZINDEX_START_END_LOGO_LAYER = 40;
+export declare const ZINDEX_PLACE_LAYER = 30;
+export declare const ZINDEX_CAR_LAYER = 21;
+export declare const ZINDEX_PASSENGER_LAYER = 20;

package/dist/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceSection.d.ts

@@ -14,7 +14,7 @@ type SectionConfirmedProps = Required<MROP> & {
 export declare const SectionConfirmed: import("vue").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<SectionConfirmedProps>, 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<SectionConfirmedProps, Required<SectionConfirmedProps>>, never, SectionConfirmedProps, {} | {}>;
 type SectionDriverStartServiceProps = Required<MROP> & {
     passengerPosition?: Point;
-    carPosition: Point;
+    carPosition?: Point;
     from: Place;
     renderTitle: (props: Pick<DrivingRouteRenderProps, "duration" | "distance">) => string;
 };
@@ -27,14 +27,14 @@ type SectionBookDispatchedProps = Required<MROP> & {
 export declare const SectionBookDispatched: import("vue").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<SectionBookDispatchedProps>, 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<SectionBookDispatchedProps, Required<SectionBookDispatchedProps>>, never, SectionBookDispatchedProps, {} | {}>;
 type SectionDriverArrivedProps = Required<MROP> & {
     from: Place;
-    carPosition: Point;
+    carPosition?: Point;
     passengerPosition?: Point;
     title: string;
 };
 export declare const SectionDriverArrived: import("vue").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<SectionDriverArrivedProps>, 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<SectionDriverArrivedProps, Required<SectionDriverArrivedProps>>, never, SectionDriverArrivedProps, {} | {}>;
 type SectionInServiceProps = Required<MROP> & {
     to: Place;
-    carPosition: Point;
+    carPosition?: Point;
     renderTitle: (props: Pick<DrivingRouteRenderProps, "duration" | "distance">) => string;
 };
 export declare const SectionInService: import("vue").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<SectionInServiceProps>, 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<SectionInServiceProps, Required<SectionInServiceProps>>, never, SectionInServiceProps, {} | {}>;

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

@@ -1,3 +1,11 @@
 export { pointInfoBoxEmphasize, pointInfoBoxTitle, pointLayout, pointSingleInfoBox, } from "../StartEndPoint/StartEndPoint.css";
 export declare const taxiCarLayout: string;
 export declare const carIcon: string;
+export declare const hide: import("@vanilla-extract/recipes").RuntimeFn<{
+    hide: {
+        true: {
+            visibility: "hidden";
+        };
+        false: {};
+    };
+}>;

package/dist/index.cjs

@@ -1,4 +1,10 @@
 "use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Vue = require("vue");
 const style = "";
@@ -2213,7 +2219,7 @@ const ADrivingLine = defineSetup(function ADrivingLine2(props) {
       "attrs": {
         "showDir": true,
         "path": props.path,
-        "strokeWeight": strokeWidth + 2 * dirWidth,
+        "strokeWeight": strokeWidth + dirWidth,
         "strokeOpacity": 1,
         "strokeColor": "transparent",
         "lineJoin": "round",
@@ -2657,6 +2663,12 @@ const KeyedFitView = defineSetup(function KeyedFitView2(props, {
     return Vue.h("div", [(_a = slots.default) == null ? void 0 : _a.call(slots)]);
   };
 });
+const BEIJIN_POINT = [116.2317, 39.5427];
+const ZINDEX_BUBBLE_LAYER = 50;
+const ZINDEX_START_END_LOGO_LAYER = 40;
+const ZINDEX_PLACE_LAYER = 30;
+const ZINDEX_CAR_LAYER = 21;
+const ZINDEX_PASSENGER_LAYER = 20;
 const imgEndPoint = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IHgxPSI3Mi4zMzklIiB5MT0iNTAlIiB4Mj0iMCUiIHkyPSI1MCUiIGlkPSJwcmVmaXhfX2EiPjxzdG9wIHN0b3AtY29sb3I9IiNGRjg0NDciIG9mZnNldD0iMCUiLz48c3RvcCBzdG9wLWNvbG9yPSIjRkY4QjRBIiBvZmZzZXQ9IjUwLjU5NiUiLz48c3RvcCBzdG9wLWNvbG9yPSIjRkZBOTVBIiBvZmZzZXQ9IjEwMCUiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGQ9Ik0xMiAzMC4yMTVjMi4xMzQgMCAzLjg2My0uODkzIDMuODYzLTEuOTk1IDAtMS4xLTEuNzMtMS45OTQtMy44NjMtMS45OTQtMi4xMzQgMC0zLjg2My44OTMtMy44NjMgMS45OTQgMCAxLjEwMiAxLjczIDEuOTk1IDMuODYzIDEuOTk1eiIgZmlsbC1vcGFjaXR5PSIuNSIgZmlsbD0iIzQzNDg1QSIvPjxwYXRoIGQ9Ik0xMSAyNy4wMDZjMi4xMjggMC0uOS0zLjc0MyA1LjYyMS02LjY0M0MxOS44NDIgMTguNDUzIDIyIDE0Ljk1MyAyMiAxMC45NSAyMiA0LjkwMiAxNy4wNzUgMCAxMSAwUzAgNC45MDIgMCAxMC45NWMwIDMuOTE4IDIuMDY4IDcuMzU2IDUuMTc3IDkuMjlDMTEuNzUgMjMuMjg0IDkuMDYgMjcuMDA3IDExIDI3LjAwN3oiIHN0cm9rZT0iI0ZGRiIgZmlsbD0idXJsKCNwcmVmaXhfX2EpIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxIDEuMjE1KSIvPjx0ZXh0IGZvbnQtZmFtaWx5PSJQaW5nRmFuZ1NDLVNlbWlib2xkLCBQaW5nRmFuZyBTQyIgZm9udC1zaXplPSIxMiIgZm9udC13ZWlnaHQ9IjUwMCIgZmlsbD0iI0ZGRiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMSAxLjIxNSkiPjx0c3BhbiB4PSI1IiB5PSIxNS40NDkiPue7iDwvdHNwYW4+PC90ZXh0PjwvZz48L3N2Zz4=";
 const imgStartPoint = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IHgxPSIwJSIgeTE9IjUwJSIgeDI9IjEyOS41OTklIiB5Mj0iNTAlIiBpZD0icHJlZml4X19hIj48c3RvcCBzdG9wLWNvbG9yPSIjMzZBOEZGIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iIzQ4NzFGMSIgb2Zmc2V0PSIxMDAlIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj48cGF0aCBkPSJNMTIgMzAuMjE1YzEuOTUgMCAzLjUzMi0uODE2IDMuNTMyLTEuODIzIDAtMS4wMDctMS41ODEtMS44MjMtMy41MzItMS44MjMtMS45NSAwLTMuNTMyLjgxNi0zLjUzMiAxLjgyMyAwIDEuMDA3IDEuNTgxIDEuODIzIDMuNTMyIDEuODIzeiIgZmlsbC1vcGFjaXR5PSIuNSIgZmlsbD0iIzQzNDg1QSIvPjxwYXRoIGQ9Ik0xMSAyN2MyLjEyOCAwLS45LTMuNzQyIDUuNjIxLTYuNjQxIDMuMjIxLTEuOTEgNS4zNzktNS40MSA1LjM3OS05LjQxMkMyMiA0LjkwMSAxNy4wNzUgMCAxMSAwUzAgNC45MDEgMCAxMC45NDdjMCAzLjkxOCAyLjA2OCA3LjM1NSA1LjE3NyA5LjI5QzExLjc1IDIzLjI3NyA5LjA2IDI3IDExIDI3eiIgc3Ryb2tlPSIjRkZGIiBmaWxsPSJ1cmwoI3ByZWZpeF9fYSkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEgMS4yMTUpIi8+PHRleHQgZm9udC1mYW1pbHk9IlBpbmdGYW5nU0MtU2VtaWJvbGQsIFBpbmdGYW5nIFNDIiBmb250LXNpemU9IjEyIiBmb250LXdlaWdodD0iNTAwIiBmaWxsPSIjRkZGIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxIDEuMjE1KSI+PHRzcGFuIHg9IjUiIHk9IjE1LjYyNCI+6LW3PC90c3Bhbj48L3RleHQ+PC9nPjwvc3ZnPg==";
 const StartEndPoint_css_ts_vanilla = "";
@@ -2774,7 +2786,8 @@ const AStartEndPoint = defineSetup(function AStartEndPoint2(props) {
       "registerOverlay": props.registerOverlay,
       "position": props.position,
       "content": contentRef.value,
-      "anchor": "bottom-center"
+      "anchor": "bottom-center",
+      "zIndex": ZINDEX_START_END_LOGO_LAYER
     }
   });
 });
@@ -2818,7 +2831,8 @@ const GStartEndPoint = defineSetup(function GStartEndPoint2(props) {
       "attrs": {
         "registerOverlay": props.registerOverlay,
         "position": vec2lnglat(props.position),
-        "content": contentRef.value
+        "content": contentRef.value,
+        "zIndex": ZINDEX_START_END_LOGO_LAYER
       }
     });
   };
@@ -2896,6 +2910,49 @@ const BusinessQuotingMap = defineLagecySetup(function BusinessQuotingMap2(props)
     })]);
   };
 }).props(["fallback", "from", "loading", "mapRef", "registerOverlay", "renderDescription", "to", "fromDescription", "log"]);
+const isPlace = (place) => {
+  return place.lng !== void 0 && place.lat !== void 0;
+};
+const sleep = (milliSeconds) => new Promise((resolve) => setTimeout(resolve, milliSeconds));
+class SingleGeoWatch {
+  constructor(option) {
+    __publicField(this, "id", 0);
+    __publicField(this, "listeners", /* @__PURE__ */ new Map());
+    __publicField(this, "option", {});
+    __publicField(this, "singleWatchId");
+    this.option = option != null ? option : {};
+  }
+  watchPosition(onSuccess, onError) {
+    this.id += 1;
+    const { id } = this;
+    this.listeners.set(id, [onSuccess, onError]);
+    this.start();
+    return id;
+  }
+  clearWatch(id) {
+    this.listeners.delete(id);
+  }
+  async start() {
+    const { listeners, option, singleWatchId } = this;
+    if (singleWatchId) {
+      navigator.geolocation.clearWatch(singleWatchId);
+      await sleep(20);
+    }
+    this.singleWatchId = navigator.geolocation.watchPosition(
+      (position) => {
+        for (const [onSuccess] of listeners.values()) {
+          onSuccess(position);
+        }
+      },
+      (error) => {
+        for (const [_, onError] of listeners.values()) {
+          onError == null ? void 0 : onError(error);
+        }
+      },
+      option
+    );
+  }
+}
 const useAmapGCJ02 = () => {
   const { readyPromise } = useMapSupplier();
   async function toGcj02(point) {
@@ -2926,6 +2983,11 @@ const useMapGCJ02 = () => {
   return supplier === "gmap" ? useGmapGCJ02() : useAmapGCJ02();
 };
 const GEO_TIMEOUT = 5e3;
+const singleGeoWatch = new SingleGeoWatch({
+  timeout: GEO_TIMEOUT,
+  maximumAge: 0,
+  enableHighAccuracy: false
+});
 const useGeoLocation = (props) => {
   var _a, _b;
   const { onChange, onLoad, onLoadDefault, onError, geoDefaultPosition } = props != null ? props : {};
@@ -2948,12 +3010,11 @@ const useGeoLocation = (props) => {
     () => true,
     (_1, _2, onCleanup) => {
       loading.value = true;
-      const watchId = navigator.geolocation.watchPosition(
+      const watchId = singleGeoWatch.watchPosition(
         async (position) => {
           const coordinate = position.coords;
           const wgsPoint = [position.coords.longitude, position.coords.latitude];
           const point = await toGcj02(wgsPoint);
-          console.log("wgsPoint, point = ", wgsPoint, point);
           coordinateRef.value = coordinate;
           positionRef.value = point;
           if (loading.value) {
@@ -2972,10 +3033,9 @@ const useGeoLocation = (props) => {
             onLoadDefault == null ? void 0 : onLoadDefault({ position });
           }
           onError == null ? void 0 : onError(error);
-        },
-        { timeout: GEO_TIMEOUT, maximumAge: 0, enableHighAccuracy: false }
+        }
       );
-      onCleanup(() => navigator.geolocation.clearWatch(watchId));
+      onCleanup(() => singleGeoWatch.clearWatch(watchId));
     },
     { immediate: true }
   );
@@ -3416,7 +3476,8 @@ const APassengerCircle = defineSetup(function APassengerCircle2(props) {
         "position": props.position,
         "content": contentRef.value,
         "anchor": "bottom-center",
-        "registerOverlay": props.registerOverlay
+        "registerOverlay": props.registerOverlay,
+        "zIndex": ZINDEX_PASSENGER_LAYER
       }
     });
   };
@@ -3438,7 +3499,8 @@ const GPassengerCircle = defineSetup(function GPassengerCircle2(props) {
     "attrs": {
       "position": vec2lnglat(props.position),
       "content": contentRef.value,
-      "registerOverlay": props.registerOverlay
+      "registerOverlay": props.registerOverlay,
+      "zIndex": ZINDEX_PASSENGER_LAYER
     }
   });
 });
@@ -3613,7 +3675,8 @@ const APlaceCircle = defineSetup(function APlaceCircle2(props, {
       "attrs": {
         "position": props.position,
         "content": props.label ? contentRef.value : contentWithoutLabelRef.value,
-        "anchor": textAlignRef.value === "left" ? AnchorType.middleRight : AnchorType.middleLeft
+        "anchor": textAlignRef.value === "left" ? AnchorType.middleRight : AnchorType.middleLeft,
+        "zIndex": ZINDEX_PLACE_LAYER
       },
       "on": {
         "click": handleClick
@@ -3664,7 +3727,8 @@ const GPlaceCircle = defineSetup(function GPlaceCircle2(props, {
   return () => Vue.h(GmapAdvancedMarkerView, {
     "attrs": {
       "position": vec2lnglat(props.position),
-      "content": props.label ? contentRef.value : contentWithoutLabelRef.value
+      "content": props.label ? contentRef.value : contentWithoutLabelRef.value,
+      "zIndex": ZINDEX_PLACE_LAYER
     },
     "on": {
       "click": handleClick
@@ -3880,7 +3944,8 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
         ...place
       });
       emit("changeRecomandPlace", place);
-      await pipeDefer(setZoom)(READY_ZOOM);
+      if (isFirstWorkflowRecomendLoadingRef.value)
+        await pipeDefer(setZoom)(READY_ZOOM);
       completeFirstWorkflowRecomend();
     },
     onChangeCity: (value) => {
@@ -3934,10 +3999,6 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     })]);
   };
 }).props(["log", "geoLoadingTitle", "unavailableTitle", "recomendDescription", "fallback", "geoDefaultPosition", "getRecomendPlace", "getDefaultCenterPlace", "loading", "mapContext"]);
-const BEIJIN_POINT = [116.2317, 39.5427];
-const isPlace = (place) => {
-  return place.lng !== void 0 && place.lat !== void 0;
-};
 const useAmapGeometry = () => {
   const payload = useMapSupplier();
   const apiMapDistance = (from, to) => {
@@ -3963,6 +4024,7 @@ const useMapGeometry = () => {
 const imgTaxicar = "data:image/svg+xml;base64,<svg width="24" height="44" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path d="M34.087 10.96c0 2.369-.054 2.98-.782 3.704-.793.79-5.236.833-5.236.833l-4.116.192-9.896-.144s-7.79-.026-9.131-.026c-1.342 0-2.406-.847-2.406-.847C.14 12.932 0 11.09 0 11.09V5.86s.14-1.842 2.52-3.583c0 0 1.064-.846 2.406-.846 1.341 0 9.13-.026 9.13-.026l9.897-.144 4.116.192s4.484 0 5.236.833c.778.86.782 1.37.782 3.74v4.934z" id="prefix__b"/><path d="M0 1.493S5.7.18 8.719.05c3.02-.131 3.47.017 5.282.21.507.051 3.26.91 3.26.91l-7.303.3L0 1.494z" id="prefix__c"/><path d="M10.08 2.815C9.295 4.483 8.85 6.423 8.85 8.494c0 2.062.442 3.994 1.22 5.657l5.698-1.157a15.601 15.601 0 01-.667-4.552c0-1.659.204-3.065.659-4.505L10.08 2.815z" id="prefix__e"/><path d="M25.753 8.455c0 1.92-.22 3.364-.601 4.891l2.626.35c1.178-.005 2.132-2.335 2.132-5.215s-.954-5.21-2.132-5.21l-2.614.35c.372 1.513.589 2.94.589 4.834z" id="prefix__g"/><path d="M.064.015L.158.002C.188-.016.371.106.4.124c.188.126.321.244.43.76.054.252.207 1.465.198 1.496l-.633.833.119 3.17-.094.076L0 .137c0-.052.025-.1.064-.122z" id="prefix__i"/><path d="M.064 6.515l.094.013c.03.018.213-.104.242-.122.188-.126.321-.244.43-.76.054-.252.207-1.465.198-1.496l-.633-.833L.42 0v.07L0 6.394c0 .052.025.1.064.122z" id="prefix__k"/><linearGradient x1="125.264%" y1="49.626%" x2="0%" y2="50%" id="prefix__d"><stop stop-color="#FFF" stop-opacity=".5" offset="0%"/><stop stop-opacity=".5" offset="100%"/></linearGradient><linearGradient x1="22.712%" y1="73.133%" x2="68.62%" y2="66.194%" id="prefix__f"><stop stop-color="#FFF" stop-opacity=".5" offset="0%"/><stop stop-opacity=".5" offset="100%"/></linearGradient><linearGradient x1="128.768%" y1="50%" x2="0%" y2="50%" id="prefix__h"><stop stop-color="#FFF" stop-opacity=".5" offset="0%"/><stop stop-opacity=".5" offset="100%"/></linearGradient><linearGradient x1="100%" y1="100%" x2="28.4%" y2="100%" id="prefix__j"><stop stop-color="#FFBEBE" stop-opacity=".5" offset="0%"/><stop stop-color="#352222" stop-opacity=".5" offset="100%"/></linearGradient><linearGradient x1="100%" y1="100%" x2="28.4%" y2="100%" id="prefix__l"><stop stop-color="#FFBEBE" stop-opacity=".5" offset="0%"/><stop stop-color="#352222" stop-opacity=".5" offset="100%"/></linearGradient><filter x="-17.6%" y="-41.6%" width="135.2%" height="183.2%" filterUnits="objectBoundingBox" id="prefix__a"><feOffset in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0.0862745098 0 0 0 0 0.0862745098 0 0 0 0 0.0862745098 0 0 0 0.5 0" in="shadowBlurOuter1"/></filter></defs><g fill="none" fill-rule="evenodd"><path d="M0 0h24v44H0z"/><g fill-rule="nonzero"><g transform="matrix(0 1 1 0 3.498 4.642)"><use fill="#000" filter="url(#prefix__a)" xlink:href="#prefix__b"/><use fill="#DFECF2" xlink:href="#prefix__b"/></g><path d="M14.458 38.728c2.369 0 2.98-.053 3.704-.781.79-.794.834-5.237.834-5.237l.191-4.115-.144-9.896s-.026-7.79-.026-9.132c0-1.342-.846-2.405-.846-2.405-1.741-2.381-3.582-2.52-3.582-2.52H9.357s-1.841.139-3.582 2.52c0 0-.847 1.063-.847 2.405 0 1.342-.026 9.132-.026 9.132l-.144 9.896.192 4.115s0 4.484.833 5.237c.86.777 1.37.781 3.74.781h4.935z" fill="#EFF5F8"/><g transform="matrix(0 1 1 0 17.093 15.062)" opacity=".9"><use fill="#161616" xlink:href="#prefix__c"/><use fill="url(#prefix__d)" xlink:href="#prefix__c"/></g><path d="M5.826 14.53c1.806-.937 3.915-1.465 6.17-1.465 2.243 0 4.339.528 6.141 1.452l-1.278 6.489a15.375 15.375 0 00-4.915-.794c-1.793 0-3.324.254-4.873.794L5.826 14.53z" fill="#161616"/><g transform="matrix(0 1 1 0 3.498 4.642)"><use fill="#3C4242" xlink:href="#prefix__e"/><use fill="url(#prefix__f)" xlink:href="#prefix__e"/></g><g opacity=".9" transform="matrix(0 1 1 0 3.498 4.642)"><use fill="#161616" xlink:href="#prefix__g"/><use fill="url(#prefix__h)" xlink:href="#prefix__g"/></g><path d="M3.87 17.651l.876-.462a.313.313 0 00.17-.274v-.188l-1.317.695v.082c.004.127.152.209.27.147z" fill="#303435"/><path d="M3.564 17.45l1.082-.568c.1-.053.21-.09.327-.106a.108.108 0 00.096-.107v-.552c0-.09-.078-.164-.174-.164H4.85c-.11 0-.502.062-1 .528-.222.209-.353.638-.353.933 0 .033.035.053.066.037z" fill="#DFECF2"/><path d="M5.434 15.062s1.095 4.467 1.226 7.486c.131 3.02-.017 3.47-.21 5.282-.051.507-.937 3.813-.937 3.813L5.36 25.17l.074-10.11z" fill="#161616" opacity=".9"/><path d="M20.13 17.651l-.876-.462a.313.313 0 01-.17-.274v-.188l1.317.695v.082c-.004.127-.152.209-.27.147z" fill="#303435"/><path d="M20.436 17.45l-1.082-.568a.984.984 0 00-.327-.106.108.108 0 01-.096-.107v-.552c0-.09.078-.164.174-.164h.044c.11 0 .502.062 1 .528.222.209.353.638.353.933 0 .033-.035.053-.066.037z" fill="#DFECF2"/><path d="M9.296 38.524h5.375c2.252 0 2.806-.458 3.434-1.15-.104.287-.218.52-.344.659-.712.781-1.026 1.325-3.356 1.325H9.558c-2.33 0-2.544-.486-3.39-1.325-.149-.147-.276-.405-.389-.732.755.777 1.165 1.223 3.517 1.223z" fill="#95A4AD"/><path d="M8.881 37.922h6.052c1.911 0 2.736-.298 3.33-.781a3.075 3.075 0 01-.297.72c-.585.618-1.23 1.019-3.334 1.019H9.178c-1.48 0-2.2-.176-2.718-.504-.118-.11-.24-.237-.384-.384-.14-.147-.266-.405-.376-.74.59.433 1.38.67 3.181.67z" fill="#CBD8DE"/><path d="M11.818 38.037c1.65 0 3.115-.066 4.04-.164-.07.193-.152.344-.24.426-.035.037-.113.07-.148.098-.925.082-2.195.13-3.652.13a46.22 46.22 0 01-3.539-.118c-.04-.033-.126-.07-.17-.11-.096-.082-.179-.23-.253-.418.934.099 2.36.156 3.962.156z" fill="#F2FAFF"/><path d="M11.988 12.194c-2.203 0-4.285.446-6.109 1.227.787-6.961 3.5-7.18 3.5-7.18h5.192s3.125.319 3.5 7.172a15.493 15.493 0 00-6.083-1.22z" fill="#F9FDFF"/><g transform="matrix(0 1 1 0 5.834 37.517)"><use fill="#B92E4D" xlink:href="#prefix__i"/><use fill-opacity=".7" fill="url(#prefix__j)" xlink:href="#prefix__i"/></g><g transform="matrix(0 1 1 0 11.438 37.517)"><use fill="#B92E4D" xlink:href="#prefix__k"/><use fill-opacity=".7" fill="url(#prefix__l)" xlink:href="#prefix__k"/></g><path d="M18.41 36.274c-.038.25-.082.454-.13.642-.092.372-.419.655-.82.712-1.475.208-3.434.421-5.581.421-2.086 0-3.988-.204-5.446-.405a.975.975 0 01-.824-.708 8.903 8.903 0 01-.135-.642c1.522.25 3.826.41 6.405.41 2.648 0 5.009-.168 6.532-.43z" fill="#DFECF2"/><path d="M16.216 36.711c-.947.487-2.487.7-4.232.7-1.698 0-3.207-.196-4.159-.663-.44-.83-.663-2.643-.663-2.643l-.009-.184c.773.708 2.645 1.203 4.83 1.203 2.243 0 4.159-.524 4.892-1.26l-.013.241c0-.004-.218 1.764-.646 2.606zM7.447 23.93a20.12 20.12 0 00-.294-2.442v-.065c1.538-.32 3.167-.649 4.862-.649 1.675 0 3.294.326 4.816.637a22.673 22.673 0 00-.303 2.52c-.147 2.884.02 3.314.232 5.048.006.057.026.152.056.274-1.513.278-3 .54-4.912.54-1.847 0-3.289-.25-4.75-.511v-.008c.03-.131.055-.233.06-.29.218-1.744.38-2.173.233-5.053z" fill="#F2FAFF"/><path d="M12.067 19.716l-4.645.692c-.431-2.92-.832-4.36-1.202-4.324l-.21-1.297a11.732 11.732 0 016.026-1.673c.386 0-.137.05-1.569.147l1.6 6.455z" fill="#161616"/></g></g></svg>";
 const TaxiCar_css_ts_vanilla = "";
 var carIcon = "_65j3sr1";
+var hide = createRuntimeFn({ defaultClassName: "", variantClassNames: { hide: { true: "_65j3sr2", false: "_65j3sr3" } }, defaultVariants: {}, compoundVariants: [] });
 var pointInfoBoxEmphasize = "_4a4ovk5";
 var pointInfoBoxTitle = "_4a4ovk3";
 var pointLayout = "_4a4ovk0";
@@ -3973,24 +4035,43 @@ const ATaxiCar = defineSetup(function ATaxiCar2(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)`;
     if (!props.title)
-      return `<img src="${imgTaxicar}" class="${carIcon}" style="${carStyle}">`;
-    return `
+      return {
+        img: `<img src="${imgTaxicar}" class="${carIcon}" style="${carStyle}">`
+      };
+    const content = (hide$1) => `
       <div class="${pointLayout}">
-        <div class="${pointSingleInfoBox}">
+        <div class="${pointSingleInfoBox} ${hide({
+      hide: !hide$1
+    })}">
           <div class="${pointInfoBoxTitle}">${titleRow}</div>
         </div>
-        <img src="${imgTaxicar}" class="${carIcon}" style="${carStyle}">
+        <img src="${imgTaxicar}" class="${carIcon} ${hide({
+      hide: hide$1
+    })}" style="${carStyle}">
       </div>
       `;
+    return {
+      box: content(true),
+      img: content(false)
+    };
   });
-  return () => Vue.h(AmapMarker, {
+  return () => Vue.h("div", [Vue.h(AmapMarker, {
     "attrs": {
       "position": props.position,
-      "content": contentRef.value,
+      "content": contentRef.value.img,
       "anchor": "bottom-center",
-      "registerOverlay": props.registerOverlay
+      "registerOverlay": props.registerOverlay,
+      "zIndex": ZINDEX_CAR_LAYER
     }
-  });
+  }), Vue.h(AmapMarker, {
+    "attrs": {
+      "position": props.position,
+      "content": contentRef.value.box,
+      "anchor": "bottom-center",
+      "registerOverlay": props.registerOverlay,
+      "zIndex": ZINDEX_BUBBLE_LAYER
+    }
+  })]);
 });
 const GTaxiCar = defineSetup(function GTaxiCar2(props) {
   const contentRef = Vue.computed(() => {
@@ -3998,28 +4079,46 @@ const GTaxiCar = defineSetup(function GTaxiCar2(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)`;
     if (!props.title)
-      return createDom("img", {
-        class: carIcon,
-        src: imgTaxicar,
-        style: carStyle
-      });
-    return createDom("div", {
+      return {
+        img: createDom("img", {
+          class: carIcon,
+          src: imgTaxicar,
+          style: carStyle
+        })
+      };
+    const content = (hide$1) => createDom("div", {
       class: pointLayout
     }, `
-        <div class="${pointSingleInfoBox}">
+        <div class="${pointSingleInfoBox} ${hide({
+      hide: !hide$1
+    })}">
           <div class="${pointInfoBoxTitle}">${titleRow}</div>
         </div>
-        <img src="${imgTaxicar}" class="${carIcon}" style="${carStyle}">
+        <img src="${imgTaxicar}" class="${carIcon} ${hide({
+      hide: hide$1
+    })}" style="${carStyle}">
       `);
+    return {
+      box: content(true),
+      img: content(false)
+    };
   });
   return () => {
-    return Vue.h(GmapAdvancedMarkerView, {
+    return Vue.h("div", [Vue.h(GmapAdvancedMarkerView, {
       "attrs": {
         "position": vec2lnglat(props.position),
-        "content": contentRef.value,
-        "registerOverlay": props.registerOverlay
+        "content": contentRef.value.img,
+        "registerOverlay": props.registerOverlay,
+        "zIndex": ZINDEX_CAR_LAYER
       }
-    });
+    }), Vue.h(GmapAdvancedMarkerView, {
+      "attrs": {
+        "position": vec2lnglat(props.position),
+        "content": contentRef.value.box,
+        "registerOverlay": props.registerOverlay,
+        "zIndex": ZINDEX_BUBBLE_LAYER
+      }
+    })]);
   };
 });
 const TaxiCar = defineSetup(function TaxiCar2(props) {
@@ -4258,7 +4357,10 @@ const WaveCircle = defineSetup(function WaveCircle2(props) {
     });
   };
 });
-const PASSENGER_DISTANCE_LIMIT = 2e3;
+const PASSENGER_DISTANCE_MAX = 2e3;
+const PASSENGER_DISTANCE_MIN = 10;
+const CAR_DISTANCE_MIN = 100;
+const carDurationWithinMinDistance = (distance) => Math.floor(distance / 5);
 const SectionDispatching = defineSetup(function SectionDispatching2(props) {
   return () => {
     const {
@@ -4320,7 +4422,7 @@ const SectionConfirmed = defineSetup(function SectionConfirmed2(props) {
     }), Vue.h(ConditionalFittablePassengerCircle, {
       "attrs": {
         "position": passengerPosition,
-        "condition": !!passengerDistance && passengerDistance < PASSENGER_DISTANCE_LIMIT,
+        "condition": !!passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX,
         "registerOverlay": registerOverlay
       }
     }), Vue.h(StartEndPoint, {
@@ -4368,10 +4470,11 @@ const SectionDriverStartService = defineSetup(function SectionDriverStartService
     } = props;
     const from = place2point(fromPlace);
     const passengerDistance = passengerPosition ? apiMapDistance(passengerPosition, from) : void 0;
+    const carDistance = carPosition ? apiMapDistance(carPosition, from) : void 0;
     return Vue.h("div", [Vue.h(ConditionalFittablePassengerCircle, {
       "attrs": {
         "position": passengerPosition,
-        "condition": !!passengerDistance && passengerDistance < PASSENGER_DISTANCE_LIMIT,
+        "condition": !!passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX,
         "registerOverlay": registerOverlay
       }
     }), Vue.h(StartEndPoint, {
@@ -4386,7 +4489,7 @@ const SectionDriverStartService = defineSetup(function SectionDriverStartService
         "label": fromPlace.name,
         "hideIcon": true
       }
-    }), carPosition[0] !== from[0] || carPosition[1] !== from[1] ? Vue.h(DrivingRoute, {
+    }), !carPosition || !carDistance ? null : carDistance > CAR_DISTANCE_MIN ? Vue.h(DrivingRoute, {
       "attrs": {
         "from": carPosition,
         "to": from,
@@ -4414,7 +4517,21 @@ const SectionDriverStartService = defineSetup(function SectionDriverStartService
           }
         })]
       }
-    }) : null, !!passengerPosition && passengerDistance && passengerDistance < PASSENGER_DISTANCE_LIMIT && Vue.h(WalkingRoute, {
+    }) : [Vue.h(TaxiCar, {
+      "attrs": {
+        "position": carPosition,
+        "title": renderTitle({
+          distance: carDistance,
+          duration: carDurationWithinMinDistance(carDistance)
+        }),
+        "registerOverlay": registerOverlay
+      }
+    }), Vue.h(KeyedFitView, {
+      "attrs": {
+        "registerOverlay": registerOverlay,
+        "fitViewKey": JSON.stringify(carPosition)
+      }
+    })], !!passengerPosition && passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX && passengerDistance > PASSENGER_DISTANCE_MIN && Vue.h(WalkingRoute, {
       "attrs": {
         "from": passengerPosition,
         "to": from,
@@ -4459,7 +4576,7 @@ const SectionBookDispatched = defineSetup(function SectionBookDispatched2(props)
           }
         })
       }
-    }), !!passengerPosition && passengerDistance && passengerDistance < PASSENGER_DISTANCE_LIMIT && Vue.h(WalkingRoute, {
+    }), !!passengerPosition && passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX && passengerDistance > PASSENGER_DISTANCE_MIN && Vue.h(WalkingRoute, {
       "attrs": {
         "from": passengerPosition,
         "to": from,
@@ -4474,7 +4591,7 @@ const SectionBookDispatched = defineSetup(function SectionBookDispatched2(props)
     }), Vue.h(ConditionalFittablePassengerCircle, {
       "attrs": {
         "position": passengerPosition,
-        "condition": !!passengerDistance && passengerDistance < PASSENGER_DISTANCE_LIMIT,
+        "condition": !!passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX,
         "registerOverlay": registerOverlay
       }
     }), Vue.h(StartEndPoint, {
@@ -4522,7 +4639,7 @@ const SectionDriverArrived = defineSetup(function SectionDriverArrived2(props) {
     } = props;
     const from = place2point(fromPlace);
     const passengerDistance = passengerPosition ? apiMapDistance(passengerPosition, from) : void 0;
-    return Vue.h("div", [!!passengerPosition && passengerDistance && passengerDistance < PASSENGER_DISTANCE_LIMIT && Vue.h(WalkingRoute, {
+    return Vue.h("div", [!!passengerPosition && passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX && passengerDistance > PASSENGER_DISTANCE_MIN && Vue.h(WalkingRoute, {
       "attrs": {
         "from": passengerPosition,
         "to": from,
@@ -4537,16 +4654,21 @@ const SectionDriverArrived = defineSetup(function SectionDriverArrived2(props) {
     }), Vue.h(ConditionalFittablePassengerCircle, {
       "attrs": {
         "position": passengerPosition,
-        "condition": !!passengerDistance && passengerDistance < PASSENGER_DISTANCE_LIMIT,
+        "condition": !!passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX,
         "registerOverlay": registerOverlay
       }
-    }), Vue.h(TaxiCar, {
+    }), !!carPosition && [Vue.h(TaxiCar, {
       "attrs": {
         "position": carPosition,
         "title": title,
         "registerOverlay": registerOverlay
       }
-    }), Vue.h(StartEndPoint, {
+    }), Vue.h(KeyedFitView, {
+      "attrs": {
+        "registerOverlay": registerOverlay,
+        "fitViewKey": JSON.stringify(carPosition)
+      }
+    })], Vue.h(StartEndPoint, {
       "attrs": {
         "type": "start",
         "position": from,
@@ -4574,7 +4696,11 @@ const SectionInService = defineSetup(function SectionInService2(props) {
       registerOverlay
     } = props;
     const to = place2point(toPlace);
-    return Vue.h("div", [Vue.h(DrivingRoute, {
+    const {
+      apiMapDistance
+    } = useMapGeometry();
+    const carDistance = carPosition ? apiMapDistance(carPosition, to) : void 0;
+    return Vue.h("div", [!carPosition || !carDistance ? null : carDistance > CAR_DISTANCE_MIN ? Vue.h(DrivingRoute, {
       "attrs": {
         "from": carPosition,
         "to": to,
@@ -4602,7 +4728,21 @@ const SectionInService = defineSetup(function SectionInService2(props) {
           }
         })]
       }
-    }), Vue.h(StartEndPoint, {
+    }) : [Vue.h(TaxiCar, {
+      "attrs": {
+        "position": carPosition,
+        "title": renderTitle({
+          distance: carDistance,
+          duration: carDurationWithinMinDistance(carDistance)
+        }),
+        "registerOverlay": registerOverlay
+      }
+    }), Vue.h(KeyedFitView, {
+      "attrs": {
+        "registerOverlay": registerOverlay,
+        "fitViewKey": JSON.stringify(carPosition)
+      }
+    })], Vue.h(StartEndPoint, {
       "attrs": {
         "type": "end",
         "position": to,
@@ -4756,7 +4896,6 @@ const BusinessTaxiEndMap = defineSetup(function BusinessTaxiEndMap2(props) {
 const STATUS_NEED_CAR_POSITION = ["book-driverStartService", "dispatched", "driverStartService", "inService", "driverArrived"];
 const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap2(props) {
   const {
-    from,
     interval,
     registerOverlay,
     mapRef,
@@ -4768,10 +4907,8 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
   const {
     geoPosition,
     geoError
-  } = useGeoLocation({
-    geoDefaultPosition: place2point(from)
-  });
-  const carPositionRef = Vue.ref(place2point(props.from));
+  } = useGeoLocation();
+  const carPositionRef = Vue.ref();
   Vue.watch(() => props.driverStatus, (status, _, onCleanup) => {
     if (!STATUS_NEED_CAR_POSITION.includes(status))
       return;
@@ -4785,7 +4922,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
   return () => {
     const {
       driverStatus,
-      from: from2,
+      from,
       to,
       dispatchingTitle,
       bookDispatchingTitle,
@@ -4796,7 +4933,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
     const passengerPosition = geoError.value ? void 0 : geoPosition.value;
     return Vue.h(HeycarMap, {
       "attrs": {
-        "center": place2point(from2),
+        "center": place2point(from),
         "zoom": 13,
         "mapRef": mapRef,
         "touchEnable": touchEnable
@@ -4806,26 +4943,26 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }, [driverStatus === "dispatching" ? Vue.h(SectionDispatching, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "title": dispatchingTitle,
         "registerOverlay": registerOverlay
       }
     }) : driverStatus === "book-dispatching" ? Vue.h(SectionDispatching, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "title": bookDispatchingTitle,
         "registerOverlay": registerOverlay
       }
     }) : driverStatus === "assign" || driverStatus === "confirmed" ? Vue.h(SectionConfirmed, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "to": to,
         "passengerPosition": passengerPosition,
         "registerOverlay": registerOverlay
       }
     }) : driverStatus === "dispatched" || driverStatus === "driverStartService" || driverStatus === "book-driverStartService" ? Vue.h(SectionDriverStartService, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "carPosition": carPosition,
         "passengerPosition": passengerPosition,
         "renderTitle": renderStartSerivceTitle,
@@ -4833,7 +4970,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }) : driverStatus === "book-dispatched" ? Vue.h(SectionBookDispatched, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "to": to,
         "passengerPosition": passengerPosition,
         "registerOverlay": registerOverlay
@@ -4847,7 +4984,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }) : driverStatus === "driverArrived" ? Vue.h(SectionDriverArrived, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "carPosition": carPosition,
         "passengerPosition": passengerPosition,
         "title": driverArrivedTitle,
@@ -4855,13 +4992,13 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }) : driverStatus === "canceled" || driverStatus === "canceling" ? Vue.h(SectionCanceled, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "to": to,
         "registerOverlay": registerOverlay
       }
     }) : driverStatus === "endService" || driverStatus === "completed" || driverStatus === "banlanceRefund" || driverStatus === "waitBanlanceRefund" || driverStatus === "rechargePayed" || driverStatus === "waitRechargePay" || driverStatus === "payed" || driverStatus === "waitpay" || driverStatus === "refund" ? Vue.h(SectionEndService, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "to": to,
         "registerOverlay": registerOverlay
       }
@@ -4869,7 +5006,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       // 匹配不到就显示灰色路线
       Vue.h(SectionEndService, {
         "attrs": {
-          "from": from2,
+          "from": from,
           "to": to,
           "registerOverlay": registerOverlay
         }