npm - itowns - Versions diffs - 2.37.0 → 2.38.2 - Mend

itowns 2.37.0 → 2.38.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (77) hide show

package/README.md +12 -1
package/changelog.md +101 -0
package/dist/debug.js +1 -1
package/dist/debug.js.LICENSE.txt +2 -2
package/dist/debug.js.map +1 -1
package/dist/itowns.js +1 -1
package/dist/itowns.js.LICENSE.txt +2 -2
package/dist/itowns.js.map +1 -1
package/dist/itowns_widgets.js +1 -1
package/dist/itowns_widgets.js.map +1 -1
package/examples/config.json +4 -1
package/examples/css/example.css +21 -1
package/examples/css/widgets.css +118 -6
package/examples/images/code-logo.svg +43 -0
package/examples/index.html +5 -5
package/examples/mars.html +0 -1
package/examples/misc_orthographic_camera.html +7 -19
package/examples/vector_tile_3d_mesh.html +155 -0
package/examples/vector_tile_raster_3d.html +0 -5
package/examples/view_25d_map.html +6 -19
package/examples/view_2d_map.html +6 -19
package/examples/view_3d_map.html +106 -81
package/examples/widgets_minimap.html +3 -1
package/examples/widgets_navigation.html +6 -1
package/examples/widgets_scale.html +96 -0
package/examples/widgets_searchbar.html +124 -0
package/lib/Controls/PlanarControls.js +10 -42
package/lib/Converter/Feature2Mesh.js +225 -61
package/lib/Converter/Feature2Texture.js +4 -3
package/lib/Converter/convertToTile.js +10 -5
package/lib/Core/Feature.js +57 -30
package/lib/Core/MainLoop.js +136 -62
package/lib/Core/TileMesh.js +21 -5
package/lib/Core/View.js +46 -15
package/lib/Layer/FeatureGeometryLayer.js +37 -10
package/lib/Layer/GeoidLayer.js +17 -6
package/lib/Layer/GeometryLayer.js +6 -54
package/lib/Layer/OrientedImageLayer.js +1 -0
package/lib/Layer/RasterLayer.js +3 -1
package/lib/Layer/ReferencingLayerProperties.js +50 -0
package/lib/Main.js +1 -1
package/lib/Parser/B3dmParser.js +3 -2
package/lib/Parser/GeoJsonParser.js +29 -7
package/lib/Parser/VectorTileParser.js +5 -4
package/lib/Parser/deprecated/LegacyGLTFLoader.js +3 -3
package/lib/Process/3dTilesProcessing.js +3 -3
package/lib/Process/FeatureProcessing.js +36 -86
package/lib/Process/LayeredMaterialNodeProcessing.js +9 -3
package/lib/Process/ObjectRemovalHelper.js +4 -0
package/lib/Provider/3dTilesProvider.js +2 -7
package/lib/Provider/Fetcher.js +5 -2
package/lib/Provider/TileProvider.js +18 -2
package/lib/Renderer/Camera.js +33 -12
package/lib/Renderer/ColorLayersOrdering.js +3 -1
package/lib/Renderer/LayeredMaterial.js +32 -7
package/lib/Renderer/OBB.js +8 -4
package/lib/Renderer/OrientedImageMaterial.js +8 -5
package/lib/Renderer/PointsMaterial.js +1 -0
package/lib/Renderer/RenderMode.js +3 -1
package/lib/Renderer/Shader/ShaderChunk.js +5 -1
package/lib/Renderer/c3DEngine.js +9 -6
package/lib/Source/FileSource.js +8 -1
package/lib/Source/VectorTilesSource.js +5 -0
package/lib/Source/WFSSource.js +9 -3
package/lib/ThreeExtended/{WebGL.js → capabilities/WebGL.js} +8 -7
package/lib/ThreeExtended/loaders/GLTFLoader.js +3 -4
package/lib/Utils/DEMUtils.js +3 -1
package/lib/Utils/gui/Main.js +39 -0
package/lib/Utils/gui/Minimap.js +195 -0
package/lib/Utils/gui/Navigation.js +322 -0
package/lib/Utils/gui/Scale.js +154 -0
package/lib/Utils/gui/Searchbar.js +299 -0
package/lib/Utils/gui/Widget.js +119 -0
package/package.json +27 -22
package/examples/images/compass.svg +0 -60
package/examples/images/widget-logo.svg +0 -66
package/examples/js/Scale.js +0 -41

