Add support for thematicDataSource in URL

3dcitydb · Oct 29, 2019 · 85afb36 · 85afb36
1 parent e84e296
commit 85afb36
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/3dwebclient/script.js b/3dwebclient/script.js
@@ -480,6 +480,7 @@ function saveLayerSettings() {
     applySaving('maxSizeOfCachedTiles', activeLayer);
     applySaving('maxCountOfVisibleTiles', activeLayer);
     console.log(activeLayer);
+    var test = activeLayer["thematicDataSource"];
 
     // update GUI:
     var nodes = document.getElementById('citydb_layerlistpanel').childNodes;
@@ -534,6 +535,8 @@ function loadLayerGroup(_layers) {
 
                 // show/hide glTF version based on the value of Layer Data Type
                 layerDataTypeDropdownOnchange();
+
+                thematicDataSourceDropdownOnchange();
             }
         }).otherwise(function (error) {
             CitydbUtil.showAlertWindow("OK", "Error", error.message);
@@ -1297,11 +1300,13 @@ function layerDataTypeDropdownOnchange() {
     } else {
         document.getElementById("gltfVersionDropdownRow").style.display = "";
     }
+    addLayerViewModel["layerDataType"] = layerDataTypeDropdown.options[layerDataTypeDropdown.selectedIndex].value;
 }
 
 function thematicDataSourceDropdownOnchange() {
     var thematicDataSourceDropdown = document.getElementById("thematicDataSourceDropdown");
     var selectedThematicDataSource = thematicDataSourceDropdown.options[thematicDataSourceDropdown.selectedIndex].value;
+    addLayerViewModel["thematicDataSource"] = selectedThematicDataSource;
 
     // if (selectedThematicDataSource == "GoogleSheets") {
     //     document.getElementById("rowGoogleSheetsApiKey").style.display = "table-row";

diff --git a/js/CitydbKmlLayer.js b/js/CitydbKmlLayer.js
@@ -50,6 +50,7 @@
         // extended variables for CitydbKmlLayer	
         this._cesiumViewer = undefined;
         this._thematicDataUrl = Cesium.defaultValue(options.thematicDataUrl, "");
+        this._thematicDataSource = Cesium.defaultValue(options.thematicDataSource, "");
         this._thematicDataProvider = Cesium.defaultValue(options.thematicDataProvider, "");
         this._cityobjectsJsonUrl = options.cityobjectsJsonUrl;
         this._cityobjectsJsonData = new Object();
@@ -79,6 +80,7 @@
             "layerDataType": this.layerDataType,
             "gltfVersion": this.gltfVersion,
             "thematicDataUrl": this.thematicDataUrl,
+            "thematicDataSource": this.thematicDataSource,
             "thematicDataProvider": this._thematicDataProvider,
             "cityobjectsJsonUrl": this.cityobjectsJsonUrl,
             "minLodPixels": this.minLodPixels,
@@ -173,6 +175,15 @@
             }
         },
 
+        thematicDataSource: {
+            get: function () {
+                return this._thematicDataSource;
+            },
+            set: function (value) {
+                this._thematicDataSource = value;
+            }
+        },
+
         thematicDataProvider: {
             get: function () {
                 return this._thematicDataProvider;