xy-map 1.1.12 → 1.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xy-map",
-  "version": "1.1.12",
+  "version": "1.1.14",
   "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',
 };
 
 
@@ -24586,14 +24579,14 @@ class mapSdk {
     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({
@@ -48500,7 +48493,7 @@ const addLayerPoint = (option, layerId) => {
   }, layerId);
   if (opt.cluster.cluster) {
     let style = opt.cluster.style || {};
-    clusterLayer(id, style);
+    clusterLayer(opt, style);
   }
   if (opt.click) {
     mapClick(id, opt.click);
@@ -48591,7 +48584,7 @@ const addDiyPoint = (option, layerId) => {
   }, layerId);
   if (opt.cluster.cluster) {
     let style = opt.cluster.style || {};
-    clusterLayer(id, style);
+    clusterLayer(opt, style);
   }
   if (opt.click) {
     mapClick(id, opt.click);
@@ -48688,7 +48681,7 @@ const addLayerImagePoint = async (option, layerId) => {
     }
     if (opt.cluster.cluster) {
       let style = opt.cluster.style || {};
-      clusterLayer(id, style);
+      clusterLayer(opt, style);
     }
     if (opt.click) {
       mapClick(id, opt.click);
@@ -48733,10 +48726,6 @@ const clusterLayer = (option, style) => {
     map
   } = package_map;
   let id = option.id;
-  if (hasLayer(id)) {
-    setSource(id, option.data);
-    return;
-  }
   let layout = style ? style.layout : {};
   let layoutOpt = Object.assign({
     'text-field': '{point_count_abbreviated}',
@@ -48745,8 +48734,10 @@ const clusterLayer = (option, style) => {
   }, layout);
   let paint = style ? style.paint : {};
   let paintOpt = Object.assign({
-    'circle-color': ['step', ['get', 'point_count'], '#51bbd6', 100, '#f1f075', 350, '#f28cb1'],
-    'circle-radius': ['step', ['get', 'point_count'], 20, 100, 30, 750, 40]
+    'circle-color': ['step', ['get', 'point_count'], 'rgba(110, 204, 57, 0.7)', 20, 'rgba(240, 194, 12,  0.7)', 50, 'rgba(241, 128, 23,  0.7)', 100, 'rgba(241, 23, 23,  0.7)'],
+    'circle-stroke-color': ['step', ['get', 'point_count'], 'rgba(110, 204, 57, 0.3)', 20, 'rgba(240, 194, 12, 0.3)', 50, 'rgba(241, 128, 23, 0.3)', 100, 'rgba(241, 23, 23,  0.3)'],
+    'circle-stroke-width': ['step', ['get', 'point_count'], 5, 20, 6, 50, 7, 100, 7],
+    'circle-radius': ['step', ['get', 'point_count'], 16, 20, 18, 50, 20, 100, 21]
   }, paint);
   map.addLayer({
     id: id + '-clusters',
@@ -48760,9 +48751,12 @@ const clusterLayer = (option, style) => {
     type: 'symbol',
     source: option.id,
     filter: ['has', 'point_count'],
-    layout: layoutOpt
+    layout: layoutOpt,
+    paint: {
+      'text-color': '#ffffff'
+    }
   });
-  mapClick(id + 'clusters', e => {
+  mapClick(id + '-clusters', e => {
     package_map.zoom('in', e.position);
   });
 };

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',
 };
 
 
@@ -24604,14 +24597,14 @@ class mapSdk {
     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({
@@ -48518,7 +48511,7 @@ const addLayerPoint = (option, layerId) => {
   }, layerId);
   if (opt.cluster.cluster) {
     let style = opt.cluster.style || {};
-    clusterLayer(id, style);
+    clusterLayer(opt, style);
   }
   if (opt.click) {
     mapClick(id, opt.click);
@@ -48609,7 +48602,7 @@ const addDiyPoint = (option, layerId) => {
   }, layerId);
   if (opt.cluster.cluster) {
     let style = opt.cluster.style || {};
-    clusterLayer(id, style);
+    clusterLayer(opt, style);
   }
   if (opt.click) {
     mapClick(id, opt.click);
@@ -48706,7 +48699,7 @@ const addLayerImagePoint = async (option, layerId) => {
     }
     if (opt.cluster.cluster) {
       let style = opt.cluster.style || {};
-      clusterLayer(id, style);
+      clusterLayer(opt, style);
     }
     if (opt.click) {
       mapClick(id, opt.click);
@@ -48751,10 +48744,6 @@ const clusterLayer = (option, style) => {
     map
   } = package_map;
   let id = option.id;
-  if (hasLayer(id)) {
-    setSource(id, option.data);
-    return;
-  }
   let layout = style ? style.layout : {};
   let layoutOpt = Object.assign({
     'text-field': '{point_count_abbreviated}',
@@ -48763,8 +48752,10 @@ const clusterLayer = (option, style) => {
   }, layout);
   let paint = style ? style.paint : {};
   let paintOpt = Object.assign({
-    'circle-color': ['step', ['get', 'point_count'], '#51bbd6', 100, '#f1f075', 350, '#f28cb1'],
-    'circle-radius': ['step', ['get', 'point_count'], 20, 100, 30, 750, 40]
+    'circle-color': ['step', ['get', 'point_count'], 'rgba(110, 204, 57, 0.7)', 20, 'rgba(240, 194, 12,  0.7)', 50, 'rgba(241, 128, 23,  0.7)', 100, 'rgba(241, 23, 23,  0.7)'],
+    'circle-stroke-color': ['step', ['get', 'point_count'], 'rgba(110, 204, 57, 0.3)', 20, 'rgba(240, 194, 12, 0.3)', 50, 'rgba(241, 128, 23, 0.3)', 100, 'rgba(241, 23, 23,  0.3)'],
+    'circle-stroke-width': ['step', ['get', 'point_count'], 5, 20, 6, 50, 7, 100, 7],
+    'circle-radius': ['step', ['get', 'point_count'], 16, 20, 18, 50, 20, 100, 21]
   }, paint);
   map.addLayer({
     id: id + '-clusters',
@@ -48778,9 +48769,12 @@ const clusterLayer = (option, style) => {
     type: 'symbol',
     source: option.id,
     filter: ['has', 'point_count'],
-    layout: layoutOpt
+    layout: layoutOpt,
+    paint: {
+      'text-color': '#ffffff'
+    }
   });
-  mapClick(id + 'clusters', e => {
+  mapClick(id + '-clusters', e => {
     package_map.zoom('in', e.position);
   });
 };