mime, CHANGELOG.md und 12 weitere dateien aktualisiert...

vcm/config.json

@@ -1420,6 +1420,22 @@
         "url": "",
         "year": ""
       }
+    },{
+      "name": "Ludwigsburg",
+      "url": "https://w2.iaf-ex.hft-stuttgart.de/CesiumData/3DTiles/Buildings/BuildingSolid/LKRLudwigsburg/tileset.json",
+      "type": "vcs.vcm.layer.cesium.Buildings",
+      "datasourceId": "zECwoSwXppPMrqfLoc",
+      "activeOnStartup": true,
+      "exclusive": false,
+      "allowPicking": true,
+      "screenSpaceError": 1,
+      "screenSpaceErrorMobile": 1,
+      "hiddenObjectIds": [],
+      "copyright": {
+        "provider": "",
+        "url": "",
+        "year": ""
+      }
     },{
       "name": "Rosenstein",
       "url": "./datasource-data/Rosenstein/tileset.json",
@@ -1474,6 +1490,7 @@
       "name": "Openstreetmap layer",
       "type": "vcs.vcm.layer.OpenStreetMap",
       "exclusive": "base",
+      "zIndex" : 1,
       "activeOnStartup": true,
       "copyright": {
         "provider": "OpenStreetMap contributors",
@@ -1491,6 +1508,7 @@
       "url": "https://gis5.stuttgart.de/arcgis/services/1_Base/WMS_Luftbilder_aktuell/MapServer/WmsServer",
       "parameters": "",
       "maxLevel": 18,
+      "zIndex" : 2,
       "tilingSchema": "geographic",
       "datasourceId": "",
       "hiddenObjectIds": [],

vcm/index.html

@@ -364,8 +364,13 @@
                     class="collapsible">Stadtplanung</button>
                 <div class="content">
                     <h3>Historische Stadtentwicklung</h3>
-                    <p class="contentOne">Durch dieses Tool kann das Wachstum der Stadt Stuttgart dargestellt werden.</a><br>
+                    <p class="contentOne">Durch dieses Tool kann das Wachstum der Stadt Stuttgart und dem Landkreis Ludwigsburg dargestellt werden.</a><br>
                     </p>
+                    <label for="cities">Wählen Sie einen Bereich:</label>
+                        <select name="cities" id="cities">
+                        <option value="StuttgartLocal">Stuttgart</option>
+                        <option value="Ludwigsburg">Ludwigsburg</option>
+                        </select>
                     <div onclick='' class='box-3'>
                         <p>Einfärben &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </p><div class='switch'>
                         <input type='checkbox' name='toggle' id='chxboxAge' onclick='checkboxAge();'>

vcm/js/cityplanning.js

@@ -2,7 +2,9 @@ function checkboxAge() {
     var chk_ceil = document.getElementById("chxboxAge");
     if (chk_ceil.checked == true) {
         screenspaceErr(true)
-        BuildingAGE();
+        var e = document.getElementById("cities");
+        var value = e.value;
+        BuildingAGE(value);
     } else {
       
         removebuildings();
@@ -13,14 +15,14 @@ function checkboxAge() {
   };
 
 
-
-function BuildingAGE() {
+//StuttgartLocal
+function BuildingAGE(value) {
     screenspaceErr(true)
     var Framework = vcs.vcm.Framework.getInstance();
     var layers = Framework.getLayers();
   
     var layerIndexRosenstein
-    var layernameRosenstein = ["StuttgartLocal"]
+    var layernameRosenstein = [value]
     var frameworkZus = vcs.vcm.Framework.getInstance();
     var layersZus = frameworkZus.getLayers();
     for (var i = 0; i < layersZus.length; i++) {
@@ -29,7 +31,39 @@ function BuildingAGE() {
         layerIndexRosenstein = i
       }
     }
+    var layerIndexPart
+    var layernamePart4 = [value]
+    var frameworkPart4 = vcs.vcm.Framework.getInstance();
+    var layersPart4 = frameworkPart4.getLayers();
+    for (var i = 0; i < layersPart4.length; i++) {
+      var layerPart4 = layersPart4[i];
+      if (layernamePart4.indexOf(layerPart4.name) >= 0) {
+        layerPart4.activate(true);
+      }
+    }
+
+    var layernamePart2 = ["WMS layer"]
+    var frameworkPart2 = vcs.vcm.Framework.getInstance();
+    var layersPart2 = frameworkPart2.getLayers();
+    for (var i = 0; i < layersPart2.length; i++) {
+      var layerPart2 = layersPart2[i];
+      if (layernamePart2.indexOf(layerPart2.name) >= 0) {
+        layerPart2.activate(false);
+      }
+    }
+
+    var layernamePart3 = ["Openstreetmap layer"]
+    var frameworkPart3 = vcs.vcm.Framework.getInstance();
+    var layersPart3 = frameworkPart3.getLayers();
+    for (var i = 0; i < layersPart3.length; i++) {
+      var layerPart3 = layersPart3[i];
+      if (layernamePart3.indexOf(layerPart3.name) >= 0) {
+        layerPart3.activate(true);
+      }
+    }
+    
   
+    //citygml_year_of_construction
   
     var layer2 = layers[layerIndexRosenstein];
     var tileset = layer2.cesium3DTileset;
@@ -53,7 +87,7 @@ function BuildingAGE() {
   
     }
   
-  
+  // StuttgartPart
     var layerIndexPart
     var layernamePart = ["StuttgartPart"]
     var frameworkPart = vcs.vcm.Framework.getInstance();
@@ -112,12 +146,23 @@ stepSlider.noUiSlider.on('update', function (values, handle) {
 
 
 function BuildingAGEdynamic(age) {
+  var e = document.getElementById("cities");
+  var value = e.value;
     screenspaceErr(true)
+    var layernamePart4 = [value]
+    var frameworkPart4 = vcs.vcm.Framework.getInstance();
+    var layersPart4 = frameworkPart4.getLayers();
+    for (var i = 0; i < layersPart4.length; i++) {
+      var layerPart4 = layersPart4[i];
+      if (layernamePart4.indexOf(layerPart4.name) >= 0) {
+        layerPart4.activate(true);
+      }
+    }
     var Framework = vcs.vcm.Framework.getInstance();
     var layers = Framework.getLayers();
-  
+  // StuttgartLocal
     var layerIndexRosenstein
-    var layernameRosenstein = ["StuttgartLocal"]
+    var layernameRosenstein = [value]
     var frameworkZus = vcs.vcm.Framework.getInstance();
     var layersZus = frameworkZus.getLayers();
     for (var i = 0; i < layersZus.length; i++) {
@@ -126,6 +171,15 @@ function BuildingAGEdynamic(age) {
         layerIndexRosenstein = i
       }
     }
+    var layernamePart2 = ["WMS layer"]
+    var frameworkPart2 = vcs.vcm.Framework.getInstance();
+    var layersPart2 = frameworkPart2.getLayers();
+    for (var i = 0; i < layersPart2.length; i++) {
+      var layerPart2 = layersPart2[i];
+      if (layernamePart2.indexOf(layerPart2.name) >= 0) {
+        layerPart2.activate(false);
+      }
+    }
   
   
     var layer2 = layers[layerIndexRosenstein];
@@ -156,12 +210,13 @@ function BuildingAGEdynamic(age) {
 
 
 function screenspaceErr(tf) {
-
+  var e = document.getElementById("cities");
+  var value = e.value;
     var Framework = vcs.vcm.Framework.getInstance();
     var layers = Framework.getLayers();
-  
+  // StuttgartLocal
     var layerIndexRosenstein
-    var layernameRosenstein = ["StuttgartLocal"]
+    var layernameRosenstein = [value]
     var frameworkZus = vcs.vcm.Framework.getInstance();
     var layersZus = frameworkZus.getLayers();
     for (var i = 0; i < layersZus.length; i++) {
@@ -170,7 +225,15 @@ function screenspaceErr(tf) {
         layerIndexRosenstein = i
       }
     }
-  
+    var layernamePart2 = ["WMS layer"]
+    var frameworkPart2 = vcs.vcm.Framework.getInstance();
+    var layersPart2 = frameworkPart2.getLayers();
+    for (var i = 0; i < layersPart2.length; i++) {
+      var layerPart2 = layersPart2[i];
+      if (layernamePart2.indexOf(layerPart2.name) >= 0) {
+        layerPart2.activate(false);
+      }
+    }
   
     var layer2 = layers[layerIndexRosenstein];
     if (layer2 == undefined){

vcm/js/newDevBahn.js

@@ -101,7 +101,15 @@ function removebuildings() {
     });
 
   }
-
+  var layernamePart4 = ["Ludwigsburg"]
+  var frameworkPart4 = vcs.vcm.Framework.getInstance();
+  var layersPart4 = frameworkPart4.getLayers();
+  for (var i = 0; i < layersPart4.length; i++) {
+    var layerPart4 = layersPart4[i];
+    if (layernamePart4.indexOf(layerPart4.name) >= 0) {
+      layerPart4.activate(false);
+    }
+  }
 
 
 };