@heycar/heycars-map 0.8.4 → 0.8.6

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.4";
+const version = "0.8.6";
 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,18 +6113,13 @@ const usePointsLabelDirection = (props) => {
         distanceFn: diffVw
       });
       const directions = createLabelDirections({
-        sortedPoints: sortedPlaces.map(place2point),
+        sortedPoints: noOverlapPlaces.map(place2point),
         widthLimit,
         heightLimit,
         distanceFn: diffVw
       });
       directionsRef.value = directions;
       labeledPlacesRef.value = noOverlapPlaces;
-      console.log(
-        "usePointsLabelDirection basePlace, noOverlapPlaces = ",
-        basePlace.displayName,
-        noOverlapPlaces.map((item) => item.displayName)
-      );
     }
   );
   return { directionsRef, labeledPlacesRef, isContainBasePlaceRef };
@@ -6135,27 +6128,41 @@ function createLabelDirections(props) {
   const { sortedPoints, widthLimit, heightLimit, distanceFn } = props;
   const len = sortedPoints.length;
   const result = [];
+  const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2) => {
+    if (isLimited2)
+      return prevDx2 > 0 ? "right" : "left";
+    if (isDoubleLimited2 && prevDx2 < 0 && prevDirection2 === "left")
+      return "left";
+    return "right";
+  };
   let prevDirection = "right";
   let isLimited = false;
+  let isDoubleLimited = false;
+  let prevDx = Infinity;
   for (let idx = 0; idx < len; idx++) {
+    debugger;
     if (idx === len - 1) {
-      const direction2 = isLimited ? reverse(prevDirection) : "right";
+      const direction2 = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
       result.push(direction2);
       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 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 direction = isLimited ? reverse(prevDirection) : "right";
+    const direction = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
     result.push(direction);
     prevDirection = direction;
+    prevDx = dx;
     isLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
+    isDoubleLimited = dx > -widthLimit * 2 && dx < widthLimit * 2 && dy > -heightLimit && dy < heightLimit;
   }
   return result;
 }
