itowns 2.34.0 → 2.36.2

package/examples/3dtiles_basic.html

@@ -49,7 +49,7 @@
                 name: 'DiscreteLOD',
                 sseThreshold: 0.05,
                 source: new itowns.C3DTilesSource({
-                    url: 'https://raw.githubusercontent.com/AnalyticalGraphicsInc/3d-tiles-samples/master/tilesets/TilesetWithDiscreteLOD/tileset.json',
+                    url: 'https://raw.githubusercontent.com/CesiumGS/3d-tiles-samples/master/1.0/TilesetWithDiscreteLOD/tileset.json',
                 }),
             }, view);
 
@@ -61,7 +61,7 @@
             var $3dTilesLayerRequestVolume = new itowns.C3DTilesLayer('3d-tiles-request-volume', {
                 name: 'RequestVolume',
                 source: new itowns.C3DTilesSource({
-                    url: 'https://raw.githubusercontent.com/AnalyticalGraphicsInc/3d-tiles-samples/master/tilesets/TilesetWithRequestVolume/tileset.json',
+                    url: 'https://raw.githubusercontent.com/CesiumGS/3d-tiles-samples/master/1.0/TilesetWithRequestVolume/tileset.json',
                 }),
                 sseThreshold: 1,
             }, view);

package/examples/config.json

@@ -60,7 +60,8 @@
         "misc_georeferenced_images": "Georeferenced image",
         "misc_orthographic_camera": "Orthographic camera",
         "misc_custom_controls": "Define custom controls",
