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

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-alpha8";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -8033,13 +8033,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 +8062,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 +8078,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 +8119,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 +8149,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 +8169,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));
@@ -8376,6 +8379,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 +8391,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 +8402,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-alpha8";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -8031,13 +8031,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 +8060,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 +8076,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 +8117,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 +8147,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 +8167,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));
@@ -8374,6 +8377,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 +8389,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 +8400,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/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/package.json

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