@heycar/heycars-map 0.2.4 → 0.2.5

package/src/hooks/useGeoLocation.ts

@@ -2,11 +2,13 @@ import { ref, watch } from "vue-demi";
 import type { Point } from "../types/interface";
 
 export interface UseGeoLocationProps {
+  geoDefaultPosition?: Point;
   onChange?: (value: { position: Point; coordinate: GeolocationCoordinates }) => any;
   onLoad?: (value: { position: Point; coordinate: GeolocationCoordinates }) => any;
+  onLoadDefault?: (value: { position: Point }) => any;
 }
 export const useGeoLocation = (props?: UseGeoLocationProps) => {
-  const { onChange, onLoad } = props ?? {};
+  const { onChange, onLoad, onLoadDefault } = props ?? {};
   const loading = ref(false);
   const readyRef = ref(false);
   const errorRef = ref<GeolocationPositionError>();
@@ -40,6 +42,8 @@ export const useGeoLocation = (props?: UseGeoLocationProps) => {
         (error) => {
           loading.value = false;
           errorRef.value = error;
+          const position = props?.geoDefaultPosition;
+          if (position) onLoadDefault?.({ position });
           console.log("errorRef = ", errorRef);
         },
         // todo 要不要 timeout

package/src/hooks/useMapFitView.ts

@@ -13,6 +13,11 @@ type UseAmapFitViewPropsForListeners = {
   // onZoomEnd?: MapEventHandler<AMap.Map>;
 };
 
+export interface UseMapFitViewOutput<L> {
+  setFitView: () => void;
+  registerFitVeiw: RegisterOverlay<L>;
+}
+
 export interface UseMapFitViewProps<M = AMap.Map | google.maps.Map> {
   mapRef: MapShallowRef<M>;
   padding?: [number, number, number, number];
@@ -119,7 +124,9 @@ export const useGmapFitView = (props: UseMapFitViewProps<google.maps.Map>) => {
   return { registerFitVeiw, setFitView };
 };
 
-export const useMapFitView = (props: UseMapFitViewProps) => {
+export const useMapFitView = (
+  props: UseMapFitViewProps
+): UseMapFitViewOutput<AmapOverlay> | UseMapFitViewOutput<GmapOverlay> => {
   const { supplier } = useMapSupplier();
   return supplier === "gmap"
     ? useGmapFitView(props as UseMapFitViewProps<google.maps.Map>)

package/src/hooks/useWalkingRoute.ts

@@ -19,11 +19,15 @@ export const useAWalkingRoute = (props: UseWalkingRouteProps) => {
           case "complete": {
             let path: Point[] = [];
             const walkingResult = result as AMap.WalkingResult;
-            for (const route of walkingResult.routes) {
-              for (const step of route.steps) {
-                const stepPath = step.path.map<Point>(({ lng, lat }) => [lng, lat]);
-                path = path.concat(stepPath);
-              }
+            debugger;
+            if (!walkingResult.routes) {
+              return;
+            }
+            const firstRoute = walkingResult.routes[0];
+            console.log("firstRoute = ", firstRoute);
+            for (const step of firstRoute.steps) {
+              const stepPath = step.path.map<Point>(({ lng, lat }) => [lng, lat]);
+              path = path.concat(stepPath);
             }
             pathRef.value = path;
             return;
@@ -56,10 +60,12 @@ export const useGWalkingRoute = (props: UseWalkingRouteProps) => {
           switch (status) {
             case google.maps.DirectionsStatus.OK: {
               let path: Point[] = [];
-              result?.routes.map((route) => {
-                const stepPath = route.overview_path.map<Point>((item) => [item.lng(), item.lat()]);
-                path = path.concat(stepPath);
-              });
+              const firstRoute = result!.routes[0];
+              const stepPath = firstRoute.overview_path.map<Point>((item) => [
+                item.lng(),
+                item.lat(),
+              ]);
+              path = path.concat(stepPath);
               pathRef.value = path;
               return;
             }

package/src/hooks-business/useBusinessMapRecomendPlace.ts

@@ -13,9 +13,11 @@ export interface UseBusinessMapRecomendPlaceProps
   extends Pick<UseMapRecomendPlaceProps<CenterPlaceSource>, "getRecomendPlace"> {
   mapRef: MapShallowRef;
   defaultCenterPoint?: Point;
+  geoDefaultPosition?: Point;
   recomendPlaceGeoLimit: number;
   recomendPlaceDragLimit: number;
   onLoadGeoLocation?: UseGeoLocationProps["onLoad"];
+  onLoadDefaultGeoLocation?: UseGeoLocationProps["onLoadDefault"];
   onChangeByDrag?: UseMapDragProps["onChange"];
   onChangeGeoLocation?: UseGeoLocationProps["onChange"];
   onChangePlace?: UseMapPlaceProps["onChange"];
@@ -24,11 +26,13 @@ export interface UseBusinessMapRecomendPlaceProps
 export const useBusinessMapRecomendPlace = (props: UseBusinessMapRecomendPlaceProps) => {
   const {
     mapRef,
+    geoDefaultPosition,
     getRecomendPlace,
     defaultCenterPoint,
     recomendPlaceDragLimit,
     recomendPlaceGeoLimit,
     onLoadGeoLocation,
+    onLoadDefaultGeoLocation,
     onChangeByDrag,
     onChangeGeoLocation,
     onChangePlace,
@@ -49,6 +53,11 @@ export const useBusinessMapRecomendPlace = (props: UseBusinessMapRecomendPlacePr
     centerPlace.lat = point[1];
     updatePlace();
   };
+  const setCenterByPlace = (place: Place) => {
+    centerSource.source = "api";
+    centerPlace.lng = place.lng;
+    centerPlace.lat = place.lat;
+  };
   if (defaultCenterPoint) {
     // default 主入口
     readyPromise.then(() => {
@@ -57,6 +66,7 @@ export const useBusinessMapRecomendPlace = (props: UseBusinessMapRecomendPlacePr
     });
   }
   const { geoLoading, geoError, geoPosition, geoCoordinate, geoReady } = useGeoLocation({
+    geoDefaultPosition,
     onLoad: async (value) => {
       // geo 主入口
       // 如果设置了默认位置，就不在拿 gps 作为默认位置
@@ -69,6 +79,18 @@ export const useBusinessMapRecomendPlace = (props: UseBusinessMapRecomendPlacePr
       }
       onLoadGeoLocation?.(value);
     },
+    onLoadDefault: async (value) => {
+      // geo default position 主入口
+      // 如果设置了默认位置，就不在拿 gps 作为默认位置
+      if (!defaultCenterPoint) {
+        await readyPromise;
+        centerSource.source = "geo";
+        centerPlace.lng = value.position[0];
+        centerPlace.lat = value.position[1];
+        updatePlace();
+      }
+      onLoadDefaultGeoLocation?.(value);
+    },
     onChange: onChangeGeoLocation,
   });
   const { isDragging } = useMapDrag({
@@ -123,5 +145,6 @@ export const useBusinessMapRecomendPlace = (props: UseBusinessMapRecomendPlacePr
     centerPoint,
     placeCandidates,
     setCenterPlaceByRecomand,
+    setCenterByPlace,
   };
 };

package/src/index.ts

@@ -1,5 +1,6 @@
 import "./style.css";
 export { AddressBox } from "./business-components/AddressBox";
+export { BusinessTaxiServiceMap } from "./business-components/BusinessTaxiServiceMap";
 export { DrivingLine } from "./business-components/DrivingLine";
 export { DrivingRoute } from "./business-components/DrivingRoute";
 export { PassengerCircle } from "./business-components/PassengerCircle";

package/src/types/interface.ts

@@ -34,3 +34,15 @@ export interface Route {
   distance: number;
   duration: number;
 }
+
+export type DriverStatus =
+  | "dispatching"
+  | "book-dispatching"
+  | "dispatched"
+  | "driverStartService"
+  | "book-driverStartService"
+  | "book-dispatched"
+  | "driverArrived"
+  | "inService"
+  | "canceled"
+  | "endService";

package/src/utils/compare.ts

@@ -162,7 +162,10 @@ export function watchPostEffectForAMapEvent<
   });
 }
 
-export function watchPostEffectForGMapEvent<T extends google.maps.MVCObject, P>(
+export function watchPostEffectForGMapEvent<
+  T extends google.maps.MVCObject | google.maps.marker.AdvancedMarkerView,
+  P
+>(
   targetRef: ShallowRef<T | undefined> | Ref<T | undefined> | undefined,
   props: P,
   emit: EmitFn<EmitByProps<P>>,

package/todo.md

@@ -16,3 +16,10 @@ https://dawchihliou.github.io/articles/building-custom-google-maps-marker-react-
 5. home 页面用户 出发点与终点小于 200 米，需要提示，需要导出接口
 6. walkingRoute 显示报错
 7. 需要一个手段让 fitview 初始化起作用
+
+---
+
+1. locator 的气泡也要支持点击
+2. locator 气泡长度限制
+3. locator 拖动次数多了会不更新
+4. 郝瑞 searh Place 接口搜索次数多了会不更新