@mapcatch/util 1.0.8 → 1.0.9-a

package/package.json

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

package/src/exif/index.js

@@ -1,16 +1,56 @@
 import {getData} from './parse_image'
 import {getAllTags} from './exif'
+import {imageSize} from '../image-size'
 
 export const getPhotoTags = (file) => {
   return new Promise((resolve, reject) => {
-    getData(file, function (img, err) {
-      if (err) {
-        reject(err)
-        return
-      }
-      let info = getAllTags(img)
-      let exif = JSON.parse(JSON.stringify(info).replaceAll('\\u0000', '')) || {}
-      resolve(exif)
-    })
+    if (file.type === 'image/jpeg') {
+      let sliceFile = file.slice(0, 131072)
+      sliceFile.name = file.name
+      getData(sliceFile, function (img, err) {
+        if (err) {
+          reject(err)
+          return
+        }
+        let info = getAllTags(img)
+        let exif = JSON.parse(JSON.stringify(info).replaceAll('\\u0000', '')) || {}
+        if (!exif.PixelXDimension || !exif.PixelYDimension || exif.PixelXDimension == 65535 || exif.PixelYDimension == 65535) {
+          getImageSize(file).then((size) => {
+            Object.assign(exif, size)
+            resolve(exif)
+          })
+        } else {
+          resolve(exif)
+        }
+      })
+    } else {
+      var fileReader = new FileReader();
+      fileReader.onload = function (e) {
+        let u8array = new Uint8Array(e.target.result)
+        let size = imageSize(u8array)
+        resolve({
+          PixelXDimension: size.width,
+          PixelYDimension: size.height
+        })
+      };
+
+      fileReader.readAsArrayBuffer(file);
+    }
+  })
+}
+
+function getImageSize(file) {
+  return new Promise((resolve, reject) => {
+    var fileReader = new FileReader();
+    fileReader.onload = function (e) {
+      let u8array = new Uint8Array(e.target.result)
+      let size = imageSize(u8array)
+      resolve({
+        PixelXDimension: size.width,
+        PixelYDimension: size.height
+      })
+    };
+
+    fileReader.readAsArrayBuffer(file);
   })
 }

package/src/exif/parse_image.js

@@ -4,7 +4,6 @@ import ExifTags from './tags'
 import StringValues from './string_values'
 import GPSTags from './gps_tags'
 import IptcFieldMap from './iptc_field_map'
-import {imageSize} from '../image-size'
 
 var isXmpEnabled = false
 
@@ -87,10 +86,6 @@ 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
-  }
-
   var offset = 2,
     length = file.byteLength,
     marker;
@@ -107,12 +102,7 @@ function findEXIFinJPEG(file) {
 
     if (marker == 225) {
       exif = readEXIFData(dataView, offset + 4, dataView.getUint16(offset + 2) - 2)
-      let size = imageSize(new Uint8Array(file))
-      Object.assign(exif, {
-        PixelXDimension: size.width,
-        PixelYDimension: size.height
-      })
-      return exif
+      break
     }
     offset += 2 + dataView.getUint16(offset + 2);
   }

package/src/util.js

@@ -32,9 +32,7 @@ export function formatFileSize (value) { // 文件大小格式化，自动换算
   }
 }
 export async function getPhotoInfo(file) { // 获取照片的经纬度
-  let sliceFile = file.slice(0, 131072)
-  sliceFile.name = file.name
-  let exif = await getPhotoTags(sliceFile)
+  let exif = await getPhotoTags(file)
   let {GPSAltitude, GPSLatitude, GPSLatitudeRef, GPSLongitude, GPSLongitudeRef, DateTimeOriginal, Model, PixelXDimension, PixelYDimension} = exif
   let position = null
   if (GPSLongitude && GPSLatitude) {
@@ -56,15 +54,13 @@ export async function getPhotoInfo(file) { // 获取照片的经纬度
 export function getPhotoMeta(file) {  // 获取照片的元数据，包括exif和md5，为了提高计算效率，只取前64k进行计算
   return new Promise((resolve, reject) => {
     let md5, exif
-    let sliceFile = file.slice(0, 131072)
-    sliceFile.name = file.name
-    getPhotoTags(sliceFile).then(data => {
+    getPhotoTags(file).then(data => {
       exif = data
       done()
     })
     let fileReader = new FileReader()
     let spark = new SparkMD5.ArrayBuffer()
-    fileReader.readAsArrayBuffer(sliceFile)
+    fileReader.readAsArrayBuffer(file)
     fileReader.onload = e => {
       spark.append(e.target.result)
       md5 = spark.end()