itowns 2.44.3-next.26 → 2.44.3-next.28

package/examples/entwine_3d_loader.html

@@ -87,8 +87,10 @@
                 eptSource = new itowns.EntwinePointTileSource({ url });
 
                 if (eptLayer) {
-                    view.removeLayer('ept');
+                    debugGui.removeFolder(eptLayer.debugUI);
+                    view.removeLayer('Entwine Point Tile');
                     view.notifyChange();
+                    eptLayer.delete();
                 }
 
                 eptLayer = new itowns.EntwinePointTileLayer('Entwine Point Tile', {

package/examples/entwine_simple_loader.html

@@ -88,7 +88,7 @@
                 eptSource = new itowns.EntwinePointTileSource({ url });
 
                 if (eptLayer) {
-                    debugGUI.removeFolder(eptLayer.debugUI);
+                    debugGui.removeFolder(eptLayer.debugUI);
                     view.removeLayer('Entwine Point Tile');
                     view.notifyChange();
                     eptLayer.delete();

package/lib/Core/Geographic/Crs.js

@@ -35,7 +35,11 @@ export const UNIT = {
   /**
    * Distance unit in meter.
    */
-  METER: 2
+  METER: 2,
+  /**
+   * Distance unit in foot.
+   */
+  FOOT: 3
 };
 
 /**
@@ -50,8 +54,10 @@ export function is4326(crs) {
 function unitFromProj4Unit(proj) {
   if (proj.units === 'degrees') {
     return UNIT.DEGREE;
-  } else if (proj.units === 'm') {
+  } else if (proj.units === 'm' || proj.units === 'meter') {
     return UNIT.METER;
+  } else if (proj.units === 'foot') {
+    return UNIT.FOOT;
   } else if (proj.units === undefined && proj.to_meter === undefined) {
     // See https://proj.org/en/9.4/usage/projections.html [17/10/2024]
     // > The default unit for projected coordinates is the meter.
@@ -65,7 +71,7 @@ function unitFromProj4Unit(proj) {
  * Returns the horizontal coordinates system units associated with this CRS.
  *
  * @param crs - The CRS to extract the unit from.
- * @returns Either `UNIT.METER`, `UNIT.DEGREE` or `undefined`.
+ * @returns Either `UNIT.METER`, `UNIT.DEGREE`, `UNIT.FOOT` or `undefined`.
  */
 export function getUnit(crs) {
   mustBeString(crs);

package/lib/Core/Style.js

@@ -1,7 +1,7 @@
 import { FEATURE_TYPES } from "./Feature.js";
 import Cache from "./Scheduler/Cache.js";
 import Fetcher from "../Provider/Fetcher.js";
-import * as mapbox from '@mapbox/mapbox-gl-style-spec';
+import * as maplibre from '@maplibre/maplibre-gl-style-spec';
 import { Color } from 'three';
 import { deltaE } from "../Renderer/Color.js";
 import Coordinates from "./Geographic/Coordinates.js";
@@ -73,8 +73,8 @@ function rgba2rgb(orig) {
 }
 function readVectorProperty(property, options) {
   if (property != undefined) {
-    if (mapbox.expression.isExpression(property)) {
-      return mapbox.expression.createExpression(property, options).value;
+    if (maplibre.expression.isExpression(property)) {
+      return maplibre.expression.createExpression(property, options).value;
     } else {
       return property;
     }

package/lib/Layer/PointCloudLayer.js

@@ -291,9 +291,6 @@ class PointCloudLayer extends GeometryLayer {
           redraw: true,
           earlyDropFunction: cmd => !cmd.requester.visible || !this.visible
         }).then(pts => {
-          if (this.onPointsCreated) {
-            this.onPointsCreated(layer, pts);
-          }
           elt.obj = pts;
           // store tightbbox to avoid ping-pong (bbox = larger => visible, tight => invisible)
           elt.tightbbox = pts.tightbbox;
@@ -302,11 +299,12 @@ class PointCloudLayer extends GeometryLayer {
           // be added nor cleaned
           this.group.add(elt.obj);
           elt.obj.updateMatrixWorld(true);
-          elt.promise = null;
-        }, err => {
-          if (err.isCancelledCommandException) {
-            elt.promise = null;
+        }).catch(err => {
+          if (!err.isCancelledCommandException) {
+            return err;
           }
+        }).finally(() => {
+          elt.promise = null;
         });
       }
     }

package/lib/Source/CopcSource.js

@@ -1,3 +1,4 @@
+import proj4 from 'proj4';
 import { Binary, Info, Las } from 'copc';
 import Extent from "../Core/Geographic/Extent.js";
 import Fetcher from "../Provider/Fetcher.js";
@@ -102,8 +103,18 @@ class CopcSource extends Source {
       this.header = metadata.header;
       this.info = metadata.info;
       this.eb = metadata.eb;
-      // TODO: use wkt definition in `metadata.wkt` to infer/define crs
-      this.crs = config.crs || 'EPSG:4326';
+      proj4.defs('unknown', metadata.wkt);
+      let projCS;
+      if (proj4.defs('unknown').type === 'COMPD_CS') {
+        console.warn('CopcSource: compound coordinate system is not yet supported.');
+        projCS = proj4.defs('unknown').PROJCS;
+      } else {
+        projCS = proj4.defs('unknown');
+      }
+      this.crs = projCS.title || projCS.name || 'EPSG:4326';
+      if (!(this.crs in proj4.defs)) {
+        proj4.defs(this.crs, projCS);
+      }
       const bbox = new THREE.Box3();
       bbox.min.fromArray(this.info.cube, 0);
       bbox.max.fromArray(this.info.cube, 3);

package/lib/Source/EntwinePointTileSource.js

@@ -38,10 +38,19 @@ class EntwinePointTileSource extends Source {
       // Set parser and its configuration from schema
       this.parse = metadata.dataType === 'laszip' ? LASParser.parse : PotreeBinParser.parse;
       this.extension = metadata.dataType === 'laszip' ? 'laz' : 'bin';
-      if (metadata.srs && metadata.srs.authority && metadata.srs.horizontal) {
-        this.crs = `${metadata.srs.authority}:${metadata.srs.horizontal}`;
-        if (!proj4.defs(this.crs)) {
-          proj4.defs(this.crs, metadata.srs.wkt);
+      if (metadata.srs) {
+        if (metadata.srs.authority && metadata.srs.horizontal) {
+          this.crs = `${metadata.srs.authority}:${metadata.srs.horizontal}`;
+          if (!proj4.defs(this.crs)) {
+            proj4.defs(this.crs, metadata.srs.wkt);
+          }
+        } else if (metadata.srs.wkt) {
+          proj4.defs('unknown', metadata.srs.wkt);
+          const projCS = proj4.defs('unknown');
+          this.crs = projCS.title || projCS.name;
+          if (!(this.crs in proj4.defs)) {
+            proj4.defs(this.crs, projCS);
+          }
         }
         if (metadata.srs.vertical && metadata.srs.vertical !== metadata.srs.horizontal) {
           console.warn('EntwinePointTileSource: Vertical coordinates system code is not yet supported.');
@@ -53,6 +62,7 @@ class EntwinePointTileSource extends Source {
       // span in ept.json. This needs improvements.
       this.spacing = (Math.abs(metadata.boundsConforming[3] - metadata.boundsConforming[0]) + Math.abs(metadata.boundsConforming[4] - metadata.boundsConforming[1])) / (2 * metadata.span);
       this.boundsConforming = metadata.boundsConforming;
+      this.bounds = metadata.bounds;
       this.span = metadata.span;
       return this;
     });

package/lib/Source/VectorTilesSource.js

@@ -1,4 +1,4 @@
-import { featureFilter } from '@mapbox/mapbox-gl-style-spec';
+import { featureFilter } from '@maplibre/maplibre-gl-style-spec';
 import Style from "../Core/Style.js";
 import TMSSource from "./TMSSource.js";
 import URLBuilder from "../Provider/URLBuilder.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.44.3-next.26",
+  "version": "2.44.3-next.28",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",
@@ -57,8 +57,8 @@
   },
   "homepage": "https://itowns.github.io/",
   "dependencies": {
-    "@mapbox/mapbox-gl-style-spec": "^13.28.0",
     "@mapbox/vector-tile": "^2.0.3",
+    "@maplibre/maplibre-gl-style-spec": "^22.0.0",
     "@tmcw/togeojson": "^5.8.1",
     "@tweenjs/tween.js": "^25.0.0",
     "3d-tiles-renderer": "^0.3.39",