@wemap/camera 4.0.0 → 4.0.2

package/index.js

@@ -1,4 +1,5 @@
-export { BarcodeFormat } from '@zxing/library/esm/index.js';
+export { BarcodeFormat } from '@zxing/library/es2015/index.js';
 export { default as Camera } from './src/Camera.js';
 export { default as QrCodeScanner } from './src/QrCodeScanner.js';
 export { default as SharedCameras } from './src/SharedCameras.js';
+export * as CameraUtils from './src/CameraUtils.js';

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/camera"
     },
     "name": "@wemap/camera",
-    "version": "4.0.0",
+    "version": "4.0.2",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -23,9 +23,9 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@zxing/library": "^0.17.1",
+        "@zxing/library": "^0.18.3",
         "events": "^3.1.0"
     },
     "type": "module",
-    "gitHead": "8b72858590fc2ff33fbea4f090de8cd353a7445f"
+    "gitHead": "9d9cceb7b596afdb2b2987680edcfffcefa8a637"
 }

package/src/Camera.js

@@ -1,6 +1,7 @@
 import EventEmitter from 'events';
 
 import SharedCameras from './SharedCameras.js';
+import { calcDisplayedFov } from './CameraUtils.js';
 
 const GENERIC_HARDWARE_VERTICAL_FOV = 60;
 
@@ -199,35 +200,14 @@ class Camera extends EventEmitter {
 
     _computeFov = () => {
 
-        const sourceWidth = this.videoElement.videoWidth;
-        const sourceHeight = this.videoElement.videoHeight;
-
-        const containerWidth = this.videoContainer.offsetWidth;
-        const containerHeight = this.videoContainer.offsetHeight;
-
-        const sourceAspect = sourceWidth / sourceHeight;
-        const screenAspect = containerWidth / containerHeight;
-
-        let fovV = this._hardwareVerticalFov;
-        let fovH = Camera.convertFov(fovV, sourceAspect);
-
-        if (screenAspect < sourceAspect) {
-            fovH = Camera.convertFov(fovV, screenAspect);
-        } else {
-            fovV = Camera.convertFov(fovH, 1 / screenAspect);
-        }
-
-        this.fov = {
-            vertical: fovV,
-            horizontal: fovH
-        };
+        this.fov = calcDisplayedFov(
+            this.videoContainer,
+            this.videoElement,
+            this._hardwareVerticalFov
+        );
 
         this.emit('fov.changed', this.fov);
     }
-
-    static convertFov(angle, aspectRatio) {
-        return 2 * Math.atan(Math.tan((angle / 180 * Math.PI) / 2) * aspectRatio) * 180 / Math.PI;
-    }
 }
 
 export default Camera;

package/src/CameraUtils.js

@@ -0,0 +1,40 @@
+/**
+ * @param {number} angle
+ * @param {numer} aspectRatio
+ * @returns {number}
+ */
+export function convertFov(angle, aspectRatio) {
+    return 2 * Math.atan(Math.tan((angle / 180 * Math.PI) / 2) * aspectRatio) * 180 / Math.PI;
+}
+
+/**
+ * @param {HTMLDivElement} videoContainer
+ * @param {HTMLVideoElement} videoElement
+ * @param {number} hardwareVerticalFov
+ * @returns {object}
+ */
+export function calcDisplayedFov(videoContainer, videoElement, hardwareVerticalFov) {
+
+    const sourceWidth = videoElement.videoWidth;
+    const sourceHeight = videoElement.videoHeight;
+
+    const containerWidth = videoContainer.offsetWidth;
+    const containerHeight = videoContainer.offsetHeight;
+
+    const sourceAspect = sourceWidth / sourceHeight;
+    const screenAspect = containerWidth / containerHeight;
+
+    let fovV = hardwareVerticalFov;
+    let fovH = convertFov(fovV, sourceAspect);
+
+    if (screenAspect < sourceAspect) {
+        fovH = convertFov(fovV, screenAspect);
+    } else {
+        fovV = convertFov(fovH, 1 / screenAspect);
+    }
+
+    return {
+        vertical: fovV,
+        horizontal: fovH
+    };
+}

package/src/QrCodeScanner.js

@@ -7,7 +7,7 @@ import {
     RGBLuminanceSource,
     BinaryBitmap,
     HybridBinarizer
-} from '@zxing/library/esm/index.js';
+} from '@zxing/library/es2015/index.js';
 
 import Camera from './Camera.js';