-        "misc_custom_label": "Custom label popup"
+        "misc_custom_label": "Custom label popup",
+        "misc_camera_traveling": "Camera traveling"
     },
 
     "Plugins": {

package/examples/js/plugins/CSVnVRTParser.js

@@ -18,7 +18,6 @@
  * }).then(function _(res) {
  *     res.csv = Papa.parse(res.csv.trim()).data;
  *     return CSVnVRTParser.parse(res, { out: {
- *              buildExtent: true,
  *              crs: 'EPSG:4326'
  *          }
  *     });

package/examples/layers/JSONLayers/Administrative.json

@@ -6,7 +6,7 @@
   "transparent": true,
   "source": {
     "crs": "EPSG:3857",
-    "url": "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+    "url": "https://wxs.ign.fr/administratif/geoportail/wmts",
     "format": "image/png",
     "name": "LIMITES_ADMINISTRATIVES_EXPRESS.LATEST",
     "style": "normal",

package/examples/layers/JSONLayers/Cada.json

@@ -5,7 +5,7 @@
   "opacity": 1,
   "transparent": true,
   "source": {
-    "url": "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+    "url": "https://wxs.ign.fr/parcellaire/geoportail/wmts",
     "crs": "EPSG:3857",
     "networkOptions": {
       "crossOrigin": "omit"

package/examples/layers/JSONLayers/EtatMajor.json

@@ -4,7 +4,7 @@
     "transparent": true,
     "source": {
         "crs": "EPSG:3857",
-        "url":        "http://wxs.ign.fr/va5orxd0pgzvq3jxutqfuy0b/geoportail/wmts",
+        "url":        "http://wxs.ign.fr/cartes/geoportail/wmts",
         "networkOptions": {
             "crossOrigin": "anonymous"
         },

package/examples/layers/JSONLayers/IGN_MNT.json

@@ -8,7 +8,7 @@
         }
     },
     "source": {
-        "url":        "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+        "url":        "https://wxs.ign.fr/altimetrie/geoportail/wmts",
         "crs": "EPSG:4326",
         "format": "image/x-bil;bits=32",
         "attribution" : {

package/examples/layers/JSONLayers/IGN_MNT_HIGHRES.json

@@ -8,7 +8,7 @@
 		}
 	},
 	"source": {
-		"url":        "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+		"url":        "https://wxs.ign.fr/altimetrie/geoportail/wmts",
         "crs": "EPSG:4326",
 		"format": "image/x-bil;bits=32",
 		"attribution" : {

package/examples/layers/JSONLayers/Ortho.json

@@ -1,7 +1,7 @@
 {
     "id":   "Ortho",
     "source": {
-        "url": "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+        "url": "https://wxs.ign.fr/decouverte/geoportail/wmts",
         "crs": "EPSG:3857",
         "networkOptions": {
             "crossOrigin": "anonymous"

package/examples/layers/JSONLayers/WORLD_DTM.json

@@ -11,7 +11,7 @@
     "source": {
         "format": "image/x-bil;bits=32",
         "crs": "EPSG:4326",
-        "url":        "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+        "url":        "https://wxs.ign.fr/altimetrie/geoportail/wmts",
         "name": "ELEVATION.ELEVATIONGRIDCOVERAGE.SRTM3",
         "tileMatrixSet": "WGS84G",
         "tileMatrixSetLimits": {

package/examples/misc_camera_traveling.html

@@ -0,0 +1,148 @@
+<html lang="en">
+    <head>
+        <title>Itowns - Pick positions</title>
+
+        <meta charset="UTF-8">
+        <link rel="stylesheet" type="text/css" href="css/example.css">
+        <link rel="stylesheet" type="text/css" href="css/LoadingScreen.css">
+
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/dat-gui/0.7.6/dat.gui.min.js"></script>
+    </head>
+    <body>
+    	<div id="description">
+	        Controls
+	        <ul>
+	        	<li>Left-Click: camera translation (drag)</li>
+		        <li>Right-Click: camera translation (pan)</li>
+    		    <li>Ctrl + Left-Click: camera rotation (orbit)</li>
+    		    <li>Mouse Wheel: zoom in/out</li>
+            </ul>
+            Recording
+            <ul>
+    		    <li>P: save current camera position</li>
+    		    <li>T: travel through each saved camera positions</li>
+    		    <li>T while traveling: interrupt travel</li>
+    		    <li>C: clear all saved camera positions</li>
+	        </ul>
+	    </div>
+        <div id="viewerDiv"></div>
+
+        <script src="js/GUI/GuiTools.js"></script>
+        <script src="../dist/itowns.js"></script>
+        <script src="js/GUI/LoadingScreen.js"></script>
+        <script src="../dist/debug.js"></script>
+        <script type="text/javascript">
+            /* global itowns */
+
+            // ---------- Display a GlobeView with ortho-images and digital elevation model : ----------
+
+            // `viewerDiv` will contain iTowns rendering area (`<canvas>`) :
+            let viewerDiv = document.getElementById('viewerDiv');
+
+            // Define initial camera position :
+            let initialPlacement = {
+                coord: new itowns.Coordinates('EPSG:4326', 2.351323, 48.856712),
+                range: 50000
+            };
+
+            // Instantiate iTowns GlobeView :
+            let view = new itowns.GlobeView(viewerDiv, initialPlacement);
+
+            // Sets a loading screen :
+            setupLoadingScreen(viewerDiv, view);
+
+            // Add one imagery layer to the scene and the miniView.
+            // This layer is defined in a json file but it could be defined as a plain js
+            // object. See Layer for more info.
+            itowns.Fetcher.json('./layers/JSONLayers/Ortho.json').then(function _(config) {
+                config.source = new itowns.WMTSSource(config.source);
+                const orthoLayer = new itowns.ColorLayer('Ortho', config);
+                view.addLayer(orthoLayer);
+            });
+
+            // Add two elevation layers.
+            // These will deform iTowns globe geometry to represent terrain elevation.
+            function addElevationLayerFromConfig(config) {
+                config.source = new itowns.WMTSSource(config.source);
+                let layer = new itowns.ElevationLayer(config.id, config);
+                view.addLayer(layer);
+            }
+            itowns.Fetcher.json('./layers/JSONLayers/WORLD_DTM.json').then(addElevationLayerFromConfig);
+            itowns.Fetcher.json('./layers/JSONLayers/IGN_MNT_HIGHRES.json').then(addElevationLayerFromConfig);
+
+
+            // ---------- Select camera positions and travel through these positions : ----------
+
+            // THREE.Group which stores picked camera positions markers.
+            let cameraHelpers = new itowns.THREE.Group();
+            cameraHelpers.visible = false;
+            view.scene.add(cameraHelpers);
+
+            // Array which stores successive camera transform options (headings, tilts, ranges...
+            // see CameraTransformOptions doc at http://www.itowns-project.org/itowns/docs/#api/Controls/CameraUtils)
+            let travelSteps = [];
+            // Boolean which states if the camera is performing a travel animation or not
+            let travelOn = false;
+
+            function saveCurrentCameraTransformOptions() {
+                // Retrieve current camera transform options
+                const cameraTransformOptions = itowns.CameraUtils.getTransformCameraLookingAtTarget(
+                    view,
+                    view.camera.camera3D,
+                );
+                // Change default easing parameter for animation speed
+                // (see https://sole.github.io/tween.js/examples/03_graphs.html)
+                cameraTransformOptions.easing = itowns.CameraUtils.Easing.Quadratic.InOut;
+
+                // Add the camera transform options to the travel step array
+                travelSteps.push(cameraTransformOptions);
+
+                // Create a CameraHelper (https://threejs.org/docs/index.html?q=Camera#api/en/helpers/CameraHelper) at
+                // the current position of the camera. The camera is copied, and the copy's `far` is lowered. This
+                // renders shorter axes on the displayed CameraHelper.
+                const copyCamera = view.camera.camera3D.clone();
+                copyCamera.far = 50;
+                const helper = new itowns.THREE.CameraHelper(copyCamera);
+                helper.updateWorldMatrix(true, false);
+                cameraHelpers.add(helper);
+                view.notifyChange();
+            }
+
+            function animateCamera() {
+                if (!travelOn) {  // If travel is off, begin travel
+                    travelOn = true;
+                    return itowns.CameraUtils.sequenceAnimationsToLookAtTarget(
+                        view,
+                        view.camera.camera3D,
+                        travelSteps,
+                    ).then(() => { travelOn = false; });
+                }
+
+                itowns.CameraUtils.stop(view, view.camera.camera3D);  // If travel is on, interrupt it
+            }
+
+            // Listens for user input :
+            window.addEventListener('keypress', async function (event) {
+                // If user presses `p` (for 'pick:'), saves the current camera position, heading, tilt...
+                if (event.key === 'p') { saveCurrentCameraTransformOptions(); }
+                // If user presses `t` (for 'travel'), switches travelling mode on or off.
+                else if (event.key === 't') { animateCamera(); }
+                // If user presses `c` (for 'clear'), removes all the picked position from lists.
+                else if (event.key ==='c') {
+                    travelSteps = [];
+                    cameraHelpers.clear();
+                    view.notifyChange();
+                }
+            })
+
+            // Add a menu with an option to display CameraHelpers or not :
+            let menuGlobe = new GuiTools('menuDiv', view);
+            menuGlobe.addGUI('Picked positions', false, function (v) {
+                cameraHelpers.visible = !!v;
+                view.notifyChange();
+            })
+
+        </script>
+    </body>
+</html>

package/examples/misc_custom_label.html

@@ -124,8 +124,6 @@
         // create new featureCollection
         const collection = new itowns.FeatureCollection({
             crs: view.tileLayer.extent.crs,
-            buildExtent: true,
-            structure: '2d',
         });
 
         // create new feature

package/examples/plugins_vrt.html

@@ -50,7 +50,6 @@
             }).then(function _(res) {
                 res.csv = Papa.parse(res.csv.trim()).data;
                 return CSVnVRTParser.parse(res, { out: {
-                    buildExtent: true,
                     crs: view.tileLayer.extent.crs,
                 }});
             }).then(function _(features) {

package/examples/source_file_geojson_raster.html

@@ -109,9 +109,6 @@
                     // Here, we pass a FeatureBuildingOptions (http://www.itowns-project.org/itowns/docs/#api/Base/FeatureBuildingOptions)
                     out: {
                         crs: view.tileLayer.extent.crs,
-                        buildExtent: true,
-                        mergeFeatures: true,
-                        structure: '2d',
                     },
                 });
             }).then(function _(features) {

package/examples/source_file_shapefile.html

@@ -50,7 +50,6 @@
                 return itowns.ShapefileParser.parse(res, {
                     out: {
                         crs: view.tileLayer.extent.crs,
-                        buildExtent: true,
                     }
                 });
             }).then(function _(features) {

package/examples/source_stream_wfs_25d.html

@@ -242,40 +242,32 @@
             view.addLayer(wfsBuildingLayer);
 
             var wfsCartoSource = new itowns.WFSSource({
-                url: 'https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wfs?',
+                url: 'https://wxs.ign.fr/cartovecto/geoportail/wfs?',
                 version: '2.0.0',
-                typeName: 'BDCARTO_BDD_WLD_WGS84G:zone_habitat',
-                crs: 'EPSG:4326',
+                typeName: 'BDCARTO_BDD_WLD_WGS84G:zone_habitat_mairie',
+                crs: 'EPSG:3946',
                 ipr: 'IGN',
                 format: 'application/json',
-                extent: {
-                    west: 4.568,
-                    east: 5.18,
-                    south: 45.437,
-                    north: 46.03,
-                },
             });
 
             var wfsCartoStyle = new itowns.Style({
                 zoom: { min: 0, max: 20 },
                 text: {
                     field: '{toponyme}',
+                    color: 'white',
                     transform: 'uppercase',
-                    size: 20,
-                    haloColor: 'white',
-                    haloWidth: 1,
+                    size: 15,
+                    haloColor: 'rgba(20,20,20, 0.8)',
+                    haloWidth: 3,
                 },
             });
 
             var wfsCartoLayer = new itowns.LabelLayer('wfsCarto', {
-                crs: 'EPSG:3946',
                 source: wfsCartoSource,
                 style: wfsCartoStyle,
             });
 
-            // TODO: enable this again when the stream became available
-            // Search for "zone_habitat" in this page https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wfs?SERVICE=WFS&REQUEST=GetCapabilities
-            // view.addLayer(wfsCartoLayer);
+            view.addLayer(wfsCartoLayer);
 
             function picking(event) {
                 var htmlInfo = document.getElementById('info');

package/examples/vector_tile_raster_2d.html

@@ -48,9 +48,9 @@
 
             // Defines a VectorTilesSource to load Vector Tiles data from the geoportail
             var mvtSource = new itowns.VectorTilesSource({
-                style: 'https://wxs.ign.fr/static/vectorTiles/styles/PLAN.IGN/standard.json',
+                style: 'https://wxs.ign.fr/essentiels/static/vectorTiles/styles/PLAN.IGN/standard.json',
                 // We don't display mountains related data to ease visualisation
-                filter: (layer) => !layer['source-layer'].includes('oro_'),
+                filter: (layer) => !layer['source-layer'].includes('oro_') && !layer['source-layer'].includes('parcellaire'),
             });
 
             var mvtLayer = new itowns.ColorLayer('MVT', {

package/examples/vector_tile_raster_3d.html

@@ -54,9 +54,9 @@
 
             // Define a VectorTilesSource to load Vector Tiles data from the geoportail
             var mvtSource = new itowns.VectorTilesSource({
-                style: 'https://wxs.ign.fr/static/vectorTiles/styles/PLAN.IGN/standard.json',
+                style: 'https://wxs.ign.fr/essentiels/static/vectorTiles/styles/PLAN.IGN/standard.json',
                 // We don't display mountains related data to ease visualisation
-                filter: (layer) => !layer['source-layer'].includes('oro_'),
+                filter: (layer) => !layer['source-layer'].includes('oro_') && !layer['source-layer'].includes('parcellaire'),
             });
 
             var mvtLayer = new itowns.ColorLayer('MVT', {

package/examples/view_25d_map.html

@@ -97,6 +97,34 @@
 
             view.addLayer(wmsElevationLayer);
 
+            var wfsCartoSource = new itowns.WFSSource({
+                url: 'https://wxs.ign.fr/cartovecto/geoportail/wfs?',
+                version: '2.0.0',
+                typeName: 'BDCARTO_BDD_WLD_WGS84G:zone_habitat_mairie',
+                crs: 'EPSG:3946',
+                ipr: 'IGN',
+                format: 'application/json',
+            });
+
+            var wfsCartoStyle = new itowns.Style({
+                zoom: { min: 0, max: 20 },
+                text: {
+                    field: '{toponyme}',
+                    color: 'white',
+                    transform: 'uppercase',
+                    size: 15,
+                    haloColor: 'rgba(20,20,20, 0.8)',
+                    haloWidth: 3,
+                },
+            });
+
+            var wfsCartoLayer = new itowns.LabelLayer('wfsCarto', {
+                source: wfsCartoSource,
+                style: wfsCartoStyle,
+            });
+
+            view.addLayer(wfsCartoLayer);
+
             // Initialize scale :
             const initialScaleSize = 200;  // in pixel
             const divScaleWidget = document.getElementById('divScaleWidget');

package/examples/view_multi_25d.html

@@ -81,7 +81,7 @@
 
             itowns.THREE.Object3D.DefaultUp.set(0, 0, 1);
 
-            scale = new itowns.THREE.Vector3(1, 1, 1).divideScalar(extent.dimensions().x);
+            scale = new itowns.THREE.Vector3(1, 1, 1).divideScalar(extent.planarDimensions().x);
 
             // Instanciate View
             view = new itowns.View(extent.crs, viewerDiv);

package/lib/Controls/FirstPersonControls.js

@@ -170,15 +170,16 @@ var FirstPersonControls = /*#__PURE__*/function (_THREE$EventDispatche) {
       _this._onMouseWheel = _this.onMouseWheel.bind((0, _assertThisInitialized2["default"])(_this));
       _this._onKeyUp = _this.onKeyUp.bind((0, _assertThisInitialized2["default"])(_this));
       _this._onKeyDown = _this.onKeyDown.bind((0, _assertThisInitialized2["default"])(_this));
+      _this._onContextMenu = _this.onContextMenu.bind((0, _assertThisInitialized2["default"])(_this));
       view.domElement.addEventListener('mousedown', _this._onMouseDown, false);
       view.domElement.addEventListener('touchstart', _this._onMouseDown, false);
       view.domElement.addEventListener('mousemove', _this._onMouseMove, false);
       view.domElement.addEventListener('touchmove', _this._onMouseMove, false);
       view.domElement.addEventListener('mouseup', _this._onMouseUp, false);
       view.domElement.addEventListener('touchend', _this._onMouseUp, false);
-      view.domElement.addEventListener('mousewheel', _this._onMouseWheel, false);
-      view.domElement.addEventListener('DOMMouseScroll', _this._onMouseWheel, false); // firefox
-      // TODO: Why windows
+      view.domElement.addEventListener('wheel', _this._onMouseWheel, false); // Disable context menu when right clicking.
+
+      view.domElement.addEventListener('contextmenu', _this._onContextMenu, false); // TODO: Why windows
 
       document.addEventListener('keydown', _this._onKeyDown, false);
       document.addEventListener('keyup', _this._onKeyUp, false);
@@ -345,14 +346,7 @@ var FirstPersonControls = /*#__PURE__*/function (_THREE$EventDispatche) {
         return;
       }
 
-      var delta = 0;
-
-      if (event.wheelDelta !== undefined) {
-        delta = -event.wheelDelta; // Firefox
-      } else if (event.detail !== undefined) {
-        delta = event.detail;
-      }
-
+      var delta = event.deltaY;
       this.camera.fov = THREE.MathUtils.clamp(this.camera.fov + Math.sign(delta), 10, Math.min(100, this.options.verticalFOV));
       this.camera.updateProjectionMatrix();
       this._state.rotateX = limitRotation(this.camera, this._state.rotateX, this.options.verticalFOV);
@@ -389,6 +383,11 @@ var FirstPersonControls = /*#__PURE__*/function (_THREE$EventDispatche) {
         e.preventDefault();
       }
     }
+  }, {
+    key: "onContextMenu",
+    value: function onContextMenu(event) {
+      event.preventDefault();
+    }
   }, {
     key: "dispose",
     value: function dispose() {
@@ -399,9 +398,8 @@ var FirstPersonControls = /*#__PURE__*/function (_THREE$EventDispatche) {
         this.view.domElement.removeEventListener('touchmove', this._onMouseMove, false);
         this.view.domElement.removeEventListener('mouseup', this._onMouseUp, false);
         this.view.domElement.removeEventListener('touchend', this._onMouseUp, false);
-        this.view.domElement.removeEventListener('mousewheel', this._onMouseWheel, false);
-        this.view.domElement.removeEventListener('DOMMouseScroll', this._onMouseWheel, false); // firefox
-
+        this.view.domElement.removeEventListener('wheel', this._onMouseWheel, false);
+        this.view.domElement.removeEventListener('contextmenu', this._onContextMenu, false);
         document.removeEventListener('keydown', this._onKeyDown, false);
         document.removeEventListener('keyup', this._onKeyUp, false);
       }

package/lib/Controls/FlyControls.js

@@ -143,13 +143,7 @@ function onKeyDown(e) {
 }
 
 function onDocumentMouseWheel(event) {
-  var delta = 0;
-
-  if (event.wheelDelta !== undefined) {
-    delta = event.wheelDelta; // Firefox
-  } else if (event.detail !== undefined) {
-    delta = -event.detail;
-  }
+  var delta = -event.deltaY;
 
   if (delta < 0) {
     this.moves.add(MOVEMENTS.wheelup);
@@ -204,9 +198,7 @@ var FlyControls = /*#__PURE__*/function (_THREE$EventDispatche) {
     view.domElement.addEventListener('touchmove', bindedPM, false);
     view.domElement.addEventListener('mouseup', onDocumentMouseUp.bind((0, _assertThisInitialized2["default"])(_this)), false);
     view.domElement.addEventListener('touchend', onDocumentMouseUp.bind((0, _assertThisInitialized2["default"])(_this)), false);
-    view.domElement.addEventListener('mousewheel', onDocumentMouseWheel.bind((0, _assertThisInitialized2["default"])(_this)), false);
-    view.domElement.addEventListener('DOMMouseScroll', onDocumentMouseWheel.bind((0, _assertThisInitialized2["default"])(_this)), false); // firefox
-
+    view.domElement.addEventListener('wheel', onDocumentMouseWheel.bind((0, _assertThisInitialized2["default"])(_this)), false);
     view.domElement.addEventListener('keyup', onKeyUp.bind((0, _assertThisInitialized2["default"])(_this)), true);
     view.domElement.addEventListener('keydown', onKeyDown.bind((0, _assertThisInitialized2["default"])(_this)), true);