@mapcatch/util 2.2.10 → 2.2.12

package/dist/catchUtil.min.esm.js

@@ -75800,8 +75800,9 @@ function parsePhotos(r, n) {
             width: _0.width,
             height: _0.height,
             ext: E0,
+            camera_serial_number: _0.camera_serial_number,
             parameters: _0.pre_calib_param || null
-          }, l0 = o.find((A0) => A0.width === n0.width && A0.height === n0.height && A0.ext === n0.ext && _$1.isEqual(A0.parameters, n0.parameters));
+          }, l0 = o.find((A0) => A0.width === n0.width && A0.height === n0.height && A0.ext === n0.ext && _$1.isEqual(A0.parameters, n0.parameters) && A0.camera_serial_number === n0.camera_serial_number);
           l0 || (l0 = n0, l0.fileList = [], o.push(l0)), l0.fileList.push({
             name: e0.split("\\").pop(),
             filesize: _0.filesize,
@@ -86046,11 +86047,12 @@ class GeoidCoordinateTransformer {
     if (!fs.existsSync(o))
       throw new Error("tiff not exists");
     this.destroy(), this.tiff = await geotiff.fromFile(o), this.image = await this.tiff.getImage(), this.width = this.image.getWidth(), this.height = this.image.getHeight();
-    const l = this.image.getGeoKeys(), s = VAFgVHdDsUKZGZRjaSIfx.toProj4(l), [c, m] = this.image.getOrigin(), [p, H] = this.image.getResolution(), d = p * this.width, x = H * this.height;
-    this.projection = proj4("WGS84", s.proj4), this.coord2pixel = ([Y, e0]) => {
-      let { x: _0, y: E0 } = this.projection.forward({ x: Y, y: e0 }), n0 = (_0 - c) / d, l0 = (E0 - m) / x;
-      const A0 = this.width * n0, T0 = this.height * l0, J = Math.floor(A0), o0 = Math.floor(T0);
-      return J < 0 || J >= this.width || o0 < 0 || o0 >= this.height ? null : [A0, T0, J, o0];
+    const l = this.image.getGeoKeys(), s = VAFgVHdDsUKZGZRjaSIfx.toProj4(l), [c, m] = this.image.getOrigin(), [p, H] = this.image.getResolution(), d = this.image.getBoundingBox(), x = p * this.width, Y = H * this.height;
+    this.projection = proj4("WGS84", s.proj4), this.coord2pixel = ([e0, _0]) => {
+      (d[0] > 180 || d[2] > 180) && e0 < 0 ? e0 = e0 + 360 : (d[0] < -180 || d[2] < -180) && e0 > 0 && (e0 = e0 - 360);
+      let { x: E0, y: n0 } = this.projection.forward({ x: e0, y: _0 }), l0 = (E0 - c) / x, A0 = (n0 - m) / Y;
+      const T0 = this.width * l0, J = this.height * A0, o0 = Math.floor(T0), q = Math.floor(J);
+      return o0 < 0 || o0 >= this.width || q < 0 || q >= this.height ? null : [T0, J, o0, q];
     }, this.memory && (this.data = await this.image.readRasters({ interleave: !0, samples: [0] }));
   }
   destroy() {