@heycar/heycars-map 0.9.27-google3 → 0.9.27-google5

package/dist/business-components/PlaceCircle/PlaceCircle.js

@@ -1,4 +1,4 @@
-import "../../css/PlaceCircle-2369f992.css";
+import "../../css/PlaceCircle-3c051f4e.css";
 import { computed, h } from "vue";
 import "../../chunks/index.fbc1adc8.js";
 import { ZINDEX_PLACE_LAYER } from "../../api/contants.js";

package/dist/components/Amap/Amap.js

@@ -2,6 +2,7 @@ import "../../css/Amap-139f163d.css";
 import "../../chunks/index.fbc1adc8.js";
 import { MAX_ANIMATION_DISTANCE_VW } from "../../api/contants.js";
 import { provideAmap } from "../../hooks/useMap.js";
+import { useAmapDoubleClickZoomCenter } from "../../hooks/useMapGestureZoomCenter.js";
 import { useMapLngLatToVw } from "../../hooks/useMapLngLatToVw.js";
 import { useAmapWheelZoomCenter } from "../../hooks/useMapWheelZoomCenter.js";
 import { defineSetup } from "../../types/helper.js";
@@ -31,11 +32,11 @@ const Amap = defineSetup(function Amap2(props, { slots, emit }) {
       rotateEnable = true,
       animateEnable = true,
       keyboardEnable = true,
-      doubleClickZoom = true,
       touchZoom = true,
       touchZoomCenter = 0
     } = props;
     const scrollWheel = touchZoomCenter ? false : props.scrollWheel;
+    const doubleClickZoom = touchZoomCenter ? false : props.doubleClickZoom;
     return {
       dragEnable,
       zoomEnable,
@@ -52,9 +53,11 @@ const Amap = defineSetup(function Amap2(props, { slots, emit }) {
   });
   const elementRef = shallowRef();
   const mapRef = shallowRef();
+  const touchZoomCenterRef = computed(() => !!props.touchZoomCenter);
   provideAmap(mapRef);
   const { apiMapDistanceVwOfPoints } = useMapLngLatToVw({ mapRef });
-  useAmapWheelZoomCenter({ mapRef, enableRef: computed(() => !!props.touchZoomCenter) });
+  useAmapWheelZoomCenter({ mapRef, enableRef: touchZoomCenterRef });
+  useAmapDoubleClickZoomCenter({ elementRef, mapRef, enableRef: touchZoomCenterRef });
   watchPostEffect((onCleanup) => {
     if (mapRef.value || !elementRef.value)
       return;
@@ -62,6 +65,7 @@ const Amap = defineSetup(function Amap2(props, { slots, emit }) {
     const map = new SafeAmap(elementRef.value, {
       ...defaultOptions,
       scrollWheel: defaultOptions.touchZoomCenter ? false : defaultOptions.scrollWheel,
+      doubleClickZoom: defaultOptions.touchZoomCenter ? false : defaultOptions.doubleClickZoom,
       vectorMapForeign
     });
     window.GlobalAmap = map;

package/dist/css/{PlaceCircle-2369f992.css → PlaceCircle-3c051f4e.css}

@@ -12,7 +12,6 @@
   margin-left: -2.265vw;
 }
 .fhyw85 {
-  margin-bottom: -2.265vw;
   width: max-content;
 }
 .fhyw86 {

package/dist/hooks/useMapGestureZoomCenter.d.ts

@@ -1,9 +1,11 @@
 /// <reference types="google.maps" />
 import { type Ref, type ShallowRef } from "vue-demi";
-interface UseMapGestureZoomCenterProps {
+import type { AmapMap } from "../types/interface";
+interface UseMapGestureZoomCenterProps<M = AmapMap | google.maps.Map> {
     elementRef: ShallowRef<HTMLDivElement | undefined>;
-    mapRef: ShallowRef<google.maps.Map | undefined>;
+    mapRef: ShallowRef<M | undefined>;
     enableRef: Ref<boolean>;
 }
-export declare const useGmapGestureZoomCenter: (props: UseMapGestureZoomCenterProps) => void;
+export declare const useAmapDoubleClickZoomCenter: (props: UseMapGestureZoomCenterProps<AmapMap>) => void;
+export declare const useGmapGestureZoomCenter: (props: UseMapGestureZoomCenterProps<google.maps.Map>) => void;
 export {};

package/dist/hooks/useMapGestureZoomCenter.js

@@ -7,6 +7,26 @@ const SCALE_RATIO = 0.1;
 const GMAP_MAX_ZOOM = 22;
 const DOUBLE_CLICK_ZOOM_ANIMATION_DURATION = 750;
 const distanceOf = (x, y) => Math.sqrt((y[0] - x[0]) ** 2 + (y[1] - x[1]) ** 2);
+const useAmapDoubleClickZoomCenter = (props) => {
+  const { mapRef } = props;
+  watch(
+    [() => props.elementRef.value, () => props.enableRef.value],
+    ([element, enable], _, onCleanup) => {
+      if (!element || !enable)
+        return;
+      const handleDoubleTap = () => {
+        var _a;
+        const map = mapRef.value;
+        if (!map)
+          return;
+        const zoom = (_a = map.getZoom()) != null ? _a : ZOOM_IF_NOT_EXIST;
+        map.setZoom(Math.min(GMAP_MAX_ZOOM, zoom + 1), false, DOUBLE_CLICK_ZOOM_ANIMATION_DURATION);
+      };
+      const unsubscribeDoubleTap = subscribeDoubleTap(element, handleDoubleTap);
+      onCleanup(unsubscribeDoubleTap);
+    }
+  );
+};
 const useGmapGestureZoomCenter = (props) => {
   const { mapRef } = props;
   watch(
@@ -110,5 +130,6 @@ const useGmapGestureZoomCenter = (props) => {
   );
 };
 export {
+  useAmapDoubleClickZoomCenter,
   useGmapGestureZoomCenter
 };

package/dist/hooks/useMapLoader.js

@@ -1,6 +1,5 @@
 import "../chunks/index.fbc1adc8.js";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
-import { createRunOnce } from "../utils/helper.js";
 import { shallowRef, computed } from "vue";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 var distExports = {};
@@ -605,7 +604,6 @@ const useAmapLoader = (props) => {
   );
   return { statusRef, readyPromise };
 };
-const languageOnlyOnce = createRunOnce((lang) => lang);
 const useGmapLoader = (props) => {
   const { onChange } = props;
   let resolveLoader;
@@ -625,8 +623,7 @@ const useGmapLoader = (props) => {
   watchPostEffectForDeepOption(
     () => optionsRef.value,
     (options) => {
-      var _a;
-      const language = languageOnlyOnce((_a = props.language) != null ? _a : "zh");
+      const language = navigator.language;
       const loader = new Loader({ ...options, language });
       const setStatusAndExecuteCallback = (status) => {
         statusRef.value = status;

package/dist/utils/log.js

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

package/dist/utils/transform.js

@@ -77,7 +77,6 @@ const isGeoPositionEqual = (p1, p2) => {
 const isZoneEqual = (z1, z2) => {
   return z1.path.every((point, idx) => isPointEqual(point, z2 == null ? void 0 : z2.path[idx]));
 };
-const ILLEGAL_DISPLAY_NAME_WITHOUT_STREET_NUMBER_REGEX = /(?:^\s*$|\(\)|（）)/;
 const amapPlaceName2DisplayName = (name, options) => {
   const { isChina } = options;
   if (!name)
@@ -85,19 +84,19 @@ const amapPlaceName2DisplayName = (name, options) => {
   return isChina ? amapPlaceName2DisplayNameInChina(name, options) : amapPlaceName2DisplayNameOutChina(name, options);
 };
 function amapPlaceName2DisplayNameInChina(name, options) {
-  const { province, city, district, township, building, neighborhood, street, streetNumber } = options;
+  const { province, city, district, township, building, neighborhood } = options;
   if (building)
     return building;
   if (neighborhood)
     return neighborhood;
   let result = name;
   for (const item of [province, city, district, township]) {
-    if (result.trim() === item)
-      return item;
-    result = result.replace(item, "");
+    const replacedName = result.replace(item, "");
+    if (replacedName.length < 20)
+      return replacedName;
+    result = replacedName;
   }
-  const resultWithoutStreetNumber = result.replace(street, "").replace(streetNumber, "");
-  return ILLEGAL_DISPLAY_NAME_WITHOUT_STREET_NUMBER_REGEX.test(resultWithoutStreetNumber) ? result : resultWithoutStreetNumber;
+  return result;
 }
 const NOT_ONLY_NUMBERS_REGEX = /[^\d\s-]/;
 function amapPlaceName2DisplayNameOutChina(name, options) {

package/package.json

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