@mapcatch/util 1.0.9 → 1.0.10-a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapcatch/util",
-  "version": "1.0.9",
+  "version": "1.0.10-a",
   "main": "./dist/catchUtil.min.esm.js",
   "repository": "",
   "author": "wanyanyan",
@@ -19,7 +19,6 @@
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "regl": "^2.1.0",
-    "spark-md5": "^3.0.2",
     "upng-js": "^2.1.0",
     "uuid": "^9.0.0"
   },

package/src/constants/bmap_types.js

@@ -7,8 +7,8 @@ export default [
       {  // 影像地图
         type: 'raster',
         tileSize: 256,
-        tiles: ['https://t0.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=bfc12ce6bd94a4449ad626b8a0b709d0'],
-        maxzoom: 18,
+        tiles: ['http://ecn.t3.tiles.virtualearth.net/tiles/a{quadkey}.jpeg?g=1'],
+        maxzoom: 19,
         layerType:'bmap'
       }, 
       {  // 影像标注

package/src/constants/crs_types.js

@@ -0,0 +1,22 @@
+export default {
+  LOCAL_ENU: {
+    code: 0,
+    name: 'LOCAL_ENU'
+  },
+  LOCAL: {
+    code: 1,
+    name: 'LOCAL'
+  },
+  GEOGCS: {
+    code: 2,
+    name: 'Geographic'
+  },
+  PROJCS: {
+    code: 3,
+    name: 'Projected'
+  },
+  GEOCCS: {
+    code: 4,
+    name: 'Geocentric'
+  }
+}

package/src/constants/default_layers.js

@@ -29,16 +29,16 @@ export default [
     group: 'output',
     visible: true,
     opacity: 1,
-    class: 'mesh3d'
+    class: '3d_tiles'
+  },
+  {
+    type: 'point_cloud',
+    name: '三维点云',
+    group: 'output',
+    visible: false,
+    opacity: 1,
+    class: 'pnts'
   },
-  // {
-  //   type: 'point_cloud',
-  //   name: '三维点云',
-  //   group: 'output',
-  //   visible: false,
-  //   opacity: 1,
-  //   dataTypes: ['normal']
-  // },
   {
     type: 'ndvi',
     name: '植被指数（NDVI）',

package/src/constants/index.js

@@ -5,6 +5,7 @@ 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'
+export {default as tools} from './tools'
+export {default as measurementFields} from './measurement_fields'
+export {default as crsTypes} from './crs_types'

package/src/constants/layer_folders.js

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

package/src/constants/measurement_fields.js

@@ -0,0 +1,198 @@
+export default {
+  normal: {
+    point: [
+      {
+        field: 'height',
+        label: '高程',
+        unit: 'm'
+      }
+    ],
+    line: [
+      {
+        field: 'distance2d',
+        label: '平面长度',
+        unit: 'm'
+      },
+      {
+        field: 'distance3d',
+        label: '空间长度',
+        unit: 'm'
+      },
+      {
+        field: 'slope_min',
+        label: '最小坡度',
+        unit: '°'
+      },
+      {
+        field: 'slope_max',
+        label: '最大坡度',
+        unit: '°'
+      },
+      {
+        field: 'height_min',
+        label: '最小高程',
+        unit: 'm'
+      },
+      {
+        field: 'height_max',
+        label: '最大高程',
+        unit: 'm'
+      }
+    ],
+    polygon: [
+      {
+        field: 'area2d',
+        label: '平面面积',
+        unit: '㎡'
+      },
+      {
+        field: 'area3d',
+        label: '空间面积',
+        unit: '㎡'
+      },
+      {
+        field: 'distance2d',
+        label: '平面周长',
+        unit: 'm'
+      },
+      {
+        field: 'distance3d',
+        label: '空间周长',
+        unit: 'm'
+      },
+      
+      {
+        field: 'height_min',
+        label: '最小高程',
+        unit: 'm'
+      },
+      {
+        field: 'height_max',
+        label: '最大高程',
+        unit: 'm'
+      }
+    ]
+  },
+  infrared: {
+    point: [
+      {
+        field: 'temprature',
+        label: '温度',
+        unit: '℃'
+      }
+    ],
+    line: [
+      {
+        field: 'distance2d',
+        label: '长度',
+        unit: 'm'
+      },
+      {
+        field: 'temprature_min',
+        label: '最低温度',
+        unit: '℃'
+      },
+      {
+        field: 'temprature_max',
+        label: '最高温度',
+        unit: '℃'
+      }
+    ],
+    polygon: [
+      {
+        field: 'area2d',
+        label: '面积',
+        unit: '㎡'
+      },
+      {
+        field: 'distance2d',
+        label: '周长',
+        unit: 'm'
+      },
+      {
+        field: 'temprature_min',
+        label: '最低温度',
+        unit: '℃'
+      },
+      {
+        field: 'temprature_max',
+        label: '最高温度',
+        unit: '℃'
+      }
+    ]
+  },
+  multispectral: {
+    point: [
+      {
+        field: 'height',
+        label: '高程',
+        unit: 'm'
+      }
+    ],
+    line: [
+      {
+        field: 'distance2d',
+        label: '平面长度',
+        unit: 'm'
+      },
+      {
+        field: 'distance3d',
+        label: '空间长度',
+        unit: 'm'
+      },
+      {
+        field: 'slope_min',
+        label: '最小坡度',
+        unit: '°'
+      },
+      {
+        field: 'slope_max',
+        label: '最大坡度',
+        unit: '°'
+      },
+      {
+        field: 'height_min',
+        label: '最小高程',
+        unit: 'm'
+      },
+      {
+        field: 'height_max',
+        label: '最大高程',
+        unit: 'm'
+      }
+    ],
+    polygon: [
+      {
+        field: 'area2d',
+        label: '平面面积',
+        unit: '㎡'
+      },
+      {
+        field: 'area3d',
+        label: '空间面积',
+        unit: '㎡'
+      },
+      {
+        field: 'distance2d',
+        label: '平面周长',
+        unit: 'm'
+      },
+      {
+        field: 'distance3d',
+        label: '空间周长',
+        unit: 'm'
+      },
+      
+      {
+        field: 'height_min',
+        label: '最小高程',
+        unit: 'm'
+      },
+      {
+        field: 'height_max',
+        label: '最大高程',
+        unit: 'm'
+      }
+    ]
+  }
+}

package/src/gl-operations/shaders/fragment/convertDem.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/convolutionSmooth.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/diffCalc.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/drawResult.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/hillshading/hsAdvAmbientShadows.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/hillshading/hsAdvFinalBaselayer.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/hillshading/hsAdvNormals.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/hillshading/hsAdvSoftShadows.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/interpolateColor.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/interpolateColorOnly.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/interpolateValue.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/multiAnalyze1Calc.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/multiAnalyze2Calc.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/multiAnalyze3Calc.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/multiAnalyze4Calc.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/multiAnalyze5Calc.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/fragment/multiAnalyze6Calc.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`#ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 #else

package/src/gl-operations/shaders/vertex/double.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`uniform mat4 transformMatrix;
 
 attribute vec2 position;

package/src/gl-operations/shaders/vertex/multi3.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`uniform mat4 transformMatrix;
 
 attribute vec2 position;

package/src/gl-operations/shaders/vertex/multi4.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`uniform mat4 transformMatrix;
 
 attribute vec2 position;

package/src/gl-operations/shaders/vertex/multi5.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`uniform mat4 transformMatrix;
 
 attribute vec2 position;

package/src/gl-operations/shaders/vertex/multi6.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`uniform mat4 transformMatrix;
 
 attribute vec2 position;

package/src/gl-operations/shaders/vertex/singleNotTransformed.js

@@ -1,5 +1,5 @@
-import glsl from 'glslify'
-
+import glsl from 'glslify'
+
 export default glsl`attribute vec2 position;
 attribute vec2 texCoord;
 

package/src/index.js

@@ -1,5 +1,3 @@
-// 解析jpg文件，获取exif信息
-export {getPhotoTags} from './exif'
 // 常用公共函数和工具函数
 export * from './util'
 // 事件处理类

package/src/util.js

@@ -1,11 +1,10 @@
 import { v4 as uuidv4 } from 'uuid'
 import moment from 'moment'
-import SparkMD5 from 'spark-md5'
 import _ from 'lodash'
-import {getPhotoTags} from './exif'
 import cameras from './constants/cameras'
-import * as turf from '@turf/turf'
+import {getType, distance as calcDistance, midpoint as getMidpoint} from '@turf/turf'
 import { layerGroups } from './constants'
+import { mat4 } from 'gl-matrix'
 
 export function generateId() { // 生成随机id
   return uuidv4()
@@ -31,51 +30,6 @@ export function formatFileSize (value) { // 文件大小格式化，自动换算
     return value + ' KB'
   }
 }
-export async function getPhotoInfo(file) { // 获取照片的经纬度
-  let exif = await getPhotoTags(file)
-  let {GPSAltitude, GPSLatitude, GPSLatitudeRef, GPSLongitude, GPSLongitudeRef, DateTimeOriginal, Model, PixelXDimension, PixelYDimension} = exif
-  let position = null
-  if (GPSLongitude && GPSLatitude) {
-    position = {
-      lng: getGeoCoordOperator(GPSLongitudeRef) * toRadian(GPSLongitude),
-      lat: getGeoCoordOperator(GPSLatitudeRef) * toRadian(GPSLatitude),
-      alt: +GPSAltitude
-    }
-  }
-  let date = DateTimeOriginal && DateTimeOriginal.split(' ')[0].replaceAll(':', '-')
-  return {
-    date,
-    Model,
-    width: PixelXDimension,
-    height: PixelYDimension,
-    position
-  }
-}
-export function getPhotoMeta(file) {  // 获取照片的元数据，包括exif和md5，为了提高计算效率，只取前64k进行计算
-  return new Promise((resolve, reject) => {
-    let md5, exif
-    getPhotoTags(file).then(data => {
-      exif = data
-      done()
-    })
-    let fileReader = new FileReader()
-    let spark = new SparkMD5.ArrayBuffer()
-    fileReader.readAsArrayBuffer(file)
-    fileReader.onload = e => {
-      spark.append(e.target.result)
-      md5 = spark.end()
-      done()
-    }
-    function done() {
-      if (!md5 || !exif) {
-        return
-      }
-      resolve({md5, exif})
-      fileReader = null
-      spark = null
-    }
-  })
-}
 export function getGeoCoordOperator(flag) { // 将照片的中的经纬度方位字母换成正负号
   if (flag === 'N' || flag === 'E') {
     return 1
@@ -236,7 +190,7 @@ export function downloadImage(base64) {
   document.body.removeChild(a)
 }
 export function getGeometryType(feature) {
-  let type = turf.getType(feature)
+  let type = getType(feature)
   if (['Point', 'MultiPoint'].includes(type)) {
     return 'point'
   } else if (['LineString', 'MultiLineString'].includes(type)) {
@@ -290,7 +244,7 @@ export function getLineLabelFeature(lineFeature) {
   let coordinates = lineFeature.geometry.coordinates
   let temps = []
   for(let i = 1;i < coordinates.length;i++) {
-    let distance = turf.distance(coordinates[i-1], coordinates[i], {units: 'meters'})
+    let distance = calcDistance(coordinates[i-1], coordinates[i], {units: 'meters'})
     if (distance > 30) {
       temps.push([coordinates[i-1], coordinates[i]])
     }
@@ -306,7 +260,7 @@ export function getLineLabelFeature(lineFeature) {
   let start = project(labelLine[0])
   let end = project(labelLine[1])    
   let angle = 360 - (Math.atan((start.y - end.y) / (end.x - start.x)) * 180) / Math.PI
-  let midPoint = turf.midpoint(labelLine[0], labelLine[1])
+  let midPoint = getMidpoint(labelLine[0], labelLine[1])
   midPoint.properties = lineFeature.properties
   midPoint.properties.angle = angle
   midPoint.geometry.coordinates.push(((labelLine[0][2] || 0) + (labelLine[1][2] || 0)) / 2)
@@ -353,4 +307,30 @@ export function getTaskTreeList(taskInfo, annotations, layers) {
     groupItem.items.push(d)
   })
   return groups
+}
+
+export function hasNaN (arr) {
+  for (let i = 0; i < arr.length; i++) {
+    if (Number.isNaN(arr[i])) {
+      return true
+    }
+  }
+  return false
+}
+
+export function getRotationMatrix (pitch, roll, yaw) {
+  let orientation = []
+  let enu2ned = mat4.fromValues(0, 1, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1)
+  let ned2cam = mat4.fromValues(0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1)
+  let m1 = mat4.fromZRotation(mat4.create(), yaw * Math.PI / 180)
+  let m2 = mat4.fromYRotation(mat4.create(), pitch * Math.PI / 180)
+  let m3 = mat4.fromXRotation(mat4.create(), roll * Math.PI / 180)
+  let rota = mat4.multiply(mat4.create(), mat4.multiply(mat4.create(), m1, m2), m3)
+  let rot = mat4.multiply(mat4.create(), mat4.multiply(mat4.create(), ned2cam, mat4.transpose(mat4.create(), rota)), enu2ned)
+  for (let i = 0; i < 3; i++) {
+    for (let j = 0; j < 3; j++) {
+      orientation[i * 3 + j] = rot[i + j * 4]
+    }
+  }
+  return orientation
 }

package/src/constants/map_view_mode.js

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