@heycar/heycars-map 0.6.4 → 0.6.5

package/dist/index.cjs

@@ -884,8 +884,8 @@ createComparator(function() {
 createComparator(createCircularEqualCreator());
 createComparator(createCircularEqualCreator(sameValueZeroEqual));
 const vec2lnglat = ([lng, lat]) => ({
-  lng,
-  lat
+  lng: Number(lng),
+  lat: Number(lat)
 });
 const decodeAsterisk = (encodedValue) => {
   const result = [];
@@ -912,7 +912,7 @@ const language2vectorMapForeign = (lang) => {
       return "style_zh_cn";
   }
 };
-const place2point = (place) => [place.lng, place.lat];
+const place2point = (place) => [Number(place.lng), Number(place.lat)];
 const pipeAsync = (fn) => (...args) => {
   Promise.resolve().then(() => fn == null ? void 0 : fn(...args));
 };
@@ -943,6 +943,15 @@ const isPlaceEqual = (p1, p2) => {
 const isPointEqual = (p1, p2) => {
   return p1[0] === (p2 == null ? void 0 : p2[0]) && p1[1] === (p2 == null ? void 0 : p2[1]);
 };
+const toPlaceType = (maybePlace) => {
+  const lng = Number(maybePlace.lng);
+  if (isNaN(lng))
+    throw new Error("MyError: expect lng to be number");
+  const lat = Number(maybePlace.lat);
+  if (isNaN(lat))
+    throw new Error("MyError: expect lat to be number");
+  return { lng, lat, name: maybePlace.name };
+};
 const deepCompareEqualsForMaps = createComparator((deepEqual) => (a, b) => {
   if (isLatLngLiteral(a) || isLatLngLiteral(b)) {
     return new google.maps.LatLng(a).equals(new google.maps.LatLng(b));
@@ -2213,12 +2222,12 @@ const HeycarMap = defineLagecySetup(function HeycarMap2(props, {
           "attrs": {
             "mapRef": setMap,
             "mapId": gmapId,
-            "center": center ? vec2lnglat(center.map(Number)) : void 0,
+            "center": center ? vec2lnglat(center) : void 0,
             "zoom": zoom,
             "disableDefaultUI": true,
             "clickableIcons": false,
             "disableDoubleClickZoom": touchEnable,
-            "gestureHandling": touchEnable ? "auto" : "none",
+            "gestureHandling": touchEnable ? "greedy" : "none",
             "keyboardShortcuts": touchEnable,
             "touchZoomCenter": touchZoomCenter
           },
@@ -3948,8 +3957,9 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     centerSource.source = "api";
     updatePlace(point);
   };
-  const setCenterPlaceByUserSpecified = async (place) => {
+  const setCenterPlaceByUserSpecified = async (input) => {
     centerSource.source = "api";
+    const place = toPlaceType(input);
     centerPlace.lng = place.lng;
     centerPlace.lat = place.lat;
     centerPlace.name = place.name;
@@ -5011,10 +5021,12 @@ const BusinessTaxiEndMap = defineSetup(function BusinessTaxiEndMap2(props) {
   const deferedSetFitView = pipeDefer(registerFitVeiw.setFitView);
   return () => {
     const {
-      from,
-      to
+      from: inputFrom,
+      to: inputTo
     } = props;
-    const isReady = isPlace(from) && isPlace(to);
+    const isReady = isPlace(inputFrom) && isPlace(inputTo);
+    const from = toPlaceType(inputFrom);
+    const to = toPlaceType(inputTo);
     const center = isReady ? place2point(from) : [...BEIJIN_POINT];
     return Vue.h(HeycarMap, {
       "attrs": {
@@ -5078,12 +5090,14 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
   return () => {
     const {
       driverStatus,
-      from,
-      to,
+      from: inputFrom,
+      to: inputTo,
       dispatchingTitle,
       bookDispatchingTitle,
       driverArrivedTitle
     } = props;
+    const from = toPlaceType(inputFrom);
+    const to = toPlaceType(inputTo);
     const carPosition = carPositionRef.value;
     const carAngle = carAngleRef.value;
     const touchEnable = !["canceled", "canceling", "completed", "endService", "waitpay", "waitRechargePay", "refund", "rechargePayed", "payed"].includes(driverStatus);

package/dist/index.js

@@ -882,8 +882,8 @@ createComparator(function() {
 createComparator(createCircularEqualCreator());
 createComparator(createCircularEqualCreator(sameValueZeroEqual));
 const vec2lnglat = ([lng, lat]) => ({
-  lng,
-  lat
+  lng: Number(lng),
+  lat: Number(lat)
 });
 const decodeAsterisk = (encodedValue) => {
   const result = [];
@@ -910,7 +910,7 @@ const language2vectorMapForeign = (lang) => {
       return "style_zh_cn";
   }
 };
-const place2point = (place) => [place.lng, place.lat];
+const place2point = (place) => [Number(place.lng), Number(place.lat)];
 const pipeAsync = (fn) => (...args) => {
   Promise.resolve().then(() => fn == null ? void 0 : fn(...args));
 };
@@ -941,6 +941,15 @@ const isPlaceEqual = (p1, p2) => {
 const isPointEqual = (p1, p2) => {
   return p1[0] === (p2 == null ? void 0 : p2[0]) && p1[1] === (p2 == null ? void 0 : p2[1]);
 };
+const toPlaceType = (maybePlace) => {
+  const lng = Number(maybePlace.lng);
+  if (isNaN(lng))
+    throw new Error("MyError: expect lng to be number");
+  const lat = Number(maybePlace.lat);
+  if (isNaN(lat))
+    throw new Error("MyError: expect lat to be number");
+  return { lng, lat, name: maybePlace.name };
+};
 const deepCompareEqualsForMaps = createComparator((deepEqual) => (a, b) => {
   if (isLatLngLiteral(a) || isLatLngLiteral(b)) {
     return new google.maps.LatLng(a).equals(new google.maps.LatLng(b));
@@ -2211,12 +2220,12 @@ const HeycarMap = defineLagecySetup(function HeycarMap2(props, {
           "attrs": {
             "mapRef": setMap,
             "mapId": gmapId,
-            "center": center ? vec2lnglat(center.map(Number)) : void 0,
+            "center": center ? vec2lnglat(center) : void 0,
             "zoom": zoom,
             "disableDefaultUI": true,
             "clickableIcons": false,
             "disableDoubleClickZoom": touchEnable,
-            "gestureHandling": touchEnable ? "auto" : "none",
+            "gestureHandling": touchEnable ? "greedy" : "none",
             "keyboardShortcuts": touchEnable,
             "touchZoomCenter": touchZoomCenter
           },
@@ -3946,8 +3955,9 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     centerSource.source = "api";
     updatePlace(point);
   };
-  const setCenterPlaceByUserSpecified = async (place) => {
+  const setCenterPlaceByUserSpecified = async (input) => {
     centerSource.source = "api";
+    const place = toPlaceType(input);
     centerPlace.lng = place.lng;
     centerPlace.lat = place.lat;
     centerPlace.name = place.name;
@@ -5009,10 +5019,12 @@ const BusinessTaxiEndMap = defineSetup(function BusinessTaxiEndMap2(props) {
   const deferedSetFitView = pipeDefer(registerFitVeiw.setFitView);
   return () => {
     const {
-      from,
-      to
+      from: inputFrom,
+      to: inputTo
     } = props;
-    const isReady = isPlace(from) && isPlace(to);
+    const isReady = isPlace(inputFrom) && isPlace(inputTo);
+    const from = toPlaceType(inputFrom);
+    const to = toPlaceType(inputTo);
     const center = isReady ? place2point(from) : [...BEIJIN_POINT];
     return h(HeycarMap, {
       "attrs": {
@@ -5076,12 +5088,14 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
   return () => {
     const {
       driverStatus,
-      from,
-      to,
+      from: inputFrom,
+      to: inputTo,
       dispatchingTitle,
       bookDispatchingTitle,
       driverArrivedTitle
     } = props;
+    const from = toPlaceType(inputFrom);
+    const to = toPlaceType(inputTo);
     const carPosition = carPositionRef.value;
     const carAngle = carAngleRef.value;
     const touchEnable = !["canceled", "canceling", "completed", "endService", "waitpay", "waitRechargePay", "refund", "rechargePayed", "payed"].includes(driverStatus);

package/dist/style.css

@@ -126,6 +126,10 @@ a[title*="Google"]>div>img[alt="Google"], .gmnoprint {
 }
 ._7anfuo0 [class*="marker-view"] {
   will-change: unset !important;
+}
+._7anfuo0 a, ._7anfuo0 img, ._7anfuo0 div, ._7anfuo0 button {
+  -webkit-tap-highlight-color: transparent;
+  outline: none;
 }._4a4ovk0 {
   margin-bottom: -0.4vw;
   display: flex;

package/dist/utils/transform.d.ts

@@ -16,3 +16,8 @@ export declare const pipeDefer: <P extends any[], R>(fn: (...args: P) => R) => (
 export declare const pipeOnlyLastEffect: <P extends any[], R>(fn: (...arg: P) => Promise<R>) => (...args: P) => Promise<R>;
 export declare const isPlaceEqual: (p1: Place, p2?: Place) => boolean;
 export declare const isPointEqual: (p1: Point, p2?: Point) => boolean;
+export declare const toPlaceType: (maybePlace: {
+    name: string;
+    lng: string | number;
+    lat: string | number;
+}) => Place;

package/package.json

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

package/todo.md

@@ -120,3 +120,12 @@ https://dawchihliou.github.io/articles/building-custom-google-maps-marker-react-
 - 5546
 - 5541
 - 5540
+
+  0.6.5
+
+- 5640
+- 5631
+- 5614
+- 5598
+- 5567
+- 5560