manual changes

CHANGELOG.md

@@ -16,6 +16,29 @@
 
 ### Fixed
 
+---
+
+## v2.43.0 - 2024-03-06
+
+### Changed
+- StreetSmart: if started as control, it is not available in 3D mode.
+
+---
+## v2.42.0 - 2024-02-07
+
+### Fixed
+- SchoolRoutePlanning: Fixed showing the route with OL 8.2.0.
+
+---
+## v2.41.2 - 2024-01-18
+### Fixed
+- Boris: In the Calculation tab, the building position is only displayed for EFH
+
+---
+## v2.39.0 - 2023-11-01
+### Added
+- The new addon [statisticDashboard](https://bitbucket.org/geowerkstatt-hamburg/addons/src/dev/statisticDashboard/) A tool to display statistical data. Further details: [statisticDashboard documentation](https://bitbucket.org/geowerkstatt-hamburg/addons/src/dev/statisticDashboard/doc/config.json.md)
+
 ---
 ## v2.34.0 - 2023-06-07
 ### Changed

addonsConf.json

@@ -213,5 +213,9 @@
   },
   "wholeCityList": {
     "type": "tool"
+  },
+  "TemplateAdmin": {
+    "path": "cosi/TemplateAdmin",
+    "type": "tool"
   }
 }

boris/components/BorisComponent.vue

