Merge pull request #78 from mulfvik/maximum-screenspace-error

Adds maximum screenspace error option
3dcitydb · Apr 9, 2024 · bd54bed · bd54bed
2 parents c4eebdc + e444f95
commit bd54bed
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 7 deletions.
diff --git a/3dwebclient/index.html b/3dwebclient/index.html
@@ -356,6 +356,12 @@
                                             <input type="text" data-bind="value: maxSizeOfCachedTiles">
                                         </td>
                                     </tr>
+                                    <tr id="maximumScreenSpaceError">
+                                        <td>MaximumScreenSpaceError</td>
+                                        <td>
+                                            <input type="text" data-bind="value: maximumScreenSpaceError">
+                                        </td>
+                                    </tr>
                                 </tbody>
                             </table>
                             <div class="citydb_short_container">
@@ -644,4 +650,4 @@
         </script>
         <script src="script.js"></script>
     </body>
-</html>
+</html>
diff --git a/3dwebclient/script.js b/3dwebclient/script.js
@@ -94,7 +94,8 @@ var addLayerViewModel = {
     minLodPixels: "",
     maxLodPixels: "",
     maxSizeOfCachedTiles: 200,
-    maxCountOfVisibleTiles: 200
+    maxCountOfVisibleTiles: 200,
+    maximumScreenSpaceError: 16
 };
 Cesium.knockout.track(addLayerViewModel);
 Cesium.knockout.applyBindings(addLayerViewModel, document.getElementById('citydb_addlayerpanel'));
@@ -309,6 +310,7 @@ function observeActiveLayer() {
         addLayerViewModel.maxLodPixels = selectedLayer.maxLodPixels;
         addLayerViewModel.maxSizeOfCachedTiles = selectedLayer.maxSizeOfCachedTiles;
         addLayerViewModel.maxCountOfVisibleTiles = selectedLayer.maxCountOfVisibleTiles;
+        addLayerViewModel.maximumScreenSpaceError = selectedLayer.maximumScreenSpaceError;
     }
 }
 
