ry-vue-mapv3 0.0.7 → 0.0.9

package/dist/index.js

@@ -903,10 +903,30 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
   const RyMapTool = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-dfd4cfff"]]);
   function ryMapHook(props) {
     let map = null;
+    let _services;
     vue.watch(
       () => props.center,
+      (val) => {
+        if (_services && val.length == 2) {
+          _services.setCenter(val);
+        }
+      },
+      { deep: true }
+    );
+    vue.watch(
+      () => props.bboxRange,
       (val) => {
         console.log("val===", val);
+        if (_services && val.length) {
+          _services.setBBOXRange(val);
+        }
+      },
+      { deep: true }
+    );
+    vue.watch(
+      () => props.bbox,
+      (val) => {
+        setFit(val);
       },
       { deep: true }
     );
@@ -932,7 +952,13 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         viewOptions: getViewOptions(),
         callback: (_map, layers) => {
           map = _map;
-          setFit(props.bbox);
+          _services = lMap;
+          if (props.bboxRange.length) {
+            lMap.setBBOXRange(props.bbox);
+          }
+          if (props && props.bbox.length) {
+            setFit(props.bbox);
+          }
           callback({
             map,
             mapServices: lMap,
@@ -1050,6 +1076,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         bingResolutionEvent(val);
       }
     );
+    vue.watch(
+      () => props.isMapSize,
+      (val) => {
+        updateMapSize();
+      }
+    );
     function getHit(evt) {
       if (evt.dragging) {
         return;
@@ -1204,6 +1236,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         view.un("change:resolution", resolutionFun);
       }
     }
+    function updateMapSize() {
+      if (!map) return;
+      map.updateSize();
+    }
     return {
       init,
       mapClickOnce,
@@ -1212,7 +1248,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       dblClick,
       setLastMapType,
       changeSwitch,
-      bingResolutionEvent
+      bingResolutionEvent,
+      updateMapSize
     };
   }
   const CollectionEventType = {
@@ -18337,6 +18374,26 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     get DrawZIndex() {
       return this.drawZIndex;
     }
+    setBBOXRange(number) {
+      if (number.length === 1) {
+        this.setCenter(number[0], 15);
+        return;
+      }
+      const am = new ryMapts.AM();
+      number.forEach((val) => {
+        const [X, Y] = val;
+        am.getLngAndLatMaxMin({
+          X,
+          Y
+        });
+      });
+      const [x1, y1, x2, y2] = am.getLngLats();
+      if (!x1[0] || !y1[0] || x2[0] === 400 || y2[0] === 400) return;
+      this.fit([
+        [x1, y1],
+        [x2, y2]
+      ]);
+    }
   }
   let MapDto$1 = class MapDto {
     constructor() {
@@ -18471,6 +18528,16 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         type: Number,
         default: 17
       });
+      // 地图大小重置
+      __publicField(this, "isMapSize", {
+        type: Boolean,
+        default: false
+      });
+      // bbox范围
+      __publicField(this, "bboxRange", {
+        type: Array,
+        default: []
+      });
     }
   };
   class MapDto {
@@ -21070,6 +21137,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         type: Boolean,
         default: true
       });
+      // 异步加载KML时间默认100毫秒
+      __publicField(this, "time", {
+        type: Number,
+        default: 100
+      });
     }
   }
   const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
@@ -21129,7 +21201,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           }, 50);
         }
       };
-      const _insert = (dto) => {
+      const _insert = async (dto) => {
         const {
           id,
           url: kmlUrl,
@@ -21157,6 +21229,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           extractStyles
         );
         url.value = kmlUrl;
+        await kml.init(props.time);
         gcj02Url.value = kmlGcj02Url;
         setBBOXArr(bbox2);
       };
@@ -21263,6 +21336,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         type: Object,
         default: () => null
       });
+      // 异步加载KML时间默认100毫秒
+      __publicField(this, "time", {
+        type: Number,
+        default: 100
+      });
     }
   }
   const _sfc_main$2 = /* @__PURE__ */ vue.defineComponent({
@@ -21365,7 +21443,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           }, 50);
         }
       };
