itowns 2.44.3-next.21 → 2.44.3-next.23

package/lib/Source/Source.js

@@ -1,3 +1,4 @@
+import * as CRS from "../Core/Geographic/Crs.js";
 import Extent from "../Core/Geographic/Extent.js";
 import GeoJsonParser from "../Parser/GeoJsonParser.js";
 import KMLParser from "../Parser/KMLParser.js";
@@ -8,7 +9,6 @@ import ISGParser from "../Parser/ISGParser.js";
 import VectorTileParser from "../Parser/VectorTileParser.js";
 import Fetcher from "../Provider/Fetcher.js";
 import Cache from "../Core/Scheduler/Cache.js";
-import CRS from "../Core/Geographic/Crs.js";
 
 /** @private */
 export const supportedParsers = new Map([['application/geo+json', GeoJsonParser.parse], ['application/json', GeoJsonParser.parse], ['application/kml', KMLParser.parse], ['application/gpx', GpxParser.parse], ['application/x-protobuf;type=mapbox-vector', VectorTileParser.parse], ['application/gtx', GTXParser.parse], ['application/isg', ISGParser.parse], ['application/gdf', GDFParser.parse]]);

package/lib/Source/TMSSource.js

@@ -3,8 +3,7 @@ import URLBuilder from "../Provider/URLBuilder.js";
 import Extent from "../Core/Geographic/Extent.js";
 import Tile from "../Core/Tile/Tile.js";
 import { globalExtentTMS } from "../Core/Tile/TileGrid.js";
