@heycar/heycars-map 2.3.1 → 2.4.1

package/dist/index.d.ts

@@ -1 +1 @@
-export * from "./v3"
+export * from "./v2"

package/dist/index.js

@@ -1 +1 @@
-export * from "./v3"
+export * from "./v2"

package/dist/v2/business-components/BusinessRecomendPlaceMap/useCacheCenterPlace.d.ts

@@ -14,7 +14,6 @@ export declare const useCacheCenterPlace: (props: UseDefaultCenterPlaceProps) =>
     };
     geoDefaultPosition: Point;
     defaultCenterPlace: {
-        type?: import("../../types/interface").CoordinateType | undefined;
         lng: number;
         lat: number;
         name: string;

package/dist/v2/business-components/BusinessRecomendPlaceMap/useCacheCenterPlace.js

@@ -1,18 +1,21 @@
 import { reactive } from "vue-demi";
 import { apiGetCenterPlaceFromCache } from "../../api/browser.js";
 import { apiMemoryShouldSkipByKey } from "../../api/memory.js";
+import { useMapCoordinatify } from "../../hooks/useMapCoordinatify.js";
 import { maybeFunctionToFunction, lnglat2point } from "../../utils/transform.js";
 const IS_FIRST_LOAD_KEY = "IS_FIRST_LOAD_KEY";
 const useCacheCenterPlace = (props) => {
   const { geoLoadingTitle, emptyTitle } = props;
   const isFirstLoad = !apiMemoryShouldSkipByKey(IS_FIRST_LOAD_KEY);
   const getDefaultCenterPlace = maybeFunctionToFunction(props.defaultCenterPlace);
+  const { unCoordinatifyPlace } = useMapCoordinatify();
+  const inputDefaultCenterPlace = getDefaultCenterPlace == null ? void 0 : getDefaultCenterPlace(apiGetCenterPlaceFromCache());
   const defaultCenterPlace = {
     lng: 0,
     lat: 0,
     name: emptyTitle,
     displayName: emptyTitle,
-    ...getDefaultCenterPlace == null ? void 0 : getDefaultCenterPlace(apiGetCenterPlaceFromCache())
+    ...inputDefaultCenterPlace ? unCoordinatifyPlace(inputDefaultCenterPlace) : void 0
   };
   const geoDefaultPosition = defaultCenterPlace ? lnglat2point(defaultCenterPlace) : [0, 0];
   const centerPlace = reactive({

package/dist/v2/business-components/StartEndPoint/StartEndPoint.js

@@ -10,7 +10,7 @@ import { useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup } from "../../types/helper.js";
 import { createDom } from "../../utils/dom.js";
 import { decodeAsterisk, vec2lnglat } from "../../utils/transform.js";
-import { p as pointInfoBoxEmphasize, a as pointIcon, b as pointLayout, c as pointSingleInfoBox, d as pointInfoBoxTitle, t as textLayout, e as arrowRight, f as pointInfoBox, g as pointInfoBoxDescription } from "../../chunks/StartEndPoint.css.8242788c.js";
+import { p as pointInfoBoxEmphasize, a as pointIcon, b as pointLayout, c as pointSingleInfoBox, d as pointInfoBoxTitle, t as textLayout, e as arrowRight, f as pointInfoBox, g as pointInfoBoxDescription } from "../../chunks/StartEndPoint.css.9e64a1ee.js";
 const imgEndPoint = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IHgxPSI3Mi4zMzklIiB5MT0iNTAlIiB4Mj0iMCUiIHkyPSI1MCUiIGlkPSJwcmVmaXhfX2EiPjxzdG9wIHN0b3AtY29sb3I9IiNGRjg0NDciIG9mZnNldD0iMCUiLz48c3RvcCBzdG9wLWNvbG9yPSIjRkY4QjRBIiBvZmZzZXQ9IjUwLjU5NiUiLz48c3RvcCBzdG9wLWNvbG9yPSIjRkZBOTVBIiBvZmZzZXQ9IjEwMCUiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGQ9Ik0xMiAzMC4yMTVjMi4xMzQgMCAzLjg2My0uODkzIDMuODYzLTEuOTk1IDAtMS4xLTEuNzMtMS45OTQtMy44NjMtMS45OTQtMi4xMzQgMC0zLjg2My44OTMtMy44NjMgMS45OTQgMCAxLjEwMiAxLjczIDEuOTk1IDMuODYzIDEuOTk1eiIgZmlsbC1vcGFjaXR5PSIuNSIgZmlsbD0iIzQzNDg1QSIvPjxwYXRoIGQ9Ik0xMSAyNy4wMDZjMi4xMjggMC0uOS0zLjc0MyA1LjYyMS02LjY0M0MxOS44NDIgMTguNDUzIDIyIDE0Ljk1MyAyMiAxMC45NSAyMiA0LjkwMiAxNy4wNzUgMCAxMSAwUzAgNC45MDIgMCAxMC45NWMwIDMuOTE4IDIuMDY4IDcuMzU2IDUuMTc3IDkuMjlDMTEuNzUgMjMuMjg0IDkuMDYgMjcuMDA3IDExIDI3LjAwN3oiIHN0cm9rZT0iI0ZGRiIgZmlsbD0idXJsKCNwcmVmaXhfX2EpIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxIDEuMjE1KSIvPjx0ZXh0IGZvbnQtZmFtaWx5PSJQaW5nRmFuZ1NDLVNlbWlib2xkLCBQaW5nRmFuZyBTQyIgZm9udC1zaXplPSIxMiIgZm9udC13ZWlnaHQ9IjUwMCIgZmlsbD0iI0ZGRiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMSAxLjIxNSkiPjx0c3BhbiB4PSI1IiB5PSIxNS40NDkiPue7iDwvdHNwYW4+PC90ZXh0PjwvZz48L3N2Zz4=";
 const imgStartPoint = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IHgxPSIwJSIgeTE9IjUwJSIgeDI9IjEyOS41OTklIiB5Mj0iNTAlIiBpZD0icHJlZml4X19hIj48c3RvcCBzdG9wLWNvbG9yPSIjMzZBOEZGIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iIzQ4NzFGMSIgb2Zmc2V0PSIxMDAlIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj48cGF0aCBkPSJNMTIgMzAuMjE1YzEuOTUgMCAzLjUzMi0uODE2IDMuNTMyLTEuODIzIDAtMS4wMDctMS41ODEtMS44MjMtMy41MzItMS44MjMtMS45NSAwLTMuNTMyLjgxNi0zLjUzMiAxLjgyMyAwIDEuMDA3IDEuNTgxIDEuODIzIDMuNTMyIDEuODIzeiIgZmlsbC1vcGFjaXR5PSIuNSIgZmlsbD0iIzQzNDg1QSIvPjxwYXRoIGQ9Ik0xMSAyN2MyLjEyOCAwLS45LTMuNzQyIDUuNjIxLTYuNjQxIDMuMjIxLTEuOTEgNS4zNzktNS40MSA1LjM3OS05LjQxMkMyMiA0LjkwMSAxNy4wNzUgMCAxMSAwUzAgNC45MDEgMCAxMC45NDdjMCAzLjkxOCAyLjA2OCA3LjM1NSA1LjE3NyA5LjI5QzExLjc1IDIzLjI3NyA5LjA2IDI3IDExIDI3eiIgc3Ryb2tlPSIjRkZGIiBmaWxsPSJ1cmwoI3ByZWZpeF9fYSkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEgMS4yMTUpIi8+PHRleHQgZm9udC1mYW1pbHk9IlBpbmdGYW5nU0MtU2VtaWJvbGQsIFBpbmdGYW5nIFNDIiBmb250LXNpemU9IjEyIiBmb250LXdlaWdodD0iNTAwIiBmaWxsPSIjRkZGIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxIDEuMjE1KSI+PHRzcGFuIHg9IjUiIHk9IjE1LjYyNCI+6LW3PC90c3Bhbj48L3RleHQ+PC9nPjwvc3ZnPg==";
 const AStartEndPoint = defineSetup("AStartEndPoint", function(props, {

package/dist/v2/business-components/TaxiCar/TaxiCar.js

@@ -1,4 +1,4 @@
-import "../../css/TaxiCar-9155f78f.css";
+import "../../css/TaxiCar-37baac68.css";
 import { h } from "vue";
 import { computed } from "vue-demi";
 import { ICON_TAXI_CAR_URL } from "../../api/cdn.js";
@@ -10,7 +10,7 @@ import { useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup } from "../../types/helper.js";
 import { createDom } from "../../utils/dom.js";
 import { decodeAsterisk, vec2lnglat } from "../../utils/transform.js";
-import { p as pointInfoBoxEmphasize, b as pointLayout, c as pointSingleInfoBox } from "../../chunks/StartEndPoint.css.8242788c.js";
+import { p as pointInfoBoxEmphasize, b as pointLayout, c as pointSingleInfoBox } from "../../chunks/StartEndPoint.css.9e64a1ee.js";
 import { c as createRuntimeFn } from "../../chunks/vanilla-extract-recipes-createRuntimeFn.esm.bd6fc290.js";
 const TaxiCar_css_ts_vanilla = "";
 var carIcon = "_65j3sr1";

package/dist/v2/chunks/{StartEndPoint.css.8242788c.js → StartEndPoint.css.9e64a1ee.js}

@@ -1,4 +1,4 @@
-import "../css/StartEndPoint-d7806e8e.css";
+import "../css/StartEndPoint-73c01544.css";
 import { c as createRuntimeFn } from "./vanilla-extract-recipes-createRuntimeFn.esm.bd6fc290.js";
 const StartEndPoint_css_ts_vanilla = "";
 var arrowRight = createRuntimeFn({ defaultClassName: "_4a4ovka", variantClassNames: { withArrow: { true: "_4a4ovkb", false: "_4a4ovkc" } }, defaultVariants: {}, compoundVariants: [] });

package/dist/{v3/css/StartEndPoint-d7806e8e.css → v2/css/StartEndPoint-73c01544.css}

@@ -40,7 +40,8 @@
   font-weight: 400;
   color: #7E7E7E;
   line-height: 3.47vw;
-  white-space: nowrap;
+  width: max-content;
+  max-width: 41.33vw;
 }
 ._4a4ovk5 {
   color: #4471FF;

package/dist/{v3/css/TaxiCar-9155f78f.css → v2/css/TaxiCar-37baac68.css}

@@ -13,5 +13,6 @@
   font-weight: 500;
   color: #1E1E1E;
   line-height: 3.8vw;
-  white-space: nowrap;
+  width: max-content;
+  max-width: 50vw;
 }

package/dist/v2/hooks/useMapCoordinatify.js

@@ -1,6 +1,7 @@
 import { useMapGCJ02 } from "./useMapGCJ02.js";
+import { inChina } from "./useMapInChina.js";
 function useMapCoordinatify() {
-  const { toCoordinateType, toLocalGcj02 } = useMapGCJ02();
+  const { toCoordinateType, toLocalGcj02, toLocalWgs84 } = useMapGCJ02();
   const coordinatifyPoint = (value) => {
     const [lng, lat] = value;
     return { lng, lat, type: toCoordinateType(value) };
@@ -11,7 +12,9 @@ function useMapCoordinatify() {
     if (type === inputType)
       return [lng, lat];
     if (type === "wgs84") {
-      throw new Error(`国外经纬度收到火星坐标系数据: ${JSON.stringify(value)}`);
+      if (!inChina([lng, lat]))
+        throw new Error(`国外经纬度收到火星坐标系数据: ${JSON.stringify(value)}`);
+      return toLocalWgs84([lng, lat]);
     }
     return toLocalGcj02([lng, lat]);
   };

package/dist/v2/hooks/useMapGCJ02.d.ts

@@ -5,6 +5,7 @@ export declare const useAmapGCJ02: () => {
     toGcj02Points: (points: Point[]) => Promise<Point[]>;
     toLocalGcj02: (point: Point) => Point;
     toLocalGcj02Points: (points: Point[]) => Point[];
+    toLocalWgs84: (point: Point) => Point;
 };
 export declare const useGmapGCJ02: () => {
     toCoordinateType: (p: Point) => CoordinateType;
@@ -12,6 +13,7 @@ export declare const useGmapGCJ02: () => {
     toGcj02Points: (points: Point[]) => Promise<Point[]>;
     toLocalGcj02: (point: Point) => Point;
     toLocalGcj02Points: (points: Point[]) => Point[];
+    toLocalWgs84: (point: Point) => Point;
 };
 export declare const useMapGCJ02: () => {
     toCoordinateType: (p: Point) => CoordinateType;
@@ -19,4 +21,5 @@ export declare const useMapGCJ02: () => {
     toGcj02Points: (points: Point[]) => Promise<Point[]>;
     toLocalGcj02: (point: Point) => Point;
     toLocalGcj02Points: (points: Point[]) => Point[];
+    toLocalWgs84: (point: Point) => Point;
 };

package/dist/v2/hooks/useMapGCJ02.js

@@ -528,13 +528,23 @@ const useAmapGCJ02 = () => {
     }
   };
   const toLocalGcj02Points = (points) => points.map(toLocalGcj02);
+  const toLocalWgs84 = (point) => {
+    throw new Error(`高德地图为什么要转 wgs84: ${JSON.stringify(point)}`);
+  };
   const toGcj02Points = async (points) => {
     return toLocalGcj02Points(points);
   };
   function toGcj02(point) {
     return toGcj02Points([point]).then(([result]) => result);
   }
-  return { toCoordinateType, toGcj02, toGcj02Points, toLocalGcj02, toLocalGcj02Points };
+  return {
+    toCoordinateType,
+    toGcj02,
+    toGcj02Points,
+    toLocalGcj02,
+    toLocalGcj02Points,
+    toLocalWgs84
+  };
 };
 const useGmapGCJ02 = () => {
   const toCoordinateType = (p) => {
@@ -553,13 +563,32 @@ const useGmapGCJ02 = () => {
     }
   };
   const toLocalGcj02Points = (points) => points.map(toLocalGcj02);
+  const toLocalWgs84 = (point) => {
+    try {
+      if (inChina(point) && !inHongkong(point) && !inMacau(point))
+        return point;
+      return exported.transform(point, exported.GCJ02, exported.WGS1984);
+    } catch (err) {
+      const error = err;
+      console.error(`本地转换WGS84失败: ${error.message} 
+ ${error.stack}`);
+      return point;
+    }
+  };
   const toGcj02 = async (point) => {
     return toLocalGcj02Points([point])[0];
   };
   const toGcj02Points = async (points) => {
     return toLocalGcj02Points(points);
   };
-  return { toCoordinateType, toGcj02, toGcj02Points, toLocalGcj02, toLocalGcj02Points };
+  return {
+    toCoordinateType,
+    toGcj02,
+    toGcj02Points,
+    toLocalGcj02,
+    toLocalGcj02Points,
+    toLocalWgs84
+  };
 };
 const useMapGCJ02 = () => {
   const { supplier } = useMapSupplier();

package/dist/v2/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.3.1";
+const pkgVersion = "2.4.1";
 const isEnableLog = (name) => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`log-${name}`);

package/dist/v3/business-components/BusinessRecomendPlaceMap/useCacheCenterPlace.d.ts

@@ -14,7 +14,6 @@ export declare const useCacheCenterPlace: (props: UseDefaultCenterPlaceProps) =>
     };
     geoDefaultPosition: Point;
     defaultCenterPlace: {
-        type?: import("../../types/interface").CoordinateType | undefined;
         lng: number;
         lat: number;
         name: string;

package/dist/v3/business-components/BusinessRecomendPlaceMap/useCacheCenterPlace.js

@@ -1,18 +1,21 @@
 import { reactive } from "vue-demi";
 import { apiGetCenterPlaceFromCache } from "../../api/browser.js";
 import { apiMemoryShouldSkipByKey } from "../../api/memory.js";
+import { useMapCoordinatify } from "../../hooks/useMapCoordinatify.js";
 import { maybeFunctionToFunction, lnglat2point } from "../../utils/transform.js";
 const IS_FIRST_LOAD_KEY = "IS_FIRST_LOAD_KEY";
 const useCacheCenterPlace = (props) => {
   const { geoLoadingTitle, emptyTitle } = props;
   const isFirstLoad = !apiMemoryShouldSkipByKey(IS_FIRST_LOAD_KEY);
   const getDefaultCenterPlace = maybeFunctionToFunction(props.defaultCenterPlace);
+  const { unCoordinatifyPlace } = useMapCoordinatify();
+  const inputDefaultCenterPlace = getDefaultCenterPlace == null ? void 0 : getDefaultCenterPlace(apiGetCenterPlaceFromCache());
   const defaultCenterPlace = {
     lng: 0,
     lat: 0,
     name: emptyTitle,
     displayName: emptyTitle,
-    ...getDefaultCenterPlace == null ? void 0 : getDefaultCenterPlace(apiGetCenterPlaceFromCache())
+    ...inputDefaultCenterPlace ? unCoordinatifyPlace(inputDefaultCenterPlace) : void 0
   };
   const geoDefaultPosition = defaultCenterPlace ? lnglat2point(defaultCenterPlace) : [0, 0];
   const centerPlace = reactive({

package/dist/v3/business-components/StartEndPoint/StartEndPoint.js

@@ -10,7 +10,7 @@ import { useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup } from "../../types/helper.js";
 import { createDom } from "../../utils/dom.js";
 import { decodeAsterisk, vec2lnglat } from "../../utils/transform.js";
-import { p as pointInfoBoxEmphasize, a as pointIcon, b as pointLayout, c as pointSingleInfoBox, d as pointInfoBoxTitle, t as textLayout, e as arrowRight, f as pointInfoBox, g as pointInfoBoxDescription } from "../../chunks/StartEndPoint.css.8242788c.js";
+import { p as pointInfoBoxEmphasize, a as pointIcon, b as pointLayout, c as pointSingleInfoBox, d as pointInfoBoxTitle, t as textLayout, e as arrowRight, f as pointInfoBox, g as pointInfoBoxDescription } from "../../chunks/StartEndPoint.css.9e64a1ee.js";
 const imgEndPoint = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IHgxPSI3Mi4zMzklIiB5MT0iNTAlIiB4Mj0iMCUiIHkyPSI1MCUiIGlkPSJwcmVmaXhfX2EiPjxzdG9wIHN0b3AtY29sb3I9IiNGRjg0NDciIG9mZnNldD0iMCUiLz48c3RvcCBzdG9wLWNvbG9yPSIjRkY4QjRBIiBvZmZzZXQ9IjUwLjU5NiUiLz48c3RvcCBzdG9wLWNvbG9yPSIjRkZBOTVBIiBvZmZzZXQ9IjEwMCUiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGQ9Ik0xMiAzMC4yMTVjMi4xMzQgMCAzLjg2My0uODkzIDMuODYzLTEuOTk1IDAtMS4xLTEuNzMtMS45OTQtMy44NjMtMS45OTQtMi4xMzQgMC0zLjg2My44OTMtMy44NjMgMS45OTQgMCAxLjEwMiAxLjczIDEuOTk1IDMuODYzIDEuOTk1eiIgZmlsbC1vcGFjaXR5PSIuNSIgZmlsbD0iIzQzNDg1QSIvPjxwYXRoIGQ9Ik0xMSAyNy4wMDZjMi4xMjggMC0uOS0zLjc0MyA1LjYyMS02LjY0M0MxOS44NDIgMTguNDUzIDIyIDE0Ljk1MyAyMiAxMC45NSAyMiA0LjkwMiAxNy4wNzUgMCAxMSAwUzAgNC45MDIgMCAxMC45NWMwIDMuOTE4IDIuMDY4IDcuMzU2IDUuMTc3IDkuMjlDMTEuNzUgMjMuMjg0IDkuMDYgMjcuMDA3IDExIDI3LjAwN3oiIHN0cm9rZT0iI0ZGRiIgZmlsbD0idXJsKCNwcmVmaXhfX2EpIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxIDEuMjE1KSIvPjx0ZXh0IGZvbnQtZmFtaWx5PSJQaW5nRmFuZ1NDLVNlbWlib2xkLCBQaW5nRmFuZyBTQyIgZm9udC1zaXplPSIxMiIgZm9udC13ZWlnaHQ9IjUwMCIgZmlsbD0iI0ZGRiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMSAxLjIxNSkiPjx0c3BhbiB4PSI1IiB5PSIxNS40NDkiPue7iDwvdHNwYW4+PC90ZXh0PjwvZz48L3N2Zz4=";
 const imgStartPoint = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IHgxPSIwJSIgeTE9IjUwJSIgeDI9IjEyOS41OTklIiB5Mj0iNTAlIiBpZD0icHJlZml4X19hIj48c3RvcCBzdG9wLWNvbG9yPSIjMzZBOEZGIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iIzQ4NzFGMSIgb2Zmc2V0PSIxMDAlIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj48cGF0aCBkPSJNMTIgMzAuMjE1YzEuOTUgMCAzLjUzMi0uODE2IDMuNTMyLTEuODIzIDAtMS4wMDctMS41ODEtMS44MjMtMy41MzItMS44MjMtMS45NSAwLTMuNTMyLjgxNi0zLjUzMiAxLjgyMyAwIDEuMDA3IDEuNTgxIDEuODIzIDMuNTMyIDEuODIzeiIgZmlsbC1vcGFjaXR5PSIuNSIgZmlsbD0iIzQzNDg1QSIvPjxwYXRoIGQ9Ik0xMSAyN2MyLjEyOCAwLS45LTMuNzQyIDUuNjIxLTYuNjQxIDMuMjIxLTEuOTEgNS4zNzktNS40MSA1LjM3OS05LjQxMkMyMiA0LjkwMSAxNy4wNzUgMCAxMSAwUzAgNC45MDEgMCAxMC45NDdjMCAzLjkxOCAyLjA2OCA3LjM1NSA1LjE3NyA5LjI5QzExLjc1IDIzLjI3NyA5LjA2IDI3IDExIDI3eiIgc3Ryb2tlPSIjRkZGIiBmaWxsPSJ1cmwoI3ByZWZpeF9fYSkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEgMS4yMTUpIi8+PHRleHQgZm9udC1mYW1pbHk9IlBpbmdGYW5nU0MtU2VtaWJvbGQsIFBpbmdGYW5nIFNDIiBmb250LXNpemU9IjEyIiBmb250LXdlaWdodD0iNTAwIiBmaWxsPSIjRkZGIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxIDEuMjE1KSI+PHRzcGFuIHg9IjUiIHk9IjE1LjYyNCI+6LW3PC90c3Bhbj48L3RleHQ+PC9nPjwvc3ZnPg==";
 const AStartEndPoint = defineSetup("AStartEndPoint", function(props, {

package/dist/v3/business-components/TaxiCar/TaxiCar.js

@@ -1,4 +1,4 @@
-import "../../css/TaxiCar-9155f78f.css";
+import "../../css/TaxiCar-37baac68.css";
 import { createVNode } from "vue";
 import { computed } from "vue-demi";
 import { ICON_TAXI_CAR_URL } from "../../api/cdn.js";
@@ -10,7 +10,7 @@ import { useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup } from "../../types/helper.js";
 import { createDom } from "../../utils/dom.js";
 import { decodeAsterisk, vec2lnglat } from "../../utils/transform.js";
-import { p as pointInfoBoxEmphasize, b as pointLayout, c as pointSingleInfoBox } from "../../chunks/StartEndPoint.css.8242788c.js";
+import { p as pointInfoBoxEmphasize, b as pointLayout, c as pointSingleInfoBox } from "../../chunks/StartEndPoint.css.9e64a1ee.js";
 import { c as createRuntimeFn } from "../../chunks/vanilla-extract-recipes-createRuntimeFn.esm.bd6fc290.js";
 const TaxiCar_css_ts_vanilla = "";
 var carIcon = "_65j3sr1";

package/dist/v3/chunks/{StartEndPoint.css.8242788c.js → StartEndPoint.css.9e64a1ee.js}

@@ -1,4 +1,4 @@
-import "../css/StartEndPoint-d7806e8e.css";
+import "../css/StartEndPoint-73c01544.css";
 import { c as createRuntimeFn } from "./vanilla-extract-recipes-createRuntimeFn.esm.bd6fc290.js";
 const StartEndPoint_css_ts_vanilla = "";
 var arrowRight = createRuntimeFn({ defaultClassName: "_4a4ovka", variantClassNames: { withArrow: { true: "_4a4ovkb", false: "_4a4ovkc" } }, defaultVariants: {}, compoundVariants: [] });

package/dist/{v2/css/StartEndPoint-d7806e8e.css → v3/css/StartEndPoint-73c01544.css}

@@ -40,7 +40,8 @@
   font-weight: 400;
   color: #7E7E7E;
   line-height: 3.47vw;
-  white-space: nowrap;
+  width: max-content;
+  max-width: 41.33vw;
 }
 ._4a4ovk5 {
   color: #4471FF;

package/dist/{v2/css/TaxiCar-9155f78f.css → v3/css/TaxiCar-37baac68.css}

@@ -13,5 +13,6 @@
   font-weight: 500;
   color: #1E1E1E;
   line-height: 3.8vw;
-  white-space: nowrap;
+  width: max-content;
+  max-width: 50vw;
 }

package/dist/v3/hooks/useMapCoordinatify.js

@@ -1,6 +1,7 @@
 import { useMapGCJ02 } from "./useMapGCJ02.js";
+import { inChina } from "./useMapInChina.js";
 function useMapCoordinatify() {
-  const { toCoordinateType, toLocalGcj02 } = useMapGCJ02();
+  const { toCoordinateType, toLocalGcj02, toLocalWgs84 } = useMapGCJ02();
   const coordinatifyPoint = (value) => {
     const [lng, lat] = value;
     return { lng, lat, type: toCoordinateType(value) };
@@ -11,7 +12,9 @@ function useMapCoordinatify() {
     if (type === inputType)
       return [lng, lat];
     if (type === "wgs84") {
-      throw new Error(`国外经纬度收到火星坐标系数据: ${JSON.stringify(value)}`);
+      if (!inChina([lng, lat]))
+        throw new Error(`国外经纬度收到火星坐标系数据: ${JSON.stringify(value)}`);
+      return toLocalWgs84([lng, lat]);
     }
     return toLocalGcj02([lng, lat]);
   };

package/dist/v3/hooks/useMapGCJ02.d.ts

@@ -5,6 +5,7 @@ export declare const useAmapGCJ02: () => {
     toGcj02Points: (points: Point[]) => Promise<Point[]>;
     toLocalGcj02: (point: Point) => Point;
     toLocalGcj02Points: (points: Point[]) => Point[];
+    toLocalWgs84: (point: Point) => Point;
 };
 export declare const useGmapGCJ02: () => {
     toCoordinateType: (p: Point) => CoordinateType;
@@ -12,6 +13,7 @@ export declare const useGmapGCJ02: () => {
     toGcj02Points: (points: Point[]) => Promise<Point[]>;
     toLocalGcj02: (point: Point) => Point;
     toLocalGcj02Points: (points: Point[]) => Point[];
+    toLocalWgs84: (point: Point) => Point;
 };
 export declare const useMapGCJ02: () => {
     toCoordinateType: (p: Point) => CoordinateType;
@@ -19,4 +21,5 @@ export declare const useMapGCJ02: () => {
     toGcj02Points: (points: Point[]) => Promise<Point[]>;
     toLocalGcj02: (point: Point) => Point;
     toLocalGcj02Points: (points: Point[]) => Point[];
+    toLocalWgs84: (point: Point) => Point;
 };

package/dist/v3/hooks/useMapGCJ02.js

@@ -528,13 +528,23 @@ const useAmapGCJ02 = () => {
     }
   };
   const toLocalGcj02Points = (points) => points.map(toLocalGcj02);
+  const toLocalWgs84 = (point) => {
+    throw new Error(`高德地图为什么要转 wgs84: ${JSON.stringify(point)}`);
+  };
   const toGcj02Points = async (points) => {
     return toLocalGcj02Points(points);
   };
   function toGcj02(point) {
     return toGcj02Points([point]).then(([result]) => result);
   }
-  return { toCoordinateType, toGcj02, toGcj02Points, toLocalGcj02, toLocalGcj02Points };
+  return {
+    toCoordinateType,
+    toGcj02,
+    toGcj02Points,
+    toLocalGcj02,
+    toLocalGcj02Points,
+    toLocalWgs84
+  };
 };
 const useGmapGCJ02 = () => {
   const toCoordinateType = (p) => {
@@ -553,13 +563,32 @@ const useGmapGCJ02 = () => {
     }
   };
   const toLocalGcj02Points = (points) => points.map(toLocalGcj02);
+  const toLocalWgs84 = (point) => {
+    try {
+      if (inChina(point) && !inHongkong(point) && !inMacau(point))
+        return point;
+      return exported.transform(point, exported.GCJ02, exported.WGS1984);
+    } catch (err) {
+      const error = err;
+      console.error(`本地转换WGS84失败: ${error.message} 
+ ${error.stack}`);
+      return point;
+    }
+  };
   const toGcj02 = async (point) => {
     return toLocalGcj02Points([point])[0];
   };
   const toGcj02Points = async (points) => {
     return toLocalGcj02Points(points);
   };
-  return { toCoordinateType, toGcj02, toGcj02Points, toLocalGcj02, toLocalGcj02Points };
+  return {
+    toCoordinateType,
+    toGcj02,
+    toGcj02Points,
+    toLocalGcj02,
+    toLocalGcj02Points,
+    toLocalWgs84
+  };
 };
 const useMapGCJ02 = () => {
   const { supplier } = useMapSupplier();

package/dist/v3/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.3.1";
+const pkgVersion = "2.4.1";
 const isEnableLog = (name) => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`log-${name}`);

package/package.json

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