@mapcatch/util 2.0.1 → 2.0.3-a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapcatch/util",
-  "version": "2.0.1",
+  "version": "2.0.3-a",
   "main": "./dist/catchUtil.min.esm.js",
   "repository": "",
   "author": "wanyanyan",
@@ -33,6 +33,7 @@
     "protocol-buffers-schema": "^3.6.0",
     "regl": "^2.1.0",
     "satellite-geo-calc": "^0.0.7",
+    "spark-md5": "^3.0.2",
     "svg-path-commander": "^2.0.10",
     "upng-js": "^2.1.0",
     "uuid": "^9.0.0"

package/src/constants/crs.js

@@ -1,17 +1,24 @@
 export default [
   {
-    'type': 'GEOGCS',
-    'title': 'WGS 84',
-    'authName': 'EPSG',
-    'authCode': 4326,
-    'wkt': 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]'
-  },
-  {
-    'type': 'GEOGCS',
-    'title': 'China Geodetic Coordinate System 2000',
-    'authName': 'EPSG',
-    'authCode': 4490,
-    'wkt': 'GEOGCS["China Geodetic Coordinate System 2000",DATUM["China_2000",SPHEROID["CGCS2000",6378137,298.257222101,AUTHORITY["EPSG","1024"]],AUTHORITY["EPSG","1043"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4490"]]'
+    'type': 'COMMON',
+    'alias': 'Common',
+    'title': '常用坐标系',
+    'children': [
+      {
+        'type': 'GEOGCS',
+        'title': 'WGS 84',
+        'authName': 'EPSG',
+        'authCode': 4326,
+        'wkt': 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]'
+      },
+      {
+        'type': 'GEOGCS',
+        'title': 'China Geodetic Coordinate System 2000',
+        'authName': 'EPSG',
+        'authCode': 4490,
+        'wkt': 'GEOGCS["China Geodetic Coordinate System 2000",DATUM["China_2000",SPHEROID["CGCS2000",6378137,298.257222101,AUTHORITY["EPSG","1024"]],AUTHORITY["EPSG","1043"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4490"]]'
+      }
+    ]
   },
   {
     'type': 'PROJCS',

package/src/measure/index.js

@@ -160,7 +160,7 @@ class Measurement {
 
     while (!triangles.length && projs.length) { // 寻找可成功分解的投影平面
       flatCoordinates = projs.shift()
-      flatCoordinates.pop() // 去掉最后一个重复的点
+      flatCoordinates = this._reduceCoordinates(flatCoordinates)
       let edges = []
       flatCoordinates.forEach((coord, index) => {
         if (index === flatCoordinates.length - 1) {
@@ -193,6 +193,17 @@ class Measurement {
     let c = this.getDistance3D([p3, p1])
     return Math.sqrt((a + b + c) * (a + b - c) * (a + c - b) * (b + c - a)) / 4
   }
+
+  _reduceCoordinates (coords) { // 去重
+    for(let i = 0;i < coords.length; i++) {
+      let nextIndex = i === coords.length - 1 ? 0 : (i + 1)
+      if (_.isEqual(coords[i], coords[nextIndex])) {
+        coords.splice(i, 1)
+        i--
+      }
+    }
+    return coords
+  }
 }
 
 export default Measurement

package/src/photo-parser/exif/index.js

@@ -1,6 +1,7 @@
 import {getData} from './parse_image'
 import {imageSize} from '../image-size'
 import util from './util'
+import SparkMD5 from 'spark-md5'
 
 export const getPhotoMetadata = async (file) => {
   let extent = getFileExtent(file)
@@ -9,7 +10,7 @@ export const getPhotoMetadata = async (file) => {
     try {
       data = await _formatMetadata(file)
     } catch(err) {
-      return await getImageSize(file)
+      data = await getImageSize(file)
     }
   } else {
     data = await getImageSize(file)
@@ -20,6 +21,7 @@ export const getPhotoMetadata = async (file) => {
 
 async function _formatMetadata (file, index = 1) {
   let buffer = await getFileBuffer(file, index)
+  let md5 = getMd5(buffer)
   return new Promise((resolve, reject) => {
     getData(buffer, function (img, err) {
       if (err) {
@@ -35,14 +37,16 @@ async function _formatMetadata (file, index = 1) {
         resolve({
           exif, xmp,
           width: exif.PixelXDimension,
-          height: exif.PixelYDimension
+          height: exif.PixelYDimension,
+          md5
         })
       } else {
         getImageSize(file).then(size => {
           resolve({
             exif, xmp,
             width: size.width,
-            height: size.height
+            height: size.height,
+            md5
           })
         })
       }
@@ -54,9 +58,11 @@ async function getImageSize (file) {
   try {
     let buffer = await getFileBuffer(file)
     let size = imageSize(buffer)
+    let md5 = getMd5(buffer)
     return {
       width: size.width,
-      height: size.height
+      height: size.height,
+      md5
     }
   } catch (err) {
     return {
@@ -127,4 +133,11 @@ function getFileSize(file) {
   } else {
     return file.size
   }
+}
+
+function getMd5 (buffer) {
+  let spark = new SparkMD5.ArrayBuffer()
+  spark.append(buffer)
+  let md5 = spark.end()
+  return md5
 }

package/src/photo-parser/index.js

@@ -5,14 +5,14 @@ import _ from 'lodash'
 
 export async function parsePhoto (file) {
   let tags = await getPhotoMetadata(file)
-  const {width, height, exif, xmp, filesize} = tags
-  let imageMetaData = {width, height, filesize}
+  const {width, height, exif, xmp, filesize, md5} = tags
+  let imageMetaData = {width, height, filesize, md5}
   let lng = NaN, lat = NaN, alt = NaN
   let yaw = NaN, pitch = NaN, roll = NaN
   let x_std = NaN, y_std = NaN, z_std = NaN
   let pos = [lng, lat, alt]
   let flatedXmp = util.flatObject(xmp)
-  let {GPSAltitude, GPSLatitude, GPSLatitudeRef, GPSLongitude, GPSLongitudeRef} = exif
+  let {GPSAltitude, GPSLatitude, GPSLatitudeRef, GPSLongitude, GPSLongitudeRef} = exif || {}
   if (GPSLongitude && GPSLatitude) {
     pos = [
       util.getGeoCoordOperator(GPSLongitudeRef) * util.toRadian(GPSLongitude),
@@ -76,10 +76,12 @@ export async function parsePhoto (file) {
     imageMetaData.pitch_roll_yaw = [pitch, roll, yaw]
     imageMetaData.orientation = util.getRotationMatrix(pitch, roll, yaw)
   }
-  if (exif.DateTimeOriginal) {
+  if (exif?.DateTime) {
+    imageMetaData.capture_time = moment(exif.DateTime, 'YYYY:MM:DD HH:mm:ss').valueOf()
+  } else if (exif?.DateTimeOriginal) {
     imageMetaData.capture_time = moment(exif.DateTimeOriginal, 'YYYY:MM:DD HH:mm:ss').valueOf()
   }
-  if (exif.FocalLengthIn35mmFilm) {
+  if (exif?.FocalLengthIn35mmFilm) {
     imageMetaData.focal_length_in_35mm = exif.FocalLengthIn35mmFilm
   }
   if (util.hasNaN(pos)) {
@@ -154,6 +156,8 @@ export function parsePhotos (files, cb) {
           }
           item.fileList.push({
             name: file.split('\\').pop(),
+            filesize: meta_data.filesize,
+            md5: meta_data.md5,
             filePath: file,
             meta_data
           })

package/src/report/report.js

@@ -69,6 +69,19 @@ export default async function generateReport (params) {
             type: 'cameras',
             items: getCameras(reportInfo)
           },
+          {
+            type: 'page-line'  // 分页
+          },
+          {
+            type: 'sub-title',
+            label: '图像位置'
+          },
+          {
+            type: 'image',
+            imageType: 'photos',
+            errorFeatures: await getErrorFeatures(photos, taskInfo, reportInfo),
+            errorData: getErrorData(reportInfo.image_POS_diff.filter(d => !!d.pos_diff))
+          },
           {
             type: 'page-line'  // 分页
           }
@@ -99,21 +112,6 @@ export default async function generateReport (params) {
   }
   // 建了二维地图才有以下报告
   if (tilejson) {
-    report.sections[1].content.push(
-      {
-        type: 'sub-title',
-        label: '图像位置'
-      },
-      {
-        type: 'image',
-        imageType: 'photos',
-        errorFeatures: await getErrorFeatures(photos, reportInfo, tilejson),
-        errorData: getErrorData(reportInfo.image_POS_diff.filter(d => !!d.pos_diff))
-      },
-      {
-        type: 'page-line'  // 分页
-      }
-    )
     report.sections[2].content.push(
       {
         type: 'sub-title',

package/src/transform.js

@@ -11,6 +11,9 @@ import { crsList, crsTypes } from './constants'
 export function getWKTString (crs) {
   let {type, epsg_code} = crs
   for(let i = 0;i < crsList.length;i++) {
+    if (!crsTypes[crsList[i].type]) {
+      continue
+    }
     let typeCode = crsTypes[crsList[i].type].code
     if (typeCode !== type) {
       continue