-      const _insert = (dto) => {
+      const _insert = async (dto) => {
         const {
           id,
           url,
@@ -21379,6 +21457,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           gcj02Url
         } = dto;
         if (!kmlMap.value.has(id)) {
+          console.log(dto);
+          console.log(props.map);
           const lKml = new ryMapts.LKML(
             {
               id,
@@ -21393,6 +21473,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
             props.map,
             extractStyles
           );
+          await lKml.init(props.time);
           kmlMap.value.set(id, lKml);
           urls.value.set(id, url);
           if (gcj02Url) {

package/dist/index.mjs

@@ -902,10 +902,30 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
 const RyMapTool = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-dfd4cfff"]]);
 function ryMapHook(props) {
   let map = null;
+  let _services;
   watch(
     () => props.center,
+    (val) => {
+      if (_services && val.length == 2) {
+        _services.setCenter(val);
+      }
+    },
+    { deep: true }
+  );
+  watch(
+    () => props.bboxRange,
     (val) => {
       console.log("val===", val);
+      if (_services && val.length) {
+        _services.setBBOXRange(val);
+      }
+    },
+    { deep: true }
+  );
+  watch(
+    () => props.bbox,
+    (val) => {
+      setFit(val);
     },
     { deep: true }
   );
@@ -931,7 +951,13 @@ function ryMapHook(props) {
       viewOptions: getViewOptions(),
       callback: (_map, layers) => {
         map = _map;
-        setFit(props.bbox);
+        _services = lMap;
+        if (props.bboxRange.length) {
+          lMap.setBBOXRange(props.bbox);
+        }
+        if (props && props.bbox.length) {
+          setFit(props.bbox);
+        }
         callback({
           map,
           mapServices: lMap,
@@ -1049,6 +1075,12 @@ function useMapEvent(props) {
       bingResolutionEvent(val);
     }
   );
+  watch(
+    () => props.isMapSize,
+    (val) => {
+      updateMapSize();
+    }
+  );
   function getHit(evt) {
     if (evt.dragging) {
       return;
@@ -1203,6 +1235,10 @@ function useMapEvent(props) {
       view.un("change:resolution", resolutionFun);
     }
   }
+  function updateMapSize() {
+    if (!map) return;
+    map.updateSize();
+  }
   return {
     init,
     mapClickOnce,
@@ -1211,7 +1247,8 @@ function useMapEvent(props) {
     dblClick,
     setLastMapType,
     changeSwitch,
-    bingResolutionEvent
+    bingResolutionEvent,
+    updateMapSize
   };
 }
 const CollectionEventType = {
@@ -18336,6 +18373,26 @@ class LMapServices {
   get DrawZIndex() {
     return this.drawZIndex;
   }
+  setBBOXRange(number) {
+    if (number.length === 1) {
+      this.setCenter(number[0], 15);
+      return;
+    }
+    const am = new AM();
+    number.forEach((val) => {
+      const [X, Y] = val;
+      am.getLngAndLatMaxMin({
+        X,
+        Y
+      });
+    });
+    const [x1, y1, x2, y2] = am.getLngLats();
+    if (!x1[0] || !y1[0] || x2[0] === 400 || y2[0] === 400) return;
+    this.fit([
+      [x1, y1],
+      [x2, y2]
+    ]);
+  }
 }
 let MapDto$1 = class MapDto {
   constructor() {
@@ -18470,6 +18527,16 @@ let MapDto$1 = class MapDto {
       type: Number,
       default: 17
     });
+    // 地图大小重置
+    __publicField(this, "isMapSize", {
+      type: Boolean,
+      default: false
+    });
+    // bbox范围
+    __publicField(this, "bboxRange", {
+      type: Array,
+      default: []
+    });
   }
 };
 class MapDto2 {
@@ -21069,6 +21136,11 @@ class RyKMLDto extends Base {
       type: Boolean,
       default: true
     });
+    // 异步加载KML时间默认100毫秒
+    __publicField(this, "time", {
+      type: Number,
+      default: 100
+    });
   }
 }
 const _sfc_main$3 = /* @__PURE__ */ defineComponent({
@@ -21128,7 +21200,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         }, 50);
       }
     };
-    const _insert = (dto) => {
+    const _insert = async (dto) => {
       const {
         id,
         url: kmlUrl,
@@ -21156,6 +21228,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         extractStyles
       );
       url.value = kmlUrl;
+      await kml.init(props.time);
       gcj02Url.value = kmlGcj02Url;
       setBBOXArr(bbox2);
     };
@@ -21262,6 +21335,11 @@ class RyKMLDtoArr extends Base {
       type: Object,
       default: () => null
     });
+    // 异步加载KML时间默认100毫秒
+    __publicField(this, "time", {
+      type: Number,
+      default: 100
+    });
   }
 }
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
@@ -21364,7 +21442,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
         }, 50);
       }
     };
