Mercurial > gemma
changeset 912:85b2648066d7 geo-style
Merged default into geo-style branch.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Tue, 02 Oct 2018 22:25:44 +0200 |
| parents | 66e2b038d336 (current diff) 86278692c30c (diff) |
| children | 876d1f5433be |
| files | |
| diffstat | 7 files changed, 26 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/application/Linetool.vue Tue Oct 02 16:05:17 2018 +0200 +++ b/client/src/application/Linetool.vue Tue Oct 02 22:25:44 2018 +0200 @@ -20,13 +20,13 @@ z-index: 2; } -.fa-pencil-inverted { +.inverted { color: #0077ff; } </style> <script> -import { mapGetters } from "vuex"; +import { mapGetters, mapState } from "vuex"; export default { name: "linetool", @@ -37,11 +37,14 @@ }, computed: { ...mapGetters("application", ["drawMode"]), + ...mapState("mapstore", ["identifiedFeatures", "selectedMorph"]), icon() { return { fa: true, - "fa-pencil": true, - "fa-pencil-inverted": this.drawMode + "fa-pencil": !this.selectedMorph, + "fa-pencil inverted": !this.selectedMorph && this.drawMode, + "fa-cut": this.selectedMorph, + "fa-cut inverted": this.selectedMorph && this.drawMode }; } }
--- a/client/src/application/Main.vue Tue Oct 02 16:05:17 2018 +0200 +++ b/client/src/application/Main.vue Tue Oct 02 22:25:44 2018 +0200 @@ -33,7 +33,7 @@ margin: { top: 20, right: 40, - bottom: 20, + bottom: 30, left: 40 } }; @@ -57,11 +57,7 @@ return [this.yScaleLeft.lo, hi]; }, yAxisRight() { - const hi = - Math.max(this.maxAlt, this.selectedWaterLevel) - - this.selectedWaterLevel; - const lo = this.selectedWaterLevel - this.minAlt; - return [-lo, hi]; + return [-this.maxAlt, 0]; }, margins() { return this.margin;
--- a/client/src/application/Morphtool.vue Tue Oct 02 16:05:17 2018 +0200 +++ b/client/src/application/Morphtool.vue Tue Oct 02 22:25:44 2018 +0200 @@ -1,6 +1,6 @@ <template> <div v-if="selectedBottleneck || selectedMorph" class="morphcontainer"> - <div v-if="surveyList && !drawmode" class="ui-element card card-body shadow"> + <div v-if="surveyList && !drawMode" class="ui-element card card-body shadow"> <div class="headline"> <h4>{{selectedBottleneck.get("objnam")}}</h4> <hr> @@ -18,7 +18,7 @@ <div class="d-flex flex-row justify-content-between"> <i class="fa fa-close text-danger"></i> <small>Bottleneck: </small> - <h6>{{selectedBottleneck.get("objnam")}}</h6> + <h6>{{selectedBottleneck.get("objnam")}} <small>( {{selectedMorph.date_info}} )</small></h6> </div> </div> </div> @@ -32,7 +32,7 @@ .morphcontainer { margin-bottom: $offset; margin-left: auto; - margin-right: auto; + margin-right: $large-offset + $icon-width; border-radius: $border-radius; } .surveylist {
--- a/client/src/fairway/Fairwayprofile.vue Tue Oct 02 16:05:17 2018 +0200 +++ b/client/src/fairway/Fairwayprofile.vue Tue Oct 02 22:25:44 2018 +0200 @@ -110,7 +110,7 @@ this.drawProfile({ graph, xScale, - yScaleLeft, + yScaleRight, currentData, height, width @@ -157,15 +157,6 @@ drawLabels({ graph, height }) { graph .append("text") - .attr("transform", "rotate(-90)") - .attr("y", 0 - this.margin.left) - .attr("x", -(this.height - this.margin.top - this.margin.bottom) / 2) - .attr("dy", "1em") - .attr("fill", "black") - .style("text-anchor", "middle") - .text("Height above Adria [m]"); - graph - .append("text") .attr("transform", ["rotate(-90)"]) .attr("y", this.width - 60) .attr("x", -(this.height - this.margin.top - this.margin.bottom) / 2) @@ -204,7 +195,6 @@ .rangeRound([height, 0]); let xAxis = d3.axisBottom(xScale); - let yAxis = d3.axisLeft(yScaleLeft); let yAxis2 = d3.axisRight(yScaleRight); let graph = svg .append("g") @@ -216,7 +206,6 @@ .append("g") .attr("transform", "translate(0," + height + ")") .call(xAxis.ticks(5)); - graph.append("g").call(yAxis); graph .append("g") .attr("transform", "translate(" + width + ",0)") @@ -240,7 +229,7 @@ .attr("stroke", this.waterColor) .attr("d", waterArea); }, - drawProfile({ graph, xScale, yScaleLeft, currentData, height }) { + drawProfile({ graph, xScale, yScaleRight, currentData, height }) { for (let part of currentData) { let profileLine = d3 .line() @@ -248,7 +237,7 @@ return xScale(d.x); }) .y(d => { - return yScaleLeft(d.y); + return yScaleRight(-d.y); }); let profileArea = d3 .area() @@ -257,7 +246,7 @@ }) .y0(height) .y1(function(d) { - return yScaleLeft(d.y); + return yScaleRight(-d.y); }); graph .append("path")
--- a/client/src/layers/Identify.vue Tue Oct 02 16:05:17 2018 +0200 +++ b/client/src/layers/Identify.vue Tue Oct 02 22:25:44 2018 +0200 @@ -36,7 +36,7 @@ <style lang="scss"> .features { - height: $identify-height; + max-height: $identify-height; overflow-y: auto; margin-bottom: $x-large-offset + $large-offset; } @@ -63,7 +63,6 @@ } .identifyexpanded { - min-height: $identify-height; width: $identify-width; } @@ -88,6 +87,11 @@ collapsed: true }; }, + watch: { + identifiedFeatures() { + this.collapsed = !this.identifiedFeatures; + } + }, computed: { ...mapState("mapstore", ["identifiedFeatures"]), identifyStyle() {
--- a/client/src/map/Maplayer.vue Tue Oct 02 16:05:17 2018 +0200 +++ b/client/src/map/Maplayer.vue Tue Oct 02 22:25:44 2018 +0200 @@ -14,11 +14,11 @@ @media print { .mapfull { width: 2000px; - heigth: 2828px; + height: 2828px; } .mapsplit { width: 2000px; - heigth: 2828px; + height: 2828px; } } </style>
--- a/schema/default_sysconfig.sql Tue Oct 02 16:05:17 2018 +0200 +++ b/schema/default_sysconfig.sql Tue Oct 02 22:25:44 2018 +0200 @@ -7,7 +7,7 @@ -- -- Style definitions -- -INSERT INTO systemconf.feature_colours VALUES ('Bottlenecks', 'stroke', 220, 220, 0, 1); -INSERT INTO systemconf.feature_colours VALUES ('Bottlenecks', 'fill', 230, 230, 10, 0.8); +INSERT INTO systemconf.feature_colours VALUES ('Bottlenecks', 'stroke', 250, 40, 255, 1); +INSERT INTO systemconf.feature_colours VALUES ('Bottlenecks', 'fill', 255, 37, 196, 0.14); COMMIT;