Mercurial > gemma
changeset 817:6607cabec150
merge
author | Bernhard Reiter <bernhard@intevation.de> |
---|---|
date | Thu, 27 Sep 2018 17:38:53 +0200 |
parents | cd79f62794dd (diff) 01019d4c8359 (current diff) |
children | 265693832ccd |
files | |
diffstat | 3 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/App.vue Thu Sep 27 17:37:47 2018 +0200 +++ b/client/src/App.vue Thu Sep 27 17:38:53 2018 +0200 @@ -17,6 +17,7 @@ </div> <div class="bottomcontainer d-flex flex-row align-items-end"> <Userbar></Userbar> + <Morphtool v-if="routeName == 'mainview'"></Morphtool> <Linetool v-if="routeName == 'mainview'"></Linetool> </div> </div> @@ -89,6 +90,7 @@ import { mapGetters } from "vuex"; import Userbar from "./application/Userbar"; import Linetool from "./application/Linetool"; +import Morphtool from "./application/Morphtool"; export default { name: "app", @@ -103,7 +105,8 @@ Sidebar, Topbar, Userbar, - Linetool + Linetool, + Morphtool } }; </script>
--- a/client/src/layers/Identify.vue Thu Sep 27 17:37:47 2018 +0200 +++ b/client/src/layers/Identify.vue Thu Sep 27 17:38:53 2018 +0200 @@ -38,7 +38,7 @@ <style lang="scss"> .versioninfo { - font-size:60%; + font-size: 60%; } .identifymenu { position: relative;
--- a/client/src/map/store.js Thu Sep 27 17:37:47 2018 +0200 +++ b/client/src/map/store.js Thu Sep 27 17:38:53 2018 +0200 @@ -170,7 +170,8 @@ } ], identifiedFeatures: [], - currentMeasurement: null + currentMeasurement: null, + selectedMorph: null }, getters: { layers: state => { @@ -193,6 +194,9 @@ }, setCurrentMeasurement: (state, measurement) => { state.currentMeasurement = measurement; + }, + setSelectedMorpth: (state, selectedMorph) => { + state.selectedMorph = selectedMorph; } } };