@heycar/heycars-map 0.5.5 → 0.5.7

package/dist/hooks/useDrivingRoute.d.ts

@@ -7,10 +7,20 @@ export declare const useADrivingRoute: (props: UseDrivingRouteProps) => {
     path: [number, number][];
     distance: number;
     duration: number;
+    steps: {
+        path: [number, number][];
+        duration: number;
+        distance: number;
+    }[];
 };
 export declare const useGDrivingRoute: (props: UseDrivingRouteProps) => {
     path: [number, number][];
     distance: number;
     duration: number;
+    steps: {
+        path: [number, number][];
+        duration: number;
+        distance: number;
+    }[];
 };
 export declare const useDrivingRoute: (props: UseDrivingRouteProps) => Route;

package/dist/hooks/useDrivingTrackCorrection.d.ts

@@ -0,0 +1,17 @@
+import type { Point, Route } from "../types/interface";
+interface UseDrivingTrackCorrectionProps {
+    track: Point[];
+    route: Route;
+    onDeviation: (point: Point) => any;
+}
+export declare const useDrivingTrackCorrection: (props: UseDrivingTrackCorrectionProps) => {
+    path: [number, number][];
+    distance: number;
+    duration: number;
+    steps: {
+        path: [number, number][];
+        duration: number;
+        distance: number;
+    }[];
+};
+export {};

package/dist/hooks/useMapGeometry.d.ts

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

package/dist/index.cjs