-import CRS from "../Core/Geographic/Crs.js";
-const _tile = new Tile(CRS.tms_4326, 0, 0, 0);
+const _tile = new Tile('EPSG:4326', 0, 0, 0);
 
 /**
  * An object defining the source of resources to get from a
@@ -88,7 +87,7 @@ class TMSSource extends Source {
     }
     this.zoom = source.zoom;
     this.isInverted = source.isInverted || false;
-    this.crs = CRS.formatToTms(source.crs);
+    this.crs = source.crs;
     this.tileMatrixSetLimits = source.tileMatrixSetLimits;
     this.extentSetlimits = {};
     this.tileMatrixCallback = source.tileMatrixCallback || (zoomLevel => zoomLevel);

package/lib/Source/WFSSource.js

@@ -1,6 +1,5 @@
 import Source from "./Source.js";
 import URLBuilder from "../Provider/URLBuilder.js";
-import CRS from "../Core/Geographic/Crs.js";
 import Extent from "../Core/Geographic/Extent.js";
 const _extent = new Extent('EPSG:4326', [0, 0, 0, 0]);
 
@@ -154,7 +153,7 @@ class WFSSource extends Source {
     return super.handlingError(err);
   }
   requestToKey(extent) {
-    if (CRS.isTms(extent.crs)) {
+    if (extent.isTile) {
       return super.requestToKey(extent);
     } else {
       return [extent.zoom, extent.south, extent.west];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.44.3-next.21",
+  "version": "2.44.3-next.23",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",
@@ -21,13 +21,13 @@
     "base-test-unit": "cross-env BABEL_DISABLE_CACHE=1 mocha --file test/unit/bootstrap.js --import=./config/babel-register/register.mjs",
     "build": "cross-env NODE_ENV=production webpack",
     "build-dev": "cross-env NODE_ENV=development webpack",
-    "transpile": "cross-env BABEL_DISABLE_CACHE=1 babel src --out-dir lib",
+    "transpile": "cross-env BABEL_DISABLE_CACHE=1 babel src --out-dir lib --extensions .js,.ts",
     "start": "cross-env NODE_ENV=development webpack serve",
     "start-https": "cross-env NODE_ENV=development webpack serve --https",
     "debug": "cross-env noInline=true npm start",
     "prepublishOnly": "npm run build && npm run transpile",
     "prepare": "cross-env NO_UPDATE_NOTIFIER=true node ./config/prepare.mjs && node ./config/replace.config.mjs",
-    "watch": "cross-env BABEL_DISABLE_CACHE=1 babel --watch src --out-dir lib",
+    "watch": "npm run transpile -- --watch",
     "changelog": "conventional-changelog -n ./config/conventionalChangelog/config.cjs -i changelog.md -s",
     "bump": "if [ -z $npm_config_level ]; then grunt bump:minor;  else grunt bump:$npm_config_level; fi && npm run changelog && npm install && git add -A && git commit --amend --no-edit",
     "publish-next": "npm version prerelease --preid next && npm publish --access public --tag=next --provenance",

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

@@ -1,110 +0,0 @@
-import * as THREE from 'three';
-import Coordinates from "../../Geographic/Coordinates.js";
-import Extent from "../../Geographic/Extent.js";
-const PI_OV_FOUR = Math.PI / 4;
-const INV_TWO_PI = 1.0 / (Math.PI * 2);
-const axisZ = new THREE.Vector3(0, 0, 1);
-const axisY = new THREE.Vector3(0, 1, 0);
-const quatToAlignLongitude = new THREE.Quaternion();
-const quatToAlignLatitude = new THREE.Quaternion();
-const quatNormalToZ = new THREE.Quaternion();
-function WGS84ToOneSubY(latitude) {
-  return 1.0 - (0.5 - Math.log(Math.tan(PI_OV_FOUR + THREE.MathUtils.degToRad(latitude) * 0.5)) * INV_TWO_PI);
-}
-class BuilderEllipsoidTile {
-  constructor() {
-    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    this.tmp = {
-      coords: [new Coordinates('EPSG:4326', 0, 0), new Coordinates('EPSG:4326', 0, 0)],
-      position: new THREE.Vector3(),
-      dimension: new THREE.Vector2()
-    };
-    this.crs = options.crs;
-    // Order crs projection on tiles
-    this.uvCount = options.uvCount;
-    this.computeUvs = [
-    // Normalized coordinates (from degree) on the entire tile
-    // EPSG:4326
-    () => {},
-    // Float row coordinate from Pseudo mercator coordinates
-    // EPSG:3857
-    params => {
-      const t = WGS84ToOneSubY(params.projected.latitude) * params.nbRow;
-      return (!isFinite(t) ? 0 : t) - params.deltaUV1;
-    }];
-  }
-  // prepare params
-  // init projected object -> params.projected
-  prepare(params) {
-    params.nbRow = 2 ** (params.level + 1.0);
-    let st1 = WGS84ToOneSubY(params.extent.south);
-    if (!isFinite(st1)) {
-      st1 = 0;
-    }
-    const sizeTexture = 1.0 / params.nbRow;
-    const start = st1 % sizeTexture;
-    params.deltaUV1 = (st1 - start) * params.nbRow;
-
-    // transformation to align tile's normal to z axis
-    params.quatNormalToZ = quatNormalToZ.setFromAxisAngle(axisY, -(Math.PI * 0.5 - THREE.MathUtils.degToRad(params.extent.center().latitude)));
-
-    // let's avoid building too much temp objects
-    params.projected = {
-      longitude: 0,
-      latitude: 0
-    };
-    params.extent.planarDimensions(this.tmp.dimension);
-  }
-
-  // get center tile in cartesian 3D
-  center(extent) {
-    return extent.center(this.tmp.coords[0]).as(this.crs, this.tmp.coords[1]).toVector3();
-  }
-
-  // get position 3D cartesian
-  vertexPosition(params) {
-    this.tmp.coords[0].setFromValues(params.projected.longitude, params.projected.latitude);
-    this.tmp.coords[0].as(this.crs, this.tmp.coords[1]).toVector3(this.tmp.position);
-    return this.tmp.position;
-  }
-
-  // get normal for last vertex
-  vertexNormal() {
-    return this.tmp.coords[1].geodesicNormal;
-  }
-
-  // coord u tile to projected
-  uProjecte(u, params) {
-    params.projected.longitude = params.extent.west + u * this.tmp.dimension.x;
-  }
-
-  // coord v tile to projected
-  vProjecte(v, params) {
-    params.projected.latitude = params.extent.south + v * this.tmp.dimension.y;
-  }
-  computeSharableExtent(extent) {
-    // Compute sharable extent to pool the geometries
-    // the geometry in common extent is identical to the existing input
-    // with a transformation (translation, rotation)
-
-    // TODO: It should be possible to use equatorial plan symetrie,
-    // but we should be reverse UV on tile
-    // Common geometry is looking for only on longitude
-    const sizeLongitude = Math.abs(extent.west - extent.east) / 2;
-    const sharableExtent = new Extent(extent.crs, -sizeLongitude, sizeLongitude, extent.south, extent.north);
-
-    // compute rotation to transform tile to position it on ellipsoid
-    // this transformation take into account the transformation of the parents
-    const rotLon = THREE.MathUtils.degToRad(extent.west - sharableExtent.west);
-    const rotLat = THREE.MathUtils.degToRad(90 - extent.center(this.tmp.coords[0]).latitude);
-    quatToAlignLongitude.setFromAxisAngle(axisZ, rotLon);
-    quatToAlignLatitude.setFromAxisAngle(axisY, rotLat);
-    quatToAlignLongitude.multiply(quatToAlignLatitude);
-    return {
-      sharableExtent,
-      quaternion: quatToAlignLongitude.clone(),
-      position: this.center(extent)
-    };
-  }
-}
-export default BuilderEllipsoidTile;