@mapcatch/util 1.0.8-a → 1.0.8-b

package/package.json

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

package/src/exif/index.js

@@ -1,16 +1,33 @@
 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', '')) || {}
+        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);
+    }
   })
 }

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()