@mapcatch/util 1.0.8-b → 1.0.9-a

package/package.json

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

package/src/exif/index.js

@@ -14,7 +14,14 @@ export const getPhotoTags = (file) => {
         }
         let info = getAllTags(img)
         let exif = JSON.parse(JSON.stringify(info).replaceAll('\\u0000', '')) || {}
-        resolve(exif)
+        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();
@@ -30,4 +37,20 @@ export const getPhotoTags = (file) => {
       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
 
@@ -107,11 +106,6 @@ function findEXIFinJPEG(file) {
     }
     offset += 2 + dataView.getUint16(offset + 2);
   }
-  let size = imageSize(new Uint8Array(file))
-  Object.assign(exif, {
-    PixelXDimension: size.width,
-    PixelYDimension: size.height
-  })
   return exif
 
 }