@heycar/heycars-map 2.4.0 → 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/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.4.0";
+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/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.4.0";
+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.4.0",
+  "version": "2.4.1",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js",