@@ -470,6 +472,7 @@ function saveLayerSettings() {
     applySaving('maxLodPixels', activeLayer);
     applySaving('maxSizeOfCachedTiles', activeLayer);
     applySaving('maxCountOfVisibleTiles', activeLayer);
+    applySaving('maximumScreenSpaceError', activeLayer);
     console.log(activeLayer);
 
     // Update Data Source
@@ -894,7 +897,8 @@ function addNewLayer() {
         minLodPixels: addLayerViewModel.minLodPixels,
         maxLodPixels: addLayerViewModel.maxLodPixels == -1 ? Number.MAX_VALUE : addLayerViewModel.maxLodPixels,
         maxSizeOfCachedTiles: addLayerViewModel.maxSizeOfCachedTiles,
-        maxCountOfVisibleTiles: addLayerViewModel.maxCountOfVisibleTiles
+        maxCountOfVisibleTiles: addLayerViewModel.maxCountOfVisibleTiles,
+        maximumScreenSpaceError: addLayerViewModel.maximumScreenSpaceError
     }
 
     // since Cesium 3D Tiles also require name.json in the URL, it must be checked first
@@ -1173,9 +1177,11 @@ function layerDataTypeDropdownOnchange() {
     if (layerDataTypeDropdown.options[layerDataTypeDropdown.selectedIndex].value !== "COLLADA/KML/glTF") {
         document.getElementById("gltfVersionDropdownRow").style.display = "none";
         document.getElementById("layerProxyAndClampToGround").style.display = "none";
+        document.getElementById("maximumScreenSpaceError").style.display = "";
     } else {
         document.getElementById("gltfVersionDropdownRow").style.display = "";
         document.getElementById("layerProxyAndClampToGround").style.display = "";
+        document.getElementById("maximumScreenSpaceError").style.display = "none";
     }
     addLayerViewModel["layerDataType"] = layerDataTypeDropdown.options[layerDataTypeDropdown.selectedIndex].value;
 }

diff --git a/3dwebclient/utils/UrlController.js b/3dwebclient/utils/UrlController.js
@@ -33,6 +33,7 @@ var UrlController = /** @class */ (function () {
             "maxLodPixels": "al",
             "maxSizeOfCachedTiles": "ac",
             "maxCountOfVisibleTiles": "av",
+            "maximumScreenSpaceError": "mse",
             // basemap infos
             "basemap": "bm",
             // "name" : "n",
@@ -182,6 +183,7 @@ var UrlController = /** @class */ (function () {
             layerConfig[this.getUrlParaForward('maxLodPixels')] = Cesium.defaultValue(layer.maxLodPixels, "");
             layerConfig[this.getUrlParaForward('maxSizeOfCachedTiles')] = Cesium.defaultValue(layer.maxSizeOfCachedTiles, "");
             layerConfig[this.getUrlParaForward('maxCountOfVisibleTiles')] = Cesium.defaultValue(layer.maxCountOfVisibleTiles, "");
+            layerConfig[this.getUrlParaForward('maximumScreenSpaceError')] = Cesium.defaultValue(layer.maximumScreenSpaceError, "");
             layerGroupObject[this.getUrlParaForward('layer_') + i] = Cesium.objectToQuery(layerConfig);
         }
         return Cesium.objectToQuery(layerGroupObject);
@@ -267,6 +269,7 @@ var UrlController = /** @class */ (function () {
                 maxLodPixels: this.getValueFromObject('maxLodPixels', layerConfig, Number.MAX_VALUE, Cesium) === -1 ? Number.MAX_VALUE : this.getValueFromObject('maxLodPixels', layerConfig, Number.MAX_VALUE, Cesium),
                 maxSizeOfCachedTiles: this.getValueFromObject('maxSizeOfCachedTiles', layerConfig, 140, Cesium),
                 maxCountOfVisibleTiles: this.getValueFromObject('maxCountOfVisibleTiles', layerConfig, 140, Cesium),
+                maximumScreenSpaceError: this.getValueFromObject('maximumScreenSpaceError', layerConfig, '', Cesium),
             };
             if (['kml', 'kmz', 'json', 'czml'].indexOf(CitydbUtil.get_suffix_from_filename(options.url)) > -1
                 && options.layerDataType === "COLLADA/KML/glTF") {

diff --git a/js/Cesium3DTilesDataLayer.js b/js/Cesium3DTilesDataLayer.js
@@ -53,6 +53,7 @@
         this._tableType = Cesium.defaultValue(options.tableType, "");
         this._cityobjectsJsonUrl = options.cityobjectsJsonUrl;
         this._thematicDataProvider = Cesium.defaultValue(options.thematicDataProvider, "");
+        this._maximumScreenSpaceError = Cesium.defaultValue(options.maximumScreenSpaceError, "");
         this._cesiumViewer = undefined;
         this._tileset = undefined;
 
@@ -67,7 +68,8 @@
             "url": this.url,
             "layerDataType": this.layerDataType,
             "thematicDataUrl": this.thematicDataUrl,
-            "thematicDataProvider": this._thematicDataProvider
+            "thematicDataProvider": this._thematicDataProvider,
+            "maximumScreenSpaceError": this._maximumScreenSpaceError,
         }
 
         /**
@@ -261,7 +263,18 @@
             get: function () {
                 return this._configParameters;
             }
-        }
+        },
+        /**
+         * Gets the maximumScreenSpaceError of the Cesium 3D Tiles
+         */
+        maximumScreenSpaceError: {
+            get: function () {
+                return this._maximumScreenSpaceError;
+            },
+            set: function (value) {
+                this._maximumScreenSpaceError = value;
+            }
+        },
     });
 
     /**
@@ -290,7 +303,8 @@
         var deferred = Cesium.when.defer();
 
         this._tileset = new Cesium.Cesium3DTileset({
-            url: this._url
+            url: this._url,
+            maximumScreenSpaceError: this._maximumScreenSpaceError
         });
 
         this._tileset.readyPromise.then(function (tileset) {
@@ -462,7 +476,8 @@
         this._cesiumViewer.scene.primitives.remove(this._tileset);
 
         this._tileset = new Cesium.Cesium3DTileset({
-            url: this.autofillUrl(this._url)
+            url: this.autofillUrl(this._url),
+            maximumScreenSpaceError: this._maximumScreenSpaceError
         });
 
         this._tileset.readyPromise.then(function (tileset) {