@heycar/heycars-map 0.8.5 → 0.8.7

package/dist/index.cjs

@@ -9,7 +9,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Vue = require("vue");
 const style = "";
 const name = "@heycar/heycars-map";
-const version = "0.8.5";
+const version = "0.8.7";
 const type = "module";
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
@@ -2224,7 +2224,6 @@ const useAmapLngLatToVw = (props) => {
     const [x1, y1] = apiMapLngLatToVw(point1);
     const [x2, y2] = apiMapLngLatToVw(point2);
     const result = Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1));
-    console.log("distance = ", result);
     return result;
   };
   return { apiMapLngLatToVw, apiMapDistanceVwOfPoints };
@@ -6085,7 +6084,6 @@ const useMapZoom = (props) => {
   const { supplier } = useMapSupplier();
   return supplier === "gmap" ? useGmapZoom(props) : useAmapZoom(props);
 };
-const reverse = (direction) => direction === "left" ? "right" : "left";
 const usePointsLabelDirection = (props) => {
   const { widthLimit, heightLimit } = props;
   const mapRef = useMap();
@@ -6115,7 +6113,7 @@ const usePointsLabelDirection = (props) => {
         distanceFn: diffVw
       });
       const directions = createLabelDirections({
-        sortedPoints: sortedPlaces.map(place2point),
+        sortedPoints: noOverlapPlaces.map(place2point),
         widthLimit,
         heightLimit,
         distanceFn: diffVw
@@ -6132,7 +6130,7 @@ function createLabelDirections(props) {
   const result = [];
   const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2) => {
     if (isLimited2)
-      return reverse(prevDirection2);
+      return prevDx2 > 0 ? "right" : "left";
     if (isDoubleLimited2 && prevDx2 < 0 && prevDirection2 === "left")
       return "left";
     return "right";
@@ -6142,6 +6140,7 @@ function createLabelDirections(props) {
   let isDoubleLimited = false;
   let prevDx = Infinity;
   for (let idx = 0; idx < len; idx++) {
+    debugger;
     if (idx === len - 1) {
       const direction2 = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
       result.push(direction2);
@@ -6195,7 +6194,7 @@ function filterNoOverlapPlaces(props) {
   }
   return nextPlaces;
 }
-const findRelation = (places, measureRelate) => {
+const findSequenceRelation = (places, measureRelate) => {
   let isPrevRelated = false;
   let isNextRelated = false;
   let isFound = false;
@@ -6237,6 +6236,14 @@ const findMax = (list, measure) => {
   }
   return list[index];
 };
+const find3ItemFullRelation = (places, measureRelate) => {
+  const [p1, p2, p3] = places;
+  const count = Number(measureRelate(p1, p2)) + Number(measureRelate(p1, p3)) + Number(measureRelate(p2, p3));
+  return count >= 2 ? places : [];
+};
+const findRelation = (places, measureRelate) => {
+  return places.length === 3 ? find3ItemFullRelation(places, measureRelate) : findSequenceRelation(places, measureRelate);
+};
 var AnchorType = /* @__PURE__ */ ((AnchorType2) => {
   AnchorType2["topLeft"] = "top-left";
   AnchorType2["topCenter"] = "top-center";
@@ -6425,8 +6432,8 @@ const PickupPoints = defineSetup(function PickupPoints2(props, {
 });
 const RECOMMEND_PLACE_DRAG_LIMIT = 10;
 const RECOMMEND_PLACE_LARGE_LIMIT = 100;
-const RECOMMEND_PLACE_ICON_ZOOM_MIN = 15.75;
-const RECOMMEND_PLACE_TEXT_ZOOM_MIN = 16.75;
+const RECOMMEND_PLACE_ICON_ZOOM_MIN = 16.25;
+const RECOMMEND_PLACE_TEXT_ZOOM_MIN = 16.25;
 const DEFAULT_PLACE_NAME = "当前位置";
 const DEFAULT_ZOOM = 17;
 const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlaceMap2(props, {

package/dist/index.js

@@ -7,7 +7,7 @@ var __publicField = (obj, key, value) => {
 import Vue, { defineComponent, h, computed, inject, provide, watch, onMounted, onUnmounted, watchPostEffect, shallowRef, ref, watchEffect, reactive, toRefs, toRef } from "vue";
 const style = "";
 const name = "@heycar/heycars-map";
-const version = "0.8.5";
+const version = "0.8.7";
 const type = "module";
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
@@ -2222,7 +2222,6 @@ const useAmapLngLatToVw = (props) => {
     const [x1, y1] = apiMapLngLatToVw(point1);
     const [x2, y2] = apiMapLngLatToVw(point2);
     const result = Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1));
-    console.log("distance = ", result);
     return result;
   };
   return { apiMapLngLatToVw, apiMapDistanceVwOfPoints };
@@ -6083,7 +6082,6 @@ const useMapZoom = (props) => {
   const { supplier } = useMapSupplier();
   return supplier === "gmap" ? useGmapZoom(props) : useAmapZoom(props);
 };
-const reverse = (direction) => direction === "left" ? "right" : "left";
 const usePointsLabelDirection = (props) => {
   const { widthLimit, heightLimit } = props;
   const mapRef = useMap();
@@ -6113,7 +6111,7 @@ const usePointsLabelDirection = (props) => {
         distanceFn: diffVw
       });
       const directions = createLabelDirections({
-        sortedPoints: sortedPlaces.map(place2point),
+        sortedPoints: noOverlapPlaces.map(place2point),
         widthLimit,
         heightLimit,
         distanceFn: diffVw
@@ -6130,7 +6128,7 @@ function createLabelDirections(props) {
   const result = [];
   const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2) => {
     if (isLimited2)
-      return reverse(prevDirection2);
+      return prevDx2 > 0 ? "right" : "left";
     if (isDoubleLimited2 && prevDx2 < 0 && prevDirection2 === "left")
       return "left";
     return "right";
@@ -6140,6 +6138,7 @@ function createLabelDirections(props) {
   let isDoubleLimited = false;
   let prevDx = Infinity;
   for (let idx = 0; idx < len; idx++) {
+    debugger;
     if (idx === len - 1) {
       const direction2 = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
       result.push(direction2);
@@ -6193,7 +6192,7 @@ function filterNoOverlapPlaces(props) {
   }
   return nextPlaces;
 }
-const findRelation = (places, measureRelate) => {
+const findSequenceRelation = (places, measureRelate) => {
   let isPrevRelated = false;
   let isNextRelated = false;
   let isFound = false;
@@ -6235,6 +6234,14 @@ const findMax = (list, measure) => {
   }
   return list[index];
 };
+const find3ItemFullRelation = (places, measureRelate) => {
+  const [p1, p2, p3] = places;
+  const count = Number(measureRelate(p1, p2)) + Number(measureRelate(p1, p3)) + Number(measureRelate(p2, p3));
+  return count >= 2 ? places : [];
+};
+const findRelation = (places, measureRelate) => {
+  return places.length === 3 ? find3ItemFullRelation(places, measureRelate) : findSequenceRelation(places, measureRelate);
+};
 var AnchorType = /* @__PURE__ */ ((AnchorType2) => {
   AnchorType2["topLeft"] = "top-left";
   AnchorType2["topCenter"] = "top-center";
@@ -6423,8 +6430,8 @@ const PickupPoints = defineSetup(function PickupPoints2(props, {
 });
 const RECOMMEND_PLACE_DRAG_LIMIT = 10;
 const RECOMMEND_PLACE_LARGE_LIMIT = 100;
-const RECOMMEND_PLACE_ICON_ZOOM_MIN = 15.75;
-const RECOMMEND_PLACE_TEXT_ZOOM_MIN = 16.75;
+const RECOMMEND_PLACE_ICON_ZOOM_MIN = 16.25;
+const RECOMMEND_PLACE_TEXT_ZOOM_MIN = 16.25;
 const DEFAULT_PLACE_NAME = "当前位置";
 const DEFAULT_ZOOM = 17;
 const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlaceMap2(props, {

package/dist/src/business-components/BusinessRecomendPlaceMap/BusinessRecomendPlaceMap.d.ts

@@ -8,8 +8,8 @@ import type { Place, Point } from "../../types/interface";
 import { AbsoluteAddressBoxProps } from "../AbsoluteAddressBox";
 export declare const RECOMMEND_PLACE_DRAG_LIMIT = 10;
 export declare const RECOMMEND_PLACE_LARGE_LIMIT = 100;
-export declare const RECOMMEND_PLACE_ICON_ZOOM_MIN = 15.75;
-export declare const RECOMMEND_PLACE_TEXT_ZOOM_MIN = 16.75;
+export declare const RECOMMEND_PLACE_ICON_ZOOM_MIN = 16.25;
+export declare const RECOMMEND_PLACE_TEXT_ZOOM_MIN = 16.25;
 export declare const DEFAULT_PLACE_NAME = "\u5F53\u524D\u4F4D\u7F6E";
 export declare const DEFAULT_ZOOM = 17;
 export interface CenterPlaceSource {

package/package.json

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