package/examples/widgets_scale.html ADDED Viewed

@@ -0,0 +1,96 @@
+<html>
+    <head>
+        <title>Itowns - Scale widget</title>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <link rel="stylesheet" type="text/css" href="css/example.css">
+        <link rel="stylesheet" type="text/css" href="css/LoadingScreen.css">
+        <!-- Import stylesheet for itowns Widgets plugin. This stylesheet is included in the bundles if you downloaded
+        them, or it can be found in `node_modules/itowns/examples/css` if you installed iTowns with npm. Otherwise, it
+        can be found here : https://raw.githubusercontent.com/iTowns/itowns/master/examples/css/widgets.css -->
+        <link rel="stylesheet" type="text/css" href="css/widgets.css">
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/dat-gui/0.7.6/dat.gui.min.js"></script>
+    </head>
+    <body>
+        <!-- Create a container for itowns viewer -->
+        <div id="viewerDiv"></div>
+        <!-- Import iTowns source code -->
+        <script src="../dist/itowns.js"></script>
+        <script src="../dist/debug.js"></script>
+        <!-- Import iTowns Widgets plugin -->
+        <script src="../dist/itowns_widgets.js"></script>
+        <!-- Import iTowns LoadingScreen and GuiTools plugins -->
+        <script src="js/GUI/LoadingScreen.js"></script>
+        <script src="js/GUI/GuiTools.js"></script>
+        <script type="text/javascript">
+            // ---------- CREATE A GlobeView FOR SUPPORTING DATA VISUALIZATION : ----------
+            // Define camera initial position
+            const placement = {
+                coord: new itowns.Coordinates('EPSG:4326', 2.351323, 48.856712),
+                range: 6000,
+                tilt: 50,
+            }
+            // `viewerDiv` contains iTowns' rendering area (`<canvas>`)
+            const viewerDiv = document.getElementById('viewerDiv');
+            // Create a GlobeView
+            const view = new itowns.GlobeView(viewerDiv, placement);
+            // Setup loading screen and debug menu
+            setupLoadingScreen(viewerDiv, view);
+            const debugMenu = new GuiTools('menuDiv', view);
+            // ---------- DISPLAY CONTEXTUAL DATA : ----------
+            // Add one imagery layer to the scene. This layer's properties are defined in a json file, but it could be
+            // defined as a plain js object. See `Layer` documentation for more info.
+            itowns.Fetcher.json('layers/JSONLayers/Ortho.json').then((config) => {
+                config.source = new itowns.WMTSSource(config.source);
+                view.addLayer(
+                    new itowns.ColorLayer(config.id, config),
+                ).then(debugMenu.addLayerGUI.bind(debugMenu));
+            });
+            // Add two elevation layers, each with a different level of detail. Here again, each layer's properties are
+            // defined in a json file.
+            function addElevationLayerFromConfig(config) {
+                config.source = new itowns.WMTSSource(config.source);
+                view.addLayer(
+                    new itowns.ElevationLayer(config.id, config),
+                ).then(debugMenu.addLayerGUI.bind(debugMenu));
+            }
+            itowns.Fetcher.json('layers/JSONLayers/WORLD_DTM.json').then(addElevationLayerFromConfig);
+            itowns.Fetcher.json('layers/JSONLayers/IGN_MNT_HIGHRES.json').then(addElevationLayerFromConfig);
+            // ---------- ADD SCALE WIDGET : ----------
+            const scale = new itowns_widgets.Scale(view, {
+                position: 'bottom-right',
+                translate: { x: -70 },
+            });
+            // ---------- DEBUG TOOLS : ----------
+            debug.createTileDebugUI(debugMenu.gui, view);
+        </script>
+    </body>
+</html>

