xy-map 1.1.11 → 1.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xy-map",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "雄越地图",
   "main": "xy-map.umd.min.js",
   "scripts": {

package/xy-map.common.js

@@ -24404,7 +24404,7 @@ var style_map = __webpack_require__(7193);
 var defaultOptions = {
   container: 'map',
   zoom: 12,
-  // maxZoom: 18,
+  maxZoom: 18,
   center: [102.485544, 24.921785],
   pitch: 0,
   // 3d倾斜视角
@@ -24438,9 +24438,10 @@ var defaultOptions = {
         'tiles': ['https://api.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}.jpg?access_token=pk.eyJ1IjoiaGo0NjI3NzEzOTYiLCJhIjoiY2w5YzNjOTZvMDF6NDNwb2d6YmJkYWRpMCJ9.-fW-OChGB1oY2DCMO_c8sg'
         // 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
         // 'https://map.ynmdgq.com/{z}/{x}/{y}.png'
+        // 'http://t7.tianditu.gov.cn/img_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=f3c2ca3a170f5712abd7b6858e038f18',
         ],
 
-        'tileSize': 256
+        'tileSize': 512
       }
     },
     'layers': [{
@@ -24450,15 +24451,7 @@ var defaultOptions = {
     }]
   },
   defaultLanguage: 'zh',
-  // preserveDrawingBuffer: true, // 允许地图导出为图片
-  // sprite: 'mapbox://sprites/mapbox/bright-v8', //不受地图旋转缩放影响的图标等，类似精灵漂浮在空中，当有 layer 使用了 background-pattern、fill-pattern、line-pattern、fill-extrusion-pattern、icon-image 等属性时，sprite 必填。
-  // transition: { //全局的过渡动画属性
-  //   duration: 300, // 过渡的持续时间（可选，单位：毫秒，默认值为 300）
-  //   delay: 0 // 延迟多久开始过渡（可选，单位：毫秒，默认值为 0）
-  // },
   is3d: true // 3d视图
-  // glyphs: 'mapbox://fonts/mapbox/{fontstack}/{range}.pbf'
-  // style: 'mapbox://styles/mapbox/streets-v9',
 };
 
 
@@ -24583,18 +24576,17 @@ class mapSdk {
    * 添加雾
    */
   addFog(night = false) {
-    if (!this.options.fog) return;
     let map = this.map;
     if (night || this.options.night) {
       // 晚上
-      // map.setFog({
-      //   'range': [1, 15],
-      //   'horizon-blend': 0.1,
-      //   'color': '#242B4B',
-      //   'high-color': '#161B36',
-      //   'space-color': '#0B1026',
-      //   'star-intensity': 0.1
-      // })
+      map.setFog({
+        'range': [1, 15],
+        'horizon-blend': 0.1,
+        'color': '#242B4B',
+        'high-color': '#161B36',
+        'space-color': '#0B1026',
+        'star-intensity': 0.1
+      });
     } else {
       // 天空
       map.addLayer({
@@ -24607,7 +24599,7 @@ class mapSdk {
           'sky-atmosphere-sun-intensity': 30
         }
       });
-
+      if (!this.options.fog) return;
       // 白天
       map.setFog({
         'range': [1, 15],
@@ -58835,8 +58827,8 @@ var point_component = normalizeComponent(
 )
 
 /* harmony default export */ var draw_point = (point_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=template&id=32bb3fda&
-var linevue_type_template_id_32bb3fda_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=template&id=0a0718ee&
+var linevue_type_template_id_0a0718ee_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -58892,7 +58884,7 @@ var linevue_type_template_id_32bb3fda_render = function render() {
     }
   }, [_vm._v("保存")])], 1)])], 1);
 };
