xy-map 1.1.13 → 1.1.14

package/package.json

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

package/xy-map.common.js

@@ -48493,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);
@@ -48584,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);
@@ -48681,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);
@@ -48726,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}',
@@ -48738,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',
@@ -48753,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

@@ -48511,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);
@@ -48602,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);
@@ -48699,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);
@@ -48744,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}',
@@ -48756,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',
@@ -48771,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);
   });
 };