package/examples/widgets_searchbar.html ADDED Viewed

@@ -0,0 +1,124 @@
+<html>
+    <head>
+        <title>Itowns - Searchbar widget</title>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <link rel="stylesheet" type="text/css" href="css/example.css">
+        <link rel="stylesheet" type="text/css" href="css/LoadingScreen.css">
+        <!-- Import stylesheet for itowns Widgets plugin. This stylesheet is included in the bundles if you downloaded
+        them, or it can be found in `node_modules/itowns/examples/css` if you installed iTowns with npm. Otherwise, it
+        can be found here : https://raw.githubusercontent.com/iTowns/itowns/master/examples/css/widgets.css -->
+        <link rel="stylesheet" type="text/css" href="css/widgets.css">
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/dat-gui/0.7.6/dat.gui.min.js"></script>
+    </head>
+    <body>
+        <!-- Create a container for itowns viewer -->
+        <div id="viewerDiv"></div>
+        <!-- Import iTowns source code -->
+        <script src="../dist/itowns.js"></script>
+        <script src="../dist/debug.js"></script>
+        <!-- Import iTowns Widgets plugin -->
+        <script src="../dist/itowns_widgets.js"></script>
+        <!-- Import iTowns LoadingScreen and GuiTools plugins -->
+        <script src="js/GUI/LoadingScreen.js"></script>
+        <script src="js/GUI/GuiTools.js"></script>
+        <script type="text/javascript">
+            // ---------- CREATE A GlobeView FOR SUPPORTING DATA VISUALIZATION : ----------
+            // Define camera initial position
+            const placement = {
+                coord: new itowns.Coordinates('EPSG:4326', 2.351323, 48.856712),
+                range: 6000,
+                tilt: 50,
+            }
+            // `viewerDiv` contains iTowns' rendering area (`<canvas>`)
+            const viewerDiv = document.getElementById('viewerDiv');
+            // Create a GlobeView
+            const view = new itowns.GlobeView(viewerDiv, placement);
+            // Setup loading screen and debug menu
+            setupLoadingScreen(viewerDiv, view);
+            const debugMenu = new GuiTools('menuDiv', view);
+            // ---------- DISPLAY CONTEXTUAL DATA : ----------
+            // Add one imagery layer to the scene. This layer's properties are defined in a json file, but it could be
+            // defined as a plain js object. See `Layer` documentation for more info.
+            itowns.Fetcher.json('layers/JSONLayers/Ortho.json').then((config) => {
+                config.source = new itowns.WMTSSource(config.source);
+                view.addLayer(
+                    new itowns.ColorLayer(config.id, config),
+                ).then(debugMenu.addLayerGUI.bind(debugMenu));
+            });
+            // Add two elevation layers, each with a different level of detail. Here again, each layer's properties are
+            // defined in a json file.
+            function addElevationLayerFromConfig(config) {
+                config.source = new itowns.WMTSSource(config.source);
+                view.addLayer(
+                    new itowns.ElevationLayer(config.id, config),
+                ).then(debugMenu.addLayerGUI.bind(debugMenu));
+            }
+            itowns.Fetcher.json('layers/JSONLayers/WORLD_DTM.json').then(addElevationLayerFromConfig);
+            itowns.Fetcher.json('layers/JSONLayers/IGN_MNT_HIGHRES.json').then(addElevationLayerFromConfig);
+            // ---------- ADD SEARCH BAR WIDGET : ----------
+            // Function that should be called when clicking a location suggestion.
+            function lookAtCoordinate(coordinates) {
+                view.controls.lookAtCoordinate({ coord: coordinates, range: 20000, tilt: 45, heading: 0 });
+            }
+            // Define options for geocoding service that should be used by the searchbar.
+            const geocodingOptions = {
+                url: new URL(
+                    'https://wxs.ign.fr/ayxvok72rcocdyn8xyvy32og/ols/apis/completion?text=&type=StreetAddress,' +
+                    'PositionOfInterest',
+                ),
+                // As precised in the doc (http://www.itowns-project.org/itowns/docs/#api/Widgets/Searchbar), the parser
+                // method must parse the geocoding service response into a Map object. For each item of this Map, the
+                // key is a string that is displayed in the suggestions bellow the searchbar, and the value is whatever
+                // the user wants. The value is the parameter that is passed to the `onSelected` method when a
+                // suggestion is clicked. Here, we se the value as the `Coordinates` associated to the location.
+                parser: (response) => {
+                    const map = new Map();
+                    response.results.forEach(location => {
+                        map.set(location.fulltext, new itowns.Coordinates('EPSG:4326', location.x, location.y));
+                    });
+                    return map;
+                },
+                onSelected: lookAtCoordinate,
+            }
+            // Create the searchbar
+            const searchbar = new itowns_widgets.Searchbar(view, geocodingOptions, {
+                // We want to display at maximum 15 location suggestions when typing the searchbar.
+                maxSuggestionNumber: 15,
+                placeholder: 'Search a location in France',
+            });
+            // ---------- DEBUG TOOLS : ----------
+            debug.createTileDebugUI(debugMenu.gui, view);
+        </script>
+    </body>
+</html>