@@ -6164,7 +6171,8 @@ function filterNoOverlapPlaces(props) {
   const measureOverlap = (place1, place2) => {
     const [dx, dy] = distanceFn(place2point(place1), place2point(place2));
     const isOverlap = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
-    console.log(
+    spaceLog(
+      "usePointsLabelDirection",
       "p1, p2, dx, dy, isOverlap = ",
       place1.displayName,
       place2.displayName,
@@ -6186,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;
@@ -6228,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";
@@ -6248,25 +6264,23 @@ 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: [] });
+const DEFAULT_TEXT_ALIGN = "right";
 const APlaceCircle = defineSetup(function APlaceCircle2(props, {
   emit
 }) {
-  const textAlignRef = Vue.computed(() => {
-    var _a;
-    return (_a = props.textAlign) != null ? _a : "right";
-  });
   const contentRef = Vue.computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return `
         <div class="APlaceCircle ${placeCircleLayout({
-      textAlign: textAlignRef.value
+      textAlign
     })}">
           <img class="${placeIcon({
       hideIcon
     })} ${amapPlaceIconLayout({
-      textAlign: textAlignRef.value
+      textAlign
     })}" src="${imgPlaceCircle}">
           <div class="${labelLayout}">
             <div class="${labelStroke}">${props.label}</div>
@@ -6277,23 +6291,27 @@ const APlaceCircle = defineSetup(function APlaceCircle2(props, {
   });
   const contentWithoutLabelRef = Vue.computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return `<img class="APlaceCircle ${placeIcon({
       hideIcon
     })} ${amapPlaceIconLayout({
-      textAlign: textAlignRef.value
+      textAlign
     })}" src="${imgPlaceCircle}">`;
   });
   const handleClick = () => {
     emit("click", props.position);
   };
   return () => {
+    const {
+      textAlign = DEFAULT_TEXT_ALIGN
+    } = props;
     return Vue.h(AmapMarker, {
       "attrs": {
         "position": props.position,
         "content": props.label ? contentRef.value : contentWithoutLabelRef.value,
-        "anchor": textAlignRef.value === "left" ? AnchorType.middleRight : AnchorType.middleLeft,
+        "anchor": textAlign === "left" ? AnchorType.middleRight : AnchorType.middleLeft,
         "zIndex": ZINDEX_PLACE_LAYER
       },
       "on": {
@@ -6305,19 +6323,16 @@ const APlaceCircle = defineSetup(function APlaceCircle2(props, {
 const GPlaceCircle = defineSetup(function GPlaceCircle2(props, {
   emit
 }) {
-  const textAlignRef = Vue.computed(() => {
-    var _a;
-    return (_a = props.textAlign) != null ? _a : "right";
-  });
   const contentRef = Vue.computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return createDom("div", {
       class: `GPlaceCircle ${placeCircleLayout({
-        textAlign: textAlignRef.value
+        textAlign
       })} ${gmapPlaceIconLayout({
-        textAlign: textAlignRef.value
+        textAlign
       })}`
     }, `
       <img class="${placeIcon({
@@ -6331,13 +6346,14 @@ const GPlaceCircle = defineSetup(function GPlaceCircle2(props, {
   });
   const contentWithoutLabelRef = Vue.computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return createDom("img", {
       class: `GPlaceCircle ${placeIcon({
         hideIcon
       })} ${gmapPlaceIconLayout({
-        textAlign: textAlignRef.value
+        textAlign
       })}`,
       src: imgPlaceCircle
     });
@@ -6386,7 +6402,7 @@ const PickupPoints = defineSetup(function PickupPoints2(props, {
     basePlace: Vue.toRef(props, "basePlace"),
     places: Vue.toRef(props, "places"),
     heightLimit: 9,
-    widthLimit: 32
+    widthLimit: 34
   }));
   return () => {
     const {

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.4";
+const version = "0.8.6";
 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,18 +6111,13 @@ const usePointsLabelDirection = (props) => {
         distanceFn: diffVw
       });
       const directions = createLabelDirections({
-        sortedPoints: sortedPlaces.map(place2point),
+        sortedPoints: noOverlapPlaces.map(place2point),
         widthLimit,
         heightLimit,
         distanceFn: diffVw
       });
       directionsRef.value = directions;
       labeledPlacesRef.value = noOverlapPlaces;
-      console.log(
-        "usePointsLabelDirection basePlace, noOverlapPlaces = ",
-        basePlace.displayName,
-        noOverlapPlaces.map((item) => item.displayName)
-      );
     }
   );
   return { directionsRef, labeledPlacesRef, isContainBasePlaceRef };
@@ -6133,27 +6126,41 @@ function createLabelDirections(props) {
   const { sortedPoints, widthLimit, heightLimit, distanceFn } = props;
   const len = sortedPoints.length;
   const result = [];
+  const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2) => {
+    if (isLimited2)
+      return prevDx2 > 0 ? "right" : "left";
+    if (isDoubleLimited2 && prevDx2 < 0 && prevDirection2 === "left")
+      return "left";
+    return "right";
+  };
   let prevDirection = "right";
   let isLimited = false;
+  let isDoubleLimited = false;
+  let prevDx = Infinity;
   for (let idx = 0; idx < len; idx++) {
+    debugger;
     if (idx === len - 1) {
-      const direction2 = isLimited ? reverse(prevDirection) : "right";
+      const direction2 = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
       result.push(direction2);
       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 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 direction = isLimited ? reverse(prevDirection) : "right";
+    const direction = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
     result.push(direction);
     prevDirection = direction;
+    prevDx = dx;
     isLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
+    isDoubleLimited = dx > -widthLimit * 2 && dx < widthLimit * 2 && dy > -heightLimit && dy < heightLimit;
   }
   return result;
 }
@@ -6162,7 +6169,8 @@ function filterNoOverlapPlaces(props) {
   const measureOverlap = (place1, place2) => {
     const [dx, dy] = distanceFn(place2point(place1), place2point(place2));
     const isOverlap = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
-    console.log(
+    spaceLog(
+      "usePointsLabelDirection",
       "p1, p2, dx, dy, isOverlap = ",
       place1.displayName,
       place2.displayName,
@@ -6184,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;
@@ -6226,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";
@@ -6246,25 +6262,23 @@ 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: [] });
+const DEFAULT_TEXT_ALIGN = "right";
 const APlaceCircle = defineSetup(function APlaceCircle2(props, {
   emit
 }) {
-  const textAlignRef = computed(() => {
-    var _a;
-    return (_a = props.textAlign) != null ? _a : "right";
-  });
   const contentRef = computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return `
         <div class="APlaceCircle ${placeCircleLayout({
-      textAlign: textAlignRef.value
+      textAlign
     })}">
           <img class="${placeIcon({
       hideIcon
     })} ${amapPlaceIconLayout({
-      textAlign: textAlignRef.value
+      textAlign
     })}" src="${imgPlaceCircle}">
           <div class="${labelLayout}">
             <div class="${labelStroke}">${props.label}</div>
@@ -6275,23 +6289,27 @@ const APlaceCircle = defineSetup(function APlaceCircle2(props, {
   });
   const contentWithoutLabelRef = computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return `<img class="APlaceCircle ${placeIcon({
       hideIcon
     })} ${amapPlaceIconLayout({
-      textAlign: textAlignRef.value
+      textAlign
     })}" src="${imgPlaceCircle}">`;
   });
   const handleClick = () => {
     emit("click", props.position);
   };
   return () => {
+    const {
+      textAlign = DEFAULT_TEXT_ALIGN
+    } = props;
     return h(AmapMarker, {
       "attrs": {
         "position": props.position,
         "content": props.label ? contentRef.value : contentWithoutLabelRef.value,
-        "anchor": textAlignRef.value === "left" ? AnchorType.middleRight : AnchorType.middleLeft,
+        "anchor": textAlign === "left" ? AnchorType.middleRight : AnchorType.middleLeft,
         "zIndex": ZINDEX_PLACE_LAYER
       },
       "on": {
@@ -6303,19 +6321,16 @@ const APlaceCircle = defineSetup(function APlaceCircle2(props, {
 const GPlaceCircle = defineSetup(function GPlaceCircle2(props, {
   emit
 }) {
-  const textAlignRef = computed(() => {
-    var _a;
-    return (_a = props.textAlign) != null ? _a : "right";
-  });
   const contentRef = computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return createDom("div", {
       class: `GPlaceCircle ${placeCircleLayout({
-        textAlign: textAlignRef.value
+        textAlign
       })} ${gmapPlaceIconLayout({
-        textAlign: textAlignRef.value
+        textAlign
       })}`
     }, `
       <img class="${placeIcon({
@@ -6329,13 +6344,14 @@ const GPlaceCircle = defineSetup(function GPlaceCircle2(props, {
   });
   const contentWithoutLabelRef = computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return createDom("img", {
       class: `GPlaceCircle ${placeIcon({
         hideIcon
       })} ${gmapPlaceIconLayout({
-        textAlign: textAlignRef.value
+        textAlign
       })}`,
       src: imgPlaceCircle
     });
@@ -6384,7 +6400,7 @@ const PickupPoints = defineSetup(function PickupPoints2(props, {
     basePlace: toRef(props, "basePlace"),
     places: toRef(props, "places"),
     heightLimit: 9,
-    widthLimit: 32
+    widthLimit: 34
   }));
   return () => {
     const {

package/package.json

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