@heycar/heycars-map 0.5.4 → 0.5.5

package/dist/Demo/DemoBusinessTaxiService.d.ts

@@ -2052,5 +2052,8 @@ export declare const DemoBusinessTaxiService: import("vue").DefineComponent<Read
     status: DriverStatus;
     contentHeight: number;
 }, {}, {
-    getDriverPosition(): Promise<Point>;
+    getDriverPosition(): Promise<{
+        position: Point;
+        angle: number;
+    }>;
 }, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<Readonly<{}>>>, {}>;

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

@@ -18,6 +18,9 @@ export type BusinessTaxiServiceMapProps = Omit<HeycarMapProps, "center" | "zoom"
         distance: number;
         duration: number;
     }) => string;
-    getDriverPosition: () => Promise<Point>;
+    getDriverPosition: () => Promise<{
+        position: Point;
+        angle?: number;
+    }>;
 };
 export declare const BusinessTaxiServiceMap: import("vue-demi").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<BusinessTaxiServiceMapProps>, 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<BusinessTaxiServiceMapProps, Required<BusinessTaxiServiceMapProps>>, "resize" | "dragEnd" | "zoomEnd", BusinessTaxiServiceMapProps, {} | {}>;

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

@@ -15,6 +15,7 @@ export declare const SectionConfirmed: import("vue").DefineComponent<import("vue
 type SectionDriverStartServiceProps = Required<MROP> & {
     passengerPosition?: Point;
     carPosition?: Point;
+    carAngle?: number;
     from: Place;
     renderTitle: (props: Pick<DrivingRouteRenderProps, "duration" | "distance">) => string;
 };
@@ -28,6 +29,7 @@ export declare const SectionBookDispatched: import("vue").DefineComponent<import
 type SectionDriverArrivedProps = Required<MROP> & {
     from: Place;
     carPosition?: Point;
+    carAngle?: number;
     passengerPosition?: Point;
     title: string;
 };
@@ -35,6 +37,7 @@ export declare const SectionDriverArrived: import("vue").DefineComponent<import(
 type SectionInServiceProps = Required<MROP> & {
     to: Place;
     carPosition?: Point;
+    carAngle?: number;
     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/index.cjs

@@ -2425,7 +2425,8 @@ const amapComputeHeading = (from, to, map) => {
   const { x: xFrom, y: yFrom } = map.lngLatToContainer(from);
   const { x: xTo, y: yTo } = map.lngLatToContainer(to);
   const theta = Math.atan2(yFrom - yTo, xTo - xFrom);
-  return (Math.PI / 2 - theta) / Math.PI * 180;
+  const signedAngle = (Math.PI / 2 - theta) / Math.PI * 180;
+  return signedAngle < 0 ? 360 + signedAngle : signedAngle;
 };
 const useAmapAngle = (props) => {
   return Vue.computed(() => {
@@ -2955,6 +2956,16 @@ const isPlace = (place) => {
   return place.lng !== void 0 && place.lat !== void 0;
 };
 const sleep = (milliSeconds) => new Promise((resolve) => setTimeout(resolve, milliSeconds));
+const assertPoint = (point) => {
+  if (Array.isArray(point) && point.length === 2 && typeof point[0] === "number" && typeof point[1] === "number")
+    return;
+  throw new Error(`Assertion Error: expect type [number, number], actual is ${point}`);
+};
+const assertAngle = (angle) => {
+  if (typeof angle === "number" || typeof angle === "undefined")
+    return;
+  throw new Error(`Assertion Error: expect type number | undefined, actual is ${angle}`);
+};
 class SingleGeoWatch {
   constructor(option) {
     __publicField(this, "id", 0);
@@ -3858,7 +3869,8 @@ const DEFAULT_PLACE_NAME = "当前位置";
 const DEFAULT_ZOOM = 8;
 const READY_ZOOM = 17;
 const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlaceMap2(props, {
-  emit
+  emit,
+  slots
 }) {
   var _a, _b;
   const {
@@ -4041,7 +4053,9 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
         "center": centerPoint.value,
         "zoom": zoomRef.value,
         "touchZoomCenter": true,
-        "mapRef": setMap
+        "mapRef": setMap,
+        "fallback": slots.fallback,
+        "loading": slots.loading
       }
     }, [!geoLoading.value && !geoError.value && Vue.h(PassengerCircle, {
       "attrs": {
@@ -4535,6 +4549,7 @@ const SectionDriverStartService = defineSetup(function SectionDriverStartService
     const {
       from: fromPlace,
       carPosition,
+      carAngle,
       passengerPosition,
       renderTitle,
       registerOverlay
@@ -4566,31 +4581,37 @@ const SectionDriverStartService = defineSetup(function SectionDriverStartService
         "to": from,
         "render": ({
           path,
+          angle,
           distance,
           duration
-        }) => [Vue.h(DrivingLine, {
-          "attrs": {
-            "path": path
-          }
-        }), Vue.h(TaxiCar, {
-          "attrs": {
-            "position": carPosition,
-            "title": renderTitle({
-              distance,
-              duration
-            }),
-            "registerOverlay": registerOverlay
-          }
-        }), Vue.h(KeyedFitView, {
-          "attrs": {
-            "registerOverlay": registerOverlay,
-            "fitViewKey": JSON.stringify(carPosition)
-          }
-        })]
+        }) => {
+          spaceLog("angleDifference", "carPosition, routeAngle, driverAngle = ", carPosition, angle, carAngle);
+          return [Vue.h(DrivingLine, {
+            "attrs": {
+              "path": path
+            }
+          }), Vue.h(TaxiCar, {
+            "attrs": {
+              "position": carPosition,
+              "angle": angle,
+              "title": renderTitle({
+                distance,
+                duration
+              }),
+              "registerOverlay": registerOverlay
+            }
+          }), Vue.h(KeyedFitView, {
+            "attrs": {
+              "registerOverlay": registerOverlay,
+              "fitViewKey": JSON.stringify(carPosition)
+            }
+          })];
+        }
       }
     }) : [Vue.h(TaxiCar, {
       "attrs": {
         "position": carPosition,
+        "angle": carAngle,
         "title": renderTitle({
           distance: carDistance,
           duration: carDurationWithinMinDistance(carDistance)
@@ -4704,6 +4725,7 @@ const SectionDriverArrived = defineSetup(function SectionDriverArrived2(props) {
     const {
       from: fromPlace,
       carPosition,
+      carAngle,
       passengerPosition,
       title,
       registerOverlay
@@ -4731,6 +4753,7 @@ const SectionDriverArrived = defineSetup(function SectionDriverArrived2(props) {
     }), !!carPosition && [Vue.h(TaxiCar, {
       "attrs": {
         "position": carPosition,
+        "angle": carAngle,
         "title": title,
         "registerOverlay": registerOverlay
       }
@@ -4763,6 +4786,7 @@ const SectionInService = defineSetup(function SectionInService2(props) {
     const {
       to: toPlace,
       carPosition,
+      carAngle,
       renderTitle,
       registerOverlay
     } = props;
@@ -4777,31 +4801,37 @@ const SectionInService = defineSetup(function SectionInService2(props) {
         "to": to,
         "render": ({
           path,
+          angle,
           distance,
           duration
-        }) => [Vue.h(DrivingLine, {
-          "attrs": {
-            "path": path
-          }
-        }), Vue.h(TaxiCar, {
-          "attrs": {
-            "position": carPosition,
-            "title": renderTitle({
-              distance,
-              duration
-            }),
-            "registerOverlay": registerOverlay
-          }
-        }), Vue.h(KeyedFitView, {
-          "attrs": {
-            "registerOverlay": registerOverlay,
-            "fitViewKey": JSON.stringify(carPosition)
-          }
-        })]
+        }) => {
+          spaceLog("angleDifference", "carPosition, routeAngle, driverAngle = ", carPosition, angle, carAngle);
+          return [Vue.h(DrivingLine, {
+            "attrs": {
+              "path": path
+            }
+          }), Vue.h(TaxiCar, {
+            "attrs": {
+              "position": carPosition,
+              "angle": angle,
+              "title": renderTitle({
+                distance,
+                duration
+              }),
+              "registerOverlay": registerOverlay
+            }
+          }), Vue.h(KeyedFitView, {
+            "attrs": {
+              "registerOverlay": registerOverlay,
+              "fitViewKey": JSON.stringify(carPosition)
+            }
+          })];
+        }
       }
     }) : [Vue.h(TaxiCar, {
       "attrs": {
         "position": carPosition,
+        "angle": carAngle,
         "title": renderTitle({
           distance: carDistance,
           duration: carDurationWithinMinDistance(carDistance)
@@ -4980,12 +5010,26 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
     geoError
   } = useGeoLocation();
   const carPositionRef = Vue.ref();
+  const carAngleRef = Vue.ref();
+  const {
+    toGcj02
+  } = useMapGCJ02();
   Vue.watch(() => props.driverStatus, (status, _, onCleanup) => {
     if (!STATUS_NEED_CAR_POSITION.includes(status))
       return;
-    const timer = setInterval(() => {
-      getDriverPosition().then((pos) => carPositionRef.value = pos);
-    }, interval);
+    const update = () => {
+      getDriverPosition().then(async ({
+        position,
+        angle
+      }) => {
+        assertPoint(position);
+        assertAngle(angle);
+        carPositionRef.value = position ? await toGcj02(position) : void 0;
+        carAngleRef.value = angle;
+      });
+    };
+    const timer = setInterval(update, interval);
+    update();
     onCleanup(() => clearInterval(timer));
   }, {
     immediate: true
@@ -5000,6 +5044,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       driverArrivedTitle
     } = props;
     const carPosition = carPositionRef.value;
+    const carAngle = carAngleRef.value;
     const touchEnable = !["canceled", "canceling", "completed", "endService", "waitpay", "waitRechargePay", "refund", "rechargePayed", "payed"].includes(driverStatus);
     const passengerPosition = geoError.value ? void 0 : geoPosition.value;
     return Vue.h(HeycarMap, {
@@ -5035,6 +5080,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       "attrs": {
         "from": from,
         "carPosition": carPosition,
+        "carAngle": carAngle,
         "passengerPosition": passengerPosition,
         "renderTitle": renderStartSerivceTitle,
         "registerOverlay": registerOverlay
@@ -5050,6 +5096,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       "attrs": {
         "to": to,
         "carPosition": carPosition,
+        "carAngle": carAngle,
         "renderTitle": renderInServiceTitle,
         "registerOverlay": registerOverlay
       }
@@ -5057,6 +5104,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       "attrs": {
         "from": from,
         "carPosition": carPosition,
+        "carAngle": carAngle,
         "passengerPosition": passengerPosition,
         "title": driverArrivedTitle,
         "registerOverlay": registerOverlay

package/dist/index.js

@@ -2423,7 +2423,8 @@ const amapComputeHeading = (from, to, map) => {
   const { x: xFrom, y: yFrom } = map.lngLatToContainer(from);
   const { x: xTo, y: yTo } = map.lngLatToContainer(to);
   const theta = Math.atan2(yFrom - yTo, xTo - xFrom);
-  return (Math.PI / 2 - theta) / Math.PI * 180;
+  const signedAngle = (Math.PI / 2 - theta) / Math.PI * 180;
+  return signedAngle < 0 ? 360 + signedAngle : signedAngle;
 };
 const useAmapAngle = (props) => {
   return computed(() => {
@@ -2953,6 +2954,16 @@ const isPlace = (place) => {
   return place.lng !== void 0 && place.lat !== void 0;
 };
 const sleep = (milliSeconds) => new Promise((resolve) => setTimeout(resolve, milliSeconds));
+const assertPoint = (point) => {
+  if (Array.isArray(point) && point.length === 2 && typeof point[0] === "number" && typeof point[1] === "number")
+    return;
+  throw new Error(`Assertion Error: expect type [number, number], actual is ${point}`);
+};
+const assertAngle = (angle) => {
+  if (typeof angle === "number" || typeof angle === "undefined")
+    return;
+  throw new Error(`Assertion Error: expect type number | undefined, actual is ${angle}`);
+};
 class SingleGeoWatch {
   constructor(option) {
     __publicField(this, "id", 0);
@@ -3856,7 +3867,8 @@ const DEFAULT_PLACE_NAME = "当前位置";
 const DEFAULT_ZOOM = 8;
 const READY_ZOOM = 17;
 const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlaceMap2(props, {
-  emit
+  emit,
+  slots
 }) {
   var _a, _b;
   const {
@@ -4039,7 +4051,9 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
         "center": centerPoint.value,
         "zoom": zoomRef.value,
         "touchZoomCenter": true,
-        "mapRef": setMap
+        "mapRef": setMap,
+        "fallback": slots.fallback,
+        "loading": slots.loading
       }
     }, [!geoLoading.value && !geoError.value && h(PassengerCircle, {
       "attrs": {
@@ -4533,6 +4547,7 @@ const SectionDriverStartService = defineSetup(function SectionDriverStartService
     const {
       from: fromPlace,
       carPosition,
+      carAngle,
       passengerPosition,
       renderTitle,
       registerOverlay
@@ -4564,31 +4579,37 @@ const SectionDriverStartService = defineSetup(function SectionDriverStartService
         "to": from,
         "render": ({
           path,
+          angle,
           distance,
           duration
-        }) => [h(DrivingLine, {
-          "attrs": {
-            "path": path
-          }
-        }), h(TaxiCar, {
-          "attrs": {
-            "position": carPosition,
-            "title": renderTitle({
-              distance,
-              duration
-            }),
-            "registerOverlay": registerOverlay
-          }
-        }), h(KeyedFitView, {
-          "attrs": {
-            "registerOverlay": registerOverlay,
-            "fitViewKey": JSON.stringify(carPosition)
-          }
-        })]
+        }) => {
+          spaceLog("angleDifference", "carPosition, routeAngle, driverAngle = ", carPosition, angle, carAngle);
+          return [h(DrivingLine, {
+            "attrs": {
+              "path": path
+            }
+          }), h(TaxiCar, {
+            "attrs": {
+              "position": carPosition,
+              "angle": angle,
+              "title": renderTitle({
+                distance,
+                duration
+              }),
+              "registerOverlay": registerOverlay
+            }
+          }), h(KeyedFitView, {
+            "attrs": {
+              "registerOverlay": registerOverlay,
+              "fitViewKey": JSON.stringify(carPosition)
+            }
+          })];
+        }
       }
     }) : [h(TaxiCar, {
       "attrs": {
         "position": carPosition,
+        "angle": carAngle,
         "title": renderTitle({
           distance: carDistance,
           duration: carDurationWithinMinDistance(carDistance)
@@ -4702,6 +4723,7 @@ const SectionDriverArrived = defineSetup(function SectionDriverArrived2(props) {
     const {
       from: fromPlace,
       carPosition,
+      carAngle,
       passengerPosition,
       title,
       registerOverlay
@@ -4729,6 +4751,7 @@ const SectionDriverArrived = defineSetup(function SectionDriverArrived2(props) {
     }), !!carPosition && [h(TaxiCar, {
       "attrs": {
         "position": carPosition,
+        "angle": carAngle,
         "title": title,
         "registerOverlay": registerOverlay
       }
@@ -4761,6 +4784,7 @@ const SectionInService = defineSetup(function SectionInService2(props) {
     const {
       to: toPlace,
       carPosition,
+      carAngle,
       renderTitle,
       registerOverlay
     } = props;
@@ -4775,31 +4799,37 @@ const SectionInService = defineSetup(function SectionInService2(props) {
         "to": to,
         "render": ({
           path,
+          angle,
           distance,
           duration
-        }) => [h(DrivingLine, {
-          "attrs": {
-            "path": path
-          }
-        }), h(TaxiCar, {
-          "attrs": {
-            "position": carPosition,
-            "title": renderTitle({
-              distance,
-              duration
-            }),
-            "registerOverlay": registerOverlay
-          }
-        }), h(KeyedFitView, {
-          "attrs": {
-            "registerOverlay": registerOverlay,
-            "fitViewKey": JSON.stringify(carPosition)
-          }
-        })]
+        }) => {
+          spaceLog("angleDifference", "carPosition, routeAngle, driverAngle = ", carPosition, angle, carAngle);
+          return [h(DrivingLine, {
+            "attrs": {
+              "path": path
+            }
+          }), h(TaxiCar, {
+            "attrs": {
+              "position": carPosition,
+              "angle": angle,
+              "title": renderTitle({
+                distance,
+                duration
+              }),
+              "registerOverlay": registerOverlay
+            }
+          }), h(KeyedFitView, {
+            "attrs": {
+              "registerOverlay": registerOverlay,
+              "fitViewKey": JSON.stringify(carPosition)
+            }
+          })];
+        }
       }
     }) : [h(TaxiCar, {
       "attrs": {
         "position": carPosition,
+        "angle": carAngle,
         "title": renderTitle({
           distance: carDistance,
           duration: carDurationWithinMinDistance(carDistance)
@@ -4978,12 +5008,26 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
     geoError
   } = useGeoLocation();
   const carPositionRef = ref();
+  const carAngleRef = ref();
+  const {
+    toGcj02
+  } = useMapGCJ02();
   watch(() => props.driverStatus, (status, _, onCleanup) => {
     if (!STATUS_NEED_CAR_POSITION.includes(status))
       return;
-    const timer = setInterval(() => {
-      getDriverPosition().then((pos) => carPositionRef.value = pos);
-    }, interval);
+    const update = () => {
+      getDriverPosition().then(async ({
+        position,
+        angle
+      }) => {
+        assertPoint(position);
+        assertAngle(angle);
+        carPositionRef.value = position ? await toGcj02(position) : void 0;
+        carAngleRef.value = angle;
+      });
+    };
+    const timer = setInterval(update, interval);
+    update();
     onCleanup(() => clearInterval(timer));
   }, {
     immediate: true
@@ -4998,6 +5042,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       driverArrivedTitle
     } = props;
     const carPosition = carPositionRef.value;
+    const carAngle = carAngleRef.value;
     const touchEnable = !["canceled", "canceling", "completed", "endService", "waitpay", "waitRechargePay", "refund", "rechargePayed", "payed"].includes(driverStatus);
     const passengerPosition = geoError.value ? void 0 : geoPosition.value;
     return h(HeycarMap, {
@@ -5033,6 +5078,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       "attrs": {
         "from": from,
         "carPosition": carPosition,
+        "carAngle": carAngle,
         "passengerPosition": passengerPosition,
         "renderTitle": renderStartSerivceTitle,
         "registerOverlay": registerOverlay
@@ -5048,6 +5094,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       "attrs": {
         "to": to,
         "carPosition": carPosition,
+        "carAngle": carAngle,
         "renderTitle": renderInServiceTitle,
         "registerOverlay": registerOverlay
       }
@@ -5055,6 +5102,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       "attrs": {
         "from": from,
         "carPosition": carPosition,
+        "carAngle": carAngle,
         "passengerPosition": passengerPosition,
         "title": driverArrivedTitle,
         "registerOverlay": registerOverlay

package/dist/utils/helper.d.ts

@@ -1,3 +1,5 @@
 import type { Place } from "../types/interface";
 export declare const isPlace: (place: Partial<Place>) => place is Place;
 export declare const sleep: (milliSeconds: number) => Promise<unknown>;
+export declare const assertPoint: (point: unknown) => void;
+export declare const assertAngle: (angle: unknown) => void;

package/package.json

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

package/todo.md

@@ -2,10 +2,8 @@ https://dawchihliou.github.io/articles/building-custom-google-maps-marker-react-
 
 2. Google 地址名称太长
 3. 高德地图加载期间出现大量的请求
-4. 做完其他事情进入首页，变成了获取定位失败，但其实 gps 是 ok 的，因为刷新页面是有点位的
-5. map 的两个 slot loading 和 error slot 没有生效
-6. 企业微信如果关闭定位，会不停的跳 geoError 事件
-7. 司机已接单页面，title 倒计时, 1s 更新一次 title，引起 walking 接口 1s 触发
+4. map 的两个 slot loading 和 error slot 没有生效
+5. 企业微信如果关闭定位，会不停的跳 geoError 事件
 
 缩放问题
 
@@ -94,3 +92,8 @@ https://dawchihliou.github.io/articles/building-custom-google-maps-marker-react-
 
 - 5375
 - 4946
+
+  0.5.5
+
+- 4977
+- 5381