@mapcatch/util 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapcatch/util",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "main": "./dist/catchUtil.min.js",
   "repository": "",
   "author": "wanyanyan",

package/src/constants/bmap_types.js

@@ -7,14 +7,14 @@ export default [
       {  // 影像地图
         type: 'raster',
         tileSize: 256,
-        tiles: ['http://t0.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=bfc12ce6bd94a4449ad626b8a0b709d0'],
+        tiles: ['https://t0.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=bfc12ce6bd94a4449ad626b8a0b709d0'],
         maxzoom: 18,
         layerType:'bmap'
       }, 
       {  // 影像标注
         type: 'raster',
         tileSize: 256,
-        tiles: ['http://t0.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=bfc12ce6bd94a4449ad626b8a0b709d0'],
+        tiles: ['https://t0.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=bfc12ce6bd94a4449ad626b8a0b709d0'],
         maxzoom: 18,
         layerType:'bmap'
       }
@@ -28,14 +28,14 @@ export default [
       {   // 矢量淡雅
         type: 'raster',
         tileSize: 256,
-        tiles: ['http://t0.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=bfc12ce6bd94a4449ad626b8a0b709d0'],
+        tiles: ['https://t0.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=bfc12ce6bd94a4449ad626b8a0b709d0'],
         maxzoom: 18,
         layerType:'bmap'
       },
       {
         type: 'raster',
         tileSize: 256,
-        tiles: ['http://t0.tianditu.gov.cn/DataServer?T=cva_w&x={x}&y={y}&l={z}&tk=bfc12ce6bd94a4449ad626b8a0b709d0'],
+        tiles: ['https://t0.tianditu.gov.cn/DataServer?T=cva_w&x={x}&y={y}&l={z}&tk=bfc12ce6bd94a4449ad626b8a0b709d0'],
         maxzoom: 18,
         layerType:'bmap'
       }

package/src/constants/layer_groups.js

@@ -22,5 +22,13 @@ export default [
     collapsed: false,
     visible: true,
     opacity: 1
+  },
+  {
+    id: 'overlay',
+    type: 'overlay',
+    name: '覆盖物',
+    collapsed: false,
+    visible: true,
+    opacity: 1
   }
 ]

package/src/constants/layer_icons.js

@@ -1,7 +1,11 @@
 export default {
   annotation: 'icon-biaozhu',
   output: 'icon-chengguo',
-  dataset: 'icon-dataset',
+  dataset: 'icon-photos',
+  overlay: 'icon-dataset',
+  geojson: 'icon-vector',
+  raster: 'icon-tuxiang',
+  object: 'icon-cube',
   dom: 'icon-tuxiang',
   dsm: 'icon-moxing',
   ndvi: 'icon-zhishu',

package/src/util.js

@@ -116,9 +116,10 @@ export function diffLayers(newList, oldList = []) { // 任务详情中的任务
       if (_.isEqual(layer, oldNode)) {
         continue
       }
+      // 有属性更新
       if (['point', 'line', 'polygon'].includes(type)) {
         cmds.push(['updateAnnotations', layer])
-      } if (opacity !== oldOpacity) {
+      } else if (opacity !== oldOpacity || (type === 'geojson' && !_.isEqual(layer.metadata, oldNode.metadata))) {
         cmds.push(['updateLayer', layer])
       } else if (visible !== oldVisible){
         cmds.push([visible?'addLayer':'removeLayer', layer])
@@ -347,8 +348,8 @@ export function getTaskTreeList(taskInfo, annotations, layers) {
   lyrs.forEach(d => {
     let {group} = d
     let groupItem = groups.find(d => d.id === group)
-    if (!groupItem.items) {
-      groupItem.items = []
+    if (!groupItem) {
+      return
     }
     groupItem.items.push(d)
   })