@heycar/heycars-map 0.8.9 → 0.8.10

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.9";
+const version = "0.8.10";
 const type = "module";
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
@@ -6127,11 +6127,23 @@ function createLabelDirections(props) {
   const { sortedPoints, widthLimit, heightLimit, distanceFn } = props;
   const len = sortedPoints.length;
   const result = [];
-  const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2) => {
+  const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2, isNextLimited, dx) => {
+    spaceLog(
+      "calcDirection",
+      "isLimited, isDoubleLimited, prevDx, prevDirection, isNextLimited, dx = ",
+      isLimited2,
+      isDoubleLimited2,
+      prevDx2,
+      prevDirection2,
+      isNextLimited,
+      dx
+    );
     if (isLimited2)
       return prevDx2 > 0 ? "right" : "left";
     if (isDoubleLimited2 && prevDx2 < 0 && prevDirection2 === "left")
       return "left";
+    if (isNextLimited)
+      return dx > 0 ? "left" : "right";
     return "right";
   };
   let prevDirection = "right";
@@ -6140,7 +6152,15 @@ function createLabelDirections(props) {
   let prevDx = Infinity;
   for (let idx = 0; idx < len; idx++) {
     if (idx === len - 1) {
-      const direction2 = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
+      const isNextLimited2 = false;
+      const direction2 = calcDirection(
+        isLimited,
+        isDoubleLimited,
+        prevDx,
+        prevDirection,
+        isNextLimited2,
+        0
+      );
       result.push(direction2);
       continue;
     }
@@ -6155,11 +6175,19 @@ function createLabelDirections(props) {
       continue;
     }
     const [dx, dy] = distanceFn(sortedPoints[idx], sortedPoints[idx + 1]);
-    const direction = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
+    const isNextLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
+    const direction = calcDirection(
+      isLimited,
+      isDoubleLimited,
+      prevDx,
+      prevDirection,
+      isNextLimited,
+      dx
+    );
     result.push(direction);
     prevDirection = direction;
     prevDx = dx;
-    isLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
+    isLimited = isNextLimited;
     isDoubleLimited = dx > -widthLimit * 2 && dx < widthLimit * 2 && dy > -heightLimit && dy < heightLimit;
   }
   return result;
@@ -6170,7 +6198,7 @@ function filterNoOverlapPlaces(props) {
     const [dx, dy] = distanceFn(place2point(place1), place2point(place2));
     const isOverlap = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
     spaceLog(
-      "usePointsLabelDirection",
+      "filterNoOverlapPlaces",
       "p1, p2, dx, dy, isOverlap = ",
       place1.displayName,
       place2.displayName,

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.9";
+const version = "0.8.10";
 const type = "module";
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
@@ -6125,11 +6125,23 @@ function createLabelDirections(props) {
   const { sortedPoints, widthLimit, heightLimit, distanceFn } = props;
   const len = sortedPoints.length;
   const result = [];
-  const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2) => {
+  const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2, isNextLimited, dx) => {
+    spaceLog(
+      "calcDirection",
+      "isLimited, isDoubleLimited, prevDx, prevDirection, isNextLimited, dx = ",
+      isLimited2,
+      isDoubleLimited2,
+      prevDx2,
+      prevDirection2,
+      isNextLimited,
+      dx
+    );
     if (isLimited2)
       return prevDx2 > 0 ? "right" : "left";
     if (isDoubleLimited2 && prevDx2 < 0 && prevDirection2 === "left")
       return "left";
+    if (isNextLimited)
+      return dx > 0 ? "left" : "right";
     return "right";
   };
   let prevDirection = "right";
@@ -6138,7 +6150,15 @@ function createLabelDirections(props) {
   let prevDx = Infinity;
   for (let idx = 0; idx < len; idx++) {
     if (idx === len - 1) {
-      const direction2 = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
+      const isNextLimited2 = false;
+      const direction2 = calcDirection(
+        isLimited,
+        isDoubleLimited,
+        prevDx,
+        prevDirection,
+        isNextLimited2,
+        0
+      );
       result.push(direction2);
       continue;
     }
@@ -6153,11 +6173,19 @@ function createLabelDirections(props) {
       continue;
     }
     const [dx, dy] = distanceFn(sortedPoints[idx], sortedPoints[idx + 1]);
-    const direction = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
+    const isNextLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
+    const direction = calcDirection(
+      isLimited,
+      isDoubleLimited,
+      prevDx,
+      prevDirection,
+      isNextLimited,
+      dx
+    );
     result.push(direction);
     prevDirection = direction;
     prevDx = dx;
-    isLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
+    isLimited = isNextLimited;
     isDoubleLimited = dx > -widthLimit * 2 && dx < widthLimit * 2 && dy > -heightLimit && dy < heightLimit;
   }
   return result;
@@ -6168,7 +6196,7 @@ function filterNoOverlapPlaces(props) {
     const [dx, dy] = distanceFn(place2point(place1), place2point(place2));
     const isOverlap = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
     spaceLog(
-      "usePointsLabelDirection",
+      "filterNoOverlapPlaces",
       "p1, p2, dx, dy, isOverlap = ",
       place1.displayName,
       place2.displayName,

package/package.json

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