@@ -19,8 +19,17 @@ export default {
         FloorComponent
     },
     computed: {
-        ...mapGetters("Tools/BorisComponent", ["active", "id", "icon", "renderToWindow", "resizableWindow", "initialWidth", "initialWidthMobile", "keepOpen", "filteredLayerList", "isAreaLayer", "isStripesLayer", "textIds", "selectedPolygon", "selectedLayerName", "selectedLanduse", "selectedBrwFeature", "convertedBrw", "buttonValue", "buildingDesigns", "positionsToStreet", "selectedOption", "isProcessFromParametricUrl", "paramUrlParams"]),
-        ...mapGetters("Tools/Print", ["printFileReady", "fileDownloadUrl", "filename", "printStarted", "progressWidth"]),
+        ...mapGetters("Tools/BorisComponent", [
+            "active", "id", "icon", "renderToWindow", "resizableWindow", "initialWidth",
+            "initialWidthMobile", "keepOpen", "filteredLayerList", "isAreaLayer",
+            "isStripesLayer", "textIds", "selectedPolygon", "selectedLayerName",
+            "selectedLanduse", "selectedBrwFeature", "convertedBrw", "buttonValue",
+            "buildingDesigns", "positionsToStreet", "isProcessFromParametricUrl",
+            "paramUrlParams", "selectedBuildDesign", "selectedPositionToStreet"
+        ]),
+        ...mapGetters("Tools/Print", [
+            "printFileReady", "fileDownloadUrl", "filename", "printStarted", "progressWidth"
+        ]),
         /**
          * Gets a list of layers without the stripes-layers
          * @return {Array} filteredListWithoutStripes which is used to select by date
@@ -89,15 +98,20 @@ export default {
                         newValue === "GR Grünland" ||
                         newValue === "EGA Erwerbsgartenanbaufläche" ||
                         newValue === "F forstwirtschaftliche Fläche" ||
-                        newValue === "LAD Läden (eingeschossig)"
-                    ) {
+                        newValue === "LAD Läden (eingeschossig)") {
                         if (oldValue === "MFH Mehrfamilienhäuser" ||
                             oldValue === "GH Geschäftshäuser (mehrgeschossig, Wertanteil Erdgeschoss)" ||
                             oldValue === "BH Bürohäuser") {
                             this.setButtonValue("info");
                         }
                     }
                 }
+                if (newValue === "EFH Ein- und Zweifamilienhäuser") {
+                    this.setSelectedBuildDesign("eh Einzelhaus (freistehend)");
+                }
+                else {
+                    this.setSelectedBuildDesign("");
+                }
                 this.matchPolygonFeatureWithLanduse({feature: this.selectedPolygon, selectedLanduse: newValue});
             }
         },
@@ -128,8 +142,8 @@ export default {
             }
         },
         selectedLayerName () {
-            this.setBuildingDesigns(["eh Einzelhaus (freistehend)", "dh Doppelhaushälfte", " dd Doppelhaus (ganzes Doppelhaus)", "rm Reihenmittelhaus", "rm Reihenmittelhäuser", "re Reihenendhaus", "g geschlossene Bauweise", "a abweichende Bauweise (Gartenhofhaus)"]);
-            this.setPositionsToStreet(["F Frontlage", "E Ecklage", "P Pfeifenstielgrundstück", "H Hinterlage (in 2. Reihe durch Wegerecht erschlossen)"]);
+            this.setBuildingDesigns(this.buildingDesigns);
+            this.setPositionsToStreet(this.positionsToStreet);
         }
     },
     created () {
@@ -179,15 +193,28 @@ export default {
             }
         },
         /**
-         * Handles option-change for individual property conversion
+         * Handles option-change of the building design for the individual property conversion
+         * @param {String} event the selected option
+         * @param {String} subject contains subject information for the select: building design oder position to street
+         * @returns {void}
+         */
+        handleBuildingDesignOptionChange (event, subject) {
+            const eventValue = event.target.value;
+
+            this.setSelectedBuildDesign(eventValue);
+            this.updateSelectedBrwFeature({converted: subject, brw: eventValue});
+            this.sendWpsConvertRequest({state: this});
+        },
+        /**
+         * Handles option-change of positon to street for the individual property conversion
          * @param {String} event the selected option
          * @param {String} subject contains subject information for the select: building design oder position to street
          * @returns {void}
          */
-        handleOptionChange (event, subject) {
+        handlePositionToStreetOptionChange (event, subject) {
             const eventValue = event.target.value;
 
-            this.setSelectedOption(eventValue);
+            this.setSelectedPositionToStreet(eventValue);
             this.updateSelectedBrwFeature({converted: subject, brw: eventValue});
             this.sendWpsConvertRequest({state: this});
         },
@@ -343,30 +370,30 @@ export default {
                         class="d-flex mb-2"
                     >
                         <button
-                            class="btn btn-primary bi-info-circle-fill col me-1"
-                            :class="(buttonValue === 'info') ? 'btn btn-primary btn active' : 'btn btn-primary'"
+                            class="bi-info-circle-fill col me-1"
+                            :class="(buttonValue === 'info') ? 'btn btn-primary' : 'btn btn-default'"
                             value="info"
                             :title="$t('additional:modules.tools.boris.detailInformation.title')"
                             @click="setButtonValue($event.target.value)"
                         />
                         <button
-                            class="btn btn-primary bi-geo-alt-fill col me-1"
-                            :class="(buttonValue === 'lage') ? 'btn btn-primary btn active' : 'btn btn-primary'"
+                            class="bi-geo-alt-fill col me-1"
+                            :class="(buttonValue === 'lage') ? 'btn btn-primary' : 'btn btn-default'"
                             value="lage"
                             :title="$t('additional:modules.tools.boris.locationDescription.title')"
                             @click="setButtonValue($event.target.value)"
                         />
                         <button
-                            class="btn btn-primary bi-currency-euro col "
-                            :class="(buttonValue === 'euro') ? 'btn btn-primary btn active' : 'btn btn-primary'"
+                            class="bi-currency-euro col "
+                            :class="(buttonValue === 'euro') ? 'btn btn-primary' : 'btn btn-default'"
                             value="euro"
                             :title="$t('additional:modules.tools.boris.landCalculation.title')"
                             @click="setButtonValue($event.target.value)"
                         />
                         <button
                             v-if="selectedBrwFeature.get('schichtwert')"
-                            class="btn btn-primary bi-list-ul col ms-1"
-                            :class="(buttonValue === 'liste') ? 'btn btn-primary btn active' : 'btn btn-primary'"
+                            class="bi-list-ul col ms-1"
+                            :class="(buttonValue === 'liste') ? 'btn btn-primary' : 'btn btn-default'"
                             value="liste"
                             :title="$t('additional:modules.tools.boris.floorValues.title')"
                             @click="setButtonValue($event.target.value)"
@@ -405,9 +432,10 @@ export default {
                                     :text-id="2"
                                     :text="$t('additional:modules.tools.boris.landCalculation.buildingDesignsInfo')"
                                     :toggle-info-text="toggleInfoText"
-                                    :handle-change="handleOptionChange"
+                                    :handle-change="handleBuildingDesignOptionChange"
                                     :subject="'zBauweise'"
                                     :type="'select'"
+                                    :selected-option="selectedBuildDesign"
                                 />
                             </div>
                             <div
@@ -421,9 +449,10 @@ export default {
                                     :text-id="3"
                                     :text="$t('additional:modules.tools.boris.landCalculation.positionToStreetInfo')"
                                     :toggle-info-text="toggleInfoText"
-                                    :handle-change="handleOptionChange"
+                                    :handle-change="handlePositionToStreetOptionChange"
                                     :subject="'zStrassenLage'"
                                     :type="'select'"
+                                    :selected-option="selectedPositionToStreet"
                                 />
                             </div>
                             <div

boris/components/CalculationComponent.vue

@@ -1,6 +1,4 @@
 <script>
-import {mapMutations} from "vuex";
-import mutations from "../store/mutationsBoris";
 
 export default {
     name: "CalculationComponent",
@@ -44,34 +42,18 @@ export default {
         type: {
             type: String,
             required: true
-        }
-    },
-    methods: {
-        ...mapMutations("Tools/Boris", Object.keys(mutations)),
-        /**
-         * Check if 'Einzelhäuser' or 'Doppelhäuser' are selected to change the option name to singular
-         * @param {String} option is one option of the options of buildingDesigns or positionsToStreet
-         * @return {String} zBauweise that changes the term to singular
-         */
-        checkForBuildingMatch (option) {
-
-            let zBauweise = this.selectedBrwFeature.get("zBauweise");
-            const zStrassenLage = this.selectedBrwFeature.get("zStrassenLage");
-
-            if (this.selectedBrwFeature.get("zBauweise") === "eh Einzelhäuser") {
-                zBauweise = "eh Einzelhaus (freistehend)";
-            }
-            else if (this.selectedBrwFeature.get("zBauweise") === "dh Doppelhaushälften") {
-                zBauweise = "dh Doppelhaushälfte";
-            }
-
-            return option === zBauweise || option === zStrassenLage;
+        },
+        selectedOption: {
+            type: String,
+            default: "",
+            required: false
         }
     }
-
 };
+
 </script>
 
+
 <template>
     <div id="calculation-component">
         <div
@@ -90,15 +72,16 @@ export default {
             </dt>
             <dd>
                 <select
+                    :value="selectedOption"
                     class="form-select"
                     :aria-label="$t('additional:modules.tools.boris.landCalculation.ariaLabelBuildingDesigns')"
+                    @select="$emit('select', $event.target.value)"
                     @change="handleChange($event, subject)"
                 >
                     <option
                         v-for="(option, i) in options"
                         :key="i"
                         :value="option"
-                        :selected="checkForBuildingMatch(option)"
                     >
                         {{ option }}
                     </option>

boris/store/actionsBoris.js

@@ -424,10 +424,10 @@ const actions = {
             "zEntwicklungszustand": feature.get("entwicklungszustand"), // Mandatory attribute for WPS
             "zBeitragszustand": feature.get("beitragszustand"), // Mandatory attribute for WPS
             "zNutzung": feature.get("nutzung_kombiniert"), // Mandatory attribute for WPS
-            "zBauweise": feature.get("anbauart") !== "" ? feature.get("anbauart") : null,
+            "zBauweise": state.selectedBuildDesign !== "" ? state.selectedBuildDesign : null,
             "zGeschossfl_zahl": feature.get("geschossfl_zahl") !== "" ? feature.get("geschossfl_zahl") : null,
             "zGrdstk_flaeche": feature.get("grdstk_flaeche") !== "" ? feature.get("grdstk_flaeche") : null,
-            "zStrassenLage": feature.get("nutzung_kombiniert") === "EFH Ein- und Zweifamilienhäuser" ? "F Frontlage" : null
+            "zStrassenLage": feature.get("nutzung_kombiniert") === "EFH Ein- und Zweifamilienhäuser" ? state.selectedPositionToStreet : null
         });
 
         commit("setSelectedBrwFeature", feature);

boris/store/stateBoris.js

@@ -26,9 +26,13 @@
  * @property {Boolean} isProcessFromParametricUrl - true if paremetric URL is being used
  * @property {Object} paramUrlParams - parameters that are used to center map and select relevant options to display data
  * @property {String} buttonValue - html value of button that indicates which further information are displayed
- * @property {Object} buildingDesigns - list of building designs that are options for the Conversion to Individual Property
- * @property {Object} positionsToStreet - list of positions to streets that are options for the Conversion to Individual Property
+ * @property {Object} buildingDesigns - list of building designs that are options for the conversion to individual property
+ * @property {Object} positionsToStreet - list of positions to streets that are options for the conversion to individual property
+ * @property {String} selectedBuildingDesign - is the selected option of building designs
+ * @property {String} selectedPositionToStreet - is the selected option of positions to street
  * @property {String} selectedOption - is the selected option of building designs or positions to street
+ * @property {String} selectedBuildingDesign - is the selected option of building designs
+ * @property {String} selectedPositionToStreet - is the selected option of positions to street
  * @property {String} wpsId - the id of the used web processing service
  * @property {String} fmwProcess - the FME process triggered via the WPS
  */
@@ -60,9 +64,17 @@ const state = {
     isProcessFromParametricUrl: false,
     paramUrlParams: {},
     buttonValue: "info",
-    buildingDesigns: ["eh Einzelhaus (freistehend)", "dh Doppelhaushälfte", " dd Doppelhaus (ganzes Doppelhaus)", "rm Reihenmittelhaus", "rm Reihenmittelhäuser", "re Reihenendhaus", "g geschlossene Bauweise", "a abweichende Bauweise (Gartenhofhaus)"],
-    positionsToStreet: ["F Frontlage", "E Ecklage", "P Pfeifenstielgrundstück", "H Hinterlage (in 2. Reihe durch Wegerecht erschlossen)"],
-    selectedOption: "",
+    buildingDesigns: [
+        "eh Einzelhaus (freistehend)", "dh Doppelhaushälfte", " dd Doppelhaus (ganzes Doppelhaus)",
+        "rm Reihenmittelhaus", "re Reihenendhaus", "g geschlossene Bauweise",
+        "a abweichende Bauweise (Gartenhofhaus)"
+    ],
+    positionsToStreet: [
+        "F Frontlage", "E Ecklage", "P Pfeifenstielgrundstück",
+        "H Hinterlage (in 2. Reihe durch Wegerecht erschlossen)"
+    ],
+    selectedBuildDesign: "",
+    selectedPositionToStreet: "F Frontlage",
     wpsId: "1001",
     fmwProcess: "BRWConvert.fmw"
 };

boris/tests/unit/components/BorisComponent.spec.js

@@ -207,6 +207,31 @@ describe("ADDONS: addons/boris/components/BorisComponent.vue", () => {
             expect(store.state.Tools.BorisComponent.buttonValue).to.equals("info");
             expect(Boris.actions.matchPolygonFeatureWithLanduse.calledOnce).to.equal(true);
         });
+        it("selectedLanduse shall change selectedBuildDesign to 'EFH Ein- und Zweifamilienhäuser'", () => {
+            const oldValue = "BH Bürohäuser",
+                newValue = "EFH Ein- und Zweifamilienhäuser";
+
+            store.state.Tools.BorisComponent.active = true;
+            store.state.Tools.BorisComponent.buttonValue = "liste";
+            wrapper = shallowMount(BorisComponent, {store, localVue});
+            wrapper.vm.$options.watch.selectedLanduse.call(wrapper.vm, newValue, oldValue);
+
+            expect(store.state.Tools.BorisComponent.buttonValue).to.equals("info");
+            expect(store.state.Tools.BorisComponent.selectedBuildDesign).to.equals("eh Einzelhaus (freistehend)");
+            expect(Boris.actions.matchPolygonFeatureWithLanduse.calledOnce).to.equal(true);
+        });
+        it("selectedLanduse shall change selectedBuildDesign to ''", () => {
+            const oldValue = "EFH Ein- und Zweifamilienhäuser",
+                newValue = "MFH Mehrfamilienhäuser";
+
+            store.state.Tools.BorisComponent.active = true;
+            store.state.Tools.BorisComponent.buttonValue = "liste";
+            wrapper = shallowMount(BorisComponent, {store, localVue});
+            wrapper.vm.$options.watch.selectedLanduse.call(wrapper.vm, newValue, oldValue);
+
+            expect(store.state.Tools.BorisComponent.selectedBuildDesign).to.equals("");
+            expect(Boris.actions.matchPolygonFeatureWithLanduse.calledOnce).to.equal(true);
+        });
     });
     describe("selectedBrwFeature watcher", () => {
         it("selectedBrwFeature: should change buttonValue to 'info'", () => {
@@ -249,15 +274,28 @@ describe("ADDONS: addons/boris/components/BorisComponent.vue", () => {
         });
     });
     describe("handle input and option change methods", () => {
-        it("handleOptionChange", () => {
+        it("handle option change: handleBuildingDesignOptionChange", () => {
             const event = {target: {value: store.state.Tools.BorisComponent.buildingDesigns[1]}, get: () => "value"},
                 subject = "zBauweise";
 
             store.state.Tools.BorisComponent.active = true;
             wrapper = shallowMount(BorisComponent, {store, localVue});
-            wrapper.vm.handleOptionChange(event, subject);
+            wrapper.vm.handleBuildingDesignOptionChange(event, subject);
+
+            expect(store.state.Tools.BorisComponent.selectedBuildDesign).to.equal(store.state.Tools.BorisComponent.buildingDesigns[1]);
+            expect(Boris.actions.updateSelectedBrwFeature.calledOnce).to.equal(true);
+            expect(Boris.actions.sendWpsConvertRequest.calledOnce).to.equal(true);
+
+        });
+        it("handle option change: handlePositionToStreetOptionChange", () => {
+            const event = {target: {value: store.state.Tools.BorisComponent.positionsToStreet[1]}, get: () => "value"},
+                subject = "zStrassenLage";
+
+            store.state.Tools.BorisComponent.active = true;
+            wrapper = shallowMount(BorisComponent, {store, localVue});
+            wrapper.vm.handlePositionToStreetOptionChange(event, subject);
 
-            expect(store.state.Tools.BorisComponent.selectedOption).to.equal(store.state.Tools.BorisComponent.buildingDesigns[1]);
+            expect(store.state.Tools.BorisComponent.selectedPositionToStreet).to.equal(store.state.Tools.BorisComponent.positionsToStreet[1]);
             expect(Boris.actions.updateSelectedBrwFeature.calledOnce).to.equal(true);
             expect(Boris.actions.sendWpsConvertRequest.calledOnce).to.equal(true);
 

boris/tests/unit/components/FloorComponent.spec.js

@@ -51,7 +51,8 @@ describe("ADDONS: addons/boris/components/FloorComponent.vue", () => {
             title: "title",
             feature: {
             },
-            label: "subtitle"
+            label: "subtitle",
+            landuse: "MFH Mehrfamilienhäuser"
         };
         wrapper = shallowMount(FloorComponent, {
             store,