@mapcatch/util 1.0.1 → 1.0.3

package/package.json

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

package/src/constants/bmap_types.js

@@ -0,0 +1,44 @@
+export default [
+  {
+    type: 'image',
+    img: 'satellite',
+    name: '影像地图',
+    items: [
+      {  // 影像地图
+        type: 'raster',
+        tileSize: 256,
+        tiles: ['http://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'],
+        maxzoom: 18,
+        layerType:'bmap'
+      }
+    ]
+  },
+  {
+    type: 'vector_standard',
+    img: 'vector_standard',
+    name: '矢量地图',
+    items: [
+      {   // 矢量淡雅
+        type: 'raster',
+        tileSize: 256,
+        tiles: ['http://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'],
+        maxzoom: 18,
+        layerType:'bmap'
+      }
+    ]
+  }
+]

package/src/constants/colors.js

@@ -0,0 +1,10 @@
+export default [
+  '#321644',
+  '#455dd1',
+  '#2eb4f2',
+  '#26eda6',
+  '#c3f134',
+  '#f8bd39',
+  '#e14209',
+  '#7a0403'
+]

package/src/constants/default_layers.js

@@ -0,0 +1,58 @@
+export default [
+  {
+    type: 'dom',
+    name: '正射影像（DOM）',
+    group: 'output',
+    visible: true,
+    opacity: 1,
+    class: 'image2d'
+  },
+  {
+    type: 'tmp',
+    name: '温度图',
+    group: 'output',
+    visible: true,
+    opacity: 1,
+    class: 'tmp'
+  },
+  {
+    type: 'dsm',
+    name: '数字表面模型（DSM）',
+    group: 'output',
+    visible: false,
+    opacity: 0.5,
+    class: 'image2d'
+  },
+  {
+    type: 'mesh3d',
+    name: '三维模型',
+    group: 'output',
+    visible: true,
+    opacity: 1,
+    class: 'mesh3d'
+  },
+  // {
+  //   type: 'point_cloud',
+  //   name: '三维点云',
+  //   group: 'output',
+  //   visible: false,
+  //   opacity: 1,
+  //   dataTypes: ['normal']
+  // },
+  {
+    type: 'ndvi',
+    name: '植被指数（NDVI）',
+    group: 'output',
+    visible: true,
+    opacity: 1,
+    class: 'ndvi'
+  },
+  {
+    type: 'photos',
+    name: '照片',
+    group: 'dataset',
+    visible: false,
+    opacity: 1,
+    class: 'photos'
+  }
+]

package/src/constants/index.js

@@ -1 +1,10 @@
-export {default as cameras} from './cameras'
+export {default as cameras} from './cameras'
+export {default as layerGroups} from './layer_groups'
+export {default as bmapTypes} from './bmap_types'
+export {default as colors} from './colors'
+export {default as defaultLayers} from './default_layers'
+export {default as layerFolders} from './layer_folders'
+export {default as layerIcons} from './layer_icons'
+export {default as mapViewModes} from './map_view_mode'
+export {default as taskParams} from './task_params'
+export {default as tools} from './tools'

package/src/constants/layer_folders.js

@@ -0,0 +1,6 @@
+export default {
+  dom: 'tile',
+  dsm: 'dsm_tile',
+  ndvi: 'ndvi_tile',
+  tmp: 'tem_tile'
+}

package/src/constants/layer_groups.js

@@ -0,0 +1,26 @@
+export default [
+  {
+    id: 'annotation',
+    type: 'annotation',
+    name: '标注',
+    collapsed: false,
+    visible: true,
+    opacity: 1
+  },
+  {
+    id: 'output',
+    type: 'output',
+    name: '成果图层',
+    collapsed: false,
+    visible: true,
+    opacity: 1
+  },
+  {
+    id: 'dataset',
+    type: 'dataset',
+    name: '数据集',
+    collapsed: false,
+    visible: true,
+    opacity: 1
+  }
+]

package/src/constants/layer_icons.js

@@ -0,0 +1,14 @@
+export default {
+  annotation: 'icon-biaozhu',
+  output: 'icon-chengguo',
+  dataset: 'icon-dataset',
+  dom: 'icon-tuxiang',
+  dsm: 'icon-moxing',
+  ndvi: 'icon-zhishu',
+  mesh3d: 'icon-mesh',
+  point_cloud: 'icon-dianyun',
+  photos: 'icon-24gf-photoAlbum',
+  point: 'icon-locate',
+  line: 'icon-line',
+  polygon: 'icon-polygon'
+}

package/src/constants/map_view_mode.js