-    const _insert = (dto) => {
+    const _insert = async (dto) => {
       const {
         id,
         url,
@@ -21378,6 +21456,8 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
         gcj02Url
       } = dto;
       if (!kmlMap.value.has(id)) {
+        console.log(dto);
+        console.log(props.map);
         const lKml = new LKML(
           {
             id,
@@ -21392,6 +21472,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           props.map,
           extractStyles
         );
+        await lKml.init(props.time);
         kmlMap.value.set(id, lKml);
         urls.value.set(id, url);
         if (gcj02Url) {

package/dist/models/ryKML/index.d.ts

@@ -16,4 +16,8 @@ export default class RyKMLDto extends Base {
         type: BooleanConstructor;
         default: boolean;
     };
+    time: {
+        type: NumberConstructor;
+        default: number;
+    };
 }

package/dist/models/ryKMLs/index.d.ts

@@ -28,4 +28,8 @@ export default class RyKMLDtoArr extends Base {
         type: ObjectConstructor;
         default: () => null;
     };
+    time: {
+        type: NumberConstructor;
+        default: number;
+    };
 }

package/dist/models/ryMap/index.d.ts

@@ -76,4 +76,12 @@ export default class MapDto {
         type: NumberConstructor;
         default: number;
     };
+    isMapSize: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    bboxRange: {
+        type: ArrayConstructor;
+        default: never[];
+    };
 }

package/dist/ryKML/src/index.d.ts

@@ -16,6 +16,10 @@ declare const _default: DefineComponent<ExtractPropTypes<{
         type: BooleanConstructor;
         default: boolean;
     };
+    time: {
+        type: NumberConstructor;
+        default: number;
+    };
     map: {
         type: ObjectConstructor;
         default: () => null;
@@ -41,6 +45,10 @@ declare const _default: DefineComponent<ExtractPropTypes<{
         type: BooleanConstructor;
         default: boolean;
     };
+    time: {
+        type: NumberConstructor;
+        default: number;
+    };
     map: {
         type: ObjectConstructor;
         default: () => null;
@@ -52,6 +60,7 @@ declare const _default: DefineComponent<ExtractPropTypes<{
 }>> & Readonly<{}>, {
     map: Record<string, any>;
     clear: boolean;
+    time: number;
     gpsType: number;
     model: Record<string, any>;
     isShow: boolean;

package/dist/ryKMLs/src/index.d.ts

@@ -28,6 +28,10 @@ declare const _default: DefineComponent<ExtractPropTypes<{
         type: ObjectConstructor;
         default: () => null;
     };
+    time: {
+        type: NumberConstructor;
+        default: number;
+    };
     map: {
         type: ObjectConstructor;
         default: () => null;
@@ -65,6 +69,10 @@ declare const _default: DefineComponent<ExtractPropTypes<{
         type: ObjectConstructor;
         default: () => null;
     };
+    time: {
+        type: NumberConstructor;
+        default: number;
+    };
     map: {
         type: ObjectConstructor;
         default: () => null;
@@ -76,6 +84,7 @@ declare const _default: DefineComponent<ExtractPropTypes<{
 }>> & Readonly<{}>, {
     map: Record<string, any>;
     clear: boolean;
+    time: number;
     gpsType: number;
     isFit: boolean;
     modelArr: unknown[];

package/dist/ryMap/src/index.d.ts

@@ -728,6 +728,14 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
         type: NumberConstructor;
         default: number;
     };
+    isMapSize: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    bboxRange: {
+        type: ArrayConstructor;
+        default: never[];
+    };
 }>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     changeSwitchMap: (...args: any[]) => void;
     loadDrawPolygonEvent: (...args: any[]) => void;
@@ -924,6 +932,14 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
         type: NumberConstructor;
         default: number;
     };
+    isMapSize: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    bboxRange: {
+        type: ArrayConstructor;
+        default: never[];
+    };
 }>> & Readonly<{
     onChangeSwitchMap?: ((...args: any[]) => any) | undefined;
     onLoadDrawPolygonEvent?: ((...args: any[]) => any) | undefined;
@@ -982,6 +998,8 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
     isShowSwitchMap: boolean;
     resolution: boolean;
     zoomedIn: number;
+    isMapSize: boolean;
+    bboxRange: unknown[];
 }, {}, {}, {}, string, ComponentProvideOptions, true, {
     mapTool: ({
         $: ComponentInternalInstance;

package/dist/utils/lMapServices.d.ts

@@ -146,4 +146,5 @@ export default class LMapServices {
     }): Promise<void>;
     set DrawZIndex(zIndex: number);
     get DrawZIndex(): number;
+    setBBOXRange(number: [][]): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ry-vue-mapv3",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "type": "module",
   "files": [
     "dist"