-var linevue_type_template_id_32bb3fda_staticRenderFns = [];
+var linevue_type_template_id_0a0718ee_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=template&id=42f41398&scoped=true&
 var shpFilevue_type_template_id_42f41398_scoped_true_render = function render() {
@@ -59008,7 +59000,7 @@ var shpFile_component = normalizeComponent(
     showDeleteBtn: {
       // 删除按钮
       type: Boolean,
-      default: true
+      default: false
     },
     showClearBtn: {
       // 清空按钮
@@ -59129,8 +59121,8 @@ var shpFile_component = normalizeComponent(
 ;
 var line_component = normalizeComponent(
   draw_linevue_type_script_lang_js_,
-  linevue_type_template_id_32bb3fda_render,
-  linevue_type_template_id_32bb3fda_staticRenderFns,
+  linevue_type_template_id_0a0718ee_render,
+  linevue_type_template_id_0a0718ee_staticRenderFns,
   false,
   null,
   null,
@@ -59139,8 +59131,8 @@ var line_component = normalizeComponent(
 )
 
 /* harmony default export */ var line = (line_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=template&id=3db4718a&
-var polygonvue_type_template_id_3db4718a_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=template&id=31fde69b&
+var polygonvue_type_template_id_31fde69b_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -59196,7 +59188,7 @@ var polygonvue_type_template_id_3db4718a_render = function render() {
     }
   }, [_vm._v("保存")])], 1)])], 1);
 };
-var polygonvue_type_template_id_3db4718a_staticRenderFns = [];
+var polygonvue_type_template_id_31fde69b_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=script&lang=js&
 
@@ -59240,7 +59232,7 @@ var polygonvue_type_template_id_3db4718a_staticRenderFns = [];
     showDeleteBtn: {
       // 删除按钮
       type: Boolean,
-      default: true
+      default: false
     },
     showClearBtn: {
       // 清空按钮
@@ -59361,8 +59353,8 @@ var polygonvue_type_template_id_3db4718a_staticRenderFns = [];
 ;
 var polygon_component = normalizeComponent(
   draw_polygonvue_type_script_lang_js_,
-  polygonvue_type_template_id_3db4718a_render,
-  polygonvue_type_template_id_3db4718a_staticRenderFns,
+  polygonvue_type_template_id_31fde69b_render,
+  polygonvue_type_template_id_31fde69b_staticRenderFns,
   false,
   null,
   null,

package/xy-map.umd.js

@@ -24422,7 +24422,7 @@ var style_map = __webpack_require__(4321);
 var defaultOptions = {
   container: 'map',
   zoom: 12,
-  // maxZoom: 18,
+  maxZoom: 18,
   center: [102.485544, 24.921785],
   pitch: 0,
   // 3d倾斜视角
@@ -24456,9 +24456,10 @@ var defaultOptions = {
         'tiles': ['https://api.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}.jpg?access_token=pk.eyJ1IjoiaGo0NjI3NzEzOTYiLCJhIjoiY2w5YzNjOTZvMDF6NDNwb2d6YmJkYWRpMCJ9.-fW-OChGB1oY2DCMO_c8sg'
         // 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
         // 'https://map.ynmdgq.com/{z}/{x}/{y}.png'
+        // 'http://t7.tianditu.gov.cn/img_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=f3c2ca3a170f5712abd7b6858e038f18',
         ],
 
-        'tileSize': 256
+        'tileSize': 512
       }
     },
     'layers': [{
@@ -24468,15 +24469,7 @@ var defaultOptions = {
     }]
   },
   defaultLanguage: 'zh',
-  // preserveDrawingBuffer: true, // 允许地图导出为图片
-  // sprite: 'mapbox://sprites/mapbox/bright-v8', //不受地图旋转缩放影响的图标等，类似精灵漂浮在空中，当有 layer 使用了 background-pattern、fill-pattern、line-pattern、fill-extrusion-pattern、icon-image 等属性时，sprite 必填。
-  // transition: { //全局的过渡动画属性
-  //   duration: 300, // 过渡的持续时间（可选，单位：毫秒，默认值为 300）
-  //   delay: 0 // 延迟多久开始过渡（可选，单位：毫秒，默认值为 0）
-  // },
   is3d: true // 3d视图
-  // glyphs: 'mapbox://fonts/mapbox/{fontstack}/{range}.pbf'
-  // style: 'mapbox://styles/mapbox/streets-v9',
 };
 
 
@@ -24601,18 +24594,17 @@ class mapSdk {
    * 添加雾
    */
   addFog(night = false) {
-    if (!this.options.fog) return;
     let map = this.map;
     if (night || this.options.night) {
       // 晚上
-      // map.setFog({
-      //   'range': [1, 15],
-      //   'horizon-blend': 0.1,
-      //   'color': '#242B4B',
-      //   'high-color': '#161B36',
-      //   'space-color': '#0B1026',
-      //   'star-intensity': 0.1
-      // })
+      map.setFog({
+        'range': [1, 15],
+        'horizon-blend': 0.1,
+        'color': '#242B4B',
+        'high-color': '#161B36',
+        'space-color': '#0B1026',
+        'star-intensity': 0.1
+      });
     } else {
       // 天空
       map.addLayer({
@@ -24625,7 +24617,7 @@ class mapSdk {
           'sky-atmosphere-sun-intensity': 30
         }
       });
-
+      if (!this.options.fog) return;
       // 白天
       map.setFog({
         'range': [1, 15],
@@ -58853,8 +58845,8 @@ var point_component = normalizeComponent(
 )
 
 /* harmony default export */ var draw_point = (point_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=template&id=32bb3fda&
-var linevue_type_template_id_32bb3fda_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=template&id=0a0718ee&
+var linevue_type_template_id_0a0718ee_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -58910,7 +58902,7 @@ var linevue_type_template_id_32bb3fda_render = function render() {
     }
   }, [_vm._v("保存")])], 1)])], 1);
 };
