xy-map 1.1.31 → 1.1.32

package/package.json

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

package/xy-map.common.js

@@ -43868,7 +43868,9 @@ var defaultOptions = {
     'sources': {
       'nav': {
         'type': 'raster',
-        'tiles': ['https://api.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}.jpg?access_token=pk.eyJ1IjoiaGo0NjI3NzEzOTYiLCJhIjoiY2w5YzNjOTZvMDF6NDNwb2d6YmJkYWRpMCJ9.-fW-OChGB1oY2DCMO_c8sg' // mapbox
+        'tiles': [
+        // 'https://tiles2.geovisearth.com/base/v1/img/{z}/{x}/{y}?format=webp&tmsIds=w&token=74b34fe951b7f641aacb67fbfb0dfb14a445c7ae4481de804740e8b297d6fdec', // 星球影像
+        'https://api.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}.jpg?access_token=pk.eyJ1IjoiaGo0NjI3NzEzOTYiLCJhIjoiY2w5YzNjOTZvMDF6NDNwb2d6YmJkYWRpMCJ9.-fW-OChGB1oY2DCMO_c8sg' // mapbox
         // 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', // ArcGIS
         // 'https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}', // 高德
         // 'https://map.ynmdgq.com/{z}/{x}/{y}.png' // 本地
@@ -43884,6 +43886,12 @@ var defaultOptions = {
       'source': 'nav'
     }]
   },
+  light: {
+    anchor: 'map',
+    // “viewport”：光照位置不变，所以building旋转的时候，其表面明暗程度会变化； “map”：光照随地图位置变化，所以buliding旋转的时候，其表面明显程度不会变化了
+    color: 'white',
+    intensity: 0.4
+  },
   is3d: true,
   // 3d视图
   antialias: false,
@@ -70906,15 +70914,20 @@ const addLayerPoint = (option, layerId) => {
 /**
  * 添加闪烁点图层
  */
-const addFlashPoint = (option = {
-  id: 'flash',
-  data: [],
-  time: 0,
-  // 闪烁时间
-  size: 140 // 大小
-}, layerId) => {
+const addFlashPoint = (option = {}, layerId) => {
   // 点
 
+  option = Object.assign({}, {
+    id: 'flash',
+    data: [],
+    time: 0,
+    // 闪烁时间
+    size: 140,
+    // 大小
+    outerRgb: [255, 255, 255],
+    centerColor: 'rgba(255, 100, 100, 1)',
+    strokeColor: '#fff'
+  }, option);
   let {
     map
   } = package_map;
@@ -70940,14 +70953,14 @@ const addFlashPoint = (option = {
       context.clearRect(0, 0, this.width, this.height);
       context.beginPath();
       context.arc(this.width / 2, this.height / 2, outerRadius, 0, Math.PI * 2);
-      context.fillStyle = `rgba(255, 255, 255, ${1 - t})`;
+      context.fillStyle = `rgba(${option.outerRgb[0]}, ${option.outerRgb[1]}, ${option.outerRgb[2]}, ${1 - t})`;
       context.fill();
 
       // Draw the inner circle.
       context.beginPath();
       context.arc(this.width / 2, this.height / 2, radius, 0, Math.PI * 2);
-      context.fillStyle = 'rgba(255, 100, 100, 1)';
-      context.strokeStyle = 'white';
+      context.fillStyle = option.centerColor;
+      context.strokeStyle = option.strokeColor;
       context.lineWidth = 2 + 4 * (1 - t);
       context.fill();
       context.stroke();

package/xy-map.umd.js

@@ -43886,7 +43886,9 @@ var defaultOptions = {
     'sources': {
       'nav': {
         'type': 'raster',
-        'tiles': ['https://api.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}.jpg?access_token=pk.eyJ1IjoiaGo0NjI3NzEzOTYiLCJhIjoiY2w5YzNjOTZvMDF6NDNwb2d6YmJkYWRpMCJ9.-fW-OChGB1oY2DCMO_c8sg' // mapbox
+        'tiles': [
+        // 'https://tiles2.geovisearth.com/base/v1/img/{z}/{x}/{y}?format=webp&tmsIds=w&token=74b34fe951b7f641aacb67fbfb0dfb14a445c7ae4481de804740e8b297d6fdec', // 星球影像
+        'https://api.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}.jpg?access_token=pk.eyJ1IjoiaGo0NjI3NzEzOTYiLCJhIjoiY2w5YzNjOTZvMDF6NDNwb2d6YmJkYWRpMCJ9.-fW-OChGB1oY2DCMO_c8sg' // mapbox
         // 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', // ArcGIS
         // 'https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}', // 高德
         // 'https://map.ynmdgq.com/{z}/{x}/{y}.png' // 本地
@@ -43902,6 +43904,12 @@ var defaultOptions = {
       'source': 'nav'
     }]
   },
+  light: {
+    anchor: 'map',
+    // “viewport”：光照位置不变，所以building旋转的时候，其表面明暗程度会变化； “map”：光照随地图位置变化，所以buliding旋转的时候，其表面明显程度不会变化了
+    color: 'white',
+    intensity: 0.4
+  },
   is3d: true,
   // 3d视图
   antialias: false,
@@ -70924,15 +70932,20 @@ const addLayerPoint = (option, layerId) => {
 /**
  * 添加闪烁点图层
  */
-const addFlashPoint = (option = {
-  id: 'flash',
-  data: [],
-  time: 0,
-  // 闪烁时间
-  size: 140 // 大小
-}, layerId) => {
+const addFlashPoint = (option = {}, layerId) => {
   // 点
 
+  option = Object.assign({}, {
+    id: 'flash',
+    data: [],
+    time: 0,
+    // 闪烁时间
+    size: 140,
+    // 大小
+    outerRgb: [255, 255, 255],
+    centerColor: 'rgba(255, 100, 100, 1)',
+    strokeColor: '#fff'
+  }, option);
   let {
     map
   } = package_map;
@@ -70958,14 +70971,14 @@ const addFlashPoint = (option = {
       context.clearRect(0, 0, this.width, this.height);
       context.beginPath();
       context.arc(this.width / 2, this.height / 2, outerRadius, 0, Math.PI * 2);
-      context.fillStyle = `rgba(255, 255, 255, ${1 - t})`;
+      context.fillStyle = `rgba(${option.outerRgb[0]}, ${option.outerRgb[1]}, ${option.outerRgb[2]}, ${1 - t})`;
       context.fill();
 
       // Draw the inner circle.
       context.beginPath();
       context.arc(this.width / 2, this.height / 2, radius, 0, Math.PI * 2);
-      context.fillStyle = 'rgba(255, 100, 100, 1)';
-      context.strokeStyle = 'white';
+      context.fillStyle = option.centerColor;
+      context.strokeStyle = option.strokeColor;
       context.lineWidth = 2 + 4 * (1 - t);
       context.fill();
       context.stroke();