@heycar/heycars-map 2.7.1 → 2.7.2

package/dist/v2/App.js

@@ -4,8 +4,8 @@ import { DemoBusinessRecomendPlace } from "./Demo/DemoBusinessRecomendPlace.js";
 import { MapProvider } from "./components/MapProvider/MapProvider.js";
 const gmapApiKey = "AIzaSyCCOe8MAeS3EYvSraKsBX6ztVyLxj69z94";
 const gmapId = "d0af0c05331af64a";
-const amapApiKey = "81ed1d2b5b77187683717a5f2f19591a";
-const amapApiSecret = "1dfe626553258a9f91d7c4552c0816d2";
+const amapApiKey = "fcb7b14c930354a248e21f4031dfa179";
+const amapApiSecret = "11ad0e3d585b80d18b1ada5b0d947c4a";
 const App = defineComponent({
   setup() {
     const supplierRef = ref("amap");

package/dist/v2/components/Amap/Amap.d.ts

@@ -1,10 +1,9 @@
 import type { SetMap } from "../../hooks/useHeycarMap";
 import type { AmapMap } from "../../types/interface";
 import type { MapEventHandler } from "../../types/mapHelper";
-import { type VectorMapForeign } from "../../utils/transform";
-export interface AmapProps extends Omit<AMap.MapOptions, "vectorMapForeign"> {
-    vectorMapForeign?: VectorMapForeign;
+export interface AmapProps extends Omit<AMap.MapOptions, "viewMode"> {
     mapRef?: SetMap<AmapMap>;
+    viewMode?: "2D" | "3D";
     dragEnable?: boolean;
     zoomEnable?: boolean;
     rotateEnable?: boolean;

package/dist/v2/components/Amap/Amap.js

@@ -14,15 +14,7 @@ import { SafeAmap } from "./SafeAmap.js";
 const Amap_css_ts_vanilla = "";
 var amap = "_1d8ur7t0";
 const Amap = defineSetup("Amap", function(props, { slots, emit, attrs }) {
-  const {
-    onDragStart,
-    onDragEnd,
-    onZoomEnd,
-    onResize,
-    mapRef: setMap,
-    vectorMapForeign = "style_zh_cn",
-    ...defaultOptions
-  } = props;
+  const { onDragStart, onDragEnd, onZoomEnd, onResize, mapRef: setMap, ...defaultOptions } = props;
   const statusOptions = computed(() => {
     const {
       dragEnable = true,
@@ -65,8 +57,7 @@ const Amap = defineSetup("Amap", function(props, { slots, emit, attrs }) {
     const map = new SafeAmap(elementRef.value, {
       ...defaultOptions,
       scrollWheel: defaultOptions.touchZoomCenter ? false : defaultOptions.scrollWheel,
-      doubleClickZoom: defaultOptions.touchZoomCenter ? false : defaultOptions.doubleClickZoom,
-      vectorMapForeign
+      doubleClickZoom: defaultOptions.touchZoomCenter ? false : defaultOptions.doubleClickZoom
     });
     window.GlobalAmap = map;
     mapRef.value = map;

package/dist/v2/components/AmapMarker/AmapMarker.js

@@ -3,12 +3,23 @@ import { useAmap } from "../../hooks/useMap.js";
 import { useMapOverlay } from "../../hooks/useOverlay.js";
 import { defineSetup } from "../../types/helper.js";
 import { watchNoneImmediatePostEffectForMapProperty, watchPostEffectForAMapEvent } from "../../utils/compare.js";
+import { detectTouchDevice } from "../../utils/platform.js";
 import { referenceCount } from "../../utils/referenceCount.js";
 import { useAmapFixBugOverlayDrag } from "../AmapPolygon/AmapPolygon.js";
+const isTouchDevice = detectTouchDevice();
+const shouldSkipByAmapClickDoubleTriggerBug = (e) => {
+  return isTouchDevice && e.originEvent.type === "mouseup";
+};
 const AmapMarker = defineSetup("AmapMarker", function(props, { emit }) {
   const { registerOverlay } = props;
   const markerRef = shallowRef();
   const mapRef = useAmap();
+  const emitClick = (_, e) => {
+    const event = e;
+    if (shouldSkipByAmapClickDoubleTriggerBug(event))
+      return;
+    emit("click", event);
+  };
   onMounted(() => {
     referenceCount.add();
     const { registerOverlay: registerOverlay2, onClick, ...option } = props;
@@ -49,7 +60,7 @@ const AmapMarker = defineSetup("AmapMarker", function(props, { emit }) {
     { name: "title", defaultValue: "" },
     { name: "extData", defaultValue: "" }
   ]);
-  watchPostEffectForAMapEvent(markerRef, props, emit, ["onClick"]);
+  watchPostEffectForAMapEvent(markerRef, props, emitClick, ["onClick"]);
   return () => null;
 });
 export {

package/dist/v2/components/MapProvider/MapProvider.js

@@ -8,7 +8,7 @@ import { defineLagecySetup } from "../../types/helper.js";
 import "../../utils/alipayPolyfill.js";
 import { loadTraditionalChineseConvertOnce } from "../../utils/cn2tw.js";
 import { detectWebGL, WEBGL_STATUS, detectBrowserPlatform, OS_PLATFORM, BRWOSER_PLATFORM, detectOSPlatform } from "../../utils/platform.js";
-import { language2vectorMapForeign, vec2lnglat } from "../../utils/transform.js";
+import { vec2lnglat } from "../../utils/transform.js";
 import { Amap } from "../Amap/Amap.js";
 import { Gmap } from "../Gmap/Gmap.js";
 import { t as throttle } from "../../chunks/throttle.8bdd8d3b.js";
@@ -162,7 +162,7 @@ const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
         }, [h(Amap, {
           "attrs": {
             "mapRef": setMap,
-            "vectorMapForeign": language2vectorMapForeign(language),
+            "showOversea": true,
             "center": center,
             "zoom": zoom,
             "dragEnable": touchEnable,

package/dist/v2/types/amap/index.d.ts

@@ -3,6 +3,7 @@ export type * from "./driving";
 export type * from "./geocoder";
 export type * from "./graspRoad";
 export type * from "./marker";
+export type * from "./options";
 export type * from "./place";
 export type * from "./plugin";
 export type * from "./walking";

package/dist/v2/types/amap/options.d.ts

@@ -0,0 +1,8 @@
+export {};
+declare global {
+    namespace AMap {
+        interface MapOptions {
+            showOversea?: boolean;
+        }
+    }
+}

package/dist/v2/types/amap/options.js

@@ -0,0 +1 @@
+

package/dist/v2/utils/log.js

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

package/dist/v2/utils/platform.d.ts

@@ -28,3 +28,4 @@ export declare const detectOSPlatform: () => OS_PLATFORM;
  * Inspired from http://www.browserleaks.com/webgl#howto-detect-webgl
  */
 export declare function detectWebGL(): WEBGL_STATUS;
+export declare function detectTouchDevice(): boolean;

package/dist/v2/utils/platform.js

@@ -80,6 +80,9 @@ function detectWebGL() {
   }
   return "NOT_SUPPORTED";
 }
+function detectTouchDevice() {
+  return "ontouchend" in window || navigator.maxTouchPoints > 0 || navigator.msMaxTouchPoints > 0;
+}
 export {
   ALIPAY_WALLET,
   BRWOSER_PLATFORM,
@@ -88,5 +91,6 @@ export {
   detectAlipayWallet,
   detectBrowserPlatform,
   detectOSPlatform,
+  detectTouchDevice,
   detectWebGL
 };

package/dist/v2/utils/transform.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="google.maps" />
-import type { Language, LngLatLiterial, Place, Point, TrackPoint, Zone } from "../types/interface";
+import type { LngLatLiterial, Place, Point, TrackPoint, Zone } from "../types/interface";
 import type { AlipayMyGetLocationSuccessResponse } from "../types/my";
 import type { WxGetLocationSuccessResponse } from "../types/wx";
 import { BRWOSER_PLATFORM } from "./platform";
@@ -18,8 +18,6 @@ export interface AsteriskItem {
 export declare const decodeAsterisk: (encodedValue: string) => AsteriskItem[];
 export declare const property2emitEventName: (propertyName: string) => string;
 export declare const property2mapEventName: (propertyName: string) => string;
-export type VectorMapForeign = "style_en" | "style_local" | "style_zh_cn";
-export declare const language2vectorMapForeign: (lang: Language) => VectorMapForeign;
 export declare const place2point: (place: Place) => Point;
 export declare const combineHandler: <P extends any[], R>(fn1: ((...args: P) => any) | undefined, fn2: (...args: P) => R) => (...args: P) => R;
 export declare const pipeAsync: <P extends any[]>(fn?: ((...args: P) => any) | undefined) => (...args: P) => void;

package/dist/v2/utils/transform.js

@@ -61,15 +61,6 @@ const property2emitEventName = (propertyName) => {
 const property2mapEventName = (propertyName) => {
   return propertyName.slice(2).toLowerCase();
 };
-const language2vectorMapForeign = (lang) => {
-  switch (lang) {
-    case "en":
-      return "style_en";
-    case "zh-TW":
-    case "zh":
-      return "style_zh_cn";
-  }
-};
 const place2point = (place) => [Number(place.lng), Number(place.lat)];
 const combineHandler = (fn1, fn2) => {
   return (...args) => {
@@ -316,7 +307,6 @@ export {
   isPlaceEqual,
   isPointEqual,
   isZoneEqual,
-  language2vectorMapForeign,
   lnglat2point,
   maybeFunctionToFunction,
   pipeAsync,

package/dist/v3/App.js

@@ -4,8 +4,8 @@ import { DemoBusinessRecomendPlace } from "./Demo/DemoBusinessRecomendPlace.js";
 import { MapProvider } from "./components/MapProvider/MapProvider.js";
 const gmapApiKey = "AIzaSyCCOe8MAeS3EYvSraKsBX6ztVyLxj69z94";
 const gmapId = "d0af0c05331af64a";
-const amapApiKey = "81ed1d2b5b77187683717a5f2f19591a";
-const amapApiSecret = "1dfe626553258a9f91d7c4552c0816d2";
+const amapApiKey = "fcb7b14c930354a248e21f4031dfa179";
+const amapApiSecret = "11ad0e3d585b80d18b1ada5b0d947c4a";
 const App = /* @__PURE__ */ defineComponent({
   setup() {
     const supplierRef = ref("amap");

package/dist/v3/components/Amap/Amap.d.ts

@@ -1,11 +1,10 @@
 import type { SetMap } from "../../hooks/useHeycarMap";
 import type { AmapMap } from "../../types/interface";
 import type { MapEventHandler } from "../../types/mapHelper";
-import { type VectorMapForeign } from "../../utils/transform";
 import { SafeAmap } from "./SafeAmap";
-export interface AmapProps extends Omit<AMap.MapOptions, "vectorMapForeign"> {
-    vectorMapForeign?: VectorMapForeign;
+export interface AmapProps extends Omit<AMap.MapOptions, "viewMode"> {
     mapRef?: SetMap<AmapMap>;
+    viewMode?: "2D" | "3D";
     dragEnable?: boolean;
     zoomEnable?: boolean;
     rotateEnable?: boolean;

package/dist/v3/components/Amap/Amap.js

@@ -14,15 +14,7 @@ import { SafeAmap } from "./SafeAmap.js";
 const Amap_css_ts_vanilla = "";
 var amap = "_1d8ur7t0";
 const Amap = defineSetup("Amap", function(props, { slots, emit, attrs }) {
-  const {
-    onDragStart,
-    onDragEnd,
-    onZoomEnd,
-    onResize,
-    mapRef: setMap,
-    vectorMapForeign = "style_zh_cn",
-    ...defaultOptions
-  } = props;
+  const { onDragStart, onDragEnd, onZoomEnd, onResize, mapRef: setMap, ...defaultOptions } = props;
   const statusOptions = computed(() => {
     const {
       dragEnable = true,
@@ -65,8 +57,7 @@ const Amap = defineSetup("Amap", function(props, { slots, emit, attrs }) {
     const map = new SafeAmap(elementRef.value, {
       ...defaultOptions,
       scrollWheel: defaultOptions.touchZoomCenter ? false : defaultOptions.scrollWheel,
-      doubleClickZoom: defaultOptions.touchZoomCenter ? false : defaultOptions.doubleClickZoom,
-      vectorMapForeign
+      doubleClickZoom: defaultOptions.touchZoomCenter ? false : defaultOptions.doubleClickZoom
     });
     window.GlobalAmap = map;
     mapRef.value = map;

package/dist/v3/components/AmapMarker/AmapMarker.js

@@ -3,12 +3,23 @@ import { useAmap } from "../../hooks/useMap.js";
 import { useMapOverlay } from "../../hooks/useOverlay.js";
 import { defineSetup } from "../../types/helper.js";
 import { watchNoneImmediatePostEffectForMapProperty, watchPostEffectForAMapEvent } from "../../utils/compare.js";
+import { detectTouchDevice } from "../../utils/platform.js";
 import { referenceCount } from "../../utils/referenceCount.js";
 import { useAmapFixBugOverlayDrag } from "../AmapPolygon/AmapPolygon.js";
+const isTouchDevice = detectTouchDevice();
+const shouldSkipByAmapClickDoubleTriggerBug = (e) => {
+  return isTouchDevice && e.originEvent.type === "mouseup";
+};
 const AmapMarker = defineSetup("AmapMarker", function(props, { emit }) {
   const { registerOverlay } = props;
   const markerRef = shallowRef();
   const mapRef = useAmap();
+  const emitClick = (_, e) => {
+    const event = e;
+    if (shouldSkipByAmapClickDoubleTriggerBug(event))
+      return;
+    emit("click", event);
+  };
   onMounted(() => {
     referenceCount.add();
     const { registerOverlay: registerOverlay2, onClick, ...option } = props;
@@ -49,7 +60,7 @@ const AmapMarker = defineSetup("AmapMarker", function(props, { emit }) {
     { name: "title", defaultValue: "" },
     { name: "extData", defaultValue: "" }
   ]);
-  watchPostEffectForAMapEvent(markerRef, props, emit, ["onClick"]);
+  watchPostEffectForAMapEvent(markerRef, props, emitClick, ["onClick"]);
   return () => null;
 });
 export {

package/dist/v3/components/MapProvider/MapProvider.js

@@ -8,7 +8,7 @@ import { defineLagecySetup } from "../../types/helper.js";
 import "../../utils/alipayPolyfill.js";
 import { loadTraditionalChineseConvertOnce } from "../../utils/cn2tw.js";
 import { detectWebGL, WEBGL_STATUS, detectBrowserPlatform, OS_PLATFORM, BRWOSER_PLATFORM, detectOSPlatform } from "../../utils/platform.js";
-import { language2vectorMapForeign, vec2lnglat } from "../../utils/transform.js";
+import { vec2lnglat } from "../../utils/transform.js";
 import { Amap } from "../Amap/Amap.js";
 import { Gmap } from "../Gmap/Gmap.js";
 import { t as throttle } from "../../chunks/throttle.8bdd8d3b.js";
@@ -154,7 +154,7 @@ const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
           "style": attrs.style
         }, [createVNode(Amap, {
           "mapRef": setMap,
-          "vectorMapForeign": language2vectorMapForeign(language),
+          "showOversea": true,
           "center": center,
           "zoom": zoom,
           "dragEnable": touchEnable,

package/dist/v3/types/amap/index.d.ts

@@ -3,6 +3,7 @@ export type * from "./driving";
 export type * from "./geocoder";
 export type * from "./graspRoad";
 export type * from "./marker";
+export type * from "./options";
 export type * from "./place";
 export type * from "./plugin";
 export type * from "./walking";

package/dist/v3/types/amap/options.d.ts

@@ -0,0 +1,8 @@
+export {};
+declare global {
+    namespace AMap {
+        interface MapOptions {
+            showOversea?: boolean;
+        }
+    }
+}

package/dist/v3/types/amap/options.js

@@ -0,0 +1 @@
+

package/dist/v3/utils/log.js

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

package/dist/v3/utils/platform.d.ts

@@ -28,3 +28,4 @@ export declare const detectOSPlatform: () => OS_PLATFORM;
  * Inspired from http://www.browserleaks.com/webgl#howto-detect-webgl
  */
 export declare function detectWebGL(): WEBGL_STATUS;
+export declare function detectTouchDevice(): boolean;

package/dist/v3/utils/platform.js

@@ -80,6 +80,9 @@ function detectWebGL() {
   }
   return "NOT_SUPPORTED";
 }
+function detectTouchDevice() {
+  return "ontouchend" in window || navigator.maxTouchPoints > 0 || navigator.msMaxTouchPoints > 0;
+}
 export {
   ALIPAY_WALLET,
   BRWOSER_PLATFORM,
@@ -88,5 +91,6 @@ export {
   detectAlipayWallet,
   detectBrowserPlatform,
   detectOSPlatform,
+  detectTouchDevice,
   detectWebGL
 };

package/dist/v3/utils/transform.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="google.maps" />
-import type { Language, LngLatLiterial, Place, Point, TrackPoint, Zone } from "../types/interface";
+import type { LngLatLiterial, Place, Point, TrackPoint, Zone } from "../types/interface";
 import type { AlipayMyGetLocationSuccessResponse } from "../types/my";
 import type { WxGetLocationSuccessResponse } from "../types/wx";
 import { BRWOSER_PLATFORM } from "./platform";
@@ -18,8 +18,6 @@ export interface AsteriskItem {
 export declare const decodeAsterisk: (encodedValue: string) => AsteriskItem[];
 export declare const property2emitEventName: (propertyName: string) => string;
 export declare const property2mapEventName: (propertyName: string) => string;
-export type VectorMapForeign = "style_en" | "style_local" | "style_zh_cn";
-export declare const language2vectorMapForeign: (lang: Language) => VectorMapForeign;
 export declare const place2point: (place: Place) => Point;
 export declare const combineHandler: <P extends any[], R>(fn1: ((...args: P) => any) | undefined, fn2: (...args: P) => R) => (...args: P) => R;
 export declare const pipeAsync: <P extends any[]>(fn?: ((...args: P) => any) | undefined) => (...args: P) => void;

package/dist/v3/utils/transform.js

@@ -61,15 +61,6 @@ const property2emitEventName = (propertyName) => {
 const property2mapEventName = (propertyName) => {
   return propertyName.slice(2).toLowerCase();
 };
-const language2vectorMapForeign = (lang) => {
-  switch (lang) {
-    case "en":
-      return "style_en";
-    case "zh-TW":
-    case "zh":
-      return "style_zh_cn";
-  }
-};
 const place2point = (place) => [Number(place.lng), Number(place.lat)];
 const combineHandler = (fn1, fn2) => {
   return (...args) => {
@@ -316,7 +307,6 @@ export {
   isPlaceEqual,
   isPointEqual,
   isZoneEqual,
-  language2vectorMapForeign,
   lnglat2point,
   maybeFunctionToFunction,
   pipeAsync,

package/package.json

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