@heycar/heycars-map 0.9.23-alpha7 → 0.9.23-alpha9

package/README.md

@@ -47,7 +47,6 @@ export type Place = {
   lat: number;
   name: string;
   displayName: string;
-  photo?: string;
 };
 
 export interface Zone {

package/dist/index.cjs

@@ -19,7 +19,7 @@ if (typeof GeolocationPositionError === "undefined") {
   };
 }
 const name = "@heycar/heycars-map";
-const version = "0.9.23-alpha7";
+const version = "0.9.23-alpha9";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -4451,9 +4451,11 @@ const watchVisibilityState = () => {
 class QueryWxSignatureStatus {
   constructor(timeout) {
     __publicField(this, "error");
-    __publicField(this, "timeout");
     __publicField(this, "status", "PENDING");
-    __publicField(this, "pendingStatusPromise", new Promise((resolve, reject) => {
+    __publicField(this, "pendingStatusPromise");
+    __publicField(this, "timoutStatusPromise", Promise.resolve("TIMEOUT"));
+    __publicField(this, "readyStatusPromise", Promise.resolve("READY"));
+    this.pendingStatusPromise = new Promise((resolve, reject) => {
       wx == null ? void 0 : wx.ready(() => {
         this.status = "READY";
         resolve("READY");
@@ -4468,11 +4470,8 @@ class QueryWxSignatureStatus {
           return;
         this.status = "TIMEOUT";
         resolve("TIMEOUT");
-      }, this.timeout);
-    }));
-    __publicField(this, "timoutStatusPromise", Promise.resolve("TIMEOUT"));
-    __publicField(this, "readyStatusPromise", Promise.resolve("READY"));
-    this.timeout = timeout;
+      }, timeout);
+    });
   }
   get statusPromise() {
     switch (this.status) {
@@ -7373,7 +7372,7 @@ const useMapRecomendPlace = (props) => {
         force,
         zone: zone2
       } = await findAttachedPlace({ lng, lat, name: "", displayName: "" });
-      if (!isPointEqual(place2point(closestPlace), point)) {
+      if (isPlacesInclude(candidates, closestPlace)) {
         return { place: { ...closestPlace }, zone: zone2, available, candidates, force };
       }
       const regeoPlace = await reGeoPlacePromise;
@@ -8033,13 +8032,13 @@ const ConditionalFittablePassengerCircle = defineSetup(function ConditionalFitta
   };
 });
 const usePointsLabelDirection = (props) => {
-  const { widthLimit, heightLimit } = props;
+  const { widthLimit, getHeightLimit } = props;
   const mapRef = useMap();
   const { apiMapLngLatToVw } = useMapLngLatToVw({ mapRef });
   const { zoomRef } = useMapZoom({ mapRef });
   const diffVw = (from, to) => {
-    const [x1, y1] = apiMapLngLatToVw(from);
-    const [x2, y2] = apiMapLngLatToVw(to);
+    const [x1, y1] = apiMapLngLatToVw(lnglat2point(from));
+    const [x2, y2] = apiMapLngLatToVw(lnglat2point(to));
     return [x2 - x1, y2 - y1];
   };
   const directionsRef = Vue.ref([]);
@@ -8062,14 +8061,14 @@ const usePointsLabelDirection = (props) => {
         basePlace,
         sortedPlaces,
         widthLimit,
-        heightLimit,
-        distanceFn: diffVw
+        getHeightLimit,
+        placeDistanceFn: diffVw
       });
       const directions = createLabelDirections({
-        sortedPoints: noOverlapPlaces.map(place2point),
+        sortedPlaces: noOverlapPlaces,
         widthLimit,
-        heightLimit,
-        distanceFn: diffVw
+        getHeightLimit,
+        placeDistanceFn: diffVw
       });
       directionsRef.value = directions;
       labeledPlacesRef.value = noOverlapPlaces;
@@ -8078,8 +8077,8 @@ const usePointsLabelDirection = (props) => {
   return { directionsRef, labeledPlacesRef, isContainBasePlaceRef };
 };
 function createLabelDirections(props) {
-  const { sortedPoints, widthLimit, heightLimit, distanceFn } = props;
-  const len = sortedPoints.length;
+  const { sortedPlaces, widthLimit, getHeightLimit, placeDistanceFn } = props;
+  const len = sortedPlaces.length;
   const result = [];
   const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2, isNextLimited, dx) => {
     spaceLog(
@@ -8119,16 +8118,18 @@ function createLabelDirections(props) {
       continue;
     }
     if (idx === 0) {
-      const [dx2, dy2] = distanceFn(sortedPoints[idx], sortedPoints[idx + 1]);
-      isLimited = dx2 > -widthLimit && dx2 < widthLimit && dy2 > -heightLimit && dy2 < heightLimit;
-      isDoubleLimited = dx2 > -widthLimit * 2 && dx2 < widthLimit * 2 && dy2 > -heightLimit && dy2 < heightLimit;
+      const [dx2, dy2] = placeDistanceFn(sortedPlaces[idx], sortedPlaces[idx + 1]);
+      const heightLimit2 = getHeightLimit(sortedPlaces[idx], sortedPlaces[idx + 1]);
+      isLimited = dx2 > -widthLimit && dx2 < widthLimit && dy2 > -heightLimit2 && dy2 < heightLimit2;
+      isDoubleLimited = dx2 > -widthLimit * 2 && dx2 < widthLimit * 2 && dy2 > -heightLimit2 && dy2 < heightLimit2;
       const direction2 = !isLimited ? "right" : dx2 > 0 ? "left" : "right";
       result.push(direction2);
       prevDirection = direction2;
       prevDx = dx2;
       continue;
     }
-    const [dx, dy] = distanceFn(sortedPoints[idx], sortedPoints[idx + 1]);
+    const [dx, dy] = placeDistanceFn(sortedPlaces[idx], sortedPlaces[idx + 1]);
+    const heightLimit = getHeightLimit(sortedPlaces[idx], sortedPlaces[idx + 1]);
     const isNextLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
     const direction = calcDirection(
       isLimited,
@@ -8147,9 +8148,10 @@ function createLabelDirections(props) {
   return result;
 }
 function filterNoOverlapPlaces(props) {
-  const { basePlace, sortedPlaces, widthLimit, heightLimit, distanceFn } = props;
+  const { basePlace, sortedPlaces, widthLimit, getHeightLimit, placeDistanceFn } = props;
   const measureOverlap = (place1, place2) => {
-    const [dx, dy] = distanceFn(place2point(place1), place2point(place2));
+    const [dx, dy] = placeDistanceFn(place1, place2);
+    const heightLimit = getHeightLimit(place1, place2);
     const isOverlap = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
     spaceLog(
       "filterNoOverlapPlaces",
@@ -8166,7 +8168,7 @@ function filterNoOverlapPlaces(props) {
   let overlapPlaces = findRelation(nextPlaces, measureOverlap);
   while (overlapPlaces.length > 0) {
     const maxPlace = findMax(overlapPlaces, (place) => {
-      const [dx, dy] = distanceFn(place2point(place), place2point(basePlace));
+      const [dx, dy] = placeDistanceFn(place, basePlace);
       return dx * dx + dy * dy;
     });
     nextPlaces = nextPlaces.filter((place) => !isPlaceEqual(maxPlace, place));
@@ -8244,7 +8246,7 @@ var labelLayout = "fhyw8b";
 var labelStroke = "fhyw8d fhyw8c";
 var placeCircleLayout = createRuntimeFn({ defaultClassName: "fhyw80", variantClassNames: { textAlign: { left: "fhyw81", right: "fhyw82" } }, defaultVariants: {}, compoundVariants: [] });
 var placeIcon = createRuntimeFn({ defaultClassName: "fhyw88", variantClassNames: { hideIcon: { true: "fhyw89", false: "fhyw8a" } }, defaultVariants: {}, compoundVariants: [] });
-var tag = createRuntimeFn({ defaultClassName: "fhyw8e", variantClassNames: { textAlign: { left: "fhyw8f", right: "fhyw8g" } }, defaultVariants: {}, compoundVariants: [] });
+var tag = "fhyw8e";
 const DEFAULT_TEXT_ALIGN = "right";
 const APlaceCircle = defineSetup(function APlaceCircle2(props, {
   emit
@@ -8255,9 +8257,7 @@ const APlaceCircle = defineSetup(function APlaceCircle2(props, {
       hideIcon = false,
       textAlign = DEFAULT_TEXT_ALIGN
     } = props;
-    const tagArea = tag$1 ? `<div class="${tag({
-      textAlign
-    })}">${tag$1}</div>` : "";
+    const tagArea = tag$1 ? `<div class="${tag}">${tag$1}</div>` : "";
     return `
         <div class="APlaceCircle ${placeCircleLayout({
       textAlign
@@ -8315,9 +8315,7 @@ const GPlaceCircle = defineSetup(function GPlaceCircle2(props, {
       hideIcon = false,
       textAlign = DEFAULT_TEXT_ALIGN
     } = props;
-    const tagArea = tag$1 ? `<div class="${tag({
-      textAlign
-    })}">${tag$1}</div>` : "";
+    const tagArea = tag$1 ? `<div class="${tag}">${tag$1}</div>` : "";
     return createDom("div", {
       class: `GPlaceCircle ${placeCircleLayout({
         textAlign
@@ -8376,6 +8374,9 @@ const PlaceCircle = defineSetup(function PlaceCircle2(props, {
     });
   };
 });
+const REGULAR_PLACE_WIDTH_LIMIT = 34;
+const REGULAR_PLACE_HEIGHT_LIMIT = 9;
+const TAGED_PLACE_HEIGHT_LIMIT = 14;
 const PickupPoints = defineSetup(function PickupPoints2(props, {
   emit
 }) {
@@ -8385,6 +8386,10 @@ const PickupPoints = defineSetup(function PickupPoints2(props, {
   } = useMapZoom({
     mapRef
   });
+  const getHeightLimit = (place) => {
+    var _a;
+    return ((_a = props.renderPlaceTag) == null ? void 0 : _a.call(props, place)) ? TAGED_PLACE_HEIGHT_LIMIT : REGULAR_PLACE_HEIGHT_LIMIT;
+  };
   const {
     directionsRef,
     labeledPlacesRef,
@@ -8392,8 +8397,8 @@ const PickupPoints = defineSetup(function PickupPoints2(props, {
   } = usePointsLabelDirection(Vue.reactive({
     basePlace: Vue.toRef(props, "basePlace"),
     places: Vue.toRef(props, "places"),
-    heightLimit: 9,
-    widthLimit: 34,
+    getHeightLimit,
+    widthLimit: REGULAR_PLACE_WIDTH_LIMIT,
     skip: Vue.toRef(props, "noLabel")
   }));
   return () => {

package/dist/index.js

@@ -17,7 +17,7 @@ if (typeof GeolocationPositionError === "undefined") {
   };
 }
 const name = "@heycar/heycars-map";
-const version = "0.9.23-alpha7";
+const version = "0.9.23-alpha9";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -4449,9 +4449,11 @@ const watchVisibilityState = () => {
 class QueryWxSignatureStatus {
   constructor(timeout) {
     __publicField(this, "error");
-    __publicField(this, "timeout");
     __publicField(this, "status", "PENDING");
-    __publicField(this, "pendingStatusPromise", new Promise((resolve, reject) => {
+    __publicField(this, "pendingStatusPromise");
+    __publicField(this, "timoutStatusPromise", Promise.resolve("TIMEOUT"));
+    __publicField(this, "readyStatusPromise", Promise.resolve("READY"));
+    this.pendingStatusPromise = new Promise((resolve, reject) => {
       wx == null ? void 0 : wx.ready(() => {
         this.status = "READY";
         resolve("READY");
@@ -4466,11 +4468,8 @@ class QueryWxSignatureStatus {
           return;
         this.status = "TIMEOUT";
         resolve("TIMEOUT");
-      }, this.timeout);
-    }));
-    __publicField(this, "timoutStatusPromise", Promise.resolve("TIMEOUT"));
-    __publicField(this, "readyStatusPromise", Promise.resolve("READY"));
-    this.timeout = timeout;
+      }, timeout);
+    });
   }
   get statusPromise() {
     switch (this.status) {
@@ -7371,7 +7370,7 @@ const useMapRecomendPlace = (props) => {
         force,
         zone: zone2
       } = await findAttachedPlace({ lng, lat, name: "", displayName: "" });
-      if (!isPointEqual(place2point(closestPlace), point)) {
+      if (isPlacesInclude(candidates, closestPlace)) {
         return { place: { ...closestPlace }, zone: zone2, available, candidates, force };
       }
       const regeoPlace = await reGeoPlacePromise;
@@ -8031,13 +8030,13 @@ const ConditionalFittablePassengerCircle = defineSetup(function ConditionalFitta
   };
 });
 const usePointsLabelDirection = (props) => {
-  const { widthLimit, heightLimit } = props;
+  const { widthLimit, getHeightLimit } = props;
   const mapRef = useMap();
   const { apiMapLngLatToVw } = useMapLngLatToVw({ mapRef });
   const { zoomRef } = useMapZoom({ mapRef });
   const diffVw = (from, to) => {
-    const [x1, y1] = apiMapLngLatToVw(from);
-    const [x2, y2] = apiMapLngLatToVw(to);
+    const [x1, y1] = apiMapLngLatToVw(lnglat2point(from));
+    const [x2, y2] = apiMapLngLatToVw(lnglat2point(to));
     return [x2 - x1, y2 - y1];
   };
   const directionsRef = ref([]);
@@ -8060,14 +8059,14 @@ const usePointsLabelDirection = (props) => {
         basePlace,
         sortedPlaces,
         widthLimit,
-        heightLimit,
-        distanceFn: diffVw
+        getHeightLimit,
+        placeDistanceFn: diffVw
       });
       const directions = createLabelDirections({
-        sortedPoints: noOverlapPlaces.map(place2point),
+        sortedPlaces: noOverlapPlaces,
         widthLimit,
-        heightLimit,
-        distanceFn: diffVw
+        getHeightLimit,
+        placeDistanceFn: diffVw
       });
       directionsRef.value = directions;
       labeledPlacesRef.value = noOverlapPlaces;
@@ -8076,8 +8075,8 @@ const usePointsLabelDirection = (props) => {
   return { directionsRef, labeledPlacesRef, isContainBasePlaceRef };
 };
 function createLabelDirections(props) {
-  const { sortedPoints, widthLimit, heightLimit, distanceFn } = props;
-  const len = sortedPoints.length;
+  const { sortedPlaces, widthLimit, getHeightLimit, placeDistanceFn } = props;
+  const len = sortedPlaces.length;
   const result = [];
   const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2, isNextLimited, dx) => {
     spaceLog(
@@ -8117,16 +8116,18 @@ function createLabelDirections(props) {
       continue;
     }
     if (idx === 0) {
-      const [dx2, dy2] = distanceFn(sortedPoints[idx], sortedPoints[idx + 1]);
-      isLimited = dx2 > -widthLimit && dx2 < widthLimit && dy2 > -heightLimit && dy2 < heightLimit;
-      isDoubleLimited = dx2 > -widthLimit * 2 && dx2 < widthLimit * 2 && dy2 > -heightLimit && dy2 < heightLimit;
+      const [dx2, dy2] = placeDistanceFn(sortedPlaces[idx], sortedPlaces[idx + 1]);
+      const heightLimit2 = getHeightLimit(sortedPlaces[idx], sortedPlaces[idx + 1]);
+      isLimited = dx2 > -widthLimit && dx2 < widthLimit && dy2 > -heightLimit2 && dy2 < heightLimit2;
+      isDoubleLimited = dx2 > -widthLimit * 2 && dx2 < widthLimit * 2 && dy2 > -heightLimit2 && dy2 < heightLimit2;
       const direction2 = !isLimited ? "right" : dx2 > 0 ? "left" : "right";
       result.push(direction2);
       prevDirection = direction2;
       prevDx = dx2;
       continue;
     }
-    const [dx, dy] = distanceFn(sortedPoints[idx], sortedPoints[idx + 1]);
+    const [dx, dy] = placeDistanceFn(sortedPlaces[idx], sortedPlaces[idx + 1]);
+    const heightLimit = getHeightLimit(sortedPlaces[idx], sortedPlaces[idx + 1]);
     const isNextLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
     const direction = calcDirection(
       isLimited,
@@ -8145,9 +8146,10 @@ function createLabelDirections(props) {
   return result;
 }
 function filterNoOverlapPlaces(props) {
-  const { basePlace, sortedPlaces, widthLimit, heightLimit, distanceFn } = props;
+  const { basePlace, sortedPlaces, widthLimit, getHeightLimit, placeDistanceFn } = props;
   const measureOverlap = (place1, place2) => {
-    const [dx, dy] = distanceFn(place2point(place1), place2point(place2));
+    const [dx, dy] = placeDistanceFn(place1, place2);
+    const heightLimit = getHeightLimit(place1, place2);
     const isOverlap = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
     spaceLog(
       "filterNoOverlapPlaces",
@@ -8164,7 +8166,7 @@ function filterNoOverlapPlaces(props) {
   let overlapPlaces = findRelation(nextPlaces, measureOverlap);
   while (overlapPlaces.length > 0) {
     const maxPlace = findMax(overlapPlaces, (place) => {
-      const [dx, dy] = distanceFn(place2point(place), place2point(basePlace));
+      const [dx, dy] = placeDistanceFn(place, basePlace);
       return dx * dx + dy * dy;
     });
     nextPlaces = nextPlaces.filter((place) => !isPlaceEqual(maxPlace, place));
@@ -8242,7 +8244,7 @@ var labelLayout = "fhyw8b";
 var labelStroke = "fhyw8d fhyw8c";
 var placeCircleLayout = createRuntimeFn({ defaultClassName: "fhyw80", variantClassNames: { textAlign: { left: "fhyw81", right: "fhyw82" } }, defaultVariants: {}, compoundVariants: [] });
 var placeIcon = createRuntimeFn({ defaultClassName: "fhyw88", variantClassNames: { hideIcon: { true: "fhyw89", false: "fhyw8a" } }, defaultVariants: {}, compoundVariants: [] });
-var tag = createRuntimeFn({ defaultClassName: "fhyw8e", variantClassNames: { textAlign: { left: "fhyw8f", right: "fhyw8g" } }, defaultVariants: {}, compoundVariants: [] });
+var tag = "fhyw8e";
 const DEFAULT_TEXT_ALIGN = "right";
 const APlaceCircle = defineSetup(function APlaceCircle2(props, {
   emit
@@ -8253,9 +8255,7 @@ const APlaceCircle = defineSetup(function APlaceCircle2(props, {
       hideIcon = false,
       textAlign = DEFAULT_TEXT_ALIGN
     } = props;
-    const tagArea = tag$1 ? `<div class="${tag({
-      textAlign
-    })}">${tag$1}</div>` : "";
+    const tagArea = tag$1 ? `<div class="${tag}">${tag$1}</div>` : "";
     return `
         <div class="APlaceCircle ${placeCircleLayout({
       textAlign
@@ -8313,9 +8313,7 @@ const GPlaceCircle = defineSetup(function GPlaceCircle2(props, {
       hideIcon = false,
       textAlign = DEFAULT_TEXT_ALIGN
     } = props;
-    const tagArea = tag$1 ? `<div class="${tag({
-      textAlign
-    })}">${tag$1}</div>` : "";
+    const tagArea = tag$1 ? `<div class="${tag}">${tag$1}</div>` : "";
     return createDom("div", {
       class: `GPlaceCircle ${placeCircleLayout({
         textAlign
@@ -8374,6 +8372,9 @@ const PlaceCircle = defineSetup(function PlaceCircle2(props, {
     });
   };
 });
+const REGULAR_PLACE_WIDTH_LIMIT = 34;
+const REGULAR_PLACE_HEIGHT_LIMIT = 9;
+const TAGED_PLACE_HEIGHT_LIMIT = 14;
 const PickupPoints = defineSetup(function PickupPoints2(props, {
   emit
 }) {
@@ -8383,6 +8384,10 @@ const PickupPoints = defineSetup(function PickupPoints2(props, {
   } = useMapZoom({
     mapRef
   });
+  const getHeightLimit = (place) => {
+    var _a;
+    return ((_a = props.renderPlaceTag) == null ? void 0 : _a.call(props, place)) ? TAGED_PLACE_HEIGHT_LIMIT : REGULAR_PLACE_HEIGHT_LIMIT;
+  };
   const {
     directionsRef,
     labeledPlacesRef,
@@ -8390,8 +8395,8 @@ const PickupPoints = defineSetup(function PickupPoints2(props, {
   } = usePointsLabelDirection(reactive({
     basePlace: toRef(props, "basePlace"),
     places: toRef(props, "places"),
-    heightLimit: 9,
-    widthLimit: 34,
+    getHeightLimit,
+    widthLimit: REGULAR_PLACE_WIDTH_LIMIT,
     skip: toRef(props, "noLabel")
   }));
   return () => {

package/dist/src/business-components/PlaceCircle/PlaceCircle.css.d.ts

@@ -37,13 +37,4 @@ export declare const placeIcon: import("@vanilla-extract/recipes").RuntimeFn<{
 export declare const labelLayout: string;
 export declare const label: string;
 export declare const labelStroke: string;
-export declare const tag: import("@vanilla-extract/recipes").RuntimeFn<{
-    textAlign: {
-        left: {
-            right: number;
-        };
-        right: {
-            left: number;
-        };
-    };
-}>;
+export declare const tag: string;

package/dist/src/hooks/usePlacesLabelDirection.d.ts

@@ -1,10 +1,11 @@
 import type { Place } from "../types/interface";
 export type LabelDirection = "left" | "right";
+type GetHeightLimitFn = (p1: Place, p2: Place) => number;
 export interface UsePointsLabelDirectionProps {
     basePlace: Place;
     places: Place[];
     widthLimit: number;
-    heightLimit: number;
+    getHeightLimit: GetHeightLimitFn;
     skip: boolean;
 }
 export declare const usePointsLabelDirection: (props: UsePointsLabelDirectionProps) => {
@@ -17,3 +18,4 @@ export declare const usePointsLabelDirection: (props: UsePointsLabelDirectionPro
     }[]>;
     isContainBasePlaceRef: import("vue-demi").Ref<boolean>;
 };
+export {};

package/dist/src/utils/QueryWxSignatureStatus.d.ts

@@ -1,7 +1,6 @@
 export type WxSignatureStatus = "PENDING" | "READY" | "TIMEOUT" | "FAIL";
 export declare class QueryWxSignatureStatus {
     private error;
-    private timeout;
     private status;
     private pendingStatusPromise;
     private timoutStatusPromise;

package/dist/style.css

@@ -46,6 +46,7 @@
   font-weight: 400;
   color: #FFFFFF;
   line-height: 3.73vw;
+  letter-spacing: 0.2vw;
 }
 .n8tgem6 {
   display: flex;
@@ -351,6 +352,7 @@ a[title*="Google"]>div>img[alt="Google"], .gmnoprint {
 }
 .fhyw8e {
   position: absolute;
+  left: 0;
   bottom: -5.07vw;
   padding: 0 1.07vw;
   height: 4vw;
@@ -363,12 +365,6 @@ a[title*="Google"]>div>img[alt="Google"], .gmnoprint {
   color: #FFFFFF;
   line-height: 4vw;
   background: #4C88FF;
-}
-.fhyw8f {
-  right: 0;
-}
-.fhyw8g {
-  left: 0;
 }._65j3sr1 {
   margin-top: 1.87vw;
   margin-bottom: -5.5vw;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "0.9.23-alpha7",
+  "version": "0.9.23-alpha9",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js"