@heycar/heycars-map 0.6.9 → 0.6.11

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

@@ -15,8 +15,9 @@ export interface AmapProps extends Omit<AMap.MapOptions, "vectorMapForeign"> {
     touchZoomCenter?: 0 | 1;
     onDragStart?: MapEventHandler<AMap.Map>;
     onDragEnd?: MapEventHandler<AMap.Map>;
+    onZoomStart?: MapEventHandler<AMap.Map>;
     onZoomEnd?: MapEventHandler<AMap.Map>;
     onResize?: MapEventHandler<AMap.Map>;
     onMoveend?: MapEventHandler<AMap.Map>;
 }
-export declare const Amap: import("vue-demi").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<AmapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<AmapProps, Required<AmapProps>>, "resize" | "moveend" | "dragStart" | "dragEnd" | "zoomEnd", AmapProps, {}>;
+export declare const Amap: import("vue-demi").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<AmapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<AmapProps, Required<AmapProps>>, "resize" | "moveend" | "dragStart" | "dragEnd" | "zoomStart" | "zoomEnd", AmapProps, {}>;

package/dist/index.cjs

@@ -1893,6 +1893,34 @@ const useMapLoader = (props) => {
     onChange
   });
 };
+var WEBGL_STATUS = /* @__PURE__ */ ((WEBGL_STATUS2) => {
+  WEBGL_STATUS2["NOT_SUPPORTED"] = "NOT_SUPPORTED";
+  WEBGL_STATUS2["DISABLED"] = "DISABLED";
+  WEBGL_STATUS2["ENABLED"] = "ENABLED";
+  return WEBGL_STATUS2;
+})(WEBGL_STATUS || {});
+function detectWebGL() {
+  if (typeof window === "undefined")
+    return "NOT_SUPPORTED";
+  if (window.WebGLRenderingContext) {
+    const canvas = document.createElement("canvas");
+    const names = ["webgl", "experimental-webgl", "moz-webgl", "webkit-3d"];
+    let context2 = null;
+    for (const name of names) {
+      try {
+        context2 = canvas.getContext(name);
+        if (context2 && typeof context2.getParameter === "function") {
+          return "ENABLED";
+        }
+      } catch (e) {
+        console.error("MyError: detectWebGL catch e = ", e);
+        return "NOT_SUPPORTED";
+      }
+    }
+    return "DISABLED";
+  }
+  return "NOT_SUPPORTED";
+}
 const ZOOM_WHEEL_RATIO = -135e-5;
 const useAmapWheelZoomCenter = (props) => {
   const { mapRef, enableRef } = props;
@@ -1984,7 +2012,7 @@ const Amap = defineSetup(function Amap2(props, { slots, emit }) {
   );
   watchNoneImmediatePostEffectForMapProperty(mapRef, props, [
     { name: "center", defaultValue: [0, 0] },
-    { name: "zooms", defaultValue: [0, 0] },
+    { name: "zooms", defaultValue: [2, 20] },
     { name: "zoom", defaultValue: 0 },
     { name: "layers", defaultValue: [] },
     { name: "limitBounds", defaultValue: [] },
@@ -2134,7 +2162,6 @@ var createRuntimeFn = (config) => (options) => {
   return className;
 };
 var gmap = "_7anfuo0";
-createRuntimeFn({ defaultClassName: "", variantClassNames: { enable: { true: "_7anfuo1", false: "_7anfuo2" } }, defaultVariants: {}, compoundVariants: [] });
 const Gmap = defineSetup(function Gmap2(props, { slots, emit }) {
   const setMap = props.mapRef;
   const { onResize } = props;
@@ -2207,6 +2234,9 @@ const Loading = defineSetup(function Loading2() {
   })]);
 });
 window.movingDraw = !new URLSearchParams(location.search).has("disableMovingDraw");
+if (detectWebGL() === WEBGL_STATUS.ENABLED) {
+  window.forceWebGL = true;
+}
 const MapProvider = defineLagecySetup(function MapProvider2(props, {
   slots
 }) {
@@ -3385,12 +3415,28 @@ const useAmapDrag = (props) => {
   const centerRef = Vue.ref([0, 0]);
   const isDragging = Vue.ref(false);
   const isDragEndWaitingMovingEndRef = Vue.ref(false);
+  let isZoom = false;
+  let zoomStartCenter = void 0;
   let watchId = void 0;
   const emitDragStart = () => {
     pipeAsync(() => {
       isDragging.value = true;
     })();
   };
+  const handleZoomStart = () => {
+    var _a;
+    isZoom = true;
+    zoomStartCenter = (_a = mapRef.value) == null ? void 0 : _a.getCenter().toJSON();
+  };
+  const handleChange = (value) => {
+    console.log("useAmapDrag value, zoomStartCenter = ", value, zoomStartCenter);
+    if (isZoom) {
+      isZoom = false;
+      if (isPointEqual(value, zoomStartCenter))
+        return;
+    }
+    onChange == null ? void 0 : onChange(value);
+  };
   const handleDragEndWithAnimationEnd = (target) => {
     var _a;
     isDragEndWaitingMovingEndRef.value = false;
@@ -3398,7 +3444,7 @@ const useAmapDrag = (props) => {
     const { lng, lat } = target.getCenter();
     spaceLog("onDragEndWithAnimationEnd", "[lng, lat] = ", [lng, lat]);
     centerRef.value = [lng, lat];
-    (_a = pipeAsync(onChange)) == null ? void 0 : _a([lng, lat]);
+    (_a = pipeAsync(handleChange)) == null ? void 0 : _a([lng, lat]);
   };
   const emitDragEnd = (_, { target }) => {
     const { lng: baseLng, lat: baseLat } = target.getCenter();
@@ -3420,6 +3466,9 @@ const useAmapDrag = (props) => {
       return;
     handleDragEndWithAnimationEnd(target);
   };
+  watchPostEffectForAMapEvent(mapRef, {}, handleZoomStart, [
+    "onZoomStart"
+  ]);
   watchPostEffectForAMapEvent(mapRef, {}, emitDragStart, [
     "onDragStart"
   ]);

package/dist/index.js

@@ -1891,6 +1891,34 @@ const useMapLoader = (props) => {
     onChange
   });
 };
+var WEBGL_STATUS = /* @__PURE__ */ ((WEBGL_STATUS2) => {
+  WEBGL_STATUS2["NOT_SUPPORTED"] = "NOT_SUPPORTED";
+  WEBGL_STATUS2["DISABLED"] = "DISABLED";
+  WEBGL_STATUS2["ENABLED"] = "ENABLED";
+  return WEBGL_STATUS2;
+})(WEBGL_STATUS || {});
+function detectWebGL() {
+  if (typeof window === "undefined")
+    return "NOT_SUPPORTED";
+  if (window.WebGLRenderingContext) {
+    const canvas = document.createElement("canvas");
+    const names = ["webgl", "experimental-webgl", "moz-webgl", "webkit-3d"];
+    let context2 = null;
+    for (const name of names) {
+      try {
+        context2 = canvas.getContext(name);
+        if (context2 && typeof context2.getParameter === "function") {
+          return "ENABLED";
+        }
+      } catch (e) {
+        console.error("MyError: detectWebGL catch e = ", e);
+        return "NOT_SUPPORTED";
+      }
+    }
+    return "DISABLED";
+  }
+  return "NOT_SUPPORTED";
+}
 const ZOOM_WHEEL_RATIO = -135e-5;
 const useAmapWheelZoomCenter = (props) => {
   const { mapRef, enableRef } = props;
@@ -1982,7 +2010,7 @@ const Amap = defineSetup(function Amap2(props, { slots, emit }) {
   );
   watchNoneImmediatePostEffectForMapProperty(mapRef, props, [
     { name: "center", defaultValue: [0, 0] },
-    { name: "zooms", defaultValue: [0, 0] },
+    { name: "zooms", defaultValue: [2, 20] },
     { name: "zoom", defaultValue: 0 },
     { name: "layers", defaultValue: [] },
     { name: "limitBounds", defaultValue: [] },
@@ -2132,7 +2160,6 @@ var createRuntimeFn = (config) => (options) => {
   return className;
 };
 var gmap = "_7anfuo0";
-createRuntimeFn({ defaultClassName: "", variantClassNames: { enable: { true: "_7anfuo1", false: "_7anfuo2" } }, defaultVariants: {}, compoundVariants: [] });
 const Gmap = defineSetup(function Gmap2(props, { slots, emit }) {
   const setMap = props.mapRef;
   const { onResize } = props;
@@ -2205,6 +2232,9 @@ const Loading = defineSetup(function Loading2() {
   })]);
 });
 window.movingDraw = !new URLSearchParams(location.search).has("disableMovingDraw");
+if (detectWebGL() === WEBGL_STATUS.ENABLED) {
+  window.forceWebGL = true;
+}
 const MapProvider = defineLagecySetup(function MapProvider2(props, {
   slots
 }) {
@@ -3383,12 +3413,28 @@ const useAmapDrag = (props) => {
   const centerRef = ref([0, 0]);
   const isDragging = ref(false);
   const isDragEndWaitingMovingEndRef = ref(false);
+  let isZoom = false;
+  let zoomStartCenter = void 0;
   let watchId = void 0;
   const emitDragStart = () => {
     pipeAsync(() => {
       isDragging.value = true;
     })();
   };
+  const handleZoomStart = () => {
+    var _a;
+    isZoom = true;
+    zoomStartCenter = (_a = mapRef.value) == null ? void 0 : _a.getCenter().toJSON();
+  };
+  const handleChange = (value) => {
+    console.log("useAmapDrag value, zoomStartCenter = ", value, zoomStartCenter);
+    if (isZoom) {
+      isZoom = false;
+      if (isPointEqual(value, zoomStartCenter))
+        return;
+    }
+    onChange == null ? void 0 : onChange(value);
+  };
   const handleDragEndWithAnimationEnd = (target) => {
     var _a;
     isDragEndWaitingMovingEndRef.value = false;
@@ -3396,7 +3442,7 @@ const useAmapDrag = (props) => {
     const { lng, lat } = target.getCenter();
     spaceLog("onDragEndWithAnimationEnd", "[lng, lat] = ", [lng, lat]);
     centerRef.value = [lng, lat];
-    (_a = pipeAsync(onChange)) == null ? void 0 : _a([lng, lat]);
+    (_a = pipeAsync(handleChange)) == null ? void 0 : _a([lng, lat]);
   };
   const emitDragEnd = (_, { target }) => {
     const { lng: baseLng, lat: baseLat } = target.getCenter();
@@ -3418,6 +3464,9 @@ const useAmapDrag = (props) => {
       return;
     handleDragEndWithAnimationEnd(target);
   };
+  watchPostEffectForAMapEvent(mapRef, {}, handleZoomStart, [
+    "onZoomStart"
+  ]);
   watchPostEffectForAMapEvent(mapRef, {}, emitDragStart, [
     "onDragStart"
   ]);

package/dist/utils/platform.d.ts

@@ -0,0 +1,25 @@
+export declare enum BRWOSER_PLATFORM {
+    WECHAT = "WECHAT",
+    WECHAT_MINIPROGRAM = "WECHAT_MINIPROGRAM",
+    ALIPAY = "ALIPAY",
+    ALIPAY_MINIPROGRAM = "ALIPAY_MINIPROGRAM",
+    H5 = "H5",
+    NODE_JS = "NODE_JS"
+}
+export declare enum OS_PLATFORM {
+    IOS = "IOS",
+    ANDROID = "ANDROID",
+    OTHER = "OTHER"
+}
+export declare enum WEBGL_STATUS {
+    NOT_SUPPORTED = "NOT_SUPPORTED",
+    DISABLED = "DISABLED",
+    ENABLED = "ENABLED"
+}
+export declare const detectBrowserPlatform: () => BRWOSER_PLATFORM;
+export declare const detectOSPlatform: () => OS_PLATFORM;
+/**
+ * Detects if WebGL is enabled.
+ * Inspired from http://www.browserleaks.com/webgl#howto-detect-webgl
+ */
+export declare function detectWebGL(): WEBGL_STATUS;

package/package.json

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

package/todo.md

@@ -1,131 +1,6 @@
 https://dawchihliou.github.io/articles/building-custom-google-maps-marker-react-component-like-airbnb-in-nextjs
 
-2. Google 地址名称太长
-3. 高德地图加载期间出现大量的请求
-4. map 的两个 slot loading 和 error slot 没有生效
-5. 企业微信如果关闭定位，会不停的跳 geoError 事件
-
-二期：
-
-1. 绿区数据格式约定
-2. map loading 设计稿
-
-缩放问题
-
-- 4867
-- 4920
-
-章新华
-
-- 5238
-
-不明白的
-
-- 5294
-
-需要复现
-
-- 5044
-- 5113
-- 5291
-- 5257 我的 safari 没有问题
-
-  0.4.3
-
-- 5105
-
-  0.4.4
-
-- 5057
-
-  0.4.5
-
-- 5215
-
-  0.4.6
-
-- 4824
-- 4809
-- 4836
-- 4915
-- 5228
-
-  0.4.8
-
-- 5014
-
-  0.4.9
-
-- 4903
-- 5006
-- 5017
-- 5238
-
-  0.5.0
-
-- 5284
-- 5314
-- 5313
-- 5297
-- 5277
-- 5244
-- 5198
-- 5173
-- 5168
-
-  0.5.1
-
-- 5303
-- 5329
-- 4769
-- 5044 （跟章新华说下）
-- 5314
-- 5347
-- 5348
-- 5057
-
-  0.5.3
-
-- 4867
-- 4920
-- 5252
-- 5366
-- 5364
-- 5373
-
-  0.5.4
-
-- 5375
-- 4946
-
-  0.5.5
-
-- 4977
-- 5381
-
-  0.5.6
-
-- 5455
-
-  0.5.9
-
-- 5500
-- 5524
-
-  0.6.3
-
-- 5623
-- 5625
-- 5550
-- 5546
-- 5541
-- 5540
-
-  0.6.5
-
-- 5640
-- 5631
-- 5614
-- 5598
-- 5567
-- 5560
+1. Google 地址名称太长
+2. 企业微信如果关闭定位，会不停的跳 geoError 事件
+3. regeo 不应该阻塞 getRecommendPlace
+4. 手机缩放导致 onPlaceChange 触发，并且 getRecommendPlace 也被调用了