@heycar/heycars-map 0.6.8 → 0.6.10

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
 }) {
@@ -3129,6 +3159,7 @@ function wechatWatchPosition(onSuccess, onError, option) {
   let enable = true;
   let interval = WX_GET_LOCATION_INTERVAL_STILL;
   let prevGeoPosition = void 0;
+  const isGeoWorkingRef = Vue.ref(true);
   const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
   const startWatch = async () => {
     await wxReady();
@@ -3137,7 +3168,7 @@ function wechatWatchPosition(onSuccess, onError, option) {
         await sleep$1(WX_GET_LOCATION_INTERVAL_FAST);
         continue;
       }
-      const geoPosition = await new Promise((resolve, reject) => {
+      const geoPosition = await new Promise((resolve) => {
         let isHandled = false;
         wx.getLocation({
           type: "wgs84",
@@ -3145,6 +3176,7 @@ function wechatWatchPosition(onSuccess, onError, option) {
             if (isHandled)
               return;
             isHandled = true;
+            isGeoWorkingRef.value = true;
             const speed = Number(res.speed);
             interval = speed === 0 ? WX_GET_LOCATION_INTERVAL_STILL : speed < 2 ? WX_GET_LOCATION_INTERVAL_SLOW : WX_GET_LOCATION_INTERVAL_FAST;
             resolve(wxGetLocationSuccessResponse2GeolocationPosition(res));
@@ -3153,9 +3185,13 @@ function wechatWatchPosition(onSuccess, onError, option) {
             if (isHandled)
               return;
             isHandled = true;
-            const error = new Error(res.errMsg);
-            reject(error);
-            onError == null ? void 0 : onError(error);
+            const isGeoWorking = isGeoWorkingRef.value;
+            isGeoWorkingRef.value = false;
+            console.warn("MyWarning: wx.getLocation failed msg = ", res.errMsg);
+            resolve(void 0);
+            if (!isGeoWorking)
+              return;
+            onError == null ? void 0 : onError(new Error(res.errMsg));
           }
         });
         if (!timeout)
@@ -3286,7 +3322,7 @@ const useGeoLocation = (props) => {
   var _a, _b;
   const { onChange, onLoad, onLoadDefault, onError, geoDefaultPosition } = props != null ? props : {};
   const { toGcj02 } = useMapGCJ02();
-  let isOnLoadDefaultTriggered = false;
+  let isOnLoadTriggered = false;
   const loading = Vue.ref(false);
   const readyRef = Vue.ref(false);
   const errorRef = Vue.ref();
@@ -3314,9 +3350,11 @@ const useGeoLocation = (props) => {
           const point = await toGcj02(wgsPoint);
           coordinateRef.value = coordinate;
           positionRef.value = point;
+          errorRef.value = void 0;
           if (loading.value) {
             loading.value = false;
             readyRef.value = true;
+            isOnLoadTriggered = true;
             onLoad == null ? void 0 : onLoad({ position: point, coordinate });
           }
           onChange == null ? void 0 : onChange({ position: point, coordinate });
@@ -3326,8 +3364,8 @@ const useGeoLocation = (props) => {
           loading.value = false;
           errorRef.value = error;
           const position = props == null ? void 0 : props.geoDefaultPosition;
-          if (position && !isOnLoadDefaultTriggered) {
-            isOnLoadDefaultTriggered = true;
+          if (position && !isOnLoadTriggered) {
+            isOnLoadTriggered = true;
             onLoadDefault == null ? void 0 : onLoadDefault({ position });
           }
           onError == null ? void 0 : onError(error);

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
 }) {
@@ -3127,6 +3157,7 @@ function wechatWatchPosition(onSuccess, onError, option) {
   let enable = true;
   let interval = WX_GET_LOCATION_INTERVAL_STILL;
   let prevGeoPosition = void 0;
+  const isGeoWorkingRef = ref(true);
   const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
   const startWatch = async () => {
     await wxReady();
@@ -3135,7 +3166,7 @@ function wechatWatchPosition(onSuccess, onError, option) {
         await sleep$1(WX_GET_LOCATION_INTERVAL_FAST);
         continue;
       }
-      const geoPosition = await new Promise((resolve, reject) => {
+      const geoPosition = await new Promise((resolve) => {
         let isHandled = false;
         wx.getLocation({
           type: "wgs84",
@@ -3143,6 +3174,7 @@ function wechatWatchPosition(onSuccess, onError, option) {
             if (isHandled)
               return;
             isHandled = true;
+            isGeoWorkingRef.value = true;
             const speed = Number(res.speed);
             interval = speed === 0 ? WX_GET_LOCATION_INTERVAL_STILL : speed < 2 ? WX_GET_LOCATION_INTERVAL_SLOW : WX_GET_LOCATION_INTERVAL_FAST;
             resolve(wxGetLocationSuccessResponse2GeolocationPosition(res));
@@ -3151,9 +3183,13 @@ function wechatWatchPosition(onSuccess, onError, option) {
             if (isHandled)
               return;
             isHandled = true;
-            const error = new Error(res.errMsg);
-            reject(error);
-            onError == null ? void 0 : onError(error);
+            const isGeoWorking = isGeoWorkingRef.value;
+            isGeoWorkingRef.value = false;
+            console.warn("MyWarning: wx.getLocation failed msg = ", res.errMsg);
+            resolve(void 0);
+            if (!isGeoWorking)
+              return;
+            onError == null ? void 0 : onError(new Error(res.errMsg));
           }
         });
         if (!timeout)
@@ -3284,7 +3320,7 @@ const useGeoLocation = (props) => {
   var _a, _b;
   const { onChange, onLoad, onLoadDefault, onError, geoDefaultPosition } = props != null ? props : {};
   const { toGcj02 } = useMapGCJ02();
-  let isOnLoadDefaultTriggered = false;
+  let isOnLoadTriggered = false;
   const loading = ref(false);
   const readyRef = ref(false);
   const errorRef = ref();
@@ -3312,9 +3348,11 @@ const useGeoLocation = (props) => {
           const point = await toGcj02(wgsPoint);
           coordinateRef.value = coordinate;
           positionRef.value = point;
+          errorRef.value = void 0;
           if (loading.value) {
             loading.value = false;
             readyRef.value = true;
+            isOnLoadTriggered = true;
             onLoad == null ? void 0 : onLoad({ position: point, coordinate });
           }
           onChange == null ? void 0 : onChange({ position: point, coordinate });
@@ -3324,8 +3362,8 @@ const useGeoLocation = (props) => {
           loading.value = false;
           errorRef.value = error;
           const position = props == null ? void 0 : props.geoDefaultPosition;
-          if (position && !isOnLoadDefaultTriggered) {
-            isOnLoadDefaultTriggered = true;
+          if (position && !isOnLoadTriggered) {
+            isOnLoadTriggered = true;
             onLoadDefault == null ? void 0 : onLoadDefault({ position });
           }
           onError == null ? void 0 : onError(error);

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.8",
+  "version": "0.6.10",
   "type": "module",
   "scripts": {
     "dev": "vite -c vite.config.dev.ts",