package/lib/Controls/PlanarControls.js CHANGED Viewed

@@ -126,8 +126,6 @@ var defaultOptions = {
   instantTravel: false,
   minZenithAngle: 0,
   maxZenithAngle: 82.5,
-  focusOnMouseOver: true,
-  focusOnMouseClick: true,
   handleCollision: true,
   minDistanceCollision: 30,
   enableSmartTravel: true,
@@ -183,8 +181,6 @@ var PLANAR_CONTROL_EVENT = {
  * rotation, in degrees.
  * @param   {number}        [options.maxZenithAngle=82.5]       The maximum reachable zenith angle for a camera
  * rotation, in degrees.
- * @param   {boolean}       [options.focusOnMouseOver=true]     Set the focus on the canvas if hovered.
- * @param   {boolean}       [options.focusOnMouseClick=true]    Set the focus on the canvas if clicked.
  * @param   {boolean}       [options.handleCollision=true]
  */
@@ -280,8 +276,14 @@ var PlanarControls = /*#__PURE__*/function (_THREE$EventDispatche) {
     _this.maxZenithAngle = (options.maxZenithAngle || defaultOptions.maxZenithAngle) * Math.PI / 180; // focus policy options
-    _this.focusOnMouseOver = options.focusOnMouseOver || defaultOptions.focusOnMouseOver;
-    _this.focusOnMouseClick = options.focusOnMouseClick || defaultOptions.focusOnMouseClick; // set collision options
+    if (options.focusOnMouseOver) {
+      console.warn('Planar controls \'focusOnMouseOver\' optional parameter has been removed.');
+    }
+    if (options.focusOnMouseClick) {
+      console.warn('Planar controls \'focusOnMouseClick\' optional parameter has been removed.');
+    } // set collision options
     _this.handleCollision = options.handleCollision === undefined ? defaultOptions.handleCollision : options.handleCollision;
     _this.minDistanceCollision = defaultOptions.minDistanceCollision; // enable smart travel
@@ -307,8 +309,6 @@ var PlanarControls = /*#__PURE__*/function (_THREE$EventDispatche) {
     _this._handlerOnMouseUp = _this.onMouseUp.bind((0, _assertThisInitialized2["default"])(_this));
     _this._handlerOnMouseMove = _this.onMouseMove.bind((0, _assertThisInitialized2["default"])(_this));
     _this._handlerOnMouseWheel = _this.onMouseWheel.bind((0, _assertThisInitialized2["default"])(_this));
-    _this._handlerFocusOnMouseClick = _this.onMouseClick.bind((0, _assertThisInitialized2["default"])(_this));
-    _this._handlerFocusOnMouseOver = _this.onMouseOver.bind((0, _assertThisInitialized2["default"])(_this));
     _this._handlerContextMenu = _this.onContextMenu.bind((0, _assertThisInitialized2["default"])(_this));
     _this._handlerUpdate = _this.update.bind((0, _assertThisInitialized2["default"])(_this)); // add this PlanarControl instance to the view's frameRequesters
     // with this, PlanarControl.update() will be called each frame
@@ -856,18 +856,9 @@ var PlanarControls = /*#__PURE__*/function (_THREE$EventDispatche) {
       this.view.domElement.addEventListener('mouseup', this._handlerOnMouseUp, false);
       this.view.domElement.addEventListener('mouseleave', this._handlerOnMouseUp, false);
       this.view.domElement.addEventListener('mousemove', this._handlerOnMouseMove, false);
-      this.view.domElement.addEventListener('wheel', this._handlerOnMouseWheel, false); // focus policy
-      if (this.focusOnMouseOver) {
-        this.view.domElement.addEventListener('mouseover', this._handlerFocusOnMouseOver, false);
-      }
-      if (this.focusOnMouseClick) {
-        this.view.domElement.addEventListener('click', this._handlerFocusOnMouseClick, false);
-      } // prevent the default context menu from appearing when right-clicking
+      this.view.domElement.addEventListener('wheel', this._handlerOnMouseWheel, false); // prevent the default context menu from appearing when right-clicking
       // this allows to use right-click for input without the menu appearing
       this.view.domElement.addEventListener('contextmenu', this._handlerContextMenu, false);
     }
     /**
@@ -885,8 +876,6 @@ var PlanarControls = /*#__PURE__*/function (_THREE$EventDispatche) {
       this.view.domElement.removeEventListener('mouseleave', this._handlerOnMouseUp, false);
       this.view.domElement.removeEventListener('mousemove', this._handlerOnMouseMove, false);
       this.view.domElement.removeEventListener('wheel', this._handlerOnMouseWheel, false);
-      this.view.domElement.removeEventListener('mouseover', this._handlerFocusOnMouseOver, false);
-      this.view.domElement.removeEventListener('click', this._handlerFocusOnMouseClick, false);
       this.view.domElement.removeEventListener('contextmenu', this._handlerContextMenu, false);
     }
     /**
@@ -959,6 +948,7 @@ var PlanarControls = /*#__PURE__*/function (_THREE$EventDispatche) {
     key: "onMouseDown",
     value: function onMouseDown(event) {
       event.preventDefault();
+      this.view.domElement.focus();
       if (STATE.NONE !== this.state) {
         return;
@@ -1086,28 +1076,6 @@ var PlanarControls = /*#__PURE__*/function (_THREE$EventDispatche) {
         this.initiateZoom(event);
       }
     }
-    /**
-     * Set the focus on view's domElement according to focus policy regarding MouseOver
-     *
-     * @ignore
-     */
-  }, {
-    key: "onMouseOver",
-    value: function onMouseOver() {
-      this.view.domElement.focus();
-    }
-    /**
-     * Set the focus on view's domElement according to focus policy regarding MouseClick
-     *
-     * @ignore
-     */
-  }, {
-    key: "onMouseClick",
-    value: function onMouseClick() {
-      this.view.domElement.focus();
-    }
     /**
      * Catch and manage the event when the context menu is called (by a right-click on the window). We use this
      * to prevent the context menu from appearing so we can use right click for other inputs.