@@ -2324,7 +2324,7 @@ const DrivingLine = defineSetup(function DrivingLine2(props) {
   };
 });
 const useADrivingRoute = (props) => {
-  const outputRoute = Vue.reactive({ path: [], distance: 0, duration: 0 });
+  const outputRoute = Vue.reactive({ path: [], distance: 0, duration: 0, steps: [] });
   const amapDriving = new AMap.Driving({});
   watchPostEffectForDeepOption(
     () => {
@@ -2341,21 +2341,29 @@ const useADrivingRoute = (props) => {
             case "complete": {
               let path = [];
               const drivingResult = result;
+              const routeSteps = [];
               const firstRoute = drivingResult.routes[0];
               for (const step of firstRoute.steps) {
                 const basicStep = step;
                 const stepPath = basicStep.path.map(({ lng, lat }) => [lng, lat]);
                 path = path.concat(stepPath);
+                routeSteps.push({
+                  path: basicStep.path.map(({ lng, lat }) => [lng, lat]),
+                  duration: basicStep.time,
+                  distance: basicStep.distance
+                });
               }
               outputRoute.path = path;
               outputRoute.distance = firstRoute.distance;
               outputRoute.duration = firstRoute.time;
+              outputRoute.steps = routeSteps;
               return;
             }
             case "no_data":
               outputRoute.path = [];
               outputRoute.distance = 0;
               outputRoute.duration = 0;
+              outputRoute.steps = [];
               return;
             default:
               throw result;
@@ -2367,7 +2375,7 @@ const useADrivingRoute = (props) => {
   return outputRoute;
 };
 const useGDrivingRoute = (props) => {
-  const outputRoute = Vue.reactive({ path: [], distance: 0, duration: 0 });
+  const outputRoute = Vue.reactive({ path: [], distance: 0, duration: 0, steps: [] });
   const gmapDirectionsService = new google.maps.DirectionsService();
   watchPostEffectForDeepOption(
     () => ({ ...props }),
@@ -2379,25 +2387,31 @@ const useGDrivingRoute = (props) => {
           travelMode: google.maps.TravelMode.DRIVING
         },
         (result, status) => {
-          var _a, _b, _c, _d;
+          var _a, _b, _c, _d, _e, _f, _g, _h;
           switch (status) {
             case google.maps.DirectionsStatus.OK: {
               let path = [];
               let distance = 0;
               let duration = 0;
+              const routeSteps = [];
               const firstRoute = result.routes[0];
-              const stepPath = firstRoute.overview_path.map((item) => [
-                item.lng(),
-                item.lat()
-              ]);
-              path = path.concat(stepPath);
               for (const leg of firstRoute.legs) {
                 distance += (_b = (_a = leg.distance) == null ? void 0 : _a.value) != null ? _b : 0;
                 duration += (_d = (_c = leg.duration) == null ? void 0 : _c.value) != null ? _d : 0;
+                for (const step of leg.steps) {
+                  const stepPath = step.path.map(({ lng, lat }) => [lng(), lat()]);
+                  path = path.concat(stepPath);
+                  routeSteps.push({
+                    path: stepPath,
+                    distance: (_f = (_e = step.distance) == null ? void 0 : _e.value) != null ? _f : 0,
+                    duration: (_h = (_g = step.duration) == null ? void 0 : _g.value) != null ? _h : 0
+                  });
+                }
               }
               outputRoute.path = path;
               outputRoute.distance = distance;
               outputRoute.duration = duration;
+              outputRoute.steps = routeSteps;
               return;
             }
             case google.maps.DirectionsStatus.ZERO_RESULTS:
@@ -2405,6 +2419,7 @@ const useGDrivingRoute = (props) => {
               outputRoute.path = [];
               outputRoute.distance = 0;
               outputRoute.duration = 0;
+              outputRoute.steps = [];
               return;
             default:
               throw new Error(status);
@@ -2549,11 +2564,20 @@ const useAmapFitView = (props) => {
     },
     setFitView
   };
-  const handleMoveEndOrZomEnd = () => {
+  const handleDraggingOrZoomChange = () => {
+    if (!autoFitTimeout || !timer)
+      return;
+    clearTimeout(timer);
+    timer = void 0;
+  };
+  const handleMoveEndOrZomEnd = (eventName) => {
+    spaceLog("useAmapFitViewHandleMoveEndOrZomEnd", "eventName = ", eventName);
     if (!autoFitTimeout)
       return;
-    if (timer)
+    if (timer) {
       clearTimeout(timer);
+      timer = void 0;
+    }
     timer = setTimeout(() => {
       timer = void 0;
       setFitView();
@@ -2563,7 +2587,13 @@ const useAmapFitView = (props) => {
     mapRef,
     {},
     handleMoveEndOrZomEnd,
-    ["onDragEnd"]
+    ["onDragEnd", "onZoomEnd"]
+  );
+  watchPostEffectForAMapEvent(
+    mapRef,
+    {},
+    handleDraggingOrZoomChange,
+    ["onDragging", "onZoomchange"]
   );
   return { registerFitVeiw, setFitView };
 };
@@ -2608,6 +2638,12 @@ const useGmapFitView = (props) => {
     },
     setFitView
   };
+  const handleDrag = () => {
+    if (!autoFitTimeout || !timer)
+      return;
+    clearTimeout(timer);
+    timer = void 0;
+  };
   const handleMoveEnd = () => {
     const eventSource = getMapEvnetSource();
     if (!autoFitTimeout || eventSource !== "user")
@@ -2626,6 +2662,9 @@ const useGmapFitView = (props) => {
   watchPostEffectForGMapEvent(mapRef, {}, handleZoomChange, [
     "onZoom_changed"
   ]);
+  watchPostEffectForGMapEvent(mapRef, {}, handleDrag, [
+    "onDrag"
+  ]);
   return { registerFitVeiw, setFitView };
 };
 const useMapFitView = (props) => {
@@ -3232,7 +3271,6 @@ const useAmapPlace = (props) => {
             const cityName = addressComponent.city ? addressComponent.city : addressComponent.province;
             const cityParentName = addressComponent.province;
             const name = formattedAddress ? formattedAddress : emptyPlaceName;
-            console.log("geocoder.getAddress status, name, lng, lat = ", status, name, lng, lat);
             place.name = name;
             place.lng = lng;
             place.lat = lat;
@@ -3244,8 +3282,8 @@ const useAmapPlace = (props) => {
             place.name = emptyPlaceName;
             place.lng = lng;
             place.lat = lat;
-            console.log("geocoder.getAddress status, name, lng, lat = ", status, "", lng, lat);
             onChange == null ? void 0 : onChange({ lng, lat, name: "" });
+            onChangeCity == null ? void 0 : onChangeCity({ cityName: "", cityParentName: "", countryName: "" });
             return;
           case "error":
             throw result;
@@ -4088,7 +4126,12 @@ const useAmapGeometry = () => {
       return void 0;
     return AMap.GeometryUtil.distance(from, to);
   };
-  return { apiMapDistance };
+  const apiMapDistanceToLine = (from, line) => {
+    if (payload.status !== Status.SUCCESS)
+      return void 0;
+    return AMap.GeometryUtil.distanceToLine(from, line);
+  };
+  return { apiMapDistance, apiMapDistanceToLine };
 };
 const useGmapGeometry = () => {
   const payload = useMapSupplier();
@@ -4097,7 +4140,12 @@ const useGmapGeometry = () => {
       return void 0;
     return google.maps.geometry.spherical.computeDistanceBetween(vec2lnglat(from), vec2lnglat(to));
   };
-  return { apiMapDistance };
+  const apiMapDistanceToLine = (from, line) => {
+    if (payload.status !== Status.SUCCESS)
+      return void 0;
+    return 0;
+  };
+  return { apiMapDistance, apiMapDistanceToLine };
 };
 const useMapGeometry = () => {
   const { supplier } = useMapSupplier();

package/dist/index.js

@@ -2322,7 +2322,7 @@ const DrivingLine = defineSetup(function DrivingLine2(props) {
   };
 });
 const useADrivingRoute = (props) => {
-  const outputRoute = reactive({ path: [], distance: 0, duration: 0 });
+  const outputRoute = reactive({ path: [], distance: 0, duration: 0, steps: [] });
   const amapDriving = new AMap.Driving({});
   watchPostEffectForDeepOption(
     () => {
@@ -2339,21 +2339,29 @@ const useADrivingRoute = (props) => {
             case "complete": {
               let path = [];
               const drivingResult = result;
+              const routeSteps = [];
               const firstRoute = drivingResult.routes[0];
               for (const step of firstRoute.steps) {
                 const basicStep = step;
                 const stepPath = basicStep.path.map(({ lng, lat }) => [lng, lat]);
                 path = path.concat(stepPath);
+                routeSteps.push({
+                  path: basicStep.path.map(({ lng, lat }) => [lng, lat]),
+                  duration: basicStep.time,
+                  distance: basicStep.distance
+                });
               }
               outputRoute.path = path;
               outputRoute.distance = firstRoute.distance;
               outputRoute.duration = firstRoute.time;
+              outputRoute.steps = routeSteps;
               return;
             }
             case "no_data":
               outputRoute.path = [];
               outputRoute.distance = 0;
               outputRoute.duration = 0;
+              outputRoute.steps = [];
               return;
             default:
               throw result;
@@ -2365,7 +2373,7 @@ const useADrivingRoute = (props) => {
   return outputRoute;
 };
 const useGDrivingRoute = (props) => {
-  const outputRoute = reactive({ path: [], distance: 0, duration: 0 });
+  const outputRoute = reactive({ path: [], distance: 0, duration: 0, steps: [] });
   const gmapDirectionsService = new google.maps.DirectionsService();
   watchPostEffectForDeepOption(
     () => ({ ...props }),
@@ -2377,25 +2385,31 @@ const useGDrivingRoute = (props) => {
           travelMode: google.maps.TravelMode.DRIVING
         },
         (result, status) => {
-          var _a, _b, _c, _d;
+          var _a, _b, _c, _d, _e, _f, _g, _h;
           switch (status) {
             case google.maps.DirectionsStatus.OK: {
               let path = [];
               let distance = 0;
               let duration = 0;
+              const routeSteps = [];
               const firstRoute = result.routes[0];
-              const stepPath = firstRoute.overview_path.map((item) => [
-                item.lng(),
-                item.lat()
-              ]);
-              path = path.concat(stepPath);
               for (const leg of firstRoute.legs) {
                 distance += (_b = (_a = leg.distance) == null ? void 0 : _a.value) != null ? _b : 0;
                 duration += (_d = (_c = leg.duration) == null ? void 0 : _c.value) != null ? _d : 0;
+                for (const step of leg.steps) {
+                  const stepPath = step.path.map(({ lng, lat }) => [lng(), lat()]);
+                  path = path.concat(stepPath);
+                  routeSteps.push({
+                    path: stepPath,
+                    distance: (_f = (_e = step.distance) == null ? void 0 : _e.value) != null ? _f : 0,
+                    duration: (_h = (_g = step.duration) == null ? void 0 : _g.value) != null ? _h : 0
+                  });
+                }
               }
               outputRoute.path = path;
               outputRoute.distance = distance;
               outputRoute.duration = duration;
+              outputRoute.steps = routeSteps;
               return;
             }
             case google.maps.DirectionsStatus.ZERO_RESULTS:
@@ -2403,6 +2417,7 @@ const useGDrivingRoute = (props) => {
               outputRoute.path = [];
               outputRoute.distance = 0;
               outputRoute.duration = 0;
+              outputRoute.steps = [];
               return;
             default:
               throw new Error(status);
@@ -2547,11 +2562,20 @@ const useAmapFitView = (props) => {
     },
     setFitView
   };
-  const handleMoveEndOrZomEnd = () => {
+  const handleDraggingOrZoomChange = () => {
+    if (!autoFitTimeout || !timer)
+      return;
+    clearTimeout(timer);
+    timer = void 0;
+  };
+  const handleMoveEndOrZomEnd = (eventName) => {
+    spaceLog("useAmapFitViewHandleMoveEndOrZomEnd", "eventName = ", eventName);
     if (!autoFitTimeout)
       return;
-    if (timer)
+    if (timer) {
       clearTimeout(timer);
+      timer = void 0;
+    }
     timer = setTimeout(() => {
       timer = void 0;
       setFitView();
@@ -2561,7 +2585,13 @@ const useAmapFitView = (props) => {
     mapRef,
     {},
     handleMoveEndOrZomEnd,
-    ["onDragEnd"]
+    ["onDragEnd", "onZoomEnd"]
+  );
+  watchPostEffectForAMapEvent(
+    mapRef,
+    {},
+    handleDraggingOrZoomChange,
+    ["onDragging", "onZoomchange"]
   );
   return { registerFitVeiw, setFitView };
 };
@@ -2606,6 +2636,12 @@ const useGmapFitView = (props) => {
     },
     setFitView
   };
+  const handleDrag = () => {
+    if (!autoFitTimeout || !timer)
+      return;
+    clearTimeout(timer);
+    timer = void 0;
+  };
   const handleMoveEnd = () => {
     const eventSource = getMapEvnetSource();
     if (!autoFitTimeout || eventSource !== "user")
@@ -2624,6 +2660,9 @@ const useGmapFitView = (props) => {
   watchPostEffectForGMapEvent(mapRef, {}, handleZoomChange, [
     "onZoom_changed"
   ]);
+  watchPostEffectForGMapEvent(mapRef, {}, handleDrag, [
+    "onDrag"
+  ]);
   return { registerFitVeiw, setFitView };
 };
 const useMapFitView = (props) => {
@@ -3230,7 +3269,6 @@ const useAmapPlace = (props) => {
             const cityName = addressComponent.city ? addressComponent.city : addressComponent.province;
             const cityParentName = addressComponent.province;
             const name = formattedAddress ? formattedAddress : emptyPlaceName;
-            console.log("geocoder.getAddress status, name, lng, lat = ", status, name, lng, lat);
             place.name = name;
             place.lng = lng;
             place.lat = lat;
@@ -3242,8 +3280,8 @@ const useAmapPlace = (props) => {
             place.name = emptyPlaceName;
             place.lng = lng;
             place.lat = lat;
-            console.log("geocoder.getAddress status, name, lng, lat = ", status, "", lng, lat);
             onChange == null ? void 0 : onChange({ lng, lat, name: "" });
+            onChangeCity == null ? void 0 : onChangeCity({ cityName: "", cityParentName: "", countryName: "" });
             return;
           case "error":
             throw result;
@@ -4086,7 +4124,12 @@ const useAmapGeometry = () => {
       return void 0;
     return AMap.GeometryUtil.distance(from, to);
   };
-  return { apiMapDistance };
+  const apiMapDistanceToLine = (from, line) => {
+    if (payload.status !== Status.SUCCESS)
+      return void 0;
+    return AMap.GeometryUtil.distanceToLine(from, line);
+  };
+  return { apiMapDistance, apiMapDistanceToLine };
 };
 const useGmapGeometry = () => {
   const payload = useMapSupplier();
@@ -4095,7 +4138,12 @@ const useGmapGeometry = () => {
       return void 0;
     return google.maps.geometry.spherical.computeDistanceBetween(vec2lnglat(from), vec2lnglat(to));
   };
-  return { apiMapDistance };
+  const apiMapDistanceToLine = (from, line) => {
+    if (payload.status !== Status.SUCCESS)
+      return void 0;
+    return 0;
+  };
+  return { apiMapDistance, apiMapDistanceToLine };
 };
 const useMapGeometry = () => {
   const { supplier } = useMapSupplier();

package/dist/types/interface.d.ts

@@ -29,9 +29,15 @@ export interface RegisterOverlay<T> {
     remove: (overlay: T) => void;
     setFitView: () => void;
 }
+export interface RouteStep {
+    path: Point[];
+    duration: number;
+    distance: number;
+}
 export interface Route {
     path: Point[];
     distance: number;
     duration: number;
+    steps: RouteStep[];
 }
 export type DriverStatus = "dispatching" | "book-dispatching" | "dispatched" | "driverStartService" | "book-driverStartService" | "book-dispatched" | "driverArrived" | "inService" | "canceled" | "endService" | "completed" | "canceling" | "banlanceRefund" | "waitBanlanceRefund" | "rechargePayed" | "waitRechargePay" | "payed" | "waitpay" | "refund" | "confirmed" | "assign";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "type": "module",
   "scripts": {
     "dev": "vite -c vite.config.dev.ts",

package/todo.md

@@ -97,3 +97,7 @@ https://dawchihliou.github.io/articles/building-custom-google-maps-marker-react-
 
 - 4977
 - 5381
+
+  0.5.6
+
+- 5455