itowns 2.44.3-next.24 → 2.44.3-next.26

package/lib/Controls/GlobeControls.js

@@ -1035,7 +1035,7 @@ class GlobeControls extends THREE.EventDispatcher {
    *
    * @deprecated Use View#getScale instead.
    */
-  getScale(pitch) /* istanbul ignore next */{
+  getScale(pitch) {
     console.warn('Deprecated, use View#getScale instead.');
     return this.view.getScale(pitch);
   }
@@ -1048,7 +1048,7 @@ class GlobeControls extends THREE.EventDispatcher {
    *
    * @deprecated Use `View#getPixelsToMeters` instead.
    */
-  pixelsToMeters(pixels) /* istanbul ignore next */{
+  pixelsToMeters(pixels) {
     let pixelPitch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0.28;
     console.warn('Deprecated use View#getPixelsToMeters instead.');
     const scaled = this.getScale(pixelPitch);
@@ -1064,7 +1064,7 @@ class GlobeControls extends THREE.EventDispatcher {
    * @deprecated Use `View#getPixelsToMeters` and `GlobeControls#metersToDegrees`
    * instead.
    */
-  pixelsToDegrees(pixels) /* istanbul ignore next */{
+  pixelsToDegrees(pixels) {
     let pixelPitch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0.28;
     console.warn('Deprecated, use View#getPixelsToMeters and GlobeControls#getMetersToDegrees instead.');
     const chord = this.pixelsToMeters(pixels, pixelPitch);
@@ -1079,7 +1079,7 @@ class GlobeControls extends THREE.EventDispatcher {
    *
    * @deprecated Use `View#getMetersToPixels` instead.
    */
-  metersToPixels(value) /* istanbul ignore next */{
+  metersToPixels(value) {
     let pixelPitch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0.28;
     console.warn('Deprecated, use View#getMetersToPixels instead.');
     const scaled = this.getScale(pixelPitch);

package/lib/Converter/convertToTile.js

@@ -1,8 +1,3 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 import * as THREE from 'three';
 import TileMesh from "../Core/TileMesh.js";
 import LayeredMaterial from "../Renderer/LayeredMaterial.js";

package/lib/Core/Deprecated/Undeprecator.js

@@ -13,7 +13,6 @@ export const deprecatedColorLayerOptions = options => {
   return options;
 };
 export const deprecatedParsingOptionsToNewOne = options => {
-  /* istanbul ignore next */
   if (options.crsOut || options.crsIn) {
     console.warn('Parsing options with crsIn and crsOut are deprecated, use { in, out } structure.');
     const newOptions = {

package/lib/Core/Geographic/Crs.js

@@ -1,6 +1,12 @@
 import proj4 from 'proj4';
 proj4.defs('EPSG:4978', '+proj=geocent +datum=WGS84 +units=m +no_defs');
 
+// Redefining proj4 global projections to match epsg.org database axis order.
+// See https://github.com/iTowns/itowns/pull/2465#issuecomment-2517024859
+proj4.defs('EPSG:4326').axis = 'neu';
+proj4.defs('EPSG:4269').axis = 'neu';
+proj4.defs('WGS84').axis = 'neu';
+
 /**
  * A projection as a CRS identifier string. This identifier references a
  * projection definition previously defined with
@@ -133,6 +139,19 @@ export function reasonableEpsilon(crs) {
   }
 }
 
+/**
+ * Returns the axis parameter defined in proj4 for the provided crs.
+ * Might be undefined depending on crs definition.
+ *
+ * @param crs - The CRS to get axis from.
+ * @returns the matching proj4 axis string, 'enu' for instance (east, north, up)
+ */
+export function axisOrder(crs) {
+  mustBeString(crs);
+  const projection = proj4.defs(crs);
+  return !projection ? undefined : projection.axis;
+}
+
 /**
  * Defines a proj4 projection as a named alias.
  * This function is a specialized wrapper over the

package/lib/Core/Prefab/Globe/Atmosphere.js

@@ -1,9 +1,3 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
 import * as THREE from 'three';
 import GeometryLayer from "../../../Layer/GeometryLayer.js";
 import Coordinates from "../../Geographic/Coordinates.js";

package/lib/Layer/OrientedImageLayer.js

@@ -103,8 +103,6 @@ class OrientedImageLayer extends GeometryLayer {
       getCamerasNameFromFeature = () => {},
       ...geometryOptions
     } = config;
-
-    /* istanbul ignore next */
     if (config.projection) {
       console.warn('OrientedImageLayer projection parameter is deprecated, use crs instead.');
       config.crs = config.crs || config.projection;

package/lib/Renderer/SphereHelper.js

@@ -1,9 +1,3 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
 import * as THREE from 'three';
 function SphereHelper(radius) {
   THREE.Mesh.call(this);

package/lib/Source/FileSource.js

@@ -103,12 +103,10 @@ class FileSource extends Source {
    * presents in `features` under the property `crs`, it is fine.
    */
   constructor(source) {
-    /* istanbul ignore next */
     if (source.parsedData) {
       console.warn('FileSource parsedData parameter is deprecated, use features instead of.');
       source.features = source.features || source.parsedData;
     }
-    /* istanbul ignore next */
     if (source.projection) {
       console.warn('FileSource projection parameter is deprecated, use crs instead.');
       source.crs = source.crs || source.projection;

package/lib/Source/Source.js

@@ -30,7 +30,6 @@ const noCache = {
  */
 class InformationsData {
   constructor(options) {
-    /* istanbul ignore next */
     if (options.projection) {
       console.warn('Source projection parameter is deprecated, use crs instead.');
       options.crs = options.crs || options.projection;
@@ -166,8 +165,6 @@ class Source extends InformationsData {
         in: this,
         extent
       })).catch(err => this.handlingError(err)), key);
-
-      /* istanbul ignore next */
       if (this.onParsedFile) {
         features.then(feat => {
           this.onParsedFile(feat);

package/lib/Source/VectorTilesSource.js

@@ -162,8 +162,6 @@ class VectorTilesSource extends TMSSource {
         in: this,
         extent
       })))).then(collections => mergeCollections(collections)).catch(err => this.handlingError(err)), key);
-
-      /* istanbul ignore next */
       if (this.onParsedFile) {
         features.then(feat => {
           this.onParsedFile(feat);

package/lib/Source/WMSSource.js

@@ -1,8 +1,37 @@
 import Source from "./Source.js";
 import URLBuilder from "../Provider/URLBuilder.js";
 import Extent from "../Core/Geographic/Extent.js";
+import * as CRS from "../Core/Geographic/Crs.js";
 const _extent = new Extent('EPSG:4326', [0, 0, 0, 0]);
 
+/**
+ * Proj provides an optional param to define axis order and orientation for a
+ * given projection. 'enu' for instance stands for east, north, up.
+ * Elevation is not needed here. The two first characters are sufficient to map
+ * proj axis to iTowns bbox order formalism.
+ * 'enu' corresponds to 'wsen' because bbox starts by lower value coordinates
+ * and preserves axis ordering, here long/lat.
+ */
+const projAxisToBboxMappings = {
+  en: 'wsen',
+  es: 'wnes',
+  wn: 'eswn',
+  ws: 'enws',
+  ne: 'swne',
+  se: 'nwse',
+  nw: 'senw',
+  sw: 'nesw'
+};
+
+/**
+ * Provides the bbox axis order matching provided proj4 axis
+ * @param {string} projAxis the CRS axis order as defined in proj4
+ * @returns {string} the corresponding bbox axis order to use for WMS 1.3.0
+ */
+function projAxisToWmsBbox(projAxis) {
+  return projAxis && projAxisToBboxMappings[projAxis.slice(0, 2)] || 'wsen';
+}
+
 /**
  * An object defining the source of images to get from a
  * [WMS](http://www.opengeospatial.org/standards/wms) server. It inherits
@@ -97,16 +126,15 @@ class WMSSource extends Source {
     this.version = source.version || '1.3.0';
     this.transparent = source.transparent || false;
     this.bboxDigits = source.bboxDigits;
-    if (!source.axisOrder) {
-      // 4326 (lat/long) axis order depends on the WMS version used
-      if (this.crs == 'EPSG:4326') {
-        // EPSG 4326 x = lat, long = y
-        // version 1.X.X long/lat while version 1.3.0 mandates xy (so lat,long)
-        this.axisOrder = this.version === '1.3.0' ? 'swne' : 'wsen';
-      } else {
-        // xy,xy order
-        this.axisOrder = 'wsen';
-      }
+    if (source.axisOrder) {
+      this.axisOrder = source.axisOrder;
+    } else if (this.version === '1.3.0') {
+      // If not set, axis order depends on WMS version
+      // Version 1.3.0 depends on CRS axis order as defined in epsg.org database
+      this.axisOrder = projAxisToWmsBbox(CRS.axisOrder(this.crs));
+    } else {
+      // Versions 1.X.X mandate long/lat order, east-north orientation
+      this.axisOrder = 'wsen';
     }
     const crsPropName = this.version === '1.3.0' ? 'CRS' : 'SRS';
     const urlObj = new URL(this.url);

package/lib/Utils/placeObjectOnGround.js

@@ -55,7 +55,6 @@ function _updateVector3(layer, method, nodes, vecCRS, vec, offset) {
  *
  * @return {boolean} true if successful, false if we couldn't lookup the elevation at the given coords
  */
-/* istanbul ignore next */
 function placeObjectOnGround(layer, crs, obj) {
   let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   let tileHint = arguments.length > 4 ? arguments[4] : undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.44.3-next.24",
+  "version": "2.44.3-next.26",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",