-var linevue_type_template_id_32bb3fda_staticRenderFns = [];
+var linevue_type_template_id_0a0718ee_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=template&id=42f41398&scoped=true&
 var shpFilevue_type_template_id_42f41398_scoped_true_render = function render() {
@@ -59026,7 +59018,7 @@ var shpFile_component = normalizeComponent(
     showDeleteBtn: {
       // 删除按钮
       type: Boolean,
-      default: true
+      default: false
     },
     showClearBtn: {
       // 清空按钮
@@ -59147,8 +59139,8 @@ var shpFile_component = normalizeComponent(
 ;
 var line_component = normalizeComponent(
   draw_linevue_type_script_lang_js_,
-  linevue_type_template_id_32bb3fda_render,
-  linevue_type_template_id_32bb3fda_staticRenderFns,
+  linevue_type_template_id_0a0718ee_render,
+  linevue_type_template_id_0a0718ee_staticRenderFns,
   false,
   null,
   null,
@@ -59157,8 +59149,8 @@ var line_component = normalizeComponent(
 )
 
 /* harmony default export */ var line = (line_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=template&id=3db4718a&
-var polygonvue_type_template_id_3db4718a_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=template&id=31fde69b&
+var polygonvue_type_template_id_31fde69b_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -59214,7 +59206,7 @@ var polygonvue_type_template_id_3db4718a_render = function render() {
     }
   }, [_vm._v("保存")])], 1)])], 1);
 };
-var polygonvue_type_template_id_3db4718a_staticRenderFns = [];
+var polygonvue_type_template_id_31fde69b_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=script&lang=js&
 
@@ -59258,7 +59250,7 @@ var polygonvue_type_template_id_3db4718a_staticRenderFns = [];
     showDeleteBtn: {
       // 删除按钮
       type: Boolean,
-      default: true
+      default: false
     },
     showClearBtn: {
       // 清空按钮
@@ -59379,8 +59371,8 @@ var polygonvue_type_template_id_3db4718a_staticRenderFns = [];
 ;
 var polygon_component = normalizeComponent(
   draw_polygonvue_type_script_lang_js_,
-  polygonvue_type_template_id_3db4718a_render,
-  polygonvue_type_template_id_3db4718a_staticRenderFns,
+  polygonvue_type_template_id_31fde69b_render,
+  polygonvue_type_template_id_31fde69b_staticRenderFns,
   false,
   null,
   null,