@vcmap/core 5.0.0-rc.28 → 5.0.0-rc.29

package/src/util/mapCollection.js

@@ -129,7 +129,9 @@ class MapCollection extends Collection {
      * @type {ClippingObjectManager}
      * @api
      */
-    this.clippingObjectManager = new ClippingObjectManager(this._layerCollection);
+    this.clippingObjectManager = new ClippingObjectManager(
+      this._layerCollection,
+    );
 
     /**
      * @type {Array<Function>}
@@ -165,7 +167,9 @@ class MapCollection extends Collection {
    * @api
    * @readonly
    */
-  get activeMap() { return this._activeMap; }
+  get activeMap() {
+    return this._activeMap;
+  }
 
   /**
    * The currently set HTML element in which to render the maps
@@ -244,8 +248,11 @@ class MapCollection extends Collection {
   add(map) {
     const added = super.add(map);
     if (added !== null) {
-      this._mapPointerListeners
-        .push(map.pointerInteractionEvent.addEventListener(this.eventHandler.handleMapEvent.bind(this.eventHandler)));
+      this._mapPointerListeners.push(
+        map.pointerInteractionEvent.addEventListener(
+          this.eventHandler.handleMapEvent.bind(this.eventHandler),
+        ),
+      );
       map.layerCollection = this._layerCollection;
       map.setTarget(this._target);
     }
@@ -293,7 +300,8 @@ class MapCollection extends Collection {
   setTarget(target) {
     checkMaybe(target, [String, HTMLElement]);
 
-    this._target = typeof target === 'string' ? document.getElementById(target) : target;
+    this._target =
+      typeof target === 'string' ? document.getElementById(target) : target;
     this._array.forEach((map) => {
       map.setTarget(this._target);
     });
@@ -313,7 +321,9 @@ class MapCollection extends Collection {
       if (fMap && fMap !== map) {
         return fMap;
       } else {
-        getLogger().warning(`the fallback map with the name: ${fallbackMap} is missconfigured`);
+        getLogger().warning(
+          `the fallback map with the name: ${fallbackMap} is missconfigured`,
+        );
       }
     }
     return null;
@@ -326,9 +336,7 @@ class MapCollection extends Collection {
    */
   _getFallbackMapOrDefault(map) {
     const fallbackMap = this._getFallbackMap(map);
-    return fallbackMap ||
-      this.getByType('OpenlayersMap')[0] ||
-      this._array[0];
+    return fallbackMap || this.getByType('OpenlayersMap')[0] || this._array[0];
   }
 
   /**
@@ -341,7 +349,9 @@ class MapCollection extends Collection {
   async setActiveMap(mapName) {
     const map = this.getByKey(mapName);
     if (!map) {
-      getLogger('MapCollection').warning(`could not find map with name ${mapName}`);
+      getLogger('MapCollection').warning(
+        `could not find map with name ${mapName}`,
+      );
       return Promise.resolve();
     }
 
@@ -358,7 +368,8 @@ class MapCollection extends Collection {
 
     try {
       await map.initialize();
-    } catch (error) { // typically unsupported webGL and cesium map
+    } catch (error) {
+      // typically unsupported webGL and cesium map
       getLogger('MapCollection').error(error);
       this.remove(map);
       const fallbackMap = this._getFallbackMapOrDefault(map);
@@ -379,7 +390,9 @@ class MapCollection extends Collection {
         return map.activate();
       }
 
-      viewpoint = this._activeMap ? await this._activeMap.getViewpoint() : this._cachedViewpoint;
+      viewpoint = this._activeMap
+        ? await this._activeMap.getViewpoint()
+        : this._cachedViewpoint;
 
       const canShow = await map.canShowViewpoint(viewpoint);
       if (!canShow) {
@@ -409,9 +422,11 @@ class MapCollection extends Collection {
 
     this.clippingObjectManager.mapActivated(map);
     this._postRenderListener();
-    this._postRenderListener = this._activeMap.postRender.addEventListener((event) => {
-      this.postRender.raiseEvent(event);
-    });
+    this._postRenderListener = this._activeMap.postRender.addEventListener(
+      (event) => {
+        this.postRender.raiseEvent(event);
+      },
+    );
     this.mapActivated.raiseEvent(map);
     return Promise.resolve();
   }
@@ -423,7 +438,7 @@ class MapCollection extends Collection {
    * @api
    */
   getByType(type) {
-    return this._array.filter(m => m.className === type);
+    return this._array.filter((m) => m.className === type);
   }
 
   /**
@@ -431,7 +446,9 @@ class MapCollection extends Collection {
    */
   destroy() {
     super.destroy();
-    [...this._layerCollection].forEach((l) => { l.destroy(); });
+    [...this._layerCollection].forEach((l) => {
+      l.destroy();
+    });
     this._layerCollection.destroy();
     this.eventHandler.destroy();
     this.mapActivated.destroy();
@@ -441,7 +458,9 @@ class MapCollection extends Collection {
     this.fallbackMapActivated.destroy();
     this.initializeError.destroy();
 
-    this._mapPointerListeners.forEach((cb) => { cb(); });
+    this._mapPointerListeners.forEach((cb) => {
+      cb();
+    });
     this._mapPointerListeners = [];
 
     this._target = null;

package/src/util/math.js

@@ -1,4 +1,8 @@
-import { Math as CesiumMath, Cartesian3, Cartographic } from '@vcmap-cesium/engine';
+import {
+  Math as CesiumMath,
+  Cartesian3,
+  Cartographic,
+} from '@vcmap-cesium/engine';
 import Projection from './projection.js';
 
 /**
@@ -13,13 +17,20 @@ export function coordinateAtDistance(coord, d, brng) {
   const brngRadians = CesiumMath.toRadians(brng);
   const lat1 = CesiumMath.toRadians(coord[1]);
   const lon1 = CesiumMath.toRadians(coord[0]);
-  const lat2 = Math.asin((Math.sin(lat1) * Math.cos(d / R)) +
-    (Math.cos(lat1) * Math.sin(d / R) * Math.cos(brngRadians)));
-  const lon2 = lon1 + Math.atan2(
-    Math.sin(brngRadians) * Math.sin(d / R) * Math.cos(lat1),
-    Math.cos(d / R) - (Math.sin(lat1) * Math.sin(lat2)),
+  const lat2 = Math.asin(
+    Math.sin(lat1) * Math.cos(d / R) +
+      Math.cos(lat1) * Math.sin(d / R) * Math.cos(brngRadians),
   );
-  return [parseFloat(CesiumMath.toDegrees(lon2).toFixed(5)), parseFloat(CesiumMath.toDegrees(lat2).toFixed(5))];
+  const lon2 =
+    lon1 +
+    Math.atan2(
+      Math.sin(brngRadians) * Math.sin(d / R) * Math.cos(lat1),
+      Math.cos(d / R) - Math.sin(lat1) * Math.sin(lat2),
+    );
+  return [
+    parseFloat(CesiumMath.toDegrees(lon2).toFixed(5)),
+    parseFloat(CesiumMath.toDegrees(lat2).toFixed(5)),
+  ];
 }
 
 /**
@@ -39,7 +50,9 @@ export function initialBearingBetweenCoords(coords1, coords2) {
   const f2 = CesiumMath.toRadians(coords2[1]);
 
   const y = Math.sin(l2 - l1) * Math.cos(f2);
-  const x = (Math.cos(f1) * Math.sin(f2)) - (Math.sin(f1) * Math.cos(f2) * Math.cos(l2 - l1));
+  const x =
+    Math.cos(f1) * Math.sin(f2) -
+    Math.sin(f1) * Math.cos(f2) * Math.cos(l2 - l1);
   let brng = CesiumMath.toDegrees(Math.atan2(y, x));
   brng = (brng + 360) % 360;
   return brng;
@@ -65,7 +78,7 @@ export function getCartesianBearing(p1, p2) {
 export function cartesian2DDistance(point0, point1) {
   const distX = point0[0] - point1[0];
   const distY = point0[1] - point1[1];
-  return Math.sqrt((distX ** 2) + (distY ** 2));
+  return Math.sqrt(distX ** 2 + distY ** 2);
 }
 
 /**
@@ -108,7 +121,13 @@ export function cartographicToWgs84(cartographic) {
  */
 export function mercatorToCartesian(mercatorCoordinates, result) {
   const wgs84Coords = Projection.mercatorToWgs84(mercatorCoordinates);
-  return Cartesian3.fromDegrees(wgs84Coords[0], wgs84Coords[1], wgs84Coords[2], null, result ?? new Cartesian3());
+  return Cartesian3.fromDegrees(
+    wgs84Coords[0],
+    wgs84Coords[1],
+    wgs84Coords[2],
+    null,
+    result ?? new Cartesian3(),
+  );
 }
 
 /**
@@ -128,16 +147,12 @@ export function cartesianToMercator(cartesian) {
  */
 export function getMidPoint(p1, p2) {
   if (p1.length < 3 && p2.length < 3) {
-    return [
-      p1[0] + ((p2[0] - p1[0]) / 2),
-      p1[1] + ((p2[1] - p1[1]) / 2),
-      0,
-    ];
+    return [p1[0] + (p2[0] - p1[0]) / 2, p1[1] + (p2[1] - p1[1]) / 2, 0];
   }
   return [
-    p1[0] + ((p2[0] - p1[0]) / 2),
-    p1[1] + ((p2[1] - p1[1]) / 2),
-    p1[2] + ((p2[2] - p1[2]) / 2),
+    p1[0] + (p2[0] - p1[0]) / 2,
+    p1[1] + (p2[1] - p1[1]) / 2,
+    p1[2] + (p2[2] - p1[2]) / 2,
   ];
 }
 
@@ -168,7 +183,8 @@ export function getCartesianPitch(p1, p2) {
 
   let pitch;
   if (p1[2] > p2[2]) {
-    pitch = CesiumMath.toDegrees(Math.acos(Cartesian3.dot(scratch2, scratch3))) - 90;
+    pitch =
+      CesiumMath.toDegrees(Math.acos(Cartesian3.dot(scratch2, scratch3))) - 90;
   } else {
     pitch = CesiumMath.toDegrees(Math.acos(Cartesian3.dot(scratch2, scratch3)));
   }

package/src/util/overrideCollection.js

@@ -57,14 +57,17 @@ function makeOverrideCollection(
 
   const overrideCollection = /** @type {OverrideCollection<T>} */ (collection);
   if (overrideCollection[isOverrideCollection]) {
-    throw new Error('Cannot transform collection, collection already is an OverrideCollection');
+    throw new Error(
+      'Cannot transform collection, collection already is an OverrideCollection',
+    );
   }
   overrideCollection[isOverrideCollection] = true;
 
-  const deserialize = deserializeItem || (i => i);
+  const deserialize = deserializeItem || ((i) => i);
   // @ts-ignore
-  const serialize = serializeItem || (i => (i.toJSON ? i.toJSON() : i));
-  const getShadowIndex = determineShadowIndex || ((item, shadow, currentIndex) => currentIndex);
+  const serialize = serializeItem || ((i) => (i.toJSON ? i.toJSON() : i));
+  const getShadowIndex =
+    determineShadowIndex || ((item, shadow, currentIndex) => currentIndex);
 
   /**
    * @type {Map<string, Array<Object>>}
@@ -117,20 +120,31 @@ function makeOverrideCollection(
    * @param {string} moduleId
    * @returns {Promise<void>}
    */
-  overrideCollection.parseItems = async function parseItems(configArray, moduleId) {
+  overrideCollection.parseItems = async function parseItems(
+    configArray,
+    moduleId,
+  ) {
     if (Array.isArray(configArray)) {
-      const instanceArray = await Promise.all(configArray.map(async (config) => {
-        const item = await deserialize(config);
-        if (!item || (ctor && !(item instanceof ctor))) {
-          getLogger().warning(`Could not load item ${config[overrideCollection.uniqueKey]} of type ${config.type}`);
-          return null;
-        }
-        item[moduleIdSymbol] = moduleId;
-        return item;
-      }));
+      const instanceArray = await Promise.all(
+        configArray.map(async (config) => {
+          const item = await deserialize(config);
+          if (!item || (ctor && !(item instanceof ctor))) {
+            getLogger().warning(
+              `Could not load item ${
+                config[overrideCollection.uniqueKey]
+              } of type ${config.type}`,
+            );
+            return null;
+          }
+          item[moduleIdSymbol] = moduleId;
+          return item;
+        }),
+      );
       instanceArray
-        .filter(i => i)
-        .forEach((i) => { overrideCollection.override(i); });
+        .filter((i) => i)
+        .forEach((i) => {
+          overrideCollection.override(i);
+        });
     }
   };
 
@@ -154,8 +168,12 @@ function makeOverrideCollection(
       if (serializedShadow) {
         const reincarnation = await deserialize(serializedShadow);
         reincarnation[moduleIdSymbol] = serializedShadow[moduleIdSymbol];
-        // @ts-ignore
-        const index = getShadowIndex(reincarnation, item, item[overrideCollection.previousIndexSymbol]);
+        const index = getShadowIndex(
+          reincarnation,
+          item,
+          // @ts-ignore
+          item[overrideCollection.previousIndexSymbol],
+        );
         // @ts-ignore
         overrideCollection.add(reincarnation, index);
       }
@@ -178,7 +196,9 @@ function makeOverrideCollection(
    */
   overrideCollection.removeModule = async function removeModule(moduleId) {
     overrideCollection.shadowMap.forEach((shadowsArray, name) => {
-      const newShadowsArray = shadowsArray.filter(c => c[moduleIdSymbol] !== moduleId);
+      const newShadowsArray = shadowsArray.filter(
+        (c) => c[moduleIdSymbol] !== moduleId,
+      );
       if (newShadowsArray.length === 0) {
         overrideCollection.shadowMap.delete(name);
       } else if (newShadowsArray.length !== shadowsArray.length) {
@@ -186,16 +206,18 @@ function makeOverrideCollection(
       }
     });
 
-    await Promise.all([...overrideCollection]
-      .filter(item => item[moduleIdSymbol] === moduleId)
-      .map(async (item) => {
-        overrideCollection.remove(item);
-        // @ts-ignore
-        if (item.destroy) {
+    await Promise.all(
+      [...overrideCollection]
+        .filter((item) => item[moduleIdSymbol] === moduleId)
+        .map(async (item) => {
+          overrideCollection.remove(item);
           // @ts-ignore
-          item.destroy();
-        }
-      }));
+          if (item.destroy) {
+            // @ts-ignore
+            item.destroy();
+          }
+        }),
+    );
   };
 
   /**
@@ -213,13 +235,16 @@ function makeOverrideCollection(
         if (item[moduleIdSymbol] === moduleId) {
           return serialize(item);
         }
-        if (overrideCollection.shadowMap.has(item[overrideCollection.uniqueKey])) {
-          return overrideCollection.shadowMap.get(item[overrideCollection.uniqueKey])
-            .find(i => i[moduleIdSymbol] === moduleId);
+        if (
+          overrideCollection.shadowMap.has(item[overrideCollection.uniqueKey])
+        ) {
+          return overrideCollection.shadowMap
+            .get(item[overrideCollection.uniqueKey])
+            .find((i) => i[moduleIdSymbol] === moduleId);
         }
         return null;
       })
-      .filter(i => i);
+      .filter((i) => i);
   };
 
   const originalDestroy = overrideCollection.destroy.bind(overrideCollection);

package/src/util/projection.js

@@ -16,8 +16,14 @@ import { check } from '@vcsuite/check';
  * @typedef {function(Array<number>, Array<number>=, number=): Array<number>} CorrectTransformFunction
  */
 
-export const wgs84ToMercatorTransformer = /** @type {CorrectTransformFunction} */ (getTransform('EPSG:4326', 'EPSG:3857'));
-export const mercatorToWgs84Transformer = /** @type {CorrectTransformFunction} */ (getTransform('EPSG:3857', 'EPSG:4326'));
+export const wgs84ToMercatorTransformer =
+  /** @type {CorrectTransformFunction} */ (
+    getTransform('EPSG:4326', 'EPSG:3857')
+  );
+export const mercatorToWgs84Transformer =
+  /** @type {CorrectTransformFunction} */ (
+    getTransform('EPSG:3857', 'EPSG:4326')
+  );
 
 /**
  * @type {ProjectionOptions}
@@ -123,7 +129,9 @@ class Projection {
   /**
    * @returns {string}
    */
-  static get className() { return 'Projection'; }
+  static get className() {
+    return 'Projection';
+  }
 
   /**
    * @param {ProjectionOptions} options
@@ -293,7 +301,11 @@ class Projection {
    * @api
    */
   static mercatorToWgs84(coords, inPlace) {
-    return mercatorToWgs84Transformer(coords, inPlace ? coords : undefined, coords.length);
+    return mercatorToWgs84Transformer(
+      coords,
+      inPlace ? coords : undefined,
+      coords.length,
+    );
   }
 
   /**
@@ -304,7 +316,11 @@ class Projection {
    * @api
    */
   static wgs84ToMercator(coords, inPlace) {
-    return wgs84ToMercatorTransformer(coords, inPlace ? coords : undefined, coords.length);
+    return wgs84ToMercatorTransformer(
+      coords,
+      inPlace ? coords : undefined,
+      coords.length,
+    );
   }
 
   /**

package/src/util/urlHelpers.js

@@ -5,12 +5,14 @@
 // eslint-disable-next-line import/prefer-default-export
 export function isSameOrigin(source) {
   const { location } = window;
-  const url = new URL(source, `${location.protocol}//${location.host}${location.pathname}`);
+  const url = new URL(
+    source,
+    `${location.protocol}//${location.host}${location.pathname}`,
+  );
   // for instance data: URIs have no host information and are implicitly same origin
   // see https://developer.mozilla.org/en-US/docs/Web/Security/Same-origin_policy#inherited_origins
   if (!url.host) {
     return true;
   }
-  return url.protocol === location.protocol &&
-    url.host === location.host;
+  return url.protocol === location.protocol && url.host === location.host;
 }

package/src/util/viewpoint.js

@@ -23,11 +23,10 @@ export function propertyEqualsEpsilon(left, right, epsilon) {
  * @returns {boolean}
  */
 export function angleEqualsEpsilon(left, right, epsilon) {
-  const diff = (left - right) - Math.trunc((left - right) / 360) * 360;
+  const diff = left - right - Math.trunc((left - right) / 360) * 360;
   return Math.abs(diff) <= epsilon;
 }
 
-
 /**
  * compares two coordinates componentwise
  * @param {import("ol/coordinate").Coordinate} left
@@ -36,8 +35,11 @@ export function angleEqualsEpsilon(left, right, epsilon) {
  * @returns {boolean}
  */
 export function coordinateEqualsEpsilon(left, right, epsilon) {
-  return left !== null && right !== null &&
-    left.every((val, idx) => propertyEqualsEpsilon(val, right[idx], epsilon));
+  return (
+    left !== null &&
+    right !== null &&
+    left.every((val, idx) => propertyEqualsEpsilon(val, right[idx], epsilon))
+  );
 }
 
 /**
@@ -61,7 +63,9 @@ export function coordinateEqualsEpsilon(left, right, epsilon) {
  * @api stable
  */
 class Viewpoint extends VcsObject {
-  static get className() { return 'Viewpoint'; }
+  static get className() {
+    return 'Viewpoint';
+  }
 
   /**
    * @param {ViewpointOptions} options
@@ -76,8 +80,11 @@ class Viewpoint extends VcsObject {
      * @api
      */
     this.cameraPosition = null;
-    if (Array.isArray(options.cameraPosition) && options.cameraPosition.length === 3) {
-      this.cameraPosition = options.cameraPosition.map(c => Number(c));
+    if (
+      Array.isArray(options.cameraPosition) &&
+      options.cameraPosition.length === 3
+    ) {
+      this.cameraPosition = options.cameraPosition.map((c) => Number(c));
     }
 
     /**
@@ -88,7 +95,7 @@ class Viewpoint extends VcsObject {
      */
     this.groundPosition = null;
     if (Array.isArray(options.groundPosition)) {
-      this.groundPosition = options.groundPosition.map(c => Number(c));
+      this.groundPosition = options.groundPosition.map((c) => Number(c));
     }
 
     /**
@@ -97,7 +104,10 @@ class Viewpoint extends VcsObject {
      * @type {?number}
      * @api
      */
-    this.distance = parseNumber(options.distance, this.cameraPosition ? this.cameraPosition[2] : 1000);
+    this.distance = parseNumber(
+      options.distance,
+      this.cameraPosition ? this.cameraPosition[2] : 1000,
+    );
 
     /**
      * heading, angle between 0 and 360 degree 0° = North, 90° = east ...
@@ -147,7 +157,9 @@ class Viewpoint extends VcsObject {
    * @readonly
    */
   get easingFunction() {
-    return this.easingFunctionName ? EasingFunction[this.easingFunctionName] : null;
+    return this.easingFunctionName
+      ? EasingFunction[this.easingFunctionName]
+      : null;
   }
 
   /**
@@ -184,7 +196,10 @@ class Viewpoint extends VcsObject {
    * @api stable
    */
   toString() {
-    const stringRep = `Viewpoint: [Ground:${String(this.groundPosition ? this.groundPosition : null)}]` +
+    const stringRep =
+      `Viewpoint: [Ground:${String(
+        this.groundPosition ? this.groundPosition : null,
+      )}]` +
       `[Camera:${String(this.cameraPosition ? this.cameraPosition : null)}]` +
       `[Distance:${this.distance}]` +
       `[heading:${this.distance}]` +
@@ -200,9 +215,10 @@ class Viewpoint extends VcsObject {
    * @api
    */
   static createViewpointFromExtent(extent) {
-    const extentCoordinates = extent instanceof Extent ?
-      extent.getCoordinatesInProjection(wgs84Projection) :
-      extent;
+    const extentCoordinates =
+      extent instanceof Extent
+        ? extent.getCoordinatesInProjection(wgs84Projection)
+        : extent;
 
     if (extentCoordinates && extentCoordinates.length === 4) {
       const minx = extentCoordinates[0];
@@ -216,7 +232,7 @@ class Viewpoint extends VcsObject {
       if (delta < 0.001) {
         distance = 400;
       } else {
-        distance = (delta) * 300000;
+        distance = delta * 300000;
       }
 
       return new Viewpoint({
@@ -240,11 +256,11 @@ class Viewpoint extends VcsObject {
   static parseURLparameter(urlParameter) {
     let { cameraPosition, groundPosition } = urlParameter;
     if (cameraPosition != null) {
-      cameraPosition = cameraPosition.split(',').map(c => Number(c));
+      cameraPosition = cameraPosition.split(',').map((c) => Number(c));
     }
 
     if (groundPosition != null) {
-      groundPosition = groundPosition.split(',').map(c => Number(c));
+      groundPosition = groundPosition.split(',').map((c) => Number(c));
     }
 
     if (urlParameter.epsg != null) {
@@ -252,10 +268,18 @@ class Viewpoint extends VcsObject {
       const srcProjection = new Projection({ epsg, proj4: proj4String });
       const destProjection = wgs84Projection;
       if (groundPosition) {
-        groundPosition = Projection.transform(destProjection, srcProjection, groundPosition);
+        groundPosition = Projection.transform(
+          destProjection,
+          srcProjection,
+          groundPosition,
+        );
       }
       if (cameraPosition) {
-        cameraPosition = Projection.transform(destProjection, srcProjection, cameraPosition);
+        cameraPosition = Projection.transform(
+          destProjection,
+          srcProjection,
+          cameraPosition,
+        );
       }
     }
 
@@ -278,15 +302,17 @@ class Viewpoint extends VcsObject {
    * @returns {boolean}
    */
   isValid() {
-    const hasCamera = this.cameraPosition &&
+    const hasCamera =
+      this.cameraPosition &&
       Array.isArray(this.cameraPosition) &&
       this.cameraPosition.length === 3 &&
-      this.cameraPosition.every(position => Number.isFinite(position));
-    const hasGround = this.groundPosition &&
+      this.cameraPosition.every((position) => Number.isFinite(position));
+    const hasGround =
+      this.groundPosition &&
       Array.isArray(this.groundPosition) &&
       this.groundPosition.length > 1 &&
       this.groundPosition.length < 4 &&
-      this.groundPosition.every(position => Number.isFinite(position));
+      this.groundPosition.every((position) => Number.isFinite(position));
     if (!hasGround && !hasCamera) {
       return false;
     }
@@ -312,16 +338,23 @@ class Viewpoint extends VcsObject {
    * @returns {boolean}
    */
   equals(other, epsilon = 0) {
-    return other === this || (
-      other !== null &&
-      propertyEqualsEpsilon(other.distance, this.distance, epsilon) &&
-      angleEqualsEpsilon(other.heading, this.heading, epsilon) &&
-      angleEqualsEpsilon(other.pitch, this.pitch, epsilon) &&
-      angleEqualsEpsilon(other.roll, this.roll, epsilon) &&
-      (
-        coordinateEqualsEpsilon(other.cameraPosition, this.cameraPosition, epsilon) ||
-        coordinateEqualsEpsilon(other.groundPosition, this.groundPosition, epsilon)
-      )
+    return (
+      other === this ||
+      (other !== null &&
+        propertyEqualsEpsilon(other.distance, this.distance, epsilon) &&
+        angleEqualsEpsilon(other.heading, this.heading, epsilon) &&
+        angleEqualsEpsilon(other.pitch, this.pitch, epsilon) &&
+        angleEqualsEpsilon(other.roll, this.roll, epsilon) &&
+        (coordinateEqualsEpsilon(
+          other.cameraPosition,
+          this.cameraPosition,
+          epsilon,
+        ) ||
+          coordinateEqualsEpsilon(
+            other.groundPosition,
+            this.groundPosition,
+            epsilon,
+          )))
     );
   }
 }