@mapcatch/util 1.0.6 → 1.0.7

package/package.json

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

package/src/exif/parse_image.js

@@ -84,6 +84,7 @@ function getImageData(img, callback) {
 
 function findEXIFinJPEG(file) {
   var dataView = new DataView(file);
+  let exif = {}
 
   if ((dataView.getUint8(0) != 0xFF) || (dataView.getUint8(1) != 0xD8)) {
     return false; // not a valid jpeg
@@ -95,7 +96,7 @@ function findEXIFinJPEG(file) {
 
   while (offset < length) {
     if (dataView.getUint8(offset) != 0xFF) {
-      return false; // not a valid marker, something is wrong
+      break
     }
 
     marker = dataView.getUint8(offset + 1);
@@ -104,16 +105,22 @@ function findEXIFinJPEG(file) {
     // but we're only looking for 0xFFE1 for EXIF data
 
     if (marker == 225) {
-
-      return readEXIFData(dataView, offset + 4, dataView.getUint16(offset + 2) - 2);
-
-      // offset += 2 + file.getShortAt(offset+2, true);
-
-    } else {
-      offset += 2 + dataView.getUint16(offset + 2);
+      Object.assign(exif, readEXIFData(dataView, offset + 4, dataView.getUint16(offset + 2) - 2))
+    } else if (marker === 192) {
+      let width = dataView.getUint16(offset + 7)
+      let height = dataView.getUint16(offset + 5)
+      if (width && height) {
+        Object.assign(exif, {
+          PixelXDimension: width,
+          PixelYDimension: height
+        })
+      }
+      return exif
     }
+    offset += 2 + dataView.getUint16(offset + 2);
 
   }
+  return exif
 
 }
 

package/src/util.js

@@ -32,30 +32,31 @@ export function formatFileSize (value) { // 文件大小格式化，自动换算
   }
 }
 export async function getPhotoInfo(file) { // 获取照片的经纬度
-  let sliceFile = file.slice(0, 65536)
+  let sliceFile = file.slice(0, 131072)
   sliceFile.name = file.name
   let exif = await getPhotoTags(sliceFile)
   let {GPSAltitude, GPSLatitude, GPSLatitudeRef, GPSLongitude, GPSLongitudeRef, DateTimeOriginal, Model, PixelXDimension, PixelYDimension} = exif
-  if (!GPSLongitude || !GPSLatitude) {
-    return {}
+  let position = null
+  if (GPSLongitude && GPSLatitude) {
+    position = {
+      lng: getGeoCoordOperator(GPSLongitudeRef) * toRadian(GPSLongitude),
+      lat: getGeoCoordOperator(GPSLatitudeRef) * toRadian(GPSLatitude),
+      alt: +GPSAltitude
+    }
   }
-  let date = DateTimeOriginal.split(' ')[0].replaceAll(':', '-')
+  let date = DateTimeOriginal && DateTimeOriginal.split(' ')[0].replaceAll(':', '-')
   return {
     date,
     Model,
     width: PixelXDimension,
     height: PixelYDimension,
-    position: {
-      lng: getGeoCoordOperator(GPSLongitudeRef) * toRadian(GPSLongitude),
-      lat: getGeoCoordOperator(GPSLatitudeRef) * toRadian(GPSLatitude),
-      alt: +GPSAltitude
-    }
+    position
   }
 }
 export function getPhotoMeta(file) {  // 获取照片的元数据，包括exif和md5，为了提高计算效率，只取前64k进行计算
   return new Promise((resolve, reject) => {
     let md5, exif
-    let sliceFile = file.slice(0, 65536)
+    let sliceFile = file.slice(0, 131072)
     sliceFile.name = file.name
     getPhotoTags(sliceFile).then(data => {
       exif = data