@@ -0,0 +1,10 @@
+export default [
+  {
+    name: '2d',
+    icon: 'icon-view_d'
+  },
+  {
+    name: '3d',
+    icon: 'icon-view_d1'
+  }
+]

package/src/constants/task_params.js

@@ -0,0 +1,33 @@
+export default {
+  quality: 'medium',     // high、low、medium
+  output: {
+    normal: [
+      {
+        type: 'image2d',
+        name: '二维正射（DOM+DSM）'
+      },
+      {
+        type: 'mesh3d',
+        name: '三维模型（3DTiles）'
+      }
+    ],
+    infrared: [
+      {
+        type: 'tmp',
+        name: '温度图',
+        required: true
+      }
+    ],
+    multispectral: [
+      {
+        type: 'image2d',
+        name: '二维正射（DOM+DSM）'
+      },
+      {
+        type: 'ndvi',
+        name: '植被指数（NDVI）',
+        required: true
+      }
+    ]
+  }
+}

package/src/constants/tools.js

@@ -0,0 +1,20 @@
+export default [
+  {
+    type: 'draw_point',
+    mode: 'draw_point',
+    name: '标点',
+    icon: 'icon-locate'
+  },
+  {
+    type: 'draw_line_string',
+    mode: 'draw_line_string',
+    name: '标线',
+    icon: 'icon-line'
+  },
+  {
+    type: 'draw_polygon',
+    mode: 'draw_polygon',
+    name: '标面',
+    icon: 'icon-polygon'
+  }
+]

package/src/exif/parse_image.js

@@ -20,7 +20,7 @@ export const getData = function (img, callback) {
     getImageData(img, callback);
   } else {
     if (callback) {
-      callback.call(img);
+      callback(img);
     }
   }
   return true;
@@ -38,7 +38,7 @@ function getImageData(img, callback) {
         img.xmpdata = xmpdata || {};
       }
       if (callback) {
-        callback.call(img);
+        callback(img);
       }
     } catch (err) {
       callback(null, err)

package/src/util.js

@@ -5,6 +5,7 @@ import _ from 'lodash'
 import {getPhotoTags} from './exif'
 import cameras from './constants/cameras'
 import * as turf from '@turf/turf'
+import { layerGroups } from './constants'
 
 export function generateId() { // 生成随机id
   return uuidv4()
@@ -13,7 +14,7 @@ export function formatDate(date) {
   if (!date) {
     return '-'
   }
-  return moment().format('YYYY-MM-DD HH:mm:ss')
+  return moment(date).format('YYYY-MM-DD HH:mm:ss')
 }
 export function formatLocalDate() {
   return moment().format('YYYY/M/D HH:mm:ss')
@@ -311,13 +312,13 @@ export function getLineLabelFeature(lineFeature) {
   midPoint.geometry.coordinates.push(((labelLine[0][2] || 0) + (labelLine[1][2] || 0)) / 2)
   return midPoint
 }
-export function project(lngLat) { // 经纬度转墨卡托像素坐标
+export function project(lngLat, zoom=12) { // 经纬度转墨卡托像素坐标
   let [lng, lat] = lngLat
   let x = (180 + lng) / 360
   let y = (180 - (180 / Math.PI) * Math.log(Math.tan(Math.PI / 4 + (lat * Math.PI) / 360))) / 360
   return {
-    x: x * Math.pow(2, 12) * 512,
-    y: y * Math.pow(2, 12) * 512
+    x: x * Math.pow(2, zoom) * 512,
+    y: y * Math.pow(2, zoom) * 512
   }
 }
 export function addIcons2Map (map, icons) {
@@ -329,4 +330,27 @@ export function addIcons2Map (map, icons) {
       map.addImage(iconName, image)
     })
   })
+}
+
+export function getTaskTreeList(taskInfo, annotations, layers) {
+  let groups = _.cloneDeep(taskInfo.metadata?.groups || layerGroups)
+  groups.forEach(g => g.items = [])
+  annotations.forEach(item => {
+    let info = _.cloneDeep(item)
+    if (!info.group) {
+      info.group === 'annotation'
+    }
+    let groupItem = groups.find(d => d.id === info.group)
+    groupItem.items.push(info)
+  })
+  let lyrs = taskInfo.status === 'complete' ? layers : []
+  lyrs.forEach(d => {
+    let {group} = d
+    let groupItem = groups.find(d => d.id === group)
+    if (!groupItem.items) {
+      groupItem.items = []
+    }
+    groupItem.items.push(d)
+  })
+  return groups
 }