Mercurial > gemma
changeset 4618:0f2c3cb139cc geoserver_sql_views
Merge default into geoserver_sql_views
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Fri, 20 Sep 2019 15:35:16 +0200 |
| parents | ae840f9eb4c8 (current diff) 5e62c467e145 (diff) |
| children | 4476ec4db818 |
| files | schema/default_sysconfig.sql schema/demo-data/fake_stretches.sql schema/demo-data/responsibility_areas.sql schema/gemma.sql schema/install-db.sh schema/run_tests.sh schema/updates/1300/02.views_to_geoservers.sql schema/version.sql |
| diffstat | 92 files changed, 3489 insertions(+), 2038 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Mon Sep 16 16:56:11 2019 +0200 +++ b/.hgignore Fri Sep 20 15:35:16 2019 +0200 @@ -97,7 +97,6 @@ .buildbase session.data gemma -cmd/tokenserver/tokenserver web gemma.toml CHROME*
--- a/.hgtags Mon Sep 16 16:56:11 2019 +0200 +++ b/.hgtags Fri Sep 20 15:35:16 2019 +0200 @@ -13,3 +13,4 @@ d78af8354b95cea86744459f350edb16662dadd0 v3.1 5396581cf20334cbc5e69280e5d9b192640d96b9 v4-preview20190717 aececbc3d04798d905e65196ac0870d081776ca2 v4-preview20190726 +b5619087e3e909645eeab9e3f198667692895382 v4-preview20190918
--- a/3rdpartylibs.sh Mon Sep 16 16:56:11 2019 +0200 +++ b/3rdpartylibs.sh Fri Sep 20 15:35:16 2019 +0200 @@ -1,5 +1,14 @@ #!/bin/sh -go get -u -v github.com/jackc/pgx + +# pgx hase undergone some major incompatible changes in v4, +# we need to stick to v3 for now... +# Unfortunatly using gopkg.in does not work as expected here, so lets +# get hackisch... +go get -u -v gopkg.in/jackc/pgx.v3 +oldcwd="$CWD" +cd "$GOPATH"/src/github.com/jackc/pgx +git checkout v3.6.0 +cd "$oldcwd" # MIT go get -u -v github.com/etcd-io/bbolt/... @@ -32,7 +41,7 @@ go get -u -v github.com/jonas-p/go-shp # MIT -go get -u -v github.com/robfig/cron +go get -u -v gopkg.in/robfig/cron.v1 # MIT go get -u -v github.com/tidwall/rtree
--- a/Makefile Mon Sep 16 16:56:11 2019 +0200 +++ b/Makefile Fri Sep 20 15:35:16 2019 +0200 @@ -50,7 +50,7 @@ v="gemma-$$(hg id -i)" ;\ tar --transform "s@^@$${v}/@" \ -cJf "../$${v}.tar.xz" \ - cmd/gemma/gemma schema web example_conf.toml + cmd/gemma/gemma schema web misc example_conf.toml clean: $(MAKE) -f Makefile.build -C client $@
--- a/README.md Mon Sep 16 16:56:11 2019 +0200 +++ b/README.md Fri Sep 20 15:35:16 2019 +0200 @@ -1,6 +1,6 @@ # Workingtitle "gemma" -//"gemma" is just a temporary title and is likely to be changed.// +//"gemma" is a working title and is likely to be changed.// # Quick Start @@ -18,7 +18,7 @@ - To only build the SPA-Client in demo mode you can use `make clientdemo`. -For further details see [docs/DEVELOPMENT](docs/DEVELOPMENT.md), +For further details see [docs/DEVELOPMENT](docs/DEVELOPMENT.md). ## Running Tests @@ -106,8 +106,8 @@ # License -//gemma// source code itself licenses as Free Software -under GNU Affero GPL v>=3. See the particular source files +//gemma// source code itself is licensed as Free Software +under GNU Affero GPL v>=3. See the specific source files for details, the license itself can be found in the directory `LICENSES`. To build a complete product, a number of other Free Software components
--- a/client/README.md Mon Sep 16 16:56:11 2019 +0200 +++ b/client/README.md Fri Sep 20 15:35:16 2019 +0200 @@ -1,5 +1,8 @@ * Install dependencies + * [Yarn](https://yarnpkg.com/) and a compatible nodejs version (>=8.10.0) + is needed. + * Install (`xgettext`) tool (e.g. for Debian xgettext (GNU gettext-tools) 0.19.8.1) * Javascript
--- a/client/docs/dev-translations.md Mon Sep 16 16:56:11 2019 +0200 +++ b/client/docs/dev-translations.md Fri Sep 20 15:35:16 2019 +0200 @@ -26,7 +26,13 @@ - `gettext` must be called only in javascript part. For html part we use `<translate>` and `<v-translate>` to make sure that `makemessages` marks the strings correctly - passing a value with \`\` to `gettext` leads to break up the translation process (e.g. gettext(\` text to translate ${value} \`)) - passing html element (e.g. `<div>`) to gettext is interpreted as string. -- The strings to translate have to be included in the source code and not directly in `.po` files. +- The strings to translate have to be included in the source code and not directly in `.po` files. +- Use the central defined class `<span class="fix-trans-space"> text<span>` to fix leading and trailing whitespace problem.see:[https://github.com/Polyconseil/vue-gettext/issues/80](https://github.com/Polyconseil/vue-gettext/issues/80). +- Check if the development work does not ruin the translation process: + Call `make makemessages` --> if `.po` files were generated --> everything is ok. + **Notice**: To avoid merge conflicts we push `.po` files into the repository after we synchronize it with the new translations on `weblate`. + We do this one time weekly, so you do not have to do this yourself. + If it is required to merge the new strings instantly please contact one of the translation managers. ## Why was gettext chosen?
--- a/client/src/components/Contextbox.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/Contextbox.vue Fri Sep 20 15:35:16 2019 +0200 @@ -59,6 +59,7 @@ this.$store.commit("map/mapPopupEnabled", true); this.$store.commit("application/searchQuery", ""); this.$store.commit("application/showContextBox", false); + this.$store.commit("map/reviewActive", false); this.$store.commit( "application/showSearchbar", this.showSearchbarLastState
--- a/client/src/components/Pdftool.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/Pdftool.vue Fri Sep 20 15:35:16 2019 +0200 @@ -206,14 +206,7 @@ } } - filename = - filename - .replace(/[^\w-]/gi, "") // remove everything but wordchars and dash - .toLowerCase() + - "-exported" + - date + - ".pdf"; - + filename = filename.toLowerCase() + "-exported" + date + ".pdf"; return filename; } }, @@ -462,15 +455,18 @@ ); }, cancel() { - this.openLayersMap().un( - this.rendercompleteListener.type, - this.rendercompleteListener.listener - ); - this.openLayersMap().setSize(this.mapSize); - this.openLayersMap() - .getView() - .fit(this.resolution, { size: this.mapSize }); - this.readyToGenerate = true; + try { + this.openLayersMap().un( + this.rendercompleteListener.type, + this.rendercompleteListener.listener + ); + this.openLayersMap().setSize(this.mapSize); + this.openLayersMap() + .getView() + .fit(this.resolution, { size: this.mapSize }); + } finally { + this.readyToGenerate = true; + } }, // add the used map scale and papersize addScale(scaleDenominator, position, width, offset, fontSize, color) {
--- a/client/src/components/fairway/AvailableFairwayDepth.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/fairway/AvailableFairwayDepth.vue Fri Sep 20 15:35:16 2019 +0200 @@ -100,6 +100,14 @@ }, data() { return { + frequencyD: null, + selectedFairwayAvailabilityFeatureD: null, + fromDate: null, + toDate: null, + depthlimit1D: null, + depthlimit2D: null, + widthlimit1D: null, + widthlimit2D: null, containerId: "availablefairwaydepth-diagram-container", resizeListenerFunction: null, loading: false, @@ -136,7 +144,7 @@ // not guarantee that the DOM is not only updated but also re-painted on the // screen. setTimeout(this.drawDiagram, 150); - + this.initDiagramValues(); this.templates[0] = this.defaultTemplate; this.form.template = this.templates[0]; this.templateData = this.form.template; @@ -176,20 +184,20 @@ "widthlimit2" ]), legend() { - const d = [this.depthlimit1, this.depthlimit2].sort(); - const w = [this.widthlimit1, this.widthlimit2].sort(); - const lowerBound = [d[0], w[0]].filter(x => x).join(", "); - const upperBound = [d[1], w[1]].filter(x => x).join(", "); + const d = [this.depthlimit1D, this.depthlimit2D].sort(); + const w = [this.widthlimit1D, this.widthlimit2D].sort(); + const lowerBound = [d[0] / 100, w[0]].filter(x => x).join(", "); + const upperBound = [d[1] / 100, w[1]].filter(x => x).join(", "); let result; - if (this.depthlimit1 !== this.depthlimit2) { + if (this.depthlimit1D !== this.depthlimit2D) { result = [ `> LDC`, - `>= ${upperBound}`, - `< ${upperBound}`, - `< ${lowerBound}` + `>= ${upperBound} [m]`, + `< ${upperBound} [m]`, + `< ${lowerBound} [m]` ]; } else { - result = [`> LDC`, `>= ${upperBound}`, `< ${upperBound}`]; + result = [`> LDC`, `>= ${upperBound} [m]`, `< ${upperBound} [m]`]; } return result; }, @@ -197,42 +205,49 @@ return `data:text/csv;charset=utf-8, ${encodeURIComponent(this.csv)}`; }, csvFileName() { + if (!this.frequencyD) return; return `${this.$gettext("fairwayavailability")}-${ this.featureName }-${filters.surveyDate(this.fromDate)}-${filters.surveyDate( this.toDate - )}-${this.$gettext(this.frequency)}-.csv`; + )}-${this.$gettext(this.frequencyD)}-.csv`; }, frequencyToRange() { + if (!this.frequencyD) return; const frequencies = { [FREQUENCIES.MONTHLY]: [-33, 33], [FREQUENCIES.QUARTERLY]: [-93, 93], [FREQUENCIES.YEARLY]: [-370, 370] }; - return frequencies[this.frequency]; - }, - fromDate() { - return this.from; - }, - toDate() { - return this.to; + return frequencies[this.frequencyD]; }, availability() { return this.plainAvailability; }, title() { + if (!this.frequencyD) return; return `Available Fairway Depth: ${ this.featureName } (${filters.surveyDate(this.fromDate)} - ${filters.surveyDate( this.toDate - )}) ${this.$gettext(this.frequency)}`; + )}) ${this.$gettext(this.frequencyD)}`; }, featureName() { - if (this.selectedFairwayAvailabilityFeature == null) return ""; - return this.selectedFairwayAvailabilityFeature.properties.name; + if (this.selectedFairwayAvailabilityFeatureD == null) return ""; + return this.selectedFairwayAvailabilityFeatureD.properties.name; } }, methods: { + initDiagramValues() { + this.selectedFairwayAvailabilityFeatureD = this.selectedFairwayAvailabilityFeature; + this.fromDate = this.from; + this.toDate = this.to; + this.depthlimit1D = this.depthlimit1; + this.depthlimit2D = this.depthlimit2; + this.widthlimit1D = this.widthlimit1; + this.widthlimit2D = this.widthlimit2; + this.frequencyD = this.frequency; + }, applyChange() { if (this.form.template.hasOwnProperty("properties")) { this.templateData = this.defaultTemplate; @@ -702,6 +717,7 @@ }, watch: { fwData() { + this.initDiagramValues(); this.drawDiagram(); }, showNumbers() {
--- a/client/src/components/fairway/AvailableFairwayDepthDialogue.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/fairway/AvailableFairwayDepthDialogue.vue Fri Sep 20 15:35:16 2019 +0200 @@ -162,7 +162,7 @@ <div v-if="depthLimitVisible" class="d-flex mt-2" :key="1"> <div class="d-flex flex-column w-50 mr-1"> <small for="from" class="my-auto text-muted"> - <translate>Depthlimit 1 (in cm)</translate> + <translate>Depthlimit 1 [m]</translate> </small> <input id="depthlimit1" @@ -170,6 +170,7 @@ class="form-control form-control-sm" type="number" min="0" + step="0.1" /> </div> <div @@ -178,7 +179,7 @@ :key="2" > <small for="to" class="my-auto text-muted"> - <translate>Depthlimit 2 ( in cm)</translate> + <translate>Depthlimit 2 [m]</translate> </small> <input id="depthlimit2" @@ -186,13 +187,14 @@ class="form-control form-control-sm" type="number" min="0" + step="0.1" /> </div> </div> <div v-if="widthLimitVisible" class="d-flex mt-2" :key="3"> <div class="d-flex flex-column w-50 mr-1"> <small for="from" class="my-auto text-muted"> - <translate>Widthlimit 1</translate> + <translate>Widthlimit 1 [m]</translate> </small> <input id="widthLimit" @@ -208,7 +210,7 @@ :key="4" > <small for="from" class="my-auto text-muted"> - <translate>Widthlimit 2</translate> + <translate>Widthlimit 2 [m]</translate> </small> <input id="widthLimit" @@ -338,10 +340,10 @@ }, isComplete() { return ( - this.from !== null && - this.to !== null && - this.frequency !== null && - this.los !== null && + !!this.from && + !!this.to && + !!this.frequency && + !!this.los && this.selectedFairwayAvailabilityFeature !== null ); }, @@ -379,18 +381,24 @@ }, depthLimit1: { get() { - return this.depthlimit1; + return this.depthlimit1 / 100; }, set(value) { - this.$store.commit("fairwayavailability/setDepthlimit1", value); + this.$store.commit( + "fairwayavailability/setDepthlimit1", + Math.round(value * 100) + ); } }, depthLimit2: { get() { - return this.depthlimit2; + return this.depthlimit2 / 100; }, set(value) { - this.$store.commit("fairwayavailability/setDepthlimit2", value); + this.$store.commit( + "fairwayavailability/setDepthlimit2", + Math.round(value * 100) + ); } }, widthLimit1: { @@ -440,6 +448,12 @@ } }, watch: { + depthLimitVisible() { + if (this.depthLimitVisible) { + this.depthLimit1 = 2.3; + this.depthLimit2 = 2.5; + } + }, selectedBottleneck() { this.type = this.$options.BOTTLENECK; this.setSelectedBottleneck(); @@ -493,6 +507,7 @@ }, methods: { openFairwaydepthLNWLDiagram() { + this.clearInvisibleFormValues(); this.loading = true; this.$store .dispatch("fairwayavailability/loadAvailableFairwayDepthLNWLDiagram", { @@ -502,8 +517,8 @@ frequency: this.frequency, LOS: this.los, type: this.type, - depthLimit1: this.depthLimit1, - depthLimit2: this.depthLimit2, + depthLimit1: this.depthlimit1, + depthLimit2: this.depthlimit2, widthLimit1: this.widthLimit1, widthLimit2: this.widthLimit2, limitingFactor: this.limitingFactor @@ -525,8 +540,19 @@ this.loading = false; }); }, + clearInvisibleFormValues() { + if (!this.widthLimitVisible) { + this.widthLimit1 = null; + this.widthLimit2 = null; + } + if (!this.depthLimitVisible) { + this.depthLimit1 = null; + this.depthLimit2 = null; + } + }, openFairwaydepthDiagram() { this.loading = true; + this.clearInvisibleFormValues(); this.$store .dispatch("fairwayavailability/loadAvailableFairwayDepth", { feature: this.selectedFairwayAvailabilityFeature, @@ -535,8 +561,8 @@ frequency: this.frequency, LOS: this.los, type: this.type, - depthLimit1: this.depthLimit1, - depthLimit2: this.depthLimit2, + depthLimit1: this.depthlimit1, + depthLimit2: this.depthlimit2, widthLimit1: this.widthLimit1, widthLimit2: this.widthLimit2, limitingFactor: this.limitingFactor
--- a/client/src/components/fairway/AvailableFairwayDepthLNWL.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/fairway/AvailableFairwayDepthLNWL.vue Fri Sep 20 15:35:16 2019 +0200 @@ -99,6 +99,14 @@ }, data() { return { + frequencyD: null, + selectedFairwayAvailabilityFeatureD: null, + fromDate: null, + toDate: null, + depthlimit1D: null, + depthlimit2D: null, + widthlimit1D: null, + widthlimit2D: null, containerId: "availablefairwaydepthlnwl-diagram-container", resizeListenerFunction: null, loading: false, @@ -135,7 +143,7 @@ // not guarantee that the DOM is not only updated but also re-painted on the // screen. setTimeout(this.drawDiagram, 150); - + this.initDiagramValues(); this.templates[0] = this.defaultTemplate; this.form.template = this.templates[0]; this.templateData = this.form.template; @@ -175,20 +183,20 @@ "widthlimit2" ]), legendLNWL() { - const d = [this.depthlimit1, this.depthlimit2].sort(); - const w = [this.widthlimit1, this.widthlimit2].sort(); - const lowerBound = [d[0], w[0]].filter(x => x).join(", "); - const upperBound = [d[1], w[1]].filter(x => x).join(", "); + const d = [this.depthlimit1D, this.depthlimit2D].sort(); + const w = [this.widthlimit1D, this.widthlimit2D].sort(); + const lowerBound = [d[0] / 100, w[0]].filter(x => x).join(", "); + const upperBound = [d[1] / 100, w[1]].filter(x => x).join(", "); let result; - if (this.depthlimit1 !== this.depthlimit2) { + if (this.depthlimit1D !== this.depthlimit2D) { result = [ `> LDC`, - `< ${lowerBound}`, - `< ${upperBound}`, - `>= ${upperBound}` + `< ${lowerBound} [m]`, + `< ${upperBound} [m]`, + `>= ${upperBound} [m]` ]; } else { - result = [`> LDC`, `< ${upperBound}`, `>= ${upperBound}`]; + result = [`> LDC`, `< ${upperBound} [m]`, `>= ${upperBound} [m]`]; } return result; }, @@ -196,34 +204,40 @@ return `data:text/csv;charset=utf-8, ${encodeURIComponent(this.csv)}`; }, csvFileName() { + if (!this.frequencyD) return; return `${this.$gettext("fairwayavailabilityLNWL")}-${ this.featureName }-${filters.surveyDate(this.fromDate)}-${filters.surveyDate( this.toDate - )}-${this.$gettext(this.frequency)}-.csv`; - }, - fromDate() { - return this.from; - }, - toDate() { - return this.to; + )}-${this.$gettext(this.frequencyD)}-.csv`; }, availability() { return this.plainAvailability; }, title() { + if (!this.frequencyD) return; return `Available Fairway Depth vs LNWL: ${ this.featureName } (${filters.surveyDate(this.fromDate)} - ${filters.surveyDate( this.toDate - )}) ${this.$gettext(this.frequency)}`; + )}) ${this.$gettext(this.frequencyD)}`; }, featureName() { - if (this.selectedFairwayAvailabilityFeature == null) return ""; - return this.selectedFairwayAvailabilityFeature.properties.name; + if (this.selectedFairwayAvailabilityFeatureD == null) return ""; + return this.selectedFairwayAvailabilityFeatureD.properties.name; } }, methods: { + initDiagramValues() { + this.selectedFairwayAvailabilityFeatureD = this.selectedFairwayAvailabilityFeature; + this.fromDate = this.from; + this.toDate = this.to; + this.depthlimit1D = this.depthlimit1; + this.depthlimit2D = this.depthlimit2; + this.widthlimit1D = this.widthlimit1; + this.widthlimit2D = this.widthlimit2; + this.frequencyD = this.frequency; + }, legendStyle(index) { let style; if (this.depthlimit1 !== this.depthlimit2) { @@ -645,6 +659,7 @@ }, watch: { fwLNWLData() { + this.initDiagramValues(); this.drawDiagram(); }, showNumbers() {
--- a/client/src/components/fairway/BottleneckDialogue.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/fairway/BottleneckDialogue.vue Fri Sep 20 15:35:16 2019 +0200 @@ -306,7 +306,6 @@ import { displayError, displayInfo } from "@/lib/errors"; import { HTTP } from "@/lib/http"; import { COMPARESURVEYS } from "@/components/paneSetups"; -import lib from "@/lib/filters"; export default { name: "profiles", @@ -634,29 +633,31 @@ }); }, deleteSelectedSurvey() { - const surveyText = `${this.selectedBottleneck}: ${lib.surveyDate( - this.selectedSurvey.date_info - )}`; - this.$store.commit("application/popup", { - icon: "trash", - title: this.$gettext("Delete survey"), - content: - `<small><b>` + - this.$gettext("Do you really want to delete the survey:") + - `</b><br> - ${surveyText}</small>`, - confirm: { - label: this.$gettext("Delete"), - icon: "trash", - callback: () => { - displayInfo({ title: this.$gettext("Not implemented") }); - } + HTTP.post( + "/imports/dsr", + { + "bottleneck-id": this.selectedSurvey.bottleneck_id, + "date-info": this.selectedSurvey.date_info }, - cancel: { - label: this.$gettext("Cancel"), - icon: "times" + { + headers: { "X-Gemma-Auth": localStorage.getItem("token") } } - }); + ) + .then(() => { + displayInfo({ + title: this.$gettext("Survey"), + message: + this.$gettext("Deleting ") + + `${this.selectedBottleneck}: ${this.selectedSurvey.date_info}` + }); + }) + .catch(error => { + const { status, data } = error.response; + displayError({ + title: this.$gettext("Backend Error"), + message: `${status}: ${data.message || data}` + }); + }); }, deleteSelectedCut(cut) { this.$store.commit("application/popup", {
--- a/client/src/components/gauge/Gauges.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/gauge/Gauges.vue Fri Sep 20 15:35:16 2019 +0200 @@ -109,6 +109,7 @@ * Author(s): * Markus Kottländer <markus.kottlaender@intevation.de> */ +/*eslint no-unused-vars: ["error", { "varsIgnorePattern": "_" }]*/ import { mapState, mapGetters } from "vuex"; import { displayError } from "@/lib/errors"; @@ -245,17 +246,24 @@ return `${gauge.properties.objname} (${this.isrsInfo(gauge).orc})`; }, isrsInfo(gauge) { - let isrsInfo = gauge.id - .split(".")[1] - .replace(/[()]/g, "") - .split(","); + // See https://www.elwis.de/DE/Service/Daten-und-Fakten/RIS-Index/RIS-Index-node.html + const [ + _, + countryCode, + loCode, + fairwaySection, + orc, + hectometre + ] = gauge.properties.isrs_code.match( + /(\w{2})(\w{3})(\w{5})(\w{5})(\w{5})/ + ); return { - countryCode: isrsInfo[0], - loCode: isrsInfo[1], - fairwaySection: isrsInfo[2], - orc: isrsInfo[3], - hectometre: isrsInfo[4] + countryCode: countryCode, + loCode: loCode, + fairwaySection: fairwaySection, + orc: orc, + hectometre: hectometre }; } },
--- a/client/src/components/gauge/HydrologicalConditions.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/gauge/HydrologicalConditions.vue Fri Sep 20 15:35:16 2019 +0200 @@ -12,7 +12,7 @@ <span style="background-color: red; width: 20px; height: 20px;" ></span> - {{ yearCompare }} + {{ yearCompareD }} </div> <div class="legend"> <span @@ -116,6 +116,9 @@ }, data() { return { + selectedGaugeD: null, + longtermIntervalD: null, + yearCompareD: null, zoomStore: null, containerId: "hydrologicalconditions-diagram-container", resizeListenerFunction: null, @@ -143,19 +146,22 @@ ]), ...mapGetters("gauges", ["selectedGauge"]), title() { - return `${this.selectedGauge.properties.objname}: ${this.$gettext( + if (!this.selectedGaugeD || !this.longtermIntervalD) return; + return `${this.selectedGaugeD.properties.objname}: ${this.$gettext( "Hydrological Conditions" - )} (${this.longtermInterval.join(" - ")})`; + )} (${this.longtermIntervalD.join(" - ")})`; }, csvLink() { return "data:text/csv;charset=utf-8," + encodeURIComponent(this.csvData); }, csvFileName() { + if (!this.selectedGaugeD || !this.longtermIntervalD) return; return `${this.$gettext("hydrological-conditions")}-${ - this.selectedGauge.properties.objname - }-${this.longtermInterval.join(" - ")}.csv`; + this.selectedGaugeD.properties.objname + }-${this.longtermIntervalD.join(" - ")}.csv`; }, csvData() { + if (!this.longtermIntervalD || !this.yearCompareD) return; // We cannot directly use the csv data provided by the backend because the // diagram uses data from two endpoints, longterm- and yearWaterlevels. // So we need to merge them here to have them in one csv export. @@ -165,31 +171,41 @@ let yearData = this.yearWaterlevels.find(y => { return d.date.getTime() === y.date.getTime(); }); - d[this.yearCompare] = yearData ? yearData.mean : ""; + d[this.yearCompareD] = yearData ? yearData.mean : ""; return `${d.date.getMonth() + 1}-${d.date.getDate()};${d.min};${ d.max - };${d.mean};${d.median};${d.q25};${d.q75};${d[this.yearCompare]}`; + };${d.mean};${d.median};${d.q25};${d.q75};${d[this.yearCompareD]}`; }) .join("\n"); - return `#Interval: ${this.longtermInterval.join( + return `#Interval: ${this.longtermIntervalD.join( " - " )}\n#date;#min;#max;#mean;#median;#q25;#q75;#${ - this.yearCompare + this.yearCompareD }\n${merged}`; } }, watch: { paneSetup() { - this.$nextTick(() => this.drawDiagram()); + this.$nextTick(() => { + this.initialDiagramValues(); + this.drawDiagram(); + }); }, longtermWaterlevels() { + this.initialDiagramValues(); this.drawDiagram(); }, yearWaterlevels() { + this.initialDiagramValues(); this.drawDiagram(); } }, methods: { + initialDiagramValues() { + this.selectedGaugeD = this.selectedGauge; + this.longtermIntervalD = this.longtermInterval; + this.yearCompareD = this.yearCompare; + }, close() { this.$store.commit( "application/paneSetup", @@ -200,9 +216,9 @@ }, downloadPDF() { let diagramTitle = - this.gaugeInfo(this.selectedGauge) + + this.gaugeInfo(this.selectedGaugeD) + ": Hydrological Conditions " + - this.longtermInterval.join(" - "); + this.longtermIntervalD.join(" - "); this.generatePDF({ templateData: this.templateData, @@ -210,7 +226,7 @@ }); this.pdf.doc.save( - this.selectedGauge.properties.objname + + this.selectedGaugeD.properties.objname + " Hydrological-condition Diagram.pdf" ); }, @@ -242,6 +258,7 @@ }, // Diagram legend addDiagramLegend(position, offset, color) { + if (!this.yearCompareD) return; let x = offset.x + 2, // 2 is the radius of the circle y = offset.y, padding = 3; @@ -263,7 +280,7 @@ this.pdf.doc.setDrawColor("white"); this.pdf.doc.setFillColor("red"); this.pdf.doc.circle(x, y, 2, "FD"); - this.pdf.doc.text(x + padding, y + 1, "" + this.yearCompare); + this.pdf.doc.text(x + padding, y + 1, "" + this.yearCompareD); this.pdf.doc.setFillColor("orange"); this.pdf.doc.circle(x, y + 5, 2, "FD"); this.pdf.doc.text(x + padding, y + 6, "Q25%"); @@ -297,7 +314,7 @@ // remove old diagram d3.select("#" + this.containerId + " svg").remove(); const el = document.querySelector("#" + this.containerId); - if (!this.selectedGauge || !this.longtermWaterlevels.length || !el) + if (!this.selectedGaugeD || !this.longtermWaterlevels.length || !el) return; const svgWidth = el.clientWidth; const svgHeight = el.clientHeight; @@ -316,7 +333,7 @@ // HDC/LDC/MW for the selected gauge const refWaterLevels = JSON.parse( - this.selectedGauge.properties.reference_water_levels + this.selectedGaugeD.properties.reference_water_levels ); // dimensions (widths, heights, margins) @@ -962,6 +979,7 @@ ywl => ywl.date.getTime() === d.date.getTime() ); if (dYear) { + if (!this.yearCompareD) return; tooltipText .append("tspan") .attr("x", 0) @@ -969,7 +987,7 @@ .attr("dy", "7.4em") .attr("dominant-baseline", "hanging") .attr("text-anchor", "middle") - .text(`${this.yearCompare}: ${dYear.mean.toFixed(1)} cm`); + .text(`${this.yearCompareD}: ${dYear.mean.toFixed(1)} cm`); } // get text dimensions @@ -1016,7 +1034,7 @@ // not guarantee that the DOM is not only updated but also re-painted on the // screen. setTimeout(this.drawDiagram, 150); - + this.initialDiagramValues(); this.templates[0] = this.defaultTemplate; this.form.template = this.templates[0]; this.templateData = this.form.template;
--- a/client/src/components/gauge/Waterlevel.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/gauge/Waterlevel.vue Fri Sep 20 15:35:16 2019 +0200 @@ -70,6 +70,17 @@ </button> --> </div> + <div class="btn-group-toggle w-100 mt-2"> + <label + class="btn btn-outline-secondary btn-sm" + :class="{ active: showNSC }" + ><input + type="checkbox" + v-model="showNSC" + autocomplete="off" + />Nash-Sutcliffe + </label> + </div> </DiagramLegend> <div class="d-flex flex-fill justify-content-center align-items-center" @@ -114,6 +125,8 @@ // d3-line-chunked plugin: https://github.com/pbeshai/d3-line-chunked const d3 = Object.assign(d3Base, { lineChunked }); +let temp = null; + export default { mixins: [diagram, pdfgen, templateLoader, refwaterlevels], components: { @@ -121,6 +134,9 @@ }, data() { return { + dateFromD: null, + dateToD: null, + selectedGaugeD: null, containerId: "waterlevel-diagram-container", resizeListenerFunction: null, form: { @@ -134,32 +150,25 @@ height: 297 }, templateData: null, - zoomStore: null + zoomStore: null, + showNSC: true }; }, computed: { ...mapState("application", ["paneSetup"]), ...mapState("gauges", [ "dateFrom", + "dateTo", "waterlevels", "waterlevelsCSV", "nashSutcliffe" ]), ...mapGetters("gauges", ["selectedGauge"]), title() { - return `${this.selectedGauge.properties.objname}: ${this.$gettext( + if (!this.selectedGaugeD) return; + return `${this.selectedGaugeD.properties.objname}: ${this.$gettext( "Waterlevel" - )} (${this.dateFrom.toLocaleDateString()} - ${this.dateTo.toLocaleDateString()})`; - }, - dateFrom: { - get() { - return this.$store.state.gauges.dateFrom; - } - }, - dateTo: { - get() { - return this.$store.state.gauges.dateTo; - } + )} (${this.dateFromD.toLocaleDateString()} - ${this.dateToD.toLocaleDateString()})`; }, csvLink() { return ( @@ -167,10 +176,11 @@ ); }, csvFileName() { + if (!this.dateFromD || !this.dateToD) return ""; return `${this.$gettext("waterlevels")}-${ this.selectedGauge.properties.objname - }-${this.dateFrom.toISOString().split("T")[0]}-${ - this.dateTo.toISOString().split("T")[0] + }-${this.dateFromD.toISOString().split("T")[0]}-${ + this.dateToD.toISOString().split("T")[0] }.csv`; }, hasPredictions() { @@ -178,14 +188,23 @@ } }, watch: { + showNSC() { + this.drawDiagram({ ...this.zoomStore }); + }, paneSetup() { this.$nextTick(() => this.drawDiagram()); }, waterlevels() { + this.initialDiagramValues(); this.drawDiagram(); } }, methods: { + initialDiagramValues() { + this.dateFromD = this.dateFrom; + this.dateToD = this.dateTo; + this.selectedGaugeD = this.selectedGauge; + }, close() { this.$store.commit( "application/paneSetup", @@ -206,9 +225,9 @@ let diagramTitle = this.gaugeInfo(this.selectedGauge) + ": Waterlevel " + - this.dateFrom.toLocaleDateString() + + this.dateFromD.toLocaleDateString() + " - " + - this.dateTo.toLocaleDateString(); + this.dateToD.toLocaleDateString(); this.generatePDF({ templateData: this.templateData, diagramTitle: diagramTitle @@ -291,7 +310,7 @@ } }; }, - drawDiagram() { + drawDiagram(zoom) { // remove old diagram and exit if necessary data is missing d3.select("#" + this.containerId + " svg").remove(); const elem = document.querySelector("#" + this.containerId); @@ -305,7 +324,8 @@ svgWidth: svgWidth, svgHeight: svgHeight, ...layout - }) + }), + zoomLevel: zoom ? zoom : null }); }, renderTo({ element, dimensions, zoomLevel }) { @@ -398,16 +418,17 @@ // static, don't need updater this.drawNavigationChart({ scale, navigation }); this.drawRefLines({ refWaterLevels, diagram, scale, dimensions, extent }); - - updaters.push( - this.drawNashSutcliffe({ hours: 72, diagram, scale, dimensions }) - ); - updaters.push( - this.drawNashSutcliffe({ hours: 48, diagram, scale, dimensions }) - ); - updaters.push( - this.drawNashSutcliffe({ hours: 24, diagram, scale, dimensions }) - ); + if (this.showNSC) { + updaters.push( + this.drawNashSutcliffe({ hours: 72, diagram, scale, dimensions }) + ); + updaters.push( + this.drawNashSutcliffe({ hours: 48, diagram, scale, dimensions }) + ); + updaters.push( + this.drawNashSutcliffe({ hours: 24, diagram, scale, dimensions }) + ); + } // INTERACTIONS @@ -955,14 +976,19 @@ .call(brush.move, scale.x.range().map(t.invertX, t)); }; zoom.on("zoom", () => { - if (d3.event.sourceEvent && d3.event.sourceEvent.type === "brush") + if (d3.event.sourceEvent && d3.event.sourceEvent.type === "brush") { return; // ignore zoom-by-brush + } let t = d3.event.transform; + // set the zoom to the passed zoom level. if (zoomLevel) { - const tx = (zoomLevel.x * dimensions.width) / zoomLevel.width; - const k = zoomLevel.k; - const ty = zoomLevel.y; + let tx = (zoomLevel.x * dimensions.width) / zoomLevel.width; + let k = zoomLevel.k; + let ty = zoomLevel.y; t = d3.zoomIdentity.translate(tx, ty).scale(k); + zoomLevel = null; // avoid to stuck at same zoom level after setting the zoom by subsequent zooming. + } else { + temp = { ...d3.event.transform, width: dimensions.width }; } scaleForZoom(t); }); @@ -971,11 +997,13 @@ svg.select(".chart-tooltip").style("opacity", 0); }); // store the zoom level after zomming is ended - if (!zoomLevel) { - zoom.on("end", () => { - this.zoomStore = { ...d3.event.transform, width: dimensions.width }; - }); - } + zoom.on("end", () => { + if (!zoomLevel) { + this.zoomStore = temp + ? temp + : { ...d3.event.transform, width: dimensions.width }; + } + }); navigation .append("g") @@ -1154,7 +1182,7 @@ // not guarantee that the DOM is not only updated but also re-painted on the // screen. setTimeout(this.drawDiagram, 150); - + this.initialDiagramValues(); this.templates[0] = this.defaultTemplate; this.form.template = this.templates[0]; this.templateData = this.form.template;
--- a/client/src/components/identify/Identify.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/identify/Identify.vue Fri Sep 20 15:35:16 2019 +0200 @@ -5,7 +5,7 @@ { expanded: showIdentify } ]" > - <div style="width: 18rem"> + <div style="width: 20rem"> <UIBoxHeader icon="info" :title="identifiedLabel" @@ -40,10 +40,19 @@ </a> </small> <div + class="text-left mt-2" + v-if="showBottleneckMeta(feature) || showGaugeMeta(feature)" + > + <small class="ml-2 text-muted bg-white"> + Meta: + </small> + <hr style="margin-top:0.25em;margin-bottom:0.5em;" /> + </div> + <div v-if="showBottleneckMeta(feature)" - class="ml-2 mb-1 text-left d-flex flex-column" + class="ml-1 mb-1 text-left d-flex flex-column" > - <div> + <div class="d-flex"> <font-awesome-icon icon="caret-up" fixed-width @@ -52,9 +61,15 @@ 'font-size': 'x-large' }" /> - <small class="my-auto"> - {{ recency(feature) }} - </small> + <div class="d-flex flex-column"> + <small + v-for="(line, index) in recency(feature)" + :key="index" + class="bg-white my-auto text-wrap" + > + {{ line }} + </small> + </div> </div> <div> <small><translate>According gauge data:</translate></small> @@ -62,7 +77,7 @@ </div> <div v-if="showGaugeMeta(feature)" - class="ml-2 mb-1 text-left d-flex flex-column" + class="ml-1 mb-1 text-left d-flex flex-column" > <div class="d-flex"> <div class="d-flex flex-column"> @@ -87,11 +102,17 @@ }" /> </div> - <small class="my-auto"> - {{ gmAvailability(feature) }} - </small> + <div class="d-flex flex-column"> + <small + v-for="(line, index) in gmAvailability(feature)" + class="bg-white my-auto" + :key="index" + > + {{ line }} + </small> + </div> </div> - <div> + <div class="mt-2 d-flex"> <font-awesome-icon icon="caret-up" fixed-width @@ -100,11 +121,17 @@ 'font-size': 'x-large' }" /> - <small class="my-auto"> - {{ getGaugeStatusText(feature) }} - </small> + <div class="d-flex flex-column"> + <small + v-for="(line, index) in getGaugeStatusText(feature)" + :key="index" + class="bg-white my-auto" + > + {{ line }} + </small> + </div> </div> - <div> + <div class="mt-2 d-flex"> <font-awesome-icon icon="caret-up" fixed-width @@ -113,11 +140,21 @@ 'font-size': 'x-large' }" /> - <small class="my-auto"> - {{ forecastAccuracy(feature) }} - </small> + <div style="line-height:1.1em" class="d-flex flex-column"> + <small + v-for="(line, index) in forecastAccuracy(feature)" + :key="index" + class="bg-white my-auto" + > + {{ line }} + </small> + </div> </div> </div> + <hr + v-if="showBottleneckMeta(feature) || showGaugeMeta(feature)" + style="margin-top:0.5em;margin-bottom:0.25em;" + /> <div> <small v-for="prop in featureProps(feature)" @@ -226,8 +263,9 @@ import { mapState, mapGetters } from "vuex"; import { formatter } from "./formatter"; import { getCenter } from "ol/extent"; -import classifications from "../../lib/classifications"; +import classifications from "@/lib/classifications"; import { styleFactory } from "@/components/map/styles"; +import filters from "@/lib/filters"; const { recencyColorCodes, @@ -262,20 +300,30 @@ return forecastVsRealityColorCodes[this.gaugeStatus]; }, gaugeStatusText() { - const nsc24 = this.config.gm_forecast_vs_reality_nsc_24h; - const nsc72 = this.config.gm_forecast_vs_reality_nsc_72h; - const coeffWarn = this.gaugeCoeffs ? this.gaugeCoeffs[2].value : ""; - const coeffDanger = this.gaugeCoeffs ? this.gaugeCoeffs[0].value : ""; + const nsc24 = Number(this.config.gm_forecast_vs_reality_nsc_24h).toFixed( + 2 + ); + const nsc72 = Number(this.config.gm_forecast_vs_reality_nsc_72h).toFixed( + 2 + ); + const coeffWarn = this.gaugeCoeffs + ? Number(this.gaugeCoeffs[2].value).toFixed(2) + : ""; + const coeffDanger = this.gaugeCoeffs + ? Number(this.gaugeCoeffs[0].value).toFixed(2) + : ""; const messagesPerState = { - OK: + OK: [ this.$gettext("Nash-Sutcliffe") + - `(${coeffDanger} >${nsc24} /24h ${coeffWarn} >${nsc72} / 72h)`, - WARNING: - this.$gettext("Nash-Sutcliffe") + ` (${coeffWarn} < ${nsc72} / 72h)`, - DANGER: - this.$gettext("Nash-Sutcliffe") + - ` (${coeffDanger} < ${nsc24} / 72h)`, - NEUTRAL: this.$gettext("Nash-Sutcliffe not available") + `(${coeffDanger} >${nsc24} /24h ${coeffWarn} >${nsc72} / 72h)` + ], + WARNING: [ + this.$gettext("Nash-Sutcliffe") + ` (${coeffWarn} < ${nsc72} / 72h)` + ], + DANGER: [ + this.$gettext("Nash-Sutcliffe") + ` (${coeffDanger} < ${nsc24} / 72h)` + ], + NEUTRAL: [this.$gettext("Nash-Sutcliffe not available")] }; return messagesPerState[this.gaugeStatus]; }, @@ -283,22 +331,30 @@ return forecastVsRealityColorCodes[this.refGaugeStatus]; }, refGaugeStatusText() { - const nsc24 = this.config.gm_forecast_vs_reality_nsc_24h; - const nsc72 = this.config.gm_forecast_vs_reality_nsc_72h; - const coeffWarn = this.refGaugeCoeffs ? this.refGaugeCoeffs[2].value : ""; + const nsc24 = Number(this.config.gm_forecast_vs_reality_nsc_24h).toFixed( + 2 + ); + const nsc72 = Number(this.config.gm_forecast_vs_reality_nsc_72h).toFixed( + 2 + ); + const coeffWarn = this.refGaugeCoeffs + ? Number(this.refGaugeCoeffs[2].value).toFixed(2) + : ""; const coeffDanger = this.refGaugeCoeffs - ? this.refGaugeCoeffs[0].value + ? Number(this.refGaugeCoeffs[0].value).toFixed(2) : ""; const messagesPerState = { - OK: + OK: [ this.$gettext("Nash-Sutcliffe") + - `(${coeffDanger} >${nsc24} /24h ${coeffWarn} >${nsc72} / 72h)`, - WARNING: - this.$gettext("Nash-Sutcliffe") + ` (${coeffWarn} < ${nsc72} / 72h)`, - DANGER: - this.$gettext("Nash-Sutcliffe") + - ` (${coeffDanger} < ${nsc24} / 72h)`, - NEUTRAL: this.$gettext("Nash-Sutcliffe not available") + `(${coeffDanger} >${nsc24} /24h ${coeffWarn} >${nsc72} / 72h)` + ], + WARNING: [ + this.$gettext("Nash-Sutcliffe") + ` (${coeffWarn} < ${nsc72} / 72h)` + ], + DANGER: [ + this.$gettext("Nash-Sutcliffe") + ` (${coeffDanger} < ${nsc24} / 72h)` + ], + NEUTRAL: [this.$gettext("Nash-Sutcliffe not available")] }; return messagesPerState[this.refGaugeStatus]; } @@ -350,18 +406,31 @@ gmAvailability(feature) { const latestInHours = this.config.gm_latest_hours; const measurementsIn14D = this.config.gm_min_values_14d; + const gauge = classifications.getGauge(feature); + const lastMeasureDate = filters.surveyDate(gauge.get("gm_measuredate")); + const in14Days = gauge.get("gm_n_14d"); const messagesPerState = { - OK: - this.$gettext("Avail: Last measurement <") + - ` ${latestInHours} (${measurementsIn14D} in 14d)`, - WARNING: - this.$gettext("Avail: Below treshold") + - `: ${measurementsIn14D} in 14d`, - DANGER: + OK: [ + this.$gettext("Avail: Latest measurement from") + + `${lastMeasureDate}`, + this.$gettext("Measurement is within") + ` ${latestInHours}h`, + `${in14Days} / ${measurementsIn14D} ${this.$gettext( + "measurements" + )} in 14d` + ], + WARNING: [ + this.$gettext("Avail: Below treshold"), + `${in14Days} / ${measurementsIn14D} ${this.$gettext( + "measurements" + )} in 14d` + ], + DANGER: [ this.$gettext("Avail: Latest measurement older than") + - ` ${latestInHours} d` + ` ${latestInHours} d`, + `(${lastMeasureDate})` + ] }; - return messagesPerState[[classifications.gmAvailability(feature)]]; + return messagesPerState[classifications.gmAvailability(feature)]; }, gmAvailabilityColor(feature) { return gmAvailabilityColorCodes[classifications.gmAvailability(feature)]; @@ -372,16 +441,20 @@ const fa3d = feature.get("forecast_accuracy_3d"); const fa1d = feature.get("forecast_accuracy_1d"); const messagesPerState = { - OK: - this.$gettext("Highest confidence") + - ` <${offset24} cm/24h, <${offset72} cm/72h`, - WARNING: - this.$gettext("Confidence per 72h") + - ` (${fa3d} cm > ${offset72} cm)`, - DANGER: + OK: [ + this.$gettext("Highest confidence"), + `${fa1d} < ${offset24} cm/24h`, + `${fa3d} < ${offset72} cm/72h` + ], + WARNING: [ + this.$gettext("Confidence per 72h") + ` (${fa3d} cm > ${offset72} cm)` + ], + DANGER: [ this.$gettext("Confidence per 24h") + ` (${fa1d} cm > ${offset24} cm)` + ], + NEUTRAL: [this.$gettext("Predictions not available")] }; - return messagesPerState[[classifications.forecastAccuracy(feature)]]; + return messagesPerState[classifications.forecastAccuracy(feature)]; }, forecastAccuracyColor(feature) { return forecastAccuracyColorCodes[ @@ -391,16 +464,26 @@ recency(feature) { const revisitingFactor = this.config.bn_revtime_multiplier; const revisitingTime = feature.get("revisiting_time"); + if (!revisitingTime) return [this.$gettext("No revisiting time defined")]; + const latest = feature.get("date_max"); + if (!latest) return [this.$gettext("No survey-data available")]; + const latestMeasurement = filters.surveyDate(new Date(latest)); const messagesPerState = { - OK: + OK: [ this.$gettext("Data within the revisiting time") + - ` (${revisitingTime}d)`, - WARNING: + ` (${revisitingTime} mth)`, + `${this.$gettext("Latest measurement")} ${latestMeasurement}` + ], + WARNING: [ this.$gettext("Data within revisiting treshold") + - ` (${revisitingTime} * ${revisitingFactor})`, - DANGER: + ` (${revisitingFactor} * ${revisitingTime})`, + `${this.$gettext("Latest measurement")} ${latestMeasurement}` + ], + DANGER: [ this.$gettext("Data too old. Treshold:") + - ` (${revisitingTime}d * ${revisitingFactor})` + ` (${revisitingFactor} * ${revisitingTime}mth)`, + `${this.$gettext("Latest measurement")} ${latestMeasurement}` + ] }; return messagesPerState[classifications.surveyRecency(feature)]; },
--- a/client/src/components/importconfiguration/ScheduledImports.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/importconfiguration/ScheduledImports.vue Fri Sep 20 15:35:16 2019 +0200 @@ -718,7 +718,7 @@ this.maxWidth = value; }, setDepth(value) { - this.depth = value; + this.depth = parseInt(value * 100); }, setSourceOrganization(value) { this.sourceOrganization = value;
--- a/client/src/components/importconfiguration/types/Fairwaydimensions.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/importconfiguration/types/Fairwaydimensions.vue Fri Sep 20 15:35:16 2019 +0200 @@ -91,9 +91,10 @@ @input="depthChanged" class="depth form-control form-control-sm" type="number" - :value="depth" + :value="depthInMeter" + step="0.1" /> - <div class="ml-2 my-auto">cm</div> + <div class="ml-2 my-auto">m</div> </div> <div v-if="!depth" class="d-flex flex-row"> <small @@ -228,6 +229,9 @@ } }, computed: { + depthInMeter() { + return this.depth / 100; + }, los: { get() { return this.LOS;
--- a/client/src/components/importoverview/FairwayDimensionDetail.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/importoverview/FairwayDimensionDetail.vue Fri Sep 20 15:35:16 2019 +0200 @@ -1,5 +1,15 @@ <template> - <div>Fairwaydimension</div> + <div class="d-flex flex-column"> + <div> + Fairwaydimensions + </div> + <template v-if="LOS"> + <span class="ml-2 mt-1">LOS: {{ LOS }}</span> + <span class="ml-2 mb-3" + ><translate>Source</translate>: {{ organization }}</span + > + </template> + </div> </template> <script> @@ -16,13 +26,14 @@ * Author(s): * Thomas Junk <thomas.junk@intevation.de> */ -import { HTTP } from "@/lib/http"; -import { WFS } from "ol/format"; import { or as orFilter, equalTo as equalToFilter } from "ol/format/filter"; //import { displayError } from "@/lib/errors"; import { mapGetters } from "vuex"; -import Feature from "ol/Feature"; -import Polygon from "ol/geom/Polygon"; +import VectorSource from "ol/source/Vector"; +import { buildVectorLoader } from "@/components/map/layers.js"; +import { bbox as bboxStrategy } from "ol/loadingstrategy"; +import { WFS } from "ol/format"; +import { HTTP } from "@/lib/http"; const getFromWFS = (type, filter) => { return new Promise((resolve, reject) => { @@ -55,24 +66,41 @@ export default { props: ["summary"], + data() { + return { + organization: "", + LOS: "" + }; + }, mounted() { const ids = this.fairWayDimensionIDs.map(id => { return equalToFilter("id", id); }); - getFromWFS("fairway_dimensions", orFilter(...ids)).then(response => { - let { features } = response.data; - const fairwaydimensionLayer = this.openLayersMap().getLayer( - "FDREVIEWLAYER" - ); - features = features.map(f => { - let result = new Feature({ - geometry: new Polygon(f.geometry.coordinates) - }); - result.setId(f.id); - return result; - }); - fairwaydimensionLayer.setVisible(true); - fairwaydimensionLayer.getSource().addFeatures(features); + const fairwaydimensionLayer = this.openLayersMap().getLayer( + "FDREVIEWLAYER" + ); + const source = new VectorSource({ strategy: bboxStrategy }); + this.$store.commit("map/reviewActive", true); + fairwaydimensionLayer.setVisible(true); + source.setLoader( + buildVectorLoader( + { + geometryName: "area", + featureTypes: ["fairway_dimensions"], + filter: orFilter(...ids) + }, + source, + false + ) + ); + fairwaydimensionLayer.setSource(source); + getFromWFS("fairway_dimensions", ids[0]).then(response => { + const { + level_of_service, + source_organization + } = response.data.features[0].properties; + this.LOS = level_of_service; + this.organization = source_organization; }); }, computed: {
--- a/client/src/components/importoverview/ImportOverview.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/importoverview/ImportOverview.vue Fri Sep 20 15:35:16 2019 +0200 @@ -414,11 +414,16 @@ .then(response => { this.loadLogs(); this.$store.commit("imports/setReviewed", []); + this.$store.commit("map/startRefreshLayers"); this.$store.commit("gauges/deleteNashSutcliffeCache"); this.$store.dispatch("map/refreshLayers"); this.$store.dispatch("imports/loadStagingNotifications"); this.$store.dispatch("imports/loadStretches"); this.$store.dispatch("imports/loadSections"); + this.$store.commit("map/reviewActive", false); + this.$nextTick(() => { + this.$store.commit("map/finishRefreshLayers"); + }); const messages = response.data .map(x => { if (x.message) return x.message;
--- a/client/src/components/importoverview/LogDetail.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/importoverview/LogDetail.vue Fri Sep 20 15:35:16 2019 +0200 @@ -108,7 +108,7 @@ return this.kind === "SEC"; }, isSR() { - return this.kind === "SR"; + return this.kind === "SR" || this.kind === "DSR"; } }, methods: {
--- a/client/src/components/importoverview/LogEntry.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/importoverview/LogEntry.vue Fri Sep 20 15:35:16 2019 +0200 @@ -29,8 +29,11 @@ </div> <div style="width: 44px;" class="table-cell center"> <font-awesome-icon - v-if="entry.warnings" - class="text-warning" + v-if="entry.warnings || entry.errors" + :class="{ + 'text-warning': entry.warnings && !entry.errors, + 'text-danger': entry.errors + }" icon="exclamation-triangle" fixed-width /> @@ -145,6 +148,7 @@ this.$store.commit("imports/hideDetails"); this.$store.commit("imports/hideAdditionalInfo"); this.$store.commit("imports/hideAdditionalLogs"); + this.$store.commit("map/reviewActive", false); } else { this.loading = true; HTTP.get("/imports/" + this.entry.id, {
--- a/client/src/components/importoverview/LogItem.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/importoverview/LogItem.vue Fri Sep 20 15:35:16 2019 +0200 @@ -9,8 +9,8 @@ 'font-weight-bold': /warn|error/.test(line.kind) } ]" - >{{ line.kind.toUpperCase() }}</span - > + >{{ line.kind.toUpperCase() }} + </span> <span :class="[ 'time', @@ -20,8 +20,8 @@ 'font-weight-bold': /warn|error/.test(line.kind) } ]" - >{{ line.time | dateTime }}</span - > + >{{ line.time | dateTime }} + </span> <span :class="[ 'message', @@ -31,8 +31,8 @@ 'font-weight-bold': /warn|error/.test(line.kind) } ]" - >{{ line.message }}</span - > + >{{ line.message }} + </span> </div> </template>
--- a/client/src/components/importoverview/SoundingResultDetail.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/importoverview/SoundingResultDetail.vue Fri Sep 20 15:35:16 2019 +0200 @@ -1,8 +1,18 @@ <template> <div> - <a @click="zoomTo()" class="text-info pointer"> + <a v-if="isSR" @click="zoomTo()" class="text-info pointer"> {{ details.summary.bottleneck }} </a> + <div class="d-flex flex-column" v-if="isDSR"> + <span> + <translate>Bottleneck: </translate> + {{ details.summary["bottleneck-id"] }} + </span> + <span> + <translate>Survey from: </translate> + {{ details.summary["date-info"] | surveyDate }} + </span> + </div> </div> </template> @@ -29,7 +39,13 @@ this.$store.commit("imports/hideAdditionalInfo"); }, computed: { - ...mapState("imports", ["showAdditional", "details"]) + ...mapState("imports", ["showAdditional", "details"]), + isSR() { + return this.entry.kind.toUpperCase() === "SR"; + }, + isDSR() { + return this.entry.kind.toUpperCase() === "DSR"; + } }, methods: { zoomTo() {
--- a/client/src/components/layers/Layers.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/layers/Layers.vue Fri Sep 20 15:35:16 2019 +0200 @@ -5,7 +5,7 @@ { expanded: showLayers } ]" > - <div class="position-relative" style="width: 18rem; min-height: 350px;"> + <div class="position-relative" style="width: 20rem; min-height: 350px;"> <UIBoxHeader icon="layer-group" :title="label" @@ -37,6 +37,7 @@ <Layerselect layerId="DISTANCEMARKS" /> <Layerselect layerId="DISTANCEMARKSAXIS" /> <Layerselect layerId="GAUGES" /> + <Layerselect v-if="reviewActive" layerId="FDREVIEWLAYER" /> </div> <UISpinnerOverlay v-else style="top: 34px;" /> </div> @@ -58,7 +59,7 @@ * Thomas Junk <thomas.junk@intevation.de> * Markus Kottländer <markus.kottlaender@intevation.de> */ -import { mapState } from "vuex"; +import { mapState, mapGetters } from "vuex"; export default { components: { @@ -66,7 +67,8 @@ }, computed: { ...mapState("application", ["showLayers"]), - ...mapState("map", ["openLayersMaps"]), + ...mapState("map", ["openLayersMaps", "reviewActive"]), + ...mapGetters("map", ["openLayersMap"]), label() { return this.$gettext("Map Layers"); }, @@ -81,6 +83,16 @@ return counter; } }, + watch: { + reviewActive() { + if (!this.reviewActive) { + const fairwaydimensionLayer = this.openLayersMap().getLayer( + "FDREVIEWLAYER" + ); + fairwaydimensionLayer.setVisible(false); + } + } + }, methods: { close() { this.$store.commit("application/showLayers", false);
--- a/client/src/components/layers/LegendElement.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/layers/LegendElement.vue Fri Sep 20 15:35:16 2019 +0200 @@ -166,6 +166,9 @@ [[-1.7, -1.2], [-1.7, 0.5], [1.7, 1.2], [1.7, -0.5]] ]) }); + if (typeof mapStyle === "function") { + mapStyle = mapStyle(); + } mapStyle = new Style({ stroke: new Stroke({ color: mapStyle.getStroke().getColor(),
--- a/client/src/components/map/Map.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/map/Map.vue Fri Sep 20 15:35:16 2019 +0200 @@ -187,7 +187,7 @@ if (this.initialLoad) { this.$store.commit("map/initialLoad", false); var currentUser = this.$store.state.user.user; - HTTP.get("/users/" + currentUser, { + HTTP.get("/users/" + encodeURIComponent(`${currentUser}`), { headers: { "X-Gemma-Auth": localStorage.getItem("token"), "Content-type": "text/xml; charset=UTF-8" @@ -208,6 +208,7 @@ }); }) .catch(error => { + this.mountMap(); const { status, data } = error.response; displayError({ title: this.$gettext("Backend Error"),
--- a/client/src/components/map/layers.js Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/map/layers.js Fri Sep 20 15:35:16 2019 +0200 @@ -11,12 +11,12 @@ import { bbox as bboxStrategy } from "ol/loadingstrategy"; import { WFS, GeoJSON } from "ol/format"; import OSM from "ol/source/OSM"; -import { equalTo } from "ol/format/filter"; +import { equalTo, and as andFilter } from "ol/format/filter"; import { HTTP } from "@/lib/http"; import { styleFactory } from "./styles"; import store from "@/store/index"; -const buildVectorLoader = ( +export const buildVectorLoader = ( featureRequestOptions, vectorSource, bboxStrategyDisabled, @@ -184,7 +184,7 @@ id: "FDREVIEWLAYER", label: "Review", visible: true, - source: new VectorSource(), + source: new VectorSource({ wrapX: false }), style: styles.sections }); const bottlenecksSource = new VectorSource({ strategy: bboxStrategy }); @@ -331,7 +331,10 @@ { geometryName: "area", featureTypes: ["fairway_dimensions"], - filter: equalTo("level_of_service", 1) + filter: andFilter( + equalTo("level_of_service", 1), + equalTo("staging_done", true) + ) }, source, false @@ -354,7 +357,10 @@ { geometryName: "area", featureTypes: ["fairway_dimensions"], - filter: equalTo("level_of_service", 2) + filter: andFilter( + equalTo("level_of_service", 2), + equalTo("staging_done", true) + ) }, source, false @@ -377,7 +383,10 @@ { geometryName: "area", featureTypes: ["fairway_dimensions"], - filter: equalTo("level_of_service", 3) + filter: andFilter( + equalTo("level_of_service", 3), + equalTo("staging_done", true) + ) }, source, false
--- a/client/src/components/map/styles.js Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/map/styles.js Fri Sep 20 15:35:16 2019 +0200 @@ -221,20 +221,24 @@ } if (feature.get("fa_critical") && feature.get("fa_data")) { let data = feature.get("fa_data"); - const heightInPixel = 82; + const heightInPixel = 80; const relativeHeightInPercent = heightInPixel / 100; let lnwlHeight = relativeHeightInPercent * data.ldc; let belowThresholdHeight = relativeHeightInPercent * data.below; let betweenThresholdHeight = relativeHeightInPercent * data.between; let aboveThresholdHeight = relativeHeightInPercent * data.above; - let lnwl = `<rect x='2' y='${heightInPixel - + let lnwl = `<rect x='2' y='${2 + + heightInPixel - lnwlHeight}' width='10' height='${lnwlHeight}' stroke-width='0' fill='aqua'/>`; - let above = `<rect x='12' y='${heightInPixel - + let above = `<rect x='12' y='${2 + + heightInPixel - aboveThresholdHeight}' width='18' height='${aboveThresholdHeight}' stroke-width='0' fill='blue'/>`; - let between = `<rect x='12' y='${heightInPixel - + let between = `<rect x='12' y='${2 + + heightInPixel - aboveThresholdHeight - betweenThresholdHeight}' width='18' height='${betweenThresholdHeight}' stroke-width='0' fill='darksalmon'/>`; - let below = `<rect x='12' y='${heightInPixel - + let below = `<rect x='12' y='${2 + + heightInPixel - aboveThresholdHeight - betweenThresholdHeight - belowThresholdHeight}' width='18' height='${belowThresholdHeight}' stroke-width='0' fill='hotpink'/>`;
--- a/client/src/components/stretches/Stretches.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/stretches/Stretches.vue Fri Sep 20 15:35:16 2019 +0200 @@ -152,7 +152,7 @@ const link = document.createElement("a"); const now = new Date(); link.href = window.URL.createObjectURL(response.data); - link.download = `${name}-${format(now, "YYYY-mm-DD")}.zip`; + link.download = `${name}-${format(now, "YYYY-MM-DD")}.zip`; document.body.appendChild(link); link.click(); document.body.removeChild(link); @@ -207,29 +207,19 @@ }); }, deleteStretch(stretch) { - this.$store.commit("application/popup", { - icon: "trash", - title: this.$gettext("Delete Stretch"), - content: - this.$gettext("Do you really want to delete this stretch:") + - `<br> - <b>${stretch.properties.name}, ${ - stretch.properties.source_organization - } (${stretch.properties.countries})</b>`, - confirm: { - label: this.$gettext("Delete"), - icon: "trash", - callback: () => { - displayInfo({ - title: this.$gettext("Not implemented"), - message: this.$gettext("Deleting ") + stretch.id - }); - } + HTTP.post( + "/imports/dst", + { + id: stretch.id.split(".")[1] * 1 }, - cancel: { - label: this.$gettext("Cancel"), - icon: "times" + { + headers: { "X-Gemma-Auth": localStorage.getItem("token") } } + ).then(() => { + displayInfo({ + title: this.$gettext("Staging Area"), + message: this.$gettext("Deleting ") + stretch.properties.objnam + }); }); }, moveMapToStretch(stretch) {
--- a/client/src/components/systemconfiguration/ColorSettings.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/systemconfiguration/ColorSettings.vue Fri Sep 20 15:35:16 2019 +0200 @@ -2,7 +2,7 @@ <div class="d-flex flex-column py-3"> <div class="px-3 container-fluid"> <div class="row"> - <div v-for="f in features" :key="f.key" class="col-sm-2 mt-2"> + <div v-for="f in features" :key="f.key" class="col-sm-3 mt-2 mb-4"> <div v-if="f.fillColor" class="card mt-3"> <div class="card-header small text-center"> <span v-translate="{ layerName: f.name }" @@ -36,28 +36,29 @@ </div> </div> </div> - <div class="mt-2"> + <div class="d-flex text-right mt-2 mb-4"> <a @click.prevent="submit(f)" - class="btn btn-info btn-sm text-white" + class="w-50 btn btn-info btn-sm text-white" > <translate>Send</translate> </a> <a @click.prevent="reset(f)" - class="btn btn-outline-info btn-sm ml-2" + class="w-50 btn btn-outline-info btn-sm ml-2" > <translate>Reset to defaults</translate> </a> </div> + <hr /> </div> - <div class="col-sm-2 align-self-end px-1"> - <a @click.prevent="resetAll" class="btn btn-outline-info btn-sm" + <div class="d-flex col-sm-3 align-self-end text-right savebuttons"> + <a @click.prevent="resetAll" class="w-50 btn btn-outline-info btn-sm" ><translate>Reset all to defaults</translate> </a> <a @click.prevent="saveAll" - class="btn btn-info ml-1 btn-sm text-white " + class="w-50 btn btn-info ml-1 btn-sm text-white " ><translate>Send all</translate> </a> </div> @@ -67,6 +68,9 @@ </template> <style lang="sass" scoped> +.savebuttons + position:relative + top: -4em; /deep/ .card overflow: hidden
--- a/client/src/components/systemconfiguration/DataAccuracy.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/systemconfiguration/DataAccuracy.vue Fri Sep 20 15:35:16 2019 +0200 @@ -110,11 +110,12 @@ type="number" step="1" min="1" + max="336" class="form-control form-control-sm mx-1" style="width: 55px" v-model="config.gm_latest_hours" /> - <translate>days.</translate> + <translate>hours.</translate> </div> </div> </div>
--- a/client/src/components/systemconfiguration/MorphologyClassbreaks.vue Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/components/systemconfiguration/MorphologyClassbreaks.vue Fri Sep 20 15:35:16 2019 +0200 @@ -104,6 +104,9 @@ <span class="text-danger" v-if="!checkClassbreaks"> {{ validationMessage }} </span> + <span class="text-secondary fix-trans-space" v-translate> + Changes need a map reload. Consider informing your users. + </span> </div> <div class="px-3"> <h6 class="font-weight-bold"> @@ -211,6 +214,10 @@ <span class="text-danger" v-if="!checkClassbreaksCompare"> {{ validationMessageForCompare }} </span> + <span class="text-secondary fix-trans-space" v-translate> + Colour changes need a map reload. Value changes need a de- and re-select + of a difference calculation. Inform your users! + </span> </div> </div> </template> @@ -221,7 +228,7 @@ border-color: #ff0000 .classbreak - width: 142px + width: 154px .btn-outline-secondary border-color: #ccc color: #ccc @@ -310,7 +317,7 @@ // check if the same value is used for more than one field. hasDoublettes(m, compare) { const errorMessage = this.$gettext( - "Same value is used in multiple fields. Please check" + "Same value is used in multiple fields." ); let values = []; for (let i = 0; i < m.length; i++) { @@ -329,7 +336,7 @@ }, valuesAreValid(m, compare) { const errorMessage = this.$gettext( - "There are invalid classbreak values. Please check" + "There are invalid classbreak values." ); let values = m.map(e => { const element = e[0];
--- a/client/src/lib/classifications.js Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/lib/classifications.js Fri Sep 20 15:35:16 2019 +0200 @@ -61,6 +61,7 @@ }; export default { + getGauge: getGauge, surveyRecency(bottleneck) { if ( bottleneck.get("revisiting_time") === null ||
--- a/client/src/lib/session.js Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/lib/session.js Fri Sep 20 15:35:16 2019 +0200 @@ -14,13 +14,32 @@ import app from "@/main"; import { unsetLayerConfigs } from "@/components/map/layers"; +import { HTTP } from "@/lib/http"; +import { displayError } from "@/lib/errors"; const logOff = () => { - app.$snotify.clear(); - app.$store.commit("reset"); - app.$store.commit("user/clearAuth"); - app.$router.push("/login"); - unsetLayerConfigs(); + const hasToken = localStorage.getItem("token"); + if (!hasToken) return; + HTTP.get("/logout", { + headers: { + "X-Gemma-Auth": localStorage.getItem("token"), + "Content-type": "text/xml; charset=UTF-8" + } + }) + .catch(error => { + const { status, data } = error.response; + displayError({ + title: this.$gettext("Backend Error"), + message: `${status}: ${data.message || data}` + }); + }) + .finally(() => { + app.$snotify.clear(); + app.$store.commit("reset"); + app.$store.commit("user/clearAuth"); + app.$router.push("/login"); + unsetLayerConfigs(); + }); }; /**
--- a/client/src/locale/bg_BG/LC_MESSAGES/app.po Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/locale/bg_BG/LC_MESSAGES/app.po Fri Sep 20 15:35:16 2019 +0200 @@ -91,7 +91,7 @@ msgid "Accesslog" msgstr "" -#: src/components/identify/Identify.vue:59 +#: src/components/identify/Identify.vue:74 msgid "According gauge data:" msgstr "" @@ -116,7 +116,7 @@ msgid "April" msgstr "" -#: src/store/map.js:214 +#: src/store/map.js:218 msgid "Area" msgstr "Район" @@ -128,15 +128,15 @@ msgid "August" msgstr "" -#: src/components/identify/Identify.vue:324 +#: src/components/identify/Identify.vue:422 msgid "Avail: Below treshold" msgstr "" -#: src/components/identify/Identify.vue:321 -msgid "Avail: Last measurement <" +#: src/components/identify/Identify.vue:414 +msgid "Avail: Latest measurement from" msgstr "" -#: src/components/identify/Identify.vue:327 +#: src/components/identify/Identify.vue:428 msgid "Avail: Latest measurement older than" msgstr "" @@ -144,17 +144,17 @@ msgid "Availability of Gauge Measurements" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:228 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:432 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:230 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:440 #: src/components/toolbar/AvailableFairwayDepth.vue:35 msgid "Available fairway depth" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:620 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:628 msgid "Available Fairway Depth" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:235 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:237 msgid "Available fairway depth vs LNWL" msgstr "" @@ -163,7 +163,7 @@ msgstr "" #: src/components/sections/SectionForm.vue:178 -#: src/components/stretches/StretchForm.vue:195 +#: src/components/stretches/StretchForm.vue:18 msgid "Back" msgstr "" @@ -172,21 +172,22 @@ msgstr "" #: src/components/Bottlenecks.vue:188 src/components/Logs.vue:163 -#: src/components/Pdftool.vue:244 src/components/Pdftool.vue:832 +#: src/components/Pdftool.vue:237 src/components/Pdftool.vue:828 #: src/components/Search.vue:260 src/components/Search.vue:299 -#: src/components/fairway/AvailableFairwayDepth.vue:149 -#: src/components/fairway/AvailableFairwayDepth.vue:245 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:520 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:551 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:146 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:253 +#: src/components/fairway/AvailableFairwayDepth.vue:168 +#: src/components/fairway/AvailableFairwayDepth.vue:271 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:528 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:559 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:167 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:280 +#: src/components/fairway/BottleneckDialogue.vue:516 +#: src/components/fairway/BottleneckDialogue.vue:657 #: src/components/fairway/Fairwayprofile.vue:312 #: src/components/fairway/Fairwayprofile.vue:706 -#: src/components/fairway/Profiles.vue:511 -#: src/components/gauge/HydrologicalConditions.vue:237 -#: src/components/gauge/HydrologicalConditions.vue:1040 -#: src/components/gauge/Waterlevel.vue:240 -#: src/components/gauge/Waterlevel.vue:1178 +#: src/components/gauge/HydrologicalConditions.vue:253 +#: src/components/gauge/HydrologicalConditions.vue:1058 +#: src/components/gauge/Waterlevel.vue:259 +#: src/components/gauge/Waterlevel.vue:1206 #: src/components/importconfiguration/Import.vue:130 #: src/components/importconfiguration/Import.vue:147 #: src/components/importconfiguration/Import.vue:166 @@ -205,19 +206,19 @@ #: src/components/importoverview/ImportOverview.vue:246 #: src/components/importoverview/ImportOverview.vue:364 #: src/components/importoverview/ImportOverview.vue:376 -#: src/components/importoverview/ImportOverview.vue:458 -#: src/components/importoverview/LogEntry.vue:160 +#: src/components/importoverview/ImportOverview.vue:459 +#: src/components/importoverview/LogEntry.vue:161 #: src/components/importoverview/SectionDetails.vue:109 -#: src/components/importoverview/StretchDetails.vue:113 -#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:213 +#: src/components/importoverview/StretchDetails.vue:140 +#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:214 #: src/components/sections/SectionForm.vue:339 #: src/components/sections/Sections.vue:170 #: src/components/sections/Sections.vue:180 #: src/components/sections/Sections.vue:222 -#: src/components/stretches/StretchForm.vue:362 -#: src/components/stretches/Stretches.vue:170 -#: src/components/stretches/Stretches.vue:180 -#: src/components/stretches/Stretches.vue:232 +#: src/components/stretches/StretchForm.vue:91 +#: src/components/stretches/Stretches.vue:194 +#: src/components/stretches/Stretches.vue:204 +#: src/components/stretches/Stretches.vue:246 #: src/components/systemconfiguration/PDFTemplates.vue:165 #: src/components/systemconfiguration/PDFTemplates.vue:254 #: src/components/systemconfiguration/PDFTemplates.vue:292 @@ -225,7 +226,7 @@ #: src/components/usermanagement/Usermanagement.vue:216 #: src/components/usermanagement/Usermanagement.vue:253 #: src/components/usermanagement/Usermanagement.vue:261 -#: src/components/usermanagement/Usermanagement.vue:302 +#: src/components/usermanagement/Usermanagement.vue:302 src/lib/session.js:32 msgid "Backend Error" msgstr "" @@ -234,7 +235,7 @@ msgid "BeamType" msgstr "Тип" -#: src/components/Pdftool.vue:718 src/components/identify/formatter.js:26 +#: src/components/Pdftool.vue:714 src/components/identify/formatter.js:26 #: src/components/importconfiguration/types/Soundingresults.vue:13 #, fuzzy msgid "Bottleneck" @@ -244,27 +245,31 @@ msgid "Bottleneck Morphology Classbreaks" msgstr "" -#: src/components/fairway/Profiles.vue:334 +#: src/components/fairway/BottleneckDialogue.vue:339 #: src/components/toolbar/Profiles.vue:35 #, fuzzy msgid "Bottleneck Surveys" msgstr "Критични участъци" +#: src/components/importoverview/SoundingResultDetail.vue:7 +#, fuzzy +msgid "Bottleneck:" +msgstr "Критични участъци" + #: src/components/Bottlenecks.vue:107 src/components/Sidebar.vue:19 #: src/components/fairway/AvailableFairwayDepthDialogue.vue:24 #: src/components/importconfiguration/ImportDetails.vue:32 msgid "Bottlenecks" msgstr "" -#: src/components/fairway/Profiles.vue:113 +#: src/components/fairway/BottleneckDialogue.vue:118 msgid "Calculating differences" msgstr "" #: src/components/Pdftool.vue:83 src/components/Popup.vue:28 -#: src/components/fairway/Profiles.vue:654 +#: src/components/fairway/BottleneckDialogue.vue:687 #: src/components/importconfiguration/Import.vue:204 -#: src/components/importoverview/ImportOverview.vue:447 -#: src/components/stretches/Stretches.vue:206 +#: src/components/importoverview/ImportOverview.vue:448 #: src/components/systemconfiguration/PDFTemplates.vue:331 #: src/components/usermanagement/Usermanagement.vue:268 msgid "Cancel" @@ -274,12 +279,15 @@ msgid "Chainage" msgstr "" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:106 +msgid "Changes need a map reload. Consider informing your users." +msgstr "" + #: src/components/sections/SectionForm.vue:251 -#: src/components/stretches/StretchForm.vue:270 msgid "Choose a distance mark by clicking on the map." msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:294 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:301 msgid "Choose color" msgstr "" @@ -295,6 +303,12 @@ msgid "Color Settings" msgstr "" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:216 +msgid "" +"Colour changes need a map reload. Value changes need a de- and re-select\n" +" of a difference calculation. Inform your users!" +msgstr "" + #: src/components/importoverview/ImportOverview.vue:17 msgid "Commit" msgstr "" @@ -303,15 +317,15 @@ msgid "Compare to" msgstr "" -#: src/components/fairway/Profiles.vue:90 +#: src/components/fairway/BottleneckDialogue.vue:95 msgid "Compare with" msgstr "" -#: src/components/identify/Identify.vue:343 +#: src/components/identify/Identify.vue:453 msgid "Confidence per 24h" msgstr "" -#: src/components/identify/Identify.vue:342 +#: src/components/identify/Identify.vue:450 msgid "Confidence per 72h" msgstr "" @@ -325,7 +339,7 @@ msgid "Confirm" msgstr "" -#: src/components/fairway/Profiles.vue:556 +#: src/components/fairway/BottleneckDialogue.vue:561 msgid "Coordinates copied to clipboard!" msgstr "" @@ -339,15 +353,11 @@ msgid "Country" msgstr "Държава" -#: src/components/stretches/StretchForm.vue:23 -msgid "Countrycode" -msgstr "" - #: src/components/importconfiguration/ScheduledImports.vue:363 msgid "Cronstring" msgstr "" -#: src/components/fairway/Profiles.vue:59 +#: src/components/fairway/BottleneckDialogue.vue:59 msgid "Current Waterlevel" msgstr "" @@ -355,21 +365,21 @@ msgid "Data Availability/Accuracy" msgstr "" -#: src/components/identify/Identify.vue:360 +#: src/components/identify/Identify.vue:483 msgid "Data too old. Treshold:" msgstr "" -#: src/components/identify/Identify.vue:357 +#: src/components/identify/Identify.vue:478 msgid "Data within revisiting treshold" msgstr "" -#: src/components/identify/Identify.vue:355 +#: src/components/identify/Identify.vue:473 msgid "Data within the revisiting time" msgstr "" #: src/components/importconfiguration/types/Soundingresults.vue:94 #: src/components/sections/Sections.vue:127 -#: src/components/stretches/Stretches.vue:127 +#: src/components/stretches/Stretches.vue:134 #: src/components/systemconfiguration/PDFTemplates.vue:120 msgid "Date" msgstr "" @@ -379,7 +389,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:144 -#: src/components/stretches/StretchForm.vue:161 msgid "Date info" msgstr "" @@ -395,10 +404,6 @@ msgid "Day" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:116 -msgid "days." -msgstr "" - #: src/components/importconfiguration/ScheduledImports.vue:1089 msgid "December" msgstr "" @@ -419,19 +424,18 @@ msgid "Define stretches" msgstr "" -#: src/components/stretches/Stretches.vue:121 +#: src/components/stretches/Stretches.vue:128 msgid "Define Stretches" msgstr "" -#: src/components/fairway/Profiles.vue:639 +#: src/components/fairway/BottleneckDialogue.vue:672 #: src/components/importconfiguration/Import.vue:182 -#: src/components/stretches/Stretches.vue:196 #: src/components/systemconfiguration/PDFTemplates.vue:308 #: src/components/usermanagement/Usermanagement.vue:242 msgid "Delete" msgstr "" -#: src/components/fairway/Profiles.vue:633 +#: src/components/fairway/BottleneckDialogue.vue:665 msgid "Delete cross profile" msgstr "" @@ -439,10 +443,6 @@ msgid "Delete Import" msgstr "" -#: src/components/stretches/Stretches.vue:188 -msgid "Delete Stretch" -msgstr "" - #: src/components/systemconfiguration/PDFTemplates.vue:300 msgid "Delete Template" msgstr "" @@ -467,8 +467,9 @@ msgid "deleted successfully" msgstr "" +#: src/components/fairway/BottleneckDialogue.vue:650 #: src/components/sections/Sections.vue:197 -#: src/components/stretches/Stretches.vue:201 +#: src/components/stretches/Stretches.vue:221 msgid "Deleting " msgstr "" @@ -476,20 +477,20 @@ msgid "Depth" msgstr "" -#: src/components/fairway/Profiles.vue:48 +#: src/components/fairway/BottleneckDialogue.vue:48 msgid "Depth Reference" msgstr "" -#: src/components/Pdftool.vue:724 +#: src/components/Pdftool.vue:720 msgid "Depth relativ to" msgstr "" #: src/components/fairway/AvailableFairwayDepthDialogue.vue:164 -msgid "Depthlimit 1 (in cm)" +msgid "Depthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:180 -msgid "Depthlimit 2 ( in cm)" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:181 +msgid "Depthlimit 2 [m]" msgstr "" #: src/components/importconfiguration/types/Soundingresults.vue:74 @@ -512,7 +513,7 @@ msgid "Distance marks virtual" msgstr "" -#: src/components/fairway/Profiles.vue:635 +#: src/components/fairway/BottleneckDialogue.vue:668 msgid "Do you really want to delete the cross profile:" msgstr "" @@ -528,11 +529,7 @@ msgid "Do you really want to delete the import with ID" msgstr "" -#: src/components/stretches/Stretches.vue:190 -msgid "Do you really want to delete this stretch:" -msgstr "" - -#: src/components/identify/Identify.vue:130 +#: src/components/identify/Identify.vue:181 msgid "Download" msgstr "" @@ -562,7 +559,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:57 -#: src/components/stretches/StretchForm.vue:74 msgid "End rhm" msgstr "" @@ -570,11 +566,11 @@ msgid "Enqueued" msgstr "" -#: src/components/fairway/Profiles.vue:175 +#: src/components/fairway/BottleneckDialogue.vue:180 msgid "Enter coordinates manually" msgstr "" -#: src/components/fairway/Profiles.vue:239 +#: src/components/fairway/BottleneckDialogue.vue:244 msgid "Enter label for cross profile" msgstr "" @@ -647,11 +643,11 @@ msgid "Fairway Dimensions" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:189 +#: src/components/fairway/AvailableFairwayDepth.vue:209 msgid "fairwayavailability" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:186 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:208 msgid "fairwayavailabilityLNWL" msgstr "" @@ -732,7 +728,7 @@ msgid "Gauge Waterlevel Date" msgstr "" -#: src/components/gauge/Gauges.vue:126 src/components/toolbar/Gauges.vue:34 +#: src/components/gauge/Gauges.vue:127 src/components/toolbar/Gauges.vue:34 msgid "Gauges" msgstr "" @@ -745,11 +741,11 @@ msgid "Generated by" msgstr "" -#: src/components/identify/Identify.vue:160 +#: src/components/identify/Identify.vue:211 msgid "Generated PDFs use font:" msgstr "" -#: src/components/identify/Identify.vue:340 +#: src/components/identify/Identify.vue:445 msgid "Highest confidence" msgstr "" @@ -761,11 +757,15 @@ msgid "Hour" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:146 +#: src/components/systemconfiguration/DataAccuracy.vue:116 +msgid "hours." +msgstr "" + +#: src/components/gauge/HydrologicalConditions.vue:150 msgid "Hydrological Conditions" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:154 +#: src/components/gauge/HydrologicalConditions.vue:159 msgid "hydrological-conditions" msgstr "" @@ -775,11 +775,10 @@ #: src/components/importconfiguration/Import.vue:252 #: src/components/sections/SectionForm.vue:5 -#: src/components/stretches/StretchForm.vue:5 msgid "ID" msgstr "" -#: src/components/identify/Identify.vue:240 src/components/map/MapPopup.vue:148 +#: src/components/identify/Identify.vue:294 src/components/map/MapPopup.vue:148 #: src/components/toolbar/Identify.vue:49 msgid "Identified Features" msgstr "" @@ -795,7 +794,7 @@ #: src/components/importconfiguration/types/Soundingresults.vue:347 #: src/components/importconfiguration/types/WaterwayProfiles.vue:187 #: src/components/sections/SectionForm.vue:328 -#: src/components/stretches/StretchForm.vue:351 +#: src/components/stretches/StretchForm.vue:83 msgid "Import" msgstr "" @@ -851,7 +850,7 @@ msgid "invalid email" msgstr "" -#: src/components/fairway/Profiles.vue:598 +#: src/components/fairway/BottleneckDialogue.vue:603 msgid "Invalid input" msgstr "" @@ -883,6 +882,12 @@ msgid "Later" msgstr "" +#: src/components/identify/Identify.vue:475 +#: src/components/identify/Identify.vue:480 +#: src/components/identify/Identify.vue:485 +msgid "Latest measurement" +msgstr "" + #: src/components/Bottlenecks.vue:116 msgid "Latest Measurement" msgstr "" @@ -900,7 +905,7 @@ msgid "Layers" msgstr "Слоеве" -#: src/store/map.js:187 +#: src/store/map.js:191 msgid "Length" msgstr "" @@ -934,7 +939,7 @@ msgid "Map" msgstr "" -#: src/components/layers/Layers.vue:71 +#: src/components/layers/Layers.vue:73 #: src/components/systemconfiguration/Systemconfiguration.vue:31 #: src/components/toolbar/Layers.vue:35 #, fuzzy @@ -949,7 +954,7 @@ msgid "Maximum retry count" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:130 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:131 msgid "MaxWidth" msgstr "" @@ -973,6 +978,15 @@ msgid "Measurement Count in Last 14 Days" msgstr "" +#: src/components/identify/Identify.vue:416 +msgid "Measurement is within" +msgstr "" + +#: src/components/identify/Identify.vue:417 +#: src/components/identify/Identify.vue:423 +msgid "measurements" +msgstr "" + #: src/components/systemconfiguration/DataAccuracy.vue:97 msgid "measurements in the last 14 days." msgstr "" @@ -991,7 +1005,7 @@ msgid "minutes past" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:109 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:110 msgid "MinWidth" msgstr "" @@ -1003,7 +1017,7 @@ msgid "month" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:622 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:630 msgid "monthly" msgstr "" @@ -1014,28 +1028,27 @@ #: src/components/Bottlenecks.vue:113 src/components/identify/formatter.js:6 #: src/components/identify/formatter.js:7 #: src/components/sections/Sections.vue:124 -#: src/components/stretches/Stretches.vue:124 +#: src/components/stretches/Stretches.vue:131 #: src/components/systemconfiguration/PDFTemplates.vue:117 #, fuzzy msgid "Name" msgstr "име" -#: src/components/identify/Identify.vue:252 -#: src/components/identify/Identify.vue:253 -#: src/components/identify/Identify.vue:254 -#: src/components/identify/Identify.vue:266 -#: src/components/identify/Identify.vue:267 -#: src/components/identify/Identify.vue:268 +#: src/components/identify/Identify.vue:317 +#: src/components/identify/Identify.vue:321 +#: src/components/identify/Identify.vue:324 +#: src/components/identify/Identify.vue:348 +#: src/components/identify/Identify.vue:352 +#: src/components/identify/Identify.vue:355 msgid "Nash-Sutcliffe" msgstr "" -#: src/components/identify/Identify.vue:255 -#: src/components/identify/Identify.vue:269 +#: src/components/identify/Identify.vue:326 +#: src/components/identify/Identify.vue:357 msgid "Nash-Sutcliffe not available" msgstr "" #: src/components/sections/SectionForm.vue:131 -#: src/components/stretches/StretchForm.vue:148 msgid "National Object name" msgstr "" @@ -1060,7 +1073,7 @@ msgid "New section" msgstr "" -#: src/components/stretches/Stretches.vue:66 +#: src/components/stretches/Stretches.vue:72 msgid "New stretch" msgstr "" @@ -1070,11 +1083,11 @@ #: src/components/fairway/Fairwayprofile.vue:92 #: src/components/gauge/HydrologicalConditions.vue:79 -#: src/components/gauge/Waterlevel.vue:78 +#: src/components/gauge/Waterlevel.vue:89 msgid "No data available." msgstr "" -#: src/components/identify/Identify.vue:122 +#: src/components/identify/Identify.vue:173 msgid "No features identified." msgstr "" @@ -1082,20 +1095,24 @@ msgid "No results." msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:270 +#: src/components/identify/Identify.vue:467 +msgid "No revisiting time defined" +msgstr "" + +#: src/components/systemconfiguration/ColorSettings.vue:272 msgid "No style-changes" msgstr "" -#: src/components/stretches/Stretches.vue:200 -msgid "Not implemented" +#: src/components/identify/Identify.vue:469 +msgid "No survey-data available" msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1088 msgid "November" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:630 -#: src/components/gauge/Waterlevel.vue:735 +#: src/components/gauge/HydrologicalConditions.vue:647 +#: src/components/gauge/Waterlevel.vue:756 msgid "Now" msgstr "" @@ -1104,7 +1121,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:114 -#: src/components/stretches/StretchForm.vue:131 msgid "Object name" msgstr "" @@ -1177,7 +1193,7 @@ msgid "pending" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:608 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:669 msgid "Percent" msgstr "" @@ -1190,17 +1206,12 @@ msgid "Please choose a role" msgstr "" -#: src/components/stretches/StretchForm.vue:34 -msgid "Please enter a countrycode" -msgstr "" - #: src/components/importconfiguration/types/Soundingresults.vue:104 #: src/components/sections/SectionForm.vue:155 -#: src/components/stretches/StretchForm.vue:172 msgid "Please enter a date" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:99 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:100 msgid "Please enter a depth" msgstr "" @@ -1216,11 +1227,11 @@ msgid "Please enter a level of service" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:143 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:144 msgid "Please enter a maximum width" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:122 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:123 msgid "Please enter a minimum width" msgstr "" @@ -1238,23 +1249,20 @@ msgstr "" #: src/components/sections/SectionForm.vue:171 -#: src/components/stretches/StretchForm.vue:188 #, fuzzy msgid "Please enter a source organization" msgstr "Моля, изберете държава" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:167 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:168 msgid "Please enter a source orgranization" msgstr "" #: src/components/sections/SectionForm.vue:51 -#: src/components/stretches/StretchForm.vue:68 msgid "Please enter a start point" msgstr "" #: src/components/importconfiguration/types/Bottleneck.vue:69 #: src/components/sections/SectionForm.vue:106 -#: src/components/stretches/StretchForm.vue:123 msgid "Please enter a tolerance value" msgstr "" @@ -1277,17 +1285,14 @@ msgstr "" #: src/components/sections/SectionForm.vue:83 -#: src/components/stretches/StretchForm.vue:100 msgid "Please enter an end point" msgstr "" #: src/components/sections/SectionForm.vue:17 -#: src/components/stretches/StretchForm.vue:17 msgid "Please enter an id" msgstr "" #: src/components/sections/SectionForm.vue:125 -#: src/components/stretches/StretchForm.vue:142 msgid "Please enter an objectname" msgstr "" @@ -1296,7 +1301,7 @@ msgid "Please enter an originator" msgstr "Моля, изберете държава" -#: src/components/fairway/Profiles.vue:599 +#: src/components/fairway/BottleneckDialogue.vue:604 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" msgstr "" @@ -1325,6 +1330,10 @@ msgid "Positive values are the upper limit for retries" msgstr "" +#: src/components/identify/Identify.vue:455 +msgid "Predictions not available" +msgstr "" + #: src/components/KeyboardHandler.vue:69 msgid "Press ESC to close compare view." msgstr "" @@ -1333,11 +1342,11 @@ msgid "Press ESC to stop drawing." msgstr "" -#: src/components/fairway/Profiles.vue:650 +#: src/components/fairway/BottleneckDialogue.vue:683 msgid "Profile deleted!" msgstr "" -#: src/components/fairway/Profiles.vue:624 +#: src/components/fairway/BottleneckDialogue.vue:629 msgid "Profile saved!" msgstr "" @@ -1345,7 +1354,7 @@ msgid "Projection" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:623 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:631 msgid "quarterly" msgstr "" @@ -1354,7 +1363,7 @@ msgid "Recency of Bottleneck Surveys" msgstr "Критични участъци" -#: src/components/Pdftool.vue:722 +#: src/components/Pdftool.vue:718 msgid "Ref gauge" msgstr "" @@ -1378,15 +1387,15 @@ msgid "Request password reset!" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:50 +#: src/components/systemconfiguration/ColorSettings.vue:56 msgid "Reset all to defaults" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:44 +#: src/components/systemconfiguration/ColorSettings.vue:49 #: src/components/systemconfiguration/DataAccuracy.vue:274 #: src/components/systemconfiguration/MapLayers.vue:58 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:101 -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:208 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:211 msgid "Reset to defaults" msgstr "" @@ -1403,7 +1412,7 @@ msgstr "" #: src/components/sections/Sections.vue:133 -#: src/components/stretches/Stretches.vue:133 +#: src/components/stretches/Stretches.vue:140 msgid "Review pending import" msgstr "" @@ -1412,12 +1421,12 @@ msgid "Role" msgstr "" -#: src/components/fairway/Profiles.vue:420 +#: src/components/fairway/BottleneckDialogue.vue:425 msgid "Rotate Maps" msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:312 -msgid "Same value is used in multiple fields. Please check" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:319 +msgid "Same value is used in multiple fields." msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1074 @@ -1429,7 +1438,7 @@ msgid "Save" msgstr "" -#: src/components/fairway/Profiles.vue:148 +#: src/components/fairway/BottleneckDialogue.vue:153 msgid "Saved cross profiles" msgstr "" @@ -1437,7 +1446,7 @@ msgid "Saved import: #" msgstr "" -#: src/components/Pdftool.vue:479 +#: src/components/Pdftool.vue:475 msgid "Scale" msgstr "" @@ -1462,13 +1471,13 @@ msgid "Sections" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:436 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:444 #: src/components/importconfiguration/types/Soundingresults.vue:400 #, fuzzy msgid "Select bottleneck" msgstr "Критични участъци" -#: src/components/fairway/Profiles.vue:21 +#: src/components/fairway/BottleneckDialogue.vue:21 msgid "Select Bottleneck" msgstr "" @@ -1476,23 +1485,23 @@ msgid "Select Gauge" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:439 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:447 msgid "Select section" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:438 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:446 msgid "Select stretch" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:38 +#: src/components/systemconfiguration/ColorSettings.vue:43 #: src/components/systemconfiguration/DataAccuracy.vue:271 #: src/components/systemconfiguration/MapLayers.vue:55 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:95 -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:202 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:205 msgid "Send" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:55 +#: src/components/systemconfiguration/ColorSettings.vue:61 msgid "Send all" msgstr "" @@ -1504,7 +1513,7 @@ msgid "September" msgstr "" -#: src/components/fairway/Profiles.vue:123 +#: src/components/fairway/BottleneckDialogue.vue:128 msgid "Show differences" msgstr "" @@ -1512,7 +1521,7 @@ msgid "Show Hydrological Conditions" msgstr "" -#: src/components/fairway/Profiles.vue:120 +#: src/components/fairway/BottleneckDialogue.vue:125 msgid "Show survey" msgstr "" @@ -1528,7 +1537,7 @@ msgid "Simple" msgstr "" -#: src/components/identify/Identify.vue:147 +#: src/components/identify/Identify.vue:198 msgid "" "Some data ©\n" " <a href=\"https://www.openstreetmap.org/copyright\">%{ name }</a>\n" @@ -1547,7 +1556,7 @@ msgid "Sounding Result" msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:109 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:112 msgid "Sounding Result Comparison" msgstr "" @@ -1555,35 +1564,38 @@ msgid "Soundingresults" msgstr "" +#: src/components/importoverview/FairwayDimensionDetail.vue:8 +msgid "Source" +msgstr "" + #: src/components/sections/Sections.vue:130 -#: src/components/stretches/Stretches.vue:130 +#: src/components/stretches/Stretches.vue:137 msgid "Source organization" msgstr "" #: src/components/identify/formatter.js:35 #: src/components/sections/SectionForm.vue:161 -#: src/components/stretches/StretchForm.vue:178 msgid "Source Organization" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:154 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:155 msgid "Source orgranization" msgstr "" -#: src/components/identify/Identify.vue:144 +#: src/components/identify/Identify.vue:195 msgid "source-code" msgstr "" #: src/components/sections/Sections.vue:196 +#: src/components/stretches/Stretches.vue:220 msgid "Staging Area" msgstr "" -#: src/components/fairway/Profiles.vue:194 +#: src/components/fairway/BottleneckDialogue.vue:199 msgid "Start" msgstr "" #: src/components/sections/SectionForm.vue:25 -#: src/components/stretches/StretchForm.vue:42 msgid "Start rhm" msgstr "" @@ -1599,10 +1611,6 @@ msgid "Starting import of section" msgstr "" -#: src/components/stretches/StretchForm.vue:352 -msgid "Starting import of stretch" -msgstr "" - #: src/components/importoverview/ImportOverview.vue:196 msgid "Status" msgstr "" @@ -1618,11 +1626,11 @@ #: src/components/importconfiguration/types/ApprovedGaugeMeasurement.vue:66 #: src/components/importconfiguration/types/WaterwayProfiles.vue:113 #: src/components/sections/SectionForm.vue:185 -#: src/components/stretches/StretchForm.vue:202 +#: src/components/stretches/StretchForm.vue:26 msgid "Submit" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:652 +#: src/components/fairway/AvailableFairwayDepth.vue:727 msgid "Sum of days" msgstr "" @@ -1630,14 +1638,19 @@ msgid "Sunday" msgstr "" -#: src/components/fairway/Profiles.vue:72 +#: src/components/fairway/BottleneckDialogue.vue:72 +#: src/components/fairway/BottleneckDialogue.vue:648 msgid "Survey" msgstr "" -#: src/components/Pdftool.vue:720 +#: src/components/Pdftool.vue:716 msgid "Survey date" msgstr "" +#: src/components/importoverview/SoundingResultDetail.vue:11 +msgid "Survey from:" +msgstr "" + #: src/components/map/MapPopup.vue:165 msgid "Surveys" msgstr "" @@ -1735,26 +1748,27 @@ msgid "The provided template has no name property." msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:331 -msgid "There are invalid classbreak values. Please check" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:338 +msgid "There are invalid classbreak values." msgstr "" #: src/components/systemconfiguration/DataAccuracy.vue:88 msgid "There are less than" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:193 -#: src/components/fairway/AvailableFairwayDepth.vue:217 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:190 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:206 -#: src/components/fairway/Profiles.vue:423 +#: src/components/fairway/AvailableFairwayDepth.vue:213 +#: src/components/fairway/AvailableFairwayDepth.vue:233 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:212 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:223 +#: src/components/fairway/BottleneckDialogue.vue:428 #: src/components/importconfiguration/types/Soundingresults.vue:232 #: src/components/importconfiguration/types/Soundingresults.vue:251 #: src/components/layers/Layerselect.vue:68 +#: src/components/stretches/StretchForm.vue:56 msgid "this" msgstr "" -#: src/components/identify/Identify.vue:138 +#: src/components/identify/Identify.vue:189 msgid "" "This app uses <i>gemma</i>, which is Free Software under <br/>\n" " %{ license } without warranty, see docs for details." @@ -1781,7 +1795,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:89 -#: src/components/stretches/StretchForm.vue:106 msgid "Tolerance for snapping to axis" msgstr "" @@ -1820,6 +1833,10 @@ msgid "Upload new map template" msgstr "" +#: src/components/stretches/StretchForm.vue:84 +msgid "Upload of stretch complete" +msgstr "" + #: src/components/systemconfiguration/PDFTemplates.vue:183 msgid "Uploaded file does not contain valid json data." msgstr "" @@ -1842,8 +1859,8 @@ msgid "URL" msgstr "" -#: src/components/identify/Identify.vue:134 -#: src/components/identify/Identify.vue:243 +#: src/components/identify/Identify.vue:185 +#: src/components/identify/Identify.vue:297 msgid "User Manual" msgstr "" @@ -1860,7 +1877,7 @@ msgid "Users" msgstr "" -#: src/components/identify/Identify.vue:153 +#: src/components/identify/Identify.vue:204 msgid "" "Uses\n" " <a href=\"https://download.geonames.org/export/dump/readme.txt" @@ -1880,17 +1897,17 @@ msgid "warning" msgstr "" -#: src/components/fairway/Profiles.vue:41 -#: src/components/gauge/Waterlevel.vue:150 +#: src/components/fairway/BottleneckDialogue.vue:41 +#: src/components/gauge/Waterlevel.vue:169 msgid "Waterlevel" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:663 -#: src/components/gauge/Waterlevel.vue:613 +#: src/components/gauge/HydrologicalConditions.vue:680 +#: src/components/gauge/Waterlevel.vue:634 msgid "Waterlevel [m]" msgstr "" -#: src/components/gauge/Waterlevel.vue:170 +#: src/components/gauge/Waterlevel.vue:180 msgid "waterlevels" msgstr "" @@ -1948,19 +1965,19 @@ msgid "Weekly" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:194 -msgid "Widthlimit 1" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:196 +msgid "Widthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:210 -msgid "Widthlimit 2" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:212 +msgid "Widthlimit 2 [m]" msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1066 msgid "year" msgstr "Година" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:624 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:632 #, fuzzy msgid "yearly" msgstr "Година" @@ -1970,7 +1987,7 @@ msgid "yes" msgstr "Слоеве" -#: src/components/fairway/Profiles.vue:625 +#: src/components/fairway/BottleneckDialogue.vue:630 msgid "" "You can now select these coordinates from the \"Saved cross profiles\" menu " "to restore this cross profile."
--- a/client/src/locale/de_AT/LC_MESSAGES/app.po Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/locale/de_AT/LC_MESSAGES/app.po Fri Sep 20 15:35:16 2019 +0200 @@ -92,7 +92,7 @@ msgid "Accesslog" msgstr "Zugriffs-Protokoll" -#: src/components/identify/Identify.vue:59 +#: src/components/identify/Identify.vue:74 msgid "According gauge data:" msgstr "" @@ -118,7 +118,7 @@ msgid "April" msgstr "April" -#: src/store/map.js:214 +#: src/store/map.js:218 msgid "Area" msgstr "Fläche" @@ -130,16 +130,16 @@ msgid "August" msgstr "August" -#: src/components/identify/Identify.vue:324 +#: src/components/identify/Identify.vue:422 msgid "Avail: Below treshold" msgstr "" -#: src/components/identify/Identify.vue:321 +#: src/components/identify/Identify.vue:414 #, fuzzy -msgid "Avail: Last measurement <" +msgid "Avail: Latest measurement from" msgstr "Messung" -#: src/components/identify/Identify.vue:327 +#: src/components/identify/Identify.vue:428 #, fuzzy msgid "Avail: Latest measurement older than" msgstr "Messung" @@ -149,19 +149,19 @@ msgid "Availability of Gauge Measurements" msgstr "Messung" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:228 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:432 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:230 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:440 #: src/components/toolbar/AvailableFairwayDepth.vue:35 #, fuzzy msgid "Available fairway depth" msgstr "Verfügbare Fahrrinnen Tiefen" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:620 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:628 #, fuzzy msgid "Available Fairway Depth" msgstr "Verfügbare Fahrrinnen Tiefen" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:235 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:237 #, fuzzy msgid "Available fairway depth vs LNWL" msgstr "Verfügbare Fahrrinnen Tiefen" @@ -172,7 +172,7 @@ msgstr "Verfügbare Fahrrinnen Tiefen" #: src/components/sections/SectionForm.vue:178 -#: src/components/stretches/StretchForm.vue:195 +#: src/components/stretches/StretchForm.vue:18 msgid "Back" msgstr "" @@ -181,21 +181,22 @@ msgstr "zurück zur Anmeldung" #: src/components/Bottlenecks.vue:188 src/components/Logs.vue:163 -#: src/components/Pdftool.vue:244 src/components/Pdftool.vue:832 +#: src/components/Pdftool.vue:237 src/components/Pdftool.vue:828 #: src/components/Search.vue:260 src/components/Search.vue:299 -#: src/components/fairway/AvailableFairwayDepth.vue:149 -#: src/components/fairway/AvailableFairwayDepth.vue:245 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:520 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:551 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:146 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:253 +#: src/components/fairway/AvailableFairwayDepth.vue:168 +#: src/components/fairway/AvailableFairwayDepth.vue:271 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:528 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:559 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:167 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:280 +#: src/components/fairway/BottleneckDialogue.vue:516 +#: src/components/fairway/BottleneckDialogue.vue:657 #: src/components/fairway/Fairwayprofile.vue:312 #: src/components/fairway/Fairwayprofile.vue:706 -#: src/components/fairway/Profiles.vue:511 -#: src/components/gauge/HydrologicalConditions.vue:237 -#: src/components/gauge/HydrologicalConditions.vue:1040 -#: src/components/gauge/Waterlevel.vue:240 -#: src/components/gauge/Waterlevel.vue:1178 +#: src/components/gauge/HydrologicalConditions.vue:253 +#: src/components/gauge/HydrologicalConditions.vue:1058 +#: src/components/gauge/Waterlevel.vue:259 +#: src/components/gauge/Waterlevel.vue:1206 #: src/components/importconfiguration/Import.vue:130 #: src/components/importconfiguration/Import.vue:147 #: src/components/importconfiguration/Import.vue:166 @@ -214,19 +215,19 @@ #: src/components/importoverview/ImportOverview.vue:246 #: src/components/importoverview/ImportOverview.vue:364 #: src/components/importoverview/ImportOverview.vue:376 -#: src/components/importoverview/ImportOverview.vue:458 -#: src/components/importoverview/LogEntry.vue:160 +#: src/components/importoverview/ImportOverview.vue:459 +#: src/components/importoverview/LogEntry.vue:161 #: src/components/importoverview/SectionDetails.vue:109 -#: src/components/importoverview/StretchDetails.vue:113 -#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:213 +#: src/components/importoverview/StretchDetails.vue:140 +#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:214 #: src/components/sections/SectionForm.vue:339 #: src/components/sections/Sections.vue:170 #: src/components/sections/Sections.vue:180 #: src/components/sections/Sections.vue:222 -#: src/components/stretches/StretchForm.vue:362 -#: src/components/stretches/Stretches.vue:170 -#: src/components/stretches/Stretches.vue:180 -#: src/components/stretches/Stretches.vue:232 +#: src/components/stretches/StretchForm.vue:91 +#: src/components/stretches/Stretches.vue:194 +#: src/components/stretches/Stretches.vue:204 +#: src/components/stretches/Stretches.vue:246 #: src/components/systemconfiguration/PDFTemplates.vue:165 #: src/components/systemconfiguration/PDFTemplates.vue:254 #: src/components/systemconfiguration/PDFTemplates.vue:292 @@ -234,7 +235,7 @@ #: src/components/usermanagement/Usermanagement.vue:216 #: src/components/usermanagement/Usermanagement.vue:253 #: src/components/usermanagement/Usermanagement.vue:261 -#: src/components/usermanagement/Usermanagement.vue:302 +#: src/components/usermanagement/Usermanagement.vue:302 src/lib/session.js:32 msgid "Backend Error" msgstr "Server-Fehler" @@ -243,7 +244,7 @@ msgid "BeamType" msgstr "Typ" -#: src/components/Pdftool.vue:718 src/components/identify/formatter.js:26 +#: src/components/Pdftool.vue:714 src/components/identify/formatter.js:26 #: src/components/importconfiguration/types/Soundingresults.vue:13 msgid "Bottleneck" msgstr "Seichtstelle" @@ -252,27 +253,31 @@ msgid "Bottleneck Morphology Classbreaks" msgstr "" -#: src/components/fairway/Profiles.vue:334 +#: src/components/fairway/BottleneckDialogue.vue:339 #: src/components/toolbar/Profiles.vue:35 #, fuzzy msgid "Bottleneck Surveys" msgstr "Seichtstellen" +#: src/components/importoverview/SoundingResultDetail.vue:7 +#, fuzzy +msgid "Bottleneck:" +msgstr "Seichtstelle" + #: src/components/Bottlenecks.vue:107 src/components/Sidebar.vue:19 #: src/components/fairway/AvailableFairwayDepthDialogue.vue:24 #: src/components/importconfiguration/ImportDetails.vue:32 msgid "Bottlenecks" msgstr "Seichtstellen" -#: src/components/fairway/Profiles.vue:113 +#: src/components/fairway/BottleneckDialogue.vue:118 msgid "Calculating differences" msgstr "" #: src/components/Pdftool.vue:83 src/components/Popup.vue:28 -#: src/components/fairway/Profiles.vue:654 +#: src/components/fairway/BottleneckDialogue.vue:687 #: src/components/importconfiguration/Import.vue:204 -#: src/components/importoverview/ImportOverview.vue:447 -#: src/components/stretches/Stretches.vue:206 +#: src/components/importoverview/ImportOverview.vue:448 #: src/components/systemconfiguration/PDFTemplates.vue:331 #: src/components/usermanagement/Usermanagement.vue:268 #, fuzzy @@ -283,12 +288,15 @@ msgid "Chainage" msgstr "Kilometrierung" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:106 +msgid "Changes need a map reload. Consider informing your users." +msgstr "" + #: src/components/sections/SectionForm.vue:251 -#: src/components/stretches/StretchForm.vue:270 msgid "Choose a distance mark by clicking on the map." msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:294 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:301 msgid "Choose color" msgstr "" @@ -304,6 +312,12 @@ msgid "Color Settings" msgstr "" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:216 +msgid "" +"Colour changes need a map reload. Value changes need a de- and re-select\n" +" of a difference calculation. Inform your users!" +msgstr "" + #: src/components/importoverview/ImportOverview.vue:17 msgid "Commit" msgstr "" @@ -313,15 +327,15 @@ msgid "Compare to" msgstr "Vergleiche mit" -#: src/components/fairway/Profiles.vue:90 +#: src/components/fairway/BottleneckDialogue.vue:95 msgid "Compare with" msgstr "Vergleiche mit" -#: src/components/identify/Identify.vue:343 +#: src/components/identify/Identify.vue:453 msgid "Confidence per 24h" msgstr "" -#: src/components/identify/Identify.vue:342 +#: src/components/identify/Identify.vue:450 msgid "Confidence per 72h" msgstr "" @@ -335,7 +349,7 @@ msgid "Confirm" msgstr "Bestätigen" -#: src/components/fairway/Profiles.vue:556 +#: src/components/fairway/BottleneckDialogue.vue:561 msgid "Coordinates copied to clipboard!" msgstr "Koordinaten auf die Zwischenablage kopiert!" @@ -348,16 +362,11 @@ msgid "Country" msgstr "Land" -#: src/components/stretches/StretchForm.vue:23 -#, fuzzy -msgid "Countrycode" -msgstr "Landeskennung" - #: src/components/importconfiguration/ScheduledImports.vue:363 msgid "Cronstring" msgstr "Crontab-Zeile" -#: src/components/fairway/Profiles.vue:59 +#: src/components/fairway/BottleneckDialogue.vue:59 msgid "Current Waterlevel" msgstr "" @@ -365,21 +374,21 @@ msgid "Data Availability/Accuracy" msgstr "" -#: src/components/identify/Identify.vue:360 +#: src/components/identify/Identify.vue:483 msgid "Data too old. Treshold:" msgstr "" -#: src/components/identify/Identify.vue:357 +#: src/components/identify/Identify.vue:478 msgid "Data within revisiting treshold" msgstr "" -#: src/components/identify/Identify.vue:355 +#: src/components/identify/Identify.vue:473 msgid "Data within the revisiting time" msgstr "" #: src/components/importconfiguration/types/Soundingresults.vue:94 #: src/components/sections/Sections.vue:127 -#: src/components/stretches/Stretches.vue:127 +#: src/components/stretches/Stretches.vue:134 #: src/components/systemconfiguration/PDFTemplates.vue:120 msgid "Date" msgstr "Datum" @@ -390,7 +399,6 @@ msgstr "Datum" #: src/components/sections/SectionForm.vue:144 -#: src/components/stretches/StretchForm.vue:161 msgid "Date info" msgstr "Datum" @@ -408,10 +416,6 @@ msgid "Day" msgstr "Tag" -#: src/components/systemconfiguration/DataAccuracy.vue:116 -msgid "days." -msgstr "" - #: src/components/importconfiguration/ScheduledImports.vue:1089 msgid "December" msgstr "Dezember" @@ -432,20 +436,19 @@ msgid "Define stretches" msgstr "" -#: src/components/stretches/Stretches.vue:121 +#: src/components/stretches/Stretches.vue:128 msgid "Define Stretches" msgstr "" -#: src/components/fairway/Profiles.vue:639 +#: src/components/fairway/BottleneckDialogue.vue:672 #: src/components/importconfiguration/Import.vue:182 -#: src/components/stretches/Stretches.vue:196 #: src/components/systemconfiguration/PDFTemplates.vue:308 #: src/components/usermanagement/Usermanagement.vue:242 #, fuzzy msgid "Delete" msgstr "Konto löschen" -#: src/components/fairway/Profiles.vue:633 +#: src/components/fairway/BottleneckDialogue.vue:665 #, fuzzy msgid "Delete cross profile" msgstr "Gespeicherte Profile" @@ -455,11 +458,6 @@ msgid "Delete Import" msgstr "Neuer Import" -#: src/components/stretches/Stretches.vue:188 -#, fuzzy -msgid "Delete Stretch" -msgstr "Konto löschen" - #: src/components/systemconfiguration/PDFTemplates.vue:300 #, fuzzy msgid "Delete Template" @@ -488,8 +486,9 @@ msgid "deleted successfully" msgstr "Erfolgreich" +#: src/components/fairway/BottleneckDialogue.vue:650 #: src/components/sections/Sections.vue:197 -#: src/components/stretches/Stretches.vue:201 +#: src/components/stretches/Stretches.vue:221 msgid "Deleting " msgstr "Löchen " @@ -497,21 +496,21 @@ msgid "Depth" msgstr "Tiefe" -#: src/components/fairway/Profiles.vue:48 +#: src/components/fairway/BottleneckDialogue.vue:48 #, fuzzy msgid "Depth Reference" msgstr "Tiefenreferenz" -#: src/components/Pdftool.vue:724 +#: src/components/Pdftool.vue:720 msgid "Depth relativ to" msgstr "" #: src/components/fairway/AvailableFairwayDepthDialogue.vue:164 -msgid "Depthlimit 1 (in cm)" +msgid "Depthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:180 -msgid "Depthlimit 2 ( in cm)" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:181 +msgid "Depthlimit 2 [m]" msgstr "" #: src/components/importconfiguration/types/Soundingresults.vue:74 @@ -534,7 +533,7 @@ msgid "Distance marks virtual" msgstr "" -#: src/components/fairway/Profiles.vue:635 +#: src/components/fairway/BottleneckDialogue.vue:668 msgid "Do you really want to delete the cross profile:" msgstr "" @@ -550,11 +549,7 @@ msgid "Do you really want to delete the import with ID" msgstr "" -#: src/components/stretches/Stretches.vue:190 -msgid "Do you really want to delete this stretch:" -msgstr "" - -#: src/components/identify/Identify.vue:130 +#: src/components/identify/Identify.vue:181 msgid "Download" msgstr "Herunterladen" @@ -583,7 +578,6 @@ msgstr "E-Mail Benachrichtigung" #: src/components/sections/SectionForm.vue:57 -#: src/components/stretches/StretchForm.vue:74 msgid "End rhm" msgstr "" @@ -591,11 +585,11 @@ msgid "Enqueued" msgstr "Hinzugefügt" -#: src/components/fairway/Profiles.vue:175 +#: src/components/fairway/BottleneckDialogue.vue:180 msgid "Enter coordinates manually" msgstr "Manuelle Koordinateneingabe" -#: src/components/fairway/Profiles.vue:239 +#: src/components/fairway/BottleneckDialogue.vue:244 msgid "Enter label for cross profile" msgstr "Namen für Profilschnitt eingeben" @@ -674,11 +668,11 @@ msgid "Fairway Dimensions" msgstr "Fahrrinnenbreite" -#: src/components/fairway/AvailableFairwayDepth.vue:189 +#: src/components/fairway/AvailableFairwayDepth.vue:209 msgid "fairwayavailability" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:186 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:208 msgid "fairwayavailabilityLNWL" msgstr "" @@ -763,7 +757,7 @@ msgid "Gauge Waterlevel Date" msgstr "" -#: src/components/gauge/Gauges.vue:126 src/components/toolbar/Gauges.vue:34 +#: src/components/gauge/Gauges.vue:127 src/components/toolbar/Gauges.vue:34 msgid "Gauges" msgstr "" @@ -777,12 +771,12 @@ msgid "Generated by" msgstr "– erstellt von:" -#: src/components/identify/Identify.vue:160 +#: src/components/identify/Identify.vue:211 #, fuzzy msgid "Generated PDFs use font:" msgstr "PDF generieren" -#: src/components/identify/Identify.vue:340 +#: src/components/identify/Identify.vue:445 msgid "Highest confidence" msgstr "" @@ -794,11 +788,16 @@ msgid "Hour" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:146 +#: src/components/systemconfiguration/DataAccuracy.vue:116 +#, fuzzy +msgid "hours." +msgstr "Stunde" + +#: src/components/gauge/HydrologicalConditions.vue:150 msgid "Hydrological Conditions" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:154 +#: src/components/gauge/HydrologicalConditions.vue:159 msgid "hydrological-conditions" msgstr "" @@ -808,11 +807,10 @@ #: src/components/importconfiguration/Import.vue:252 #: src/components/sections/SectionForm.vue:5 -#: src/components/stretches/StretchForm.vue:5 msgid "ID" msgstr "ID" -#: src/components/identify/Identify.vue:240 src/components/map/MapPopup.vue:148 +#: src/components/identify/Identify.vue:294 src/components/map/MapPopup.vue:148 #: src/components/toolbar/Identify.vue:49 #, fuzzy msgid "Identified Features" @@ -829,7 +827,7 @@ #: src/components/importconfiguration/types/Soundingresults.vue:347 #: src/components/importconfiguration/types/WaterwayProfiles.vue:187 #: src/components/sections/SectionForm.vue:328 -#: src/components/stretches/StretchForm.vue:351 +#: src/components/stretches/StretchForm.vue:83 msgid "Import" msgstr "Daten-Import" @@ -892,7 +890,7 @@ msgid "invalid email" msgstr "Ungültige E-Mail" -#: src/components/fairway/Profiles.vue:598 +#: src/components/fairway/BottleneckDialogue.vue:603 msgid "Invalid input" msgstr "Ungültige Eingabe" @@ -925,6 +923,13 @@ msgid "Later" msgstr "Neueste" +#: src/components/identify/Identify.vue:475 +#: src/components/identify/Identify.vue:480 +#: src/components/identify/Identify.vue:485 +#, fuzzy +msgid "Latest measurement" +msgstr "Messung" + #: src/components/Bottlenecks.vue:116 #, fuzzy msgid "Latest Measurement" @@ -945,7 +950,7 @@ msgid "Layers" msgstr "Ebenen" -#: src/store/map.js:187 +#: src/store/map.js:191 msgid "Length" msgstr "Länge" @@ -979,7 +984,7 @@ msgid "Map" msgstr "Karte" -#: src/components/layers/Layers.vue:71 +#: src/components/layers/Layers.vue:73 #: src/components/systemconfiguration/Systemconfiguration.vue:31 #: src/components/toolbar/Layers.vue:35 #, fuzzy @@ -994,7 +999,7 @@ msgid "Maximum retry count" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:130 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:131 msgid "MaxWidth" msgstr "Max. Breite" @@ -1019,6 +1024,17 @@ msgid "Measurement Count in Last 14 Days" msgstr "" +#: src/components/identify/Identify.vue:416 +#, fuzzy +msgid "Measurement is within" +msgstr "Messung" + +#: src/components/identify/Identify.vue:417 +#: src/components/identify/Identify.vue:423 +#, fuzzy +msgid "measurements" +msgstr "Messung" + #: src/components/systemconfiguration/DataAccuracy.vue:97 msgid "measurements in the last 14 days." msgstr "" @@ -1037,7 +1053,7 @@ msgid "minutes past" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:109 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:110 msgid "MinWidth" msgstr "Min. Breite" @@ -1049,7 +1065,7 @@ msgid "month" msgstr "Monat" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:622 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:630 #, fuzzy msgid "monthly" msgstr "monatlich" @@ -1061,27 +1077,26 @@ #: src/components/Bottlenecks.vue:113 src/components/identify/formatter.js:6 #: src/components/identify/formatter.js:7 #: src/components/sections/Sections.vue:124 -#: src/components/stretches/Stretches.vue:124 +#: src/components/stretches/Stretches.vue:131 #: src/components/systemconfiguration/PDFTemplates.vue:117 msgid "Name" msgstr "Name" -#: src/components/identify/Identify.vue:252 -#: src/components/identify/Identify.vue:253 -#: src/components/identify/Identify.vue:254 -#: src/components/identify/Identify.vue:266 -#: src/components/identify/Identify.vue:267 -#: src/components/identify/Identify.vue:268 +#: src/components/identify/Identify.vue:317 +#: src/components/identify/Identify.vue:321 +#: src/components/identify/Identify.vue:324 +#: src/components/identify/Identify.vue:348 +#: src/components/identify/Identify.vue:352 +#: src/components/identify/Identify.vue:355 msgid "Nash-Sutcliffe" msgstr "" -#: src/components/identify/Identify.vue:255 -#: src/components/identify/Identify.vue:269 +#: src/components/identify/Identify.vue:326 +#: src/components/identify/Identify.vue:357 msgid "Nash-Sutcliffe not available" msgstr "" #: src/components/sections/SectionForm.vue:131 -#: src/components/stretches/StretchForm.vue:148 #, fuzzy msgid "National Object name" msgstr "Narionaler Objektname" @@ -1108,7 +1123,7 @@ msgid "New section" msgstr "" -#: src/components/stretches/Stretches.vue:66 +#: src/components/stretches/Stretches.vue:72 msgid "New stretch" msgstr "" @@ -1118,11 +1133,11 @@ #: src/components/fairway/Fairwayprofile.vue:92 #: src/components/gauge/HydrologicalConditions.vue:79 -#: src/components/gauge/Waterlevel.vue:78 +#: src/components/gauge/Waterlevel.vue:89 msgid "No data available." msgstr "" -#: src/components/identify/Identify.vue:122 +#: src/components/identify/Identify.vue:173 msgid "No features identified." msgstr "Keine Objekte identifiziert." @@ -1130,21 +1145,24 @@ msgid "No results." msgstr "Keine Ergebnisse." -#: src/components/systemconfiguration/ColorSettings.vue:270 +#: src/components/identify/Identify.vue:467 +msgid "No revisiting time defined" +msgstr "" + +#: src/components/systemconfiguration/ColorSettings.vue:272 msgid "No style-changes" msgstr "" -#: src/components/stretches/Stretches.vue:200 -#, fuzzy -msgid "Not implemented" -msgstr "Nicht implementiert" +#: src/components/identify/Identify.vue:469 +msgid "No survey-data available" +msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1088 msgid "November" msgstr "November" -#: src/components/gauge/HydrologicalConditions.vue:630 -#: src/components/gauge/Waterlevel.vue:735 +#: src/components/gauge/HydrologicalConditions.vue:647 +#: src/components/gauge/Waterlevel.vue:756 msgid "Now" msgstr "" @@ -1154,7 +1172,6 @@ msgstr "Uhr" #: src/components/sections/SectionForm.vue:114 -#: src/components/stretches/StretchForm.vue:131 msgid "Object name" msgstr "" @@ -1231,7 +1248,7 @@ msgid "pending" msgstr "Ausstehend" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:608 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:669 msgid "Percent" msgstr "" @@ -1243,18 +1260,12 @@ msgid "Please choose a role" msgstr "Bitte wählen Sie eine Rolle aus" -#: src/components/stretches/StretchForm.vue:34 -#, fuzzy -msgid "Please enter a countrycode" -msgstr "Bitte ein Datum eingeben" - #: src/components/importconfiguration/types/Soundingresults.vue:104 #: src/components/sections/SectionForm.vue:155 -#: src/components/stretches/StretchForm.vue:172 msgid "Please enter a date" msgstr "Bitte ein Datum eingeben" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:99 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:100 #, fuzzy msgid "Please enter a depth" msgstr "Bitte ein Datum eingeben" @@ -1273,12 +1284,12 @@ msgid "Please enter a level of service" msgstr "Bitte ein Höhenreferenzsystem eingeben" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:143 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:144 #, fuzzy msgid "Please enter a maximum width" msgstr "Bitte ein Datum eingeben" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:122 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:123 #, fuzzy msgid "Please enter a minimum width" msgstr "Bitte ein Datum eingeben" @@ -1298,24 +1309,21 @@ msgstr "Bitte ein Höhenreferenzsystem eingeben" #: src/components/sections/SectionForm.vue:171 -#: src/components/stretches/StretchForm.vue:188 #, fuzzy msgid "Please enter a source organization" msgstr "Bitte eine Quelle eingeben" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:167 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:168 msgid "Please enter a source orgranization" msgstr "" #: src/components/sections/SectionForm.vue:51 -#: src/components/stretches/StretchForm.vue:68 #, fuzzy msgid "Please enter a start point" msgstr "Bitte einen Startpunkt eingeben" #: src/components/importconfiguration/types/Bottleneck.vue:69 #: src/components/sections/SectionForm.vue:106 -#: src/components/stretches/StretchForm.vue:123 #, fuzzy msgid "Please enter a tolerance value" msgstr "Bitte einen Nutzernamen eingeben" @@ -1341,19 +1349,16 @@ msgstr "Bitte einen Nutzernamen eingeben" #: src/components/sections/SectionForm.vue:83 -#: src/components/stretches/StretchForm.vue:100 #, fuzzy msgid "Please enter an end point" msgstr "Bitte einen Endpunkt eingeben" #: src/components/sections/SectionForm.vue:17 -#: src/components/stretches/StretchForm.vue:17 #, fuzzy msgid "Please enter an id" msgstr "Bitte ein Id eingeben" #: src/components/sections/SectionForm.vue:125 -#: src/components/stretches/StretchForm.vue:142 msgid "Please enter an objectname" msgstr "" @@ -1362,7 +1367,7 @@ msgid "Please enter an originator" msgstr "Bitte einen Endpunkt eingeben" -#: src/components/fairway/Profiles.vue:599 +#: src/components/fairway/BottleneckDialogue.vue:604 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" msgstr "" "Bitte geben Sie die Koordinaten in folgendem Format an: Lat,Lon,Lat,Lon" @@ -1392,6 +1397,10 @@ msgid "Positive values are the upper limit for retries" msgstr "" +#: src/components/identify/Identify.vue:455 +msgid "Predictions not available" +msgstr "" + #: src/components/KeyboardHandler.vue:69 msgid "Press ESC to close compare view." msgstr "" @@ -1400,11 +1409,11 @@ msgid "Press ESC to stop drawing." msgstr "" -#: src/components/fairway/Profiles.vue:650 +#: src/components/fairway/BottleneckDialogue.vue:683 msgid "Profile deleted!" msgstr "Profil gelöscht!" -#: src/components/fairway/Profiles.vue:624 +#: src/components/fairway/BottleneckDialogue.vue:629 msgid "Profile saved!" msgstr "Profil gespeichert!" @@ -1412,7 +1421,7 @@ msgid "Projection" msgstr "Projektion" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:623 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:631 msgid "quarterly" msgstr "" @@ -1421,7 +1430,7 @@ msgid "Recency of Bottleneck Surveys" msgstr "Seichtstellen" -#: src/components/Pdftool.vue:722 +#: src/components/Pdftool.vue:718 msgid "Ref gauge" msgstr "" @@ -1447,15 +1456,15 @@ msgid "Request password reset!" msgstr "Passwort-Zurücksetzung anfragen!" -#: src/components/systemconfiguration/ColorSettings.vue:50 +#: src/components/systemconfiguration/ColorSettings.vue:56 msgid "Reset all to defaults" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:44 +#: src/components/systemconfiguration/ColorSettings.vue:49 #: src/components/systemconfiguration/DataAccuracy.vue:274 #: src/components/systemconfiguration/MapLayers.vue:58 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:101 -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:208 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:211 msgid "Reset to defaults" msgstr "" @@ -1472,7 +1481,7 @@ msgstr "" #: src/components/sections/Sections.vue:133 -#: src/components/stretches/Stretches.vue:133 +#: src/components/stretches/Stretches.vue:140 msgid "Review pending import" msgstr "" @@ -1481,12 +1490,12 @@ msgid "Role" msgstr "Rolle" -#: src/components/fairway/Profiles.vue:420 +#: src/components/fairway/BottleneckDialogue.vue:425 msgid "Rotate Maps" msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:312 -msgid "Same value is used in multiple fields. Please check" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:319 +msgid "Same value is used in multiple fields." msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1074 @@ -1498,7 +1507,7 @@ msgid "Save" msgstr "" -#: src/components/fairway/Profiles.vue:148 +#: src/components/fairway/BottleneckDialogue.vue:153 msgid "Saved cross profiles" msgstr "Gespeicherte Profile" @@ -1507,7 +1516,7 @@ msgid "Saved import: #" msgstr "Neuer Import" -#: src/components/Pdftool.vue:479 +#: src/components/Pdftool.vue:475 msgid "Scale" msgstr "" @@ -1535,13 +1544,13 @@ msgid "Sections" msgstr "Projektion" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:436 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:444 #: src/components/importconfiguration/types/Soundingresults.vue:400 #, fuzzy msgid "Select bottleneck" msgstr "Wähle Seichtstelle" -#: src/components/fairway/Profiles.vue:21 +#: src/components/fairway/BottleneckDialogue.vue:21 msgid "Select Bottleneck" msgstr "Wähle Seichtstelle" @@ -1549,24 +1558,24 @@ msgid "Select Gauge" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:439 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:447 msgid "Select section" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:438 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:446 #, fuzzy msgid "Select stretch" msgstr "Konto löschen" -#: src/components/systemconfiguration/ColorSettings.vue:38 +#: src/components/systemconfiguration/ColorSettings.vue:43 #: src/components/systemconfiguration/DataAccuracy.vue:271 #: src/components/systemconfiguration/MapLayers.vue:55 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:95 -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:202 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:205 msgid "Send" msgstr "Absenden" -#: src/components/systemconfiguration/ColorSettings.vue:55 +#: src/components/systemconfiguration/ColorSettings.vue:61 #, fuzzy msgid "Send all" msgstr "Test-E-Mail versenden" @@ -1579,7 +1588,7 @@ msgid "September" msgstr "September" -#: src/components/fairway/Profiles.vue:123 +#: src/components/fairway/BottleneckDialogue.vue:128 msgid "Show differences" msgstr "" @@ -1587,7 +1596,7 @@ msgid "Show Hydrological Conditions" msgstr "" -#: src/components/fairway/Profiles.vue:120 +#: src/components/fairway/BottleneckDialogue.vue:125 msgid "Show survey" msgstr "" @@ -1604,7 +1613,7 @@ msgid "Simple" msgstr "" -#: src/components/identify/Identify.vue:147 +#: src/components/identify/Identify.vue:198 msgid "" "Some data ©\n" " <a href=\"https://www.openstreetmap.org/copyright\">%{ name }</a>\n" @@ -1625,7 +1634,7 @@ msgid "Sounding Result" msgstr "Seichtstellenvermessung" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:109 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:112 #, fuzzy msgid "Sounding Result Comparison" msgstr "Seichtstellenvermessung" @@ -1635,37 +1644,40 @@ msgid "Soundingresults" msgstr "Seichtstellenvermessung" +#: src/components/importoverview/FairwayDimensionDetail.vue:8 +msgid "Source" +msgstr "" + #: src/components/sections/Sections.vue:130 -#: src/components/stretches/Stretches.vue:130 +#: src/components/stretches/Stretches.vue:137 #, fuzzy msgid "Source organization" msgstr "Bitte ein Datum eingeben" #: src/components/identify/formatter.js:35 #: src/components/sections/SectionForm.vue:161 -#: src/components/stretches/StretchForm.vue:178 #, fuzzy msgid "Source Organization" msgstr "Bitte ein Datum eingeben" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:154 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:155 msgid "Source orgranization" msgstr "" -#: src/components/identify/Identify.vue:144 +#: src/components/identify/Identify.vue:195 msgid "source-code" msgstr "Quelltext" #: src/components/sections/Sections.vue:196 +#: src/components/stretches/Stretches.vue:220 msgid "Staging Area" msgstr "Import-Überprüfung" -#: src/components/fairway/Profiles.vue:194 +#: src/components/fairway/BottleneckDialogue.vue:199 msgid "Start" msgstr "Start" #: src/components/sections/SectionForm.vue:25 -#: src/components/stretches/StretchForm.vue:42 #, fuzzy msgid "Start rhm" msgstr "Start" @@ -1683,11 +1695,6 @@ msgid "Starting import of section" msgstr "Import gestartet " -#: src/components/stretches/StretchForm.vue:352 -#, fuzzy -msgid "Starting import of stretch" -msgstr "Import gestartet " - #: src/components/importoverview/ImportOverview.vue:196 #, fuzzy msgid "Status" @@ -1706,11 +1713,11 @@ #: src/components/importconfiguration/types/ApprovedGaugeMeasurement.vue:66 #: src/components/importconfiguration/types/WaterwayProfiles.vue:113 #: src/components/sections/SectionForm.vue:185 -#: src/components/stretches/StretchForm.vue:202 +#: src/components/stretches/StretchForm.vue:26 msgid "Submit" msgstr "Abschicken" -#: src/components/fairway/AvailableFairwayDepth.vue:652 +#: src/components/fairway/AvailableFairwayDepth.vue:727 msgid "Sum of days" msgstr "" @@ -1718,14 +1725,19 @@ msgid "Sunday" msgstr "Sonntag" -#: src/components/fairway/Profiles.vue:72 +#: src/components/fairway/BottleneckDialogue.vue:72 +#: src/components/fairway/BottleneckDialogue.vue:648 msgid "Survey" msgstr "" -#: src/components/Pdftool.vue:720 +#: src/components/Pdftool.vue:716 msgid "Survey date" msgstr "" +#: src/components/importoverview/SoundingResultDetail.vue:11 +msgid "Survey from:" +msgstr "" + #: src/components/map/MapPopup.vue:165 msgid "Surveys" msgstr "" @@ -1825,26 +1837,27 @@ msgid "The provided template has no name property." msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:331 -msgid "There are invalid classbreak values. Please check" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:338 +msgid "There are invalid classbreak values." msgstr "" #: src/components/systemconfiguration/DataAccuracy.vue:88 msgid "There are less than" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:193 -#: src/components/fairway/AvailableFairwayDepth.vue:217 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:190 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:206 -#: src/components/fairway/Profiles.vue:423 +#: src/components/fairway/AvailableFairwayDepth.vue:213 +#: src/components/fairway/AvailableFairwayDepth.vue:233 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:212 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:223 +#: src/components/fairway/BottleneckDialogue.vue:428 #: src/components/importconfiguration/types/Soundingresults.vue:232 #: src/components/importconfiguration/types/Soundingresults.vue:251 #: src/components/layers/Layerselect.vue:68 +#: src/components/stretches/StretchForm.vue:56 msgid "this" msgstr "" -#: src/components/identify/Identify.vue:138 +#: src/components/identify/Identify.vue:189 msgid "" "This app uses <i>gemma</i>, which is Free Software under <br/>\n" " %{ license } without warranty, see docs for details." @@ -1871,7 +1884,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:89 -#: src/components/stretches/StretchForm.vue:106 msgid "Tolerance for snapping to axis" msgstr "" @@ -1911,6 +1923,10 @@ msgid "Upload new map template" msgstr "" +#: src/components/stretches/StretchForm.vue:84 +msgid "Upload of stretch complete" +msgstr "" + #: src/components/systemconfiguration/PDFTemplates.vue:183 msgid "Uploaded file does not contain valid json data." msgstr "" @@ -1933,8 +1949,8 @@ msgid "URL" msgstr "" -#: src/components/identify/Identify.vue:134 -#: src/components/identify/Identify.vue:243 +#: src/components/identify/Identify.vue:185 +#: src/components/identify/Identify.vue:297 #, fuzzy msgid "User Manual" msgstr "Benutzername" @@ -1952,7 +1968,7 @@ msgid "Users" msgstr "Benutzer" -#: src/components/identify/Identify.vue:153 +#: src/components/identify/Identify.vue:204 msgid "" "Uses\n" " <a href=\"https://download.geonames.org/export/dump/readme.txt" @@ -1976,17 +1992,17 @@ msgid "warning" msgstr "" -#: src/components/fairway/Profiles.vue:41 -#: src/components/gauge/Waterlevel.vue:150 +#: src/components/fairway/BottleneckDialogue.vue:41 +#: src/components/gauge/Waterlevel.vue:169 msgid "Waterlevel" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:663 -#: src/components/gauge/Waterlevel.vue:613 +#: src/components/gauge/HydrologicalConditions.vue:680 +#: src/components/gauge/Waterlevel.vue:634 msgid "Waterlevel [m]" msgstr "" -#: src/components/gauge/Waterlevel.vue:170 +#: src/components/gauge/Waterlevel.vue:180 msgid "waterlevels" msgstr "" @@ -2051,19 +2067,19 @@ msgid "Weekly" msgstr "wöchentlich" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:194 -msgid "Widthlimit 1" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:196 +msgid "Widthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:210 -msgid "Widthlimit 2" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:212 +msgid "Widthlimit 2 [m]" msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1066 msgid "year" msgstr "Jahr" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:624 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:632 #, fuzzy msgid "yearly" msgstr "Jahr" @@ -2073,7 +2089,7 @@ msgid "yes" msgstr "Ebenen" -#: src/components/fairway/Profiles.vue:625 +#: src/components/fairway/BottleneckDialogue.vue:630 msgid "" "You can now select these coordinates from the \"Saved cross profiles\" menu " "to restore this cross profile." @@ -2081,6 +2097,30 @@ "Sie können diese Koordinaten aus dem \"Gespeicherte Profile\"-Menü " "auswählen, um diesen Profilschnitt wieder herzustellen." +#, fuzzy +#~ msgid "Delete survey" +#~ msgstr "Konto löschen" + +#, fuzzy +#~ msgid "Not implemented" +#~ msgstr "Nicht implementiert" + +#, fuzzy +#~ msgid "Countrycode" +#~ msgstr "Landeskennung" + +#, fuzzy +#~ msgid "Delete Stretch" +#~ msgstr "Konto löschen" + +#, fuzzy +#~ msgid "Please enter a countrycode" +#~ msgstr "Bitte ein Datum eingeben" + +#, fuzzy +#~ msgid "Starting import of stretch" +#~ msgstr "Import gestartet " + #~ msgid "Bottleneck Areas fill-color" #~ msgstr "Flächenfüllfarbe Seichtstelle"
--- a/client/src/locale/en_GB/LC_MESSAGES/app.po Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/locale/en_GB/LC_MESSAGES/app.po Fri Sep 20 15:35:16 2019 +0200 @@ -89,7 +89,7 @@ msgid "Accesslog" msgstr "" -#: src/components/identify/Identify.vue:59 +#: src/components/identify/Identify.vue:74 msgid "According gauge data:" msgstr "" @@ -114,7 +114,7 @@ msgid "April" msgstr "" -#: src/store/map.js:214 +#: src/store/map.js:218 msgid "Area" msgstr "" @@ -126,15 +126,15 @@ msgid "August" msgstr "" -#: src/components/identify/Identify.vue:324 +#: src/components/identify/Identify.vue:422 msgid "Avail: Below treshold" msgstr "" -#: src/components/identify/Identify.vue:321 -msgid "Avail: Last measurement <" +#: src/components/identify/Identify.vue:414 +msgid "Avail: Latest measurement from" msgstr "" -#: src/components/identify/Identify.vue:327 +#: src/components/identify/Identify.vue:428 msgid "Avail: Latest measurement older than" msgstr "" @@ -142,17 +142,17 @@ msgid "Availability of Gauge Measurements" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:228 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:432 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:230 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:440 #: src/components/toolbar/AvailableFairwayDepth.vue:35 msgid "Available fairway depth" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:620 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:628 msgid "Available Fairway Depth" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:235 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:237 msgid "Available fairway depth vs LNWL" msgstr "" @@ -161,7 +161,7 @@ msgstr "" #: src/components/sections/SectionForm.vue:178 -#: src/components/stretches/StretchForm.vue:195 +#: src/components/stretches/StretchForm.vue:18 msgid "Back" msgstr "" @@ -170,21 +170,22 @@ msgstr "" #: src/components/Bottlenecks.vue:188 src/components/Logs.vue:163 -#: src/components/Pdftool.vue:244 src/components/Pdftool.vue:832 +#: src/components/Pdftool.vue:237 src/components/Pdftool.vue:828 #: src/components/Search.vue:260 src/components/Search.vue:299 -#: src/components/fairway/AvailableFairwayDepth.vue:149 -#: src/components/fairway/AvailableFairwayDepth.vue:245 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:520 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:551 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:146 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:253 +#: src/components/fairway/AvailableFairwayDepth.vue:168 +#: src/components/fairway/AvailableFairwayDepth.vue:271 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:528 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:559 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:167 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:280 +#: src/components/fairway/BottleneckDialogue.vue:516 +#: src/components/fairway/BottleneckDialogue.vue:657 #: src/components/fairway/Fairwayprofile.vue:312 #: src/components/fairway/Fairwayprofile.vue:706 -#: src/components/fairway/Profiles.vue:511 -#: src/components/gauge/HydrologicalConditions.vue:237 -#: src/components/gauge/HydrologicalConditions.vue:1040 -#: src/components/gauge/Waterlevel.vue:240 -#: src/components/gauge/Waterlevel.vue:1178 +#: src/components/gauge/HydrologicalConditions.vue:253 +#: src/components/gauge/HydrologicalConditions.vue:1058 +#: src/components/gauge/Waterlevel.vue:259 +#: src/components/gauge/Waterlevel.vue:1206 #: src/components/importconfiguration/Import.vue:130 #: src/components/importconfiguration/Import.vue:147 #: src/components/importconfiguration/Import.vue:166 @@ -203,19 +204,19 @@ #: src/components/importoverview/ImportOverview.vue:246 #: src/components/importoverview/ImportOverview.vue:364 #: src/components/importoverview/ImportOverview.vue:376 -#: src/components/importoverview/ImportOverview.vue:458 -#: src/components/importoverview/LogEntry.vue:160 +#: src/components/importoverview/ImportOverview.vue:459 +#: src/components/importoverview/LogEntry.vue:161 #: src/components/importoverview/SectionDetails.vue:109 -#: src/components/importoverview/StretchDetails.vue:113 -#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:213 +#: src/components/importoverview/StretchDetails.vue:140 +#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:214 #: src/components/sections/SectionForm.vue:339 #: src/components/sections/Sections.vue:170 #: src/components/sections/Sections.vue:180 #: src/components/sections/Sections.vue:222 -#: src/components/stretches/StretchForm.vue:362 -#: src/components/stretches/Stretches.vue:170 -#: src/components/stretches/Stretches.vue:180 -#: src/components/stretches/Stretches.vue:232 +#: src/components/stretches/StretchForm.vue:91 +#: src/components/stretches/Stretches.vue:194 +#: src/components/stretches/Stretches.vue:204 +#: src/components/stretches/Stretches.vue:246 #: src/components/systemconfiguration/PDFTemplates.vue:165 #: src/components/systemconfiguration/PDFTemplates.vue:254 #: src/components/systemconfiguration/PDFTemplates.vue:292 @@ -223,7 +224,7 @@ #: src/components/usermanagement/Usermanagement.vue:216 #: src/components/usermanagement/Usermanagement.vue:253 #: src/components/usermanagement/Usermanagement.vue:261 -#: src/components/usermanagement/Usermanagement.vue:302 +#: src/components/usermanagement/Usermanagement.vue:302 src/lib/session.js:32 msgid "Backend Error" msgstr "" @@ -231,7 +232,7 @@ msgid "BeamType" msgstr "" -#: src/components/Pdftool.vue:718 src/components/identify/formatter.js:26 +#: src/components/Pdftool.vue:714 src/components/identify/formatter.js:26 #: src/components/importconfiguration/types/Soundingresults.vue:13 msgid "Bottleneck" msgstr "" @@ -240,26 +241,29 @@ msgid "Bottleneck Morphology Classbreaks" msgstr "" -#: src/components/fairway/Profiles.vue:334 +#: src/components/fairway/BottleneckDialogue.vue:339 #: src/components/toolbar/Profiles.vue:35 msgid "Bottleneck Surveys" msgstr "" +#: src/components/importoverview/SoundingResultDetail.vue:7 +msgid "Bottleneck:" +msgstr "" + #: src/components/Bottlenecks.vue:107 src/components/Sidebar.vue:19 #: src/components/fairway/AvailableFairwayDepthDialogue.vue:24 #: src/components/importconfiguration/ImportDetails.vue:32 msgid "Bottlenecks" msgstr "" -#: src/components/fairway/Profiles.vue:113 +#: src/components/fairway/BottleneckDialogue.vue:118 msgid "Calculating differences" msgstr "" #: src/components/Pdftool.vue:83 src/components/Popup.vue:28 -#: src/components/fairway/Profiles.vue:654 +#: src/components/fairway/BottleneckDialogue.vue:687 #: src/components/importconfiguration/Import.vue:204 -#: src/components/importoverview/ImportOverview.vue:447 -#: src/components/stretches/Stretches.vue:206 +#: src/components/importoverview/ImportOverview.vue:448 #: src/components/systemconfiguration/PDFTemplates.vue:331 #: src/components/usermanagement/Usermanagement.vue:268 msgid "Cancel" @@ -269,12 +273,15 @@ msgid "Chainage" msgstr "" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:106 +msgid "Changes need a map reload. Consider informing your users." +msgstr "" + #: src/components/sections/SectionForm.vue:251 -#: src/components/stretches/StretchForm.vue:270 msgid "Choose a distance mark by clicking on the map." msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:294 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:301 msgid "Choose color" msgstr "" @@ -290,6 +297,12 @@ msgid "Color Settings" msgstr "" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:216 +msgid "" +"Colour changes need a map reload. Value changes need a de- and re-select\n" +" of a difference calculation. Inform your users!" +msgstr "" + #: src/components/importoverview/ImportOverview.vue:17 msgid "Commit" msgstr "" @@ -298,15 +311,15 @@ msgid "Compare to" msgstr "" -#: src/components/fairway/Profiles.vue:90 +#: src/components/fairway/BottleneckDialogue.vue:95 msgid "Compare with" msgstr "" -#: src/components/identify/Identify.vue:343 +#: src/components/identify/Identify.vue:453 msgid "Confidence per 24h" msgstr "" -#: src/components/identify/Identify.vue:342 +#: src/components/identify/Identify.vue:450 msgid "Confidence per 72h" msgstr "" @@ -320,7 +333,7 @@ msgid "Confirm" msgstr "" -#: src/components/fairway/Profiles.vue:556 +#: src/components/fairway/BottleneckDialogue.vue:561 msgid "Coordinates copied to clipboard!" msgstr "" @@ -333,15 +346,11 @@ msgid "Country" msgstr "" -#: src/components/stretches/StretchForm.vue:23 -msgid "Countrycode" -msgstr "" - #: src/components/importconfiguration/ScheduledImports.vue:363 msgid "Cronstring" msgstr "" -#: src/components/fairway/Profiles.vue:59 +#: src/components/fairway/BottleneckDialogue.vue:59 msgid "Current Waterlevel" msgstr "" @@ -349,21 +358,21 @@ msgid "Data Availability/Accuracy" msgstr "" -#: src/components/identify/Identify.vue:360 +#: src/components/identify/Identify.vue:483 msgid "Data too old. Treshold:" msgstr "" -#: src/components/identify/Identify.vue:357 +#: src/components/identify/Identify.vue:478 msgid "Data within revisiting treshold" msgstr "" -#: src/components/identify/Identify.vue:355 +#: src/components/identify/Identify.vue:473 msgid "Data within the revisiting time" msgstr "" #: src/components/importconfiguration/types/Soundingresults.vue:94 #: src/components/sections/Sections.vue:127 -#: src/components/stretches/Stretches.vue:127 +#: src/components/stretches/Stretches.vue:134 #: src/components/systemconfiguration/PDFTemplates.vue:120 msgid "Date" msgstr "" @@ -373,7 +382,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:144 -#: src/components/stretches/StretchForm.vue:161 msgid "Date info" msgstr "" @@ -389,10 +397,6 @@ msgid "Day" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:116 -msgid "days." -msgstr "" - #: src/components/importconfiguration/ScheduledImports.vue:1089 msgid "December" msgstr "" @@ -413,19 +417,18 @@ msgid "Define stretches" msgstr "" -#: src/components/stretches/Stretches.vue:121 +#: src/components/stretches/Stretches.vue:128 msgid "Define Stretches" msgstr "" -#: src/components/fairway/Profiles.vue:639 +#: src/components/fairway/BottleneckDialogue.vue:672 #: src/components/importconfiguration/Import.vue:182 -#: src/components/stretches/Stretches.vue:196 #: src/components/systemconfiguration/PDFTemplates.vue:308 #: src/components/usermanagement/Usermanagement.vue:242 msgid "Delete" msgstr "" -#: src/components/fairway/Profiles.vue:633 +#: src/components/fairway/BottleneckDialogue.vue:665 msgid "Delete cross profile" msgstr "" @@ -433,10 +436,6 @@ msgid "Delete Import" msgstr "" -#: src/components/stretches/Stretches.vue:188 -msgid "Delete Stretch" -msgstr "" - #: src/components/systemconfiguration/PDFTemplates.vue:300 msgid "Delete Template" msgstr "" @@ -461,8 +460,9 @@ msgid "deleted successfully" msgstr "" +#: src/components/fairway/BottleneckDialogue.vue:650 #: src/components/sections/Sections.vue:197 -#: src/components/stretches/Stretches.vue:201 +#: src/components/stretches/Stretches.vue:221 msgid "Deleting " msgstr "" @@ -470,20 +470,20 @@ msgid "Depth" msgstr "" -#: src/components/fairway/Profiles.vue:48 +#: src/components/fairway/BottleneckDialogue.vue:48 msgid "Depth Reference" msgstr "" -#: src/components/Pdftool.vue:724 +#: src/components/Pdftool.vue:720 msgid "Depth relativ to" msgstr "" #: src/components/fairway/AvailableFairwayDepthDialogue.vue:164 -msgid "Depthlimit 1 (in cm)" +msgid "Depthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:180 -msgid "Depthlimit 2 ( in cm)" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:181 +msgid "Depthlimit 2 [m]" msgstr "" #: src/components/importconfiguration/types/Soundingresults.vue:74 @@ -506,7 +506,7 @@ msgid "Distance marks virtual" msgstr "" -#: src/components/fairway/Profiles.vue:635 +#: src/components/fairway/BottleneckDialogue.vue:668 msgid "Do you really want to delete the cross profile:" msgstr "" @@ -522,11 +522,7 @@ msgid "Do you really want to delete the import with ID" msgstr "" -#: src/components/stretches/Stretches.vue:190 -msgid "Do you really want to delete this stretch:" -msgstr "" - -#: src/components/identify/Identify.vue:130 +#: src/components/identify/Identify.vue:181 msgid "Download" msgstr "" @@ -555,7 +551,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:57 -#: src/components/stretches/StretchForm.vue:74 msgid "End rhm" msgstr "" @@ -563,11 +558,11 @@ msgid "Enqueued" msgstr "" -#: src/components/fairway/Profiles.vue:175 +#: src/components/fairway/BottleneckDialogue.vue:180 msgid "Enter coordinates manually" msgstr "" -#: src/components/fairway/Profiles.vue:239 +#: src/components/fairway/BottleneckDialogue.vue:244 msgid "Enter label for cross profile" msgstr "" @@ -640,11 +635,11 @@ msgid "Fairway Dimensions" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:189 +#: src/components/fairway/AvailableFairwayDepth.vue:209 msgid "fairwayavailability" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:186 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:208 msgid "fairwayavailabilityLNWL" msgstr "" @@ -725,7 +720,7 @@ msgid "Gauge Waterlevel Date" msgstr "" -#: src/components/gauge/Gauges.vue:126 src/components/toolbar/Gauges.vue:34 +#: src/components/gauge/Gauges.vue:127 src/components/toolbar/Gauges.vue:34 msgid "Gauges" msgstr "" @@ -738,11 +733,11 @@ msgid "Generated by" msgstr "" -#: src/components/identify/Identify.vue:160 +#: src/components/identify/Identify.vue:211 msgid "Generated PDFs use font:" msgstr "" -#: src/components/identify/Identify.vue:340 +#: src/components/identify/Identify.vue:445 msgid "Highest confidence" msgstr "" @@ -754,11 +749,15 @@ msgid "Hour" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:146 +#: src/components/systemconfiguration/DataAccuracy.vue:116 +msgid "hours." +msgstr "" + +#: src/components/gauge/HydrologicalConditions.vue:150 msgid "Hydrological Conditions" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:154 +#: src/components/gauge/HydrologicalConditions.vue:159 msgid "hydrological-conditions" msgstr "" @@ -768,11 +767,10 @@ #: src/components/importconfiguration/Import.vue:252 #: src/components/sections/SectionForm.vue:5 -#: src/components/stretches/StretchForm.vue:5 msgid "ID" msgstr "" -#: src/components/identify/Identify.vue:240 src/components/map/MapPopup.vue:148 +#: src/components/identify/Identify.vue:294 src/components/map/MapPopup.vue:148 #: src/components/toolbar/Identify.vue:49 msgid "Identified Features" msgstr "" @@ -788,7 +786,7 @@ #: src/components/importconfiguration/types/Soundingresults.vue:347 #: src/components/importconfiguration/types/WaterwayProfiles.vue:187 #: src/components/sections/SectionForm.vue:328 -#: src/components/stretches/StretchForm.vue:351 +#: src/components/stretches/StretchForm.vue:83 msgid "Import" msgstr "" @@ -844,7 +842,7 @@ msgid "invalid email" msgstr "" -#: src/components/fairway/Profiles.vue:598 +#: src/components/fairway/BottleneckDialogue.vue:603 msgid "Invalid input" msgstr "" @@ -876,6 +874,12 @@ msgid "Later" msgstr "" +#: src/components/identify/Identify.vue:475 +#: src/components/identify/Identify.vue:480 +#: src/components/identify/Identify.vue:485 +msgid "Latest measurement" +msgstr "" + #: src/components/Bottlenecks.vue:116 msgid "Latest Measurement" msgstr "" @@ -892,7 +896,7 @@ msgid "Layers" msgstr "" -#: src/store/map.js:187 +#: src/store/map.js:191 msgid "Length" msgstr "" @@ -926,7 +930,7 @@ msgid "Map" msgstr "" -#: src/components/layers/Layers.vue:71 +#: src/components/layers/Layers.vue:73 #: src/components/systemconfiguration/Systemconfiguration.vue:31 #: src/components/toolbar/Layers.vue:35 msgid "Map Layers" @@ -940,7 +944,7 @@ msgid "Maximum retry count" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:130 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:131 msgid "MaxWidth" msgstr "" @@ -964,6 +968,15 @@ msgid "Measurement Count in Last 14 Days" msgstr "" +#: src/components/identify/Identify.vue:416 +msgid "Measurement is within" +msgstr "" + +#: src/components/identify/Identify.vue:417 +#: src/components/identify/Identify.vue:423 +msgid "measurements" +msgstr "" + #: src/components/systemconfiguration/DataAccuracy.vue:97 msgid "measurements in the last 14 days." msgstr "" @@ -982,7 +995,7 @@ msgid "minutes past" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:109 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:110 msgid "MinWidth" msgstr "" @@ -994,7 +1007,7 @@ msgid "month" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:622 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:630 msgid "monthly" msgstr "" @@ -1005,27 +1018,26 @@ #: src/components/Bottlenecks.vue:113 src/components/identify/formatter.js:6 #: src/components/identify/formatter.js:7 #: src/components/sections/Sections.vue:124 -#: src/components/stretches/Stretches.vue:124 +#: src/components/stretches/Stretches.vue:131 #: src/components/systemconfiguration/PDFTemplates.vue:117 msgid "Name" msgstr "" -#: src/components/identify/Identify.vue:252 -#: src/components/identify/Identify.vue:253 -#: src/components/identify/Identify.vue:254 -#: src/components/identify/Identify.vue:266 -#: src/components/identify/Identify.vue:267 -#: src/components/identify/Identify.vue:268 +#: src/components/identify/Identify.vue:317 +#: src/components/identify/Identify.vue:321 +#: src/components/identify/Identify.vue:324 +#: src/components/identify/Identify.vue:348 +#: src/components/identify/Identify.vue:352 +#: src/components/identify/Identify.vue:355 msgid "Nash-Sutcliffe" msgstr "" -#: src/components/identify/Identify.vue:255 -#: src/components/identify/Identify.vue:269 +#: src/components/identify/Identify.vue:326 +#: src/components/identify/Identify.vue:357 msgid "Nash-Sutcliffe not available" msgstr "" #: src/components/sections/SectionForm.vue:131 -#: src/components/stretches/StretchForm.vue:148 msgid "National Object name" msgstr "" @@ -1050,7 +1062,7 @@ msgid "New section" msgstr "" -#: src/components/stretches/Stretches.vue:66 +#: src/components/stretches/Stretches.vue:72 msgid "New stretch" msgstr "" @@ -1060,11 +1072,11 @@ #: src/components/fairway/Fairwayprofile.vue:92 #: src/components/gauge/HydrologicalConditions.vue:79 -#: src/components/gauge/Waterlevel.vue:78 +#: src/components/gauge/Waterlevel.vue:89 msgid "No data available." msgstr "" -#: src/components/identify/Identify.vue:122 +#: src/components/identify/Identify.vue:173 msgid "No features identified." msgstr "" @@ -1072,20 +1084,24 @@ msgid "No results." msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:270 +#: src/components/identify/Identify.vue:467 +msgid "No revisiting time defined" +msgstr "" + +#: src/components/systemconfiguration/ColorSettings.vue:272 msgid "No style-changes" msgstr "" -#: src/components/stretches/Stretches.vue:200 -msgid "Not implemented" +#: src/components/identify/Identify.vue:469 +msgid "No survey-data available" msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1088 msgid "November" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:630 -#: src/components/gauge/Waterlevel.vue:735 +#: src/components/gauge/HydrologicalConditions.vue:647 +#: src/components/gauge/Waterlevel.vue:756 msgid "Now" msgstr "" @@ -1094,7 +1110,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:114 -#: src/components/stretches/StretchForm.vue:131 msgid "Object name" msgstr "" @@ -1167,7 +1182,7 @@ msgid "pending" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:608 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:669 msgid "Percent" msgstr "" @@ -1179,17 +1194,12 @@ msgid "Please choose a role" msgstr "" -#: src/components/stretches/StretchForm.vue:34 -msgid "Please enter a countrycode" -msgstr "" - #: src/components/importconfiguration/types/Soundingresults.vue:104 #: src/components/sections/SectionForm.vue:155 -#: src/components/stretches/StretchForm.vue:172 msgid "Please enter a date" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:99 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:100 msgid "Please enter a depth" msgstr "" @@ -1205,11 +1215,11 @@ msgid "Please enter a level of service" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:143 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:144 msgid "Please enter a maximum width" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:122 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:123 msgid "Please enter a minimum width" msgstr "" @@ -1227,22 +1237,19 @@ msgstr "" #: src/components/sections/SectionForm.vue:171 -#: src/components/stretches/StretchForm.vue:188 msgid "Please enter a source organization" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:167 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:168 msgid "Please enter a source orgranization" msgstr "" #: src/components/sections/SectionForm.vue:51 -#: src/components/stretches/StretchForm.vue:68 msgid "Please enter a start point" msgstr "" #: src/components/importconfiguration/types/Bottleneck.vue:69 #: src/components/sections/SectionForm.vue:106 -#: src/components/stretches/StretchForm.vue:123 msgid "Please enter a tolerance value" msgstr "" @@ -1265,17 +1272,14 @@ msgstr "" #: src/components/sections/SectionForm.vue:83 -#: src/components/stretches/StretchForm.vue:100 msgid "Please enter an end point" msgstr "" #: src/components/sections/SectionForm.vue:17 -#: src/components/stretches/StretchForm.vue:17 msgid "Please enter an id" msgstr "" #: src/components/sections/SectionForm.vue:125 -#: src/components/stretches/StretchForm.vue:142 msgid "Please enter an objectname" msgstr "" @@ -1283,7 +1287,7 @@ msgid "Please enter an originator" msgstr "" -#: src/components/fairway/Profiles.vue:599 +#: src/components/fairway/BottleneckDialogue.vue:604 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" msgstr "" @@ -1312,6 +1316,10 @@ msgid "Positive values are the upper limit for retries" msgstr "" +#: src/components/identify/Identify.vue:455 +msgid "Predictions not available" +msgstr "" + #: src/components/KeyboardHandler.vue:69 msgid "Press ESC to close compare view." msgstr "" @@ -1320,11 +1328,11 @@ msgid "Press ESC to stop drawing." msgstr "" -#: src/components/fairway/Profiles.vue:650 +#: src/components/fairway/BottleneckDialogue.vue:683 msgid "Profile deleted!" msgstr "" -#: src/components/fairway/Profiles.vue:624 +#: src/components/fairway/BottleneckDialogue.vue:629 msgid "Profile saved!" msgstr "" @@ -1332,7 +1340,7 @@ msgid "Projection" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:623 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:631 msgid "quarterly" msgstr "" @@ -1340,7 +1348,7 @@ msgid "Recency of Bottleneck Surveys" msgstr "" -#: src/components/Pdftool.vue:722 +#: src/components/Pdftool.vue:718 msgid "Ref gauge" msgstr "" @@ -1364,15 +1372,15 @@ msgid "Request password reset!" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:50 +#: src/components/systemconfiguration/ColorSettings.vue:56 msgid "Reset all to defaults" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:44 +#: src/components/systemconfiguration/ColorSettings.vue:49 #: src/components/systemconfiguration/DataAccuracy.vue:274 #: src/components/systemconfiguration/MapLayers.vue:58 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:101 -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:208 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:211 msgid "Reset to defaults" msgstr "" @@ -1389,7 +1397,7 @@ msgstr "" #: src/components/sections/Sections.vue:133 -#: src/components/stretches/Stretches.vue:133 +#: src/components/stretches/Stretches.vue:140 msgid "Review pending import" msgstr "" @@ -1398,12 +1406,12 @@ msgid "Role" msgstr "" -#: src/components/fairway/Profiles.vue:420 +#: src/components/fairway/BottleneckDialogue.vue:425 msgid "Rotate Maps" msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:312 -msgid "Same value is used in multiple fields. Please check" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:319 +msgid "Same value is used in multiple fields." msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1074 @@ -1415,7 +1423,7 @@ msgid "Save" msgstr "" -#: src/components/fairway/Profiles.vue:148 +#: src/components/fairway/BottleneckDialogue.vue:153 msgid "Saved cross profiles" msgstr "" @@ -1423,7 +1431,7 @@ msgid "Saved import: #" msgstr "" -#: src/components/Pdftool.vue:479 +#: src/components/Pdftool.vue:475 msgid "Scale" msgstr "" @@ -1448,12 +1456,12 @@ msgid "Sections" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:436 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:444 #: src/components/importconfiguration/types/Soundingresults.vue:400 msgid "Select bottleneck" msgstr "" -#: src/components/fairway/Profiles.vue:21 +#: src/components/fairway/BottleneckDialogue.vue:21 msgid "Select Bottleneck" msgstr "" @@ -1461,23 +1469,23 @@ msgid "Select Gauge" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:439 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:447 msgid "Select section" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:438 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:446 msgid "Select stretch" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:38 +#: src/components/systemconfiguration/ColorSettings.vue:43 #: src/components/systemconfiguration/DataAccuracy.vue:271 #: src/components/systemconfiguration/MapLayers.vue:55 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:95 -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:202 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:205 msgid "Send" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:55 +#: src/components/systemconfiguration/ColorSettings.vue:61 msgid "Send all" msgstr "" @@ -1489,7 +1497,7 @@ msgid "September" msgstr "" -#: src/components/fairway/Profiles.vue:123 +#: src/components/fairway/BottleneckDialogue.vue:128 msgid "Show differences" msgstr "" @@ -1497,7 +1505,7 @@ msgid "Show Hydrological Conditions" msgstr "" -#: src/components/fairway/Profiles.vue:120 +#: src/components/fairway/BottleneckDialogue.vue:125 msgid "Show survey" msgstr "" @@ -1513,7 +1521,7 @@ msgid "Simple" msgstr "" -#: src/components/identify/Identify.vue:147 +#: src/components/identify/Identify.vue:198 msgid "" "Some data ©\n" " <a href=\"https://www.openstreetmap.org/copyright\">%{ name }</a>\n" @@ -1532,7 +1540,7 @@ msgid "Sounding Result" msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:109 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:112 msgid "Sounding Result Comparison" msgstr "" @@ -1540,35 +1548,38 @@ msgid "Soundingresults" msgstr "" +#: src/components/importoverview/FairwayDimensionDetail.vue:8 +msgid "Source" +msgstr "" + #: src/components/sections/Sections.vue:130 -#: src/components/stretches/Stretches.vue:130 +#: src/components/stretches/Stretches.vue:137 msgid "Source organization" msgstr "" #: src/components/identify/formatter.js:35 #: src/components/sections/SectionForm.vue:161 -#: src/components/stretches/StretchForm.vue:178 msgid "Source Organization" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:154 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:155 msgid "Source orgranization" msgstr "" -#: src/components/identify/Identify.vue:144 +#: src/components/identify/Identify.vue:195 msgid "source-code" msgstr "" #: src/components/sections/Sections.vue:196 +#: src/components/stretches/Stretches.vue:220 msgid "Staging Area" msgstr "" -#: src/components/fairway/Profiles.vue:194 +#: src/components/fairway/BottleneckDialogue.vue:199 msgid "Start" msgstr "" #: src/components/sections/SectionForm.vue:25 -#: src/components/stretches/StretchForm.vue:42 msgid "Start rhm" msgstr "" @@ -1584,10 +1595,6 @@ msgid "Starting import of section" msgstr "" -#: src/components/stretches/StretchForm.vue:352 -msgid "Starting import of stretch" -msgstr "" - #: src/components/importoverview/ImportOverview.vue:196 msgid "Status" msgstr "" @@ -1603,11 +1610,11 @@ #: src/components/importconfiguration/types/ApprovedGaugeMeasurement.vue:66 #: src/components/importconfiguration/types/WaterwayProfiles.vue:113 #: src/components/sections/SectionForm.vue:185 -#: src/components/stretches/StretchForm.vue:202 +#: src/components/stretches/StretchForm.vue:26 msgid "Submit" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:652 +#: src/components/fairway/AvailableFairwayDepth.vue:727 msgid "Sum of days" msgstr "" @@ -1615,14 +1622,19 @@ msgid "Sunday" msgstr "" -#: src/components/fairway/Profiles.vue:72 +#: src/components/fairway/BottleneckDialogue.vue:72 +#: src/components/fairway/BottleneckDialogue.vue:648 msgid "Survey" msgstr "" -#: src/components/Pdftool.vue:720 +#: src/components/Pdftool.vue:716 msgid "Survey date" msgstr "" +#: src/components/importoverview/SoundingResultDetail.vue:11 +msgid "Survey from:" +msgstr "" + #: src/components/map/MapPopup.vue:165 msgid "Surveys" msgstr "" @@ -1720,26 +1732,27 @@ msgid "The provided template has no name property." msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:331 -msgid "There are invalid classbreak values. Please check" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:338 +msgid "There are invalid classbreak values." msgstr "" #: src/components/systemconfiguration/DataAccuracy.vue:88 msgid "There are less than" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:193 -#: src/components/fairway/AvailableFairwayDepth.vue:217 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:190 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:206 -#: src/components/fairway/Profiles.vue:423 +#: src/components/fairway/AvailableFairwayDepth.vue:213 +#: src/components/fairway/AvailableFairwayDepth.vue:233 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:212 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:223 +#: src/components/fairway/BottleneckDialogue.vue:428 #: src/components/importconfiguration/types/Soundingresults.vue:232 #: src/components/importconfiguration/types/Soundingresults.vue:251 #: src/components/layers/Layerselect.vue:68 +#: src/components/stretches/StretchForm.vue:56 msgid "this" msgstr "" -#: src/components/identify/Identify.vue:138 +#: src/components/identify/Identify.vue:189 msgid "" "This app uses <i>gemma</i>, which is Free Software under <br/>\n" " %{ license } without warranty, see docs for details." @@ -1766,7 +1779,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:89 -#: src/components/stretches/StretchForm.vue:106 msgid "Tolerance for snapping to axis" msgstr "" @@ -1804,6 +1816,10 @@ msgid "Upload new map template" msgstr "" +#: src/components/stretches/StretchForm.vue:84 +msgid "Upload of stretch complete" +msgstr "" + #: src/components/systemconfiguration/PDFTemplates.vue:183 msgid "Uploaded file does not contain valid json data." msgstr "" @@ -1826,8 +1842,8 @@ msgid "URL" msgstr "" -#: src/components/identify/Identify.vue:134 -#: src/components/identify/Identify.vue:243 +#: src/components/identify/Identify.vue:185 +#: src/components/identify/Identify.vue:297 msgid "User Manual" msgstr "" @@ -1844,7 +1860,7 @@ msgid "Users" msgstr "" -#: src/components/identify/Identify.vue:153 +#: src/components/identify/Identify.vue:204 msgid "" "Uses\n" " <a href=\"https://download.geonames.org/export/dump/readme.txt" @@ -1864,17 +1880,17 @@ msgid "warning" msgstr "" -#: src/components/fairway/Profiles.vue:41 -#: src/components/gauge/Waterlevel.vue:150 +#: src/components/fairway/BottleneckDialogue.vue:41 +#: src/components/gauge/Waterlevel.vue:169 msgid "Waterlevel" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:663 -#: src/components/gauge/Waterlevel.vue:613 +#: src/components/gauge/HydrologicalConditions.vue:680 +#: src/components/gauge/Waterlevel.vue:634 msgid "Waterlevel [m]" msgstr "" -#: src/components/gauge/Waterlevel.vue:170 +#: src/components/gauge/Waterlevel.vue:180 msgid "waterlevels" msgstr "" @@ -1932,19 +1948,19 @@ msgid "Weekly" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:194 -msgid "Widthlimit 1" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:196 +msgid "Widthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:210 -msgid "Widthlimit 2" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:212 +msgid "Widthlimit 2 [m]" msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1066 msgid "year" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:624 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:632 msgid "yearly" msgstr "" @@ -1952,7 +1968,7 @@ msgid "yes" msgstr "" -#: src/components/fairway/Profiles.vue:625 +#: src/components/fairway/BottleneckDialogue.vue:630 msgid "" "You can now select these coordinates from the \"Saved cross profiles\" menu " "to restore this cross profile."
--- a/client/src/locale/hr_HR/LC_MESSAGES/app.po Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/locale/hr_HR/LC_MESSAGES/app.po Fri Sep 20 15:35:16 2019 +0200 @@ -93,7 +93,7 @@ msgid "Accesslog" msgstr "Zapis pristupa" -#: src/components/identify/Identify.vue:59 +#: src/components/identify/Identify.vue:74 msgid "According gauge data:" msgstr "" @@ -119,7 +119,7 @@ msgid "April" msgstr "Travanj" -#: src/store/map.js:214 +#: src/store/map.js:218 msgid "Area" msgstr "Područje" @@ -131,16 +131,16 @@ msgid "August" msgstr "Kolovoz" -#: src/components/identify/Identify.vue:324 +#: src/components/identify/Identify.vue:422 msgid "Avail: Below treshold" msgstr "" -#: src/components/identify/Identify.vue:321 +#: src/components/identify/Identify.vue:414 #, fuzzy -msgid "Avail: Last measurement <" +msgid "Avail: Latest measurement from" msgstr "Mjerenje" -#: src/components/identify/Identify.vue:327 +#: src/components/identify/Identify.vue:428 #, fuzzy msgid "Avail: Latest measurement older than" msgstr "Mjerenje" @@ -150,19 +150,19 @@ msgid "Availability of Gauge Measurements" msgstr "Započinje uvoz odobrenih vodostaja" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:228 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:432 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:230 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:440 #: src/components/toolbar/AvailableFairwayDepth.vue:35 #, fuzzy msgid "Available fairway depth" msgstr "Dostupne dubine plovnog puta" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:620 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:628 #, fuzzy msgid "Available Fairway Depth" msgstr "Dostupne dubine plovnog puta" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:235 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:237 #, fuzzy msgid "Available fairway depth vs LNWL" msgstr "Dostupne dubine plovnog puta" @@ -173,7 +173,7 @@ msgstr "Dostupne dubine plovnog puta" #: src/components/sections/SectionForm.vue:178 -#: src/components/stretches/StretchForm.vue:195 +#: src/components/stretches/StretchForm.vue:18 msgid "Back" msgstr "" @@ -182,21 +182,22 @@ msgstr "natrag na prijavu" #: src/components/Bottlenecks.vue:188 src/components/Logs.vue:163 -#: src/components/Pdftool.vue:244 src/components/Pdftool.vue:832 +#: src/components/Pdftool.vue:237 src/components/Pdftool.vue:828 #: src/components/Search.vue:260 src/components/Search.vue:299 -#: src/components/fairway/AvailableFairwayDepth.vue:149 -#: src/components/fairway/AvailableFairwayDepth.vue:245 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:520 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:551 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:146 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:253 +#: src/components/fairway/AvailableFairwayDepth.vue:168 +#: src/components/fairway/AvailableFairwayDepth.vue:271 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:528 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:559 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:167 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:280 +#: src/components/fairway/BottleneckDialogue.vue:516 +#: src/components/fairway/BottleneckDialogue.vue:657 #: src/components/fairway/Fairwayprofile.vue:312 #: src/components/fairway/Fairwayprofile.vue:706 -#: src/components/fairway/Profiles.vue:511 -#: src/components/gauge/HydrologicalConditions.vue:237 -#: src/components/gauge/HydrologicalConditions.vue:1040 -#: src/components/gauge/Waterlevel.vue:240 -#: src/components/gauge/Waterlevel.vue:1178 +#: src/components/gauge/HydrologicalConditions.vue:253 +#: src/components/gauge/HydrologicalConditions.vue:1058 +#: src/components/gauge/Waterlevel.vue:259 +#: src/components/gauge/Waterlevel.vue:1206 #: src/components/importconfiguration/Import.vue:130 #: src/components/importconfiguration/Import.vue:147 #: src/components/importconfiguration/Import.vue:166 @@ -215,19 +216,19 @@ #: src/components/importoverview/ImportOverview.vue:246 #: src/components/importoverview/ImportOverview.vue:364 #: src/components/importoverview/ImportOverview.vue:376 -#: src/components/importoverview/ImportOverview.vue:458 -#: src/components/importoverview/LogEntry.vue:160 +#: src/components/importoverview/ImportOverview.vue:459 +#: src/components/importoverview/LogEntry.vue:161 #: src/components/importoverview/SectionDetails.vue:109 -#: src/components/importoverview/StretchDetails.vue:113 -#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:213 +#: src/components/importoverview/StretchDetails.vue:140 +#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:214 #: src/components/sections/SectionForm.vue:339 #: src/components/sections/Sections.vue:170 #: src/components/sections/Sections.vue:180 #: src/components/sections/Sections.vue:222 -#: src/components/stretches/StretchForm.vue:362 -#: src/components/stretches/Stretches.vue:170 -#: src/components/stretches/Stretches.vue:180 -#: src/components/stretches/Stretches.vue:232 +#: src/components/stretches/StretchForm.vue:91 +#: src/components/stretches/Stretches.vue:194 +#: src/components/stretches/Stretches.vue:204 +#: src/components/stretches/Stretches.vue:246 #: src/components/systemconfiguration/PDFTemplates.vue:165 #: src/components/systemconfiguration/PDFTemplates.vue:254 #: src/components/systemconfiguration/PDFTemplates.vue:292 @@ -235,7 +236,7 @@ #: src/components/usermanagement/Usermanagement.vue:216 #: src/components/usermanagement/Usermanagement.vue:253 #: src/components/usermanagement/Usermanagement.vue:261 -#: src/components/usermanagement/Usermanagement.vue:302 +#: src/components/usermanagement/Usermanagement.vue:302 src/lib/session.js:32 msgid "Backend Error" msgstr "Greška Servera" @@ -244,7 +245,7 @@ msgid "BeamType" msgstr "Tip" -#: src/components/Pdftool.vue:718 src/components/identify/formatter.js:26 +#: src/components/Pdftool.vue:714 src/components/identify/formatter.js:26 #: src/components/importconfiguration/types/Soundingresults.vue:13 msgid "Bottleneck" msgstr "Kritični sektor" @@ -253,27 +254,31 @@ msgid "Bottleneck Morphology Classbreaks" msgstr "" -#: src/components/fairway/Profiles.vue:334 +#: src/components/fairway/BottleneckDialogue.vue:339 #: src/components/toolbar/Profiles.vue:35 #, fuzzy msgid "Bottleneck Surveys" msgstr "Kritični sektori" +#: src/components/importoverview/SoundingResultDetail.vue:7 +#, fuzzy +msgid "Bottleneck:" +msgstr "Kritični sektor" + #: src/components/Bottlenecks.vue:107 src/components/Sidebar.vue:19 #: src/components/fairway/AvailableFairwayDepthDialogue.vue:24 #: src/components/importconfiguration/ImportDetails.vue:32 msgid "Bottlenecks" msgstr "Kritični sektori" -#: src/components/fairway/Profiles.vue:113 +#: src/components/fairway/BottleneckDialogue.vue:118 msgid "Calculating differences" msgstr "" #: src/components/Pdftool.vue:83 src/components/Popup.vue:28 -#: src/components/fairway/Profiles.vue:654 +#: src/components/fairway/BottleneckDialogue.vue:687 #: src/components/importconfiguration/Import.vue:204 -#: src/components/importoverview/ImportOverview.vue:447 -#: src/components/stretches/Stretches.vue:206 +#: src/components/importoverview/ImportOverview.vue:448 #: src/components/systemconfiguration/PDFTemplates.vue:331 #: src/components/usermanagement/Usermanagement.vue:268 #, fuzzy @@ -284,12 +289,15 @@ msgid "Chainage" msgstr "Stacionaža" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:106 +msgid "Changes need a map reload. Consider informing your users." +msgstr "" + #: src/components/sections/SectionForm.vue:251 -#: src/components/stretches/StretchForm.vue:270 msgid "Choose a distance mark by clicking on the map." msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:294 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:301 msgid "Choose color" msgstr "" @@ -305,6 +313,12 @@ msgid "Color Settings" msgstr "" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:216 +msgid "" +"Colour changes need a map reload. Value changes need a de- and re-select\n" +" of a difference calculation. Inform your users!" +msgstr "" + #: src/components/importoverview/ImportOverview.vue:17 msgid "Commit" msgstr "" @@ -314,15 +328,15 @@ msgid "Compare to" msgstr "Usporedi sa" -#: src/components/fairway/Profiles.vue:90 +#: src/components/fairway/BottleneckDialogue.vue:95 msgid "Compare with" msgstr "Usporedi sa" -#: src/components/identify/Identify.vue:343 +#: src/components/identify/Identify.vue:453 msgid "Confidence per 24h" msgstr "" -#: src/components/identify/Identify.vue:342 +#: src/components/identify/Identify.vue:450 msgid "Confidence per 72h" msgstr "" @@ -336,7 +350,7 @@ msgid "Confirm" msgstr "Potvrdi" -#: src/components/fairway/Profiles.vue:556 +#: src/components/fairway/BottleneckDialogue.vue:561 msgid "Coordinates copied to clipboard!" msgstr "Koordinate su kopirane u međuspremnik!" @@ -349,15 +363,11 @@ msgid "Country" msgstr "Država" -#: src/components/stretches/StretchForm.vue:23 -msgid "Countrycode" -msgstr "Oznaka države" - #: src/components/importconfiguration/ScheduledImports.vue:363 msgid "Cronstring" msgstr "Crontab - linija" -#: src/components/fairway/Profiles.vue:59 +#: src/components/fairway/BottleneckDialogue.vue:59 msgid "Current Waterlevel" msgstr "" @@ -365,21 +375,21 @@ msgid "Data Availability/Accuracy" msgstr "" -#: src/components/identify/Identify.vue:360 +#: src/components/identify/Identify.vue:483 msgid "Data too old. Treshold:" msgstr "" -#: src/components/identify/Identify.vue:357 +#: src/components/identify/Identify.vue:478 msgid "Data within revisiting treshold" msgstr "" -#: src/components/identify/Identify.vue:355 +#: src/components/identify/Identify.vue:473 msgid "Data within the revisiting time" msgstr "" #: src/components/importconfiguration/types/Soundingresults.vue:94 #: src/components/sections/Sections.vue:127 -#: src/components/stretches/Stretches.vue:127 +#: src/components/stretches/Stretches.vue:134 #: src/components/systemconfiguration/PDFTemplates.vue:120 msgid "Date" msgstr "Datum" @@ -390,7 +400,6 @@ msgstr "Datum" #: src/components/sections/SectionForm.vue:144 -#: src/components/stretches/StretchForm.vue:161 msgid "Date info" msgstr "Datum" @@ -408,10 +417,6 @@ msgid "Day" msgstr "Dan" -#: src/components/systemconfiguration/DataAccuracy.vue:116 -msgid "days." -msgstr "" - #: src/components/importconfiguration/ScheduledImports.vue:1089 msgid "December" msgstr "Prosinac" @@ -434,21 +439,20 @@ msgid "Define stretches" msgstr "Definiraj dionice" -#: src/components/stretches/Stretches.vue:121 +#: src/components/stretches/Stretches.vue:128 #, fuzzy msgid "Define Stretches" msgstr "Definiraj dionice" -#: src/components/fairway/Profiles.vue:639 +#: src/components/fairway/BottleneckDialogue.vue:672 #: src/components/importconfiguration/Import.vue:182 -#: src/components/stretches/Stretches.vue:196 #: src/components/systemconfiguration/PDFTemplates.vue:308 #: src/components/usermanagement/Usermanagement.vue:242 #, fuzzy msgid "Delete" msgstr "Brisanje " -#: src/components/fairway/Profiles.vue:633 +#: src/components/fairway/BottleneckDialogue.vue:665 #, fuzzy msgid "Delete cross profile" msgstr "Spremljeni poprečni profili" @@ -458,11 +462,6 @@ msgid "Delete Import" msgstr "Obrisan uvoz: #" -#: src/components/stretches/Stretches.vue:188 -#, fuzzy -msgid "Delete Stretch" -msgstr "Definiraj dionice" - #: src/components/systemconfiguration/PDFTemplates.vue:300 #, fuzzy msgid "Delete Template" @@ -492,8 +491,9 @@ msgid "deleted successfully" msgstr "Uspješno" +#: src/components/fairway/BottleneckDialogue.vue:650 #: src/components/sections/Sections.vue:197 -#: src/components/stretches/Stretches.vue:201 +#: src/components/stretches/Stretches.vue:221 msgid "Deleting " msgstr "Brisanje " @@ -501,21 +501,21 @@ msgid "Depth" msgstr "Dubina" -#: src/components/fairway/Profiles.vue:48 +#: src/components/fairway/BottleneckDialogue.vue:48 #, fuzzy msgid "Depth Reference" msgstr "Referentna dubina" -#: src/components/Pdftool.vue:724 +#: src/components/Pdftool.vue:720 msgid "Depth relativ to" msgstr "" #: src/components/fairway/AvailableFairwayDepthDialogue.vue:164 -msgid "Depthlimit 1 (in cm)" +msgid "Depthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:180 -msgid "Depthlimit 2 ( in cm)" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:181 +msgid "Depthlimit 2 [m]" msgstr "" #: src/components/importconfiguration/types/Soundingresults.vue:74 @@ -542,7 +542,7 @@ msgid "Distance marks virtual" msgstr "Virtualne Oznake Udaljenosti" -#: src/components/fairway/Profiles.vue:635 +#: src/components/fairway/BottleneckDialogue.vue:668 msgid "Do you really want to delete the cross profile:" msgstr "" @@ -558,11 +558,7 @@ msgid "Do you really want to delete the import with ID" msgstr "" -#: src/components/stretches/Stretches.vue:190 -msgid "Do you really want to delete this stretch:" -msgstr "" - -#: src/components/identify/Identify.vue:130 +#: src/components/identify/Identify.vue:181 msgid "Download" msgstr "Preuzimanje" @@ -591,7 +587,6 @@ msgstr "Email Obavijest" #: src/components/sections/SectionForm.vue:57 -#: src/components/stretches/StretchForm.vue:74 msgid "End rhm" msgstr "Završni rkm" @@ -599,11 +594,11 @@ msgid "Enqueued" msgstr "Na čekanju" -#: src/components/fairway/Profiles.vue:175 +#: src/components/fairway/BottleneckDialogue.vue:180 msgid "Enter coordinates manually" msgstr "Unesi koordinate ručno" -#: src/components/fairway/Profiles.vue:239 +#: src/components/fairway/BottleneckDialogue.vue:244 msgid "Enter label for cross profile" msgstr "Unesi oznaku poprečnog profila" @@ -683,11 +678,11 @@ msgid "Fairway Dimensions" msgstr "Dimenzije plovnog puta" -#: src/components/fairway/AvailableFairwayDepth.vue:189 +#: src/components/fairway/AvailableFairwayDepth.vue:209 msgid "fairwayavailability" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:186 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:208 msgid "fairwayavailabilityLNWL" msgstr "" @@ -771,7 +766,7 @@ msgid "Gauge Waterlevel Date" msgstr "" -#: src/components/gauge/Gauges.vue:126 src/components/toolbar/Gauges.vue:34 +#: src/components/gauge/Gauges.vue:127 src/components/toolbar/Gauges.vue:34 msgid "Gauges" msgstr "" @@ -785,12 +780,12 @@ msgid "Generated by" msgstr "– kreiran od:" -#: src/components/identify/Identify.vue:160 +#: src/components/identify/Identify.vue:211 #, fuzzy msgid "Generated PDFs use font:" msgstr "Kreiraj PDF" -#: src/components/identify/Identify.vue:340 +#: src/components/identify/Identify.vue:445 msgid "Highest confidence" msgstr "" @@ -802,11 +797,16 @@ msgid "Hour" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:146 +#: src/components/systemconfiguration/DataAccuracy.vue:116 +#, fuzzy +msgid "hours." +msgstr "sat" + +#: src/components/gauge/HydrologicalConditions.vue:150 msgid "Hydrological Conditions" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:154 +#: src/components/gauge/HydrologicalConditions.vue:159 msgid "hydrological-conditions" msgstr "" @@ -816,11 +816,10 @@ #: src/components/importconfiguration/Import.vue:252 #: src/components/sections/SectionForm.vue:5 -#: src/components/stretches/StretchForm.vue:5 msgid "ID" msgstr "ID" -#: src/components/identify/Identify.vue:240 src/components/map/MapPopup.vue:148 +#: src/components/identify/Identify.vue:294 src/components/map/MapPopup.vue:148 #: src/components/toolbar/Identify.vue:49 #, fuzzy msgid "Identified Features" @@ -837,7 +836,7 @@ #: src/components/importconfiguration/types/Soundingresults.vue:347 #: src/components/importconfiguration/types/WaterwayProfiles.vue:187 #: src/components/sections/SectionForm.vue:328 -#: src/components/stretches/StretchForm.vue:351 +#: src/components/stretches/StretchForm.vue:83 msgid "Import" msgstr "Uvoz" @@ -900,7 +899,7 @@ msgid "invalid email" msgstr "nevažeći email" -#: src/components/fairway/Profiles.vue:598 +#: src/components/fairway/BottleneckDialogue.vue:603 msgid "Invalid input" msgstr "nevažeći unos" @@ -933,6 +932,13 @@ msgid "Later" msgstr "Najnovije" +#: src/components/identify/Identify.vue:475 +#: src/components/identify/Identify.vue:480 +#: src/components/identify/Identify.vue:485 +#, fuzzy +msgid "Latest measurement" +msgstr "Mjerenje" + #: src/components/Bottlenecks.vue:116 #, fuzzy msgid "Latest Measurement" @@ -953,7 +959,7 @@ msgid "Layers" msgstr "Slojevi" -#: src/store/map.js:187 +#: src/store/map.js:191 msgid "Length" msgstr "Duljina" @@ -987,7 +993,7 @@ msgid "Map" msgstr "Karta" -#: src/components/layers/Layers.vue:71 +#: src/components/layers/Layers.vue:73 #: src/components/systemconfiguration/Systemconfiguration.vue:31 #: src/components/toolbar/Layers.vue:35 #, fuzzy @@ -1002,7 +1008,7 @@ msgid "Maximum retry count" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:130 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:131 msgid "MaxWidth" msgstr "Maksimalna Širina" @@ -1027,6 +1033,17 @@ msgid "Measurement Count in Last 14 Days" msgstr "" +#: src/components/identify/Identify.vue:416 +#, fuzzy +msgid "Measurement is within" +msgstr "Mjerenje" + +#: src/components/identify/Identify.vue:417 +#: src/components/identify/Identify.vue:423 +#, fuzzy +msgid "measurements" +msgstr "Mjerenje" + #: src/components/systemconfiguration/DataAccuracy.vue:97 msgid "measurements in the last 14 days." msgstr "" @@ -1045,7 +1062,7 @@ msgid "minutes past" msgstr "prošlo minuta" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:109 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:110 msgid "MinWidth" msgstr "Minimalna Širina" @@ -1057,7 +1074,7 @@ msgid "month" msgstr "mjesec" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:622 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:630 #, fuzzy msgid "monthly" msgstr "Mjesečno" @@ -1069,27 +1086,26 @@ #: src/components/Bottlenecks.vue:113 src/components/identify/formatter.js:6 #: src/components/identify/formatter.js:7 #: src/components/sections/Sections.vue:124 -#: src/components/stretches/Stretches.vue:124 +#: src/components/stretches/Stretches.vue:131 #: src/components/systemconfiguration/PDFTemplates.vue:117 msgid "Name" msgstr "Naziv" -#: src/components/identify/Identify.vue:252 -#: src/components/identify/Identify.vue:253 -#: src/components/identify/Identify.vue:254 -#: src/components/identify/Identify.vue:266 -#: src/components/identify/Identify.vue:267 -#: src/components/identify/Identify.vue:268 +#: src/components/identify/Identify.vue:317 +#: src/components/identify/Identify.vue:321 +#: src/components/identify/Identify.vue:324 +#: src/components/identify/Identify.vue:348 +#: src/components/identify/Identify.vue:352 +#: src/components/identify/Identify.vue:355 msgid "Nash-Sutcliffe" msgstr "" -#: src/components/identify/Identify.vue:255 -#: src/components/identify/Identify.vue:269 +#: src/components/identify/Identify.vue:326 +#: src/components/identify/Identify.vue:357 msgid "Nash-Sutcliffe not available" msgstr "" #: src/components/sections/SectionForm.vue:131 -#: src/components/stretches/StretchForm.vue:148 msgid "National Object name" msgstr "Nacionalni naziv Objekta" @@ -1116,7 +1132,7 @@ msgid "New section" msgstr "Nova dionica" -#: src/components/stretches/Stretches.vue:66 +#: src/components/stretches/Stretches.vue:72 msgid "New stretch" msgstr "Nova dionica" @@ -1126,11 +1142,11 @@ #: src/components/fairway/Fairwayprofile.vue:92 #: src/components/gauge/HydrologicalConditions.vue:79 -#: src/components/gauge/Waterlevel.vue:78 +#: src/components/gauge/Waterlevel.vue:89 msgid "No data available." msgstr "" -#: src/components/identify/Identify.vue:122 +#: src/components/identify/Identify.vue:173 msgid "No features identified." msgstr "Nema identificiranih objekata." @@ -1138,20 +1154,24 @@ msgid "No results." msgstr "Nema rezultata." -#: src/components/systemconfiguration/ColorSettings.vue:270 +#: src/components/identify/Identify.vue:467 +msgid "No revisiting time defined" +msgstr "" + +#: src/components/systemconfiguration/ColorSettings.vue:272 msgid "No style-changes" msgstr "" -#: src/components/stretches/Stretches.vue:200 -msgid "Not implemented" -msgstr "Nije implementirano" +#: src/components/identify/Identify.vue:469 +msgid "No survey-data available" +msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1088 msgid "November" msgstr "Studeni" -#: src/components/gauge/HydrologicalConditions.vue:630 -#: src/components/gauge/Waterlevel.vue:735 +#: src/components/gauge/HydrologicalConditions.vue:647 +#: src/components/gauge/Waterlevel.vue:756 msgid "Now" msgstr "" @@ -1160,7 +1180,6 @@ msgstr "sati" #: src/components/sections/SectionForm.vue:114 -#: src/components/stretches/StretchForm.vue:131 msgid "Object name" msgstr "Naziv objekta" @@ -1237,7 +1256,7 @@ msgid "pending" msgstr "Na čekanju" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:608 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:669 msgid "Percent" msgstr "" @@ -1249,17 +1268,12 @@ msgid "Please choose a role" msgstr "Odaberite ulogu" -#: src/components/stretches/StretchForm.vue:34 -msgid "Please enter a countrycode" -msgstr "Unesite kod države" - #: src/components/importconfiguration/types/Soundingresults.vue:104 #: src/components/sections/SectionForm.vue:155 -#: src/components/stretches/StretchForm.vue:172 msgid "Please enter a date" msgstr "Unesite datum" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:99 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:100 msgid "Please enter a depth" msgstr "Unesite dubinu" @@ -1275,11 +1289,11 @@ msgid "Please enter a level of service" msgstr "Unesite razinu usluge" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:143 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:144 msgid "Please enter a maximum width" msgstr "Unesite maksimalnu širinu" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:122 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:123 msgid "Please enter a minimum width" msgstr "Unesite minimalnu širinu" @@ -1297,23 +1311,20 @@ msgstr "Unesite referencu" #: src/components/sections/SectionForm.vue:171 -#: src/components/stretches/StretchForm.vue:188 #, fuzzy msgid "Please enter a source organization" msgstr "Unesite organizaciju izvora" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:167 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:168 msgid "Please enter a source orgranization" msgstr "Unesite organizaciju izvora" #: src/components/sections/SectionForm.vue:51 -#: src/components/stretches/StretchForm.vue:68 msgid "Please enter a start point" msgstr "Unesite početnu točku" #: src/components/importconfiguration/types/Bottleneck.vue:69 #: src/components/sections/SectionForm.vue:106 -#: src/components/stretches/StretchForm.vue:123 #, fuzzy msgid "Please enter a tolerance value" msgstr "Unesite Korisničko ime" @@ -1337,17 +1348,14 @@ msgstr "Unesite Korisničko ime" #: src/components/sections/SectionForm.vue:83 -#: src/components/stretches/StretchForm.vue:100 msgid "Please enter an end point" msgstr "Unesite završnu točku" #: src/components/sections/SectionForm.vue:17 -#: src/components/stretches/StretchForm.vue:17 msgid "Please enter an id" msgstr "Unesite id" #: src/components/sections/SectionForm.vue:125 -#: src/components/stretches/StretchForm.vue:142 msgid "Please enter an objectname" msgstr "Unesite naziv objekta" @@ -1356,7 +1364,7 @@ msgid "Please enter an originator" msgstr "Unesite završnu točku" -#: src/components/fairway/Profiles.vue:599 +#: src/components/fairway/BottleneckDialogue.vue:604 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" msgstr "Unesite točne koordinate u formatu: Lat,Lon,Lat,Lon" @@ -1385,6 +1393,10 @@ msgid "Positive values are the upper limit for retries" msgstr "" +#: src/components/identify/Identify.vue:455 +msgid "Predictions not available" +msgstr "" + #: src/components/KeyboardHandler.vue:69 msgid "Press ESC to close compare view." msgstr "" @@ -1393,11 +1405,11 @@ msgid "Press ESC to stop drawing." msgstr "" -#: src/components/fairway/Profiles.vue:650 +#: src/components/fairway/BottleneckDialogue.vue:683 msgid "Profile deleted!" msgstr "Profil obrisan!" -#: src/components/fairway/Profiles.vue:624 +#: src/components/fairway/BottleneckDialogue.vue:629 msgid "Profile saved!" msgstr "Profil spremljen!" @@ -1405,7 +1417,7 @@ msgid "Projection" msgstr "Projekcija" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:623 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:631 msgid "quarterly" msgstr "" @@ -1414,7 +1426,7 @@ msgid "Recency of Bottleneck Surveys" msgstr "Kritični sektori" -#: src/components/Pdftool.vue:722 +#: src/components/Pdftool.vue:718 msgid "Ref gauge" msgstr "" @@ -1440,15 +1452,15 @@ msgid "Request password reset!" msgstr "Zatraži poništavanje lozinke!" -#: src/components/systemconfiguration/ColorSettings.vue:50 +#: src/components/systemconfiguration/ColorSettings.vue:56 msgid "Reset all to defaults" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:44 +#: src/components/systemconfiguration/ColorSettings.vue:49 #: src/components/systemconfiguration/DataAccuracy.vue:274 #: src/components/systemconfiguration/MapLayers.vue:58 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:101 -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:208 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:211 msgid "Reset to defaults" msgstr "" @@ -1465,7 +1477,7 @@ msgstr "" #: src/components/sections/Sections.vue:133 -#: src/components/stretches/Stretches.vue:133 +#: src/components/stretches/Stretches.vue:140 msgid "Review pending import" msgstr "" @@ -1474,12 +1486,12 @@ msgid "Role" msgstr "Uloga" -#: src/components/fairway/Profiles.vue:420 +#: src/components/fairway/BottleneckDialogue.vue:425 msgid "Rotate Maps" msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:312 -msgid "Same value is used in multiple fields. Please check" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:319 +msgid "Same value is used in multiple fields." msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1074 @@ -1491,7 +1503,7 @@ msgid "Save" msgstr "" -#: src/components/fairway/Profiles.vue:148 +#: src/components/fairway/BottleneckDialogue.vue:153 msgid "Saved cross profiles" msgstr "Spremljeni poprečni profili" @@ -1499,7 +1511,7 @@ msgid "Saved import: #" msgstr "Spremljen uvoz: #" -#: src/components/Pdftool.vue:479 +#: src/components/Pdftool.vue:475 msgid "Scale" msgstr "" @@ -1526,13 +1538,13 @@ msgid "Sections" msgstr "Projekcija" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:436 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:444 #: src/components/importconfiguration/types/Soundingresults.vue:400 #, fuzzy msgid "Select bottleneck" msgstr "Odaberi Kritični sektor" -#: src/components/fairway/Profiles.vue:21 +#: src/components/fairway/BottleneckDialogue.vue:21 msgid "Select Bottleneck" msgstr "Odaberi Kritični sektor" @@ -1540,24 +1552,24 @@ msgid "Select Gauge" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:439 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:447 msgid "Select section" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:438 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:446 #, fuzzy msgid "Select stretch" msgstr "Definiraj dionice" -#: src/components/systemconfiguration/ColorSettings.vue:38 +#: src/components/systemconfiguration/ColorSettings.vue:43 #: src/components/systemconfiguration/DataAccuracy.vue:271 #: src/components/systemconfiguration/MapLayers.vue:55 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:95 -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:202 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:205 msgid "Send" msgstr "Pošalji" -#: src/components/systemconfiguration/ColorSettings.vue:55 +#: src/components/systemconfiguration/ColorSettings.vue:61 #, fuzzy msgid "Send all" msgstr "Pošalji testni e-mail" @@ -1570,7 +1582,7 @@ msgid "September" msgstr "Rujan" -#: src/components/fairway/Profiles.vue:123 +#: src/components/fairway/BottleneckDialogue.vue:128 msgid "Show differences" msgstr "" @@ -1578,7 +1590,7 @@ msgid "Show Hydrological Conditions" msgstr "" -#: src/components/fairway/Profiles.vue:120 +#: src/components/fairway/BottleneckDialogue.vue:125 msgid "Show survey" msgstr "" @@ -1594,7 +1606,7 @@ msgid "Simple" msgstr "" -#: src/components/identify/Identify.vue:147 +#: src/components/identify/Identify.vue:198 msgid "" "Some data ©\n" " <a href=\"https://www.openstreetmap.org/copyright\">%{ name }</a>\n" @@ -1617,7 +1629,7 @@ msgid "Sounding Result" msgstr "Rezultat Hidrografskog mjerenja" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:109 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:112 #, fuzzy msgid "Sounding Result Comparison" msgstr "Rezultat Hidrografskog mjerenja" @@ -1627,36 +1639,39 @@ msgid "Soundingresults" msgstr "Rezultat Hidrografskog mjerenja" +#: src/components/importoverview/FairwayDimensionDetail.vue:8 +msgid "Source" +msgstr "Izvor" + #: src/components/sections/Sections.vue:130 -#: src/components/stretches/Stretches.vue:130 +#: src/components/stretches/Stretches.vue:137 msgid "Source organization" msgstr "Organizacija izvora" #: src/components/identify/formatter.js:35 #: src/components/sections/SectionForm.vue:161 -#: src/components/stretches/StretchForm.vue:178 #, fuzzy msgid "Source Organization" msgstr "Organizacija izvora" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:154 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:155 msgid "Source orgranization" msgstr "Organizacija izvora" -#: src/components/identify/Identify.vue:144 +#: src/components/identify/Identify.vue:195 msgid "source-code" msgstr "izvorni kod" #: src/components/sections/Sections.vue:196 +#: src/components/stretches/Stretches.vue:220 msgid "Staging Area" msgstr "Pristanište" -#: src/components/fairway/Profiles.vue:194 +#: src/components/fairway/BottleneckDialogue.vue:199 msgid "Start" msgstr "Početak" #: src/components/sections/SectionForm.vue:25 -#: src/components/stretches/StretchForm.vue:42 msgid "Start rhm" msgstr "Početni rhm" @@ -1673,10 +1688,6 @@ msgid "Starting import of section" msgstr "Započinje uvoz dionice" -#: src/components/stretches/StretchForm.vue:352 -msgid "Starting import of stretch" -msgstr "Započinje uvoz dionice" - #: src/components/importoverview/ImportOverview.vue:196 #, fuzzy msgid "Status" @@ -1695,11 +1706,11 @@ #: src/components/importconfiguration/types/ApprovedGaugeMeasurement.vue:66 #: src/components/importconfiguration/types/WaterwayProfiles.vue:113 #: src/components/sections/SectionForm.vue:185 -#: src/components/stretches/StretchForm.vue:202 +#: src/components/stretches/StretchForm.vue:26 msgid "Submit" msgstr "Predaj" -#: src/components/fairway/AvailableFairwayDepth.vue:652 +#: src/components/fairway/AvailableFairwayDepth.vue:727 msgid "Sum of days" msgstr "" @@ -1707,14 +1718,19 @@ msgid "Sunday" msgstr "Nedjelja" -#: src/components/fairway/Profiles.vue:72 +#: src/components/fairway/BottleneckDialogue.vue:72 +#: src/components/fairway/BottleneckDialogue.vue:648 msgid "Survey" msgstr "" -#: src/components/Pdftool.vue:720 +#: src/components/Pdftool.vue:716 msgid "Survey date" msgstr "" +#: src/components/importoverview/SoundingResultDetail.vue:11 +msgid "Survey from:" +msgstr "" + #: src/components/map/MapPopup.vue:165 msgid "Surveys" msgstr "" @@ -1813,26 +1829,27 @@ msgid "The provided template has no name property." msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:331 -msgid "There are invalid classbreak values. Please check" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:338 +msgid "There are invalid classbreak values." msgstr "" #: src/components/systemconfiguration/DataAccuracy.vue:88 msgid "There are less than" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:193 -#: src/components/fairway/AvailableFairwayDepth.vue:217 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:190 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:206 -#: src/components/fairway/Profiles.vue:423 +#: src/components/fairway/AvailableFairwayDepth.vue:213 +#: src/components/fairway/AvailableFairwayDepth.vue:233 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:212 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:223 +#: src/components/fairway/BottleneckDialogue.vue:428 #: src/components/importconfiguration/types/Soundingresults.vue:232 #: src/components/importconfiguration/types/Soundingresults.vue:251 #: src/components/layers/Layerselect.vue:68 +#: src/components/stretches/StretchForm.vue:56 msgid "this" msgstr "" -#: src/components/identify/Identify.vue:138 +#: src/components/identify/Identify.vue:189 msgid "" "This app uses <i>gemma</i>, which is Free Software under <br/>\n" " %{ license } without warranty, see docs for details." @@ -1861,7 +1878,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:89 -#: src/components/stretches/StretchForm.vue:106 msgid "Tolerance for snapping to axis" msgstr "" @@ -1899,6 +1915,10 @@ msgid "Upload new map template" msgstr "" +#: src/components/stretches/StretchForm.vue:84 +msgid "Upload of stretch complete" +msgstr "" + #: src/components/systemconfiguration/PDFTemplates.vue:183 msgid "Uploaded file does not contain valid json data." msgstr "" @@ -1921,8 +1941,8 @@ msgid "URL" msgstr "URL" -#: src/components/identify/Identify.vue:134 -#: src/components/identify/Identify.vue:243 +#: src/components/identify/Identify.vue:185 +#: src/components/identify/Identify.vue:297 #, fuzzy msgid "User Manual" msgstr "Korisničko ime" @@ -1940,7 +1960,7 @@ msgid "Users" msgstr "Korisnici" -#: src/components/identify/Identify.vue:153 +#: src/components/identify/Identify.vue:204 msgid "" "Uses\n" " <a href=\"https://download.geonames.org/export/dump/readme.txt" @@ -1964,17 +1984,17 @@ msgid "warning" msgstr "" -#: src/components/fairway/Profiles.vue:41 -#: src/components/gauge/Waterlevel.vue:150 +#: src/components/fairway/BottleneckDialogue.vue:41 +#: src/components/gauge/Waterlevel.vue:169 msgid "Waterlevel" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:663 -#: src/components/gauge/Waterlevel.vue:613 +#: src/components/gauge/HydrologicalConditions.vue:680 +#: src/components/gauge/Waterlevel.vue:634 msgid "Waterlevel [m]" msgstr "" -#: src/components/gauge/Waterlevel.vue:170 +#: src/components/gauge/Waterlevel.vue:180 msgid "waterlevels" msgstr "" @@ -2037,19 +2057,19 @@ msgid "Weekly" msgstr "Tjedno" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:194 -msgid "Widthlimit 1" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:196 +msgid "Widthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:210 -msgid "Widthlimit 2" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:212 +msgid "Widthlimit 2 [m]" msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1066 msgid "year" msgstr "godina" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:624 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:632 #, fuzzy msgid "yearly" msgstr "godina" @@ -2059,7 +2079,7 @@ msgid "yes" msgstr "Slojevi" -#: src/components/fairway/Profiles.vue:625 +#: src/components/fairway/BottleneckDialogue.vue:630 msgid "" "You can now select these coordinates from the \"Saved cross profiles\" menu " "to restore this cross profile." @@ -2067,6 +2087,26 @@ "Sada možete odabrati ove koordinate iz izbornika \"Spremljeni poprečni " "profili\" da biste vratili ovaj poprečni profil." +#, fuzzy +#~ msgid "Delete survey" +#~ msgstr "Brisanje " + +#~ msgid "Not implemented" +#~ msgstr "Nije implementirano" + +#~ msgid "Countrycode" +#~ msgstr "Oznaka države" + +#, fuzzy +#~ msgid "Delete Stretch" +#~ msgstr "Definiraj dionice" + +#~ msgid "Please enter a countrycode" +#~ msgstr "Unesite kod države" + +#~ msgid "Starting import of stretch" +#~ msgstr "Započinje uvoz dionice" + #~ msgid "Bottleneck Areas fill-color" #~ msgstr "Kritični sektor - boja ispune" @@ -2100,9 +2140,6 @@ #~ msgid "Simple schedule" #~ msgstr "Jednostavan Raspored" -#~ msgid "Source" -#~ msgstr "Izvor" - #~ msgid "User" #~ msgstr "Korisnik"
--- a/client/src/locale/hu_HU/LC_MESSAGES/app.po Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/locale/hu_HU/LC_MESSAGES/app.po Fri Sep 20 15:35:16 2019 +0200 @@ -92,7 +92,7 @@ msgid "Accesslog" msgstr "Bejelentkezési log" -#: src/components/identify/Identify.vue:59 +#: src/components/identify/Identify.vue:74 msgid "According gauge data:" msgstr "" @@ -117,7 +117,7 @@ msgid "April" msgstr "Április" -#: src/store/map.js:214 +#: src/store/map.js:218 msgid "Area" msgstr "terület" @@ -129,15 +129,15 @@ msgid "August" msgstr "Augusztus" -#: src/components/identify/Identify.vue:324 +#: src/components/identify/Identify.vue:422 msgid "Avail: Below treshold" msgstr "" -#: src/components/identify/Identify.vue:321 -msgid "Avail: Last measurement <" +#: src/components/identify/Identify.vue:414 +msgid "Avail: Latest measurement from" msgstr "" -#: src/components/identify/Identify.vue:327 +#: src/components/identify/Identify.vue:428 msgid "Avail: Latest measurement older than" msgstr "" @@ -145,19 +145,19 @@ msgid "Availability of Gauge Measurements" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:228 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:432 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:230 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:440 #: src/components/toolbar/AvailableFairwayDepth.vue:35 #, fuzzy msgid "Available fairway depth" msgstr "hajóút mélysége" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:620 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:628 #, fuzzy msgid "Available Fairway Depth" msgstr "hajóút mélysége" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:235 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:237 #, fuzzy msgid "Available fairway depth vs LNWL" msgstr "hajóút mélysége" @@ -167,7 +167,7 @@ msgstr "hajóút mélysége" #: src/components/sections/SectionForm.vue:178 -#: src/components/stretches/StretchForm.vue:195 +#: src/components/stretches/StretchForm.vue:18 msgid "Back" msgstr "" @@ -176,21 +176,22 @@ msgstr "vissza a bejelentkezéshez" #: src/components/Bottlenecks.vue:188 src/components/Logs.vue:163 -#: src/components/Pdftool.vue:244 src/components/Pdftool.vue:832 +#: src/components/Pdftool.vue:237 src/components/Pdftool.vue:828 #: src/components/Search.vue:260 src/components/Search.vue:299 -#: src/components/fairway/AvailableFairwayDepth.vue:149 -#: src/components/fairway/AvailableFairwayDepth.vue:245 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:520 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:551 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:146 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:253 +#: src/components/fairway/AvailableFairwayDepth.vue:168 +#: src/components/fairway/AvailableFairwayDepth.vue:271 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:528 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:559 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:167 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:280 +#: src/components/fairway/BottleneckDialogue.vue:516 +#: src/components/fairway/BottleneckDialogue.vue:657 #: src/components/fairway/Fairwayprofile.vue:312 #: src/components/fairway/Fairwayprofile.vue:706 -#: src/components/fairway/Profiles.vue:511 -#: src/components/gauge/HydrologicalConditions.vue:237 -#: src/components/gauge/HydrologicalConditions.vue:1040 -#: src/components/gauge/Waterlevel.vue:240 -#: src/components/gauge/Waterlevel.vue:1178 +#: src/components/gauge/HydrologicalConditions.vue:253 +#: src/components/gauge/HydrologicalConditions.vue:1058 +#: src/components/gauge/Waterlevel.vue:259 +#: src/components/gauge/Waterlevel.vue:1206 #: src/components/importconfiguration/Import.vue:130 #: src/components/importconfiguration/Import.vue:147 #: src/components/importconfiguration/Import.vue:166 @@ -209,19 +210,19 @@ #: src/components/importoverview/ImportOverview.vue:246 #: src/components/importoverview/ImportOverview.vue:364 #: src/components/importoverview/ImportOverview.vue:376 -#: src/components/importoverview/ImportOverview.vue:458 -#: src/components/importoverview/LogEntry.vue:160 +#: src/components/importoverview/ImportOverview.vue:459 +#: src/components/importoverview/LogEntry.vue:161 #: src/components/importoverview/SectionDetails.vue:109 -#: src/components/importoverview/StretchDetails.vue:113 -#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:213 +#: src/components/importoverview/StretchDetails.vue:140 +#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:214 #: src/components/sections/SectionForm.vue:339 #: src/components/sections/Sections.vue:170 #: src/components/sections/Sections.vue:180 #: src/components/sections/Sections.vue:222 -#: src/components/stretches/StretchForm.vue:362 -#: src/components/stretches/Stretches.vue:170 -#: src/components/stretches/Stretches.vue:180 -#: src/components/stretches/Stretches.vue:232 +#: src/components/stretches/StretchForm.vue:91 +#: src/components/stretches/Stretches.vue:194 +#: src/components/stretches/Stretches.vue:204 +#: src/components/stretches/Stretches.vue:246 #: src/components/systemconfiguration/PDFTemplates.vue:165 #: src/components/systemconfiguration/PDFTemplates.vue:254 #: src/components/systemconfiguration/PDFTemplates.vue:292 @@ -229,7 +230,7 @@ #: src/components/usermanagement/Usermanagement.vue:216 #: src/components/usermanagement/Usermanagement.vue:253 #: src/components/usermanagement/Usermanagement.vue:261 -#: src/components/usermanagement/Usermanagement.vue:302 +#: src/components/usermanagement/Usermanagement.vue:302 src/lib/session.js:32 msgid "Backend Error" msgstr "Backend Error" @@ -238,7 +239,7 @@ msgid "BeamType" msgstr "Típus" -#: src/components/Pdftool.vue:718 src/components/identify/formatter.js:26 +#: src/components/Pdftool.vue:714 src/components/identify/formatter.js:26 #: src/components/importconfiguration/types/Soundingresults.vue:13 #, fuzzy msgid "Bottleneck" @@ -248,27 +249,31 @@ msgid "Bottleneck Morphology Classbreaks" msgstr "" -#: src/components/fairway/Profiles.vue:334 +#: src/components/fairway/BottleneckDialogue.vue:339 #: src/components/toolbar/Profiles.vue:35 #, fuzzy msgid "Bottleneck Surveys" msgstr "Gázlók" +#: src/components/importoverview/SoundingResultDetail.vue:7 +#, fuzzy +msgid "Bottleneck:" +msgstr "Gázlók, szűkületek" + #: src/components/Bottlenecks.vue:107 src/components/Sidebar.vue:19 #: src/components/fairway/AvailableFairwayDepthDialogue.vue:24 #: src/components/importconfiguration/ImportDetails.vue:32 msgid "Bottlenecks" msgstr "Gázlók" -#: src/components/fairway/Profiles.vue:113 +#: src/components/fairway/BottleneckDialogue.vue:118 msgid "Calculating differences" msgstr "" #: src/components/Pdftool.vue:83 src/components/Popup.vue:28 -#: src/components/fairway/Profiles.vue:654 +#: src/components/fairway/BottleneckDialogue.vue:687 #: src/components/importconfiguration/Import.vue:204 -#: src/components/importoverview/ImportOverview.vue:447 -#: src/components/stretches/Stretches.vue:206 +#: src/components/importoverview/ImportOverview.vue:448 #: src/components/systemconfiguration/PDFTemplates.vue:331 #: src/components/usermanagement/Usermanagement.vue:268 msgid "Cancel" @@ -278,12 +283,15 @@ msgid "Chainage" msgstr "" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:106 +msgid "Changes need a map reload. Consider informing your users." +msgstr "" + #: src/components/sections/SectionForm.vue:251 -#: src/components/stretches/StretchForm.vue:270 msgid "Choose a distance mark by clicking on the map." msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:294 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:301 msgid "Choose color" msgstr "" @@ -299,6 +307,12 @@ msgid "Color Settings" msgstr "" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:216 +msgid "" +"Colour changes need a map reload. Value changes need a de- and re-select\n" +" of a difference calculation. Inform your users!" +msgstr "" + #: src/components/importoverview/ImportOverview.vue:17 msgid "Commit" msgstr "" @@ -307,15 +321,15 @@ msgid "Compare to" msgstr "" -#: src/components/fairway/Profiles.vue:90 +#: src/components/fairway/BottleneckDialogue.vue:95 msgid "Compare with" msgstr "" -#: src/components/identify/Identify.vue:343 +#: src/components/identify/Identify.vue:453 msgid "Confidence per 24h" msgstr "" -#: src/components/identify/Identify.vue:342 +#: src/components/identify/Identify.vue:450 msgid "Confidence per 72h" msgstr "" @@ -329,7 +343,7 @@ msgid "Confirm" msgstr "" -#: src/components/fairway/Profiles.vue:556 +#: src/components/fairway/BottleneckDialogue.vue:561 msgid "Coordinates copied to clipboard!" msgstr "" @@ -343,15 +357,11 @@ msgid "Country" msgstr "Ország" -#: src/components/stretches/StretchForm.vue:23 -msgid "Countrycode" -msgstr "" - #: src/components/importconfiguration/ScheduledImports.vue:363 msgid "Cronstring" msgstr "" -#: src/components/fairway/Profiles.vue:59 +#: src/components/fairway/BottleneckDialogue.vue:59 msgid "Current Waterlevel" msgstr "" @@ -359,21 +369,21 @@ msgid "Data Availability/Accuracy" msgstr "" -#: src/components/identify/Identify.vue:360 +#: src/components/identify/Identify.vue:483 msgid "Data too old. Treshold:" msgstr "" -#: src/components/identify/Identify.vue:357 +#: src/components/identify/Identify.vue:478 msgid "Data within revisiting treshold" msgstr "" -#: src/components/identify/Identify.vue:355 +#: src/components/identify/Identify.vue:473 msgid "Data within the revisiting time" msgstr "" #: src/components/importconfiguration/types/Soundingresults.vue:94 #: src/components/sections/Sections.vue:127 -#: src/components/stretches/Stretches.vue:127 +#: src/components/stretches/Stretches.vue:134 #: src/components/systemconfiguration/PDFTemplates.vue:120 msgid "Date" msgstr "" @@ -383,7 +393,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:144 -#: src/components/stretches/StretchForm.vue:161 msgid "Date info" msgstr "" @@ -399,10 +408,6 @@ msgid "Day" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:116 -msgid "days." -msgstr "" - #: src/components/importconfiguration/ScheduledImports.vue:1089 msgid "December" msgstr "" @@ -423,19 +428,18 @@ msgid "Define stretches" msgstr "" -#: src/components/stretches/Stretches.vue:121 +#: src/components/stretches/Stretches.vue:128 msgid "Define Stretches" msgstr "" -#: src/components/fairway/Profiles.vue:639 +#: src/components/fairway/BottleneckDialogue.vue:672 #: src/components/importconfiguration/Import.vue:182 -#: src/components/stretches/Stretches.vue:196 #: src/components/systemconfiguration/PDFTemplates.vue:308 #: src/components/usermanagement/Usermanagement.vue:242 msgid "Delete" msgstr "" -#: src/components/fairway/Profiles.vue:633 +#: src/components/fairway/BottleneckDialogue.vue:665 msgid "Delete cross profile" msgstr "" @@ -443,10 +447,6 @@ msgid "Delete Import" msgstr "" -#: src/components/stretches/Stretches.vue:188 -msgid "Delete Stretch" -msgstr "" - #: src/components/systemconfiguration/PDFTemplates.vue:300 msgid "Delete Template" msgstr "" @@ -471,8 +471,9 @@ msgid "deleted successfully" msgstr "" +#: src/components/fairway/BottleneckDialogue.vue:650 #: src/components/sections/Sections.vue:197 -#: src/components/stretches/Stretches.vue:201 +#: src/components/stretches/Stretches.vue:221 msgid "Deleting " msgstr "" @@ -480,20 +481,20 @@ msgid "Depth" msgstr "" -#: src/components/fairway/Profiles.vue:48 +#: src/components/fairway/BottleneckDialogue.vue:48 msgid "Depth Reference" msgstr "" -#: src/components/Pdftool.vue:724 +#: src/components/Pdftool.vue:720 msgid "Depth relativ to" msgstr "" #: src/components/fairway/AvailableFairwayDepthDialogue.vue:164 -msgid "Depthlimit 1 (in cm)" +msgid "Depthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:180 -msgid "Depthlimit 2 ( in cm)" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:181 +msgid "Depthlimit 2 [m]" msgstr "" #: src/components/importconfiguration/types/Soundingresults.vue:74 @@ -516,7 +517,7 @@ msgid "Distance marks virtual" msgstr "" -#: src/components/fairway/Profiles.vue:635 +#: src/components/fairway/BottleneckDialogue.vue:668 msgid "Do you really want to delete the cross profile:" msgstr "" @@ -532,11 +533,7 @@ msgid "Do you really want to delete the import with ID" msgstr "" -#: src/components/stretches/Stretches.vue:190 -msgid "Do you really want to delete this stretch:" -msgstr "" - -#: src/components/identify/Identify.vue:130 +#: src/components/identify/Identify.vue:181 msgid "Download" msgstr "" @@ -566,7 +563,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:57 -#: src/components/stretches/StretchForm.vue:74 msgid "End rhm" msgstr "" @@ -574,11 +570,11 @@ msgid "Enqueued" msgstr "" -#: src/components/fairway/Profiles.vue:175 +#: src/components/fairway/BottleneckDialogue.vue:180 msgid "Enter coordinates manually" msgstr "" -#: src/components/fairway/Profiles.vue:239 +#: src/components/fairway/BottleneckDialogue.vue:244 msgid "Enter label for cross profile" msgstr "" @@ -651,11 +647,11 @@ msgid "Fairway Dimensions" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:189 +#: src/components/fairway/AvailableFairwayDepth.vue:209 msgid "fairwayavailability" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:186 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:208 msgid "fairwayavailabilityLNWL" msgstr "" @@ -736,7 +732,7 @@ msgid "Gauge Waterlevel Date" msgstr "" -#: src/components/gauge/Gauges.vue:126 src/components/toolbar/Gauges.vue:34 +#: src/components/gauge/Gauges.vue:127 src/components/toolbar/Gauges.vue:34 msgid "Gauges" msgstr "" @@ -750,11 +746,11 @@ msgid "Generated by" msgstr "- létrehozta:" -#: src/components/identify/Identify.vue:160 +#: src/components/identify/Identify.vue:211 msgid "Generated PDFs use font:" msgstr "" -#: src/components/identify/Identify.vue:340 +#: src/components/identify/Identify.vue:445 msgid "Highest confidence" msgstr "" @@ -766,11 +762,15 @@ msgid "Hour" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:146 +#: src/components/systemconfiguration/DataAccuracy.vue:116 +msgid "hours." +msgstr "" + +#: src/components/gauge/HydrologicalConditions.vue:150 msgid "Hydrological Conditions" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:154 +#: src/components/gauge/HydrologicalConditions.vue:159 msgid "hydrological-conditions" msgstr "" @@ -780,11 +780,10 @@ #: src/components/importconfiguration/Import.vue:252 #: src/components/sections/SectionForm.vue:5 -#: src/components/stretches/StretchForm.vue:5 msgid "ID" msgstr "" -#: src/components/identify/Identify.vue:240 src/components/map/MapPopup.vue:148 +#: src/components/identify/Identify.vue:294 src/components/map/MapPopup.vue:148 #: src/components/toolbar/Identify.vue:49 msgid "Identified Features" msgstr "" @@ -800,7 +799,7 @@ #: src/components/importconfiguration/types/Soundingresults.vue:347 #: src/components/importconfiguration/types/WaterwayProfiles.vue:187 #: src/components/sections/SectionForm.vue:328 -#: src/components/stretches/StretchForm.vue:351 +#: src/components/stretches/StretchForm.vue:83 msgid "Import" msgstr "" @@ -856,7 +855,7 @@ msgid "invalid email" msgstr "" -#: src/components/fairway/Profiles.vue:598 +#: src/components/fairway/BottleneckDialogue.vue:603 msgid "Invalid input" msgstr "" @@ -888,6 +887,12 @@ msgid "Later" msgstr "" +#: src/components/identify/Identify.vue:475 +#: src/components/identify/Identify.vue:480 +#: src/components/identify/Identify.vue:485 +msgid "Latest measurement" +msgstr "" + #: src/components/Bottlenecks.vue:116 msgid "Latest Measurement" msgstr "" @@ -905,7 +910,7 @@ msgid "Layers" msgstr "Rétegek" -#: src/store/map.js:187 +#: src/store/map.js:191 msgid "Length" msgstr "" @@ -939,7 +944,7 @@ msgid "Map" msgstr "" -#: src/components/layers/Layers.vue:71 +#: src/components/layers/Layers.vue:73 #: src/components/systemconfiguration/Systemconfiguration.vue:31 #: src/components/toolbar/Layers.vue:35 #, fuzzy @@ -954,7 +959,7 @@ msgid "Maximum retry count" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:130 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:131 msgid "MaxWidth" msgstr "" @@ -978,6 +983,15 @@ msgid "Measurement Count in Last 14 Days" msgstr "" +#: src/components/identify/Identify.vue:416 +msgid "Measurement is within" +msgstr "" + +#: src/components/identify/Identify.vue:417 +#: src/components/identify/Identify.vue:423 +msgid "measurements" +msgstr "" + #: src/components/systemconfiguration/DataAccuracy.vue:97 msgid "measurements in the last 14 days." msgstr "" @@ -996,7 +1010,7 @@ msgid "minutes past" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:109 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:110 msgid "MinWidth" msgstr "" @@ -1008,7 +1022,7 @@ msgid "month" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:622 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:630 msgid "monthly" msgstr "" @@ -1019,28 +1033,27 @@ #: src/components/Bottlenecks.vue:113 src/components/identify/formatter.js:6 #: src/components/identify/formatter.js:7 #: src/components/sections/Sections.vue:124 -#: src/components/stretches/Stretches.vue:124 +#: src/components/stretches/Stretches.vue:131 #: src/components/systemconfiguration/PDFTemplates.vue:117 #, fuzzy msgid "Name" msgstr "Név" -#: src/components/identify/Identify.vue:252 -#: src/components/identify/Identify.vue:253 -#: src/components/identify/Identify.vue:254 -#: src/components/identify/Identify.vue:266 -#: src/components/identify/Identify.vue:267 -#: src/components/identify/Identify.vue:268 +#: src/components/identify/Identify.vue:317 +#: src/components/identify/Identify.vue:321 +#: src/components/identify/Identify.vue:324 +#: src/components/identify/Identify.vue:348 +#: src/components/identify/Identify.vue:352 +#: src/components/identify/Identify.vue:355 msgid "Nash-Sutcliffe" msgstr "" -#: src/components/identify/Identify.vue:255 -#: src/components/identify/Identify.vue:269 +#: src/components/identify/Identify.vue:326 +#: src/components/identify/Identify.vue:357 msgid "Nash-Sutcliffe not available" msgstr "" #: src/components/sections/SectionForm.vue:131 -#: src/components/stretches/StretchForm.vue:148 msgid "National Object name" msgstr "" @@ -1065,7 +1078,7 @@ msgid "New section" msgstr "" -#: src/components/stretches/Stretches.vue:66 +#: src/components/stretches/Stretches.vue:72 msgid "New stretch" msgstr "" @@ -1075,11 +1088,11 @@ #: src/components/fairway/Fairwayprofile.vue:92 #: src/components/gauge/HydrologicalConditions.vue:79 -#: src/components/gauge/Waterlevel.vue:78 +#: src/components/gauge/Waterlevel.vue:89 msgid "No data available." msgstr "" -#: src/components/identify/Identify.vue:122 +#: src/components/identify/Identify.vue:173 msgid "No features identified." msgstr "" @@ -1087,20 +1100,24 @@ msgid "No results." msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:270 +#: src/components/identify/Identify.vue:467 +msgid "No revisiting time defined" +msgstr "" + +#: src/components/systemconfiguration/ColorSettings.vue:272 msgid "No style-changes" msgstr "" -#: src/components/stretches/Stretches.vue:200 -msgid "Not implemented" +#: src/components/identify/Identify.vue:469 +msgid "No survey-data available" msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1088 msgid "November" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:630 -#: src/components/gauge/Waterlevel.vue:735 +#: src/components/gauge/HydrologicalConditions.vue:647 +#: src/components/gauge/Waterlevel.vue:756 msgid "Now" msgstr "" @@ -1109,7 +1126,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:114 -#: src/components/stretches/StretchForm.vue:131 msgid "Object name" msgstr "" @@ -1182,7 +1198,7 @@ msgid "pending" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:608 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:669 msgid "Percent" msgstr "" @@ -1195,17 +1211,12 @@ msgid "Please choose a role" msgstr "" -#: src/components/stretches/StretchForm.vue:34 -msgid "Please enter a countrycode" -msgstr "" - #: src/components/importconfiguration/types/Soundingresults.vue:104 #: src/components/sections/SectionForm.vue:155 -#: src/components/stretches/StretchForm.vue:172 msgid "Please enter a date" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:99 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:100 msgid "Please enter a depth" msgstr "" @@ -1221,11 +1232,11 @@ msgid "Please enter a level of service" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:143 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:144 msgid "Please enter a maximum width" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:122 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:123 msgid "Please enter a minimum width" msgstr "" @@ -1243,23 +1254,20 @@ msgstr "" #: src/components/sections/SectionForm.vue:171 -#: src/components/stretches/StretchForm.vue:188 #, fuzzy msgid "Please enter a source organization" msgstr "Kérem, válasszon országot" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:167 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:168 msgid "Please enter a source orgranization" msgstr "" #: src/components/sections/SectionForm.vue:51 -#: src/components/stretches/StretchForm.vue:68 msgid "Please enter a start point" msgstr "" #: src/components/importconfiguration/types/Bottleneck.vue:69 #: src/components/sections/SectionForm.vue:106 -#: src/components/stretches/StretchForm.vue:123 msgid "Please enter a tolerance value" msgstr "" @@ -1282,17 +1290,14 @@ msgstr "" #: src/components/sections/SectionForm.vue:83 -#: src/components/stretches/StretchForm.vue:100 msgid "Please enter an end point" msgstr "" #: src/components/sections/SectionForm.vue:17 -#: src/components/stretches/StretchForm.vue:17 msgid "Please enter an id" msgstr "" #: src/components/sections/SectionForm.vue:125 -#: src/components/stretches/StretchForm.vue:142 msgid "Please enter an objectname" msgstr "" @@ -1301,7 +1306,7 @@ msgid "Please enter an originator" msgstr "Kérem, válasszon országot" -#: src/components/fairway/Profiles.vue:599 +#: src/components/fairway/BottleneckDialogue.vue:604 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" msgstr "" @@ -1330,6 +1335,10 @@ msgid "Positive values are the upper limit for retries" msgstr "" +#: src/components/identify/Identify.vue:455 +msgid "Predictions not available" +msgstr "" + #: src/components/KeyboardHandler.vue:69 msgid "Press ESC to close compare view." msgstr "" @@ -1338,11 +1347,11 @@ msgid "Press ESC to stop drawing." msgstr "" -#: src/components/fairway/Profiles.vue:650 +#: src/components/fairway/BottleneckDialogue.vue:683 msgid "Profile deleted!" msgstr "" -#: src/components/fairway/Profiles.vue:624 +#: src/components/fairway/BottleneckDialogue.vue:629 msgid "Profile saved!" msgstr "" @@ -1350,7 +1359,7 @@ msgid "Projection" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:623 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:631 msgid "quarterly" msgstr "" @@ -1359,7 +1368,7 @@ msgid "Recency of Bottleneck Surveys" msgstr "Gázlók" -#: src/components/Pdftool.vue:722 +#: src/components/Pdftool.vue:718 msgid "Ref gauge" msgstr "" @@ -1383,15 +1392,15 @@ msgid "Request password reset!" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:50 +#: src/components/systemconfiguration/ColorSettings.vue:56 msgid "Reset all to defaults" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:44 +#: src/components/systemconfiguration/ColorSettings.vue:49 #: src/components/systemconfiguration/DataAccuracy.vue:274 #: src/components/systemconfiguration/MapLayers.vue:58 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:101 -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:208 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:211 msgid "Reset to defaults" msgstr "" @@ -1408,7 +1417,7 @@ msgstr "" #: src/components/sections/Sections.vue:133 -#: src/components/stretches/Stretches.vue:133 +#: src/components/stretches/Stretches.vue:140 msgid "Review pending import" msgstr "" @@ -1417,12 +1426,12 @@ msgid "Role" msgstr "" -#: src/components/fairway/Profiles.vue:420 +#: src/components/fairway/BottleneckDialogue.vue:425 msgid "Rotate Maps" msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:312 -msgid "Same value is used in multiple fields. Please check" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:319 +msgid "Same value is used in multiple fields." msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1074 @@ -1434,7 +1443,7 @@ msgid "Save" msgstr "" -#: src/components/fairway/Profiles.vue:148 +#: src/components/fairway/BottleneckDialogue.vue:153 msgid "Saved cross profiles" msgstr "" @@ -1442,7 +1451,7 @@ msgid "Saved import: #" msgstr "" -#: src/components/Pdftool.vue:479 +#: src/components/Pdftool.vue:475 msgid "Scale" msgstr "" @@ -1467,13 +1476,13 @@ msgid "Sections" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:436 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:444 #: src/components/importconfiguration/types/Soundingresults.vue:400 #, fuzzy msgid "Select bottleneck" msgstr "Gázlók, szűkületek" -#: src/components/fairway/Profiles.vue:21 +#: src/components/fairway/BottleneckDialogue.vue:21 msgid "Select Bottleneck" msgstr "" @@ -1481,24 +1490,24 @@ msgid "Select Gauge" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:439 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:447 msgid "Select section" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:438 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:446 msgid "Select stretch" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:38 +#: src/components/systemconfiguration/ColorSettings.vue:43 #: src/components/systemconfiguration/DataAccuracy.vue:271 #: src/components/systemconfiguration/MapLayers.vue:55 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:95 -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:202 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:205 #, fuzzy msgid "Send" msgstr "Küldés" -#: src/components/systemconfiguration/ColorSettings.vue:55 +#: src/components/systemconfiguration/ColorSettings.vue:61 #, fuzzy msgid "Send all" msgstr "Küldés" @@ -1511,7 +1520,7 @@ msgid "September" msgstr "" -#: src/components/fairway/Profiles.vue:123 +#: src/components/fairway/BottleneckDialogue.vue:128 msgid "Show differences" msgstr "" @@ -1519,7 +1528,7 @@ msgid "Show Hydrological Conditions" msgstr "" -#: src/components/fairway/Profiles.vue:120 +#: src/components/fairway/BottleneckDialogue.vue:125 msgid "Show survey" msgstr "" @@ -1535,7 +1544,7 @@ msgid "Simple" msgstr "" -#: src/components/identify/Identify.vue:147 +#: src/components/identify/Identify.vue:198 msgid "" "Some data ©\n" " <a href=\"https://www.openstreetmap.org/copyright\">%{ name }</a>\n" @@ -1554,7 +1563,7 @@ msgid "Sounding Result" msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:109 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:112 msgid "Sounding Result Comparison" msgstr "" @@ -1562,35 +1571,38 @@ msgid "Soundingresults" msgstr "" +#: src/components/importoverview/FairwayDimensionDetail.vue:8 +msgid "Source" +msgstr "" + #: src/components/sections/Sections.vue:130 -#: src/components/stretches/Stretches.vue:130 +#: src/components/stretches/Stretches.vue:137 msgid "Source organization" msgstr "" #: src/components/identify/formatter.js:35 #: src/components/sections/SectionForm.vue:161 -#: src/components/stretches/StretchForm.vue:178 msgid "Source Organization" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:154 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:155 msgid "Source orgranization" msgstr "" -#: src/components/identify/Identify.vue:144 +#: src/components/identify/Identify.vue:195 msgid "source-code" msgstr "" #: src/components/sections/Sections.vue:196 +#: src/components/stretches/Stretches.vue:220 msgid "Staging Area" msgstr "" -#: src/components/fairway/Profiles.vue:194 +#: src/components/fairway/BottleneckDialogue.vue:199 msgid "Start" msgstr "" #: src/components/sections/SectionForm.vue:25 -#: src/components/stretches/StretchForm.vue:42 msgid "Start rhm" msgstr "" @@ -1606,10 +1618,6 @@ msgid "Starting import of section" msgstr "" -#: src/components/stretches/StretchForm.vue:352 -msgid "Starting import of stretch" -msgstr "" - #: src/components/importoverview/ImportOverview.vue:196 msgid "Status" msgstr "" @@ -1625,11 +1633,11 @@ #: src/components/importconfiguration/types/ApprovedGaugeMeasurement.vue:66 #: src/components/importconfiguration/types/WaterwayProfiles.vue:113 #: src/components/sections/SectionForm.vue:185 -#: src/components/stretches/StretchForm.vue:202 +#: src/components/stretches/StretchForm.vue:26 msgid "Submit" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:652 +#: src/components/fairway/AvailableFairwayDepth.vue:727 msgid "Sum of days" msgstr "" @@ -1637,14 +1645,19 @@ msgid "Sunday" msgstr "" -#: src/components/fairway/Profiles.vue:72 +#: src/components/fairway/BottleneckDialogue.vue:72 +#: src/components/fairway/BottleneckDialogue.vue:648 msgid "Survey" msgstr "" -#: src/components/Pdftool.vue:720 +#: src/components/Pdftool.vue:716 msgid "Survey date" msgstr "" +#: src/components/importoverview/SoundingResultDetail.vue:11 +msgid "Survey from:" +msgstr "" + #: src/components/map/MapPopup.vue:165 msgid "Surveys" msgstr "" @@ -1742,26 +1755,27 @@ msgid "The provided template has no name property." msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:331 -msgid "There are invalid classbreak values. Please check" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:338 +msgid "There are invalid classbreak values." msgstr "" #: src/components/systemconfiguration/DataAccuracy.vue:88 msgid "There are less than" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:193 -#: src/components/fairway/AvailableFairwayDepth.vue:217 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:190 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:206 -#: src/components/fairway/Profiles.vue:423 +#: src/components/fairway/AvailableFairwayDepth.vue:213 +#: src/components/fairway/AvailableFairwayDepth.vue:233 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:212 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:223 +#: src/components/fairway/BottleneckDialogue.vue:428 #: src/components/importconfiguration/types/Soundingresults.vue:232 #: src/components/importconfiguration/types/Soundingresults.vue:251 #: src/components/layers/Layerselect.vue:68 +#: src/components/stretches/StretchForm.vue:56 msgid "this" msgstr "" -#: src/components/identify/Identify.vue:138 +#: src/components/identify/Identify.vue:189 msgid "" "This app uses <i>gemma</i>, which is Free Software under <br/>\n" " %{ license } without warranty, see docs for details." @@ -1788,7 +1802,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:89 -#: src/components/stretches/StretchForm.vue:106 msgid "Tolerance for snapping to axis" msgstr "" @@ -1827,6 +1840,10 @@ msgid "Upload new map template" msgstr "" +#: src/components/stretches/StretchForm.vue:84 +msgid "Upload of stretch complete" +msgstr "" + #: src/components/systemconfiguration/PDFTemplates.vue:183 msgid "Uploaded file does not contain valid json data." msgstr "" @@ -1849,8 +1866,8 @@ msgid "URL" msgstr "" -#: src/components/identify/Identify.vue:134 -#: src/components/identify/Identify.vue:243 +#: src/components/identify/Identify.vue:185 +#: src/components/identify/Identify.vue:297 msgid "User Manual" msgstr "" @@ -1867,7 +1884,7 @@ msgid "Users" msgstr "" -#: src/components/identify/Identify.vue:153 +#: src/components/identify/Identify.vue:204 msgid "" "Uses\n" " <a href=\"https://download.geonames.org/export/dump/readme.txt" @@ -1887,17 +1904,17 @@ msgid "warning" msgstr "" -#: src/components/fairway/Profiles.vue:41 -#: src/components/gauge/Waterlevel.vue:150 +#: src/components/fairway/BottleneckDialogue.vue:41 +#: src/components/gauge/Waterlevel.vue:169 msgid "Waterlevel" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:663 -#: src/components/gauge/Waterlevel.vue:613 +#: src/components/gauge/HydrologicalConditions.vue:680 +#: src/components/gauge/Waterlevel.vue:634 msgid "Waterlevel [m]" msgstr "" -#: src/components/gauge/Waterlevel.vue:170 +#: src/components/gauge/Waterlevel.vue:180 msgid "waterlevels" msgstr "" @@ -1955,19 +1972,19 @@ msgid "Weekly" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:194 -msgid "Widthlimit 1" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:196 +msgid "Widthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:210 -msgid "Widthlimit 2" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:212 +msgid "Widthlimit 2 [m]" msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1066 msgid "year" msgstr "Év" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:624 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:632 #, fuzzy msgid "yearly" msgstr "Év" @@ -1977,7 +1994,7 @@ msgid "yes" msgstr "Rétegek" -#: src/components/fairway/Profiles.vue:625 +#: src/components/fairway/BottleneckDialogue.vue:630 msgid "" "You can now select these coordinates from the \"Saved cross profiles\" menu " "to restore this cross profile."
--- a/client/src/locale/ro_RO/LC_MESSAGES/app.po Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/locale/ro_RO/LC_MESSAGES/app.po Fri Sep 20 15:35:16 2019 +0200 @@ -92,7 +92,7 @@ msgid "Accesslog" msgstr "Acces la log" -#: src/components/identify/Identify.vue:59 +#: src/components/identify/Identify.vue:74 msgid "According gauge data:" msgstr "" @@ -117,7 +117,7 @@ msgid "April" msgstr "Aprilie" -#: src/store/map.js:214 +#: src/store/map.js:218 msgid "Area" msgstr "Zona" @@ -129,16 +129,16 @@ msgid "August" msgstr "August" -#: src/components/identify/Identify.vue:324 +#: src/components/identify/Identify.vue:422 msgid "Avail: Below treshold" msgstr "" -#: src/components/identify/Identify.vue:321 +#: src/components/identify/Identify.vue:414 #, fuzzy -msgid "Avail: Last measurement <" +msgid "Avail: Latest measurement from" msgstr "Ultima Masuratoare" -#: src/components/identify/Identify.vue:327 +#: src/components/identify/Identify.vue:428 #, fuzzy msgid "Avail: Latest measurement older than" msgstr "Ultima Masuratoare" @@ -148,19 +148,19 @@ msgid "Availability of Gauge Measurements" msgstr "Incepe importul nivelurilor oficiale" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:228 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:432 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:230 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:440 #: src/components/toolbar/AvailableFairwayDepth.vue:35 #, fuzzy msgid "Available fairway depth" msgstr "Adâncimi disponibile în şenal" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:620 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:628 #, fuzzy msgid "Available Fairway Depth" msgstr "Adâncimi disponibile în şenal" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:235 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:237 #, fuzzy msgid "Available fairway depth vs LNWL" msgstr "Adâncimi disponibile în şenal" @@ -170,7 +170,7 @@ msgstr "Adâncimi disponibile în şenal" #: src/components/sections/SectionForm.vue:178 -#: src/components/stretches/StretchForm.vue:195 +#: src/components/stretches/StretchForm.vue:18 msgid "Back" msgstr "" @@ -179,21 +179,22 @@ msgstr "inapoi la login" #: src/components/Bottlenecks.vue:188 src/components/Logs.vue:163 -#: src/components/Pdftool.vue:244 src/components/Pdftool.vue:832 +#: src/components/Pdftool.vue:237 src/components/Pdftool.vue:828 #: src/components/Search.vue:260 src/components/Search.vue:299 -#: src/components/fairway/AvailableFairwayDepth.vue:149 -#: src/components/fairway/AvailableFairwayDepth.vue:245 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:520 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:551 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:146 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:253 +#: src/components/fairway/AvailableFairwayDepth.vue:168 +#: src/components/fairway/AvailableFairwayDepth.vue:271 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:528 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:559 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:167 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:280 +#: src/components/fairway/BottleneckDialogue.vue:516 +#: src/components/fairway/BottleneckDialogue.vue:657 #: src/components/fairway/Fairwayprofile.vue:312 #: src/components/fairway/Fairwayprofile.vue:706 -#: src/components/fairway/Profiles.vue:511 -#: src/components/gauge/HydrologicalConditions.vue:237 -#: src/components/gauge/HydrologicalConditions.vue:1040 -#: src/components/gauge/Waterlevel.vue:240 -#: src/components/gauge/Waterlevel.vue:1178 +#: src/components/gauge/HydrologicalConditions.vue:253 +#: src/components/gauge/HydrologicalConditions.vue:1058 +#: src/components/gauge/Waterlevel.vue:259 +#: src/components/gauge/Waterlevel.vue:1206 #: src/components/importconfiguration/Import.vue:130 #: src/components/importconfiguration/Import.vue:147 #: src/components/importconfiguration/Import.vue:166 @@ -212,19 +213,19 @@ #: src/components/importoverview/ImportOverview.vue:246 #: src/components/importoverview/ImportOverview.vue:364 #: src/components/importoverview/ImportOverview.vue:376 -#: src/components/importoverview/ImportOverview.vue:458 -#: src/components/importoverview/LogEntry.vue:160 +#: src/components/importoverview/ImportOverview.vue:459 +#: src/components/importoverview/LogEntry.vue:161 #: src/components/importoverview/SectionDetails.vue:109 -#: src/components/importoverview/StretchDetails.vue:113 -#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:213 +#: src/components/importoverview/StretchDetails.vue:140 +#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:214 #: src/components/sections/SectionForm.vue:339 #: src/components/sections/Sections.vue:170 #: src/components/sections/Sections.vue:180 #: src/components/sections/Sections.vue:222 -#: src/components/stretches/StretchForm.vue:362 -#: src/components/stretches/Stretches.vue:170 -#: src/components/stretches/Stretches.vue:180 -#: src/components/stretches/Stretches.vue:232 +#: src/components/stretches/StretchForm.vue:91 +#: src/components/stretches/Stretches.vue:194 +#: src/components/stretches/Stretches.vue:204 +#: src/components/stretches/Stretches.vue:246 #: src/components/systemconfiguration/PDFTemplates.vue:165 #: src/components/systemconfiguration/PDFTemplates.vue:254 #: src/components/systemconfiguration/PDFTemplates.vue:292 @@ -232,7 +233,7 @@ #: src/components/usermanagement/Usermanagement.vue:216 #: src/components/usermanagement/Usermanagement.vue:253 #: src/components/usermanagement/Usermanagement.vue:261 -#: src/components/usermanagement/Usermanagement.vue:302 +#: src/components/usermanagement/Usermanagement.vue:302 src/lib/session.js:32 msgid "Backend Error" msgstr "Eroare Server" @@ -241,7 +242,7 @@ msgid "BeamType" msgstr "Tip" -#: src/components/Pdftool.vue:718 src/components/identify/formatter.js:26 +#: src/components/Pdftool.vue:714 src/components/identify/formatter.js:26 #: src/components/importconfiguration/types/Soundingresults.vue:13 msgid "Bottleneck" msgstr "Punct critic" @@ -250,27 +251,31 @@ msgid "Bottleneck Morphology Classbreaks" msgstr "" -#: src/components/fairway/Profiles.vue:334 +#: src/components/fairway/BottleneckDialogue.vue:339 #: src/components/toolbar/Profiles.vue:35 #, fuzzy msgid "Bottleneck Surveys" msgstr "Puncte critice" +#: src/components/importoverview/SoundingResultDetail.vue:7 +#, fuzzy +msgid "Bottleneck:" +msgstr "Punct critic" + #: src/components/Bottlenecks.vue:107 src/components/Sidebar.vue:19 #: src/components/fairway/AvailableFairwayDepthDialogue.vue:24 #: src/components/importconfiguration/ImportDetails.vue:32 msgid "Bottlenecks" msgstr "Puncte critice" -#: src/components/fairway/Profiles.vue:113 +#: src/components/fairway/BottleneckDialogue.vue:118 msgid "Calculating differences" msgstr "" #: src/components/Pdftool.vue:83 src/components/Popup.vue:28 -#: src/components/fairway/Profiles.vue:654 +#: src/components/fairway/BottleneckDialogue.vue:687 #: src/components/importconfiguration/Import.vue:204 -#: src/components/importoverview/ImportOverview.vue:447 -#: src/components/stretches/Stretches.vue:206 +#: src/components/importoverview/ImportOverview.vue:448 #: src/components/systemconfiguration/PDFTemplates.vue:331 #: src/components/usermanagement/Usermanagement.vue:268 msgid "Cancel" @@ -280,12 +285,15 @@ msgid "Chainage" msgstr "Secţiunea" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:106 +msgid "Changes need a map reload. Consider informing your users." +msgstr "" + #: src/components/sections/SectionForm.vue:251 -#: src/components/stretches/StretchForm.vue:270 msgid "Choose a distance mark by clicking on the map." msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:294 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:301 msgid "Choose color" msgstr "" @@ -301,6 +309,12 @@ msgid "Color Settings" msgstr "Setări culoare" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:216 +msgid "" +"Colour changes need a map reload. Value changes need a de- and re-select\n" +" of a difference calculation. Inform your users!" +msgstr "" + #: src/components/importoverview/ImportOverview.vue:17 msgid "Commit" msgstr "aproba" @@ -310,15 +324,15 @@ msgid "Compare to" msgstr "Compara cu" -#: src/components/fairway/Profiles.vue:90 +#: src/components/fairway/BottleneckDialogue.vue:95 msgid "Compare with" msgstr "Compara cu" -#: src/components/identify/Identify.vue:343 +#: src/components/identify/Identify.vue:453 msgid "Confidence per 24h" msgstr "" -#: src/components/identify/Identify.vue:342 +#: src/components/identify/Identify.vue:450 msgid "Confidence per 72h" msgstr "" @@ -332,7 +346,7 @@ msgid "Confirm" msgstr "Confirmă" -#: src/components/fairway/Profiles.vue:556 +#: src/components/fairway/BottleneckDialogue.vue:561 msgid "Coordinates copied to clipboard!" msgstr "Coordonate copiate in memorie !" @@ -345,15 +359,11 @@ msgid "Country" msgstr "Ţara" -#: src/components/stretches/StretchForm.vue:23 -msgid "Countrycode" -msgstr "Cod ţara" - #: src/components/importconfiguration/ScheduledImports.vue:363 msgid "Cronstring" msgstr "Sir cronologic" -#: src/components/fairway/Profiles.vue:59 +#: src/components/fairway/BottleneckDialogue.vue:59 #, fuzzy msgid "Current Waterlevel" msgstr "Nivelul apei" @@ -362,21 +372,21 @@ msgid "Data Availability/Accuracy" msgstr "" -#: src/components/identify/Identify.vue:360 +#: src/components/identify/Identify.vue:483 msgid "Data too old. Treshold:" msgstr "" -#: src/components/identify/Identify.vue:357 +#: src/components/identify/Identify.vue:478 msgid "Data within revisiting treshold" msgstr "" -#: src/components/identify/Identify.vue:355 +#: src/components/identify/Identify.vue:473 msgid "Data within the revisiting time" msgstr "" #: src/components/importconfiguration/types/Soundingresults.vue:94 #: src/components/sections/Sections.vue:127 -#: src/components/stretches/Stretches.vue:127 +#: src/components/stretches/Stretches.vue:134 #: src/components/systemconfiguration/PDFTemplates.vue:120 msgid "Date" msgstr "Data" @@ -387,7 +397,6 @@ msgstr "Dată informaţii" #: src/components/sections/SectionForm.vue:144 -#: src/components/stretches/StretchForm.vue:161 msgid "Date info" msgstr "Dată informaţii" @@ -404,11 +413,6 @@ msgid "Day" msgstr "Ziua" -#: src/components/systemconfiguration/DataAccuracy.vue:116 -#, fuzzy -msgid "days." -msgstr "7 zile" - #: src/components/importconfiguration/ScheduledImports.vue:1089 msgid "December" msgstr "Decembrie" @@ -431,19 +435,18 @@ msgid "Define stretches" msgstr "Defineşte secţiunile" -#: src/components/stretches/Stretches.vue:121 +#: src/components/stretches/Stretches.vue:128 msgid "Define Stretches" msgstr "Defineşte sectoarele" -#: src/components/fairway/Profiles.vue:639 +#: src/components/fairway/BottleneckDialogue.vue:672 #: src/components/importconfiguration/Import.vue:182 -#: src/components/stretches/Stretches.vue:196 #: src/components/systemconfiguration/PDFTemplates.vue:308 #: src/components/usermanagement/Usermanagement.vue:242 msgid "Delete" msgstr "Șterge" -#: src/components/fairway/Profiles.vue:633 +#: src/components/fairway/BottleneckDialogue.vue:665 msgid "Delete cross profile" msgstr "Sterge profile transversale" @@ -451,10 +454,6 @@ msgid "Delete Import" msgstr "Sterge importul" -#: src/components/stretches/Stretches.vue:188 -msgid "Delete Stretch" -msgstr "Sterge sectorul" - #: src/components/systemconfiguration/PDFTemplates.vue:300 msgid "Delete Template" msgstr "Sterge templat-ul" @@ -480,8 +479,9 @@ msgid "deleted successfully" msgstr "sterse cu succes" +#: src/components/fairway/BottleneckDialogue.vue:650 #: src/components/sections/Sections.vue:197 -#: src/components/stretches/Stretches.vue:201 +#: src/components/stretches/Stretches.vue:221 msgid "Deleting " msgstr "Șterge " @@ -489,21 +489,21 @@ msgid "Depth" msgstr "Adâncime" -#: src/components/fairway/Profiles.vue:48 +#: src/components/fairway/BottleneckDialogue.vue:48 #, fuzzy msgid "Depth Reference" msgstr "Adâncimea de eeferinţă" -#: src/components/Pdftool.vue:724 +#: src/components/Pdftool.vue:720 msgid "Depth relativ to" msgstr "Adâncime relativă la" #: src/components/fairway/AvailableFairwayDepthDialogue.vue:164 -msgid "Depthlimit 1 (in cm)" +msgid "Depthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:180 -msgid "Depthlimit 2 ( in cm)" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:181 +msgid "Depthlimit 2 [m]" msgstr "" #: src/components/importconfiguration/types/Soundingresults.vue:74 @@ -528,7 +528,7 @@ msgid "Distance marks virtual" msgstr "Marcaj distanță virtual" -#: src/components/fairway/Profiles.vue:635 +#: src/components/fairway/BottleneckDialogue.vue:668 msgid "Do you really want to delete the cross profile:" msgstr "Chiar vrei să ştergi profilul transversal:" @@ -544,11 +544,7 @@ msgid "Do you really want to delete the import with ID" msgstr "Chiar vrei să ştergi importul cu ID" -#: src/components/stretches/Stretches.vue:190 -msgid "Do you really want to delete this stretch:" -msgstr "Chiar vrei să ştergi acest sector:" - -#: src/components/identify/Identify.vue:130 +#: src/components/identify/Identify.vue:181 msgid "Download" msgstr "Descarcă" @@ -577,7 +573,6 @@ msgstr "Notificare e-mail" #: src/components/sections/SectionForm.vue:57 -#: src/components/stretches/StretchForm.vue:74 msgid "End rhm" msgstr "Rhm final" @@ -585,11 +580,11 @@ msgid "Enqueued" msgstr "In asteptare" -#: src/components/fairway/Profiles.vue:175 +#: src/components/fairway/BottleneckDialogue.vue:180 msgid "Enter coordinates manually" msgstr "Introdu coordonatele manual" -#: src/components/fairway/Profiles.vue:239 +#: src/components/fairway/BottleneckDialogue.vue:244 msgid "Enter label for cross profile" msgstr "Introdu eticheta pentru profil transversal" @@ -665,11 +660,11 @@ msgid "Fairway Dimensions" msgstr "Dimensiune șenal navigabil" -#: src/components/fairway/AvailableFairwayDepth.vue:189 +#: src/components/fairway/AvailableFairwayDepth.vue:209 msgid "fairwayavailability" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:186 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:208 msgid "fairwayavailabilityLNWL" msgstr "" @@ -754,7 +749,7 @@ msgid "Gauge Waterlevel Date" msgstr "Nivelul apei" -#: src/components/gauge/Gauges.vue:126 src/components/toolbar/Gauges.vue:34 +#: src/components/gauge/Gauges.vue:127 src/components/toolbar/Gauges.vue:34 msgid "Gauges" msgstr "Mire" @@ -767,11 +762,11 @@ msgid "Generated by" msgstr "Generat de" -#: src/components/identify/Identify.vue:160 +#: src/components/identify/Identify.vue:211 msgid "Generated PDFs use font:" msgstr "Genereaza PDF-uri:" -#: src/components/identify/Identify.vue:340 +#: src/components/identify/Identify.vue:445 msgid "Highest confidence" msgstr "" @@ -783,11 +778,16 @@ msgid "Hour" msgstr "Ora" -#: src/components/gauge/HydrologicalConditions.vue:146 +#: src/components/systemconfiguration/DataAccuracy.vue:116 +#, fuzzy +msgid "hours." +msgstr "ora" + +#: src/components/gauge/HydrologicalConditions.vue:150 msgid "Hydrological Conditions" msgstr "Conditii hidrologice" -#: src/components/gauge/HydrologicalConditions.vue:154 +#: src/components/gauge/HydrologicalConditions.vue:159 #, fuzzy msgid "hydrological-conditions" msgstr "Conditii hidrologice" @@ -798,11 +798,10 @@ #: src/components/importconfiguration/Import.vue:252 #: src/components/sections/SectionForm.vue:5 -#: src/components/stretches/StretchForm.vue:5 msgid "ID" msgstr "Eticheta" -#: src/components/identify/Identify.vue:240 src/components/map/MapPopup.vue:148 +#: src/components/identify/Identify.vue:294 src/components/map/MapPopup.vue:148 #: src/components/toolbar/Identify.vue:49 #, fuzzy msgid "Identified Features" @@ -819,7 +818,7 @@ #: src/components/importconfiguration/types/Soundingresults.vue:347 #: src/components/importconfiguration/types/WaterwayProfiles.vue:187 #: src/components/sections/SectionForm.vue:328 -#: src/components/stretches/StretchForm.vue:351 +#: src/components/stretches/StretchForm.vue:83 msgid "Import" msgstr "Import" @@ -877,7 +876,7 @@ msgid "invalid email" msgstr "adresa de email nevalabila" -#: src/components/fairway/Profiles.vue:598 +#: src/components/fairway/BottleneckDialogue.vue:603 msgid "Invalid input" msgstr "Inregistrare nevalida" @@ -909,6 +908,13 @@ msgid "Later" msgstr "Mai tarziu" +#: src/components/identify/Identify.vue:475 +#: src/components/identify/Identify.vue:480 +#: src/components/identify/Identify.vue:485 +#, fuzzy +msgid "Latest measurement" +msgstr "Ultima Masuratoare" + #: src/components/Bottlenecks.vue:116 msgid "Latest Measurement" msgstr "Ultima Masuratoare" @@ -928,7 +934,7 @@ msgid "Layers" msgstr "Straturi" -#: src/store/map.js:187 +#: src/store/map.js:191 msgid "Length" msgstr "Lungime" @@ -962,7 +968,7 @@ msgid "Map" msgstr "Harta" -#: src/components/layers/Layers.vue:71 +#: src/components/layers/Layers.vue:73 #: src/components/systemconfiguration/Systemconfiguration.vue:31 #: src/components/toolbar/Layers.vue:35 #, fuzzy @@ -977,7 +983,7 @@ msgid "Maximum retry count" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:130 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:131 msgid "MaxWidth" msgstr "Latime maxima" @@ -1002,6 +1008,17 @@ msgid "Measurement Count in Last 14 Days" msgstr "" +#: src/components/identify/Identify.vue:416 +#, fuzzy +msgid "Measurement is within" +msgstr "Ultima Masuratoare" + +#: src/components/identify/Identify.vue:417 +#: src/components/identify/Identify.vue:423 +#, fuzzy +msgid "measurements" +msgstr "Ultima Masuratoare" + #: src/components/systemconfiguration/DataAccuracy.vue:97 msgid "measurements in the last 14 days." msgstr "" @@ -1020,7 +1037,7 @@ msgid "minutes past" msgstr "minute trecute" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:109 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:110 msgid "MinWidth" msgstr "Latime minima" @@ -1032,7 +1049,7 @@ msgid "month" msgstr "luna" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:622 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:630 #, fuzzy msgid "monthly" msgstr "Lunar" @@ -1044,27 +1061,26 @@ #: src/components/Bottlenecks.vue:113 src/components/identify/formatter.js:6 #: src/components/identify/formatter.js:7 #: src/components/sections/Sections.vue:124 -#: src/components/stretches/Stretches.vue:124 +#: src/components/stretches/Stretches.vue:131 #: src/components/systemconfiguration/PDFTemplates.vue:117 msgid "Name" msgstr "Nume" -#: src/components/identify/Identify.vue:252 -#: src/components/identify/Identify.vue:253 -#: src/components/identify/Identify.vue:254 -#: src/components/identify/Identify.vue:266 -#: src/components/identify/Identify.vue:267 -#: src/components/identify/Identify.vue:268 +#: src/components/identify/Identify.vue:317 +#: src/components/identify/Identify.vue:321 +#: src/components/identify/Identify.vue:324 +#: src/components/identify/Identify.vue:348 +#: src/components/identify/Identify.vue:352 +#: src/components/identify/Identify.vue:355 msgid "Nash-Sutcliffe" msgstr "" -#: src/components/identify/Identify.vue:255 -#: src/components/identify/Identify.vue:269 +#: src/components/identify/Identify.vue:326 +#: src/components/identify/Identify.vue:357 msgid "Nash-Sutcliffe not available" msgstr "" #: src/components/sections/SectionForm.vue:131 -#: src/components/stretches/StretchForm.vue:148 msgid "National Object name" msgstr "Numele national al obiectului" @@ -1091,7 +1107,7 @@ msgid "New section" msgstr "Sector nou" -#: src/components/stretches/Stretches.vue:66 +#: src/components/stretches/Stretches.vue:72 msgid "New stretch" msgstr "Sector nou" @@ -1101,11 +1117,11 @@ #: src/components/fairway/Fairwayprofile.vue:92 #: src/components/gauge/HydrologicalConditions.vue:79 -#: src/components/gauge/Waterlevel.vue:78 +#: src/components/gauge/Waterlevel.vue:89 msgid "No data available." msgstr "Nu sunt disponibile date." -#: src/components/identify/Identify.vue:122 +#: src/components/identify/Identify.vue:173 msgid "No features identified." msgstr "Nicio caracteristica identificata." @@ -1113,20 +1129,25 @@ msgid "No results." msgstr "Niciun rezultat." -#: src/components/systemconfiguration/ColorSettings.vue:270 +#: src/components/identify/Identify.vue:467 +msgid "No revisiting time defined" +msgstr "" + +#: src/components/systemconfiguration/ColorSettings.vue:272 msgid "No style-changes" msgstr "" -#: src/components/stretches/Stretches.vue:200 -msgid "Not implemented" -msgstr "Nu este implementat" +#: src/components/identify/Identify.vue:469 +#, fuzzy +msgid "No survey-data available" +msgstr "Nu sunt disponibile date." #: src/components/importconfiguration/ScheduledImports.vue:1088 msgid "November" msgstr "Noiembrie" -#: src/components/gauge/HydrologicalConditions.vue:630 -#: src/components/gauge/Waterlevel.vue:735 +#: src/components/gauge/HydrologicalConditions.vue:647 +#: src/components/gauge/Waterlevel.vue:756 msgid "Now" msgstr "Acum" @@ -1135,7 +1156,6 @@ msgstr "ora" #: src/components/sections/SectionForm.vue:114 -#: src/components/stretches/StretchForm.vue:131 msgid "Object name" msgstr "Numele obiectului" @@ -1211,7 +1231,7 @@ msgid "pending" msgstr "in asteptare" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:608 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:669 msgid "Percent" msgstr "" @@ -1223,17 +1243,12 @@ msgid "Please choose a role" msgstr "Selectati un rol" -#: src/components/stretches/StretchForm.vue:34 -msgid "Please enter a countrycode" -msgstr "Introduceti un cod pentru țară" - #: src/components/importconfiguration/types/Soundingresults.vue:104 #: src/components/sections/SectionForm.vue:155 -#: src/components/stretches/StretchForm.vue:172 msgid "Please enter a date" msgstr "Introduceti o data" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:99 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:100 msgid "Please enter a depth" msgstr "Introduceti o adancime" @@ -1249,11 +1264,11 @@ msgid "Please enter a level of service" msgstr "Introduceti un nivel de servicii" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:143 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:144 msgid "Please enter a maximum width" msgstr "Introduceti o latime maxima" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:122 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:123 msgid "Please enter a minimum width" msgstr "Introduceti o latime minima" @@ -1271,23 +1286,20 @@ msgstr "Introduceti o referinta" #: src/components/sections/SectionForm.vue:171 -#: src/components/stretches/StretchForm.vue:188 #, fuzzy msgid "Please enter a source organization" msgstr "Introduceti o sursa (organizatie)" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:167 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:168 msgid "Please enter a source orgranization" msgstr "Introduceti o sursa (organizatie)" #: src/components/sections/SectionForm.vue:51 -#: src/components/stretches/StretchForm.vue:68 msgid "Please enter a start point" msgstr "Introduceti un punct de pornire" #: src/components/importconfiguration/types/Bottleneck.vue:69 #: src/components/sections/SectionForm.vue:106 -#: src/components/stretches/StretchForm.vue:123 msgid "Please enter a tolerance value" msgstr "Introduceti o valoare de toleranta" @@ -1310,17 +1322,14 @@ msgstr "Introduceti nume utilizator" #: src/components/sections/SectionForm.vue:83 -#: src/components/stretches/StretchForm.vue:100 msgid "Please enter an end point" msgstr "Introduceti un punct final" #: src/components/sections/SectionForm.vue:17 -#: src/components/stretches/StretchForm.vue:17 msgid "Please enter an id" msgstr "Introduceti o eticheta" #: src/components/sections/SectionForm.vue:125 -#: src/components/stretches/StretchForm.vue:142 msgid "Please enter an objectname" msgstr "Introduceti un nume de obiect" @@ -1328,7 +1337,7 @@ msgid "Please enter an originator" msgstr "Introduceti un initiator" -#: src/components/fairway/Profiles.vue:599 +#: src/components/fairway/BottleneckDialogue.vue:604 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" msgstr "Introduceti coordonatele corecte, in format: Lat,Lon,Lat,Lon" @@ -1357,6 +1366,11 @@ msgid "Positive values are the upper limit for retries" msgstr "" +#: src/components/identify/Identify.vue:455 +#, fuzzy +msgid "Predictions not available" +msgstr "Nu sunt disponibile date." + #: src/components/KeyboardHandler.vue:69 msgid "Press ESC to close compare view." msgstr "" @@ -1365,11 +1379,11 @@ msgid "Press ESC to stop drawing." msgstr "" -#: src/components/fairway/Profiles.vue:650 +#: src/components/fairway/BottleneckDialogue.vue:683 msgid "Profile deleted!" msgstr "Profil sters!" -#: src/components/fairway/Profiles.vue:624 +#: src/components/fairway/BottleneckDialogue.vue:629 msgid "Profile saved!" msgstr "Profil salvat!" @@ -1377,7 +1391,7 @@ msgid "Projection" msgstr "Proiectie" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:623 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:631 msgid "quarterly" msgstr "" @@ -1386,7 +1400,7 @@ msgid "Recency of Bottleneck Surveys" msgstr "Puncte critice" -#: src/components/Pdftool.vue:722 +#: src/components/Pdftool.vue:718 msgid "Ref gauge" msgstr "Mira de referinta" @@ -1412,15 +1426,15 @@ msgid "Request password reset!" msgstr "Solicitare resetare parola!" -#: src/components/systemconfiguration/ColorSettings.vue:50 +#: src/components/systemconfiguration/ColorSettings.vue:56 msgid "Reset all to defaults" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:44 +#: src/components/systemconfiguration/ColorSettings.vue:49 #: src/components/systemconfiguration/DataAccuracy.vue:274 #: src/components/systemconfiguration/MapLayers.vue:58 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:101 -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:208 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:211 msgid "Reset to defaults" msgstr "" @@ -1437,7 +1451,7 @@ msgstr "" #: src/components/sections/Sections.vue:133 -#: src/components/stretches/Stretches.vue:133 +#: src/components/stretches/Stretches.vue:140 msgid "Review pending import" msgstr "" @@ -1446,12 +1460,12 @@ msgid "Role" msgstr "Rol" -#: src/components/fairway/Profiles.vue:420 +#: src/components/fairway/BottleneckDialogue.vue:425 msgid "Rotate Maps" msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:312 -msgid "Same value is used in multiple fields. Please check" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:319 +msgid "Same value is used in multiple fields." msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1074 @@ -1463,7 +1477,7 @@ msgid "Save" msgstr "Salvare" -#: src/components/fairway/Profiles.vue:148 +#: src/components/fairway/BottleneckDialogue.vue:153 msgid "Saved cross profiles" msgstr "Profile transversale salvate" @@ -1471,7 +1485,7 @@ msgid "Saved import: #" msgstr "Import salvat: #" -#: src/components/Pdftool.vue:479 +#: src/components/Pdftool.vue:475 msgid "Scale" msgstr "Scara" @@ -1499,13 +1513,13 @@ msgid "Sections" msgstr "Proiectie" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:436 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:444 #: src/components/importconfiguration/types/Soundingresults.vue:400 #, fuzzy msgid "Select bottleneck" msgstr "Selecteaza punct critic" -#: src/components/fairway/Profiles.vue:21 +#: src/components/fairway/BottleneckDialogue.vue:21 msgid "Select Bottleneck" msgstr "Selecteaza punct critic" @@ -1513,25 +1527,25 @@ msgid "Select Gauge" msgstr "Selecteaza miră" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:439 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:447 #, fuzzy msgid "Select section" msgstr "Selecteaza miră" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:438 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:446 #, fuzzy msgid "Select stretch" msgstr "Sterge sectorul" -#: src/components/systemconfiguration/ColorSettings.vue:38 +#: src/components/systemconfiguration/ColorSettings.vue:43 #: src/components/systemconfiguration/DataAccuracy.vue:271 #: src/components/systemconfiguration/MapLayers.vue:55 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:95 -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:202 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:205 msgid "Send" msgstr "Trimite" -#: src/components/systemconfiguration/ColorSettings.vue:55 +#: src/components/systemconfiguration/ColorSettings.vue:61 #, fuzzy msgid "Send all" msgstr "Trimite email de test" @@ -1544,7 +1558,7 @@ msgid "September" msgstr "Septembrie" -#: src/components/fairway/Profiles.vue:123 +#: src/components/fairway/BottleneckDialogue.vue:128 #, fuzzy msgid "Show differences" msgstr "Arata Nivelurile apei" @@ -1553,7 +1567,7 @@ msgid "Show Hydrological Conditions" msgstr "Arată Condițiile Hidrologice" -#: src/components/fairway/Profiles.vue:120 +#: src/components/fairway/BottleneckDialogue.vue:125 #, fuzzy msgid "Show survey" msgstr "Masuratoare" @@ -1570,7 +1584,7 @@ msgid "Simple" msgstr "" -#: src/components/identify/Identify.vue:147 +#: src/components/identify/Identify.vue:198 msgid "" "Some data ©\n" " <a href=\"https://www.openstreetmap.org/copyright\">%{ name }</a>\n" @@ -1593,7 +1607,7 @@ msgid "Sounding Result" msgstr "Rezultate masuratori hidrografice" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:109 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:112 #, fuzzy msgid "Sounding Result Comparison" msgstr "Rezultate masuratori hidrografice" @@ -1602,36 +1616,39 @@ msgid "Soundingresults" msgstr "Rezultate masuratori hidrografice" +#: src/components/importoverview/FairwayDimensionDetail.vue:8 +msgid "Source" +msgstr "Sursa" + #: src/components/sections/Sections.vue:130 -#: src/components/stretches/Stretches.vue:130 +#: src/components/stretches/Stretches.vue:137 msgid "Source organization" msgstr "Organizatia sursa" #: src/components/identify/formatter.js:35 #: src/components/sections/SectionForm.vue:161 -#: src/components/stretches/StretchForm.vue:178 #, fuzzy msgid "Source Organization" msgstr "Organizatia sursa" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:154 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:155 msgid "Source orgranization" msgstr "Organizatia sursa" -#: src/components/identify/Identify.vue:144 +#: src/components/identify/Identify.vue:195 msgid "source-code" msgstr "cod sursa" #: src/components/sections/Sections.vue:196 +#: src/components/stretches/Stretches.vue:220 msgid "Staging Area" msgstr "Debarcader" -#: src/components/fairway/Profiles.vue:194 +#: src/components/fairway/BottleneckDialogue.vue:199 msgid "Start" msgstr "Porneste" #: src/components/sections/SectionForm.vue:25 -#: src/components/stretches/StretchForm.vue:42 msgid "Start rhm" msgstr "Rhm de pornire" @@ -1648,10 +1665,6 @@ msgid "Starting import of section" msgstr "Incepe importul secțiunii" -#: src/components/stretches/StretchForm.vue:352 -msgid "Starting import of stretch" -msgstr "Incepe importul secțiunii" - #: src/components/importoverview/ImportOverview.vue:196 msgid "Status" msgstr "Stare" @@ -1669,11 +1682,11 @@ #: src/components/importconfiguration/types/ApprovedGaugeMeasurement.vue:66 #: src/components/importconfiguration/types/WaterwayProfiles.vue:113 #: src/components/sections/SectionForm.vue:185 -#: src/components/stretches/StretchForm.vue:202 +#: src/components/stretches/StretchForm.vue:26 msgid "Submit" msgstr "Trimis" -#: src/components/fairway/AvailableFairwayDepth.vue:652 +#: src/components/fairway/AvailableFairwayDepth.vue:727 msgid "Sum of days" msgstr "" @@ -1681,14 +1694,20 @@ msgid "Sunday" msgstr "Duminica" -#: src/components/fairway/Profiles.vue:72 +#: src/components/fairway/BottleneckDialogue.vue:72 +#: src/components/fairway/BottleneckDialogue.vue:648 msgid "Survey" msgstr "Masuratoare" -#: src/components/Pdftool.vue:720 +#: src/components/Pdftool.vue:716 msgid "Survey date" msgstr "Data masuratorii" +#: src/components/importoverview/SoundingResultDetail.vue:11 +#, fuzzy +msgid "Survey from:" +msgstr "Masuratoare" + #: src/components/map/MapPopup.vue:165 #, fuzzy msgid "Surveys" @@ -1787,26 +1806,27 @@ msgid "The provided template has no name property." msgstr "Templat-ul furnizat nu are nume." -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:331 -msgid "There are invalid classbreak values. Please check" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:338 +msgid "There are invalid classbreak values." msgstr "" #: src/components/systemconfiguration/DataAccuracy.vue:88 msgid "There are less than" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:193 -#: src/components/fairway/AvailableFairwayDepth.vue:217 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:190 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:206 -#: src/components/fairway/Profiles.vue:423 +#: src/components/fairway/AvailableFairwayDepth.vue:213 +#: src/components/fairway/AvailableFairwayDepth.vue:233 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:212 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:223 +#: src/components/fairway/BottleneckDialogue.vue:428 #: src/components/importconfiguration/types/Soundingresults.vue:232 #: src/components/importconfiguration/types/Soundingresults.vue:251 #: src/components/layers/Layerselect.vue:68 +#: src/components/stretches/StretchForm.vue:56 msgid "this" msgstr "" -#: src/components/identify/Identify.vue:138 +#: src/components/identify/Identify.vue:189 msgid "" "This app uses <i>gemma</i>, which is Free Software under <br/>\n" " %{ license } without warranty, see docs for details." @@ -1836,7 +1856,6 @@ msgstr "Toleranta pentru captura axei caii navigabile [m]" #: src/components/sections/SectionForm.vue:89 -#: src/components/stretches/StretchForm.vue:106 #, fuzzy msgid "Tolerance for snapping to axis" msgstr "Toleranta pentru captura axei caii navigabile [m]" @@ -1877,6 +1896,11 @@ msgid "Upload new map template" msgstr "Incarca templat nou" +#: src/components/stretches/StretchForm.vue:84 +#, fuzzy +msgid "Upload of stretch complete" +msgstr "Incarca templat nou" + #: src/components/systemconfiguration/PDFTemplates.vue:183 msgid "Uploaded file does not contain valid json data." msgstr "Fisierele incarcate nu contin date json valide." @@ -1899,8 +1923,8 @@ msgid "URL" msgstr "URL" -#: src/components/identify/Identify.vue:134 -#: src/components/identify/Identify.vue:243 +#: src/components/identify/Identify.vue:185 +#: src/components/identify/Identify.vue:297 #, fuzzy msgid "User Manual" msgstr "Nume utilizator" @@ -1918,7 +1942,7 @@ msgid "Users" msgstr "Utilizatori" -#: src/components/identify/Identify.vue:153 +#: src/components/identify/Identify.vue:204 msgid "" "Uses\n" " <a href=\"https://download.geonames.org/export/dump/readme.txt" @@ -1942,18 +1966,18 @@ msgid "warning" msgstr "avertisment" -#: src/components/fairway/Profiles.vue:41 -#: src/components/gauge/Waterlevel.vue:150 +#: src/components/fairway/BottleneckDialogue.vue:41 +#: src/components/gauge/Waterlevel.vue:169 msgid "Waterlevel" msgstr "Nivelul apei" -#: src/components/gauge/HydrologicalConditions.vue:663 -#: src/components/gauge/Waterlevel.vue:613 +#: src/components/gauge/HydrologicalConditions.vue:680 +#: src/components/gauge/Waterlevel.vue:634 #, fuzzy msgid "Waterlevel [m]" msgstr "Nivelul apei [cm]" -#: src/components/gauge/Waterlevel.vue:170 +#: src/components/gauge/Waterlevel.vue:180 #, fuzzy msgid "waterlevels" msgstr "Nivelul apei" @@ -2016,19 +2040,19 @@ msgid "Weekly" msgstr "Saptamanal" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:194 -msgid "Widthlimit 1" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:196 +msgid "Widthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:210 -msgid "Widthlimit 2" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:212 +msgid "Widthlimit 2 [m]" msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1066 msgid "year" msgstr "an" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:624 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:632 #, fuzzy msgid "yearly" msgstr "an" @@ -2038,7 +2062,7 @@ msgid "yes" msgstr "Straturi" -#: src/components/fairway/Profiles.vue:625 +#: src/components/fairway/BottleneckDialogue.vue:630 msgid "" "You can now select these coordinates from the \"Saved cross profiles\" menu " "to restore this cross profile." @@ -2046,6 +2070,33 @@ "Acum poti selecta aceste coordonate din meniul \"Profile transversale salvate" "\" pentru a restaura profilul transversal." +#, fuzzy +#~ msgid "days." +#~ msgstr "7 zile" + +#, fuzzy +#~ msgid "Delete survey" +#~ msgstr "Șterge utilizator" + +#, fuzzy +#~ msgid "Do you really want to delete the survey:" +#~ msgstr "Chiar vrei să ştergi acest sector:" + +#~ msgid "Not implemented" +#~ msgstr "Nu este implementat" + +#~ msgid "Countrycode" +#~ msgstr "Cod ţara" + +#~ msgid "Delete Stretch" +#~ msgstr "Sterge sectorul" + +#~ msgid "Please enter a countrycode" +#~ msgstr "Introduceti un cod pentru țară" + +#~ msgid "Starting import of stretch" +#~ msgstr "Incepe importul secțiunii" + #~ msgid "Bottleneck Areas fill-color" #~ msgstr "Puncte critice - culoare fundal" @@ -2088,9 +2139,6 @@ #~ msgid "Simple schedule" #~ msgstr "Programare simplă" -#~ msgid "Source" -#~ msgstr "Sursa" - #~ msgid "User" #~ msgstr "Utilizator"
--- a/client/src/locale/sk_SK/LC_MESSAGES/app.po Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/locale/sk_SK/LC_MESSAGES/app.po Fri Sep 20 15:35:16 2019 +0200 @@ -91,7 +91,7 @@ msgid "Accesslog" msgstr "" -#: src/components/identify/Identify.vue:59 +#: src/components/identify/Identify.vue:74 msgid "According gauge data:" msgstr "" @@ -116,7 +116,7 @@ msgid "April" msgstr "" -#: src/store/map.js:214 +#: src/store/map.js:218 msgid "Area" msgstr "Oblasť" @@ -128,15 +128,15 @@ msgid "August" msgstr "" -#: src/components/identify/Identify.vue:324 +#: src/components/identify/Identify.vue:422 msgid "Avail: Below treshold" msgstr "" -#: src/components/identify/Identify.vue:321 -msgid "Avail: Last measurement <" +#: src/components/identify/Identify.vue:414 +msgid "Avail: Latest measurement from" msgstr "" -#: src/components/identify/Identify.vue:327 +#: src/components/identify/Identify.vue:428 msgid "Avail: Latest measurement older than" msgstr "" @@ -144,17 +144,17 @@ msgid "Availability of Gauge Measurements" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:228 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:432 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:230 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:440 #: src/components/toolbar/AvailableFairwayDepth.vue:35 msgid "Available fairway depth" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:620 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:628 msgid "Available Fairway Depth" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:235 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:237 msgid "Available fairway depth vs LNWL" msgstr "" @@ -163,7 +163,7 @@ msgstr "" #: src/components/sections/SectionForm.vue:178 -#: src/components/stretches/StretchForm.vue:195 +#: src/components/stretches/StretchForm.vue:18 msgid "Back" msgstr "" @@ -172,21 +172,22 @@ msgstr "" #: src/components/Bottlenecks.vue:188 src/components/Logs.vue:163 -#: src/components/Pdftool.vue:244 src/components/Pdftool.vue:832 +#: src/components/Pdftool.vue:237 src/components/Pdftool.vue:828 #: src/components/Search.vue:260 src/components/Search.vue:299 -#: src/components/fairway/AvailableFairwayDepth.vue:149 -#: src/components/fairway/AvailableFairwayDepth.vue:245 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:520 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:551 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:146 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:253 +#: src/components/fairway/AvailableFairwayDepth.vue:168 +#: src/components/fairway/AvailableFairwayDepth.vue:271 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:528 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:559 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:167 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:280 +#: src/components/fairway/BottleneckDialogue.vue:516 +#: src/components/fairway/BottleneckDialogue.vue:657 #: src/components/fairway/Fairwayprofile.vue:312 #: src/components/fairway/Fairwayprofile.vue:706 -#: src/components/fairway/Profiles.vue:511 -#: src/components/gauge/HydrologicalConditions.vue:237 -#: src/components/gauge/HydrologicalConditions.vue:1040 -#: src/components/gauge/Waterlevel.vue:240 -#: src/components/gauge/Waterlevel.vue:1178 +#: src/components/gauge/HydrologicalConditions.vue:253 +#: src/components/gauge/HydrologicalConditions.vue:1058 +#: src/components/gauge/Waterlevel.vue:259 +#: src/components/gauge/Waterlevel.vue:1206 #: src/components/importconfiguration/Import.vue:130 #: src/components/importconfiguration/Import.vue:147 #: src/components/importconfiguration/Import.vue:166 @@ -205,19 +206,19 @@ #: src/components/importoverview/ImportOverview.vue:246 #: src/components/importoverview/ImportOverview.vue:364 #: src/components/importoverview/ImportOverview.vue:376 -#: src/components/importoverview/ImportOverview.vue:458 -#: src/components/importoverview/LogEntry.vue:160 +#: src/components/importoverview/ImportOverview.vue:459 +#: src/components/importoverview/LogEntry.vue:161 #: src/components/importoverview/SectionDetails.vue:109 -#: src/components/importoverview/StretchDetails.vue:113 -#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:213 +#: src/components/importoverview/StretchDetails.vue:140 +#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:214 #: src/components/sections/SectionForm.vue:339 #: src/components/sections/Sections.vue:170 #: src/components/sections/Sections.vue:180 #: src/components/sections/Sections.vue:222 -#: src/components/stretches/StretchForm.vue:362 -#: src/components/stretches/Stretches.vue:170 -#: src/components/stretches/Stretches.vue:180 -#: src/components/stretches/Stretches.vue:232 +#: src/components/stretches/StretchForm.vue:91 +#: src/components/stretches/Stretches.vue:194 +#: src/components/stretches/Stretches.vue:204 +#: src/components/stretches/Stretches.vue:246 #: src/components/systemconfiguration/PDFTemplates.vue:165 #: src/components/systemconfiguration/PDFTemplates.vue:254 #: src/components/systemconfiguration/PDFTemplates.vue:292 @@ -225,7 +226,7 @@ #: src/components/usermanagement/Usermanagement.vue:216 #: src/components/usermanagement/Usermanagement.vue:253 #: src/components/usermanagement/Usermanagement.vue:261 -#: src/components/usermanagement/Usermanagement.vue:302 +#: src/components/usermanagement/Usermanagement.vue:302 src/lib/session.js:32 msgid "Backend Error" msgstr "" @@ -234,7 +235,7 @@ msgid "BeamType" msgstr "Typ" -#: src/components/Pdftool.vue:718 src/components/identify/formatter.js:26 +#: src/components/Pdftool.vue:714 src/components/identify/formatter.js:26 #: src/components/importconfiguration/types/Soundingresults.vue:13 msgid "Bottleneck" msgstr "Brody a úžiny" @@ -243,27 +244,31 @@ msgid "Bottleneck Morphology Classbreaks" msgstr "" -#: src/components/fairway/Profiles.vue:334 +#: src/components/fairway/BottleneckDialogue.vue:339 #: src/components/toolbar/Profiles.vue:35 #, fuzzy msgid "Bottleneck Surveys" msgstr "Brody a úžiny" +#: src/components/importoverview/SoundingResultDetail.vue:7 +#, fuzzy +msgid "Bottleneck:" +msgstr "Brody a úžiny" + #: src/components/Bottlenecks.vue:107 src/components/Sidebar.vue:19 #: src/components/fairway/AvailableFairwayDepthDialogue.vue:24 #: src/components/importconfiguration/ImportDetails.vue:32 msgid "Bottlenecks" msgstr "" -#: src/components/fairway/Profiles.vue:113 +#: src/components/fairway/BottleneckDialogue.vue:118 msgid "Calculating differences" msgstr "" #: src/components/Pdftool.vue:83 src/components/Popup.vue:28 -#: src/components/fairway/Profiles.vue:654 +#: src/components/fairway/BottleneckDialogue.vue:687 #: src/components/importconfiguration/Import.vue:204 -#: src/components/importoverview/ImportOverview.vue:447 -#: src/components/stretches/Stretches.vue:206 +#: src/components/importoverview/ImportOverview.vue:448 #: src/components/systemconfiguration/PDFTemplates.vue:331 #: src/components/usermanagement/Usermanagement.vue:268 msgid "Cancel" @@ -273,12 +278,15 @@ msgid "Chainage" msgstr "" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:106 +msgid "Changes need a map reload. Consider informing your users." +msgstr "" + #: src/components/sections/SectionForm.vue:251 -#: src/components/stretches/StretchForm.vue:270 msgid "Choose a distance mark by clicking on the map." msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:294 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:301 msgid "Choose color" msgstr "" @@ -294,6 +302,12 @@ msgid "Color Settings" msgstr "" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:216 +msgid "" +"Colour changes need a map reload. Value changes need a de- and re-select\n" +" of a difference calculation. Inform your users!" +msgstr "" + #: src/components/importoverview/ImportOverview.vue:17 msgid "Commit" msgstr "" @@ -302,15 +316,15 @@ msgid "Compare to" msgstr "" -#: src/components/fairway/Profiles.vue:90 +#: src/components/fairway/BottleneckDialogue.vue:95 msgid "Compare with" msgstr "" -#: src/components/identify/Identify.vue:343 +#: src/components/identify/Identify.vue:453 msgid "Confidence per 24h" msgstr "" -#: src/components/identify/Identify.vue:342 +#: src/components/identify/Identify.vue:450 msgid "Confidence per 72h" msgstr "" @@ -324,7 +338,7 @@ msgid "Confirm" msgstr "" -#: src/components/fairway/Profiles.vue:556 +#: src/components/fairway/BottleneckDialogue.vue:561 msgid "Coordinates copied to clipboard!" msgstr "" @@ -337,15 +351,11 @@ msgid "Country" msgstr "Štát" -#: src/components/stretches/StretchForm.vue:23 -msgid "Countrycode" -msgstr "" - #: src/components/importconfiguration/ScheduledImports.vue:363 msgid "Cronstring" msgstr "" -#: src/components/fairway/Profiles.vue:59 +#: src/components/fairway/BottleneckDialogue.vue:59 msgid "Current Waterlevel" msgstr "" @@ -353,21 +363,21 @@ msgid "Data Availability/Accuracy" msgstr "" -#: src/components/identify/Identify.vue:360 +#: src/components/identify/Identify.vue:483 msgid "Data too old. Treshold:" msgstr "" -#: src/components/identify/Identify.vue:357 +#: src/components/identify/Identify.vue:478 msgid "Data within revisiting treshold" msgstr "" -#: src/components/identify/Identify.vue:355 +#: src/components/identify/Identify.vue:473 msgid "Data within the revisiting time" msgstr "" #: src/components/importconfiguration/types/Soundingresults.vue:94 #: src/components/sections/Sections.vue:127 -#: src/components/stretches/Stretches.vue:127 +#: src/components/stretches/Stretches.vue:134 #: src/components/systemconfiguration/PDFTemplates.vue:120 msgid "Date" msgstr "" @@ -377,7 +387,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:144 -#: src/components/stretches/StretchForm.vue:161 msgid "Date info" msgstr "" @@ -394,10 +403,6 @@ msgid "Day" msgstr "Mapa" -#: src/components/systemconfiguration/DataAccuracy.vue:116 -msgid "days." -msgstr "" - #: src/components/importconfiguration/ScheduledImports.vue:1089 msgid "December" msgstr "" @@ -418,19 +423,18 @@ msgid "Define stretches" msgstr "" -#: src/components/stretches/Stretches.vue:121 +#: src/components/stretches/Stretches.vue:128 msgid "Define Stretches" msgstr "" -#: src/components/fairway/Profiles.vue:639 +#: src/components/fairway/BottleneckDialogue.vue:672 #: src/components/importconfiguration/Import.vue:182 -#: src/components/stretches/Stretches.vue:196 #: src/components/systemconfiguration/PDFTemplates.vue:308 #: src/components/usermanagement/Usermanagement.vue:242 msgid "Delete" msgstr "" -#: src/components/fairway/Profiles.vue:633 +#: src/components/fairway/BottleneckDialogue.vue:665 msgid "Delete cross profile" msgstr "" @@ -438,10 +442,6 @@ msgid "Delete Import" msgstr "" -#: src/components/stretches/Stretches.vue:188 -msgid "Delete Stretch" -msgstr "" - #: src/components/systemconfiguration/PDFTemplates.vue:300 msgid "Delete Template" msgstr "" @@ -466,8 +466,9 @@ msgid "deleted successfully" msgstr "" +#: src/components/fairway/BottleneckDialogue.vue:650 #: src/components/sections/Sections.vue:197 -#: src/components/stretches/Stretches.vue:201 +#: src/components/stretches/Stretches.vue:221 msgid "Deleting " msgstr "" @@ -475,20 +476,20 @@ msgid "Depth" msgstr "" -#: src/components/fairway/Profiles.vue:48 +#: src/components/fairway/BottleneckDialogue.vue:48 msgid "Depth Reference" msgstr "" -#: src/components/Pdftool.vue:724 +#: src/components/Pdftool.vue:720 msgid "Depth relativ to" msgstr "" #: src/components/fairway/AvailableFairwayDepthDialogue.vue:164 -msgid "Depthlimit 1 (in cm)" +msgid "Depthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:180 -msgid "Depthlimit 2 ( in cm)" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:181 +msgid "Depthlimit 2 [m]" msgstr "" #: src/components/importconfiguration/types/Soundingresults.vue:74 @@ -511,7 +512,7 @@ msgid "Distance marks virtual" msgstr "" -#: src/components/fairway/Profiles.vue:635 +#: src/components/fairway/BottleneckDialogue.vue:668 msgid "Do you really want to delete the cross profile:" msgstr "" @@ -527,11 +528,7 @@ msgid "Do you really want to delete the import with ID" msgstr "" -#: src/components/stretches/Stretches.vue:190 -msgid "Do you really want to delete this stretch:" -msgstr "" - -#: src/components/identify/Identify.vue:130 +#: src/components/identify/Identify.vue:181 msgid "Download" msgstr "" @@ -560,7 +557,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:57 -#: src/components/stretches/StretchForm.vue:74 msgid "End rhm" msgstr "" @@ -568,11 +564,11 @@ msgid "Enqueued" msgstr "" -#: src/components/fairway/Profiles.vue:175 +#: src/components/fairway/BottleneckDialogue.vue:180 msgid "Enter coordinates manually" msgstr "" -#: src/components/fairway/Profiles.vue:239 +#: src/components/fairway/BottleneckDialogue.vue:244 msgid "Enter label for cross profile" msgstr "" @@ -645,11 +641,11 @@ msgid "Fairway Dimensions" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:189 +#: src/components/fairway/AvailableFairwayDepth.vue:209 msgid "fairwayavailability" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:186 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:208 msgid "fairwayavailabilityLNWL" msgstr "" @@ -730,7 +726,7 @@ msgid "Gauge Waterlevel Date" msgstr "" -#: src/components/gauge/Gauges.vue:126 src/components/toolbar/Gauges.vue:34 +#: src/components/gauge/Gauges.vue:127 src/components/toolbar/Gauges.vue:34 msgid "Gauges" msgstr "" @@ -743,11 +739,11 @@ msgid "Generated by" msgstr "" -#: src/components/identify/Identify.vue:160 +#: src/components/identify/Identify.vue:211 msgid "Generated PDFs use font:" msgstr "" -#: src/components/identify/Identify.vue:340 +#: src/components/identify/Identify.vue:445 msgid "Highest confidence" msgstr "" @@ -759,11 +755,15 @@ msgid "Hour" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:146 +#: src/components/systemconfiguration/DataAccuracy.vue:116 +msgid "hours." +msgstr "" + +#: src/components/gauge/HydrologicalConditions.vue:150 msgid "Hydrological Conditions" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:154 +#: src/components/gauge/HydrologicalConditions.vue:159 msgid "hydrological-conditions" msgstr "" @@ -773,11 +773,10 @@ #: src/components/importconfiguration/Import.vue:252 #: src/components/sections/SectionForm.vue:5 -#: src/components/stretches/StretchForm.vue:5 msgid "ID" msgstr "" -#: src/components/identify/Identify.vue:240 src/components/map/MapPopup.vue:148 +#: src/components/identify/Identify.vue:294 src/components/map/MapPopup.vue:148 #: src/components/toolbar/Identify.vue:49 msgid "Identified Features" msgstr "" @@ -793,7 +792,7 @@ #: src/components/importconfiguration/types/Soundingresults.vue:347 #: src/components/importconfiguration/types/WaterwayProfiles.vue:187 #: src/components/sections/SectionForm.vue:328 -#: src/components/stretches/StretchForm.vue:351 +#: src/components/stretches/StretchForm.vue:83 msgid "Import" msgstr "" @@ -849,7 +848,7 @@ msgid "invalid email" msgstr "" -#: src/components/fairway/Profiles.vue:598 +#: src/components/fairway/BottleneckDialogue.vue:603 msgid "Invalid input" msgstr "" @@ -881,6 +880,12 @@ msgid "Later" msgstr "" +#: src/components/identify/Identify.vue:475 +#: src/components/identify/Identify.vue:480 +#: src/components/identify/Identify.vue:485 +msgid "Latest measurement" +msgstr "" + #: src/components/Bottlenecks.vue:116 msgid "Latest Measurement" msgstr "" @@ -898,7 +903,7 @@ msgid "Layers" msgstr "Vrstvy" -#: src/store/map.js:187 +#: src/store/map.js:191 msgid "Length" msgstr "" @@ -932,7 +937,7 @@ msgid "Map" msgstr "" -#: src/components/layers/Layers.vue:71 +#: src/components/layers/Layers.vue:73 #: src/components/systemconfiguration/Systemconfiguration.vue:31 #: src/components/toolbar/Layers.vue:35 #, fuzzy @@ -947,7 +952,7 @@ msgid "Maximum retry count" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:130 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:131 msgid "MaxWidth" msgstr "" @@ -972,6 +977,15 @@ msgid "Measurement Count in Last 14 Days" msgstr "" +#: src/components/identify/Identify.vue:416 +msgid "Measurement is within" +msgstr "" + +#: src/components/identify/Identify.vue:417 +#: src/components/identify/Identify.vue:423 +msgid "measurements" +msgstr "" + #: src/components/systemconfiguration/DataAccuracy.vue:97 msgid "measurements in the last 14 days." msgstr "" @@ -990,7 +1004,7 @@ msgid "minutes past" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:109 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:110 msgid "MinWidth" msgstr "" @@ -1002,7 +1016,7 @@ msgid "month" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:622 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:630 msgid "monthly" msgstr "" @@ -1013,27 +1027,26 @@ #: src/components/Bottlenecks.vue:113 src/components/identify/formatter.js:6 #: src/components/identify/formatter.js:7 #: src/components/sections/Sections.vue:124 -#: src/components/stretches/Stretches.vue:124 +#: src/components/stretches/Stretches.vue:131 #: src/components/systemconfiguration/PDFTemplates.vue:117 msgid "Name" msgstr "Názov" -#: src/components/identify/Identify.vue:252 -#: src/components/identify/Identify.vue:253 -#: src/components/identify/Identify.vue:254 -#: src/components/identify/Identify.vue:266 -#: src/components/identify/Identify.vue:267 -#: src/components/identify/Identify.vue:268 +#: src/components/identify/Identify.vue:317 +#: src/components/identify/Identify.vue:321 +#: src/components/identify/Identify.vue:324 +#: src/components/identify/Identify.vue:348 +#: src/components/identify/Identify.vue:352 +#: src/components/identify/Identify.vue:355 msgid "Nash-Sutcliffe" msgstr "" -#: src/components/identify/Identify.vue:255 -#: src/components/identify/Identify.vue:269 +#: src/components/identify/Identify.vue:326 +#: src/components/identify/Identify.vue:357 msgid "Nash-Sutcliffe not available" msgstr "" #: src/components/sections/SectionForm.vue:131 -#: src/components/stretches/StretchForm.vue:148 msgid "National Object name" msgstr "" @@ -1058,7 +1071,7 @@ msgid "New section" msgstr "" -#: src/components/stretches/Stretches.vue:66 +#: src/components/stretches/Stretches.vue:72 msgid "New stretch" msgstr "" @@ -1068,11 +1081,11 @@ #: src/components/fairway/Fairwayprofile.vue:92 #: src/components/gauge/HydrologicalConditions.vue:79 -#: src/components/gauge/Waterlevel.vue:78 +#: src/components/gauge/Waterlevel.vue:89 msgid "No data available." msgstr "" -#: src/components/identify/Identify.vue:122 +#: src/components/identify/Identify.vue:173 msgid "No features identified." msgstr "" @@ -1080,20 +1093,24 @@ msgid "No results." msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:270 +#: src/components/identify/Identify.vue:467 +msgid "No revisiting time defined" +msgstr "" + +#: src/components/systemconfiguration/ColorSettings.vue:272 msgid "No style-changes" msgstr "" -#: src/components/stretches/Stretches.vue:200 -msgid "Not implemented" +#: src/components/identify/Identify.vue:469 +msgid "No survey-data available" msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1088 msgid "November" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:630 -#: src/components/gauge/Waterlevel.vue:735 +#: src/components/gauge/HydrologicalConditions.vue:647 +#: src/components/gauge/Waterlevel.vue:756 msgid "Now" msgstr "" @@ -1102,7 +1119,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:114 -#: src/components/stretches/StretchForm.vue:131 msgid "Object name" msgstr "" @@ -1175,7 +1191,7 @@ msgid "pending" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:608 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:669 msgid "Percent" msgstr "" @@ -1187,17 +1203,12 @@ msgid "Please choose a role" msgstr "" -#: src/components/stretches/StretchForm.vue:34 -msgid "Please enter a countrycode" -msgstr "" - #: src/components/importconfiguration/types/Soundingresults.vue:104 #: src/components/sections/SectionForm.vue:155 -#: src/components/stretches/StretchForm.vue:172 msgid "Please enter a date" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:99 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:100 msgid "Please enter a depth" msgstr "" @@ -1213,11 +1224,11 @@ msgid "Please enter a level of service" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:143 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:144 msgid "Please enter a maximum width" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:122 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:123 msgid "Please enter a minimum width" msgstr "" @@ -1235,23 +1246,20 @@ msgstr "" #: src/components/sections/SectionForm.vue:171 -#: src/components/stretches/StretchForm.vue:188 #, fuzzy msgid "Please enter a source organization" msgstr "Vyberte krajinu" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:167 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:168 msgid "Please enter a source orgranization" msgstr "" #: src/components/sections/SectionForm.vue:51 -#: src/components/stretches/StretchForm.vue:68 msgid "Please enter a start point" msgstr "" #: src/components/importconfiguration/types/Bottleneck.vue:69 #: src/components/sections/SectionForm.vue:106 -#: src/components/stretches/StretchForm.vue:123 msgid "Please enter a tolerance value" msgstr "" @@ -1274,17 +1282,14 @@ msgstr "" #: src/components/sections/SectionForm.vue:83 -#: src/components/stretches/StretchForm.vue:100 msgid "Please enter an end point" msgstr "" #: src/components/sections/SectionForm.vue:17 -#: src/components/stretches/StretchForm.vue:17 msgid "Please enter an id" msgstr "" #: src/components/sections/SectionForm.vue:125 -#: src/components/stretches/StretchForm.vue:142 msgid "Please enter an objectname" msgstr "" @@ -1293,7 +1298,7 @@ msgid "Please enter an originator" msgstr "Vyberte krajinu" -#: src/components/fairway/Profiles.vue:599 +#: src/components/fairway/BottleneckDialogue.vue:604 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" msgstr "" @@ -1322,6 +1327,10 @@ msgid "Positive values are the upper limit for retries" msgstr "" +#: src/components/identify/Identify.vue:455 +msgid "Predictions not available" +msgstr "" + #: src/components/KeyboardHandler.vue:69 msgid "Press ESC to close compare view." msgstr "" @@ -1330,11 +1339,11 @@ msgid "Press ESC to stop drawing." msgstr "" -#: src/components/fairway/Profiles.vue:650 +#: src/components/fairway/BottleneckDialogue.vue:683 msgid "Profile deleted!" msgstr "" -#: src/components/fairway/Profiles.vue:624 +#: src/components/fairway/BottleneckDialogue.vue:629 msgid "Profile saved!" msgstr "" @@ -1342,7 +1351,7 @@ msgid "Projection" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:623 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:631 msgid "quarterly" msgstr "" @@ -1351,7 +1360,7 @@ msgid "Recency of Bottleneck Surveys" msgstr "Brody a úžiny" -#: src/components/Pdftool.vue:722 +#: src/components/Pdftool.vue:718 msgid "Ref gauge" msgstr "" @@ -1375,15 +1384,15 @@ msgid "Request password reset!" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:50 +#: src/components/systemconfiguration/ColorSettings.vue:56 msgid "Reset all to defaults" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:44 +#: src/components/systemconfiguration/ColorSettings.vue:49 #: src/components/systemconfiguration/DataAccuracy.vue:274 #: src/components/systemconfiguration/MapLayers.vue:58 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:101 -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:208 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:211 msgid "Reset to defaults" msgstr "" @@ -1400,7 +1409,7 @@ msgstr "" #: src/components/sections/Sections.vue:133 -#: src/components/stretches/Stretches.vue:133 +#: src/components/stretches/Stretches.vue:140 msgid "Review pending import" msgstr "" @@ -1409,12 +1418,12 @@ msgid "Role" msgstr "" -#: src/components/fairway/Profiles.vue:420 +#: src/components/fairway/BottleneckDialogue.vue:425 msgid "Rotate Maps" msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:312 -msgid "Same value is used in multiple fields. Please check" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:319 +msgid "Same value is used in multiple fields." msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1074 @@ -1426,7 +1435,7 @@ msgid "Save" msgstr "" -#: src/components/fairway/Profiles.vue:148 +#: src/components/fairway/BottleneckDialogue.vue:153 msgid "Saved cross profiles" msgstr "" @@ -1434,7 +1443,7 @@ msgid "Saved import: #" msgstr "" -#: src/components/Pdftool.vue:479 +#: src/components/Pdftool.vue:475 msgid "Scale" msgstr "" @@ -1459,13 +1468,13 @@ msgid "Sections" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:436 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:444 #: src/components/importconfiguration/types/Soundingresults.vue:400 #, fuzzy msgid "Select bottleneck" msgstr "Brody a úžiny" -#: src/components/fairway/Profiles.vue:21 +#: src/components/fairway/BottleneckDialogue.vue:21 msgid "Select Bottleneck" msgstr "" @@ -1473,23 +1482,23 @@ msgid "Select Gauge" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:439 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:447 msgid "Select section" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:438 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:446 msgid "Select stretch" msgstr "" -#: src/components/systemconfiguration/ColorSettings.vue:38 +#: src/components/systemconfiguration/ColorSettings.vue:43 #: src/components/systemconfiguration/DataAccuracy.vue:271 #: src/components/systemconfiguration/MapLayers.vue:55 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:95 -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:202 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:205 msgid "Send" msgstr "Poslať" -#: src/components/systemconfiguration/ColorSettings.vue:55 +#: src/components/systemconfiguration/ColorSettings.vue:61 #, fuzzy msgid "Send all" msgstr "Poslať" @@ -1502,7 +1511,7 @@ msgid "September" msgstr "" -#: src/components/fairway/Profiles.vue:123 +#: src/components/fairway/BottleneckDialogue.vue:128 msgid "Show differences" msgstr "" @@ -1510,7 +1519,7 @@ msgid "Show Hydrological Conditions" msgstr "" -#: src/components/fairway/Profiles.vue:120 +#: src/components/fairway/BottleneckDialogue.vue:125 msgid "Show survey" msgstr "" @@ -1526,7 +1535,7 @@ msgid "Simple" msgstr "" -#: src/components/identify/Identify.vue:147 +#: src/components/identify/Identify.vue:198 msgid "" "Some data ©\n" " <a href=\"https://www.openstreetmap.org/copyright\">%{ name }</a>\n" @@ -1545,7 +1554,7 @@ msgid "Sounding Result" msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:109 +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:112 msgid "Sounding Result Comparison" msgstr "" @@ -1553,35 +1562,38 @@ msgid "Soundingresults" msgstr "" +#: src/components/importoverview/FairwayDimensionDetail.vue:8 +msgid "Source" +msgstr "Zdroj správy" + #: src/components/sections/Sections.vue:130 -#: src/components/stretches/Stretches.vue:130 +#: src/components/stretches/Stretches.vue:137 msgid "Source organization" msgstr "" #: src/components/identify/formatter.js:35 #: src/components/sections/SectionForm.vue:161 -#: src/components/stretches/StretchForm.vue:178 msgid "Source Organization" msgstr "" -#: src/components/importconfiguration/types/Fairwaydimensions.vue:154 +#: src/components/importconfiguration/types/Fairwaydimensions.vue:155 msgid "Source orgranization" msgstr "" -#: src/components/identify/Identify.vue:144 +#: src/components/identify/Identify.vue:195 msgid "source-code" msgstr "" #: src/components/sections/Sections.vue:196 +#: src/components/stretches/Stretches.vue:220 msgid "Staging Area" msgstr "" -#: src/components/fairway/Profiles.vue:194 +#: src/components/fairway/BottleneckDialogue.vue:199 msgid "Start" msgstr "" #: src/components/sections/SectionForm.vue:25 -#: src/components/stretches/StretchForm.vue:42 msgid "Start rhm" msgstr "" @@ -1597,10 +1609,6 @@ msgid "Starting import of section" msgstr "" -#: src/components/stretches/StretchForm.vue:352 -msgid "Starting import of stretch" -msgstr "" - #: src/components/importoverview/ImportOverview.vue:196 msgid "Status" msgstr "" @@ -1616,11 +1624,11 @@ #: src/components/importconfiguration/types/ApprovedGaugeMeasurement.vue:66 #: src/components/importconfiguration/types/WaterwayProfiles.vue:113 #: src/components/sections/SectionForm.vue:185 -#: src/components/stretches/StretchForm.vue:202 +#: src/components/stretches/StretchForm.vue:26 msgid "Submit" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:652 +#: src/components/fairway/AvailableFairwayDepth.vue:727 msgid "Sum of days" msgstr "" @@ -1628,14 +1636,19 @@ msgid "Sunday" msgstr "" -#: src/components/fairway/Profiles.vue:72 +#: src/components/fairway/BottleneckDialogue.vue:72 +#: src/components/fairway/BottleneckDialogue.vue:648 msgid "Survey" msgstr "" -#: src/components/Pdftool.vue:720 +#: src/components/Pdftool.vue:716 msgid "Survey date" msgstr "" +#: src/components/importoverview/SoundingResultDetail.vue:11 +msgid "Survey from:" +msgstr "" + #: src/components/map/MapPopup.vue:165 msgid "Surveys" msgstr "" @@ -1733,26 +1746,27 @@ msgid "The provided template has no name property." msgstr "" -#: src/components/systemconfiguration/MorphologyClassbreaks.vue:331 -msgid "There are invalid classbreak values. Please check" +#: src/components/systemconfiguration/MorphologyClassbreaks.vue:338 +msgid "There are invalid classbreak values." msgstr "" #: src/components/systemconfiguration/DataAccuracy.vue:88 msgid "There are less than" msgstr "" -#: src/components/fairway/AvailableFairwayDepth.vue:193 -#: src/components/fairway/AvailableFairwayDepth.vue:217 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:190 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:206 -#: src/components/fairway/Profiles.vue:423 +#: src/components/fairway/AvailableFairwayDepth.vue:213 +#: src/components/fairway/AvailableFairwayDepth.vue:233 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:212 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:223 +#: src/components/fairway/BottleneckDialogue.vue:428 #: src/components/importconfiguration/types/Soundingresults.vue:232 #: src/components/importconfiguration/types/Soundingresults.vue:251 #: src/components/layers/Layerselect.vue:68 +#: src/components/stretches/StretchForm.vue:56 msgid "this" msgstr "" -#: src/components/identify/Identify.vue:138 +#: src/components/identify/Identify.vue:189 msgid "" "This app uses <i>gemma</i>, which is Free Software under <br/>\n" " %{ license } without warranty, see docs for details." @@ -1779,7 +1793,6 @@ msgstr "" #: src/components/sections/SectionForm.vue:89 -#: src/components/stretches/StretchForm.vue:106 msgid "Tolerance for snapping to axis" msgstr "" @@ -1817,6 +1830,10 @@ msgid "Upload new map template" msgstr "" +#: src/components/stretches/StretchForm.vue:84 +msgid "Upload of stretch complete" +msgstr "" + #: src/components/systemconfiguration/PDFTemplates.vue:183 msgid "Uploaded file does not contain valid json data." msgstr "" @@ -1839,8 +1856,8 @@ msgid "URL" msgstr "" -#: src/components/identify/Identify.vue:134 -#: src/components/identify/Identify.vue:243 +#: src/components/identify/Identify.vue:185 +#: src/components/identify/Identify.vue:297 msgid "User Manual" msgstr "" @@ -1857,7 +1874,7 @@ msgid "Users" msgstr "" -#: src/components/identify/Identify.vue:153 +#: src/components/identify/Identify.vue:204 msgid "" "Uses\n" " <a href=\"https://download.geonames.org/export/dump/readme.txt" @@ -1877,17 +1894,17 @@ msgid "warning" msgstr "" -#: src/components/fairway/Profiles.vue:41 -#: src/components/gauge/Waterlevel.vue:150 +#: src/components/fairway/BottleneckDialogue.vue:41 +#: src/components/gauge/Waterlevel.vue:169 msgid "Waterlevel" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:663 -#: src/components/gauge/Waterlevel.vue:613 +#: src/components/gauge/HydrologicalConditions.vue:680 +#: src/components/gauge/Waterlevel.vue:634 msgid "Waterlevel [m]" msgstr "" -#: src/components/gauge/Waterlevel.vue:170 +#: src/components/gauge/Waterlevel.vue:180 msgid "waterlevels" msgstr "" @@ -1945,19 +1962,19 @@ msgid "Weekly" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:194 -msgid "Widthlimit 1" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:196 +msgid "Widthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:210 -msgid "Widthlimit 2" +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:212 +msgid "Widthlimit 2 [m]" msgstr "" #: src/components/importconfiguration/ScheduledImports.vue:1066 msgid "year" msgstr "Rok" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:624 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:632 #, fuzzy msgid "yearly" msgstr "Rok" @@ -1967,15 +1984,12 @@ msgid "yes" msgstr "Vrstvy" -#: src/components/fairway/Profiles.vue:625 +#: src/components/fairway/BottleneckDialogue.vue:630 msgid "" "You can now select these coordinates from the \"Saved cross profiles\" menu " "to restore this cross profile." msgstr "" -#~ msgid "Source" -#~ msgstr "Zdroj správy" - #, fuzzy #~ msgid "Chose preset" #~ msgstr "Vyberte formát"
--- a/client/src/store/fairwayavailability.js Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/store/fairwayavailability.js Fri Sep 20 15:35:16 2019 +0200 @@ -192,8 +192,14 @@ // See docs/developers.md for an example how to directly // call this method for testing. setAvailableFairwayDepthData: (state, data) => { - state.csv = data; - const csv = data.split("\n").filter(x => x !== ""); //omit empty lines + const lines = data.split("\n"); + let [header, rest] = [lines.shift(), lines]; + // convert values to meter in the csv header + state.csv = [ + header.replace(/\d+\.?\d*/g, x => `${x / 100}m`), + ...rest + ].join("\n"); + const csv = [header, ...rest].filter(x => x !== ""); //omit empty lines // setLegend const headerEntries = csv.shift().split(",");
--- a/client/src/store/map.js Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/store/map.js Fri Sep 20 15:35:16 2019 +0200 @@ -49,7 +49,8 @@ cutToolEnabled: false, isolinesLegendImgDataURL: "", differencesLegendImgDataURL: "", - ongoingRefresh: false + ongoingRefresh: false, + reviewActive: false }; }; @@ -68,6 +69,9 @@ } }, mutations: { + reviewActive: (state, active) => { + state.reviewActive = active; + }, startRefreshLayers: state => { state.ongoingRefresh = true; },
--- a/client/src/store/usermanagement.js Mon Sep 16 16:56:11 2019 +0200 +++ b/client/src/store/usermanagement.js Fri Sep 20 15:35:16 2019 +0200 @@ -97,7 +97,7 @@ deleteUser({ commit }, data) { const { name } = data; return new Promise((resolve, reject) => { - HTTP.delete("/users/" + name, { + HTTP.delete("/users/" + encodeURIComponent(`${name}`), { headers: { "X-Gemma-Auth": localStorage.getItem("token") } }) .then(response => { @@ -115,7 +115,9 @@ if (user.isNew) { return new Promise((resolve, reject) => { HTTP.post("/users", user, { - headers: { "X-Gemma-Auth": localStorage.getItem("token") } + headers: { + "X-Gemma-Auth": localStorage.getItem("token") + } }) .then(response => { commit("setUserDetailsInvisible");
--- a/cmd/gemma/main.go Mon Sep 16 16:56:11 2019 +0200 +++ b/cmd/gemma/main.go Fri Sep 20 15:35:16 2019 +0200 @@ -11,6 +11,8 @@ // Author(s): // * Sascha L. Teichmann <sascha.teichmann@intevation.de> +// Command gemma starts the middleware server +// for waterway monitoring and management. package main import (
--- a/cmd/wfs/main.go Mon Sep 16 16:56:11 2019 +0200 +++ b/cmd/wfs/main.go Fri Sep 20 15:35:16 2019 +0200 @@ -11,6 +11,7 @@ // Author(s): // * Sascha L. Teichmann <sascha.teichmann@intevation.de> +// Command wfs is an diagnostic tool for manually downloading WFS data. package main import (
--- a/docs/DEVELOPMENT.md Mon Sep 16 16:56:11 2019 +0200 +++ b/docs/DEVELOPMENT.md Fri Sep 20 15:35:16 2019 +0200 @@ -1,5 +1,23 @@ # Development +Main development is done on GNU/Linux systems, mainly Debian (stretch) +or Ubuntu (18.04 LTS "Bionic Beaver"). First try packages from these +distributions. + +`Makefile` requires GNU Make for building. And `.sh` files refer to Bash. +(Both are standard in GNU/Linux setups.) + + +# View source code history + +If you want to see the source code structure and history +on our local machine (instead of online): + `hg serve` +from Mercurial SCM will start a local server. Install the +[HighlightExtension](https://www.mercurial-scm.org/wiki/HighlightExtension) +to enable syntax highlighting. + + ## Backend You need a working [Go](https://golang.org/dl) build environment (1.10+). @@ -20,6 +38,25 @@ * Run Run server with `./cmd/gemma/gemma` + +### View source code documentation interactively + +Use https://godoc.org/golang.org/x/tools/cmd/godoc +(coming with package `golang-golang-x-tools` on Ubuntu.) +to see the formatted documentation. + +Started in the top level directory like + `godoc -http=:6060` +you can access the documentation at +`http://localhost:6060/pkg/gemma.intevation.de/?m=all` + +Hints: + * A parameter like `-goroot /usr/lib/go-1.12` may avoid warnings, if + the goroot is somewhere else. + * Clicking on a function declaration header will take you to the source + code. (Or changing `?m=all` to `?m=src?`). + + ## Client See [client/README](../client/README.md) for details.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/go.mod Fri Sep 20 15:35:16 2019 +0200 @@ -0,0 +1,29 @@ +module gemma.intevation.de/gemma + +go 1.13 + +require ( + github.com/cockroachdb/apd v1.1.0 // indirect + github.com/etcd-io/bbolt v1.3.3 + github.com/gofrs/uuid v3.2.0+incompatible // indirect + github.com/golang/snappy v0.0.1 + github.com/gorilla/mux v1.7.3 + github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect + github.com/jackc/pgx v3.6.0+incompatible + github.com/jonas-p/go-shp v0.1.1 + github.com/lib/pq v1.2.0 // indirect + github.com/mitchellh/go-homedir v1.1.0 + github.com/rs/cors v1.7.0 + github.com/sergi/go-diff v1.0.0 + github.com/shopspring/decimal v0.0.0-20190905144223-a36b5d85f337 // indirect + github.com/spf13/cobra v0.0.5 + github.com/spf13/viper v1.4.0 + github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e + github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563 // indirect + golang.org/x/net v0.0.0-20190918130420-a8b05e9114ab + golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e + gonum.org/v1/gonum v0.0.0-20190915125329-975d99cd20a9 + gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect + gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df + gopkg.in/robfig/cron.v1 v1.2.0 +)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/go.sum Fri Sep 20 15:35:16 2019 +0200 @@ -0,0 +1,210 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= +github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/etcd-io/bbolt v1.3.3 h1:gSJmxrs37LgTqR/oyJBWok6k6SvXEUerFTbltIhXkBM= +github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= +github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= +github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc= +github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= +github.com/jackc/pgx v3.6.0+incompatible h1:bJeo4JdVbDAW8KB2m8XkFeo8CPipREoG37BwEoKGz+Q= +github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= +github.com/jonas-p/go-shp v0.1.1 h1:LY81nN67DBCz6VNFn2kS64CjmnDo9IP8rmSkTvhO9jE= +github.com/jonas-p/go-shp v0.1.1/go.mod h1:MRIhyxDQ6VVp0oYeD7yPGr5RSTNScUFKCDsI5DR7PtI= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= +github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/shopspring/decimal v0.0.0-20190905144223-a36b5d85f337 h1:Da9XEUfFxgyDOqUfwgoTDcWzmnlOnCGi6i4iPS+8Fbw= +github.com/shopspring/decimal v0.0.0-20190905144223-a36b5d85f337/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e h1:+NL1GDIUOKxVfbp2KoJQD9cTQ6dyP2co9q4yzmT9FZo= +github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e/go.mod h1:/h+UnNGt0IhNNJLkGikcdcJqm66zGD/uJGMRxK/9+Ao= +github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563 h1:Otn9S136ELckZ3KKDyCkxapfufrqDqwmGjcHfAyXRrE= +github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563/go.mod h1:mLqSmt7Dv/CNneF2wfcChfN1rvapyQr01LGKnKex0DQ= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +go.etcd.io/bbolt v1.3.2 h1:Z/90sZLPOeCy2PwprqkFa25PdkusRzaj9P8zm/KNyvk= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2 h1:y102fOLFqhV41b+4GPiJoa0k/x+pJcEi2/HB1Y5T6fU= +golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190918130420-a8b05e9114ab h1:h5tBRKZ1aY/bo6GNqe/4zWC8GkaLOFQ5wPKIOQ0i2sA= +golang.org/x/net v0.0.0-20190918130420-a8b05e9114ab/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= +gonum.org/v1/gonum v0.0.0-20190915125329-975d99cd20a9 h1:iyiQMxGFo4ru94OFxK2QJuucYB9MYP9+M/dtFx5HmiE= +gonum.org/v1/gonum v0.0.0-20190915125329-975d99cd20a9/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= +gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc= +gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= +gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= +gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE= +gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/robfig/cron.v1 v1.2.0 h1:PSJsm0uPEND0Rumxxbo7qNb7bxQUTIWDIdpPS59/tcw= +gopkg.in/robfig/cron.v1 v1.2.0/go.mod h1:3I22DCB+7VAStCIqyArwi2xY9a7IioCiNjrsnCqs+HE= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/misc/gemma.service Fri Sep 20 15:35:16 2019 +0200 @@ -0,0 +1,12 @@ +[Unit] +Description=Gemma Server +After=network.target + +[Service] +Type=simple +ExecStart=/home/gemma/gemma/cmd/gemma/gemma -c /home/gemma/gemma.toml +User=gemma +Group=gemma + +[Install] +WantedBy=multi-user.target
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package.json Fri Sep 20 15:35:16 2019 +0200 @@ -0,0 +1,5 @@ +{ + "dependencies": { + "sanitize-filename": "^1.6.3" + } +}
--- a/pkg/common/round.go Mon Sep 16 16:56:11 2019 +0200 +++ b/pkg/common/round.go Fri Sep 20 15:35:16 2019 +0200 @@ -4,7 +4,7 @@ // SPDX-License-Identifier: AGPL-3.0-or-later // License-Filename: LICENSES/AGPL-3.0.txt // -// Copyright (C) 2018 by via donau +// Copyright (C) 2019 by via donau // – Österreichische Wasserstraßen-Gesellschaft mbH // Software engineering by Intevation GmbH // @@ -19,49 +19,48 @@ "time" ) -type Rest struct { - Key int - Rest float64 -} +// SumPreservingRound rounds the values of arr preserving the sum. +func SumPreservingRound(arr []float64) []int { -// Simple sum preserving rounding method: -func SumPreservingRound(arr []float64) []int { + type rest struct { + key int + rest float64 + } + var ( - sum float64 - rests []Rest + result = make([]int, len(arr)) + rests = make([]rest, len(arr)) + sum float64 + newSum int ) - result := make([]int, len(arr)) // floor all values for i, v := range arr { sum += v result[i] = int(v) - rests = append(rests, Rest{Key: i, Rest: v - float64(result[i])}) + newSum += int(v) + rests[i] = rest{key: i, rest: v - float64(result[i])} } - // find the difference in summs - var newSum int - for _, v := range result { - newSum += v - } - delta := int(math.Round(sum)) - newSum - // spread delta over values with highest rest sort.Slice(rests, func(i, j int) bool { - return rests[i].Rest > rests[j].Rest + return rests[i].rest > rests[j].rest }) + + // find the difference in sums + delta := int(math.Round(sum)) - newSum for _, v := range rests { if delta <= 0 { break } - result[v.Key]++ + result[v.key]++ delta-- } return result } -// Round anarray of Duratons to full days +// RoundToFullDays rounds durations to full days. func RoundToFullDays(durations []time.Duration) []int { days := make([]float64, len(durations)) for i, v := range durations {
--- a/pkg/controllers/routes.go Mon Sep 16 16:56:11 2019 +0200 +++ b/pkg/controllers/routes.go Fri Sep 20 15:35:16 2019 +0200 @@ -241,7 +241,7 @@ kinds := strings.Join([]string{ "bn", "gm", "fa", "wx", "wa", "wg", "dmv", "fd", "dma", - "sec", "dsec", + "sec", "dsec", "dst", "dsr", }, "|") api.Handle("/imports/{kind:"+kinds+"}", waterwayAdmin(&mw.JSONHandler{
--- a/pkg/controllers/shapestretches.go Mon Sep 16 16:56:11 2019 +0200 +++ b/pkg/controllers/shapestretches.go Fri Sep 20 15:35:16 2019 +0200 @@ -45,14 +45,14 @@ nobjnam, date_info, source_organization -FROM waterway.stretches WHERE +FROM users.stretches WHERE staging_done AND name = $1` selectStretchCountriesSQL = ` -SELECT country_code FROM waterway.stretch_countries -WHERE stretches_id = $1 -ORDER BY country_code` +SELECT country FROM users.stretch_countries +WHERE stretch_id = $1 +ORDER BY country` ) func flattenPoints(mp wkb.MultiPolygonGeom) []shp.Point {
--- a/pkg/controllers/stretches.go Mon Sep 16 16:56:11 2019 +0200 +++ b/pkg/controllers/stretches.go Fri Sep 20 15:35:16 2019 +0200 @@ -45,7 +45,7 @@ SELECT distinct(b.objnam), b.limiting -FROM waterway.stretches s, waterway.bottlenecks b +FROM users.stretches s, waterway.bottlenecks b WHERE b.validity @> current_timestamp AND ST_Intersects(b.area, s.area) AND s.name = $1`
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pkg/imports/dsr.go Fri Sep 20 15:35:16 2019 +0200 @@ -0,0 +1,131 @@ +// This is Free Software under GNU Affero General Public License v >= 3.0 +// without warranty, see README.md and license for details. +// +// SPDX-License-Identifier: AGPL-3.0-or-later +// License-Filename: LICENSES/AGPL-3.0.txt +// +// Copyright (C) 2019 by via donau +// – Österreichische Wasserstraßen-Gesellschaft mbH +// Software engineering by Intevation GmbH +// +// Author(s): +// * Sascha L. Teichmann <sascha.teichmann@intevation.de> +// * Sascha Wilde <wilde@intevation.de> + +package imports + +import ( + "context" + "database/sql" + "errors" + + "gemma.intevation.de/gemma/pkg/models" +) + +// DeleteSoundingResult is a Job to delete a sounding result from the database. +type DeleteSoundingResult struct { + BottleneckId string `json:"bottleneck-id"` + Date models.Date `json:"date-info"` +} + +// DSRJobKind is the import queue type identifier. +const DSRJobKind JobKind = "dsr" + +type dsrJobCreator struct{} + +func init() { RegisterJobCreator(DSRJobKind, dsrJobCreator{}) } + +func (dsrJobCreator) Description() string { return "delete sounding result" } + +func (dsrJobCreator) AutoAccept() bool { return false } + +func (dsrJobCreator) Create() Job { return new(DeleteSoundingResult) } + +func (dsrJobCreator) Depends() [2][]string { + // Same as import. + return srJobCreator{}.Depends() +} + +const ( + dsrFindSQL = ` +SELECT id FROM waterway.sounding_results + WHERE bottleneck_id = $1 + AND date_info = $2 + AND staging_done +` + dsrStageDoneSQL = ` +DELETE FROM waterway.sounding_results +WHERE id IN ( + SELECT key from import.track_imports + WHERE import_id = $1 AND + deletion AND + relation = 'waterway.sounding_results'::regclass)` +) + +// StageDone finally removes the sounding result from the database. +func (dsrJobCreator) StageDone( + ctx context.Context, + tx *sql.Tx, + id int64, +) error { + result, err := tx.ExecContext(ctx, dsrStageDoneSQL, id) + if err != nil { + return err + } + rows, err := result.RowsAffected() + if err != nil { + return err + } + if rows == 0 { + return errors.New("Deletion failed. " + + "Propably Data outside the area of responsibility." + + "Or the data was already deleted by another user.") + } + return err +} + +// CleanUp of a sounding result delete import is a NOP. +func (*DeleteSoundingResult) CleanUp() error { return nil } + +// Do prepares the deletion of the sounding result. +func (dsr *DeleteSoundingResult) Do( + ctx context.Context, + importID int64, + conn *sql.Conn, + feedback Feedback, +) (interface{}, error) { + + tx, err := conn.BeginTx(ctx, nil) + if err != nil { + return nil, err + } + defer tx.Rollback() + + feedback.Info("SR: bottleneck-id: %v, date-info: %v", + dsr.BottleneckId, dsr.Date.Time) + + var id int64 + if err := tx.QueryRowContext(ctx, dsrFindSQL, + dsr.BottleneckId, dsr.Date.Time).Scan(&id); err != nil { + return nil, err + } + + feedback.Info("Prepare deletion of sounding result with id %d", id) + + if _, err := tx.ExecContext( + ctx, + trackImportDeletionSQL, + importID, + "waterway.sounding_results", + id, + true, + ); err != nil { + return nil, err + } + + if err := tx.Commit(); err != nil { + return nil, err + } + + return dsr, nil +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pkg/imports/dst.go Fri Sep 20 15:35:16 2019 +0200 @@ -0,0 +1,117 @@ +// This is Free Software under GNU Affero General Public License v >= 3.0 +// without warranty, see README.md and license for details. +// +// SPDX-License-Identifier: AGPL-3.0-or-later +// License-Filename: LICENSES/AGPL-3.0.txt +// +// Copyright (C) 2019 by via donau +// – Österreichische Wasserstraßen-Gesellschaft mbH +// Software engineering by Intevation GmbH +// +// Author(s): +// * Sascha L. Teichmann <sascha.teichmann@intevation.de> +// * Sascha Wilde <wilde@intevation.de> + +package imports + +import ( + "context" + "database/sql" + "fmt" +) + +// DeleteStretch is a Job to delete a stretch from the database. +type DeleteStretch struct { + ID int64 `json:"id"` +} + +// DSTJobKind is the import queue type identifier. +const DSTJobKind JobKind = "dst" + +type dstJobCreator struct{} + +func init() { RegisterJobCreator(DSTJobKind, dstJobCreator{}) } + +func (dstJobCreator) Description() string { return "delete stretch" } + +func (dstJobCreator) AutoAccept() bool { return false } + +func (dstJobCreator) Create() Job { return new(DeleteStretch) } + +func (dstJobCreator) Depends() [2][]string { + return [2][]string{ + {"stretches"}, + {}, + } +} + +const ( + dstExistsSQL = ` +SELECT EXISTS ( + SELECT 1 FROM users.stretches + WHERE id = $1 AND staging_done) +` + dstStageDoneSQL = ` +DELETE FROM users.stretches +WHERE id IN ( + SELECT key from import.track_imports + WHERE import_id = $1 AND + deletion AND + relation = 'users.stretches'::regclass)` +) + +// StageDone finally removes the stretch from the database. +func (dstJobCreator) StageDone( + ctx context.Context, + tx *sql.Tx, + id int64, +) error { + _, err := tx.ExecContext(ctx, dstStageDoneSQL, id) + return err +} + +// CleanUp of a stretch delete import is a NOP. +func (*DeleteStretch) CleanUp() error { return nil } + +// Do prepares the deletion of the stretch. +func (dst *DeleteStretch) Do( + ctx context.Context, + importID int64, + conn *sql.Conn, + feedback Feedback, +) (interface{}, error) { + + tx, err := conn.BeginTx(ctx, nil) + if err != nil { + return nil, err + } + defer tx.Rollback() + + var found bool + if err := tx.QueryRowContext(ctx, dstExistsSQL, dst.ID).Scan(&found); err != nil { + return nil, err + } + + if !found { + return nil, fmt.Errorf("no stretch with id %d found", dst.ID) + } + + feedback.Info("Prepare deletion of stretch with id %d", dst.ID) + + if _, err := tx.ExecContext( + ctx, + trackImportDeletionSQL, + importID, + "users.stretches", + dst.ID, + true, + ); err != nil { + return nil, err + } + + if err := tx.Commit(); err != nil { + return nil, err + } + + return dst, nil +}
--- a/pkg/imports/fd.go Mon Sep 16 16:56:11 2019 +0200 +++ b/pkg/imports/fd.go Fri Sep 20 15:35:16 2019 +0200 @@ -308,7 +308,7 @@ switch { case err == sql.ErrNoRows: outside++ - // ignore -> filtered by responsibility_areas + // ignore -> filtered by responsibility area (stretches) continue features case err != nil: feedback.Error(pgxutils.ReadableError{Err: err}.Error())
--- a/pkg/imports/modelconvert.go Mon Sep 16 16:56:11 2019 +0200 +++ b/pkg/imports/modelconvert.go Fri Sep 20 15:35:16 2019 +0200 @@ -30,6 +30,8 @@ STJobKind: func() interface{} { return new(models.StretchImport) }, SECJobKind: func() interface{} { return new(models.SectionImport) }, DSECJobKind: func() interface{} { return new(models.SectionDelete) }, + DSTJobKind: func() interface{} { return new(models.StretchDelete) }, + DSRJobKind: func() interface{} { return new(models.SoundingResultDelete) }, } // ImportModelForJobKind returns the constructor function to @@ -164,8 +166,21 @@ }, DSECJobKind: func(input interface{}) interface{} { - ds := input.(*models.SectionDelete) - return &DeleteSection{ID: ds.ID} + dsec := input.(*models.SectionDelete) + return &DeleteSection{ID: dsec.ID} + }, + + DSTJobKind: func(input interface{}) interface{} { + dst := input.(*models.StretchDelete) + return &DeleteStretch{ID: dst.ID} + }, + + DSRJobKind: func(input interface{}) interface{} { + dsr := input.(*models.SoundingResultDelete) + return &DeleteSoundingResult{ + BottleneckId: dsr.BottleneckId, + Date: dsr.Date, + } }, }
--- a/pkg/imports/st.go Mon Sep 16 16:56:11 2019 +0200 +++ b/pkg/imports/st.go Fri Sep 20 15:35:16 2019 +0200 @@ -57,23 +57,23 @@ const ( stDeleteSQL = ` -DELETE FROM waterway.stretches WHERE +DELETE FROM users.stretches WHERE staging_done AND name = ( SELECT name - FROM waterway.stretches WHERE + FROM users.stretches WHERE id = ( SELECT key from import.track_imports WHERE import_id = $1 AND - relation = 'waterway.stretches'::regclass) + relation = 'users.stretches'::regclass) AND NOT staging_done )` stStageDoneSQL = ` -UPDATE waterway.stretches SET staging_done = true +UPDATE users.stretches SET staging_done = true WHERE id IN ( SELECT key from import.track_imports WHERE import_id = $1 AND - relation = 'waterway.stretches'::regclass)` + relation = 'users.stretches'::regclass)` stInsertSQL = ` WITH @@ -94,7 +94,7 @@ (SELECT b FROM bounds ORDER BY b USING >~ FETCH FIRST ROW ONLY)) AS r), axs AS ( SELECT ISRSrange_axis((SELECT r FROM r), $16::double precision) AS axs) -INSERT INTO waterway.stretches ( +INSERT INTO users.stretches ( name, stretch, area, @@ -116,9 +116,9 @@ RETURNING id` stInsertCountrySQL = ` -INSERT INTO waterway.stretch_countries ( - stretches_id, - country_code +INSERT INTO users.stretch_countries ( + stretch_id, + country ) VALUES ( $1, $2 @@ -214,7 +214,7 @@ } } - if err := track(ctx, tx, importID, "waterway.stretches", id); err != nil { + if err := track(ctx, tx, importID, "users.stretches", id); err != nil { return nil, err }
--- a/pkg/imports/stsh.go Mon Sep 16 16:56:11 2019 +0200 +++ b/pkg/imports/stsh.go Fri Sep 20 15:35:16 2019 +0200 @@ -56,7 +56,7 @@ const ( stshInsertSQL = ` -INSERT INTO waterway.stretches ( +INSERT INTO users.stretches ( name, stretch, area, @@ -319,7 +319,7 @@ // Store the countries for _, country := range countries { - if _, err := insCountryStmt.ExecContext(ctx, country); err != nil { + if _, err := insCountryStmt.ExecContext(ctx, id, country); err != nil { return nil, err } } @@ -329,7 +329,7 @@ if _, err := trackStmt.ExecContext( ctx, importID, - "waterway.stretches", + "users.stretches", id, ); err != nil { return nil, err
--- a/pkg/models/importbase.go Mon Sep 16 16:56:11 2019 +0200 +++ b/pkg/models/importbase.go Fri Sep 20 15:35:16 2019 +0200 @@ -19,7 +19,7 @@ "time" "gemma.intevation.de/gemma/pkg/common" - "github.com/robfig/cron" + cron "gopkg.in/robfig/cron.v1" ) type (
--- a/pkg/models/imports.go Mon Sep 16 16:56:11 2019 +0200 +++ b/pkg/models/imports.go Fri Sep 20 15:35:16 2019 +0200 @@ -124,6 +124,15 @@ SectionDelete struct { ID int64 `json:"id"` } + + StretchDelete struct { + ID int64 `json:"id"` + } + + SoundingResultDelete struct { + BottleneckId string `json:"bottleneck-id"` + Date Date `json:"date-info"` + } ) func (cui *ConfigurableURLImport) MarshalAttributes(attrs common.Attributes) error {
--- a/pkg/pgxutils/errors.go Mon Sep 16 16:56:11 2019 +0200 +++ b/pkg/pgxutils/errors.go Fri Sep 20 15:35:16 2019 +0200 @@ -84,7 +84,9 @@ switch err.TableName { case "gauge_measurements", "gauge_predictions", "bottlenecks": switch err.ConstraintName { - case "gauge_key", "waterway_bottlenecks_reference_gauge": + case "waterway_bottlenecks_reference_gauge", + "waterway_gauge_measurements_reference_gauge", + "waterway_gauge_predictions_reference_gauge": m = "Referenced gauge with matching temporal validity not available" return }
--- a/pkg/scheduler/scheduler.go Mon Sep 16 16:56:11 2019 +0200 +++ b/pkg/scheduler/scheduler.go Fri Sep 20 15:35:16 2019 +0200 @@ -19,7 +19,7 @@ "strings" "sync" - "github.com/robfig/cron" + cron "gopkg.in/robfig/cron.v1" ) // Action is called with a configuration id.
--- a/schema/auth.sql Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/auth.sql Fri Sep 20 15:35:16 2019 +0200 @@ -55,8 +55,7 @@ -- -- Extended privileges for sys_admin -- -GRANT INSERT, UPDATE, DELETE - ON users.list_users, users.responsibility_areas TO sys_admin; +GRANT INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA users TO sys_admin; GRANT USAGE ON SCHEMA sys_admin TO sys_admin; GRANT SELECT ON ALL TABLES IN SCHEMA sys_admin TO sys_admin; GRANT INSERT, UPDATE ON sys_admin.system_config TO sys_admin; @@ -81,13 +80,16 @@ -- -- Staging area +CREATE POLICY hide_staging ON users.stretches + FOR SELECT TO waterway_user USING (staging_done); +ALTER TABLE users.stretches ENABLE ROW LEVEL SECURITY; + DO LANGUAGE plpgsql $$ DECLARE the_table varchar; BEGIN FOREACH the_table IN ARRAY ARRAY[ 'gauge_measurements', - 'stretches', 'waterway_profiles', 'fairway_dimensions', 'bottlenecks', @@ -146,6 +148,10 @@ FOR ALL TO waterway_admin USING (users.utm_covers(area)); +CREATE POLICY sys_admin ON users.stretches + FOR ALL TO sys_admin + USING (true); + -- -- RLS policies for imports and import config --
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/countries.sql Fri Sep 20 15:35:16 2019 +0200 @@ -0,0 +1,25 @@ +-- This is Free Software under GNU Affero General Public License v >= 3.0 +-- without warranty, see README.md and license for details. + +-- SPDX-License-Identifier: AGPL-3.0-or-later +-- License-Filename: LICENSES/AGPL-3.0.txt + +-- Copyright (C) 2018, 2019 by via donau +-- – Österreichische Wasserstraßen-Gesellschaft mbH +-- Software engineering by Intevation GmbH + +-- Author(s): +-- * Sascha Wilde <sascha.wilde@intevation.de> +-- * Tom Gottfried <tom@intevation.de> + + +-- Setup Country Codes +COPY countries (country_code) FROM stdin; +AT +BG +HR +HU +RO +RS +SK +\.
--- a/schema/default_sysconfig.sql Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/default_sysconfig.sql Fri Sep 20 15:35:16 2019 +0200 @@ -43,7 +43,7 @@ r.rwls AS reference_water_levels, wl.measure_date AS gm_measuredate, wl.water_level AS gm_waterlevel, - wl_14d.n AS gm_n_14d, + wl.n AS gm_n_14d, fca.forecast_accuracy_3d, fca.forecast_accuracy_1d FROM waterway.gauges g @@ -56,29 +56,32 @@ LEFT JOIN (SELECT DISTINCT ON (location) location, measure_date, - water_level - FROM waterway.gauge_measurements - ORDER BY location, measure_date DESC) AS wl - USING (location) - LEFT JOIN (SELECT location, count(water_level) AS n + water_level, + count(*) OVER (PARTITION BY location) AS n FROM waterway.gauge_measurements -- consider all measurements within 14 days plus a tolerance WHERE measure_date >= current_timestamp - '14 days 00:15'::interval - GROUP BY location) AS wl_14d + ORDER BY location, measure_date DESC) AS wl USING (location) - LEFT JOIN (SELECT location, - max(acc) FILTER (WHERE - measure_date <= current_timestamp + '1 day'::interval) - AS forecast_accuracy_1d, - max(acc) AS forecast_accuracy_3d - FROM waterway.gauge_predictions, - GREATEST(water_level - lower(conf_interval), - upper(conf_interval) - water_level) AS acc (acc) - WHERE measure_date - BETWEEN current_timestamp - AND current_timestamp + '3 days'::interval - GROUP BY location) AS fca + LEFT JOIN (SELECT DISTINCT ON (location) + location, + max(acc) FILTER (WHERE measure_date + <= current_timestamp + '1 day'::interval) + OVER loc_date_issue AS forecast_accuracy_1d, + max(acc) OVER loc_date_issue AS forecast_accuracy_3d + FROM (SELECT location, date_issue, measure_date, + GREATEST(water_level - lower(conf_interval), + upper(conf_interval) - water_level) AS acc + FROM waterway.gauge_predictions + -- consider predictions made within last 14 days ... + WHERE date_issue + >= current_timestamp - '14 days 00:15'::interval + -- ... for the next three days from now + AND measure_date BETWEEN current_timestamp + AND current_timestamp + '3 days'::interval) AS acc + WINDOW loc_date_issue AS (PARTITION BY location, date_issue) + ORDER BY location, date_issue DESC) AS fca USING (location) $$); @@ -145,15 +148,15 @@ s.nobjnam, s.date_info, s.source_organization, - (SELECT string_agg(country_code, ', ') - FROM waterway.stretch_countries - WHERE stretches_id = s.id) AS countries, + (SELECT string_agg(country, ', ') + FROM users.stretch_countries + WHERE stretch_id = s.id) AS countries, s.staging_done, min(g.gm_measuredate) AS gm_measuredate, min(g.gm_n_14d) AS gm_n_14d, max(g.forecast_accuracy_3d) AS forecast_accuracy_3d, max(g.forecast_accuracy_1d) AS forecast_accuracy_1d - FROM waterway.stretches s + FROM users.stretches s LEFT JOIN ( $$ || (SELECT def FROM base_views WHERE name = 'gauges_base_view') || $$ WHERE NOT erased) AS g
--- a/schema/demo-data/README Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/demo-data/README Fri Sep 20 15:35:16 2019 +0200 @@ -29,10 +29,3 @@ psql -f roles.sql -d gemma psql -f users.sql -d gemma - psql -f responsibility_areas.sql -d gemma - - -Acknowledgements: - -The file `responsibility_areas.sql' contains information made with -Natural Earth. Free vector and raster map data @ naturalearthdata.com.
--- a/schema/demo-data/fake_stretches.sql Mon Sep 16 16:56:11 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ --- This is Free Software under GNU Affero General Public License v >= 3.0 --- without warranty, see README.md and license for details. - --- SPDX-License-Identifier: AGPL-3.0-or-later --- License-Filename: LICENSES/AGPL-3.0.txt - --- Copyright (C) 2019 by via donau --- – Österreichische Wasserstraßen-Gesellschaft mbH --- Software engineering by Intevation GmbH - --- Author(s): --- * Sascha Wilde <sascha.wilde@intevation.de> - - --- These are stretches with the hand craftes responsibility areas from --- responsibility_areas.sql --- --- Stretches are supposed to be used for the responsibility areas, but --- as the real solution is not available yet, we fake stretches --- matching the handdrawn responsibility areas currently used for --- display in the application. - --- Setup Stretches, matching areas of responsibility -COPY waterway.stretches (name, stretch, area, objnam, nobjnam, date_info, source_organization, staging_done) FROM stdin; -BG_stretch_1 ["(RO,XXX,00001,00000,0)","(BG,XXX,00001,00000,6100)") 0106000020E610000001000000010300000003000000C30300008F5321D3DDE03B4072C9B38AA75446408EC53C00DEE03B401272DB1DA8544640C189ED7CDEE03B400A580BABA854464059F16844DFE03B403D7DD62CA95446409D80044FE0E03B402BFA3F9EA95446405D598192E1E03B403110ECFAA95446406A067102E3E03B40480A4B3FAA544640A0C8AF90E4E03B407446BC68AA5446402CB2EF2DE6E03B403B0FA875AA5446405936174045F43B40DEED13909654464021A769DC46F43B40EF39D87F965446404BF8EF6748F43B4062D33753965446404B0177D349F43B4025C3E90B965446402E6406114BF43B401888ABAC9554464009FE69144CF43B40B8212639955446401BF6A9D34CF43B40C80DCAB59454464087CE6C474DF43B40999BA32794544640E0B13F6B4DF43B402C422994935446409C6069222DF33B404518BD1C033246401AD92D2B2DF33B405A32B6FE172F46401490210E37043C4088AE2596002F4640FC50B43874043C40A101E008E7354640E1754D6674043C4082BE019CE735464092F620E374043C4090B11F29E83546405CCC62AA75043C40EA8ACDAAE835464086AE6AB476043C401C810F1CE93546403967FFF677043C407A588B78E93546408667BB6579043C401935B3BCE935464011BD86F27A043C401492E8E5E93546407DB9218E7C043C40440696F2E9354640957FEDDE50113C4087F791F4DA354640432803B7AD113C404C60A763CC3F4640365CE49B64FE3B406CDA6FAFE23F4640FC1CBC0063FE3B4040A0BCBFE23F4640342D5D7661FE3B4029896DECE23F4640C452EF0B60FE3B40EAEACA33E33F4640721760CF5EFE3B408BB11693E33F4640D2C3D9CC5DFE3B40405AA706E43F464043B14B0E5DFE3B4061FA0B8AE43F4640928C089B5CFE3B4044F03718E53F4640A04A7E775CFE3B40DA8FB4ABE53F464017613BCBC0FE3B40B1E69643684B4640B6A8310E1CFA3B40E0F842656D4B4640A42564721AFA3B40609E88756D4B46405ECA62E718FA3B40A59E32A26D4B4640EF9D5B7C17FA3B40149389E96D4B46407511423F16FA3B4052A6CF486E4B4640E0C0453C15FA3B40E28C5BBC6E4B46407D905A7D14FA3B40FA89BC3F6F4B4640BFC2D60914FA3B40981EE6CD6F4B4640A3C92AE613FA3B40F1B46161704B4640F793680063FA3B409DC17A0BA554464023EED2AB21DA3B4085EDEA1FC6544640B4AE6D0F20DA3B404C73F72FC6544640C228BB831EDA3B407DB06A5CC6544640AF32F0171DDA3B4026598FA3C65446401CC407DA1BDA3B40AF86A902C7544640986C39D61ADA3B40599D1176C7544640EB2281161ADA3B40904058F9C75446407E0B3DA219DA3B406DF47187C854464023FCE47D19DA3B4035BFE81AC9544640C66255524DDA3B40F242CEE8AF5B46407BA37429FBC93B402FD318ECBE5B46401BB5A28CF9C93B40DC7B08FCBE5B46409BEC7700F8C93B4034056028BF5B46403DC02D94F6C93B40B9336B6FBF5B4640D70BC455F5C93B405A1B6FCEBF5B46405B577751F4C93B403DFBC441C05B46403E754891F3C93B40C829FEC4C05B464004199A1CF3C93B4036AF0F53C15B4640332EE8F7F2C93B4000E283E6C15B46403B9FB138A4CA3B40B3989BF21A7546404C7C9365A4CA3B40CD2FC6851B75464001A668E2A4CA3B40DA7F00131C754640D90765AAA5CA3B40A024DD941C754640C831D9B5A6CA3B40CC8A5E061D75464060F37DFAA7CA3B40C90828631D7546402279D96BA9CA3B4079C8A8A71D7546405209BAFBAACA3B40D2DB3ED11D754640BAA8C19AACCA3B40FD2251DE1D75464065599F7A19DE3B4067BA2FCE0B754640B0E4C68E93DE3B400ED50277D78446401DD929BC93DE3B40A2A1280AD8844640DEE8A73994DE3B4047025797D8844640D27A6E0295DE3B403F002119D98446408D4EC60E96DE3B4074B8898AD9844640D2645F5497DE3B40B56D35E7D98446402474B6C698DE3B40B969942BDA844640570390579ADE3B40C8060655DA844640166F84F79BDE3B407389F261DA84464092B3090EB8E43B40F4523356D484464080FA67F613E53B40D5F69CBC569046409276002414E53B408629C14F57904640943CD3A114E53B40E583EBDC57904640EA690A6B15E53B40C72DAF5E589046406A5DEA7716E53B40F6790FD05890464062CB1DBE17E53B40DCF6B02C59904640F1661B3119E53B40CD4C0471599046409738A1C21AE53B404644699A599046407FE440631CE53B409B9B48A7599046401D3034DCA5EE3B408F586DDB4F9046407BF5E0D666EF3B4032C5887057A746403CF9D60467EF3B409A78A80358A746405FAC448367EF3B40D896CA9058A7464046474E4D68EF3B40B2A9821259A74640CC2A305B69EF3B409585D48359A74640F9418BA26AEF3B408D5465E059A74640620ACB166CEF3B40286EA6245AA746408A57A1A96DEF3B407B56F84D5AA746407E0F934B6FEF3B40568CC45A5AA74640D9BE9AC44EFA3B40BCFDDCB24EA746401FA1BE51B4FA3B40BC38D2E2D0B24640D5C00380B4FA3B401CAEEE75D1B24640A272DEFEB4FA3B40AD790903D2B246409CBF6EC9B5FA3B40576EB684D2B246400DDDEBD7B6FA3B40DECEF9F5D2B24640F1C0F01FB8FA3B40B2547952D3B24640E764E294B9FA3B401A02A796D3B2464082C96B28BBFA3B40C71AE4BFD3B2464002F60ACBBCFA3B4096EA9ACCD3B2464068807A29AF023C40091292F0CAB2464059E4C139EE023C4055FFE76EB1B94640C12E3E68EE023C403B440202B2B946400FCB61E7EE023C401BE7178FB2B94640FFF349B2EF023C4077ECBC10B3B94640E17C2AC1F0023C401CE4F581B3B9464075879A09F2023C40FCEC68DEB3B946408EECFA7EF3023C4075838822B4B946402C68F212F5023C405375B64BB4B9464040C3FAB5F6023C4024A35D58B4B94640DE4FA6E3A9233C40F35626EF8CB94640C3CDC14FD9233C40AA81FD8D25BE46403437F17ED9233C400A09102126BE46407636CDFED9233C40594B12AE26BE46407AEF6BCADA233C40D40A992F27BE46403D30FAD9DB233C405000AAA027BE4640BA6B0823DD233C409BD3ECFC27BE46406D64F198DE233C40D0DAD54028BE46405594562DE0233C4009FCC86928BE46408F8AADD0E1233C40365A337628BE46401896FE1780373C404267FF8C0EBE4640ED9F68FF90373C40B04FA7BE96BF46400A2E022F91373C407FD9B45197BF4640F59347AF91373C40761DABDE97BF464029ED4A7B92373C40BA581F6098BF4640C730358B93373C40D1FE17D198BF46400E5293D494373C409CAA3D2D99BF4640EA0CBD4A96373C4040D4057199BF4640456B51DF97373C4085A7D59999BF46402B3AC48299373C4023A41BA699BF46406A73A23F5B583C40E4BBE69D6ABF4640DDEEBCE15C583C400E3EEE8C6ABF4640A07464725E583C40D5689A5F6ABF4640D46333E25F583C40862AA9176ABF46403640072361583C409947DEB769BF4640F1C08B2862583C408127E84369BF46400B1CB4E862583C405B9D3BC068BF46402DE51D5C63583C405010E83168BF464004B3597E63583C407FB3659E67BF4640AD9C01C683573C409A2B1785FCAC46408E792A96A7673C406A521AC5E3AC4640B98F2E37A9673C400E8B09B4E3AC46402B90BDC6AA673C4006CB9D86E3AC46403F557C35AC673C40A8F4953EE3AC4640FA915275AD673C4073B8B6DEE2AC4640677FF579AE673C407258AF6AE2AC4640CECC6039AF673C40AA67F5E6E1AC4640082D39ACAF673C405DEA9858E1AC464046B714CEAF673C40DE8612C5E0AC4640BB6B0EA56E673C400469CF70BAA74640835E95F50B883C40F0FF1AFF87A74640954286960D883C40D8F5F0ED87A746406B00F2250F883C401AA363C087A7464045A7799410883C40AACA337887A74640FD4E02D411883C40DD94281887A74640840D40D812883C405B31F4A386A74640EA1A2F9713883C40736D0F2086A74640767A760914883C40FEA58D9185A74640E25CB02A14883C406AC6EAFD84A746402B4E30EAD9873C4075FC97E04AA346403026217F71A83C40F1F606A110A346401DA2621F73A83C4039037F8F10A34640D17AF4AD74A83C40A50FA26110A346402999851B76A83C40A34E331910A34640DD94095A77A83C401456FBB80FA34640E5E9425D78A83C40D1BCAC440FA34640AB633B1B79A83C4030BABFC00EA34640691DA68C79A83C402F2D46320EA34640A85327AD79A83C401BBCB99E0DA346408B164FC548A83C40AB957054C59F46404DF1C6C66BDC3C405203FE825E9F464093F5AC666DDC3C4099F417715E9F4640545BB2F46EDC3C40D537E1425E9F4640A4678B6170DC3C40DB7320FA5D9F464072BC329F71DC3C401C67A1995D9F4640E74873A172DC3C40056619255D9F4640CC61605E73DC3C406DDF02A15C9F46404D64B7CE73DC3C40EA4D71125C9F4640BD2227EE73DC3C407347DF7E5B9F46403A0FF4DD60DC3C403EB1F4A2379E4640A1587A68E7EF3C40077BED100E9E4640CA7C3E08E9EF3C408D27E4FE0D9E4640C6A60F96EAEF3C4078D58BD00D9E4640B51FA402ECEF3C40C175AC870D9E4640242EF93FEDEF3C4091F312270D9E464067ECDC41EEEF3C4020A775B20C9E4640AE4166FEEEEF3C4022D04F2E0C9E4640AE61566EEFEF3C40197FB59F0B9E46408013608DEFEF3C404A9F210C0B9E46408269F449C5EF3C4055E817079D9B46407779953452103D40B05B3A08549B4640A57C17D453103D400EADF6F5539B4640EAA6886155103D40FE0767C7539B46407213A3CD56103D40D079557E539B46404CD8680A58103D4033D5901D539B46403FACAD0B59103D408912D1A8529B4640A8A78EC759103D40AEBA9224529B46405986D3365A103D4007C4EA95519B4640A2AD35555A103D4007945402519B4640239AA2D64B103D4082AB637D889A4640C5814E47F9713D4084A237D98599464096F94CD917B33D40E5DD83FBC998464062B1277819B33D40FB6519E8C9984640D6EA52041BB33D40557E71B8C9984640072B956E1CB33D40D4FC606EC9984640F59202A91DB33D40A185C00CC9984640E4D485A71EB33D40B58A5097C89846400A1457601FB33D40FE629412C8984640FC1C5CCC1FB33D4026E4A583C798464093446EE71FB33D40D63303F0C698464025758650F3B23D4041D19C84EF9646402A146E3876D33D40422954C88A964640D1C00CD777D33D40697DAFB48A96464071D0DD6279D33D40F959D0848A964640293AABCC7AD33D40CDB48D3A8A964640E9978D067CD33D403C20C2D889964640EBEF74047DD33D40A5B72F63899646400E609FBC7DD33D4025265BDE88964640B11BF9277ED33D403A335F4F889646408D0B62427ED33D40B28ABABB87964640D4C7407ECFD23D408F455A15A08F46400F84C946CFD23D4077BEB8829F8F46408C1993BFCED23D40D311BDF69E8F464025C2CFEDCDD23D40D363C8769E8F464058228FD9CCD23D408B85C5079E8F4640F6FA6E8DCBD23D40DB94F8AD9D8F4640FBB73216CAD23D407D04D56C9D8F464027E04582C8D23D40C9A8DB469D8F46407B382EE1C6D23D406417823D9D8F4640DB9A8E8143B23D403ACD32E2019046408EF931E341B23D40814B9AF501904640F96C7D5740B23D407E723F2502904640B7DBA5ED3EB23D4038884D6F029046401D0993B33DB23D405F01ECD002904640F4C856B53CB23D40A2805A46039046401942B6FC3BB23D4075BE15CB039046401DD0C9903BB23D408FEE035A04904640A935B7753BB23D401BEEA6ED049046402B96D1EB67B23D407005965BDC9146409790866B61713D4067CE61C497924640C021CA8B51233D400145B7B35F9346408D77F538FA223D4093EA093ECB8E4640D2160C0C75363D404E42867B9B8E46400A17ADAA76363D40244DFA689B8E46404DD81E3778363D401F08273A9B8E4640F8F225A279363D407A05D9F09A8E46409CAFCFDD7A363D40B44AE18F9A8E46409A38FBDD7B363D408E9CF91A9A8E46400DE5D0987C363D40BBD99F96998E4640C30723077D363D40C1CCE907998E4640FC89B4247D363D408A275374988E4640D216EB2FDE353D405C5339538C864640F5A73BAB51563D400550888139864640058E5A4953563D40BB3BC76E39864640A89031D554563D401B6BBF3F398646404E278A3F56563D40DE953FF6388646405E53777A57563D409CDE1A953886464025A3DE7958563D4016080D20388646406046EF3359563D409FB9959B37864640A1A082A159563D40563CCC0C378646408FA362BE59563D4094642D79368646402A61B79EC9553D4075F9197A507F46401615AE8C29903D40BF04F3C7B07E46401E00362A2B903D40DADDCFB4B07E4640B49545B52C903D403B906A85B07E464027CAAD1E2E903D40D670953BB07E46408BB28A582F903D40DEF126DAAF7E4640FF2FCC5630903D401DB7DD64AF7E4640F49FAC0F31903D40A8BD3BE0AE7E4640BF01117C31903D409C015A51AE7E46406FDFCE9731903D403156B6BDAD7E46403356FD3A6D8F3D40539A027A0E764640FB2897D8CBAF3D40960E6C39AF754640F8778275CDAF3D400EAC0C26AF75464015ACDAFFCEAF3D406C126EF6AE754640F5BE7768D0AF3D4040CB64ACAE754640EA8D7DA1D1AF3D40384BC94AAE754640E338E49ED2AF3D40A2F25BD5AD754640DE81EE56D3AF3D400424A050AD754640F99F89C2D3AF3D4007DCAFC1AC75464095D792DDD3AF3D40857F092EAC754640706902B52EAF3D40B0A9AE58C46E46400412877E2EAF3D40B1ED03C6C36E4640758FA1F82DAF3D40A9F6F139C36E464045EC76282DAF3D406884DAB9C26E464082B906162CAF3D40CB83A94AC26E46403B62DCCB2AAF3D400FA6A4F0C16E46409B73A75629AF3D40315B41AFC16E4640A5D5BEC427AF3D40C5CC0289C16E464021C0932526AF3D40CE27617FC16E464018FDE821C78E3D404E4D4486206F464098994585C58E3D4024D96499206F4640338D0EFBC38E3D40F6EEC6C8206F464001136A92C28E3D40D4689812216F46401B1F3459C18E3D4025100374216F46408306765BC08E3D40F58548E9216F46407215F0A2BF8E3D402117E76D226F4640C9A0B936BF8E3D403F12C6FC226F46409342FB1ABF8E3D40EDEA6790236F4640973D13341A8F3D40F929432828734640A553D49942683D4079CCF8319473464073AF0CFD40683D40381DD0449473464095C387723F683D40E376E47394734640CE6E6A093E683D40443567BD94734640184E91CF3C683D40FBF7851E95734640318508D13B683D40035D869395734640505B95173B683D4038A3EA17967346403D3756AA3A683D409CCC9DA69673464059AA7C8D3A683D40028F253A97734640DE8076CB99683D402066DC4E2F784640241AF5173A483D405F0668628478464037C68D7A38483D40A1EF0B7584784640CDDB55EF36483D40EA4AF8A38478464024D67D8535483D40F26C5FED84784640CAD3ED4A34483D4046236F4E8578464083C3BC4B33483D40C7756CC385784640B971B99132483D403D5AD84786784640F7080A2432483D403EF19BD686784640A8BAE50632483D40CB983A6A87784640ED16BA6CBE483D4064393DF36C7F464008F8CAAD4D353D40888876069E7F46408F0B06104C353D4072B0FA189E7F4640D90662844A353D403BC2C5479E7F4640A4EA111A49353D40988B0B919E7F46401FF400DF47353D409B6FFBF19E7F4640D4B949DF46353D40A215DC669F7F4640FA21BF2446353D40230930EB9F7F4640E8C48BB645353D4014E2E179A07F4640DD71EB9845353D40D243760DA17F4640F3B57DE088353D403B894B3C12834640294631E615223D40EEC48D9E41834640D96C164814223D409089EFB0418346405AAA0DBC12223D4073629CDF41834640EF364F5111223D40E01DC92842834640BAC8CB1510223D409ED5A58942834640B56EA3150F223D40469979FE428346409E46AE5A0E223D404F0DC7824383464092A31BEC0D223D406896781144834640175E2BCE0D223D40CA5E12A544834640E722606465223D409E449AB0DC874640AC3EC680EE0E3D40D096B07C0A88464032D45CE2EC0E3D409621F08E0A8846401F8EF555EB0E3D402DAE7BBD0A88464011E7CBEAE90E3D40AD5D89060B8846405A5CD4AEE80E3D40E48C4A670B884640202733AEE70E3D409F7107DC0B88464051CCC4F2E60E3D4071AD43600C8846403E1ABD83E60E3D40506EEAEE0C884640514E6065E60E3D40E56A80820D884640ED690F424A0F3D4047092ED77C8D464092CFB417CDEE3C40570C9E82C58D46409379DC78CBEE3C4082C8A294C58D46405D3FEAEBC9EE3C401CC1F6C2C58D4640D1301F80C8EE3C40AA32D20BC68D46402B387643C7EE3C40C55C686CC68D4640BD911A42C6EE3C403A0D03E1C68D4640F414F085C5EE3C40C3232765C78D464066E83116C5EE3C401DA7C0F3C78D4640195E2BF7C4EE3C40BFB95487C88D4640FB4EABC316EF3C40BE5B5B45849246408BBF021998DB3C402AEB1AB5AD924640828BD47996DB3C407E0DFEC6AD924640DC567DEC94DB3C40431532F5AD924640A620428093DB3C40A377F03DAE9246400A2F224392DB3C40948F6D9EAE924640BE5B4D4191DB3C402E1EF412AF924640342FAC8490DB3C4035C50997AF92464024667E1490DB3C40D1149B25B09246407DA013F58FDB3C40437B2DB9B092464055C455EDA2DB3C40A898C596D4934640F617E52823C83C40351C9B5FFC93464076B6958921C83C40B61D5B71FC9346400F0B0BFC1FC83C40C1A66D9FFC934640C00C8C8F1EC83C4047760DE8FC9346406B9A1A521DC83C4074147048FD934640BCADE94F1CC83C406A47E1BCFD934640B157E5921BC83C40B283E740FE934640712351221BC83C40ECF16FCFFE934640DE9F80021BC83C4086580063FF934640EF20286964C83C4004FDBABA97984640BE99914ED9A73C40A1C86C73D698464069D1E3AED7A73C4023B0F284D69846401736DE20D6A73C40A8DECDB2D69846405282CCB3D4A73C4085323BFBD69846408E41B675D3A73C40B322725BD7984640DCCAD472D2A73C409920C0CFD798464093FE1AB5D1A73C402BF8AC53D8984640DF65D343D1A73C407EC826E2D89846405A775823D1A73C4034E4B375D99846401610CAEC01A83C4061C1AEC1219C464062EDAA3E72873C401E4026E55B9C4640126AB39E70873C4056A371F65B9C4640A85C46106F873C408FE714245C9C4640F86FB3A26D873C404C124F6C5C9C4640201E07646C873C40849359CC5C9C4640077B80606B873C40089483405D9C4640D9B918A26A873C409C4456C45D9C4640A80E21306A873C40BAC8C0525E9C46408CB1FA0E6A873C40D90C4AE65E9C4640D3046E21A4873C40F399520599A04640B10F00E10E673C4052C38F93CEA046400A2EB1400D673C40B4A5A0A4CEA0464022A0CFB10B673C40AD090CD2CEA04640808BAF430A673C40601A131ACFA046406DD7620409673C406A3EF179CFA0464019C22E0008673C40E752F7EDCFA046406429134107673C40D5E9AF71D0A04640E92A68CE06673C404A270B00D1A0464019E395AC06673C40D28D9093D1A0464009846F8047673C4073001DB5F4A546408BEB47ADAB463C4023B672AC25A6464049879F0CAA463C40932C48BD25A646404C79467DA8463C40C14D79EA25A6464086B5940EA7463C40C098493226A64640B803A1CEA5463C4033B3F69126A64640AF6BB6C9A4463C40D48CD30527A64640584BDB09A4463C40A8876C8927A64640E2BB6E96A3463C400041B31728A64640E30FE073A3463C40F94C30AB28A64640466C89F6F1463C404B0EEDFB0DAD4640A0ABE4B5DF433C40AE41A32012AD4640881EAE14DE433C405ECA563112AD4640BFE7BA84DC433C40294C6B5E12AD4640DF0A6B15DB433C40F12125A612AD46406259DDD4D9433C40156CC20513AD4640837C64CFD8433C400333967913AD464064AF0D0FD8433C4073932CFD13AD4640E6D23D9BD7433C403F90768B14AD4640DAA86878D7433C40ACDAFB1E15AD46408C9F0C5A56443C402AE7113C98B8464012B57E8555373C4048FBC866AAB84640B763150712373C400463A5A786B24640685897D711373C40D7E2961486B246400967925711373C40E14F9F8785B246402403F28B10373C40057A290685B24640F96E897C0F373C402FFD2E9584B2464053BFC6330E373C40D54F073984B246408A3F4CBE0C373C40AF0C3DF583B246402C27742A0B373C40D41B6BCC83B24640FE67C38709373C40D81123C083B246409A197706640E3C4082C32F7CB7B246400BDAA19DF60D3C408869DF5038A746404B7212909D163C405BF701F52DA74640CD54F8309F163C406C6184E42DA74640AD0BBDC0A0163C40DD47A5B72DA746406D690330A2163C4032241E702DA74640E9F2AD70A3163C4027B3AE102DA746404BBF6976A4163C40CFE8019D2CA7464011B82737A5163C4070DA89192CA7464023907FABA5163C403E01548B2BA7464059A4F8CEA5163C404D84D7F72AA74640E9F34A9D6E163C405D3093D988A14640B2510B67F9293C4097F3EC4F70A14640A8B29407FB293C40AD444D3F70A146406079ED96FC293C4090FF4C1270A146402E57BC05FE293C4026ECA6CA6FA146403E27E845FF293C4051041C6B6FA1464079A6224B002A3C405E5B58F76EA14640F387610B012A3C403AFCCE736EA14640B73E417F012A3C40E4218EE56DA14640DEB04DA2012A3C400E790D526DA14640E956A72789293C4004863A26EB95464070C9BBAD40343C40486C37C6DC9546409C6D7F4D42343C4079717EB5DC9546405D430DDC43343C40248D6888DC954640263C154A45343C40EB31B140DC9546402E2D878946343C40E7C019E1DB954640D2211D8E47343C40AF6F4E6DDB954640E712D44D48343C40A128C2E9DA9546409F5F4EC148343C40C5C8825BDA9546407B3F1CE448343C40C06907C8D995464069FBD103CD333C4078E43AFD548A4640ECB7B7D4CC333C4092AF316A548A4640C3D08F55CC333C40838C3CDD538A464001A83C8BCB333C407090C55B538A4640F6C7837DCA333C4017CDC5EA528A4640EA76C136C9333C405A6A948E528A46404BD682C3C7333C4006F8BB4A528A464007770A32C6333C405E9BD721528A4640B120C491C4333C40026F7915528A464060A6E1C3B12A3C40D4FCD1D05D8A46408A75CAAAC2293C40D126118C567346409FCA0A7CC2293C401E4E04F95573464026007BFDC1293C40D3F4076C55734640A1A1F733C1293C40637886EA547346400B403E27C0293C401753797954734640F453A1E1BE293C408531381D54734640F2BCA26FBD293C40343F4ED9537346408EC478DFBB293C402B4E57B053734640055E8240BA293C402130E6A35373464074986F0BDF253C40DF39F58258734640DECB5FDA69253C40A7EACD57D66746409C99C5AB69253C408C1BB8C4D5674640C025722D69253C40131EB237D5674640B427406468253C40523A27B6D4674640B4D7EA5767253C4073C71145D467464052E0C11266253C40D233CAE8D367464048EF43A164253C40D945DCA4D367464069CBA31163253C400D3AE47BD3674640D2A83C7361253C40A215756FD367464004A6CC061A163C40A6397482E667464064772308AC153C40D3C61D3B645C4640FE1EF2D9AB153C40FA8BFEA7635C4640A6E21D5CAB153C40C19CE91A635C4640FCE87C93AA153C40F2304B99625C4640805BC587A9153C400BB51E28625C4640C6844143A8153C4061C4BDCB615C4640628F6AD2A6153C40925BB587615C4640E7C96D43A5153C405AE8A25E615C46408D27A1A5A3153C40A78E1A52615C4640EBC77C4D3F023C400D701C42785C46407C32C9B03D023C40C8667552785C464023BCF5243C023C40F70D317F785C4640542338B93A023C40A95B97C6785C4640AC878A7B39023C4011F4E925795C464037EC217838023C4090267F99795C46409D22F6B837023C40A5F5E51C7A5C4640A6BC5F4537023C407BC711AB7A5C464082C8CF2137023C401B118C3E7B5C46406E9141085B023C40AFF9B17C80604640C9EFAF547DEA3B40956CB94D9A6046406CBF001C55EA3B40F20D8FECA55B4640D32F7512A7FA3B4034A0BF98945B4640CDD726AFA8FA3B40BE097888945B4640CDE1013BAAFA3B408B54CC5B945B464017E3CFA6ABFA3B40DAF87314945B4640E4C295E4ACFA3B40F1DA2CB5935B4640AD451DE8ADFA3B40E151A041935B4640FB306DA7AEFA3B40DA213FBE925B4640B4692B1BAFFA3B40A7CC1530925B4640B847E53EAFFA3B40F4E59A9C915B4640D066F29587FA3B4036F8E2C4F8564640B0C9E701E00D3C40A06288BAE25646405ECC4A9EE10D3C404F611EAAE25646409855C729E30D3C4093B3517DE2564640339C2A95E40D3C401516DB35E256464044A17DD2E50D3C40CB9679D6E156464014938ED5E60D3C405A90D762E156464081C56894E70D3C40669A66DFE056464085A3B607E80D3C40F3D13351E056464048D6092BE80D3C40B727B6BDDF564640A5D755897D0D3C40DB8EE03F5D4B4640AB4DA03B22123C4079053AB9574B4640557A5DD723123C401E13C9A8574B4640A82A376225123C40C6A4F57B574B464098D700CD26123C4081B97834574B46405769C90928123C404F9D11D5564B46404560640C29123C4004E26A61564B4640F298E1CA29123C40944DF6DD554B46400111EF3D2A123C40A120C14F554B464026EB20612A123C40616342BC544B4640711134F8CC113C40BA220C6560414640815E3BF016253C402C3AF77448414640150E5F8B18253C4051D2646448414640551393151A253C40FC48713748414640E942B17F1B253C4058D9D6EF47414640321ACFBB1C253C402AF255904741464077A7C6BD1D253C4089239A1C47414640890DAE7B1E253C406603169946414640F80A39EE1E253C40FD6BD70A464146407AC500111F253C40F5C25577454146404B523DEC66243C4034F5BE53D62E46401D2713BE66243C407846A9C0D52E4640F141CE4066243C40C0C0A133D52E464004B43E7965243C408A7213B2D42E4640613A0F6F64243C40DE91F840D42E464088D5792C63243C403588A9E4D32E46409B34E3BD61243C40CF35B2A0D32E46406CD1603160243C409B10AF77D32E4640296C2E965E243C40D775336BD32E464089E6D1D9CF143C401AB72B7FE62E46406EF83C52CE143C402217CC53E82746400EFB8E5BFD353C40FC4D71CEB027464062DC4DF9FE353C407F6FCDBCB02746407D323F8500363C4051683A8EB02746405C8FD9EF01363C40E9148C44B0274640E66FE22A03363C40319EA6E2AF274640DF2AFD2904363C402E6E616CAF274640691F27E304363C400D9960E6AE2746407F431C4F05363C403F3EE655AE2746406420A06905363C4001B69DC0AD274640224F0537A0353C40B0D050D9AE2346406294CAD049553C40A5F87B542E2346402394C84372553C40010247518F2446400BAB1C7D72553C40158C03E48F244640D4BD1D0573553C40F48AE76F902446405E378FD673553C405A1690EF90244640149D60E974553C4099D8125E91244640420CFD3276553C4028822EB7912446408087B3A677553C4020BB74F7912446405610343679553C402FF56B1C92244640BABB1CD27A553C40B4D0A72492244640D9B77DADD97B3C40548FBE43F823464026F43A66FB7B3C40660A41C60F2546408AD955A0FB7B3C40D350C7581025464005C8E728FC7B3C4027FE6AE410254640629AB1FAFC7B3C4045B9CE6311254640CA10A40DFE7B3C40BAA20DD2112546406C142F57FF7B3C40CF76EB2A12254640F999A9CA007C3C405435FE6A122546405F25CE59027C3C4081B5CF8F122546400F2647F5037C3C40A9DBF5971225464082CDFE92D6993C405DE648779A244640FCE2BD7F209B3C40D43A92A4FA2E464044BD75BA209B3C407BBA1437FB2E4640262EBD43219B3C40D6C9AAC2FB2E4640F6BE4D16229B3C40DF3BF741FC2E4640C105102A239B3C4042C415B0FC2E4640693E6B74249B3C40D816CB08FD2E46405589ADE8259B3C40C388AE48FD2E46402ACE8878279B3C404F994B6DFD2E4640F8759F14299B3C40F1183A75FD2E46402C8BA090B1A93C4012440A7EC12E464056A11929B3A93C408533E168C12E4640FD5E36AEB4A93C407B578A37C12E464088F80111B6A93C40712DEBEBC02E4640B24FD943B7A93C402CD0EB88C02E4640BD23F13AB8A93C40CA5D5A12C02E46404C1ECAECB8A93C407B86C58CBF2E464004478E52B9A93C4076B44FFDBE2E464068465468B9A93C4049867C69BE2E4640DF1E533269A83C4078F2E69D5B24464063D76BF768A83C401F96700B5B244640F5F41D6E68A83C404AB1EA7F5A2446406299AF9B67A83C40EC32B1005A24464038F4358866A83C406C1BA792592446400CC8453E65A83C409D6F063A59244640175F8BCA63A83C4054A936FA5824464027EE4D3B62A83C40473EABD558244640552FE39F60A83C404E86CBCD58244640798082CEF09D3C402B5BD8B283244640A8239A98149D3C401958A473EC1E4640F7966C5A149D3C406AA463E2EB1E4640CE5225CF139D3C406C833758EB1E4640C1020BFC129D3C40F7E25BDAEA1E4640FDD51CE9119D3C403745956DEA1E464054F2C4A0109D3C40D7840216EA1E46402475732F0F9D3C40ACDFF4D6E91E46407ED525A30D9D3C403CCBCFB2E91E46403A39DF0A0C9D3C4039CBF1AAE91E464014FBD6B85E7B3C40E75153576F1F464076A38693877A3C4010707E3B7418464031538FA5F9793C40EF04F456AA1146409B02DBC6E4A43C40553A30C6F4104640DDD6D05CE6A43C403782DCB0F4104640674679DFE7A43C40D9F8797FF410464059070740E9A43C408698EC33F4104640870AFB70EAA43C40C9CC18D1F310464098BFA866EBA43C403C1AC75AF31046403C7DA817ECA43C40CC0A7FD5F210464036AC337DECA43C400ACA5A46F2104640012E6793ECA43C409224D5B2F1104640C2ED3C9C15A43C408108052D0B0A46405E37E46115A43C409A3B209A0A0A46409C6AF8D814A43C40E67C2E0E0A0A4640BE3DC30614A43C405562978E090A4640BFF562F312A43C40885D4820090A4640BC227AA911A43C406A0484C7080A4640C07AC63510A43C4013F3B787080A464069E2A2A60EA43C402BE75A63080A4640C780790B0DA43C401A64D45B080A4640337EF77C61853C40011F32578D0A46404A4D5CE274653C400E8F98390B0B46407226A04B73653C406FD4454E0B0B4640FD32E6C771653C40AE72267F0B0B46404802156670653C40438B59CA0B0B46400789C5336F653C409848FB2C0C0B4640E35ABD3C6E653C40984C41A30C0B4640FFD97A8A6D653C406EFB9F280D0B4640E4CFD7236D653C404633F7B70D0B4640C306C60C6D653C4067B9C44B0E0B464030A2B4C13A663C401B981B17F1114640CCE204B14F5B3C40EFF8DFB01B12464070834C1A4E5B3C4047D887C51B124640885D8F964C5B3C401B2655F61B12464025AEAC344B5B3C40C7B168411C124640C14A37024A5B3C40164DE1A31C124640C459F00A495B3C40A312F8191D12464067E75358485B3C40D07B259F1D12464033C43BF1475B3C4015DA4D2E1E124640AF3F9CD9475B3C404C7FF3C11E124640AAC4E1440C5C3C403199988CEC184640F775039F28543C402E1BC0BB0A19464011B4880727543C4039FA54D00A19464000190B8325543C40DA8B1C010B1946401CCC772024543C40B705374C0B1946409B5F6EED22543C403EB2C1AE0B19464054D1BAF521543C406152F3240C1946406B82E14221543C40F75A41AA0C194640089BC1DB20543C40459F8C390D194640F37251C420543C4085B153CD0D1946407D3C3C1581543C4095206362561C4640521044C9E2343C40A59DFCA8C11C464009AF5130E1343C40B2C4E1BCC11C4640A7ED15AADF343C40E8A024EDC11C46401D79A145DE343C40533BE837C21C4640372AB710DD343C4055AF499AC21C464089054417DC343C401EB17C10C31C4640705EE962DB343C40B116F195C31C4640F9A99DFADA343C40D5F07F25C41C464055AE67E2DA343C400D769EB9C41C46408188F9FB19353C40BE3AC4B6FF1E46400C9783E85C093C40ABD82C54261F4640A70CBAF35C093C406ED5FFFA6B1C46404B1458CB5C093C40AED99A676B1C46408E96BA535C093C40C20FE1D96A1C4640926E7B915B093C40F30646576A1C4640145A138C5A093C4096CECFE4691C46406C66904D59093C405F7EE586691C4640F1ED32E257093C402EDC2341691C4640B9F4F45756093C40F9C93916691C4640938800BE54093C403EDACD07691C464097552C5AF4EE3B40E72B7A30691C4640FCF0B108EFEE3B40C10D354EBB1B4640F89FD6DBEEEE3B40D94F0BBBBA1B46405CB00060EEEE3B40AB13DB2DBA1B46400676F299EDEE3B40CA6011ACB91B46400B734891ECEE3B409215AB3AB91B4640A4752E50EBEE3B404ED503DEB81B46407487FBE2E9EE3B407E28AB99B81B4640A486B857E8EE3B403B754170B81B46402D1396BDE6EE3B4014285E63B81B4640230C019D15CF3B405E09A76CD61B4640C714BCA514CF3B4075DC2FAF3E17464019DC467D14CF3B403FB3D71B3E1746407496B20514CF3B40AB932B8E3D17464009F0974313CF3B40168B9D0B3D174640BFE66C3E12CF3B40344132993C1746407E5F3B0011CF3B401C974F3B3C1746405B5E3E950FCF3B40C46091F53B1746408CAD690B0ECF3B40BDE2A5CA3B1746407893E0710CCF3B40587133BC3B174640B3D204998CBB3B4005225BB83B174640367D6B5B8BBB3B405FDB1348241546400E4852328BBB3B40425CF7B323154640C4C54EB98ABB3B40A003A22523154640646714F589BB3B40DD419BA222154640809542ED88BB3B40C615FA2F22154640EBE118AC87BB3B40F36E32D2211546405E1D113E86BB3B40C7E5E88C211546409B4663B184BB3B405281CE6221154640BA24781583BB3B405CF38555211546404CB6B32C7B9B3B404CE05FAC3A15464065F586E0629B3B407376CAD29A104640935036B5629B3B403D8A903F9A104640724EF93A629B3B40AEDE35B299104640C2828276619B3B406012293099104640B3B85E6F609B3B40368E69BE98104640FBABAA2F5F9B3B40D25A566198104640278DAFC35D9B3B40D91F831C98104640D7236A395C9B3B40FFF394F297104640FB3301A05A9B3B40FA5728E5971046407E61D40730883B404E3CED1FA4104640284D80641A883B40BC553E93ED0B464096BC96391A883B402BEAFEFFEC0B464041DCC7BF19883B40512B9872EC0B4640061AC2FB18883B409B4779F0EB0B4640C70B0EF517883B40F470A27EEB0B46408E50C4B516883B409DA97321EB0B46408C3B2A4A15883B400FB981DCEA0B46402A1A39C013883B4045F072B2EA0B464001B9142712883B405218E5A4EA0B464037247E57E2743B4091D27159F50B464066F06045E2743B4007648259F50B46406F7A250FE8543B407F2D2F1C1D0C4640CE61F4DBD54A3B40E1E23DCF200C4640B3ACFF1AD44A3B40676E64E1200C4640E6DF515B35473B40AC5CB66C6B0C46403D4EE8B357453B40B3A3CEE8710C4640B96F6778003C3B40FEE5951AEF0A4640275E050CFF3B3B407A6A96EDEE0A464014F4F08EFD3B3B407EAB62D9EE0A464023AFE867EE343B404B957A86CB0A4640E04B9131ED343B405104B188CB0A4640EA9F89FFEB343B40BCDD669BCB0A46407E18151F702D3B40E0E17C08760B46400C2466A86F2D3B40DA6A6114760B464076F322A1C0273B400FF9098B180C46402ABBC946BF273B405BCA4EBE180C4640B6AD16E4671E3B4037212C37D80D4640F6D4D1AAA2033B400EED3B3ACC0D4640D546DF90CDE03A40AE1C46D49E0A4640F1DDFBE567C73A4085C66921900546408EFE813C66C73A401DA172E18F054640155F897664C73A402FD39AC48F054640CFFB21FCB0A53A40F3834E91C5044640436537CCCA6A3A40096BC128FA004640C4798FBF514F3A40D764ED453AFD4540677B715E64293A405627317770F6454059669CA2BC1B3A40B234EFB549F04540201DBD3FBB1B3A409D6D173849F04540C2B4B194B91B3A40F2A424DC48F04540B3913CB054073A40514C739301ED4540791A8E24D7FA39406AABAB5620E94540046AC6F581EF3940E0A7752C94E2454090BE5F2281EF3940AA8C7BC693E2454042ADA02280EF39407F4DD96E93E24540BA31655A57EB394090C8E4D35FE14540690E40BF64CC3940E6BCB6C379D6454079CB2A7363CC3940D831546479D6454052C1BFF861CC39409651511F79D6454063220B8B079F3940068CA8642FD04540BEB0AF1ABD8B3940E270416BC6CC4540F6622303BC8B39408BC59642C6CC45405A9C0FDE217A3940C03B8204BCCA4540214CDF3F207A39407ADFE0E4BBCA4540E454A4981E7A394053FA68E4BBCA4540E754EEF91C7A3940D6851F03BCCA454004654DCA2F70394001C48789DCCB4540F1FB241B78633940FC04FED4EACA4540672FA6C576633940AABE28C6EACA45404F9A196E75633940DFF900CCEACA45401AFBE81D74633940A3B75DE6EACA4540EB7CD4C69D4B39401C02DA378CCD45405DE4B8D7372F3940E4F2429531CE4540E82D4E7F362F394033319FA731CE4540C42A2734352F3940A1639BCE31CE4540627ACA967C18394048DA93BFA6D14540ECFBF8C77B183940EBF2FCE3A6D14540C1F8DC2DD9FC384077E6FF1B36D745404323B55D9CEE384078E8BB567AD745407B600442C8BB384066C4F3D02ED4454023254CAFC6BB3840F89222C52ED44540C501E21DC5BB3840FC7BCED52ED44540AA06EC9CC3BB3840206F56022FD44540F64EF13AC2BB384084350C492FD44540C8A64D05C1BB3840E9AD44A72FD44540D67CB007C0BB38406494711930D4454033FEAB4BBFBB384048DC439B30D44540F99E58D8BEBB3840BC50D52731D44540198D10B2BEBB38407CE9D7B931D445405B4F241CC3BB3840124AE222D0D64540E0E0E658C3BB384038D938D6D0D64540B76EC057B8BC3840D65BB68438D845406C82AC9692BC3840FECD8615EADE4540E9492EC092BC3840985EABB1EADE45404245CD4193BC3840442B5547EBDE45407E00F11594BC38402C3D0ED0EBDE4540CA17713395BC3840F59EEF45ECDE4540526BFA8D96BC3840BA96E2A3ECDE45401953971698BC3840FAE2D8E5ECDE454094F154BC99BC3840B58CF908EDDE4540F4C5BD6873EE3840D9B0D49A1DE1454058CC1E5874EE38405FD733A01DE14540ABB704DDBBFE384046BCE87723E1454054ECD92DBDFE38409A52686E23E14540AEA60476BEFE384095544D5123E1454054440B959F1939405939D9B4E3DD454051B6DAFC1D3039409F6761D8BCDD4540E070CF671F303940C4B342CABCDD4540183B64C620303940D3B461A5BCDD4540DC43DC0C3C4D3940617D2FF6A1D94540034171103D4D394001E3CBC9A1D945406C651872FF623940C854132637D545408A3CF560296F394081F5BC6C2CD54540ECEE6FE3B68B39403CA6A5AEE0D74540D910EA2BF49D3940E938DC19C0DA4540FFC310A85CCA3940BC5532A9F5E245401CD4F78096E83940805BE7E96EEF4540C4AD2CEA96E83940675D25126FEF454087F402975EFF3940C991AB9684F745402B7FB1655FFF39403803E7D684F74540D8C8B04AC1193A400A642ADDADFE45408563A915C3193A401DE26E3BAEFE4540C218B0B0EF273A4022EE4338C900464081DCEE24524D3A40D23531A3B606464034EF4932534D3A40E98F14C6B606464067AD0D95FA6A3A401F994039BD0946408CAB0B4DFB6A3A4030EFC648BD09464040B0F2E459A63A4054C23656B50D46401170B1B50BC63A40573FCD481210464038B31F3ED3DF3A408830DCCD7B15464068A30E11D5DF3A40BDCF15167C154640DBC58A06D7DF3A40EEFCCA337C154640AF6D050E3F033B40D7803AB7011646409BB84DAC3F033B404ABA5CB70116464067529207481E3B40A573F6FBA715464091AC353B491E3B40E198AEEFA71546400E707B664A1E3B407AEA3FD3A71546404EFD8FC3FA343B407A6F0CF7D5124640E4CCDFEA73443B40DC1C0CA713134640A0058B0572443B40E98956B8AF144640CA85F72C72443B4035A34E4BB0144640D76C15A372443B4009ECB4D8B01446407401616373443B4027D6215BB11446407BB8806674443B40F33399CDB1144640FC1E8DA275443B40A2FFBA2BB2144640ACC2710B77443B40672AEE71B2144640CA64639378443B40E1D0839DB2144640AAF2662B7A443B40347CD1ACB214464060BBAA6A48453B40BF4E041DB31446405F45979858453B4005651E389A1B464057E94BC258453B4038CF68CB9A1B46407BE21B3B59453B404EB0F1589B1B4640F2A862FE59453B40C69E48DB9B1B4640CB209F045B453B40E0536B4D9C1B4640606DBD435C453B40C6F2F6AA9C1B4640B7157AAF5D453B40472F53F09C1B4640A8AADA395F453B40D8ABD51A9D1B4640A94BB7D360453B40B732DC289D1B4640ADB6B81564653B4062039E31911B4640006CD0EC6D653B4081F26FBD6F1E4640AB5328176E653B40EFB0B350701E4640DD589C906E653B4091E22ADE701E464048AC81546F653B405CD36560711E46408D24515B70653B40DE5663D2711E4640BE4CF19A71653B403204C22F721E46404DBF190773653B40454EEB74721E4640EDFBCB9174653B406DD0369F721E4640B213DD2B76653B40067404AD721E4640CEA827607C853B40EF654046621E464012378795A6853B402BF63BB0B42746406CAA8EC0A6853B402E417943B5274640E0FBC43AA7853B4053BEDED0B52746409EDD77FFA7853B408F5FFD52B6274640AC341807A9853B406807D5C4B627464007768447AA853B40D3BA0522B7274640B2516CB4AB853B40ABABFA66B72746402FD7C93FAD853B403C740D91B72746409E6B6BDAAE853B408729A09EB72746404DA330ABF0983B408B37938AAB274640014A602B2AAC3B402C1DA4DC9D274640E1B7926544AC3B404E6F8F55192C46403C63629144AC3B40BF97C4E8192C464023B8640C45AC3B40EC8A14761A2C4640DD91DFD145AC3B40E00E11F81A2C464070263CDA46AC3B40EE55BB691B2C46404FAF511B48AC3B40A823B5C61B2C4640925BC98849AC3B4017C66B0B1C2C464066B497144BAC3B40A33C3B351C2C464081C986AF4CAC3B40A53288421C2C4640126BD45661CC3B40FC7A08CF012C4640A467105B99CC3B408C6760A50F344640444A8E8799CC3B404C788E3810344640AD9F4D039ACC3B40F51CCCC510344640A6FD8CC99ACC3B404CCDAB47113446408309AED29BCC3B4009D52FB911344640636B80149DCC3B40146EFB1512344640000BA6829ECC3B4075AB7D5A12344640FEBB0C0FA0CC3B40E48E14841234464090AC78AAA1CC3B4097EF269112344640525CF50CE3DF3B402470DA81003446408F5321D3DDE03B4072C9B38AA754464043000000458E326324163C4086B95BFAA29B464096F1CD04A6023C4059E7EED6B99B464069CC00DB3D023C404D18FBA1379046404273D2AC3D023C40D25FDE0E3790464066B9712E3D023C4034A8C5813690464066EDB9643C023C40A5081D00369046408C8C6B573B023C40D811E08E3590464044FFDF103A023C403DC96832359046406BC8A39D38023C4085D944EE349046401D11FB0B37023C40929D12C5349046409F4F556B35023C40A45D67B83490464067A57E12ACF83B4079F40F4E3F90464021E24D4848F83B40247F72F8BC844640BC4C6A1A48F83B40C3435765BC844640D0DE769C47F83B4087DC3BD8BB844640A6684AD346F83B40FC268C56BB844640E9949FC645F83B404CAC43E5BA844640FFE2C88044F83B40B69FBC88BA8446406A204B0E43F83B40EA0F8544BA844640F347627D41F83B4035F03B1BBA844640778175DD3FF83B407251770EBA844640706903D023F23B40C234B282C0844640FEAEC8F4C2F13B40F4705E353E7946406B336FF4C2F13B406C34E42D3E794640E7838F7D10F13B40FC87C518BC6D46408E3A05DDD8023C408F3C6CACA86D4640437AB37ADA023C40CDB5159CA86D464039727807DC023C403FEA5B6FA86D464072BD1474DD023C4063DCF627A86D4640915885B2DE023C40DBECA4C8A76D4640F37A8DB6DF023C4063DC0F55A76D4640CEFA2E76E0023C402BC2A8D1A66D4640FE9B0CEAE0023C4022597C43A66D46405C82B20DE1023C401C5201B0A56D4640DF99B8B8AE023C40BEBB963D03684640F44B452CED113C405724EC9EF1674640BE83F87E5A123C40505C9F1E74734640A0AC4BAD5A123C403B75C3B17473464089C9872B5B123C408D0EDD3E75734640265CD2F45B123C40C8547FC075734640FB1F6E015D123C401A50AE3176734640453707475E123C40ABF30F8E7673464008D218B95F123C401BF316D276734640A666684961123C40C9B825FB767346403ABF91E862123C406D24A80777734640B354C5C13E163C404720433872734640705451181E173C4013CCDBC5798A46408A0EE3461E173C406899F8587A8A4640345697C51E173C40E89B09E67A8A464010628F8F1F173C40CCB1A2677B8A464099C7079D20173C405293C8D87B8A46406BDFA4E321173C40F1D721357C8A46401FB2D85623173C40ACC221797C8A4640B6825EE824173C4081302BA27C8A4640E936C78826173C40DC50AAAE7C8A4640AF3A8C5339203C40B8950C41718A464009CEA613AD203C4010B6B964F0954640D5397E90F5153C403347BDDEFD954640648CA2F0F3153C40412D40EFFD954640117ADF61F2153C40F7B4221CFE9546408F4687F3F0153C406060AB63FE954640195AADB3EF153C402B921AC3FE95464036CE9BAEEE153C407E96C536FF954640578C5AEEED153C40FDB33ABAFF95464054A34C7AED153C4081E26C4800964640439EE756ED153C406A79E5DB00964640458E326324163C4086B95BFAA29B464005000000E7630381D1DD3B405A46144386694640B0F22273B4EA3B40574E4D61796946401EFB2BECD6EA3B40B338AA8CBC6D4640A8497239F2DD3B405191AC92C96D4640E7630381D1DD3B405A46144386694640 BG Stretch \N 2019-06-14 12:47:48.840851+02 Intevation t -HU_stretch_1 ["(RS,XXX,00001,00000,14330)","(SK,XXX,00001,00000,17500)") 0106000020E6100000010000000103000000010000000102000093740FC550AC324095DE2F4F40034740958CFAB64DAC32400EAEE3F31C044740F87A25D84DAC32405D411D7B1D0447407B59523E4EAC3240F37A15FE1D044740E24933E64EAC3240511790781E0447405D4F7E0195AD3240EF8DD9E6DD044740B3C568DF95AD3240915D5852DE044740A0AFDAEF96AD3240A4F0AEAEDE04474003D9712A98AD32400CE005F9DE044740B91AECEC92B53240CB6A0F266B0647402B4B181497CE324069B09C67691247409F8197F5ABD23240887367927D154740B317B8B1ACD232400F3AC6047E154740543139A4ADD2324069130A6A7E1547407FA3B7C5AED23240B5471DBF7E15474044802A92F2DC3240B32B6DCD021847407AD00926F4DC3240BEB6751B03184740C2134BE0F5DC3240B973124A031847403059F3F3A2E53240840032F6951847405A5BB92109E53240099F70CB411C47409A09391E09E5324038AA03F5411C47407862F1ABFFE43240CA0BB61CE523474002024DACFFE43240FB0BBB2BE523474065441D0A27E53240C80E425CD22647408A2033627DE03240A24762BEB22E4740857BDD4FFEDC324068F8BDF05F324740202BEBEBFDDC32407611979660324740B9526CF5FDDC32408AEAF83F613247406D5EE66BFEDC32402F7C5AE46132474070CA3FDAEBE632400838891E953B47407AE4E7F651DB3240C0A0F376314A4740E4FE14D98CD63240DA8706511A4E47403D80B2618CD632402B643AD21A4E47406492562F8CD6324078D8B4581B4E47407767A1438CD63240ED871EE01B4E47401B50EB9D8CD632406B5C18641C4E4740C0244A3B8DD63240EBA65FE01C4E474050F01494D0D7324086892C21E84E4740379A0EF544DD3240189C91E4555247407EFEE9F845DD32404364C665565247405D09DA4447DD324094FAA4D156524740C02079CA48DD32401BA97F2357524740292DE1784ADD3240E794C95757524740B7DCA10573F13240F7B46E88FF5347402940D25E8DFC3240B733293F4F5947401C0BB45089FC3240F523FEEBA45B4740DFC2B6ED6CFA32409C810FD9295D47405914B47DCFF4324027A76535006147402AE3A7E5CEF43240FA7DF4BB00614740FEA66AC039F43240C90441A4B66147406B2F7A42B3EF32402AE4B8B07A644740AE4E0514B3EF32406A64A8CE7A6447402436F85AF9EC32400285A3AD556647405EBC849481E9324088A754B08E684740802D240381E9324028DA9C238F68474017757DAB80E932408834939D8F684740DA50FE8F80E93240D49BD61A9068474019C8CFF9A5E932408A810B14BE6E474075C9F52DA6E9324036BF5AB1BE6E4740AE89AAC0A6E93240928D7847BF6E4740C9E866BD46ED3240A6ACACB277714740723A5A3B47ED3240DBEEB60378714740B7A5E1222DF23240BABFDA2634744740E313123796F33240A2D23CBC607747402A4F7245F0F13240A6FF9325757A474080858508BEEF3240A9A678487C7D47407CA3C4C7BDEF3240DE0DF3F27C7D47404E5D72F9BDEF32404EDC049E7D7D4740B709AA3CE2F13240902936D1DF804740B87CA1526BF2324051C1A530D88347400E47EB1254F03240BA9B6750018547406DC50093B8EC3240A0FA35E9FE854740B75760D1CFE2324031D17787B78847405E8B5A81CEE23240C3D307FAB7884740C27CBE80CDE2324039CC7982B8884740D66B66DBCCE23240E15B801AB9884740AADE69124CDE3240CAD01E5FCA8E47400408F3E24BDE3240B21C6EB2CA8E4740BD488C2AE8DB3240DE486842C194474032294317E8DB324073DEC6C0C194474091362B42E8DB324002F1773EC2944740B11F123EF9DE3240716CCDFDEA9947405A48BD96F9DE32401A0B4B69EB9947401311FC1CFADE32403A0826CFEB9947409EA5B2371FE33240BE795474879C4740445D4B4F1FE33240282BCA82879C4740E33909574FE53240FD2C50EED59D4740B8D4A917B9E73240BA9E2AAAD2A14740F8C482AB23E73240904BAA541BA54740D71D4BB423E732405A0C49D31BA547404C0934FB23E732404F489F4F1CA5474020243E7E24E732405A482CC61CA547405B369AD658EC3240FB07B6D1D5A84740C902D8EB77EF32406D4F194747AB4740C4E00A8617F03240136A9A1643AE47408C48C2D517F032407CE741B043AE474073EEC88018F032405DC30E4144AE4740811881B6E1F332407BE45395B4B0474092993CDCE2F332407A256D26B5B04740CFFEFC5CE4F3324016E6749CB5B04740AA70973594F832406C635601D7B147409786897905FB3240FC5A11D16DB2474026C5DCA806FB3240BDBE860E6EB247400DE108F107FB3240F290E43A6EB2474058F92E89D4023340196FF6503FB34740A987FB02A10833406C2BDE2C66B54740783ABBE4D00A334043B98088E5B847400123CCEF040C3340A97392FFD5BA47409C84D00FC50C3340C5A2FCD298BC4740367E85382E0833408A388AD0D8BF47407DD8C5A72D08334046CC0556D9BF474038FD80632D083340304856E2D9BF4740FB557E66A10733407BAB7CAF87C2474077B4306FA1073340E4EF0A3888C2474044E86BC0A10733408A97D4BD88C2474080C5F653AB083340CE74785FB2C3474011EE6C95C60E3340105097548ACA4740A22807644212334003853313EACE4740CA34ECEB4212334086676990EACE47408A3AE6B24312334088F09303EBCE474056EFBDB2441233404C171A69EBCE4740A4A764E60914334061C638F581CF4740EF83F0035D11334080ECB97746D3474035A844C85C1133406228BA0747D347407CFA73DF5C11334044DCEB9847D3474050D17CA4CE1533408CCBBCB62CDD4740F41D28BD2A1433407B74AE89D4DE4740553AE24E00113340F22C81516FE04740357A678AFF103340D68A5ECC6FE04740D079670CFF10334098AF555170E04740021032D9FE10334064C3D9DB70E047403E0F5CC8DF103340C162185FBEE1474058D571CBDF103340DFB2ECA4BEE14740FCF050DD3C1133402E3F75ACBEE347406D58C966F6FD3240ED4C52E16CE64740950CC0CB48FD3240BC947FAA21E647409BF46D5D7DF732402447934A55E2474012E515957CF73240F785A9DE54E247404766C6997BF73240635AA37F54E24740E0B7A6727AF73240742F353054E2474094759F0010F032402C69971BA8E047401BF01B520EF0324043C8D6CFA7E047408A49447D0CF03240A8DB2EA5A7E0474051282C980AF0324040D5A19DA7E047406D1AABB908F032408EBA8AB9A7E0474072C99707FCEA3240F82F24FF24E147408E4FE398FAEA324001E9C22E25E14740D5588A48F9EA3240E9A2457325E147406DCBB9785EE73240ED5785E408E247405E73B30B5DE73240A6D5565509E247409D8333F15BE73240184374DE09E2474088280E375BE73240D95D27790AE247408562AB01A3E43240B0AF71724BE5474036F7EF85D9DD324078CAC5D9E3E54740B9F1D6ACD7DD3240175B3817E4E547409DA6E408D6DD3240A457F276E4E5474048C09F47B3D8324007D32ABB5FE747408CFFF158B8D0324032E1B68E58E747401CB49BC3B6D032405668B29958E74740DDD625A9A8CA32403C1300C4B2E74740D3B2F98D2FC63240A8697D9C78E74740DACABEE8C1C132403AD1105415E74740CE0772A6DEBF324095B5384C59E64740B49D899CB1BC32408E3A9DD2D3E447402789C69F54BD32409E1148FB7AE447405743445855BD3240D18F1D7E7AE44740927F16C955BD32400468A1F779E4474044505EEE55BD3240C4D3706C79E44740D047D4C655BD3240285F52E178E44740D5B3D35355BD3240D0F60B5B78E4474012B24E9954BD324060FB38DE77E44740B487AB9D53BD3240A8CA216F77E44740766B8C6952BD32401622961177E44740C0F5E02D66B63240939351A8B9E24740E609ADE273B2324082FC54F233E147405EF83CD1D5B03240620E99303CE04740514D34BBD4B0324088CE55AD3BE047402DEAC658D3B03240DF3800413BE047402DF927BAD1B03240E5EB8BF03AE047406E260BA30EAF32400C5352E6F7DF474089E1A5FF0CAF3240575705B8F7DF4740CBA3430282A93240CBC1A3D78DDF47408937F8777FA932408752E5C78DDF4740D3C71F82E0A03240ACCE3535C5DF474027E6E74CDFA0324034A15444C5DF474042DBF2A690933240FAD8175EBEE04740853E9D1D548C3240A9AB80091AE14740ED69D6893C843240DFCB45B794DF4740A734311E3B8432408B94928094DF4740C93F8D9B39843240127B7A6094DF474002F5290E38843240D5C2015894DF4740BCC56B94127A32409C63DAE0AADF474005A48EAD107A32402FCD3CF7AADF4740E658EDE00E7A3240228EEC30ABDF47405C53C0440D7A3240DE43218BABDF474098B93A12A97632405E5597039BE04740945DD3D6367232402514495D49E047409CE9B2FD666C32409A197C0870DF47408B331D32666C324012019FEE6FDF4740BEFC3FE6725B32402B288DCB97DD47406F427154715B32409C5433AD97DD47402D35F3B86F5B3240779E36A897DD474041BEB8216E5B3240F54CC2BC97DD474050C68F9C6C5B3240C31424EA97DD4740B66AA9366B5B32404723D22E98DD47406F8327FC695B32401D78788898DD4740EC5AB3F7685B324029190DF498DD47406E292132685B3240B671EA6D99DD4740D100C8B0D5573240A2BC773F62E0474094A25E2DD5573240418D6CC862E0474051557FF9D4573240B3AC4D5763E047408F950D17D55732403D6CE7E663E0474077F0F584D55732400564FF7164E04740630A383FD6573240862D85F364E047408AE90B3FD75732407096C16665E047406B29217BD8573240489482C765E04740E2C9F5E7D9573240EB5E421266E04740F0704178DB5732409645484466E04740BC5FC9EEE26A32404ACDF03919E247408BF90DA5D56F32407E62C996E2E24740EFA200ADD76F3240CA6977D0E2E24740651DF0CED96F3240D30BE2DDE2E24740D292EE7E8E7A324077079C91B4E2474038D5F986907A32409304CC73B4E24740A64912F82E83324076778917D9E14740C5E8BBCC04863240A6AD92C4E7E14740BEB441F3BA8B3240E0405DB250E34740ADDADA44BC8B3240827C25F750E34740BA1B09B5BD8B32402DE9E22651E3474096335D38BF8B3240CFF6194051E34740A1A0CFC2C08B32409D2B024251E347407248194EE0963240CB52DCF109E34740B05F4120E2963240B98930D509E34740878C0FD6E39632404F42169809E347403E34E55BE596324071784A3D09E34740558F4D126F9A324011C3386602E247405BFD7E86DB9D32401EA7C55CA7E147400E19BD19B7A93240A51A506650E24740177FC21981AF32401463367080E34740F5BC9E382DB33240092FBA2DD6E44740D95B4D9692B43240900D78D1CAE5474068A4FBD192B43240E25E89F7CAE547408FD6C96551B732409D29A49B6DE74740561A45E151B732403AC519DD6DE747405F8F6720F9BB32404D8063B6A2E94740CFD97F5FFABB3240CF7F9B2FA3E94740373915E4FBBB3240923B198FA3E94740C0953E9CFDBB324051F375D0A3E947408D3CB273FFBB3240A568AEF0A3E9474077F260A3B8BE32404ED84FBFB9E947407F7CACE8B9BE3240D5CC7DC1B9E947402DA4DD9BF6C532402D5C44B198E94740AD9B1EAF0BCC324081FEE3D4E7E947405CE3A0CE0DCC3240A12406DAE7E947403A7C61D2E2D23240079DEF7AB0E94740A2315138E4D2324045A69C65B0E947408FC79C6C86D932401649696D1AE9474027E2E8FC87D932401239E83B1AE947405F061B6A89D93240E9E2C2F119E94740D3D5F8A68AD93240F3CFA89119E94740281908A88BD932402F21151F19E947405F2DF9638CD93240EB472E9E18E94740725AFDD38CD93240EF899F1318E94740A1F205F48CD93240EEB56D8417E9474033F1E9C28CD93240D999C8F516E94740E3BB70428CD9324071EADA6C16E9474063A341778BD932403D5A9AEE15E9474003BCB8688AD93240109C997F15E947408D5A51BD89D9324057EB8C4515E94740ABB3031954E6324066DF6E874EE847409B65769355E632401063AA644EE847401D7D1AF656E632402847332C4EE8474040AE103658E6324075B2C4DF4DE84740A8D9894959E63240AB7FB6814DE84740480CF1A843EA324014D8FC15B5E64740FD4A9CA744EA324035144F95B4E647409E350C5345EA32402C80D705B4E64740120B0DA445EA324069129D6DB3E64740860008FFEEEA324085B3D8C9B8E3474038AB019AD6EC324018988E7A19E347402557140DF1EF3240B2114346F4E24740DF043AD975F6324080DEACF3FDE647404D9069E076F63240B871A274FEE64740D1AD936B54FD32407EECD340B4E9474071B20E9E55FD324040E5B1A4B4E94740C6DC2D0357FD3240E5BB33F3B4E947409CA6018E58FD324079748129B5E9474052E53C305AFD32409082A345B5E947401F12E45F58083340F4554EDF15EA4740B8D9F9FE59083340622481E015EA474082E498975B0833401E51E8C715EA474050E01E9C7F163340CAB1AA66C4E8474054E22C0D811633402CC01B38C4E84740D28F4C6082163340D0CD7EF4C3E847400F39008B83163340E450EB9DC3E84740F30FB50291203340B2841DE248E547404A841A11922033409D9C3D7048E54740061570D992203340C59FF7EE47E54740F8E2679C47243340E709E35631E247409D719F0B48243340C115BBDD30E24740D18A133D4824334008D2016030E24740E5D16EB5D6243340532B717241DE474054ADF9B3D62433409D61682141DE4740BA437453AB233340486BCCCAA8D74740A424533BAB233340F9AE8980A8D74740F1C0EF14A6213340E183E67D65D34740824D85D4A52133401182421E65D3474092664C48FC1C334067D448B016CE474034B99FBFFB1C3340518D193A16CE4740BF704FFEFA1C33405B7C54CD15CE4740C30939BEF01A334058500B2821CD47408B76D2E3CA17334099D009AAA7CB4740B4A0CFA49C173340A3CA43576ACB474075285E699C173340DA9A37156ACB4740B164181426163340D1411B8205CA4740ED9D777DBB143340057E2CDE98C7474003EA8362BB143340E98DDCB598C7474059D5547A6E1433403B4AAFBB32C74740AB578C386E1433401372AC7332C74740CC8BD665C10F3340B497A766DBC24740C346DDA0940E33407B54FD2FC4C14740D4A42DE7110E334030130A4216C0474050A160BFDF133340F744B2BEE7BC47408803C986E0133340222CF332E7BC4740CC339EF5E01333400A06549CE6BC4740347A2F07E113334052A13401E6BC4740FB1895530A13334030BA5D8181B84740BC3D8EF509133340F021DCD380B84740506C5723091333403110803280B847408B6624B3B112334029656BF34DB847404AE882AEDC0F334062213C5CADB6474073375886FA0C33406692CAF222B3474028F2D7FAF90C3340462F997422B347401C40702FF90C3340FBFBD70022B34740656B9E2AF80C3340C560389B21B34740BB45D5FDEE043340E77D493D83B04740DCF6A7DBED043340259B72ED82B04740A8A23496EC04334022BC3DAF82B0474072E2AC36EB04334076BE6C8482B04740DDBCA34170FD3240541BF738D5AF4740DF505C2970FC3240B2B13BE1B1AF4740B3DFE75834F93240953311A53FAF47401A324A59DCF6324002080C1A56AD4740361C1DD3A7F5324031EFB16F65AA4740F81CB549A7F53240A496A9BF64AA4740E0EDD86E8AF23240B8C568F1BEA747408D0BFF258AF2324028CBFEB9BEA747409F650B5274EE324066AF5EBCF1A447401F9FE1FA86EE32408EB8C5821CA147408D1635C986EE3240C6D3F8DE1BA14740977DB63ED3EB3240DE2CC488D69C4740A6AB7660D2EB3240D6CB66BDD59C4740F7C285CC4EE93240BD5073F9449B47406EDA5F1AC6E83240EB501EDBEF9A4740241049A2C5E832401B46BB98EF9A474048F89B8657E5324066543DE93D994740FDF84DC1E7E232405FCD66DBA8944740D434D9B650E53240FBAC7AC08D8F474053214236C2E7324079175339188B474083CF979167F532400186A046F1864740D489ABEC68F53240D3E072C0F0864740B582A83CBAFA324017C01B994F8447402805BB20BBFA3240583AFA084F844740BB2F6AA4BBFA3240A01F6A6B4E8447402B7F80C1BBFA3240715AD9C74D8447400F5D04D14BFA3240D9A9E60A32814740901FB99B4BFA3240E5C373863181474041E0EC224BFA32401E674C0731814740780B3FDED8F63240068A94AB6C7E47406C491449C2F93240E1ACC74EF57747408DFD1259C2F9324035212695F4774740627256EA8AF832405FA71FE08673474076A396A28AF83240505B7D5B86734740CFDA14178AF83240481F5ADD857347406050CB43ADF5324061A4D329807147409EB198DBACF532404D1E97E87F714740B3A1837FA6F232404D65480FCF6F474015F4EAFAF6EF324007A183CB0F6E4740F416C0E80FF03240457D0C4B066947401F5A83E7CEF132403A8BC26544684740E8D39A5122F332402F4C382CB16747403706C88287F5324007F8315F1B6847403D3EC91489F53240A3D98F941B6847404BDB65BD8AF532407792FAAD1B6847406BBE4B6C8CF532403F0978AA1B6847405BEDEA108EF5324064C72A8A1B684740F18B189B8FF5324039A5504E1B68474077F2ADFB90F53240589236F91A6847407DC31D2592F532408AF2218E1A6847400D46F90B93F53240E16D30111A6847403083ED26630333404F2EB70FAF5E47406166BCD263033340ADA05A6FAE5E4740326F2E1164033340FA18D1C5AD5E4740BFE451376603334036A82492725E474089D196BBE0073340632BC3409E5B47403B449C66E10733403EB2A9B49D5B4740A5EA8FBCE10733408F3A9F1F9D5B47403FE5F5B9E10733405B51AE879C5B4740EDEE917E870633404DE3877B44574740121D9917870633402CE342DA43574740B3252C4D860633400EAA8E44435747402888FB288506334079A795C1425747407D9AB18790FE3240B236E75467544740789C0549CCF932408CAE873D1B5247403032D76131F7324034DCEBD4D9504740C16D054330F7324015C93F64D95047406F8C39E92EF7324089FF5009D95047408F8615622DF732407E3DB5C7D85047407FF604BD2BF7324097AA02A2D8504740BA77A10A2AF7324076BDB599D85047403E8F90E334F63240A9FB5D51DC504740078A61D881E532402944186B7C4F47400F8F8A919AE23240BBE426E80E4E474041D33FAAC7E23240018A14C6D54D4740B581F2F559ED3240B250E43A784047404EAE941629F23240E92628942C3C4740C5F6578329F232406E7B7D102C3C474068B274A929F232406E9E33882B3C4740FEC0A98729F232406DF5C6FF2A3C474052E5131F29F23240E30AB57B2A3C47402CE2427B21E83240E563E855E33247401B366829CAF032403DB92B7C39244740979C9454CAF0324029CEE3CF38244740811B800DCAF03240677EB92438244740DB3FC0221FF03240CB3C6A64572347404B56531A4FF03240F9A67077DF224740BEB9532D4FF03240E19E90F2DE224740E388BEFC4EF032407DE9986EDE2247403532A5F6E6EE324072973432A3204740782736BDEBEE324042B122CE431C47404A34CF4C04F2324005CC970AAD184740C05D379D04F23240F3A7A17DAC1847402A96399F04F23240D7E7EEEDAB184740403EC35204F23240A814B560AB1847406FEE99BA03F2324076C512DBAA184740770FE58F4DEC324088CA1852C7144740B9A971EA1AEB32408B0226D890134740ABA6562E1AEB32408E6C074B90134740170CFD2219EB324063884DCE8F13474039F0BED317EB3240321944678F134740F663D84E16EB3240301F4B1A8F13474034B8CCA414EB32406E49A7EA8E1347409FFFB2E712EB3240536F5EDA8E134740A361B7C288DE3240AAA432A08C13474010D709C2FADD32405DB0E6817E13474036800C5BF9DD3240348858697E134740BC924AEDF7DD32406B1E14667E1347401F7B97E29BDD324091F0964680134740EB800EA49CDD3240B80D2D767713474056CD068A9CDD3240B93914E9761347409DEBB8249CDD3240DD16256076134740DDFEB2779BDD3240AADD2DE075134740977C07899ADD3240D633AC6D75134740F49E166199DD3240DFD3A40C75134740B324430A98DD324006737FC074134740EE02959096DD3240EF29E88B74134740A7828175D0DC32403CB5E53360134740B64AC2488CBC32409958B5F3EB034740FF7BE0398BBC32402DE59A88EB034740FFC8F0F589BC3240B07C2D31EB0347405E01898888BC324075908DF0EA0347403B5A75EBD8B432402F766FE3DC0247404A52B0F1E5B432407727C469DF00474099BDE6F1D3D23240DE18662F55F54640576DD8CB9AD5324082E6BC8AAAF44640BE0E510B9CD5324097F7F62CAAF4464004FE36119DD53240F00184BBA9F44640FD02C8D39DD5324089349E3AA9F44640952CC44B9ED53240241B13AFA8F446401AF8B2749ED53240ABCD151EA8F4464003F60D4D9ED53240E5560D8DA7F4464094554FD69DD53240C12B6101A7F44640AFCCE3149DD53240AF9E4580A6F4464045106B251BD432409A27492ED8F34640E81F9CEC19D432404AF985AAD7F3464023F3CE6618D43240E689BE42D7F34640194D0DA816D43240579248FCD6F346409FBEF9F7D6D3324005A468D8CFF34640F4C0F741D5D3324050EE48B8CFF34640967A6582D3D33240EEBA53B8CFF34640A33A70CCD1D33240619388D8CFF346401FDEDB32D0D33240BF338617D0F3464022FC34C7CED3324097AD9972D0F3464024681099CDD332407802DCE5D0F34640904960B5CCD33240A5F15C6CD1F346405B1BE625CCD332402C235900D2F34640803BA38492D33240DA51A4D92AF44640FDF5273E15D332406A38B80B90F4464053E8478855D232403FB6D7C70FF54640BB4299A9B1CE324011DF1E949DF346406DB6C650D5CE32402FFB4B528AF346401252F610D6CE3240DEE467D089F346409E82CE85D6CE3240F298044489F346404C07EDAAD6CE3240F77D66B288F346400E5FED7ED6CE32402935042188F34640FC277603D6CE3240E620529587F346407343293DD5CE3240A4008E1487F3464051577733D4CE3240CC998CA386F3464031B9549663CD32400B0959A805F34640CC60624362CD32408E07A44705F34640B89695BF60CD3240954EC00005F346404C5AD41A5FCD3240F0DB95D604F34640D7865E665DCD32402838DFCA04F346406BCB18B45BCD3240255217DE04F34640E6E0D0155ACD32400075740F05F34640F1B0829C58CD3240EF8CF05C05F34640E716A65757CD32407C645EC305F346401F93C5715FAC324065F853FEB9FF464005F7EE835EAC3240AD2D7C6CBAFF4640FF1290D35DAC32400E4AE1E7BAFF46408F5A8B665DAC3240C858656CBBFF464007FB83405DAC3240617D9CF5BBFF464093740FC550AC324095DE2F4F40034740 HU Stretch \N 2019-06-14 12:42:26.396645+02 Intevation t -RS_stretch_1 ["(RS,XXX,00001,00000,8460)","(RS,XXX,00001,00000,14330)") 0106000020E610000001000000010300000001000000BC0200002F1304F5523E33404B6C3CBA1B6C4640C9C3CAD8C32033400F8257E2666A464012085DE2E40533404ABF958FDE674640AA75DD45E30533402099C277DE674640E09D3FA4E1053340C7B12E7DDE6746407E54B90DE0053340CB27A49FDE6746402E351292DE053340DB90CCDDDE674640A1D60640DD05334054443E35DF674640F65AB624DC053340D25494A2DF674640520C204BDB053340904A9021E06746406415B6BBDA053340794F44ADE0674640A693097CDA053340EB294440E1674640D200B6B03D033340937B10A0F0784640BECBA0C33D033340E683AA35F1784640EDFA55293E0333408795FFC6F1784640D4FED4DD3E0333409BA5574EF2784640EA9403DA3F033340A6475FC6F2784640D653F5134103334065545D2AF3784640A5A24F7F42033340AE7E6276F3784640C96D66A18219334058F3DB21997C4640DDC7961A84193340D85AE650997C4640D75576F8E73C334015656E16B67F46404215F400E83C334088262B17B67F46407F35952F7455334016702374D181464043FE0171407F3340326AFC783C8646409CDDE3CD417F3340AB2FB2923C864640D790FB31437F33405DA66E973C8646409FF15193447F3340D1DF0F873C8646408A79970563A633403B693F7A36834640BA162D5664A6334007BE895536834640FA42189165A633405FF6A81D368346401EFEBBAD66A63340B45124D435834640F7A5AACBF7D333402407105036754640DEAA18E4F8D3334087C251E7357546400D8533BFF9D33340A96D826D35754640A94FF354FAD33340260019E7347546403BEEDA9FFAD3334076B00259347546409059B390D8D63340776F2D69CE694640FE41073002E833408D69A595CD624640B4D9E8EBF20434406C17545E53634640923AE697F4043440CCC5815653634640F404313740253440BFEDB1648C614640B3CAA6AC404134400049B5C09C624640BF9B9722B25234401F46CEE08466464020AAE23BB2523440785160E684664640B74A51CE3A5C34401A63E6AB956846407E532931F95F3440E3A608F53A6C4640CFEAFFC3685D34409736CA07CA6C46402396A40491593440F9F29D4E646D46400F3775AE8F59344023D44B92646D4640F09008818E59344008C52BEB646D46407CAE9E868D593440B6133856656D4640BEB3EB5BE6483440D10925C802764640CE6AB8B3E54834407A3DBF2F03764640222DAD3BE5483440EBCA7B9F037646401E02084D1044344079A5B26DDC7B464022D1F3F80F443440EE902521DD7B4640142E7D31D14334400AA55084D67D4640A20CF835D1433440E6FEC1E0D67D4640C2977A6562443440F66F05FE6580464067AFEFAB62443440F8EE168C668046409C7A443D63443440831ED01267804640D83F2B1464443440695B468D67804640DB50CC2865443440738F01F767804640DF4E0F71664434400FF2254C68804640F6C2EBA35F4A3440AEFDAE27AA8146404830EFE9604A34402429935FAA8146404810F045624A34407B601083AA8146405F6ADDAD634A34407BD71F91AA814640A2019D6AA34F344001A0F836B6814640EBE47353FF543440A42F09C33A83464072F105338D503440916010BE9C8846404292EB26BD4934409FBD8411DA8946405C3453B8BB493440A7A30F66DA8946402DA62A82BA4934406EE555D3DA894640C10B8291B94934405250BD54DB8946403DBABD05F7443440CD7E6090188D46409B145445F64434400F5BD54C198D464013837F86B74334401F556CED208F4640D7F11787FF2E3440C46512DD8A9446401B1686F11513344072A4485E09944640770CD87F2C033440ED040B9B879346403E4B7A092B033440A3CABA9A879346406661B79829033440BC9590B187934640F016E838280334402486D8DE879346406DCBC6F4F7F33340FC4D964809964640A8DDED23F6F33340EA43DFB009964640D346A93D73F13340931E7911C7964640C02EB345F0EC33407A41FD36E89746402BEC4BFCEEEC33408D9FDA9CE8974640ABDE89F4EDEC3340397E5218E9974640E3C93BC9C5E233404B4520A3D69D4640E7C01149FADC33404DC2215A079C46402C2259E1F8DC3340932052FF069C4640AAEC704CF7DC334047319DC0069C46403CEECC7E03D23340C5CE70B6C99A4640A7A5872801D23340BADFB392C99A46406BE05487DDB83340F36FFF758F9A46400CFD5E84079D33405A74EDA4D79946401AC96C21079D334069742AA3D79946407BE7C0684F8F3340D2ED2989B5994640414C2DD74D8F33406364A092B59946404281C0514C8F334060378DB6B59946401B794EE64A8F3340E0D5A9F3B59946407CFEBEA1498F334048BBCA47B69946405764988F488F3340F328F3AFB6994640E2A15BCBDF8A33402DD9BCF2BD9B4640EF241671DF8A33407F77891FBE9B4640F77C2E95D2873340B60EB107619D46402919A14B4A70334055C7ABDBF99B46406584F13C49703340ED24B0D1F99B4640F039EFB870523340E23B09218B9B464048C00E7E6F52334003469C248B9B46400EA417486E5233407B0983388B9B4640C8952D511A4033404A49A600389D4640280A9023194033403980D224389D4640B6AC751EF23433404351A671E49E464044E6F4CCF1343340B91D957EE49E4640985FF109B61C3340B1E55A9AF2A24640FDEA88F8B41C3340227A0AD1F2A24640E84EC2ABB81933408232850EA7A34640B51DFCA8B719334020DE4756A7A346405DA276C8B6193340A5E934ABA7A346400072E22A6A1433401835B318FFA546405E4B4DFE68143340EEBF34CBFFA54640918567EF28113340100C1581B9A8464046F773D905FF324054F3038A97AA4640AE56A80404FF3240197D7AD097AA46404BE0606C02FF32404092063C98AA4640446A093750F53240AB85AD15D9AD464072E13B1B4FF532404DCA728AD9AD4640125272484EF53240CFB21111DAAD464025A7F90280F032401795329CD4B1464055E08B867FF032400D7DF226D5B146400661FE577FF03240F7B187B7D5B14640B9070C797FF0324030CD9248D6B14640446A7AE87FF032402F06B0D4D6B14640258425A280F032404A78AA56D7B1464035E019E963F532400E4098D791B44640E8D8E6405FF83240C4CCE10710B846400D9A10DB9EF632404DF6BD6CCDC04640B2999BE79EF6324090490D03CEC04640C73AA6489FF632406F468195CEC04640B29556FA9FF632402AFD491ECFC0464001659FF5A0F63240FEB9F997CFC0464019AA8730A2F63240652CBCFDCFC04640D6FE8F9EA3F63240EE77874BD0C04640E58E3131A5F63240353C457ED0C04640B6AE71D8A6F632400EF3F193D0C04640DED6AC0DFD0B3340901BD4CC25C1464094A24980CA1333401446D67673C146407026CBFE55033340DCAEBF09B3C3464060C7C08033FC324090C9729208C34640F13EDC77ABF33240CAFD8FA6EEC1464092EDD4C9A9F33240DBD52D80EEC1464025BC8A0EA8F332408044AE79EEC14640C242EA58A6F332405A4E5893EEC146401A36A2BBA4F33240357913CCEEC14640F8634EA29FE83240D35D7A5CEDC34640E2FDD7A29EE83240A035E292EDC346405F60A72587DB3240AE5EB5C62BC7464005EFFED085DB32408652852F2CC74640D7EA6FC284DB3240C84F15AF2CC74640EF9FFE0584DB324032F0BA3F2DC74640AFB009A483DB3240668C09DB2DC7464001EBEAA083DB3240CA471B7A2EC746403ACFC5FC83DB3240717EDF152FC74640A43645CF1CE132402FCD4AE651CD4640B499DB58F6E232407CFB28659FD04640278CC9BEF6E2324081558BE19FD0464075B0CA5FF7E23240E4D7FD55A0D04640CC3E2337F8E232407A1314BFA0D046402ED0010701EC3240848A52B751D446401951424845EB3240ADC8ED39B6D54640806AF4448EE53240703228CC5AD7464039E749F78CE53240D46A11445BD746405BBD4AFD8BE532409CC7D0D25BD74640A4D9F9F0ADE13240C1A66DD53DDA4640085F5EEDADE13240684421D83DDA4640542E62BEACE032409988796DFFDA464078596B43ACE03240294764E2FFDA464089930A01ACE03240183ECD5C00DB4640987303A975DF3240CFC04E7606DF46401C7B4A9855DE324001FF7F7B66E14640C9BE53400CD832402A0FE3E1DFE2464098E561290BD83240FEFDB12FE0E2464010C4E63A0AD83240EE7F868CE0E246404A0D687B09D83240E1A4D6F5E0E24640C94EA08219D432407195F7CA7FE54640819F75D918D4324024692E6080E54640CED2548E18D43240158788FE80E54640EEB63192F8D232407FCFBA7C48EC4640C984FDFAFECF32409AAFAB0A55ED4640E5678C05FECF32403398357255ED464005A29348FDCF324048C251E755ED464080C33F8918CA32407F005C53E4F1464024A4F4FE17CA3240AFB040E3E4F14640103AEAC917CA324014C3E579E5F1464085AA45EC17CA3240A79B3311E6F14640A748A36418CA3240AFCA0BA3E6F14640E1F6242E19CA3240FC658829E7F14640188BA4401ACA3240E118399FE7F1464059F3BA6DC3CE32408C9E951E89F346400656A002A0CE3240B193ED3F9CF346406F0DC9499FCE3240332079BB9CF34640FB1A2DD59ECE3240FBB0C6409DF34640968CC6A89ECE3240C07D4ACB9DF34640970819C69ECE3240A93D4B569EF34640DC94242C9FCE3240B2640BDD9EF34640FF506ED79FCE32407386F25A9FF346407AD71EC2A0CE3240C374B5CB9FF346401E4A17F650D23240A414E2E516F54640F1EB722752D23240D133C04917F54640430A348A53D23240052E399717F546400FF7111155D23240BF5B66CB17F5464022D669AD56D232409E9253E417F546400CEBCA4F58D232400CE011E117F54640A39C8AE859D23240D87BC0C117F5464056A35A685BD23240F79C8B8717F546406DC2DBC05CD23240983BA13417F54640A58D27E55DD232405E2C1CCC16F5464080124CCA5ED23240105DE65116F54640B3BECB5A24D332403F6928AF92F44640A89445A024D3324090D5557C92F4464011733D56A2D33240439505F02CF44640D56438D2A2D332401026546B2CF44640EFA92396DAD33240312FB371D6F346405DF971A30ED432406F2C9E47DCF34640AD223C804CD73240C3B408EC97F54640CB9565904DD73240DCA6C36198F54640A9865DDE4ED73240D4DD30C298F54640BEDDB95C50D73240C8D2700999F54640A2E71EFC51D732406CE1A63499F54640E941DDAB53D73240B6B5164299F546401A6D9D5A55D73240CA24363199F54640691F12F756D73240C8B9B20299F546407D2EAA7058D7324043BD6AB898F54640A8EA3AB859D732402BFF595598F54640C4139CC05AD7324092287BDD97F54640F3232F7F5BD7324016D19E5597F54640CE487CDA38DC324038F3579601F146400C7533E538DC324046A1018C01F14640A474C54951DF3240DF0DDE01F3ED46403D2177C151DF32400F688033F2ED4640B39F06F6A3DF3240E7A9B6CD13EC4640D11F93B276E43240AC503019FBE5464060C12E2FD2E93240D9155AD2FBE146409714EFB0D2E93240777E3556FBE146403F9DE29C72EE3240F9B8CADFF6DB4640C30978DEBAFF324002758D2826D7464068BEFF1BBCFF32400F5566BB25D74640AFCFC812BDFF3240B906B73925D7464028D94CB8BDFF3240A17007A924D7464086C57C05BEFF32405541830F24D746409DDF0DF7BDFF32403A90B67323D74640B0CBDB574EFE3240283816C474D34640EFC63BF94DFE3240CFF2733774D346402DB7EB4F4DFE324002EFB7B373D3464072F91F624CFE3240C8FEB53D73D34640DF5C8F384BFE3240D42DC1D972D34640117F6D5DB3F53240F0C90CC611D14640A538D39C38EC32404F4D6DEC8AC94640CBD0DDB0FEF832408FC832FE33C7464000305DE9C9FB324089040EFBF1C84640FC6DF2EACAFB324056CB9F7AF2C84640DBA0DB31CCFB324055D8D0E4F2C84640D39010B0CDFB32403B4B1235F3C8464054672955CFFB32403642F267F3C84640D8F4120FD1FB324081B4417BF3C8464032F72149F70233408007F43C00C946401C8674B1F902334070DEAE2100C94640B7363B38620B33405834F0772EC8464046200953640B33400BDA33262EC84640B315FE4E5117334083CE2002A4C54640617B3F8752173340DBD32CB1A3C54640EB80F69053173340E6EBCE4DA3C5464010057863541733402FF544DBA2C5464013C5DAB668193340EAD70C143EC446400C696FAE881D3340639AE0FC4FC346402373F2F8891D3340797D15A14FC34640D89B1F0A8B1D33402C3962304FC34640ACD074D78B1D33400B9C1CAF4EC34640FC150C598C1D3340A1A43D224EC34640E64DE9898C1D33409989308F4DC3464064D0292AC31D3340D5A12B4224BF4640E197FA04C31D334002D807A823BF464061343987C21D33400A00CB1323BF46409EA22DB6C11D3340EDC4AE8B22BF4640B14B9F9AC01D334060706A1522BF4640D655086BDB163340877755B0CABC464004707309DA1633404039274FCABC4640DF4D2676D8163340CB6CF609CABC46404B23C3C2D61633408887C9E3C9BC464083475302D516334087D64BDEC9BC4640E8A11F43EA04334004F27C333ABD4640E945CE2834063340A16673044BBA46405FE24B99870B334017335344B5B4464066B8D0FE870B334031E6689CB4B446409FFEF8F5870B3340A846C2F0B3B44640D5D3397F870B33407C3E404AB3B4464023D0AD87110933401B7355BB65B24640317A4DDB10093340567A4C3E65B24640ED11C5F00F093340C79984CE64B24640C96D08D00E0933403B1DC86F64B246409DE5E1820D093340A05C4D2564B24640F192B2D6F5003340D449A931EEB04640AB03204DCE093340C3EA8F863BAF4640EFB7931D751A3340D869C25A12AD46404534C379761A33402C897A2012AD46405F88ABB2771A3340CCCD22D111AD4640AD2729BE781A3340975C4D6F11AD4640A0419193791A334043BC25FE10AD4640DB83772F8B2333401A0FD25329A7464034393E71923A33406D29562AF4A24640DCD5C81A3348334053955E20FAA046403D4EFB53CC543340CFF714C367A046400587994FF1623340E6FDDECCDA9F4640848DA21F1A6E3340F1580270FA9F4640FEEB1460F68333402C37D0F8F2A14640F78823CDF8833340A9C6750FF3A1464023EA70F3A58C33406FDEC4AAD0A146400520D586A78C33402259C796D0A14640BFBE2A08A98C33406EA22368D0A146407E857569AA8C3340A9118B20D0A14640D87F1A7B34923340D8576A376DA04640526400BE35923340E5F0FCD36CA0464009B52B1B6B9933407BD48C94B59D464014F011F05DA633405D0F4964869E4640BB63022A5EA63340E795A367869E4640D0A7FFAC0AB23340118A3E37249F4640EEAC8CCD0BB233408B55733F249F464004BF779F92BA3340DB5C40C82D9F46402462AB597BD43340B87E7281DE9F4640027F99275ECF3340853598E64CA44640D42D22AE5DCF3340F4682E784DA4464067799C895DCF334074BE660F4EA446406C3082BB5DCF334040FD24A64EA446409334CF415ECF334020DB51364FA44640755416175FCF3340B7FD19BA4FA44640B76CB93260CF3340293D2A2C50A44640EA8B428961CF3340C8B8E68750A44640307FDA0C63CF3340DA839AC950A4464055FDD7AD64CF334074FD9DEE50A4464072A7615B66CF3340AC4672F550A446408AEF245AB7DD334025EF666C08A44640218CCA28B9DD33407A4F005108A446407A459DA0EAEA334001721D0EB6A24640387DD459ECEA33408DBC5DCEB5A24640180D15E0EDEA33402172B16DB5A246400D68FA1FEFEA3340F863E6F0B4A24640446E036257EE3340894268FB08A1464094950BDFE3FC334027541C18D89A4640186440CD99063440CD5DA6ABEF9746408EC9F091DC1234406C3D2FB7C19746406825EA58233234400F0EB8B93E9A4640815B6BE6472F34403A6C231F169F4640DF55F6DD2F1F344073FAFB1889B44640640DA19D2BFC334073F0747D70C6464029B8FBE62AFC3340073C30EE70C646407DF8F5692AFC33403F313D6871C646401D83402A2AFC3340049301E871C64640E8C0BC292AFC334021F2B76972C64640F95DC41C3BFF33407963D43720D3464022925F4F3BFF33408D1F7BA620D346406E0A21B03BFF3340E554491121D346407FA3CC68A90F34407533B5B671E146407247EA172B0A3440F1A5CE2760F34640904757BBF10234408BE06CC7420547406E3E2CACF10234404E5D60F842054740A95A3A2C2BFF33402E6003DCBD164740E63898382BFF33408DBDE576BE1647408DD7BD9F2BFF33406978A40DBF164740BAE4525D2CFF33406EECE599BF16474003EE5A692DFF33401A93C115C0164740357F8BB82EFF3340F1BAFF7BC0164740CEE4C53C30FF3340DFCB51C8C01647402E71AFE531FF3340C3B980F7C016474066DA61A133FF33405EB08F07C11647402E5F42E3D1283440B2EE9307C11647406B3DAE89D328344010C007F9C0164740D2B9E71FD528344099283ECEC01647407C537096D6283440A1F2D888C016474048FBFEDED728344037B77D2BC0164740DE900BEDD8283440CF05BCB9BF164740D43F49B6D9283440649FEA37BF16474046120B33DA283440AF18FDAABE164740D2E28E5EDA283440EA805318BE164740590295BB2C293440A2EEF936B8FF464094656EE3C72A3440DA14AF6F9DF44640CF247494D43234409F04EDF793E14640B3DCC5AAD4323440BFE43D7593E146400D32B879AD3134404A23C25CABD24640091BE34DAD3134404CBB46D8AAD24640199944E0AC31344054E69058AAD2464077031E75D2233440AE044F5782C646406E92FAAC89473440EF770B1FB0B446402698297F8A4734403E5CAD9BAFB44640728808038B473440318D380CAFB4464016E3E3F4E751344008BC7208C6A34640EB8B5519E8513440BF50FFB7C5A34640C32FFF8B00593440FB12314AD48B46400063EA7E3E5F3440CD3CB0B019884640891D644B3F5F344013C5BE0C1988464084B016CF1B633440660A4F87A083464000E3DD1B1C63344045FA0308A0834640027ED8291C6334406E33F0859F834640072C9CF81B633440644BF1049F834640AC819F891B6334401E9DDC889E8346403DE9ABAB075F344089507E5622804640A5C119F0065F344072CFF8D82180464034A292F5055F34408F8D226A21804640CCB6F4C4045F344098E4E70D2180464047611E507750344060DAE6E77F7C4640D51EF4283F53344067A199983A794640326172EAA156344032F0521D0C794640125A1881A35634407510A4F80B79464005D08BFBA4563440DA8D52B80B7946405F8B114BA65634404655DF5E0B794640131D9A62A7563440B8C2C5EF0A794640FB903D51BD6734407875E64FB770464035E49030878234406FAD9D87D16E4640BD2442F00E9F34409BC11D648A7046408E9D6BC4109F3440E8EA976D8A704640EB370693129F3440D70653528A70464063D18645149F34404E46A3138A7046403A299724B5AC3440FFF50616EA6D46405B841372B6AC344070EF5BC6E96D46403140668FB7AC3440BEA0C761E96D46406DD15872B8AC3440F1B1E3EBE86D4640719ACB12B9AC3440F76BE868E86D4640885B006BB9AC3440750D86DDE76D46400DD3CE77B9AC344043D4B94EE76D464041ABC138B9AC34407745A0C1E66D4640AE49E7DD52A73440FA2DD4187266464008CB8F01C4A8344093015A773763464091C55B714DB63440EC824FD6C25C4640CE21FD7E4DB6344001A6BACFC25C4640B5BA9E1BD9BC3440B000A80A90594640721A15D555C63440BB14E8A9DB564640DF9D0B4E30D03440E33D75C80E5646401A0F67F3AEDD344025E9EE70BA564640960C08968AE9344020013FAB0259464044B55F282DFB34404C8782A6475D4640A3731E762EFB3440BB6C6AE8475D4640AA8E9DDF2FFB34409EE9EA13485D464070D200273E093540FB690A437B5E464099BF17263F09354022FEFB527B5E464038014CE7F3163540A359D722085F4640328B1423E822354089377E2DD76046405B7561F7972A354037B645660164464004135362992A3540CBAE8FDC01644640494A057F9C3E3540FC631C0724694640AF9CC57D9C3E3540B25A2E47D96B4640B0D285A69C3E35405B736FDAD96B4640DC5A361F9D3E35404A400968DA6B46404B0235E39D3E3540BF028CEADA6B4640016FFBEA9E3E3540B4FBF45CDB6B4640FB14692CA03E354086ABDFBADB6B464039BF269BA13E35407BFEB000DC6B46409DDA1F29A33E354061BDBA2BDC6B464063DA0CC7A43E35404FE6553ADC6B464042A17365F75C3540C052C645DC6B46402CA2A600FA5C3540D89DEF77C06D46403F5C232AFA5C354087890A0BC16D4640B8BF6CA3FA5C35403ACC7398C16D4640F2B0DC67FB5C354031CDBF1AC26D4640EEA8EB6FFC5C35407502F08CC26D4640CC967AB1FD5C3540A1F2A3EAC26D46406A303620FF5C35409E274430C36D4640C9E30FAE005D3540FE6C255BC36D46405FC6C74B025D3540FFFFA269C36D4640EAE462C8D489354005763884BF6D464021CE9563D6893540D8629F75BF6D464038CD0BEFD7893540A6EAF94ABF6D46408D6ACA5BD9893540708FE505BF6D4640778D07BB45A53540B75EB4C63F674640666D1DEA46A53540510F716F3F67464036FB39E747A535405987E9053F6746400B69D1A948A5354037F0AD8D3E674640C3EFBAA5AAAB35406CADF7994B62464020E78C8256B735403706C597235F4640011AD70A50D33540EAE5A471E15D4640DF45794D51D335403D36D959E15D464010A09E834B073640D2C54B0E7D584640230188F44C07364060C101DA7C58464058F996434E0736408108138E7C584640DCE503654F0736405C062B2D7C58464060DBA14E500736405FEBB1BA7B584640F1ACCE597F0B3640CC6FD85BF75546401422D5AAB31136403E5AB382E454464094B8DCFBB41136400015CC39E4544640CB412921B6113640DD54DBDBE354464065448E10B71136409F49236CE354464048F3BDC1B7113640290284EEE25446406AEA922EB811364005035967E25446400BC24653B8113640889452DBE1544640CCAC775CB81136406A09A351084F4640F6C4D0325E273640CD5D9401AB4E4640BBED0CBAA73A36400188671398564640CEC7363E4C4436405BE80AD745604640918ABEF94C4436409BDE4A6346604640C991DD014E443640B371E6DE4660464031B4654B4F4436400525A24447604640D8F263C8504436405E872F904760464090A2B76852443640BEDD5BBE476046401031C11A54443640CBCB32CD476046401F58161F4F7A3640FC913F0E1D60464061E063A7F98F3640AD353B0E1D604640A94B8878FB8F3640B9D9BAFB1C604640485CEE32FD8F3640D4F44CC51C6046406D26E3B84DB136407990AC04775A46406665AB1F4FB13640F7024FB7765A46400119AA5450B1364069874052765A46402E95C14B51B13640E78477D9755A4640199141FB51B13640566BB051755A4640DF67485C52B13640EC283EC0745A46404B2B086B52B1364010B9D42A745A46406CD3EC2652B1364025E54F97735A4640691F87E922AA3640A7321ED4E550464015954F3F09B53640FCDFF09D714F46400C819C2C1ECD3640A9BDD79D714F4640F586E9C81FCD364054C5428F714F4640082E555521CD364095B83E64714F4640E435A6C222CD36401B7C721E714F46409228D50224CD36406F408CC0704F4640C146960925CD3640DC27274E704F4640AB69D2CC25CD3640E6D2A7CB6F4F464007360A4526CD3640F02F113E6F4F4640ECD09F6D26CD36407736D3AA6E4F4640D149446A26CD3640DB1E04FC9D3D4640A66B214026CD364090A0D5659D3D46404E4D62C325CD36405773A7D59C3D4640983D03F924CD36409BB53C519C3D46404CB91AE923CD36404F2BE0DD9B3D46406AAB869E22CD364057192E809B3D46400E3F7D2621CD3640411AE53B9B3D464090FE9D0727A63640CEE0A035303846406DEB9C555C9236403A42478FB0344640DCC2E4DD4C923640B8AAACC8492E4640D62CF984A9B83640251AA4184E2E4640E534921FABB8364022FA2E0A4E2E464062906BAAACB83640337446DF4D2E4640AA0D5A16AEB83640208590994D2E4640EE8B6255AFB8364015C1BA3B4D2E4640D27A435BB0B836401FFD5FC94C2E46403663ED1DB1B8364064DBE4464C2E4640B5D7E595B1B83640B0964CB94B2E4640D4FF90BEB1B8364058B607264B2E46405AE8FC42B8B836402EE71CFDFF1E4640F1DF0514B8B836404E48E05DFF1E46401C04B188B7B83640E6AEC7C5FE1E4640EB9242A7B6B83640954BAA3BFE1E4640421DDE79B5B836409F54BEC5FD1E4640279E06F9D5AF3640BFD4B4072F1C46400E27AE69D5AF3640AEAE2FDE2E1C4640A521F43A81A43640CC9F4D182F1946404B69B1FB7FA4364072BA90D22E194640926A209F7EA43640B01F49A22E194640137A4A307DA436402F25FE882E1946403701CDBA7BA4364051CE7C872E19464088A49F14D88836405C347179F31946404EF51F81D68836400BA7FF92F319464024371C03D588364001A441C8F3194640AB1121A9D388364084E72F17F41946408CD95B80D2883640EEDDC87CF41946408B161A94D1883640F7F22DF5F4194640754F5BEDD0883640C74BC97BF519464034FF80136D7B36400985B51965284640583F51F9726B3640FE4E3FD063344640DE4E1F5F726B3640284D596F643446409B42292B726B36401F19BE166534464055877F6E796B3640B5B3C9D9D43E46401FC64D94796B364028885967D53E4640145E99037A6B3640A933DDEFD53E4640C4C06FB87A6B364032267D6ED63E4640DEEB66AC7B6B3640BB9BBBDED63E464072A6D7D67C6B364062649D3CD73E46402F132C2D7E6B3640BE0ACE84D73E464048CE3FA37F6B36406610BEB4D73E46404EB9E8F4F2833640A1525E1D1141464041896CFEF28336400B1EEF46504B4640DFBE3CC17E7D36409A89110D04524640AF7DF4228674364013B124E96C524640312285267655364049F0A56508524640CFBBD46F6D543640D928B1ACA74E4640FCFDF0686D543640D391A898A74E4640F5B97883234E3640AC9E51B4263E4640CEA3542A234E3640C8772F2B263E464048269D8B224E364032FB5BAA253E4640DDE7D6AC214E36405BC25136253E4640EDB0C095204E3640589919D3243E4640FF7B0E501F4E364091962684243E4640671913E71D4E36401567374C243E4640F9665B671C4E36409BE03D2D243E4640C04A65A72B3B364018278234433D4640673831CED53436407ECA13289B374640E4842C0DD53436409B916BA39A374640A23DF206D4343640C883FF2E9A374640C316CDC5D2343640BF5C61CF99374640CFB95756D1343640DBD05188993746405D22FEC6CF343640B8D89A5C99374640BDB76C27CE343640C6ABF34D993746400DDD2CFB3B06364070D2164D9937464029F7625D3A06364041439D5B993746408B0B9BCF380636405556F4869937464015004F6137063640C3606CCD993746405327BF2036063640CC83472C9A3746407C4F641A350636404CFBD49F9A374640168A7358340636408ADF95239B3746408B8178E2330636402DEC69B29B37464007078EC951003640E1E7CC649D4246402062036D28FB354034732C8FD0444640E25E82DE27FB3540CB8758D3D044464088B77B33B7EC3540784720E9974C4640E1167F2453D535404F5D03549E4E464066CBE6A893A13540B32AB0359E4E46409D1D5D1292A13540691697439E4E4640CE53E48A90A13540B50A256D9E4E4640D3F716218FA13540A72FCDB09E4E4640783C74E28DA13540A666090C9F4E4640BA18DFDA8CA13540CB64727B9F4E4640F07F128C0D9135406023F86522574640BE8257710D91354072F9137422574640AB2F48261E8B35408B04FFBF575A4640F199D4EA4F8635409C1F8E9CDA5B46409C028C6A6D5A3540F13A62BF065E4640CBC9A3C56B5A3540E2D2FDE3065E4640B7A86C3E6A5A354043A55826075E46401EE541E5685A3540337CAC83075E464095E891C8675A3540A86F12F8075E464077CA43F4665A3540E9A8AC7E085E4640E5E93771665A3540E478DA11095E46407CEBE844665A3540249474AB095E464086B8F52D665A35401D1F3E8C3A624640A3ACD2EAA73E3540E29B168B3A624640A70AC080A72C35408F89827E945C46407C7CFC87952635405237B395295A464025185D2394263540A9B26624295A464095BE9B809226354063107BD2285A4640530FC8121D2135406F626D9E5C5946406C94F7C41A2135404105D7695C594640A206F58D361E354045418DA841594640CD02B9B1351E35401774B3A4415946403C6E29782407354021FB05014759464076D3F38FD3FC3440A05C8AB408594640295C109150F234405004FBB1655546404F1B8CC14FF234402E62DD72655546405529BB0EDFEE3440DB2680BA7A5446409AA6AFEDDCEE3440397C91517A544640EC42BDED16E2344065737AB3D25246400EC8B9AB14E23440AC4AD887D2524640117160D022D034400347099661524640A050441A21D0344001B6729B6152464054189540A9C234400DB57E9A0C534640CA66F35CA7C2344061F6B4C70C53464067DFEC51E6B83440E98604E76A544640A6BA8E16E5B83440FC81641E6B544640EF2739F9E3B834400DA4A1676B5446402C32CB01E3B834402EB6B6C06B5446402708DCA656B4344030549E105B564640795C09D8CFA034404B495C1B615E46408E501DE6CEA0344009961595615E4640759578FAA69A34406D3093F23B62464092AAC745A69A344030EB5E863C624640D33F46EDA59A34403DA775243D62464056AA9EFF64993440EAED7B7930674640C96B850D27883440CCA9D7FB1E684640990807B5DA7E3440DB772A3397664640A27AB15E226C3440B399E7A01D5A46406787529A216C344097CA09351D5A4640EDA478A5206C34400F0D9ED61C5A46408FABB442AF4E344092BF9956855046409D4ED512AE4E34405BCC1204855046404CC15BBEAC4E3440B67865C684504640C33A6050AB4E3440DA45949F84504640F1B9CFD4A94E34400703E39084504640FE4EC5533E243440594C00563C5046403CEC78FF56063440A418086E214C46403755669B5506344069E07649214C46406FDBEC2A54063440B2C7AB3B214C4640D5AF5EB952063440E44B1345214C4640DA52CDC63ADD3340F3715B85774E464018A4F97439DD3340D890C8A2774E4640EDDB383538DD33400D9296D3774E46400C25311037DD33407A817316784E4640127A4048F3C133403E35ADEFDE554640978D6A7986A63340926BED220758464011CF92EA84A63340CFE6605107584640469A3F7D83A63340166DF99A075846406AB8CA3F82A6334048E6D2FC075846401194AC3E81A63340C153157308584640A5D1FE8380A633406C771BF90858464059BD161780A63340068BA18909584640A0979BA36A9E33409CE08CC37D694640341A8021488E334095F4F4DACF6B4640E42DE8BE478E3340CEB929EACF6B4640F503D28A707B33405085E4DDEA6E46405A85373DA0633340DFA80E13CA6C46400E8998A19E633340312525FDC96C46402F1304F5523E33404B6C3CBA1B6C4640 RS Stretch \N 2019-06-14 12:43:36.283574+02 Intevation t -AT_stretch_1 ["(AT,XXX,00001,00000,18727)","(AT,XXX,00001,00000,22232)") 0106000020E61000000100000001030000000100000054010000AC1D394632192D404B2EF2A7CC1F484026090E9EF82E2D404471E2D4A71E4840DD713DC3FB2E2D404F9EB69BA71E4840DF875D97FE2E2D40F69FB349A71E4840038449FF002F2D40A374ECE1A61E4840427A6693FF4C2D40AA53EC0F801848400AF8BEC3A55A2D408E8A871D4417484051AEF9AC38A82D40744B88E35B1A4840B22EB75717AB2D40BC6A5C43081B48402234FEF280AB2D4070E455CFC91D48407709555A81AB2D40E180075ECA1D484033CAC36182AB2D405EEDDCE6CA1D48403269BCFF83AB2D402C9ADF64CB1D4840B8053B2586AB2D40E7767DD3CB1D4840B95651BE88AB2D403363B32ECC1D4840F845A563F4B92D408DC163AF6A1F4840100E558FF7B92D401FDEA5F76A1F4840FDF1D101FBB92D4094F0F7226B1F48407B898E96FEB92D40F19F8E2F6B1F48407CB755E915EB2D40746D4324401F4840A6C7D79019EB2D40D4378810401F484049CC780B1DEB2D403EBCD0DC3F1F48404213743220EB2D408C485D8B3F1F4840320DA9E222EB2D404582B91F3F1F484076BE22FE24EB2D4021E4949E3E1F48406F8352CA91F62D40821E52B7C91B48407302F14E94262E40B338A3043F1B4840644041E297262E4043E437EA3E1B484066ADDE419B262E40179A12B13E1B4840274E43499E262E40380B9E5B3E1B48406E275031022F2E4043A7106A181A48400332455A89482E408441C698011E4840BEC2F84B8C482E40C0DB11F6011E4840FD07C6A08F482E403B685C37021E4840BDF4EA3393482E40D575D559021E48402C4FB4EF4E8D2E404116E39D5B1F484069FA0A134CBA2E40024509523B244840B9FCA956FCC32E406CA61D700D2F484047AEE611FDC32E40E11F7BF10D2F48403308A152FEC32E4022505B6B0E2F4840753CE00E00C42E406A25F4D90E2F4840FF54D43802C42E40AD53D5390F2F4840606A8EAC9EF82E40C6E77266AC36484067F66C6DA1F82E40E4140FBAAC3648408405ED80A4F82E40EE6EDDF5AC364840A5385FCAA7F82E400C46B017AD36484058241D2BABF82E403B334C1EAD3648402D88961D5D3D2F40CE0DFD15193648406D6CC25C8DC82F40525C7DE30836484053E0618D90C82F40EB0788D60836484042E79DA293C82F40B4404EB108364840CAAEA38296C82F4078D60775083648407D1D5E1599C82F402DAAAD230836484055A98E4991EF2F404E6799413B30484027CA5259F31930405A43DDC08C304840D877FA60EA2930405EE4921C603248409195EBEFEB29304024F2063D60324840FF7EE689ED2930400C01F94460324840EAD4989950393040F68AC1FA343248405B023A47523930404B092EE83432484085785BC8884C3040EDFBC066BD3048402E0B4D4D8A4C3040549F5B3CBD3048408A1E00B58B4C3040852559FBBC3048409B11B8F38C4C30400998D8A5BC304840CFDA9BE72E5730401398457E4F2D4840B07392F32F57304068B295164F2D4840F180F0C23057304070BA79A04E2D484051818D36205D3040DC99AD5A16294840115EB7AF5D6B304040717212821F4840169D588D5C823040A83FF50A7017484061DB17E8329D3040C7CD56EF5A13484099E7CF15F8BD3040AA22BB2B1913484074521F7D3ADB3040EA2AE00E1B13484082DDC17F11E1304095FD6C982C1748401E25F79012E13040613399292D1748406DEC2AFD13E1304096EF62A22D174840D2F88AB115E130406A388CFC2D1748405A4D1FE8EBEF30408E910A88821948400332A1F1DCEF3040002B772B2A1D4840702EF41ADDEF304085A739BF2A1D48403F850C9ADDEF3040D6B36C4D2B1D48405C8BFF69DEEF3040860990D02B1D48407DD6C182DFEF3040C9ED90432C1D484013E876D9E0EF3040966FFCA12C1D4840C9BDDC60E2EF30404A772BE82C1D48404A1ECF09E4EF30407AF366132D1D4840FA8DDDC3E5EF3040BCBC02222D1D4840E4EDD11C2AF730400290BE132D1D4840A80CD1C52BF730402AA339062D1D484082D39A5F2DF730406A7C3ADE2C1D4840A5B58ADB2EF73040C5FA2E9D2C1D4840C3370D2C30F730406C1E6A452C1D484069201C4531F73040E3C50EDA2B1D48403376AC1C32F73040A4FDF25E2B1D4840BA82E8D12C003140A3033E6FB316484016520FC6350D3140CB70F27F071448403BC69218370D3140CAD0E82A0714484032669F35380D3140FED634C206144840D8322A13390D314060E28649061448401DFC64A9390D3140516B1FC50514484099406DEC081131409046F17D640F484062668F35091131400B1DF7F3630F484087CC3731091131404811D767630F484029D08CDF08113140868B66DE620F4840A6A55F43081131405A3C635C620F48403E771362071131400D3F49E6610F484093D16D4306113140FE7E2B80610F4840330252F10411314011BE8F2D610F4840A7835138810B3140086D8265470E48405033F9A87F0B314084929D26470E48401876ADFC7D0B31406B9CFD02470E4840C9ECDB437C0B3140B65B00FC460E4840E12E6D8F7A0B3140E771EA11470E4840E2C21EF0780B31401CAFE443470E48405CEB3DC37EF9304041423A9121114840616F15E2EBE130404DD8BCBFF00B4840D4139150EAE130409D8F7279F00B4840DC2F2E9DE8E13040A3BC7D4FF00B4840042D89D9E6E1304043D49043F00B4840815489C7DFBA304014A3A9CD360C48408418390CDFBA30400AB38AD1360C4840836D1934069A3040A58947BD580D4840BFB87049049A30400B81E2E0580D4840C7C495791F873040B1F673C3790F48405E1C5C8A1E87304092438FE3790F484069C2A74FA5743040BD9827405F124840C6EB606EA3743040650310A65F124840C4CD2D17DB5730404369A7B0511A4840DE10EA9ED95730409D3CE734521A4840799BA490D85730404EA579D3521A4840F8ECC9F1B6483040BF5B5139602648406D8F3E62B63D30407B3F78D06A28484043A913ACF4193040C6F05C35E22748401FFE0F55F4193040A9D39834E22748405BDDA80874F12F40B3BBA482CB2748406ED332C66FF12F40A0533A97CB274840638C84C16BF12F4055E1FBD6CB27484097A58F70CEAE2F4086D83F4B872D4840585278DF4F772F400B125F36862D48405B6095F34A772F40BDD2E653862D4840C9ED866AD33F2F40BC0D4E712E304840C3F036BA28FD2E404A667D9E942E484000A6C08F7FE52E403231DDD57F2B4840DFEB85088ADE2E40ED974E60572448406E660E0189DE2E4007847CC156244840489C453187DE2E406470FE2F56244840CBE12BEC1BD12E40B99B9EA00C214840D8FB69DC18D12E40BA59F60D0C2148400855468425A42E40EF3D8541901A484085F34BDD22A42E407D2674F08F1A4840D835A8E81FA42E40B03EA5B58F1A484094FD2FC01CA42E40517F1A938F1A4840591A23C370742E4055C6D4C5491948400A58A4A46E742E400673DCBC49194840791DCD66C34B2E4013140952061948403BCE708FE8482E40A54049E74E154840373C19DDE7482E407C3A2D614E154840781B589CE6482E407A38B2E24D1548408777CED7E4482E404E2F09704D154840544A7B9EE2482E4099CDFE0C4D154840FD443C03E0482E409840DBBC4C15484014693117ED3A2E40B0788650ED134840407EC25BEA3A2E4064059618ED13484038106771E73A2E404BA080F5EC134840B095286EE43A2E40BC784FE8EC134840FC89994EDE292E4027D45A2CE11348405D04177CDA292E40F741973BE1134840AC8683D4D6292E401B1BE86DE1134840E6674284D3292E402E3FEAC0E1134840B96A92B3D0292E40CD79AD30E21348406E964F32431A2E40EB34332CE21648402E3A77AA12182E4047FC094191164840FD5598C00F182E40E36AA7E990164840630EFF7C0C182E409A9915AD901648400499B00109182E4007D5CB8D9016484076C9F67205182E40A238108D901648404B86DBBF6AE82D405A8E0E08541748400F59837E67E82D40A907BB2254174840D884BE6964E82D40035D015754174840D4ED6A9D61E82D4027C408A3541748403749D7325FE82D408E9B210455174840F639DE3F5DE82D4081B5DD7655174840F2248D2647DB2D4098D521DC061B484082629114D4C22D408110677FE81A4840BF97D64AF9BD2D401582B0D1AE1748403E428117F8BD2D405A017E43AE174840A7C6CC40F6BD2D40A5CF63C2AD17484044549DD9F3BD2D408E5B9053AD174840B584A3FAF0BD2D40C74C76FBAC1748400AB05EC1EDBD2D406ED19EBDAC174840C9D90FDFC5632D40AB049431A4124840D9144968C2632D4004590710A4124840669E4FDBBE632D405C66E90CA4124840B526105DBB632D40C5965A28A4124840A0916B12363D2D4021349AD7811448409B7D45D7323D2D40F43DE60E82144840FF2930ED2F3D2D401F5A4C60821448407EBC1DF020122D4078ACA569491A48409E3DC967CFCF2C40ADDB8AEC1E1D48400190F87C9AAC2C406FA44DC7E71D484066B54B8897AC2C407A794EE3E71D4840134067BB94AC2C4056CC7E14E81D48405285622B92AC2C40FA246C59E81D484006B79B1B8B982C4013B694586F2048404F30E26688982C406167C1C46F204840A3D79D4886982C409DE9AE4670204840A02BAFD884982C4090AFA4D870204840E041D51A14902C4009434DAB1A2548408C9996E7CC6C2C40903F63167C25484035A5E92472392C40D29D817F9F2448405F7530BE6E392C40D2F1DA7E9F244840FC59DA666B392C4002E90D9A9F244840D1539A3E68392C40457618D09F24484033AA646365392C4041E2F91EA024484011BB52F062392C40C5CBC583A024484007E1A1FC60392C40EFE3BFFAA02448405C07A8181F352C401351865BE22548409DF2E406F2242C408464522B2E2648406B8F39FBED242C40D2BB32532E264840F900EA43EA242C40231548A22E26484004FDD8F878FD2B40127627C17C2A4840F601C46976FD2B40D16DF5177D2A48402AEFB84574FD2B40784961817D2A48403DEF719F72FD2B40FFD5D0F97D2A48400C045D8571FD2B408888267D7E2A4840BCCB1D0171FD2B40667EE5067F2A4840802D391771FD2B4047BF58927F2A4840BB46332EBF002C401DCCFB981A2F4840D9BB21773CEB2B40BF3CEAB53D3248405C45EACF0ED82B4073B5D3E386314840894FE3B70BD82B40C33851D2863148404316B49908D82B4020BF3DD886314840A2E92B8E05D82B403A256AF58631484049AE85AD02D82B408147EE2887314840CB1C604AD7BE2B4073186E3CBD334840E7C5DDDBD4BE2B40F7165E7EBD33484002BC017503892B4070991DEB823A4840004A5CC601892B40E9469628833A48404F2E28FEAA6C2B40CCE34631183F4840CBCC8FB1A86C2B4085E9B5A5183F4840AA7066FDA66C2B401DAA632B193F4840946262F3A56C2B404873E2BC193F4840F120519EA56C2B40BABA49541A3F4840A610A701A66C2B40268A73EB1A3F48400E915B19A76C2B40DF693C7C1B3F484009E912DAA86C2B408531C3001C3F48406E599431AB6C2B408127A6731C3F4840E1898707AE6C2B40B8F33AD01C3F4840D19E713EB16C2B40E91FBF121D3F48403B3A31EB826E2B40CFE3C379393F4840589E9BBB9A402B40EBF2C87609434840DEB7C7339A402B405B248682094348408FECB90F480C2B4049E5A5CABC4748401C6A8C5D450C2B40A8F4C516BD4748401DFA170A430C2B40ADED6B76BD4748405B362429410C2B4067726AE6BD4748403908ABCA3F0C2B4079240963BE474840ADCC50FA3E0C2B40C84724E8BE474840365301BF3E0C2B4013F64F71BF4748408F4EAFE87C0C2B4030835EE3CC4948402A3C3616D7DB2A409EFB401C194C4840D7C7EFE0D3DB2A4073D5B051194C4840E51849F9D0DB2A40E71668A0194C4840B18F377BCEDB2A40AA2371051A4C48403F5EB87ECCDB2A401B8EFF7C1A4C48405DA5E916CBDB2A407FA694021B4C4840B8735251CADB2A40D6BD2A911B4C4840F9916035CADB2A40037C65231C4C4840390121C4CADB2A401978C5B31C4C484035DC35F8CBDB2A403422DD3C1D4C4840D474A3E0CCDD2A4097F99397CB4C4840AFACD5A1CEDD2A40F6646E11CC4C4840691974E5D0DD2A40EF2E117BCC4C4840ABF1BA96D3DD2A404288B3D0CC4C4840CFB6F89CD6DD2A403112440FCD4C4840D9AC70DCD9DD2A4069018534CD4C4840903D5937DDDD2A407AAC203FCD4C4840D5BB4A7CD0162B40702326159A4C484019501C6CD4162B40A1CFA4FE994C4840B3509F24D8162B40926C96C3994C4840A9D849E1274A2B4080DDC2BE4548484081410D20284A2B402EAB5AB945484840880CBD30047D2B40F687796ECC43484034814113077D2B4094C7241DCC434840A609AC88097D2B40FC4A8FB5CB43484010630D790B7D2B406072A93BCB434840FA6385D10C7D2B404CE615B4CA434840EDBBFA840D7D2B408D77FC23CA43484038769A8C0D7D2B40F7EED790C9434840A3661AE80C7D2B4063B54000C9434840C9F9BB9D0B7D2B40755BB677C8434840FA272195E07A2B40BE7E57481743484025E9DA34BD852B408C1769A6014348408E8344B5C0852B40AEE6649001434840F2398C09C4852B4027AB465D014348401AC8CC0FC7852B4010D7160F0143484083583BA9C9852B405574F1A800434840F50561BBCB852B40EF7BE62E00434840384C2831CD852B408D79D0A5FF424840A0B0B3FBCD852B40E7202313FF424840781B6EF784872B406196133DBD404840C9B51C1871B52B401F3B4859393A4840F810AACE1CBE2B40030C3070C03B4840FF59E3221FBE2B40D3A83BC8C03B4840A33398CA21BE2B40F934920DC13B48408857CDB024BE2B4042C10F3EC13B48407E9599BE27BE2B40521D3558C13B4840C41FED8656E22B405990138E6B3C484025ECF9205AE22B40DA03498F6B3C4840622C79A95DE22B404CAC7E716B3C4840DADA18FB60E22B403435EF356B3C4840C691CAF263E22B4071BE0FDF6A3C4840FDD6357166E22B40E3E675706A3C48404635035C68E22B4091EFB1EE693C4840BA79F29E69E22B409E871E5F693C48403188C9778BE92B40AAC2CE3AE1374840E1A5E51AA3012C40A35C4AACCD374840F00D49B4A6012C4007BB8499CD374840F7536923AA012C40741AF067CD374840B7157643AD012C4020FE9F19CD37484009AAEEF2AF012C4043EDDBB1CC374840D8480915B2012C40154BFC34CC37484084A9334DB61A2C4074AE1BA8A03048409E9132D4B71A2C4098893116A0304840C16DF599B81A2C401FF2D6799F30484087959E95B81A2C40B7620EDA9E304840932A940EDC182C407FB10CDDD32D4840751E59F9643E2C40687CCF5E5F2A4840477A526ED8642C402E5C3AA7922C4840DD2E3159DC642C40367C01CC922C48402226005CE0642C40F6C02FCA922C48405830B01D4E992C40CC853EE5792B48406311B6FC52992C40BE7BF6AB792B4840A1192CD776B22C402DCC5719A4294840857393F679B22C40A6FB00CEA3294840EA8954AA7CB22C4004325169A32948402E63F7D57EB22C40CA386DEFA2294840F71C9E6280B22C40103E5965A22948401B78865249BD2C40C14250A8A0244840AC1D394632192D404B2EF2A7CC1F4840 AT Stretch \N 2019-06-14 12:31:25.661431+02 Intevation t -SK_stretch_1 ["(SK,XXX,00001,00000,17500)","(SK,XXX,00001,00000,18727)") 0106000020E6100000010000000103000000010000000D0100002893CCA6AA0E3140E4C44F512F1248405413D2AC280D3140BB115E340414484062E98762280D31405926A3C2041448409D3EA16A280D3140274B0953051448409F20D2C4280D3140CE0B46E005144840DF97CC6D290D3140B59B2C650614484024A65F5F2A0D31409160DEDC061448401A59B1902B0D3140909FF8420714484082D091F62C0D314095A0BD9307144840322DE4832E0D3140C4C537CC07144840A690192A300D3140F04D55EA071448405CABB9D9310D3140D1BDFBEC0714484066AB21F61015314048183E6FD313484021A4266B12153140C451DF5AD3134840C769C3D013153140CB49F231D3134840B54B06255C1B31401F87D7F9E6124840139788137823314018FDE63EE61248401A1A4BF8782331409CA3E93AE612484003599398102831403CD6A090BD12484020C207341228314043494075BD124840360035B913283140A7CDD740BD1248400242A21A152831401BD237F5BC124840C386134C162831408E83FE94BC124840AA09F64217283140169A8023BC124840B7F4BDF61728314041D4ABA4BB1248408AC46AC1222A31401B5971DBDB104840B7A70B32232A314045423846DB104840220D849B252B3140606376E68B0E484013B5B0AF252B314095FAF24E8B0E4840AEBDF468252B3140435F25B98A0E48401EE12BCA242B31405C311B2B8A0E4840BCACC0D9232B3140BAC191AA890E48407820E17EC3283140180F2742830D4840B0A76AAD2F2C31403BA18124AB094840C6C334A0E0343140C6F63C16D90848404606A7A6E13431405CBA75F7D808484089016558D53A314037CE20ED01084840A0994342D63A3140770C9FC60108484003AB06EE85413140FA10244BBD06484057E69A35874131405B0778FFBC064840735452508841314049D5A4A1BC0648409095573589413140A7F69834BC06484053CB82DD89413140BEA7BCBBBB06484050D592438A4131405DA4D63ABB064840D04B61AF8542314090ABD0E5D204484005B76EE1EC4F3140787DAA4F440248402B476FADF958314017B7A86D6501484049A7EEF2FB58314001212416650148407E897CDDED5E3140C7FA5D1022004840025FFDCBB362314085ACE0E290FF4740A6887309B56231407FF26CA890FF474033C8D426B66231407D7FA05D90FF4740ACC9F39FE9843140167EF1CAFAF447401BEB4FC3E9843140BE75BBBFFAF44740817F0267A58C3140618E9BF778F24740BCE5A67CA68C31403D86928A78F24740DCFCD94FA78C3140E4C4D30D78F2474072864BC9F78F31406B691EC8FCEF47400DB70BB1959E3140D02BABC030EA4740EB89A04E81AB314090EBF3382FE64740B7A4290DDAAE3140B44CFF3F37E64740D70127FDDBAE3140D7DEFC3137E64740262FB4D7DDAE31406BEE69FF36E64740F0235F85DFAE3140EC21C6AA36E6474068D906BA4DB131405ACC7A6A9AE547405B66B83A4FB13140623675EF99E547400CAD15F559B63140545F71C48DE34740AEAAE21A52BA3140747DE72061E24740B3D0DA82B5BF314060E6D79D38E1474035D6D00FC1C43140AA29213BC6E0474010BB6D6F9FC6314088B36D27B1E04740BECAD9CD29CB3140E5F81197E5E0474038BB02A22BCB31401E227F9BE5E04740EE96A56E2DCB3140E65FF77EE5E047407F4A931F2FCB31407BBABA42E5E047409391D3A130CB314049E36CE9E4E0474038FF2C92B9CD31405D64C7592AE04740085F3932C0D03140FEC3AE9BF5DF4740897FA42060D431401D53A773F3DF4740901EAADB8EDC31405B1461563CE047409605DC3390DC31404E6D59593CE04740E657548991DC3140C27D794A3CE04740625B23D92BE431405352825AB3DF474088053CF331EB3140DE9303B2CDE0474065A0843834EB31404F0E7BEECDE04740EB482C40BCFA31404EA33DAEA9E14740A091E1C5BDFA3140A70911B8A9E14740FA5BB74ABFFA3140C22CE2AAA9E14740C90CD1C2C0FA3140A7001887A9E14740067DB522C2FA31404705CA4DA9E14740A27924DE1BFE31403739D9EFFCE04740CE4C1CB9D7003240F4E24FAED4E04740F73EE26730033240F86C447131E147407BD4F5A5A20A3240E234F07670E24740A802B771A40A3240727CAEAF70E24740DD461357A60A324014945CC570E24740BAA2DFD84F15324082E748E284E24740E4026C57511532409391FFD984E2474060EAF71591263240686F9B51A3E1474061DC31EC9226324089737A27A3E14740A766499C94263240806213DCA2E14740202CCF11962632401624F772A2E147401EC99E04F0293240C18483DE75E04740F13740A8462D32402174AE1B1CE04740BA9DD7191C313240DC7EAFF6C8DF4740B552810DE43B3240B4D085EA1CE04740F577A00BE63B32401F1049E61CE04740CAF209ABC6463240F447C25199DF47401C1165E2C7463240E5744C3B99DF47400978E66BEF4B3240600BEE4018DF4740B75B6287695232402C1C2ACAE9DF47407D7F0E5B6A52324035C9ECE0E9DF474072C4D679DB5732403EB5334466E04740AFC18A39DD5732401F99215C66E047401A055CFEDE5732406404225566E04740177CB1B5E05732406A8C7E2F66E0474003DA7F4DE2573240BCEFC2EC65E04740B35107B5E357324017D5AC8F65E0474025B183DDE4573240D6F90E1C65E04740D0A3C7BAE55732401DFFA89664E047403D12BB3A785B324001AFDCC49BDD4740FF395FBB785B3240F708DE3F9BDD4740EDDDFBF0785B32403E5E25B59ADD47400FC9B8D9785B32404A9278299ADD4740BEE56276785B32409CEEA5A199DD47401E3065CA775B324024CE592299DD4740709AAADB765B32408E73F5AF98DD4740B7EC69B2755B32400E75684E98DD4740C46ADD58745B32406D110E0198DD4740FEBDE8DA725B3240B19F8FCA97DD4740DD1C3629375532401C888AE5ECDC4740A67AB18F355532408F0D8FC7ECDC474084342C5E9C453240F0A309024ADC47400A1851B59A453240534564FE49DC4740680D181299453240A2D7F0154ADC47404E38A883974532408273D5474ADC47400FB02B8E17413240DD55DB3E06DD47408926B418E63032405B2A987E51DD47406BE6B4A5E430324029BADF8F51DD4740F7C3AEAC621632405B64F75252DF4740FDCBCDCBC0093240291433838EDF474093C5A3C7F2073240BD25FBD450DF47409DA2BC71F2073240413C31CA50DF4740C5B0665FA502324044122BE0B0DE4740278CED91A30232401304B5BBB0DE4740A94E09B8A1023240AE2BDDB8B0DE47403675EF193001324006BF73C3BBDE474079D33276BC003240236214E4B0DE4740CCA2049FBA00324037F3A2C9B0DE47406512353BB5FF314048BE03ADABDE4740CE0ADDCAB3FF31401CD70FB0ABDE4740CC750061B2FF31405C2877C7ABDE4740C57D31C258FF31402AF40235B4DE4740DDE819ED56FF3140D3A12E75B4DE4740E70AD04E55FF3140EEFD49D7B4DE474080A9B3B9ECFE314067083020D4DE47402E9E17821DF93140EC1BF57C0BDF474080A57D076FF33140F9ABA76275DE474088D394A36DF3314054685F4875DE47404683ABCC10E73140EB7C9B0AE5DD474085F3923F10E73140724DB105E5DD47400C8D7F4316E2314008E2B553C6DD4740AA4873DF71DD31407FB4C41996DD4740790E009C66DC31402574924A7FDD47402856AC4A64DC3140E551AD337FDD474047D81C6C23D93140852CF6CE84DD4740C7692BAA21D9314043607AE184DD4740C4EB89FC1FD931408EB3381285DD47402B51DF741ED93140D574305F85DD4740D15F461222D8314050777850C3DD47409B319E6F5DD53140DA9A3A7C35DE47405DA12B8B9BD4314024D7AA9539DE4740CD3A19D36DD33140EEACAFBC3FDE474023DB6A421DD23140230D96E11EDE4740D3B40BB01BD23140D9417BC71EDE47400EC04E161AD231400D8D93C61EDE4740EFF1F48218D23140E5B5E6DE1EDE4740A95C880317D2314041B5A30F1FDE474020854D0CBACE3140BA711212ACDE47408AE1CE2017C93140141904FF1BDE474096194E7115C93140DBD516E31BDE4740D034F1B913C931403F3B28E41BDE4740C3A41FE393C43140A5985A0645DE4740B4233F2B92C43140B68F5B2545DE4740FDC89F8E90C431407B56656145DE4740D208EA1D8FC43140756E0BB845DE4740D00BE91B28C131401700B0BF41DF4740273D6236E7B83140070E9E205EDF4740796D0084E5B8314003D7ED345EDF474017ACB7E5E3B83140103E6E655EDF47402E401222DAB63140A1915593AFDF47408200B381D9B631408876F9AEAFDF47406481C9D242B531401A61AAE1FCDF4740A386A36141B5314044835D39FDDF474017B3D45CB7B43140D1E6D39E25E04740645A0244B6B4314052D76A0126E0474057DF4B4B95B23140560E1DC70BE14740AAE855F294B23140D01448EF0BE147403B571566A0B13140B68CAE5B82E147402798A019A0B131401B2B4B8382E147408EC638A8CDB03140B780EA62F7E147406514ABB2CCB03140FA354E23F8E14740079B381A96B031408F53E6673BE247401EFD6E91FEAC3140F8587972BDE247402CFF32FCFDAC31405C22C889BDE24740E9C501960EAB3140A7E45F7C12E34740714C6E3E0EAB3140A75A398C12E347403CABF4D775A93140081FEA6F60E34740D560CC1A74A93140C6CB69DF60E34740D2A51EFED7A7314077C952C0E5E347404622A29F24A03140AC23D9A368E44740D80FF62223A031405DD626C968E4474020CC5BA1829C314013FAC0B3E2E44740149C577A809C3140BCDF631CE3E44740B1FF37F80E9C31400F8FED7B00E54740862D608F0D9C314057EB22F100E54740E526F47C0C9C3140C392747E01E5474088C98E84169B31403E2484C2A5E54740403D18F7159B314083A3F638A6E547402531F69F8D9A31403304B5D93BE64740A4617707DB99314015BC47B878E64740AAA30B26DA993140CB30281279E6474071AFD970D9993140BC9FBF7679E647401CA2C01480973140A81E81CD0AE847405749F0986A9731407E1C752419E847405AFA5EC86293314047732A8D18EA4740B8F883A2FF8C314012AAB1ADFBEC4740A246245E1084314080051DA478F0474023752F331084314025FA62B578F04740B8886D0E197E3140E478B272F1F2474067F7218643723140643D9A32CFF647409ECC37033A5F3140F1E01F057AFC474046512B79E8593140A5555BBD31FD47402213E20CF94F31406825261A4EFE4740CF7E35C227453140BC5F226D29FE4740A9CDEAFB2545314010AB8E7629FE4740B86D984424453140BB18829E29FE47406F4142AE22453140F64359E329FE474096E7914921453140658141422AFE474024EAE449E6333140F2FEE4FDC8034840E7C97F87E53331404CF7F045C9034840162CC4325331314029029647DF0448402DEFE9F2462B31409AE8E0908B06484005C95AD7452B3140424D97EE8B0648405247B25E3122314057227F06210A4840173BF45A3022314017850985210A4840B89511A92F223140C03D9412220A48406C966A133E20314031FCEB69430C4840D13062C33D203140BB1E4EE6430C48406228E4B23D203140C6A56C65440C484097A77C738520314084D794168E0E484005826BC585203140A80586C38E0E4840829F9058D2213140E6E2F46C1B10484081DC254CB3213140BD21376CBE1048409FE3EF51901B314049F3472225114840A67167897D17314065345132A60F48406070A9637C1731407A6BF5D7A50F48406330EF127B1731405E655A90A50F4840735DC5A179173140FC6EBE5DA50F4840D4C7BC1B781731406B6FB741A50F48407C126A8401113140DAF8E7C8600F4840B2E46BBAFF1031405F0BA2C5600F484033BDE9F7FD10314096D86EE1600F4840B2B8804FFC103140CF54281B610F484054E9B9D2FA103140CEEF6B70610F484074DD5091F9103140CACEB3DD610F484099378D98F8103140550F7C5E620F4840A937B6F2F71031404F8972ED620F48402893CCA6AA0E3140E4C44F512F124840 SK Stretch \N 2019-06-14 12:37:32.528618+02 Intevation t -RO_stretch_1 ["(RO,XXX,00001,00000,6100)","(RO,XXX,00001,00000,8460)") 0106000020E610000001000000010300000001000000A00100008A51DC40131F3740EB4009621FE44540AF46ED865EFF3640BDBB909790E34540E9CEF4EE5CFF36404C83CB9E90E34540FE6AB6625BFF36403160B6C290E3454044326AF159FF36407029F00191E345404C4A3FA958FF364048330B5A91E34540AB6FD09657FF3640D02FA5C791E34540F106A8C456FF3640D674884692E345405D78D83A56FF3640FC5FD5D192E345405ED1ACFE55FF36402242326493E345405D01ADFB3AFF36406C72D81B58E44540A68453F49EDF36402EC28B92B9E34540B52F685C9DDF3640FAF4F398B9E345408C2DC3CF9BDF3640B1010CBCB9E34540A8169D5D9ADF364006267BFAB9E34540B6392A1499DF36403609DC51BAE3454021110F0098DF36408545D4BEBAE345405110E42B97DF3640E158353DBBE34540A18CCD9F96DF364071B925C8BBE34540B4C02B6196DF36402B7A505ABCE345405266E4AED4DE36402EEF0CBBA1E8454087F5D53ED0CB364049ED8FBF48E84540227670A6CECB364019328FC648E845409C24A919CDCB3640BAE944EA48E84540DB9FBFA7CBCB36406EC1512949E84540E835EB5ECACB3640046B498149E84540B507CF4BC9CB36408A73CAEE49E8454009B5FD78C8CB3640C3859F6D4AE84540CF5791EEC7CB364025D1E8F84AE845400BCEDBB1C7CB36402AFE4B8B4BE845401156B97E29CA364046C7431CCAF345400A9B159229CA3640A67B26B0CAF34540E31AE5F429CA36408ADBD33FCBF3454055655BA32ACA3640D1E2C5C5CBF34540A680C3962BCA3640F153D63CCCF3454007EBC1C52CCA3640B56571A0CCF3454000B2B0242ECA36408FCFC2ECCCF34540B21512A62FCA36404D79DB1ECDF34540954F153B31CA3640375BCE34CDF345402332AE60D6D036405FB3E741ECF345401BA1D8A678CF36404713CAF49FFD4540137BCF0487CE364075733E70D50246405BDF381387CE36401FF9B506D60246404323177487CE364045AD2799D6024640625D902388CE3640D80BC121D7024640D096AA1A89CE364096C4139BD70246404ACC924F8ACE3640D1014D00D8024640DDEB00B68BCE3640C180664DD802464079D5B43F8DCE3640A8874F7FD8024640126607DD8ECE3640F7180C94D8024640784AE2EBDEE13640A1F742201C0346403AC7B46466E036403D0A9011A40D4640D01F8DB949CD3640A0A9FC404D0D4640DE7F941F48CD3640CBF124484D0D46400CFF579146CD36404741F46B4D0D464074261E1E45CD364079F40AAB4D0D4640AC4424D443CD36407089FD024E0D46407A9A12C042CD364018636C704E0D4640CE1080EC41CD36408FE924EF4E0D4640683C8A6141CD364023C24A7A4F0D464057AC852441CD3640608A870C500D4640390B683E81CC3640424AE55C96124640CCD3B5F962B936405CA73E7A3B1246409B23165F61B9364014A513813B12464090610DD05FB93640CC089EA43B124640654CF05B5EB93640614280E33B124640E4DB0A115DB93640FAD14F3B3C1246402EA313FC5BB93640440BADA83C12464014C6AE275BB93640344464273D124640494F059C5AB93640A82897B23D124640FFEC745E5AB93640C69CEC443E1246407F27983574B8364021726A3B7018464032CFFE4552A53640283A3C5613184640BD81F7AA50A5364084DEE65C131846408C9A731B4FA536400B454A801318464049B0CDA64DA53640DD430ABF131846401F06585B4CA536400F7FBD1614184640F4A5CF454BA536407E220584141846400B0DDF704AA53640800AAE02151846403B3CB5E449A536408215DA8D151846400634B5A649A53640DC07302016184640FBC7305619A53640BB0C13335D1946404E092F6919A5364089970EC85D194640F64B36CD19A53640976DCA585E1946409A985F7E1AA53640151AA1DF5E19464025A3C1751BA536409FFA4F575F19464040D0B5A91CA5364027C82BBB5F194640524F462CCBAF364035577B7E331C4640F065233E90B73640C4592293A81E4640D3B516BC91B73640D5F61EF3A81E464062AF846B93B73640EA167932A91E464025D3303795B73640516B124EA91E46402CC71D46CBCA3640A1881AA8081F4640BE545EE2CCCA3640F81B70A1081F4640304C0A73CECA3640B09EEE7D081F46404130ABE8CFCA3640A2D9F43E081F464006B2D534D1CA3640FCF9F0E6071F46400126B84AD2CA3640438E4879071F4640DD29991FD3CA364057F736FA061F4640A29741ABD3CA36400599A36E061F46409AAF4DE8D3CA36402267F1DB051F464007179446B1CB3640E9FCD0D4D1184640A1A5E91EE5DE3640BD59B7F9281946407F179EB9E6DE3640FE2A6CF228194640A5DC7C48E8DE36408DFF76CE2819464022EA36BCE9DE36409323398F281946408FE78706EBDE36403EF61F3728194640F65CC21AECDE36408C108DC927194640C8424CEEECDE36404E0CB54A27194640FA2B0779EDDE36402B3276BF26194640DD0AA0B5EDDE364053A4282D26194640ABACBA8BB0DF3640DC9E10FBA6134640C06735C3C0F23640B9EB94AFFE134640E33FF55DC2F2364072DB5DA8FE13464020D7E6ECC3F23640A4D87084FE134640B63EB460C5F23640776D2F45FE134640A1A012ABC6F23640751608EDFD134640D8E54EBFC7F236409C545E7FFD134640C1AFCA92C8F2364062546900FD134640F6D6641DC9F23640A5710A75FC1346401B6BC959C9F23640EA309DE2FB13464054B148ED69F33640C1BE4179650F46400DFF07064D133740682D4333F40F4640433C79A04E133740D30BCD2BF40F4640E090FC2E501337402A63A407F40F46408F0241A251133740F2F72CC8F30F4640F5A901EC52133740E13CD76FF30F4640F91792FF53133740DB520802F30F4640DA075BD25413374074A1F882F20F46403E93425C55133740C2508AF7F10F4640E7E6FB9755133740F13C1965F10F46403C44792AC41537401BBB344E8CFD4540D4C5C015C4153740B6F661BA8BFD4540DB238DB1C31537403403DC2A8BFD45400138B801C315374000EE26A58AFD4540E1F0030DC21537406331662E8AFD4540B0D5D7DCC01537405E262ACB89FD4540857FE47CBF153740E41D437F89FD4540C496B0FABD1537408FDB9B4D89FD454020C01365BC153740A7E21C3889FD4540FA3FA755B402374081BC0FAF34FD4540710C7DC8F2033740605AC76BD7F44540A88720B6F2033740FB2890D7D6F44540C28AEF53F203374055BD8147D6F44540CBAFB4A5F1033740D3082CC1D5F44540B12C2AB2F003374096E4BE49D5F445406353B782EF0337403CCCD6E5D4F44540279E1323EE03374064494F99D4F44540EDDED2A0EC03374053D21C67D4F44540700ADF0AEB033740C1942F51D4F44540A7BDF6806DFD3640DAA52A37B6F44540DBF7FDCB89FE3640EDA11FD57CEA45403F2B8D72351E3740CAD0B1980BEB45406082AA83E31D37400B65F2739AED45401FFE8B99E31D3740FAB350089BED454089C84FFFE31D374069AD42989BED4540B50405B1E41D3740AF44351E9CED45406FF1C9A7E51D37402F8AF8949CED4540862210DAE61D37406518F3F79CED4540083EFB3BE81D374074AC4F439DED45403392D6BFE91D37406D2623749DED45406BF69C56EB1D3740307889889DED454088CB0BCAAB3D37404C871A990EEE4540DC0B561F2F7D3740B7655CC86EEF4540F6DBB9D22E7D3740A9E68E5571EF45400C6C87E92E7D3740B42F4EE971EF4540F71B934F2F7D37409DEA9A7872EF4540DB2DF100307D3740078BF3FD72EF454056FED0F6307D37405D6C387473EF4540FE0CC027327D3740C337DED673EF454069E90688337D37402C971A2274EF4540D4721C0A357D37401A7E095374EF4540B9FC2A9F367D37400B99C96774EF4540AF86BBAE4B90374020FBEEC9BEEF45407FB93D474D903740D23091C1BEEF454093E762D34E9037405E8E889CBEEF45405645F14350903740B876415CBEEF4540597DBE8A51903740A85C3403BEEF45402E113B9B52903740CF73CD94BDEF4540B8EFED6A5390374066034B15BDEF4540CA80DBF153903740DAA59389BCEF45404430D42A549037406C1006F7BBEF454002088119E59037403A73325ECDEA45403EE00ACBA6B03740B5A7729044EB4540CF651363A8B03740AC3CD08744EB4540721B9FEEA9B03740C58E8B6244EB4540B1607D5EABB03740E400132244EB45403DAF8DA4ACB037401064E0C843EB4540757D4AB4ADB037403BA0605A43EB45402D584483AEB037405407D2DA42EB4540A4798809AFB03740849D1A4F42EB4540FAECEE41AFB03740CEF097BC41EB45404DABD6CAD2B037407D0C42AF02EA4540F27B64E59BD037406511777479EA4540A412FE7E9DD03740F5B7B56B79EA45400483ED0B9FD037409068184679EA4540A5F9D47CA0D037408EEA130579EA454086716CC3A1D0374023992CAB78EA4540543D0FD3A2D037407671DD3B78EA4540835439A1A3D03740619475BB77EA45407B8AEF25A4D03740C391ED2E77EA454005A70E5CA4D03740CE24B69B76EA4540A8EE99E0DDD037403A8386ED0DE8454063C3839D0ED1374023BBF31242E6454097E73B72C3F03740DE378BF5B8E64540AFFB7E0AC5F037409602DFECB8E6454084EB3896C6F03740A0F17EC7B8E64540F25C2D06C8F03740B365DB86B8E6454043AF314CC9F037409076712DB8E645402C9CB85BCAF03740936BB2BEB7E6454077EE4D2ACBF0374096CDE13EB7E64540048BFDAFCBF037408960EBB2B6E6454091D4A1E7CBF03740D0A23220B6E645408AF34B622DF13740461687941AE34540B70C230FFD10384024289D838FE34540788207A8FE1038406DE2C57A8FE34540691D3E3400113840B8081E558FE34540B27775A4011138408A4A1A148FE34540134471EA02113840301E3EBA8EE34540863297F9031138403DE0024B8EE34540B1AB6BC7041138404171B5CA8DE34540B090F94B0511384019A64B3E8DE3454068FC208205113840253033AB8CE345401E1DA640641138406BF57FF39EDF45400BF406BE26313840CA2D8409CEDF4540B269AA502831384091E087FDCDDF4540B5D556D5293138403B6396D5CDDF45403A406A3D2B3138405DAD3093CDDF4540F250567B2C31384005ACD638CDDF4540E4F522832D3138401E2AEFC9CCDF454074BEE14A2E313840D207A74ACCDF4540BA920DCB2E313840D3FCC8BFCBDF4540D12CD3FE2E31384066698F2ECBDF4540243E19EB643138407E58D1975BDD4540BC24B01524513840BD72393887DD4540617F8D34D4503840C3B306B062E245402510E853D4503840C86D324563E245405F79DBC3D4503840740732D563E2454067680180D550384048BB5C5A64E24540F4E9F480D6503840B0BD76CF64E24540B8CE9CBCD7503840D6E4E52F65E24540D0449126D95038403FF6DF7765E24540DDA798B0DA5038406EC890A465E2454006A0364BDC503840C6B836B465E245403440921F6D703840871E40A373E245400ED2634B2C703840A09B3EA26BE545403A51D8662C7038403F1ED3356CE545400C5942D12C703840122EA1C46CE54540332C8B862D70384053132C496DE54540E893BB7F2E7038406F085CBE6DE545404F6440B32F703840C952B01F6EE5454087AB481531703840D48D6B696EE54540FEEC399832703840A874B8986EE54540A7F1352D3470384058C0C5AB6EE545407DC47445478338402E9D93B4A4E545403BA582077F9638408C08BB2AD9E54540F6CDEB9E809638404F338120D9E54540C0F4FE288296384088A0B0F9D8E5454024779796839638407025C7B7D8E54540ECDBA8D984963840AE274D5DD8E545400407C9E585963840D1B2BCEDD7E545408059AAB0869638407D445F6DD7E545407D0C8132879638401AA023E1D6E54540C0E14F668796384080486D4ED6E54540E0FA9C05B8963840B04119DC77E34540FBB5F76CAFA9384052540D708DE34540CEF00800B1A93840ADD58A638DE34540D76ED284B2A938405E9E093B8DE345406FA9A8ECB3A93840F1F010F88CE34540B3C0F729B5A9384019B8279D8CE345404CA3C630B6A93840B61DBC2D8CE34540C5B52AF7B6A93840FB6702AE8BE34540359CA775B7A93840025DCC228BE34540148977A7B7A93840FBB45A918AE345405C9A42E5F9A938405EB389A4F5DF454048F7314794BC3840E36382DA2CE045401FC970E495BC384000494AD02CE045408A0FEC7397BC3840EF189EA82CE04540C781D2E598BC384076F60F652CE04540F0B07E2B9ABC384002A54C082CE04540D47D0B389BBC3840A06B00962BE045404ACED6009CBC3840D5D9B1122BE045401C55ED7D9CBC384000E893832AE045400F285BAA9CBC38401F4451EE29E04540192E0F9AC8BC384084D9AD3138D84540A5485D5DC8BC38402E77B47637D84540DA6E155BD3BB38401DB94AC4CFD645403C62ADF8D2BB384069FA6CF298D64540D14DB3D0D2BB38409BD4166198D6454074614E5CD2BB38401E7D45D597D645405C57DB9FD1BB38403265365497D64540E2386AA2D0BB3840FCC4BFE296D64540729B7A6DCFBB3840DD33228596D64540437FA00CCEBB38405FDCDF3E96D64540243A158DCCBB384017D39A1296D645402F9838FDCABB38406FD3FB0196D645402359C1ABACAA3840FE22E92B7AD645409965CAFF999738408FCADD9947D64540476B386998973840755217A447D64540A00DF5DF96973840B82DE7CA47D64540DDA51C73959738400496CF0C48D64540BD05B430949738404C3D486748D645403A921E2593973840D136D7D648D64540F967A45A92973840CE28335749D645403C380DD99197384086766DE349D6454008C153A591973840FDC322764AD645400709512A3F973840B8E1A2FB4EDA45400DB78F8D3B843840A6943C5D1BDA4540A98201F238713840EC103664E5D945406466ACFEB4713840AC7F5843CFD545408E57ECE6B47138402C66B1ACCED54540E2720E7DB4713840C97FC41ACED545405A854EC5B371384009AC6793CDD545404FA905C7B2713840E7A7041CCDD54540B50C5F8CB1713840D4A361B9CCD5454089D7EF21B0713840FD63706FCCD545402E5C3696AE71384029DF2541CCD545405FB805F9AC713840AFF95B30CCD545406EEF4948D651384057AB546FA8D54540B45B7C0DE9513840A5059E2DDAD44540DF9767F2E85138404F7CCC98D9D44540C3E83887E8513840D5DDD108D9D44540D50820D0E7513840E5CD4D83D8D4454026C343D4E65138403551770DD8D44540EB707A9DE5513840B3A8E8ABD7D445407A9CE737E4513840664C7162D7D4454030A182B1E2513840D5D1EF33D7D44540FD058B19E1513840193B3522D7D44540A70C7C321443384054C8A0E6BAD445405EB2777125323840093EFB068ED4454078D0B664253238402559FF008ED4454080F0DA2F2432384078339B9F8DD44540EFE76FCC22323840202F0E568DD4454015E6384821323840086431278DD44540BC343EB21F323840C75BD5148DD44540EF8A3DA3721238409E86D01C40D4454067FF390F71123840BA38322740D4454066616C886F123840A5C2D04D40D44540C256A91D6E123840E2F4348F40D445407C1AB5DC6C123840B288E3E840D4454024BFBDD16B123840C03B755741D44540D7DAE4066B12384048E0B7D641D44540621ADD836A123840A420D76142D44540C1779F4D6A123840406A8BF342D44540E9EB73AD2C123840E5A5F510A3D64540162FEA64FA063840774BE53D88D645400107FE3E55F23740909D452640D6454048E8FBA753F23740F0FB292F40D64540AFFB931D52F23740DE54B45440D64540860FEFAE50F237404246739540D64540D2C8246A4FF23740F5BCE9EE40D64540BCF9B05B4EF237404A71A75D41D64540E0CBF88D4DF237408CBC6ADD41D645405277E4084DF23740BC7A4A6942D645408F7491D14CF237403D5CE6FB42D645400588CE7DE0F137408E2A15FB4EDA45403A57AA8051D237409EA232D5D7D94540A0675EE84FD2374012DFA7DDD7D945404387845C4ED237401DE4EA02D8D94540C2E866EC4CD237407B3F8B43D8D94540E87F3DA64BD23740AFE9099DD8D94540EF69A1964AD23740B0F4F10BD9D94540665B10C849D237401CBAFA8BD9D9454096E3844249D23740CF363218DAD945401E87270B49D2374042F12DABDAD945407EB80E14D9D13740584214B118DE45405877C66833B23740186A5382BDDD454066810DD431B2374015E3FD8BBDDD4540C4C32D4C30B23740AB74ECB1BDDD4540AF6106E02EB23740BC9AAEF2BDDD4540B230699D2DB237402031CF4BBEDD4540257694902CB23740E353ECB9BEDD454012F5BBC32BB23740603BD838BFDD45403CD0A53E2BB2374069D5C1C3BFDD454013035F062BB23740B5906355C0DD45405522A8DE68B13740733F3E0E59E44540AED7ECCC9491374069F59F6CE0E345407787F831939137406D5A2B75E0E3454037ACABA391913740C7C4CF9AE0E34540ACFB9031909137403D3015DCE0E34540AD8419EA8E913740BB9A6F36E1E34540A76C0CDA8D913740457558A6E1E345407F4B070C8D913740BDDB7127E2E34540A92014888C913740B633B2B4E2E34540EB0459538C913740767E9648E3E345405ECE7D6E85913740597AC1D737E44540C3969EB0907E3740E6B21DA7EDE3454053F1AF188F7E3740CDC955AFEDE345405B97058D8D7E374065D63AD4EDE3454045F1D41C8C7E37400DCC6114EEE34540B20B45D68A7E37406766536DEEE345406954E3C5897E3740FF6CA4DBEEE34540BA1528F6887E37409757175BEFE34540E06F0F6F887E3740D207C6E6EFE3454005C6CA35887E3740D5FD5179F0E34540595F0903FF7D3740C445794382E84540529B1765415E37404026C18508E84540FCED4359863E3740323D82ED84E745400CDB5805E23E37405DFCC57CACE44540D748E8EFE13E37408C271BE9ABE445400A3C6B8BE13E374001E7C859ABE44540218ABCDBE03E374083AC4ED4AAE445401C7399E7DF3E3740743ECB5DAAE44540BD725FB8DE3E3740CF6FCAFAA9E445408E48B059DD3E3740447B18AFA9E44540D6BDFFD8DB3E3740D6B79C7DA9E44540378B0F45DA3E37403B153D68A9E44540E60A7DAC1B1F3740421CCFD61CE44540D20498131A1F3740E63335DE1CE4454070839486181F3740AC4C6B021DE445402E0DC414171F3740C1B80B421DE445408B7F6BCC151F37405DFEA19A1DE44540F91D36BA141F37407E17C3081EE445406A6EB8E8131F3740F4342F881EE445407FB70760131F37401FB7FB131FE445408A51DC40131F3740EB4009621FE44540 RO Stretch \N 2019-06-14 12:44:46.923051+02 Intevation t -\.
--- a/schema/demo-data/responsibility_areas.sql Mon Sep 16 16:56:11 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ --- This is Free Software under GNU Affero General Public License v >= 3.0 --- without warranty, see README.md and license for details. - --- SPDX-License-Identifier: AGPL-3.0-or-later --- License-Filename: LICENSES/AGPL-3.0.txt - --- Copyright (C) 2018 by via donau --- – Österreichische Wasserstraßen-Gesellschaft mbH --- Software engineering by Intevation GmbH - --- Author(s): --- * Sascha Wilde <sascha.wilde@intevation.de> --- * Tom Gottfried <tom@intevation.de> - - --- Setup Country Codes -COPY countries (country_code) FROM stdin; -RO -HU -SK -AT -HR -BG -RS -\. - -COPY users.responsibility_areas (country, area) FROM stdin; -RO 0106000020E6100000010000000103000000020000005C000000D37ADD691F3238408F54CAE990D44540ACC4737D1F323840729F490790D445407D67576B721238403D49490F43D44540984C3A80341238405D9E7F16A6D6454006284723FA0638403B4C4A308BD64540C6C1DCEF54F237406C85831843D645405436284EE8F13740F6316D0B52DA454008FF942A51D237409E5461C7DAD94540354866E7E0D13740CADD40BA1BDE4540F1F89D2633B23740D6B5CF74C0DD4540293E13AA70B13740D818B51E5CE44540162B4476949137409188DF5EE3E3454059363A538D913740F8DAE0E93AE44540577CD157907E3740AFAF5A99F0E345409667FACD067E3740B0715C5485E84540EA0E630B415E37404F4703780BE84540739967D77D3E374006B067BD87E7454090C635E3D93E37403D7D665AACE445402E2784471B1F3740AD24F3C81FE44540B3288EF11A1F3740A1A2057822E4454012C746205EFF36404421B58993E34540111D8FB542FF3640860130365BE4454030AA36829EDF3640A92C8084BCE345406187635DDCDE364031C1B2D2A4E84540DA07BFD4CFCB3640133BAFB14BE8454077B6BDA431CA3640CFD2AE42CAF345405559DCF0DED03640EAD0C075E9F34540927AC7CE80CF36400A579C20A0FD4540900A2F2D8FCE364000A687A1D50246409B36AD80E7E136405BE0534A190346401CE88F286EE0364046807328A70D464025A8825149CD3640DC391E33500D4640A5A3A30189CC364048958375991246407F13BD8C62B936400E594C6C3E124640624017F87BB836405AE7DC547318464042648CD651A5364006E04048161846405186628621A5364027EB245B5D1946405A4C9352D0AF36407633D131311C464089114AA995B73640A7BA1F5CA61E464023554CB6CBCA36400E6522B6051F4640ECC84F7FA9CB364000A133BDCE1846401DE54385E5DE3640DC36940726194640845E4EC5A8DF3640200FF8E2A3134640591ED82AC1F23640DA1F7BBDFB134640AEC5AE2662F33640B32DF661620F4640461D166A4D1337407D5C2041F10F4640BB71A301BC153740314E452A8CFD45402CCFB1BCAB023740520F6E7C37FD4540F4A9A0A2EA03374020554843D7F445408159980865FD3640012CC203B9F44540B7A740FA81FE364093405BBD79EA4540662CA3F43D1E37403A0191CA08EB4540D5295AA8EB1D3740A8DA18969AED4540C8D24B31AC3D3740A130FDA60BEE45405E0E8F9B377D37407F8305026CEF4540D4D0E3F7367D374023218E7571EF4540EA1192054C903740A102B2D7BBEF4540CCD21D4CDD90374086E6D34CCAEA4540F298E61DA7B037408D02309E41EB45404BCA35FBCAB037404CC8079EFFE94540D28AD9379CD03740235C3D8276EA4540D75536BDD5D03740DA9A50D20DE845409F5CF5CA06D13740558F9D013FE64540A44FE6C4C3F03740E6AC5C03B6E6454003224F9025F1374029EFD68317E34540DC8A1260FD103840335A73918CE34540DA3A7B655C113840329276F49BDF45409358BADD263138400029EA16CBDF45409673DD0A5D313840B8D7A99958DD4540D21367672C513840BD385C5084DD45403387AD56DC5038402A3996C162E2454011E03983757038408940C7B370E24540ACD3C56D34703840447D8CB96BE54540340D238447833840D3075DC2A1E54540B0DFDF437F9638408E578638D6E545403A664F1FB0963840FA6032E074E34540442B9485AFA9384056E59C7D8AE34540C21D2DFBF1A938400677D599F2DF4540C581D38894BC384038306CE829E0454076EFAE7AC0BC38402878C02B38D8454014D6A93CCBBB384022231521D0D645406D87ADD9CABB3840262D58F498D64540406AF47BACAA38408BD1381E7DD6454061008BC3999738406C4D158C4AD64540A452270D4797384059EE8E0352DA4540FB66614F3B8438400460764F1EDA454015AF2E793071384010BCC23EE8D94540CEF774E1AC7138400C64E822CFD54540190524E4CD51384060FF0758ABD54540E38399EFE051384015EBB314DAD44540E94291FF134338407E0214D9BDD44540D37ADD691F3238408F54CAE990D44540040000004BCA35FBCAB037404CC8079EFFE945406D5B9BB5CAB037405FB2039DFFE94540006E8B08CBB03740C33F4F26FFE945404BCA35FBCAB037404CC8079EFFE94540 -HU 0106000020E610000001000000010300000001000000DC0000003A75DB3B59AC32404C65D652400347400CFE092E56AC32402A8D87F71C044740034077499CAD32408405C765DC0447407013B8AE98B53240B029EFE368064740CF73EB6E9ECE324090A546E867124740ACD4BCAAB3D23240DAB292567C1547402586C476F7DC3240BDCEA96400184740B3FA0DDAABE53240215E398C931847407B78E09C11E53240B69344F6411C4740DC2AF52C08E53240D26AFC1DE52347407B8310902FE532407EE4F8A1D22647405953BEA085E03240FC6ACB80B32E47404212F96706DD324012AAB9DC60324740F5514ACFF4E63240AD66CEFA943B474062D116105ADB32409155116E324A47407544E4BB94D63240034DA7751B4E4740716CFF14D8D73240C4DC82B6E64E4740D915D1764CDD32403BD7D47954524740084D711C78F13240F48978EBFC534740882745F295FC3240A12D944C4E594740D83215E291FC3240C39ED497A55B474045D1BBA074FA3240CFB647252B5D47408EA69927D7F43240A43D96880161474050378CBB41F43240E70A82C7B76147404192D6BDBAEF3240FB4C90227C6447407C4024F900ED3240FE0FD2095766474001D3842689E932409199B5149068474012244F92AEE93240EE28ED0DBE6E47401F07B08F4EED3240E41F037976714740DDDF0A6135F232400F7F3A1E33744740546BF1F09EF332401DF4C0C7607747405B2357B1F8F13240513BA8C4757A47401ABDD364C6EF32408A6058FE7C7D4740BE1292CCEAF13240FC818769DF804740D88CD61874F23240537FC7F0D883474069C1E3A25AF03240601A0E4B03854740BC33CBF9BDEC3240AC258A35018647406B17AC38D5E2324046C4CBD3B98847405E5B717154DE3240B0A59718CB8E4740589EE8BAF0DB32400C5DACA8C194474097E666B801DF32409747E867EA994740F65EA9D326E33240B7D9F40C869C4740A28C2A8A57E53240028697E0D49D4740880D6CCEC1E7324013BAD573D2A14740A0A197512CE7324019843C821BA54740CDB62BBB60EC3240F1E84999D4A84740F2A8897780EF32407809DE9046AB474036F59C2D20F03240022126E142AE47400349DC63E9F33240C4104C35B3B047404A857C3C99F83240D7A8209AD4B14740F1818C800AFB32408A65DB696BB247402F07A359D902334097EF48BC3CB34740A0A57004A90833402EF529C764B54740FC816165D90A3340D7417EECE4B84740FE401B800D0C334023F8C77BD5BA4740E22B910BCE0C3340C680E84999BC47400B01341136083340DB6A6116DABF47406ADF1115AA0733409AAF8EE387C24740D85C0FA9B3083340D3A94885B1C34740B4B972F6CE0E3340565F4F8589CA4740BE2731CF4A123340C991E34EE9CE474040449C87131433406BDE240681CF4740FA98B67F6511334095BEDC2747D34740CAA7D898D7153340804E5DF92CDD474031BAC9A8321433400E4B0ED8D5DE47406879F69507113340952288F370E047403FF68F85E810334032B5C876BEE14740B954DFF94511334029250B98C0E34740D1B3B794F3FD324028E0B37570E64740A29A776341FD3240FE67244223E64740A70E859675F73240C0C47AA356E24740337020240BF03240CB63B48EAAE047404D858A71FEEA3240E4605AD427E14740340590A163E73240845EAE450BE24740311FE010AAE432402EE386DF4DE547406999CFB9DBDD3240C39EFEB3E6E5474022FD9979B6D8324060E08BB062E74740398F2441B8D03240D81430815BE74740A6CB54C1A8CA32403CCC40C0B5E747404C2AEBCB2DC63240BEDEA9807BE74740A4681B13BDC1324081CC3BF317E74740D5196FBFD7BF324074095D1D5BE64740391CEF22A7BC3240657D52EDD3E4474063B75D2F4DBD324097E6806E79E4474016FBF33460B63240AAC32DD5BBE24740B5BB0BB66CB232401B7A58A835E147405418D533CEB0324077BCF8A23DE04740F8B3931C0BAF3240B7F3B798FADF47404D4C9E1E80A93240788949B890DF474087A1CD27E1A03240201E9E25C8DF474009CBCE3692933240664ED944C1E04740435C6A73528C3240E77B15191DE14740EDEA4548388432403501344A97DF4740FD1D62CD127A32407D830CD3ADDF4740E3FC625BAB7632402C10D8309EE0474004F3A92A347232403B7C832F4CE04740BAD53384636C3240E2FEB5BC72DF47400C0BBD36705B3240C3DF6D999ADD474077A510B6DD57324056961C6B63E0474017428AF0E56A3240114D327216E247408645825FD96F3240544364ECDFE2474009194B0E8E7A3240499C20A0B1E24740894EB3F62D833240AD25851ED6E14740C012FAE307863240E1C9BFE0E4E1474086E2911DC08B324021AB9C514EE34740B6E59AA7DF96324075017C0107E34740663C68C06A9A3240DE1D9AC3FFE14740F08073EBDA9D3240D1BD6257A4E1474064539632BAA932405209B5954DE24740E30AB2AF86AF324081CE44227EE34740C70B118134B33240DD359B7DD4E44740DC6E826F9AB43240B7EE4284C9E54740F353A70359B73240EC4747286CE747408FDC1B4300BC32401CE76C01A1E9474097F37C72B9BE3240AF440BD0B6E947404279E008F7C532403C87BEBB95E94740B8853EFD0CCC32406BC4D0EAE4E9474099B53A00E2D23240B6E5BE8BADE947408FC2D63384D932401F7C9A9317E94740BA85D9C477D93240C86B9C5D13E947409A4DE78A52E63240FA41E8A04BE84740901B6CEA3CEA32403F114C35B3E647408A76DB85E6EA324035359F73B7E347401CED3191D2EC3240516C1CB116E347402E1688D7F5EF32402634FD12F1E24740F8DDC1887DF63240187B008BFCE64740BCCE22145BFD324040C0FF56B2E947408B75914259083340C18B9DF012EA474084FDA5457D1633406CE7818FC1E8474061C05DBD8A20334022E7F9D346E5474075531F813F243340E5EE073C30E24740653ACAFACD2433402AE87E4E41DE4740289E779CA22333405D6FDBF7A8D74740E4AD74779D2133401E5F27F565D347403042CCECF31C33401A42058717CE47406961D7ACE91A3340B558ACE122CD4740BB81DBDAC217334048F377EFA8CB4740D04E28339417334062D3C6116BCB474043B5B0A71D1633405CDC9C4A06CA4740503330F2B214334000ED7E7099C747408618200A6614334000124F7633C74740C2549B38B90F3340E9012269DCC247400F9D4C158C0E3340560290DAC4C14740C30417F2080E3340DF3EB48F15C0474055C4C859D81333405CA0F831E6BC474005F09FA7011333405E471CB281B84740748E7637AA123340BCD804734FB84740ACA77B9DD40F334072E7B985AEB64740732CD027F20C3340B2ECC6BB23B3474091C000FBE80433404C73A25D85B04740009F887E6DFD32400AF4E505D8AF474038A405E56CFC3240385F549CB4AF474004734DBA2DF93240C45BAFE941AF4740B5C420E9D3F6324086E464E256AD474049CA703C9FF53240992DCBD765AA4740C56B456282F23240A8EB6F09C0A7474070C493A46BEE32403907EC6AF2A44740947315527EEE3240F808E57D1CA14740CE89E6C8CAEB324027A19927D79C47408AB7483547E932409DA09163469B47404EED5D83BEE83240471A5245F19A47409CA603594FE532406247E00F3F994740B0367AFCDEE2324008BAE2E2A8944740163C4C3448E532406244183F8D8F4740D1CA0A45BAE73240ED6C1CB1168B4740CF6D30D461F5324035B34813EF8647405D1C8524B3FA3240A81C1CEC4D844740D7FA083543FA3240D235272F3281474094B57EFACFF632407894490D6D7E47406D8736C7B9F93240818EDFDBF4774740B3F2E15982F83240484ED0268773474067A50D87A5F5324006273273817147404626EA059FF232405B32E884D06F474020D0ED5EEEEF3240C0C0DB83106E4740635A0C5707F032405A1F5F4205694740FD597D2BC8F13240C60675914268474041CEB2EE1FF3324066B21875AD67474036B0F1608BF53240A12666BD186847406D17D57D5B033340F64B66BCAD5E47408900D6AA5D033340C5B5A2CD715E4740F85CE333D9073340DC7912D89C5B47400E22DBF97E063340E8EAE1CB4457474020AFA6EB89FE3240B7FCD13769544740B44BAE51C5F932405E8C2CF41C52474000910D6B2AF732408870AC8BDB504740FF887F1134F632409993F947DF504740B208D9B27CE53240265B70067F4F4740F200B34291E2324085486C770F4E4740FCFE3669BFE23240B736A1FFD44D47400F698CD651ED32409BF7EB4E774047407AF7E12021F232408D4912842B3C47405CB53BA418E83240CDEEE192E3324740604A4BD4C1F0324027DA23E538244740B8C8957A16F03240270D8E925723474038363AAE46F03240E56FC50FDF22474096794276DEEE324048662783A32047401C18FF3EE3EE32402662FA5E431C47408367882AFCF1324017922232AC1847403332F5BA45EC3240CBF48079C8144740E84F08E412EB3240867E1CCD91134740D3DAAB8F87DE3240F39AAF928F13474009C78D6CF8DD32400475835781134740BC6AF12093DD3240FF305368831347405A4F172994DD32406CEFB25F77134740FE8EEC4ACBDC324096F711BF621347405165696E85BC3240BFA5C4AEED0347409C038C67D0B4324057C54FE3DE0247409A77FD82DDB43240F293ED43DE0047409E871057CED2324084DAC2F352F54640CA5F350296D532409D1CEA1CA8F44640437ADC1214D432407E12E2CAD9F34640E743C362D4D33240486001A7D2F34640041B42959AD33240F7E9A9C42BF44640FBD833DF1CD33240DCBAF55091F44640596F9B4E57D23240BC09ADF314F54640EB998B1AA7CE3240D63B9AD99DF346400094DD38CECE32403AC5A0B888F346409585BC9B5DCD3240CBA463BD07F34640B13A3DB665AC324012F23FF9BBFF46403A75DB3B59AC32404C65D65240034740 -SK 0106000020E6100000010000000103000000010000007B000000AC158524B30E3140FA3EA3193012484027321B2B310D3140A401BFFC041448408C1D9F4610153140ECF5087FD01348403134CF4A5A1B31405FF47B07E41248401CD9B210782331409A136B4CE3124840C12977B00F283140A3DD27A2BA1248404947AC7B1A2A3140390BFFD8DA10484051D1E9E51C2B31406C6745798B0E4840094FB2C4B9283140BE7046DE830D4840DCB8DFA1282C31405F8CD0BEA80948405996373DDE3431403F151340D6084840B3B974EED13A314016A5D535FF0748408294C899814131407B917BBABA06484016C316BB7D42314094701706D10448402FC3F572E94F31409D4548934102484034A01441F7583140018C7B9862014840F65B8DB3E95E31402D0EE7751F0048401D93E634B0623140E0495D328EFF474012E3B9ADE3843140AD2E90A0F8F44740C27B69519F8C31400971A4D876F24740E756DB4DF08F314032276431FBEF47400B78D65D8F9E3140BE301FB52EEA4740175B09FF7DAB3140016D4C3E2CE6474019903A4BDAAE3140C464E54D34E64740E895CB7F48B131400D5EA80D98E5474055BB78AB53B631408E87D4B48BE34740A42649D74CBA314035B6DAC35EE247409D715EF7B1BF3140261B3AE235E14740CF7CD360BFC431404CC55455C3E04740AB6CF7729FC6314080157C2EAEE0474060D14DF62ACB3140E7635BABE2E047400D9B899FB5CD3140EEFBFC9C27E04740AD0B044BBFD031404026D6A9F2DF474054D5318C60D431408BFA0681F0DF4740CBC1D2C08FDC3140C598006839E04740469CBFE72CE43140E1C8D644B0DF474079FB4FA335EB31401D302306CBE04740A25C43A9BDFA31403806D2C5A6E14740271CD2CA18FE31408E2FEC1FFAE047400AC63AE9D8003240C3639A9FD1E0474049B4802B3403324083676AC82EE1474070649588A60A32408D3242D36DE2474088CD2C095015324061A92FF081E247408A3CDBC58F263240B5F4E967A0E1474040550B47EB293240DD38F64773E04740A8A8B24A442D32403D624B4519E04740481612691B3132403032F8FBC5DF47409A11D8D5E43B32400CC853FB19E047400EFC1274C5463240FC31DF6696DF47406D16F6C5EF4B3240B2B0D82615DF474052D0D8976C5232406F75E107E7DF474077A510B6DD57324056961C6B63E047400C0BBD36705B3240C3DF6D999ADD4740B4076C8434553240356258B4EFDC474034BE29519B453240691CC6EE4CDC4740316451C71941324049EEC62709DD47407A6FEC8FE630324095DBC36F54DD474052297AE063163240AF35A44055DF4740E2BEA15CBF093240D9656B7D91DF474083344690EF073240054C4E9253DF4740BDE76D7DA20232402F9738A8B3DE4740E6A299492F013240A00FEDBEBEDE47406BA19D1DBA0032402E11ADBAB3DE47405292B0B9B4FF3140199B0D9EAEDE4740F9C7D81A5BFF3140BE689A0BB7DE47406684ED71F0FE3140133C97F3D6DE474047F3DEAC1CF93140FAC5C37B0EDF4740181CCF786CF331407D43EE3378DE474060F686A00FE73140FAFD1DF6E7DD4740854D266E15E231408B8FD442C9DD47403F3CE34570DD3140EE64ED0099DD474041E2787764DC3140D18EDF2582DD47407F7E8B9823D93140DC012AC187DD47402FC3B68F26D831403A0341DBC5DD474017FE37AC5FD53140099BF46338DE4740B01B9E149CD43140C20B99863CDE4740FC6C70D86CD331401D3587B542DE4740F8A097D41AD231400B2C33B621DE4740EFC721D1BACE31408A4E6738AFDE4740906EA9A514C93140BA1D53D21EDE474092BD58CE94C4314036588BF447DE4740E60F337E2BC1314033FCF8A644DF474014F1EF8EE7B83140B38D691261DF47400DD021CBDDB63140F78D5940B2DF47400C431E1C47B5314058471273FFDF47401C1F4D17BDB43140A11D8CD827E047408019AF1E9CB2314090354E9E0DE147406BA18092A7B13140311ABC0A84E1474057242F21D5B03140820862EAF8E147401FF331699DB03140D1075B913DE2474081451FF301AD3140A719272AC0E24740E47ACA8C12AB31405DB5C71C15E34740C0CF36267AA93140C157800063E34740E8DEED30DCA73140287DD179E8E34740EDE3F54F26A0314027560E886BE44740E8B80ACE859C31408001B672E5E44740215EE74B149C3140355842D202E547403B1BA8531E9B3140F6DF5916A7E54740CA72465B959A31408B5A40683DE647403E592140E1993140B478A1CA7AE64740056C65E487973140E07076210CE8474009C66427729731400334F0A31AE84740B8687FEA699331402E64A1421AEA4740BB06C078068D3140273CD285FDEC47405D83CD001784314068D5BF907AF04740FE3E32891F7E3140A183A570F3F247404458F87D4972314048C5A75BD1F64740E075ECB13E5F3140B45674907CFC47406A3B1680EB59314028CCE78134FD474088590F4EFA4F3140D28B6A1151FE47404392FA6827453140B09A035F2CFE47401F444A69EC33314009E51B1BCB0348401A977B8159313140344AF95AE10448409F0CF38A4C2B314097B8EDD68D0648402B05961238223140CF5018EF220A4840C7D1927D46203140FAEC8046440C48404588F23E8E20314035E8A4F78D0E484037D64D3ADB213140AEF8BB1C1B104840839E0AA7BB213140424106E1C0104840C5D4ED258D1B31402BDD0D58281148404C5C9E077717314035D3872EA80F4840BE8A916F0011314048FFB1B5630F4840AC158524B30E3140FA3EA31930124840 -AT 0106000020E6100000010000000103000000010000007000000038CCAFF72C192D4064C625D8C91F48404D11C550F32E2D4035A50705A51E48402434C61BF44C2D40818048BF7D184840BE00254FA35A2D40179249FC4017484051785B3343A82D407333C346591A48400A6466D828AB2D40155CA049071B4840379B1D9892AB2D40521577BCC91D48400960B13CFEB92D406A3A003D681F48403A03D58915EB2D40C5B5B9313D1F4840472063FF86F62D403942D1E1C61B4840AB18D11B93262E401685AC133C1B48402A0817D9022F2E40466E8283141A48404C82244795482E407E485C6CFF1D484042CEB216558D2E404533BDC4581F4840AA677C5F5CBA2E407905F29139244840111F59D70DC42E40CB8399000D2F4840D10EEB49AAF82E40C2D58E2CAA364840EC0BCAA65C3D2F40CBF2572316364840607F52488DC82F405FC9DAF005364840038B34BE8AEF2F40E16B984638304840AB04AFF1F4193040677AA5D18930484002D80940ED293040EF6DC1525D3248408929F64D50393040ADC9900832324840C5380ECD864C30409BEC4F87BA304840B269E9C028573040722405604D2D4840EEA86840185D304043BBB612152948401B28885F566B3040B3B2B15C801F4840DC67AC58578230407DCE89986D1748402DD451E6309D3040F514720058134840098225FCF7BD3040A768273916134840D2C72D0840DB30404678561C181348406A10C17119E130406B60BD512B174840389807C1F4EF3040EF8ADEA980194840539814C4E5EF3040AD727E2F2A1D4840DE39331C2AF73040D7BA3B212A1D4840431202F22500314075FBE362B116484027321B2B310D3140A401BFFC04144840BE8A916F0011314048FFB1B5630F48403E0734B67C0B3140BCDB89ED490E4840B459D00F7EF93040984F7AF024114840F9713C0BE7E13040E421ED35F30B48400AC0C7F4DFBA3040D72D15C0390C4840A5F9F818079A3040F240F8AB5B0D484064A45247228730407CD8C68E7C0F484053A8260BA97430409E61ADEB61124840ECA033B3E05730402A19F8F6531A4840F53604E9BD483040B0F2D24D622648404E2A617EB83D30402275B5CB6D2848407CD8E044F4193040FEA53627E52748406C65A2E073F12F4099794375CE274840675023BBD2AE2F40DA02DC3D8A2D48400FEC32DA4F772F406A0C0929892D4840939B8CA7D43F2F406E923F7331304840EF81BD8921FD2E40B9AE986C972E48400FB918366FE52E4033685B72812B48402257C19778DE2E4096EA04D95724484057A2A5530DD12E4018E06E490E2148403E0B7DFA19A42E401CE66E7C921A4840BC242BF86D742E40A53A05AF4C194840D80ACFCEB34B2E40EEEB212B091948401EA57713D7482E40EDEE65474F1548403FA28526E43A2E4098CEEEDAEF13484008700305DE292E40F8EAF81EE4134840F81360FD441A2E409B8E8653E6164840C469B72407182E406026497C93164840EBE5396C6CE82D4030995DF7561748407247300851DB2D405B134BDB091B484056990B3AC6C22D40AA8A0C61EB1A4840E66AD630E8BD2D408BE5C589AF174840F7D4D545C0632D407C6C2FFDA61248408ACF4CF73A3D2D404689A2AC841448405702810129122D400144381C4C1A4840188C5DC4D2CF2C40869EB8D2211D484054BF85D09CAC2C408CA167B3EA1D4840413FF0BF95982C40A4C1CAB271204840D443CD7921902C407C4B647A1D25484056E31C97CC6C2C40ACDA780B7F2548401228605D70392C404E71546EA22448407C004C052A352C4072286F1FE52548406D3982F3F3242C405E7E7D19312648408D0F38A682FD2B407642C5387F2A4840914F00DCD1002C4023E360CA1B2F48400A1B6F5E41EB2B40C519D5E9403248402088CBF10AD82B40498139C489314840EFEBC28CDFBE2B4028C4F1D7BF334840FC37AF230E892B4042BE4E45853A4840CF7E4B5BB76C2B40C6E05F4E1A3F48402C111A8FAF6E2B4023F2E70E393F4840B5CB0CA9A2402B4024B7E9190C4348406CD52181500C2B403EFE8062BF4748408F63FEF08E0C2B4080DD7619CF49484085E59DF1DBDB2A40578D11F21B4C4840290561DADCDD2A4084CBBF4CCA4C484020ACB118D0162B40FFD3C622974C4840639956D11F4A2B402FC2621E43484840F74B32DEFB7C2B40FC09F4D3C9434840D299D906C47A2B401487A18D14434840E13F975FBC852B40E763A6B4FE424840EC5C273974872B40D3188ABCBB404840A0030C6872B52B40C9CFE648353A484095B557B329BE2B40237C336ABE3B48400051907758E22B409B89FC9F683C48407A8492B87DE92B40150F0753DE374840D8070EC3A2012C40E016CDB9CA3748404B2C06FEA61A2C407152572D9F304840FE97572BC9182C404395A13BD22D4840C2EC284B633E2C4070021F285C2A4840831CC32ADE642C40D03558DD8F2C48403C6688E64B992C4023E184F8762B484060C0D4BE6FB22C4000B51666A1294840237723A93BBD2C40330355489E24484038CCAFF72C192D4064C625D8C91F4840 -HR 0106000020E6100000010000000103000000010000004C0000007C884A5CED6933408030B0A6EB9F4640A399029F2D6A334039693E1EE69B46404D6EE45F70523340069A53138E9B464032D53E671C403340CB219EDB3A9D46409F8C4061F5343340F3A69828E79E4640C3646E9CB91C33407719BB44F5A24640FF46814FBD1933408CE84482A9A3464032C519B270143340EE08EAEF00A64640CB41F2182F113340B277DCF0BBA846403D2D503008FF32400676BB5E9AAA4640DE56DEFA55F53240F85AA038DBAD4640494542B687F032403853ECC3D5B14640BF0CAC996BF53240CE14C49B90B44640BF3D9FB767F83240A06BFBB20FB84640788FBE38A7F6324022E1DEA1CDC04640CFA51EB3FD0B3340E21ACDDB22C1464057C84D68ED133340BAEE37DA71C1464005980D7C56033340145B6622B6C34640360F9DF930FC324011910A630BC346400AA53193A8F33240D4C6116BF1C14640B66A1679A3E8324005FFA5FBEFC34640E8664BFB8BDB32407132BE2F2EC74640A1D082F524E132400F40BE2951CD464099F62098FEE232409D3C95D39ED0464069FEE9060AEC3240FF2468DD50D44640AA55B6FE4CEB324017C469D2B7D54640491A7C9A93E53240674DD7135DD746405AA3C28EB5E13240054496163FDA46409481EE5FB4E03240C369F7AB00DB4640CF5D64027EDF3240A654BCDB06DF4640936D664F5DDE32403C7DCE3868E146409B0AE9F010D832408F4FF454E2E24640B40C9EF820D43240D60A372A81E546408CD932CF00D3324021F145C549EC46406C0664F904D032409406F41D57ED4640D9EE083B20CA324017F4328AE5F146400094DD38CECE32403AC5A0B888F34640EB998B1AA7CE3240D63B9AD99DF34640596F9B4E57D23240BC09ADF314F54640FBD833DF1CD33240DCBAF55091F44640041B42959AD33240F7E9A9C42BF44640E743C362D4D33240486001A7D2F34640437ADC1214D432407E12E2CAD9F34640A906259353D73240EE3D624F96F54640CB128CEF30DC3240C4B7489000F1464070A4DD5449DF32402A394206F2ED46402A99A0979BDF32409D9A155113EC464061392CC36EE432404B358012FAE5464082272E8ECAE9324004F50192FAE1464057822B346BEE324003A8902BF5DB4640591C37A1B5FF324059DBF9D923D746401A8C190346FE3240E4864E2A75D3464060AB2E85ACF532407B3274A213D1464073A62CC02DEC32408757169689C94640F73CE60302F932408E85BB0E30C7464084D7193AD1FB3240CFB79388F0C846409F806973F70233401F1A434AFDC846401AE064F95F0B3340F0B997A02BC84640BE56A5F44C173340B1E8BC7CA1C54640802F575062193340810C93043CC4464079CF6A26841D33405E1293814DC346403387E7C7BA1D3340DEAD923424BF4640D26C4D98D5163340560A51CFCCBC46405C832760E0043340D31ABC653DBD4640B20DDEFC2B0633409BE85C514ABA46403E882DA97F0B3340DC023054B4B44640B86830B209093340B2F830C566B24640FDBF7AEDE30033401E59C345EEB04640CF8352D6CA09334092A433D538AF46402B7C0239721A3340DBF875960FAD464040D79E0F85233340687AFF1F27A74640C2316EED8E3A33406A7DAF7CF1A246400B0EE7F2304833406ADC3D40F7A046403B09AB56CB5433403BB06CD564A04640913D80FBF0623340958A99D8D79F46407C884A5CED6933408030B0A6EB9F4640 -BG 0106000020E610000001000000010300000002000000FC000000A8B02017E6E03B40ED669082A75446409379512745F43B406B57009D93544640A5D416E824F33B403DB11C21033246409B65B7F124F33B4054D47416152F4640EF743C2D3F043C4017F26F97FD2E4640F9E1EE737C043C40A5FA7DFFE63546402ADA9EFE58113C40E639A3F7D7354640B84B943AB7113C40DC69E624EF3F4640FFE9F10FB6113C4080CDD94CCF3F46400C3B8CB564FE3B4003A986A2E53F4640D41F4F26C9FE3B400C85752D6B4B4640F8EE7D271CFA3B4087B15758704B464096FA3F3D6CFA3B40A67AF1EAC154464030EC1C5E6BFA3B4092EE7CF5A754464006AAF1C121DA3B40DFE70313C9544640383B88AE55DA3B404944FDD3B25B4640A65BF93DFBC93B40F50133DFC15B464072680586ACCA3B403BD13DEB1A754640E0B02AB121DE3B4058570DD3087546404FBB9BE09BDE3B40263FE76ED7844640940A5A48C0E43B40E007D15AD1844640401F904B1CE53B409FBB41B456904640A9A5BA18AEEE3B40ED93ACDF4C904640BAC0BD326FEF3B406DE1C56757A746405B12770657FA3B4099B6B7B64BA74640DBD5F5B0BCFA3B4080C8A1D9D0B2464061F4BF6DB7023C40BCF71FF4C7B24640526CFC9AF6023C40BA386865B1B94640E6555826B2233C4001EB85F189B94640182037B2E1233C407047478325BE4640BD31D65988373C404F7AA98E0BBE46402F353C6299373C406D4D35B396BF46407189AF1B5B583C408F030AAB67BF4640D7BA1A457B573C407EF0BC9EF9AC464024B6F270A7673C40E14F3DD2E0AC46408A48212466673C40CB69458AB7A74640071D41CF0B883C405FDA430C85A7464048446667D1873C402F1518FC47A346408570295371A83C406A6C3EAE0DA346409EF4614040A83C4089392971C29F4640074E7A956BDC3C40648E49905B9F4640AFED545458DC3C400BADA8C1349E464057DF2D35E7EF3C400034411E0B9E46408B9038BFBCEF3C40E05287269A9B46401E91F9FD51103D40014B9C15519B46401AEF2A4943103D40F4D2109F859A464036FB3905F9713D4067AECFE682994640DAFDEC9117B33D40F36C3E09C798464064653EB4EAB23D404A658FABEC9646407CE7C2ED75D33D40DFB722D687964640551EA32BC7D23D40DFD0B52FA08F464013A8ACC843B23D40AC167BD404904640A2DA7A8670B23D40825EAE34DF9146406582ECAB61713D40E609D0B69A9246400CE2386F49233D40523738BA62934640A1E456ADF1223D401FC37F5FC88E4640C92F63D174363D40DA61F888988E46408F6AD0A4D5353D4046EE4975898646405EE1B06D51563D40C646088F36864640A5648412C1553D40D5C4419D4D7F46400A62A54929903D40BFC090D5AD7E4640CD0252AC648F3D408571709F0B764640FE2C3A92CBAF3D4011471B47AC7546400295A46B26AF3D407477B471C46E4640DCFEAD64C78E3D40650BAB78236F464000E6CBC1228F3D406409E3022B73464044A1C2D842683D400A5474249773464018FA2955A2683D403D78F52A3278464049E1B8533A483D407677F35487784640FAB9A0F7C6483D40017472D06F7F46406C60EAE74D353D40346C09F9A07F4640952B206A91353D401278431A15834640CD754F1E16223D407487299144834640B0261AEE6D223D409D2F478FDF8746401C6102B7EE0E3D402D4D546F0D88464008EC7ECB520F3D40938599B67F8D4640A709A14ACDEE3C4029364F75C88D4640366D804B1FEF3C409686FA25879246408C410E4A98DB3C409217D3A7B092464072B0B673ABDB3C40337B2178D7934640FFD9F35723C83C40FC165B52FF9346409DA816EF6CC83C407ED9CE9C9A984640A0385A7AD9A73C4071433866D9984640F84D9C700AA83C4004F5FAA4249C464036AB256772873C4019ADFCD75E9C4640879661A3AC873C4014F3D5E99BA04640D5422D060F673C40E2F16F86D1A046409354C90050673C4070B0D69AF7A54640394826CFAB463C40DA795B9F28A64640D17F7C75FA463C4041117DE310AD46409C11BED5DF433C40E6798D1315AD464004AE57DB5E443C40769406239BB84640CE2C2D454D373C4017772865ADB84640DD701FA809373C407B080DB386B24640003175C35B0E3C408B320D79BAB246405BE7E225EE0D3C4051D8C06735A7464065EA42739D163C4057480C022BA746403F2C73BA2C163C405BF953E3A59B464025C825C79D023C40F3855AD3BC9B464039CEF38535023C40CAF667AB37904640CF290AD7A3F83B40708D254A42904640E91090F63FF83B40EAAC7D01BD84464027C91F971BF23B40A5AC667EC3844640019E59A6BAF13B406530293E3E794640B742B10408F13B40F3568A2EB96D46401752A4C2D8023C401C8C62B9A56D4640BC59F754A6023C40849BD8530068464060D2B359F5113C403AAB09A2EE674640982EA7CB62123C4045D3A41474734640DC70F5F146163C40AE25D53A6F734640D692A46B26173C40ADC1ADBB798A4640BCC02E8350203C40A5AD40306E8A46409A4F378941203C40FB79AA436E8A46400C2A0C88B5203C4000C2024DF39546408BA796ADF5153C40EE16B7D100964640B165666666163C40A16A6FF085A14640EAD85548F9293C4005AEFA5C6DA14640660642B280293C40CD5A423EE8954640AAC48E8D40343C407F8E45D3D9954640179A9EB0C4333C40A6107008558A464076A2648FA92A3C40712763CE608A4640D93F355EBA293C400B89E59656734640758FEDDCD6253C4029575E805B734640F38C149161253C400CC37762D66746406D88B1D911163C402E048C7FE9674640CD8311C2A3153C407EF62345645C464099DDF4673F023C40EE832A357B5C4640FFB6E86963023C40FEB95B6683604640A406462575EA3B40D28151499D604640D8B01EBE4CEA3B40E026F801A35B4640DEAEFDF8A6FA3B409C50AFA5915B46409986EE377FFA3B406F0EE3DAF55646406D0685E6DF0D3C4014557BC7DF56464031C6D22C750D3C40CFA98D565A4B46406479E51F22123C4019F22AC6544B4640961D2A9EC4113C40AE19DC7B5D414640F05BAAD216253C402852EA81454146407DC113B35E243C404306465ED62E464071E313A1C7143C4088FA2F7CE92E4640DB272B1AC6143C40E382AD6DE52746405AE99C33FD353C40CDFC6FDBAD274640BD0818B897353C40CA685A07AC234640B17848AE51553C40FBA91F402B23464002276C787A553C40E28B37328F244640CF309886E17B3C400C67C22FF52346400837BF9A037C3C40D9708FA50F2546403043AD69DE993C40E0745E63972446402673D8B6289B3C401D7EE882FA2E4640B2D46531B1A93C40AE68C18BBE2E4640ED9747FE60A83C407B351AC05B24464009F44B0EE99D3C40B33E58C6862446400D8C16670C9D3C406EAD4C9DEC1E46403868B7E0567B3C4079E8A969721F464013EEDF617F7A3C40A7F0E9567418464056E3BC38F1793C405D67EB85A7114640950B9964E4A43C400652EDD3F1104640864E546F0DA43C406DDB114E0B0A4640A56FE6DA61853C40A2BE8E49900A4640AAC13E3A75653C4011AF122C0E0B464030EE2A4943663C40F64671E9F311464042D22C09505B3C40EE3459A31E124640452069CB145C3C4045CD9E5FEF184640DD8FC2F528543C401B6B3EAE0D19464083EE659E89543C406ABD8038591C4640C6B10D15E3343C40A1E4A59BC41C464062171F8522353C407F2D9BA1021F46400FA270B354093C4089E5D54D291F4640B2F174BF54093C40B3DCFAFA6B1C4640679FD43CECEE3B4057C83E236C1C464004D2B5D4E6EE3B4053C28256BB1B4640961075690DCF3B404E040F67D91B4640DD06D5720CCF3B40CB3668AF3E174640142DD96784BB3B403E7936AB3E1746405DCF142983BB3B406AA3B44824154640E3D9E209739B3B4055FC7CA53D154640D2FE78AF5A9B3B40F9F85DD89A10464048944AE427883B40535D0718A71046409FEBB53412883B40A66F1E98ED0B464027063763E2743B408558AD4CF80B46406E26E620E8543B40A0FE690F200C46405FC4CCE3D54A3B40B8E87CC2230C4640DB95486936473B407AECD45C6E0C46401F46111956453B40202C2AE2740C4640C96BCD1DFD3B3B4018D889CBF10A4640074212F6ED343B40FA789E78CE0A46402652F014722D3B40D0EBC4E5780B46403D66300DC3273B4093D77C5C1B0C4640AFA997DF691E3B40F462342BDB0D46402615CFA0A1033B40C55DF92CCF0D4640ADF24E88CAE03A407F9A6B98A10A464073616AF063C73A404D8B50B692054640516C0D00B0A53A40E2F13680C80446401464BC9CC86A3A40C43BCC03FD004640E3128E7B4E4F3A40B41033FB3CFD4540FFC3F7205F293A4076B4AED172F64540F7C5A145B61B3A401ACA738E4BF04540B0B2ED4850073A404275931804ED4540FD4560E5D0FA3940B224004922E9454084D26A0F7BEF394031066CBD95E2454094571AF851EB394022D28D0B62E14540DA8D62145FCC3940CBEE21E17BD645401E171A4F049F3940CC802E1A32D04540092A7E8CB98B3940A1272D12C9CC454064D4F6651F7A39400EC7E5D3BECA4540DB6DFF363070394012AF4F94DFCB4540869BB07A76633940869DD5B8EDCA45408E4AC33A9F4B3940A4D1F4238FCD454033233658382F39404C49F08634CE454041C01DB97F18394081EC3378A9D1454021FB3779DBFC38403B4B040539D74540D13493DB9BEE3840BEB8324D7DD745403307E1D1C6BB3840ECF008B831D4454014D6A93CCBBB384022231521D0D6454076EFAE7AC0BC38402878C02B38D84540144D54B99ABC3840312C921BEADE4540C0EAFA6074EE38405F702AAD1AE14540A23B47E4BBFE3840E8C5DA8420E14540445401309E193940C196FAC3E0DD4540101FFDD41D303940497B69E5B9DD45402B3E2619394D3940058B91369FD945402319434AFD62394004F3BA3434D54540A91CAA622A6F3940E64C9F7829D54540092A7E8CB98B39404AC59EE2DDD745400FAEE7A4F79D3940A7F98A6EBDDA4540A1B437BF61CA3940A6160F4AF3E2454004D48BA19CE83940DC1F7AF76CEF454085335E4E64FF394036E16F7B82F745400AD97E32C6193A4063AB2281ABFE454076868EE4F2273A40BA315981C600464051A3F06D554D3A40C53386EFB3064640D1531CCEFC6A3A40D4FB6662BA09464015DEF5775BA63A4015F50071B20D4640F2A718AE0EC63A40D543227E0F1046406A47205ED7DF3A40AC7E34417915464059A215623F033B40BE9C96C4FE154640AFB0A9BA471E3B40AD643909A51546406D79A38FF9343B4051373FFED2124640DF0F0C207C443B4084D98CD3101346404D85D4377A443B40898E96B9AF144640F5871A9650453B40F093302EB01446407470C9CC60453B401ECBA0359A1B4640D737C43F6C653B40C1C4C03A8E1B46401851C52176653B404C3FCCB96F1E4640E39EB98784853B40B931444E5F1E4640428107CDAE853B40C2D86DABB42746405AEADE9BF0983B40875F6397A827464058E28B5132AC3B400BB645E39A274640F9453E9E4CAC3B40A05E5C4F192C4640CADFED7A69CC3B4032D786D4FE2B4640A75FE795A1CC3B4059B4029E0F34464077E03B31EBDF3B404CFDA886FD334640A8B02017E6E03B40ED669082A754464005000000B2E16F20C9DD3B4002B60E5883694640EC5D37A5BCEA3B4005EAB7657669464019BC2F4FDFEA3B40129D1C77BF6D46406FF3EB04EADD3B401CADE28DCC6D4640B2E16F20C9DD3B4002B60E5883694640 -RS 0106000020E61000000100000001030000000100000005010000FD0AC913523E3340F7330FAA1E6C46409D201D1EC2203340507896C5696A4640F09801C2E2053340F7033C69E1674640FDD18CFB45033340DB562BC9F0784640DD530E1C861933403F2A4B74967C4640213FA9F6E93C3340FFCE7D39B37F4640B02FD05A76553340B624039BCE814640C96A88CF427F3340E03C3DA539864640477A083E61A63340B2C0B3983383464034CBFB5AF2D33340FE42B11534754640DBEF748CD0D63340FF997631CD69464073384A97FEE733406469B290CA624640AB8DCD55F30434400C1E296C50634640E2CFD20440253440D22C4E6B89614640829AA07543413440413342E49962464083E9418BB65234402CB06E6182664640CEC75098415C3440408D4BB093684640E4D63F4F03603440EF3311363C6C46402E89659F6C5D3440505F36A6CC6C46407DB8195D945934405DDA9601676D464002A17433ED4834407108037404764640A9E44746184434409DD46542DD7B4640B2BA627FD943344094A393A5D67D4640F23DA1AF6A4434405B78D2C265804640ACA927E2634A34401F1C3F9EA78146400030396BA64F34401EC8444AB3814640715279E008553440EDB5FBB0398346408C8DF62E94503440314284C99E884640757851F4C04934400B5E46B1DC8946400C0E2769FE443440AC0E11ED198D4640F86A5B00BF433440B6F598A3228F4640E134AD14022F34405EF3CCDC8D9446404C19DB5A15133440C49B994F0C9446405168A1BF2B0334405CDC088B8A934640EC445F7AFBF33340BFC900F50B9646406DB5CE5378F13340C93F9468C996464064B26E17F5EC3340E8A9459FEA97464014D146BFC7E23340331F662FDB9D4640EA5CDEC1F4DC334072BACB8F099C4640E80445F300D23340982F7F85CC9A464017AA531EDDB833409DF14C68929A4640C9D17AE7069D3340BB2AE395DA99464015BA642D4F8F3340FCEEDC7BB89946401E085669E68A33402852C7BEBF9B4640CF2CC48FD687334002F7C841649D464094A0F9E648703340235C0BC4FC9B46404D6EE45F70523340069A53138E9B464032D53E671C403340CB219EDB3A9D46409F8C4061F5343340F3A69828E79E4640C3646E9CB91C33407719BB44F5A24640FF46814FBD1933408CE84482A9A3464032C519B270143340EE08EAEF00A64640CB41F2182F113340B277DCF0BBA846403D2D503008FF32400676BB5E9AAA4640DE56DEFA55F53240F85AA038DBAD4640494542B687F032403853ECC3D5B14640BF0CAC996BF53240CE14C49B90B44640BF3D9FB767F83240A06BFBB20FB84640788FBE38A7F6324022E1DEA1CDC04640CFA51EB3FD0B3340E21ACDDB22C1464057C84D68ED133340BAEE37DA71C1464005980D7C56033340145B6622B6C34640360F9DF930FC324011910A630BC346400AA53193A8F33240D4C6116BF1C14640B66A1679A3E8324005FFA5FBEFC34640E8664BFB8BDB32407132BE2F2EC74640A1D082F524E132400F40BE2951CD464099F62098FEE232409D3C95D39ED0464069FEE9060AEC3240FF2468DD50D44640AA55B6FE4CEB324017C469D2B7D54640491A7C9A93E53240674DD7135DD746405AA3C28EB5E13240054496163FDA46409481EE5FB4E03240C369F7AB00DB4640CF5D64027EDF3240A654BCDB06DF4640936D664F5DDE32403C7DCE3868E146409B0AE9F010D832408F4FF454E2E24640B40C9EF820D43240D60A372A81E546408CD932CF00D3324021F145C549EC46406C0664F904D032409406F41D57ED4640D9EE083B20CA324017F4328AE5F146400094DD38CECE32403AC5A0B888F34640EB998B1AA7CE3240D63B9AD99DF34640596F9B4E57D23240BC09ADF314F54640FBD833DF1CD33240DCBAF55091F44640041B42959AD33240F7E9A9C42BF44640E743C362D4D33240486001A7D2F34640437ADC1214D432407E12E2CAD9F34640A906259353D73240EE3D624F96F54640CB128CEF30DC3240C4B7489000F1464070A4DD5449DF32402A394206F2ED46402A99A0979BDF32409D9A155113EC464061392CC36EE432404B358012FAE5464082272E8ECAE9324004F50192FAE1464057822B346BEE324003A8902BF5DB4640591C37A1B5FF324059DBF9D923D746401A8C190346FE3240E4864E2A75D3464060AB2E85ACF532407B3274A213D1464073A62CC02DEC32408757169689C94640F73CE60302F932408E85BB0E30C7464084D7193AD1FB3240CFB79388F0C846409F806973F70233401F1A434AFDC846401AE064F95F0B3340F0B997A02BC84640BE56A5F44C173340B1E8BC7CA1C54640802F575062193340810C93043CC4464079CF6A26841D33405E1293814DC346403387E7C7BA1D3340DEAD923424BF4640D26C4D98D5163340560A51CFCCBC46405C832760E0043340D31ABC653DBD4640B20DDEFC2B0633409BE85C514ABA46403E882DA97F0B3340DC023054B4B44640B86830B209093340B2F830C566B24640FDBF7AEDE30033401E59C345EEB04640CF8352D6CA09334092A433D538AF46402B7C0239721A3340DBF875960FAD464040D79E0F85233340687AFF1F27A74640C2316EED8E3A33406A7DAF7CF1A246400B0EE7F2304833406ADC3D40F7A046403B09AB56CB5433403BB06CD564A04640913D80FBF0623340958A99D8D79F4640325D634D1B6E334077BEFE7FF79F4640C2C3E86FF883334017ED331DF0A14640B05C5095A58C3340BC1785B8CDA14640A1B8B6A62F923340BCB181CF6AA04640C9CE1F1D6899334059794265B29D46407DE297665FA633409BA3F77C839E464005906BE80BB23340FBE1804C219F4640082A9EFD92BA3340669F96D52A9F4640CB6A156987D43340BCC7E1DDDB9F4640FA6560E465CF3340911299034EA44640BA00A9E1B6DD3340A545937A05A44640A28C4358E8EA33409551D037B3A24640922CEBC550EE3340B6E91A2D07A14640694602EBDDFC3340FD74D602D69A46401E5B5D98960634407C1AE3C3EC9746408B8B0354DD123440768E9AC0BE974640A97391312D3234408550B17B3C9A4640824B7F07502F34407F1ECBCC169F464063044697371F344068F7B3588AB44640C3C63B8732FC3340DE06E92972C646405810047E43FF3340AB0DEDF71FD34640E1EA1C03B20F34405DB69C4B71E146408DD3807A330A34401B17A58460F3464054B03E1EFA023440A038D73043054740D6779BA333FF3340A525A314BE1647401EC208E1D1283440A525A314BE16474048A65945242934405EDB1A22B8FF464045735078BF2A3440FE553F259DF446401393313ECC3234400E20B58993E14640D6E49C11A5313440A6723271ABD2464093F72BF8C8233440F0E5B3F281C64640437A84D382473440D4768F6CAEB44640568EFFC9DF513440FC3C2B69C5A3464007821A74F8583440F9892A57D38B464008A2D755375F3440EEACA12F188846408053A8DA13633440DED154AA9F83464021C07BFDFF5E3440654DD477238046408ACF3F9F6D503440F194C217817C4640DFED84B938533440EAD339F537794640B84DB3ACA056344026AAAE32097946403C2F1785B86734406AD9B7A4B47046405994D7118782344091EEB787CE6E4640769F5D52109F344058E3897B877046407A0F8F30B1AC3440D2F9287EE76D46402599B0694AA73440023D343D72664640639FB525BCA83440766A914836634640A928C8CF46B6344075658412C15C46406CAD0E14D3BC344006A5D6FB8D59464056853D2652C63440E8BCF0EFD85646403C0E36F22FD0344074DD61C90B56464014220791B1DD34406861B197B7564640857686E28EE934401AEFE824005946406163D8CD31FB34408D379435455D46406045EC134009354035AB9564785E464011B85807F6163540F1A0B140055F464082275B24ED22354053D9D7BAD46046402C0EE93A9E2A354015C41A78FF63464094151BC9A43E35408737408422694640F4C5A1C8A43E35406C942E47D96B4640F5123DACFF5C3540714D1652D96B4640189E0A4C025D354019347D76C06D4640080F12C4D4893540EF661591BC6D46400C3F092241A53540D9E570523D674640A2E6C9FCA3AB35405F79D1B249624640232DF84553B73540A6E7C4C3205F4640D35118004FD335408A368584DE5D46408C3CA23149073640E90282397A584640FF1DCC81790B364091B26E17F5554640DFE8260FB01136408CCC51DBE15446405AF4081AB0113640D6B6E780054F4640EAF427CF61273640746BE0FDA74E4640A7AA85FEAE3A364001DEF98F96564640B40F1A0B54443640C3A424DA44604640EC0B11154F7A3640EA38341B1A60464072AF49A6F98F3640EA38341B1A604640F6BCEF294AB136402BB11B5B745A4640FB0927FD18AA3640C3F7C500E4504640406495C107B53640DB84D8AA6E4F4640D52D642B1ECD3640DB84D8AA6E4F46407FAD112D1ECD3640CCE8FEFB9D3D4640CDAFE7B523A63640E45861E93238464012013C1F549236408C784265B234464017C3BE9D449236404CE6F9D3462E464052EC9F85A9B83640AE3E98254B2E46405127500EB0B836408700A5FCFF1E4640E6AC4B8DD0AF3640D06C663E311C4640AA6E1F5E7CA436401B11487831194640125A38B5D8883640E807556AF6194640947FB4B5747B3640FD3DE834662846408EB0F7657A6B3640BA4E041665344640850A3DAC816B364043C90AD9D43E464023C73E33FB8336407BAEE0D10E414640D5DCA63FFB833640407314C5504B4640276BADE5847D3640A62160BE06524640E2E3E98486743640726EDEDD6F524640F8FD96B66E553640DDE3A5400B524640DC7B163A65543640B72AB7FEA74E464033DE21591B4E3640D53C201A273E464009E2EFCD253B3640809D41E8453D46403323C429CE3436403CC513419C3746406997D4F83B0636409A083D409C3746400E5B9C7B59003640D2CEB4B39E424640D66959BE2EFB3540CA79AC74D2444640D18B9E4ABCEC35409A2720819A4C4640C242C02154D5354052060D47A14E46407A8F3AA693A13540EB12DA28A14E4640EB9A7C5814913540B17DDB1324574640B60DA672248B3540B97DD0B3595A4640EED28F86538635406344FC68DD5B464074D7CE8B6E5A3540A16C7AAB095E4640CD5BFF756E5A35401091E67E3D6246409E454FCAA43E354093CF0F7E3D624640165609AAA12C35404A9A8697965C4640AA70D65D8F263540C9854C8D2B5A4640C24B95EF19213540FFEA2B595F59464066B448B8351E3540A184DF97445946409DB092342407354090D73FF4495946401B352CFCCFFC3440B7F9B1930B594640C92D31CF4AF2344054F2F2CF67554640D7AB401CDAEE3440EFD382177D54464095F53F1B14E23440CDB84379D55246400D6A183E22D0344052166987645246407A751563AAC23440E8BF85860F534640A60D4757E9B8344014C9F5A56D544640349B72F15CB434405ADBACFA5C564640AF2BCF17D6A034404B53910A635E46406290CE2CAE9A3440105A40683D624640110A24AB6C9934403246EF0A33674640709A7CD525883440A082680822684640AE5ECFB5D47E34409C2B5E76996646401202AB121B6C34401306A8041F5A4640905191AFA94E34406D60ED83875046403D2E17B83C243440C7EC66463F504640CC10BF0754063440C270B32E244C4640C44728113CDD3340BCE7316F7A4E4640D5908BD6F6C1334071A02EADE1554640EB03D53F88A63340AABE65040A5846407F15110F729E3340DFF08AE07F69464077743E3C4B8E334065281197D26B46401629115E717B3340A9BD1AFBED6E4640224BB7369E633340F07931EFCC6C4640FD0AC913523E3340F7330FAA1E6C4640 -\. - -UPDATE users.responsibility_areas - SET area = ST_Multi(CAST(ST_Buffer(area, 10) AS geometry));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/demo-data/stretches.sql Fri Sep 20 15:35:16 2019 +0200 @@ -0,0 +1,27 @@ +-- This is Free Software under GNU Affero General Public License v >= 3.0 +-- without warranty, see README.md and license for details. + +-- SPDX-License-Identifier: AGPL-3.0-or-later +-- License-Filename: LICENSES/AGPL-3.0.txt + +-- Copyright (C) 2019 by via donau +-- – Österreichische Wasserstraßen-Gesellschaft mbH +-- Software engineering by Intevation GmbH + +-- Author(s): +-- * Sascha Wilde <sascha.wilde@intevation.de> + +COPY users.stretches (name, stretch, area, objnam, nobjnam, date_info, source_organization, staging_done) FROM stdin; +BG_stretch_1 ["(RO,XXX,00001,00000,0)","(BG,XXX,00001,00000,6100)") 0106000020E610000001000000010300000003000000C30300008F5321D3DDE03B4072C9B38AA75446408EC53C00DEE03B401272DB1DA8544640C189ED7CDEE03B400A580BABA854464059F16844DFE03B403D7DD62CA95446409D80044FE0E03B402BFA3F9EA95446405D598192E1E03B403110ECFAA95446406A067102E3E03B40480A4B3FAA544640A0C8AF90E4E03B407446BC68AA5446402CB2EF2DE6E03B403B0FA875AA5446405936174045F43B40DEED13909654464021A769DC46F43B40EF39D87F965446404BF8EF6748F43B4062D33753965446404B0177D349F43B4025C3E90B965446402E6406114BF43B401888ABAC9554464009FE69144CF43B40B8212639955446401BF6A9D34CF43B40C80DCAB59454464087CE6C474DF43B40999BA32794544640E0B13F6B4DF43B402C422994935446409C6069222DF33B404518BD1C033246401AD92D2B2DF33B405A32B6FE172F46401490210E37043C4088AE2596002F4640FC50B43874043C40A101E008E7354640E1754D6674043C4082BE019CE735464092F620E374043C4090B11F29E83546405CCC62AA75043C40EA8ACDAAE835464086AE6AB476043C401C810F1CE93546403967FFF677043C407A588B78E93546408667BB6579043C401935B3BCE935464011BD86F27A043C401492E8E5E93546407DB9218E7C043C40440696F2E9354640957FEDDE50113C4087F791F4DA354640432803B7AD113C404C60A763CC3F4640365CE49B64FE3B406CDA6FAFE23F4640FC1CBC0063FE3B4040A0BCBFE23F4640342D5D7661FE3B4029896DECE23F4640C452EF0B60FE3B40EAEACA33E33F4640721760CF5EFE3B408BB11693E33F4640D2C3D9CC5DFE3B40405AA706E43F464043B14B0E5DFE3B4061FA0B8AE43F4640928C089B5CFE3B4044F03718E53F4640A04A7E775CFE3B40DA8FB4ABE53F464017613BCBC0FE3B40B1E69643684B4640B6A8310E1CFA3B40E0F842656D4B4640A42564721AFA3B40609E88756D4B46405ECA62E718FA3B40A59E32A26D4B4640EF9D5B7C17FA3B40149389E96D4B46407511423F16FA3B4052A6CF486E4B4640E0C0453C15FA3B40E28C5BBC6E4B46407D905A7D14FA3B40FA89BC3F6F4B4640BFC2D60914FA3B40981EE6CD6F4B4640A3C92AE613FA3B40F1B46161704B4640F793680063FA3B409DC17A0BA554464023EED2AB21DA3B4085EDEA1FC6544640B4AE6D0F20DA3B404C73F72FC6544640C228BB831EDA3B407DB06A5CC6544640AF32F0171DDA3B4026598FA3C65446401CC407DA1BDA3B40AF86A902C7544640986C39D61ADA3B40599D1176C7544640EB2281161ADA3B40904058F9C75446407E0B3DA219DA3B406DF47187C854464023FCE47D19DA3B4035BFE81AC9544640C66255524DDA3B40F242CEE8AF5B46407BA37429FBC93B402FD318ECBE5B46401BB5A28CF9C93B40DC7B08FCBE5B46409BEC7700F8C93B4034056028BF5B46403DC02D94F6C93B40B9336B6FBF5B4640D70BC455F5C93B405A1B6FCEBF5B46405B577751F4C93B403DFBC441C05B46403E754891F3C93B40C829FEC4C05B464004199A1CF3C93B4036AF0F53C15B4640332EE8F7F2C93B4000E283E6C15B46403B9FB138A4CA3B40B3989BF21A7546404C7C9365A4CA3B40CD2FC6851B75464001A668E2A4CA3B40DA7F00131C754640D90765AAA5CA3B40A024DD941C754640C831D9B5A6CA3B40CC8A5E061D75464060F37DFAA7CA3B40C90828631D7546402279D96BA9CA3B4079C8A8A71D7546405209BAFBAACA3B40D2DB3ED11D754640BAA8C19AACCA3B40FD2251DE1D75464065599F7A19DE3B4067BA2FCE0B754640B0E4C68E93DE3B400ED50277D78446401DD929BC93DE3B40A2A1280AD8844640DEE8A73994DE3B4047025797D8844640D27A6E0295DE3B403F002119D98446408D4EC60E96DE3B4074B8898AD9844640D2645F5497DE3B40B56D35E7D98446402474B6C698DE3B40B969942BDA844640570390579ADE3B40C8060655DA844640166F84F79BDE3B407389F261DA84464092B3090EB8E43B40F4523356D484464080FA67F613E53B40D5F69CBC569046409276002414E53B408629C14F57904640943CD3A114E53B40E583EBDC57904640EA690A6B15E53B40C72DAF5E589046406A5DEA7716E53B40F6790FD05890464062CB1DBE17E53B40DCF6B02C59904640F1661B3119E53B40CD4C0471599046409738A1C21AE53B404644699A599046407FE440631CE53B409B9B48A7599046401D3034DCA5EE3B408F586DDB4F9046407BF5E0D666EF3B4032C5887057A746403CF9D60467EF3B409A78A80358A746405FAC448367EF3B40D896CA9058A7464046474E4D68EF3B40B2A9821259A74640CC2A305B69EF3B409585D48359A74640F9418BA26AEF3B408D5465E059A74640620ACB166CEF3B40286EA6245AA746408A57A1A96DEF3B407B56F84D5AA746407E0F934B6FEF3B40568CC45A5AA74640D9BE9AC44EFA3B40BCFDDCB24EA746401FA1BE51B4FA3B40BC38D2E2D0B24640D5C00380B4FA3B401CAEEE75D1B24640A272DEFEB4FA3B40AD790903D2B246409CBF6EC9B5FA3B40576EB684D2B246400DDDEBD7B6FA3B40DECEF9F5D2B24640F1C0F01FB8FA3B40B2547952D3B24640E764E294B9FA3B401A02A796D3B2464082C96B28BBFA3B40C71AE4BFD3B2464002F60ACBBCFA3B4096EA9ACCD3B2464068807A29AF023C40091292F0CAB2464059E4C139EE023C4055FFE76EB1B94640C12E3E68EE023C403B440202B2B946400FCB61E7EE023C401BE7178FB2B94640FFF349B2EF023C4077ECBC10B3B94640E17C2AC1F0023C401CE4F581B3B9464075879A09F2023C40FCEC68DEB3B946408EECFA7EF3023C4075838822B4B946402C68F212F5023C405375B64BB4B9464040C3FAB5F6023C4024A35D58B4B94640DE4FA6E3A9233C40F35626EF8CB94640C3CDC14FD9233C40AA81FD8D25BE46403437F17ED9233C400A09102126BE46407636CDFED9233C40594B12AE26BE46407AEF6BCADA233C40D40A992F27BE46403D30FAD9DB233C405000AAA027BE4640BA6B0823DD233C409BD3ECFC27BE46406D64F198DE233C40D0DAD54028BE46405594562DE0233C4009FCC86928BE46408F8AADD0E1233C40365A337628BE46401896FE1780373C404267FF8C0EBE4640ED9F68FF90373C40B04FA7BE96BF46400A2E022F91373C407FD9B45197BF4640F59347AF91373C40761DABDE97BF464029ED4A7B92373C40BA581F6098BF4640C730358B93373C40D1FE17D198BF46400E5293D494373C409CAA3D2D99BF4640EA0CBD4A96373C4040D4057199BF4640456B51DF97373C4085A7D59999BF46402B3AC48299373C4023A41BA699BF46406A73A23F5B583C40E4BBE69D6ABF4640DDEEBCE15C583C400E3EEE8C6ABF4640A07464725E583C40D5689A5F6ABF4640D46333E25F583C40862AA9176ABF46403640072361583C409947DEB769BF4640F1C08B2862583C408127E84369BF46400B1CB4E862583C405B9D3BC068BF46402DE51D5C63583C405010E83168BF464004B3597E63583C407FB3659E67BF4640AD9C01C683573C409A2B1785FCAC46408E792A96A7673C406A521AC5E3AC4640B98F2E37A9673C400E8B09B4E3AC46402B90BDC6AA673C4006CB9D86E3AC46403F557C35AC673C40A8F4953EE3AC4640FA915275AD673C4073B8B6DEE2AC4640677FF579AE673C407258AF6AE2AC4640CECC6039AF673C40AA67F5E6E1AC4640082D39ACAF673C405DEA9858E1AC464046B714CEAF673C40DE8612C5E0AC4640BB6B0EA56E673C400469CF70BAA74640835E95F50B883C40F0FF1AFF87A74640954286960D883C40D8F5F0ED87A746406B00F2250F883C401AA363C087A7464045A7799410883C40AACA337887A74640FD4E02D411883C40DD94281887A74640840D40D812883C405B31F4A386A74640EA1A2F9713883C40736D0F2086A74640767A760914883C40FEA58D9185A74640E25CB02A14883C406AC6EAFD84A746402B4E30EAD9873C4075FC97E04AA346403026217F71A83C40F1F606A110A346401DA2621F73A83C4039037F8F10A34640D17AF4AD74A83C40A50FA26110A346402999851B76A83C40A34E331910A34640DD94095A77A83C401456FBB80FA34640E5E9425D78A83C40D1BCAC440FA34640AB633B1B79A83C4030BABFC00EA34640691DA68C79A83C402F2D46320EA34640A85327AD79A83C401BBCB99E0DA346408B164FC548A83C40AB957054C59F46404DF1C6C66BDC3C405203FE825E9F464093F5AC666DDC3C4099F417715E9F4640545BB2F46EDC3C40D537E1425E9F4640A4678B6170DC3C40DB7320FA5D9F464072BC329F71DC3C401C67A1995D9F4640E74873A172DC3C40056619255D9F4640CC61605E73DC3C406DDF02A15C9F46404D64B7CE73DC3C40EA4D71125C9F4640BD2227EE73DC3C407347DF7E5B9F46403A0FF4DD60DC3C403EB1F4A2379E4640A1587A68E7EF3C40077BED100E9E4640CA7C3E08E9EF3C408D27E4FE0D9E4640C6A60F96EAEF3C4078D58BD00D9E4640B51FA402ECEF3C40C175AC870D9E4640242EF93FEDEF3C4091F312270D9E464067ECDC41EEEF3C4020A775B20C9E4640AE4166FEEEEF3C4022D04F2E0C9E4640AE61566EEFEF3C40197FB59F0B9E46408013608DEFEF3C404A9F210C0B9E46408269F449C5EF3C4055E817079D9B46407779953452103D40B05B3A08549B4640A57C17D453103D400EADF6F5539B4640EAA6886155103D40FE0767C7539B46407213A3CD56103D40D079557E539B46404CD8680A58103D4033D5901D539B46403FACAD0B59103D408912D1A8529B4640A8A78EC759103D40AEBA9224529B46405986D3365A103D4007C4EA95519B4640A2AD35555A103D4007945402519B4640239AA2D64B103D4082AB637D889A4640C5814E47F9713D4084A237D98599464096F94CD917B33D40E5DD83FBC998464062B1277819B33D40FB6519E8C9984640D6EA52041BB33D40557E71B8C9984640072B956E1CB33D40D4FC606EC9984640F59202A91DB33D40A185C00CC9984640E4D485A71EB33D40B58A5097C89846400A1457601FB33D40FE629412C8984640FC1C5CCC1FB33D4026E4A583C798464093446EE71FB33D40D63303F0C698464025758650F3B23D4041D19C84EF9646402A146E3876D33D40422954C88A964640D1C00CD777D33D40697DAFB48A96464071D0DD6279D33D40F959D0848A964640293AABCC7AD33D40CDB48D3A8A964640E9978D067CD33D403C20C2D889964640EBEF74047DD33D40A5B72F63899646400E609FBC7DD33D4025265BDE88964640B11BF9277ED33D403A335F4F889646408D0B62427ED33D40B28ABABB87964640D4C7407ECFD23D408F455A15A08F46400F84C946CFD23D4077BEB8829F8F46408C1993BFCED23D40D311BDF69E8F464025C2CFEDCDD23D40D363C8769E8F464058228FD9CCD23D408B85C5079E8F4640F6FA6E8DCBD23D40DB94F8AD9D8F4640FBB73216CAD23D407D04D56C9D8F464027E04582C8D23D40C9A8DB469D8F46407B382EE1C6D23D406417823D9D8F4640DB9A8E8143B23D403ACD32E2019046408EF931E341B23D40814B9AF501904640F96C7D5740B23D407E723F2502904640B7DBA5ED3EB23D4038884D6F029046401D0993B33DB23D405F01ECD002904640F4C856B53CB23D40A2805A46039046401942B6FC3BB23D4075BE15CB039046401DD0C9903BB23D408FEE035A04904640A935B7753BB23D401BEEA6ED049046402B96D1EB67B23D407005965BDC9146409790866B61713D4067CE61C497924640C021CA8B51233D400145B7B35F9346408D77F538FA223D4093EA093ECB8E4640D2160C0C75363D404E42867B9B8E46400A17ADAA76363D40244DFA689B8E46404DD81E3778363D401F08273A9B8E4640F8F225A279363D407A05D9F09A8E46409CAFCFDD7A363D40B44AE18F9A8E46409A38FBDD7B363D408E9CF91A9A8E46400DE5D0987C363D40BBD99F96998E4640C30723077D363D40C1CCE907998E4640FC89B4247D363D408A275374988E4640D216EB2FDE353D405C5339538C864640F5A73BAB51563D400550888139864640058E5A4953563D40BB3BC76E39864640A89031D554563D401B6BBF3F398646404E278A3F56563D40DE953FF6388646405E53777A57563D409CDE1A953886464025A3DE7958563D4016080D20388646406046EF3359563D409FB9959B37864640A1A082A159563D40563CCC0C378646408FA362BE59563D4094642D79368646402A61B79EC9553D4075F9197A507F46401615AE8C29903D40BF04F3C7B07E46401E00362A2B903D40DADDCFB4B07E4640B49545B52C903D403B906A85B07E464027CAAD1E2E903D40D670953BB07E46408BB28A582F903D40DEF126DAAF7E4640FF2FCC5630903D401DB7DD64AF7E4640F49FAC0F31903D40A8BD3BE0AE7E4640BF01117C31903D409C015A51AE7E46406FDFCE9731903D403156B6BDAD7E46403356FD3A6D8F3D40539A027A0E764640FB2897D8CBAF3D40960E6C39AF754640F8778275CDAF3D400EAC0C26AF75464015ACDAFFCEAF3D406C126EF6AE754640F5BE7768D0AF3D4040CB64ACAE754640EA8D7DA1D1AF3D40384BC94AAE754640E338E49ED2AF3D40A2F25BD5AD754640DE81EE56D3AF3D400424A050AD754640F99F89C2D3AF3D4007DCAFC1AC75464095D792DDD3AF3D40857F092EAC754640706902B52EAF3D40B0A9AE58C46E46400412877E2EAF3D40B1ED03C6C36E4640758FA1F82DAF3D40A9F6F139C36E464045EC76282DAF3D406884DAB9C26E464082B906162CAF3D40CB83A94AC26E46403B62DCCB2AAF3D400FA6A4F0C16E46409B73A75629AF3D40315B41AFC16E4640A5D5BEC427AF3D40C5CC0289C16E464021C0932526AF3D40CE27617FC16E464018FDE821C78E3D404E4D4486206F464098994585C58E3D4024D96499206F4640338D0EFBC38E3D40F6EEC6C8206F464001136A92C28E3D40D4689812216F46401B1F3459C18E3D4025100374216F46408306765BC08E3D40F58548E9216F46407215F0A2BF8E3D402117E76D226F4640C9A0B936BF8E3D403F12C6FC226F46409342FB1ABF8E3D40EDEA6790236F4640973D13341A8F3D40F929432828734640A553D49942683D4079CCF8319473464073AF0CFD40683D40381DD0449473464095C387723F683D40E376E47394734640CE6E6A093E683D40443567BD94734640184E91CF3C683D40FBF7851E95734640318508D13B683D40035D869395734640505B95173B683D4038A3EA17967346403D3756AA3A683D409CCC9DA69673464059AA7C8D3A683D40028F253A97734640DE8076CB99683D402066DC4E2F784640241AF5173A483D405F0668628478464037C68D7A38483D40A1EF0B7584784640CDDB55EF36483D40EA4AF8A38478464024D67D8535483D40F26C5FED84784640CAD3ED4A34483D4046236F4E8578464083C3BC4B33483D40C7756CC385784640B971B99132483D403D5AD84786784640F7080A2432483D403EF19BD686784640A8BAE50632483D40CB983A6A87784640ED16BA6CBE483D4064393DF36C7F464008F8CAAD4D353D40888876069E7F46408F0B06104C353D4072B0FA189E7F4640D90662844A353D403BC2C5479E7F4640A4EA111A49353D40988B0B919E7F46401FF400DF47353D409B6FFBF19E7F4640D4B949DF46353D40A215DC669F7F4640FA21BF2446353D40230930EB9F7F4640E8C48BB645353D4014E2E179A07F4640DD71EB9845353D40D243760DA17F4640F3B57DE088353D403B894B3C12834640294631E615223D40EEC48D9E41834640D96C164814223D409089EFB0418346405AAA0DBC12223D4073629CDF41834640EF364F5111223D40E01DC92842834640BAC8CB1510223D409ED5A58942834640B56EA3150F223D40469979FE428346409E46AE5A0E223D404F0DC7824383464092A31BEC0D223D406896781144834640175E2BCE0D223D40CA5E12A544834640E722606465223D409E449AB0DC874640AC3EC680EE0E3D40D096B07C0A88464032D45CE2EC0E3D409621F08E0A8846401F8EF555EB0E3D402DAE7BBD0A88464011E7CBEAE90E3D40AD5D89060B8846405A5CD4AEE80E3D40E48C4A670B884640202733AEE70E3D409F7107DC0B88464051CCC4F2E60E3D4071AD43600C8846403E1ABD83E60E3D40506EEAEE0C884640514E6065E60E3D40E56A80820D884640ED690F424A0F3D4047092ED77C8D464092CFB417CDEE3C40570C9E82C58D46409379DC78CBEE3C4082C8A294C58D46405D3FEAEBC9EE3C401CC1F6C2C58D4640D1301F80C8EE3C40AA32D20BC68D46402B387643C7EE3C40C55C686CC68D4640BD911A42C6EE3C403A0D03E1C68D4640F414F085C5EE3C40C3232765C78D464066E83116C5EE3C401DA7C0F3C78D4640195E2BF7C4EE3C40BFB95487C88D4640FB4EABC316EF3C40BE5B5B45849246408BBF021998DB3C402AEB1AB5AD924640828BD47996DB3C407E0DFEC6AD924640DC567DEC94DB3C40431532F5AD924640A620428093DB3C40A377F03DAE9246400A2F224392DB3C40948F6D9EAE924640BE5B4D4191DB3C402E1EF412AF924640342FAC8490DB3C4035C50997AF92464024667E1490DB3C40D1149B25B09246407DA013F58FDB3C40437B2DB9B092464055C455EDA2DB3C40A898C596D4934640F617E52823C83C40351C9B5FFC93464076B6958921C83C40B61D5B71FC9346400F0B0BFC1FC83C40C1A66D9FFC934640C00C8C8F1EC83C4047760DE8FC9346406B9A1A521DC83C4074147048FD934640BCADE94F1CC83C406A47E1BCFD934640B157E5921BC83C40B283E740FE934640712351221BC83C40ECF16FCFFE934640DE9F80021BC83C4086580063FF934640EF20286964C83C4004FDBABA97984640BE99914ED9A73C40A1C86C73D698464069D1E3AED7A73C4023B0F284D69846401736DE20D6A73C40A8DECDB2D69846405282CCB3D4A73C4085323BFBD69846408E41B675D3A73C40B322725BD7984640DCCAD472D2A73C409920C0CFD798464093FE1AB5D1A73C402BF8AC53D8984640DF65D343D1A73C407EC826E2D89846405A775823D1A73C4034E4B375D99846401610CAEC01A83C4061C1AEC1219C464062EDAA3E72873C401E4026E55B9C4640126AB39E70873C4056A371F65B9C4640A85C46106F873C408FE714245C9C4640F86FB3A26D873C404C124F6C5C9C4640201E07646C873C40849359CC5C9C4640077B80606B873C40089483405D9C4640D9B918A26A873C409C4456C45D9C4640A80E21306A873C40BAC8C0525E9C46408CB1FA0E6A873C40D90C4AE65E9C4640D3046E21A4873C40F399520599A04640B10F00E10E673C4052C38F93CEA046400A2EB1400D673C40B4A5A0A4CEA0464022A0CFB10B673C40AD090CD2CEA04640808BAF430A673C40601A131ACFA046406DD7620409673C406A3EF179CFA0464019C22E0008673C40E752F7EDCFA046406429134107673C40D5E9AF71D0A04640E92A68CE06673C404A270B00D1A0464019E395AC06673C40D28D9093D1A0464009846F8047673C4073001DB5F4A546408BEB47ADAB463C4023B672AC25A6464049879F0CAA463C40932C48BD25A646404C79467DA8463C40C14D79EA25A6464086B5940EA7463C40C098493226A64640B803A1CEA5463C4033B3F69126A64640AF6BB6C9A4463C40D48CD30527A64640584BDB09A4463C40A8876C8927A64640E2BB6E96A3463C400041B31728A64640E30FE073A3463C40F94C30AB28A64640466C89F6F1463C404B0EEDFB0DAD4640A0ABE4B5DF433C40AE41A32012AD4640881EAE14DE433C405ECA563112AD4640BFE7BA84DC433C40294C6B5E12AD4640DF0A6B15DB433C40F12125A612AD46406259DDD4D9433C40156CC20513AD4640837C64CFD8433C400333967913AD464064AF0D0FD8433C4073932CFD13AD4640E6D23D9BD7433C403F90768B14AD4640DAA86878D7433C40ACDAFB1E15AD46408C9F0C5A56443C402AE7113C98B8464012B57E8555373C4048FBC866AAB84640B763150712373C400463A5A786B24640685897D711373C40D7E2961486B246400967925711373C40E14F9F8785B246402403F28B10373C40057A290685B24640F96E897C0F373C402FFD2E9584B2464053BFC6330E373C40D54F073984B246408A3F4CBE0C373C40AF0C3DF583B246402C27742A0B373C40D41B6BCC83B24640FE67C38709373C40D81123C083B246409A197706640E3C4082C32F7CB7B246400BDAA19DF60D3C408869DF5038A746404B7212909D163C405BF701F52DA74640CD54F8309F163C406C6184E42DA74640AD0BBDC0A0163C40DD47A5B72DA746406D690330A2163C4032241E702DA74640E9F2AD70A3163C4027B3AE102DA746404BBF6976A4163C40CFE8019D2CA7464011B82737A5163C4070DA89192CA7464023907FABA5163C403E01548B2BA7464059A4F8CEA5163C404D84D7F72AA74640E9F34A9D6E163C405D3093D988A14640B2510B67F9293C4097F3EC4F70A14640A8B29407FB293C40AD444D3F70A146406079ED96FC293C4090FF4C1270A146402E57BC05FE293C4026ECA6CA6FA146403E27E845FF293C4051041C6B6FA1464079A6224B002A3C405E5B58F76EA14640F387610B012A3C403AFCCE736EA14640B73E417F012A3C40E4218EE56DA14640DEB04DA2012A3C400E790D526DA14640E956A72789293C4004863A26EB95464070C9BBAD40343C40486C37C6DC9546409C6D7F4D42343C4079717EB5DC9546405D430DDC43343C40248D6888DC954640263C154A45343C40EB31B140DC9546402E2D878946343C40E7C019E1DB954640D2211D8E47343C40AF6F4E6DDB954640E712D44D48343C40A128C2E9DA9546409F5F4EC148343C40C5C8825BDA9546407B3F1CE448343C40C06907C8D995464069FBD103CD333C4078E43AFD548A4640ECB7B7D4CC333C4092AF316A548A4640C3D08F55CC333C40838C3CDD538A464001A83C8BCB333C407090C55B538A4640F6C7837DCA333C4017CDC5EA528A4640EA76C136C9333C405A6A948E528A46404BD682C3C7333C4006F8BB4A528A464007770A32C6333C405E9BD721528A4640B120C491C4333C40026F7915528A464060A6E1C3B12A3C40D4FCD1D05D8A46408A75CAAAC2293C40D126118C567346409FCA0A7CC2293C401E4E04F95573464026007BFDC1293C40D3F4076C55734640A1A1F733C1293C40637886EA547346400B403E27C0293C401753797954734640F453A1E1BE293C408531381D54734640F2BCA26FBD293C40343F4ED9537346408EC478DFBB293C402B4E57B053734640055E8240BA293C402130E6A35373464074986F0BDF253C40DF39F58258734640DECB5FDA69253C40A7EACD57D66746409C99C5AB69253C408C1BB8C4D5674640C025722D69253C40131EB237D5674640B427406468253C40523A27B6D4674640B4D7EA5767253C4073C71145D467464052E0C11266253C40D233CAE8D367464048EF43A164253C40D945DCA4D367464069CBA31163253C400D3AE47BD3674640D2A83C7361253C40A215756FD367464004A6CC061A163C40A6397482E667464064772308AC153C40D3C61D3B645C4640FE1EF2D9AB153C40FA8BFEA7635C4640A6E21D5CAB153C40C19CE91A635C4640FCE87C93AA153C40F2304B99625C4640805BC587A9153C400BB51E28625C4640C6844143A8153C4061C4BDCB615C4640628F6AD2A6153C40925BB587615C4640E7C96D43A5153C405AE8A25E615C46408D27A1A5A3153C40A78E1A52615C4640EBC77C4D3F023C400D701C42785C46407C32C9B03D023C40C8667552785C464023BCF5243C023C40F70D317F785C4640542338B93A023C40A95B97C6785C4640AC878A7B39023C4011F4E925795C464037EC217838023C4090267F99795C46409D22F6B837023C40A5F5E51C7A5C4640A6BC5F4537023C407BC711AB7A5C464082C8CF2137023C401B118C3E7B5C46406E9141085B023C40AFF9B17C80604640C9EFAF547DEA3B40956CB94D9A6046406CBF001C55EA3B40F20D8FECA55B4640D32F7512A7FA3B4034A0BF98945B4640CDD726AFA8FA3B40BE097888945B4640CDE1013BAAFA3B408B54CC5B945B464017E3CFA6ABFA3B40DAF87314945B4640E4C295E4ACFA3B40F1DA2CB5935B4640AD451DE8ADFA3B40E151A041935B4640FB306DA7AEFA3B40DA213FBE925B4640B4692B1BAFFA3B40A7CC1530925B4640B847E53EAFFA3B40F4E59A9C915B4640D066F29587FA3B4036F8E2C4F8564640B0C9E701E00D3C40A06288BAE25646405ECC4A9EE10D3C404F611EAAE25646409855C729E30D3C4093B3517DE2564640339C2A95E40D3C401516DB35E256464044A17DD2E50D3C40CB9679D6E156464014938ED5E60D3C405A90D762E156464081C56894E70D3C40669A66DFE056464085A3B607E80D3C40F3D13351E056464048D6092BE80D3C40B727B6BDDF564640A5D755897D0D3C40DB8EE03F5D4B4640AB4DA03B22123C4079053AB9574B4640557A5DD723123C401E13C9A8574B4640A82A376225123C40C6A4F57B574B464098D700CD26123C4081B97834574B46405769C90928123C404F9D11D5564B46404560640C29123C4004E26A61564B4640F298E1CA29123C40944DF6DD554B46400111EF3D2A123C40A120C14F554B464026EB20612A123C40616342BC544B4640711134F8CC113C40BA220C6560414640815E3BF016253C402C3AF77448414640150E5F8B18253C4051D2646448414640551393151A253C40FC48713748414640E942B17F1B253C4058D9D6EF47414640321ACFBB1C253C402AF255904741464077A7C6BD1D253C4089239A1C47414640890DAE7B1E253C406603169946414640F80A39EE1E253C40FD6BD70A464146407AC500111F253C40F5C25577454146404B523DEC66243C4034F5BE53D62E46401D2713BE66243C407846A9C0D52E4640F141CE4066243C40C0C0A133D52E464004B43E7965243C408A7213B2D42E4640613A0F6F64243C40DE91F840D42E464088D5792C63243C403588A9E4D32E46409B34E3BD61243C40CF35B2A0D32E46406CD1603160243C409B10AF77D32E4640296C2E965E243C40D775336BD32E464089E6D1D9CF143C401AB72B7FE62E46406EF83C52CE143C402217CC53E82746400EFB8E5BFD353C40FC4D71CEB027464062DC4DF9FE353C407F6FCDBCB02746407D323F8500363C4051683A8EB02746405C8FD9EF01363C40E9148C44B0274640E66FE22A03363C40319EA6E2AF274640DF2AFD2904363C402E6E616CAF274640691F27E304363C400D9960E6AE2746407F431C4F05363C403F3EE655AE2746406420A06905363C4001B69DC0AD274640224F0537A0353C40B0D050D9AE2346406294CAD049553C40A5F87B542E2346402394C84372553C40010247518F2446400BAB1C7D72553C40158C03E48F244640D4BD1D0573553C40F48AE76F902446405E378FD673553C405A1690EF90244640149D60E974553C4099D8125E91244640420CFD3276553C4028822EB7912446408087B3A677553C4020BB74F7912446405610343679553C402FF56B1C92244640BABB1CD27A553C40B4D0A72492244640D9B77DADD97B3C40548FBE43F823464026F43A66FB7B3C40660A41C60F2546408AD955A0FB7B3C40D350C7581025464005C8E728FC7B3C4027FE6AE410254640629AB1FAFC7B3C4045B9CE6311254640CA10A40DFE7B3C40BAA20DD2112546406C142F57FF7B3C40CF76EB2A12254640F999A9CA007C3C405435FE6A122546405F25CE59027C3C4081B5CF8F122546400F2647F5037C3C40A9DBF5971225464082CDFE92D6993C405DE648779A244640FCE2BD7F209B3C40D43A92A4FA2E464044BD75BA209B3C407BBA1437FB2E4640262EBD43219B3C40D6C9AAC2FB2E4640F6BE4D16229B3C40DF3BF741FC2E4640C105102A239B3C4042C415B0FC2E4640693E6B74249B3C40D816CB08FD2E46405589ADE8259B3C40C388AE48FD2E46402ACE8878279B3C404F994B6DFD2E4640F8759F14299B3C40F1183A75FD2E46402C8BA090B1A93C4012440A7EC12E464056A11929B3A93C408533E168C12E4640FD5E36AEB4A93C407B578A37C12E464088F80111B6A93C40712DEBEBC02E4640B24FD943B7A93C402CD0EB88C02E4640BD23F13AB8A93C40CA5D5A12C02E46404C1ECAECB8A93C407B86C58CBF2E464004478E52B9A93C4076B44FFDBE2E464068465468B9A93C4049867C69BE2E4640DF1E533269A83C4078F2E69D5B24464063D76BF768A83C401F96700B5B244640F5F41D6E68A83C404AB1EA7F5A2446406299AF9B67A83C40EC32B1005A24464038F4358866A83C406C1BA792592446400CC8453E65A83C409D6F063A59244640175F8BCA63A83C4054A936FA5824464027EE4D3B62A83C40473EABD558244640552FE39F60A83C404E86CBCD58244640798082CEF09D3C402B5BD8B283244640A8239A98149D3C401958A473EC1E4640F7966C5A149D3C406AA463E2EB1E4640CE5225CF139D3C406C833758EB1E4640C1020BFC129D3C40F7E25BDAEA1E4640FDD51CE9119D3C403745956DEA1E464054F2C4A0109D3C40D7840216EA1E46402475732F0F9D3C40ACDFF4D6E91E46407ED525A30D9D3C403CCBCFB2E91E46403A39DF0A0C9D3C4039CBF1AAE91E464014FBD6B85E7B3C40E75153576F1F464076A38693877A3C4010707E3B7418464031538FA5F9793C40EF04F456AA1146409B02DBC6E4A43C40553A30C6F4104640DDD6D05CE6A43C403782DCB0F4104640674679DFE7A43C40D9F8797FF410464059070740E9A43C408698EC33F4104640870AFB70EAA43C40C9CC18D1F310464098BFA866EBA43C403C1AC75AF31046403C7DA817ECA43C40CC0A7FD5F210464036AC337DECA43C400ACA5A46F2104640012E6793ECA43C409224D5B2F1104640C2ED3C9C15A43C408108052D0B0A46405E37E46115A43C409A3B209A0A0A46409C6AF8D814A43C40E67C2E0E0A0A4640BE3DC30614A43C405562978E090A4640BFF562F312A43C40885D4820090A4640BC227AA911A43C406A0484C7080A4640C07AC63510A43C4013F3B787080A464069E2A2A60EA43C402BE75A63080A4640C780790B0DA43C401A64D45B080A4640337EF77C61853C40011F32578D0A46404A4D5CE274653C400E8F98390B0B46407226A04B73653C406FD4454E0B0B4640FD32E6C771653C40AE72267F0B0B46404802156670653C40438B59CA0B0B46400789C5336F653C409848FB2C0C0B4640E35ABD3C6E653C40984C41A30C0B4640FFD97A8A6D653C406EFB9F280D0B4640E4CFD7236D653C404633F7B70D0B4640C306C60C6D653C4067B9C44B0E0B464030A2B4C13A663C401B981B17F1114640CCE204B14F5B3C40EFF8DFB01B12464070834C1A4E5B3C4047D887C51B124640885D8F964C5B3C401B2655F61B12464025AEAC344B5B3C40C7B168411C124640C14A37024A5B3C40164DE1A31C124640C459F00A495B3C40A312F8191D12464067E75358485B3C40D07B259F1D12464033C43BF1475B3C4015DA4D2E1E124640AF3F9CD9475B3C404C7FF3C11E124640AAC4E1440C5C3C403199988CEC184640F775039F28543C402E1BC0BB0A19464011B4880727543C4039FA54D00A19464000190B8325543C40DA8B1C010B1946401CCC772024543C40B705374C0B1946409B5F6EED22543C403EB2C1AE0B19464054D1BAF521543C406152F3240C1946406B82E14221543C40F75A41AA0C194640089BC1DB20543C40459F8C390D194640F37251C420543C4085B153CD0D1946407D3C3C1581543C4095206362561C4640521044C9E2343C40A59DFCA8C11C464009AF5130E1343C40B2C4E1BCC11C4640A7ED15AADF343C40E8A024EDC11C46401D79A145DE343C40533BE837C21C4640372AB710DD343C4055AF499AC21C464089054417DC343C401EB17C10C31C4640705EE962DB343C40B116F195C31C4640F9A99DFADA343C40D5F07F25C41C464055AE67E2DA343C400D769EB9C41C46408188F9FB19353C40BE3AC4B6FF1E46400C9783E85C093C40ABD82C54261F4640A70CBAF35C093C406ED5FFFA6B1C46404B1458CB5C093C40AED99A676B1C46408E96BA535C093C40C20FE1D96A1C4640926E7B915B093C40F30646576A1C4640145A138C5A093C4096CECFE4691C46406C66904D59093C405F7EE586691C4640F1ED32E257093C402EDC2341691C4640B9F4F45756093C40F9C93916691C4640938800BE54093C403EDACD07691C464097552C5AF4EE3B40E72B7A30691C4640FCF0B108EFEE3B40C10D354EBB1B4640F89FD6DBEEEE3B40D94F0BBBBA1B46405CB00060EEEE3B40AB13DB2DBA1B46400676F299EDEE3B40CA6011ACB91B46400B734891ECEE3B409215AB3AB91B4640A4752E50EBEE3B404ED503DEB81B46407487FBE2E9EE3B407E28AB99B81B4640A486B857E8EE3B403B754170B81B46402D1396BDE6EE3B4014285E63B81B4640230C019D15CF3B405E09A76CD61B4640C714BCA514CF3B4075DC2FAF3E17464019DC467D14CF3B403FB3D71B3E1746407496B20514CF3B40AB932B8E3D17464009F0974313CF3B40168B9D0B3D174640BFE66C3E12CF3B40344132993C1746407E5F3B0011CF3B401C974F3B3C1746405B5E3E950FCF3B40C46091F53B1746408CAD690B0ECF3B40BDE2A5CA3B1746407893E0710CCF3B40587133BC3B174640B3D204998CBB3B4005225BB83B174640367D6B5B8BBB3B405FDB1348241546400E4852328BBB3B40425CF7B323154640C4C54EB98ABB3B40A003A22523154640646714F589BB3B40DD419BA222154640809542ED88BB3B40C615FA2F22154640EBE118AC87BB3B40F36E32D2211546405E1D113E86BB3B40C7E5E88C211546409B4663B184BB3B405281CE6221154640BA24781583BB3B405CF38555211546404CB6B32C7B9B3B404CE05FAC3A15464065F586E0629B3B407376CAD29A104640935036B5629B3B403D8A903F9A104640724EF93A629B3B40AEDE35B299104640C2828276619B3B406012293099104640B3B85E6F609B3B40368E69BE98104640FBABAA2F5F9B3B40D25A566198104640278DAFC35D9B3B40D91F831C98104640D7236A395C9B3B40FFF394F297104640FB3301A05A9B3B40FA5728E5971046407E61D40730883B404E3CED1FA4104640284D80641A883B40BC553E93ED0B464096BC96391A883B402BEAFEFFEC0B464041DCC7BF19883B40512B9872EC0B4640061AC2FB18883B409B4779F0EB0B4640C70B0EF517883B40F470A27EEB0B46408E50C4B516883B409DA97321EB0B46408C3B2A4A15883B400FB981DCEA0B46402A1A39C013883B4045F072B2EA0B464001B9142712883B405218E5A4EA0B464037247E57E2743B4091D27159F50B464066F06045E2743B4007648259F50B46406F7A250FE8543B407F2D2F1C1D0C4640CE61F4DBD54A3B40E1E23DCF200C4640B3ACFF1AD44A3B40676E64E1200C4640E6DF515B35473B40AC5CB66C6B0C46403D4EE8B357453B40B3A3CEE8710C4640B96F6778003C3B40FEE5951AEF0A4640275E050CFF3B3B407A6A96EDEE0A464014F4F08EFD3B3B407EAB62D9EE0A464023AFE867EE343B404B957A86CB0A4640E04B9131ED343B405104B188CB0A4640EA9F89FFEB343B40BCDD669BCB0A46407E18151F702D3B40E0E17C08760B46400C2466A86F2D3B40DA6A6114760B464076F322A1C0273B400FF9098B180C46402ABBC946BF273B405BCA4EBE180C4640B6AD16E4671E3B4037212C37D80D4640F6D4D1AAA2033B400EED3B3ACC0D4640D546DF90CDE03A40AE1C46D49E0A4640F1DDFBE567C73A4085C66921900546408EFE813C66C73A401DA172E18F054640155F897664C73A402FD39AC48F054640CFFB21FCB0A53A40F3834E91C5044640436537CCCA6A3A40096BC128FA004640C4798FBF514F3A40D764ED453AFD4540677B715E64293A405627317770F6454059669CA2BC1B3A40B234EFB549F04540201DBD3FBB1B3A409D6D173849F04540C2B4B194B91B3A40F2A424DC48F04540B3913CB054073A40514C739301ED4540791A8E24D7FA39406AABAB5620E94540046AC6F581EF3940E0A7752C94E2454090BE5F2281EF3940AA8C7BC693E2454042ADA02280EF39407F4DD96E93E24540BA31655A57EB394090C8E4D35FE14540690E40BF64CC3940E6BCB6C379D6454079CB2A7363CC3940D831546479D6454052C1BFF861CC39409651511F79D6454063220B8B079F3940068CA8642FD04540BEB0AF1ABD8B3940E270416BC6CC4540F6622303BC8B39408BC59642C6CC45405A9C0FDE217A3940C03B8204BCCA4540214CDF3F207A39407ADFE0E4BBCA4540E454A4981E7A394053FA68E4BBCA4540E754EEF91C7A3940D6851F03BCCA454004654DCA2F70394001C48789DCCB4540F1FB241B78633940FC04FED4EACA4540672FA6C576633940AABE28C6EACA45404F9A196E75633940DFF900CCEACA45401AFBE81D74633940A3B75DE6EACA4540EB7CD4C69D4B39401C02DA378CCD45405DE4B8D7372F3940E4F2429531CE4540E82D4E7F362F394033319FA731CE4540C42A2734352F3940A1639BCE31CE4540627ACA967C18394048DA93BFA6D14540ECFBF8C77B183940EBF2FCE3A6D14540C1F8DC2DD9FC384077E6FF1B36D745404323B55D9CEE384078E8BB567AD745407B600442C8BB384066C4F3D02ED4454023254CAFC6BB3840F89222C52ED44540C501E21DC5BB3840FC7BCED52ED44540AA06EC9CC3BB3840206F56022FD44540F64EF13AC2BB384084350C492FD44540C8A64D05C1BB3840E9AD44A72FD44540D67CB007C0BB38406494711930D4454033FEAB4BBFBB384048DC439B30D44540F99E58D8BEBB3840BC50D52731D44540198D10B2BEBB38407CE9D7B931D445405B4F241CC3BB3840124AE222D0D64540E0E0E658C3BB384038D938D6D0D64540B76EC057B8BC3840D65BB68438D845406C82AC9692BC3840FECD8615EADE4540E9492EC092BC3840985EABB1EADE45404245CD4193BC3840442B5547EBDE45407E00F11594BC38402C3D0ED0EBDE4540CA17713395BC3840F59EEF45ECDE4540526BFA8D96BC3840BA96E2A3ECDE45401953971698BC3840FAE2D8E5ECDE454094F154BC99BC3840B58CF908EDDE4540F4C5BD6873EE3840D9B0D49A1DE1454058CC1E5874EE38405FD733A01DE14540ABB704DDBBFE384046BCE87723E1454054ECD92DBDFE38409A52686E23E14540AEA60476BEFE384095544D5123E1454054440B959F1939405939D9B4E3DD454051B6DAFC1D3039409F6761D8BCDD4540E070CF671F303940C4B342CABCDD4540183B64C620303940D3B461A5BCDD4540DC43DC0C3C4D3940617D2FF6A1D94540034171103D4D394001E3CBC9A1D945406C651872FF623940C854132637D545408A3CF560296F394081F5BC6C2CD54540ECEE6FE3B68B39403CA6A5AEE0D74540D910EA2BF49D3940E938DC19C0DA4540FFC310A85CCA3940BC5532A9F5E245401CD4F78096E83940805BE7E96EEF4540C4AD2CEA96E83940675D25126FEF454087F402975EFF3940C991AB9684F745402B7FB1655FFF39403803E7D684F74540D8C8B04AC1193A400A642ADDADFE45408563A915C3193A401DE26E3BAEFE4540C218B0B0EF273A4022EE4338C900464081DCEE24524D3A40D23531A3B606464034EF4932534D3A40E98F14C6B606464067AD0D95FA6A3A401F994039BD0946408CAB0B4DFB6A3A4030EFC648BD09464040B0F2E459A63A4054C23656B50D46401170B1B50BC63A40573FCD481210464038B31F3ED3DF3A408830DCCD7B15464068A30E11D5DF3A40BDCF15167C154640DBC58A06D7DF3A40EEFCCA337C154640AF6D050E3F033B40D7803AB7011646409BB84DAC3F033B404ABA5CB70116464067529207481E3B40A573F6FBA715464091AC353B491E3B40E198AEEFA71546400E707B664A1E3B407AEA3FD3A71546404EFD8FC3FA343B407A6F0CF7D5124640E4CCDFEA73443B40DC1C0CA713134640A0058B0572443B40E98956B8AF144640CA85F72C72443B4035A34E4BB0144640D76C15A372443B4009ECB4D8B01446407401616373443B4027D6215BB11446407BB8806674443B40F33399CDB1144640FC1E8DA275443B40A2FFBA2BB2144640ACC2710B77443B40672AEE71B2144640CA64639378443B40E1D0839DB2144640AAF2662B7A443B40347CD1ACB214464060BBAA6A48453B40BF4E041DB31446405F45979858453B4005651E389A1B464057E94BC258453B4038CF68CB9A1B46407BE21B3B59453B404EB0F1589B1B4640F2A862FE59453B40C69E48DB9B1B4640CB209F045B453B40E0536B4D9C1B4640606DBD435C453B40C6F2F6AA9C1B4640B7157AAF5D453B40472F53F09C1B4640A8AADA395F453B40D8ABD51A9D1B4640A94BB7D360453B40B732DC289D1B4640ADB6B81564653B4062039E31911B4640006CD0EC6D653B4081F26FBD6F1E4640AB5328176E653B40EFB0B350701E4640DD589C906E653B4091E22ADE701E464048AC81546F653B405CD36560711E46408D24515B70653B40DE5663D2711E4640BE4CF19A71653B403204C22F721E46404DBF190773653B40454EEB74721E4640EDFBCB9174653B406DD0369F721E4640B213DD2B76653B40067404AD721E4640CEA827607C853B40EF654046621E464012378795A6853B402BF63BB0B42746406CAA8EC0A6853B402E417943B5274640E0FBC43AA7853B4053BEDED0B52746409EDD77FFA7853B408F5FFD52B6274640AC341807A9853B406807D5C4B627464007768447AA853B40D3BA0522B7274640B2516CB4AB853B40ABABFA66B72746402FD7C93FAD853B403C740D91B72746409E6B6BDAAE853B408729A09EB72746404DA330ABF0983B408B37938AAB274640014A602B2AAC3B402C1DA4DC9D274640E1B7926544AC3B404E6F8F55192C46403C63629144AC3B40BF97C4E8192C464023B8640C45AC3B40EC8A14761A2C4640DD91DFD145AC3B40E00E11F81A2C464070263CDA46AC3B40EE55BB691B2C46404FAF511B48AC3B40A823B5C61B2C4640925BC98849AC3B4017C66B0B1C2C464066B497144BAC3B40A33C3B351C2C464081C986AF4CAC3B40A53288421C2C4640126BD45661CC3B40FC7A08CF012C4640A467105B99CC3B408C6760A50F344640444A8E8799CC3B404C788E3810344640AD9F4D039ACC3B40F51CCCC510344640A6FD8CC99ACC3B404CCDAB47113446408309AED29BCC3B4009D52FB911344640636B80149DCC3B40146EFB1512344640000BA6829ECC3B4075AB7D5A12344640FEBB0C0FA0CC3B40E48E14841234464090AC78AAA1CC3B4097EF269112344640525CF50CE3DF3B402470DA81003446408F5321D3DDE03B4072C9B38AA754464043000000458E326324163C4086B95BFAA29B464096F1CD04A6023C4059E7EED6B99B464069CC00DB3D023C404D18FBA1379046404273D2AC3D023C40D25FDE0E3790464066B9712E3D023C4034A8C5813690464066EDB9643C023C40A5081D00369046408C8C6B573B023C40D811E08E3590464044FFDF103A023C403DC96832359046406BC8A39D38023C4085D944EE349046401D11FB0B37023C40929D12C5349046409F4F556B35023C40A45D67B83490464067A57E12ACF83B4079F40F4E3F90464021E24D4848F83B40247F72F8BC844640BC4C6A1A48F83B40C3435765BC844640D0DE769C47F83B4087DC3BD8BB844640A6684AD346F83B40FC268C56BB844640E9949FC645F83B404CAC43E5BA844640FFE2C88044F83B40B69FBC88BA8446406A204B0E43F83B40EA0F8544BA844640F347627D41F83B4035F03B1BBA844640778175DD3FF83B407251770EBA844640706903D023F23B40C234B282C0844640FEAEC8F4C2F13B40F4705E353E7946406B336FF4C2F13B406C34E42D3E794640E7838F7D10F13B40FC87C518BC6D46408E3A05DDD8023C408F3C6CACA86D4640437AB37ADA023C40CDB5159CA86D464039727807DC023C403FEA5B6FA86D464072BD1474DD023C4063DCF627A86D4640915885B2DE023C40DBECA4C8A76D4640F37A8DB6DF023C4063DC0F55A76D4640CEFA2E76E0023C402BC2A8D1A66D4640FE9B0CEAE0023C4022597C43A66D46405C82B20DE1023C401C5201B0A56D4640DF99B8B8AE023C40BEBB963D03684640F44B452CED113C405724EC9EF1674640BE83F87E5A123C40505C9F1E74734640A0AC4BAD5A123C403B75C3B17473464089C9872B5B123C408D0EDD3E75734640265CD2F45B123C40C8547FC075734640FB1F6E015D123C401A50AE3176734640453707475E123C40ABF30F8E7673464008D218B95F123C401BF316D276734640A666684961123C40C9B825FB767346403ABF91E862123C406D24A80777734640B354C5C13E163C404720433872734640705451181E173C4013CCDBC5798A46408A0EE3461E173C406899F8587A8A4640345697C51E173C40E89B09E67A8A464010628F8F1F173C40CCB1A2677B8A464099C7079D20173C405293C8D87B8A46406BDFA4E321173C40F1D721357C8A46401FB2D85623173C40ACC221797C8A4640B6825EE824173C4081302BA27C8A4640E936C78826173C40DC50AAAE7C8A4640AF3A8C5339203C40B8950C41718A464009CEA613AD203C4010B6B964F0954640D5397E90F5153C403347BDDEFD954640648CA2F0F3153C40412D40EFFD954640117ADF61F2153C40F7B4221CFE9546408F4687F3F0153C406060AB63FE954640195AADB3EF153C402B921AC3FE95464036CE9BAEEE153C407E96C536FF954640578C5AEEED153C40FDB33ABAFF95464054A34C7AED153C4081E26C4800964640439EE756ED153C406A79E5DB00964640458E326324163C4086B95BFAA29B464005000000E7630381D1DD3B405A46144386694640B0F22273B4EA3B40574E4D61796946401EFB2BECD6EA3B40B338AA8CBC6D4640A8497239F2DD3B405191AC92C96D4640E7630381D1DD3B405A46144386694640 BG Stretch \N 2019-06-14 12:47:48.840851+02 Intevation t +HU_stretch_1 ["(RS,XXX,00001,00000,14330)","(SK,XXX,00001,00000,17500)") 0106000020E6100000010000000103000000010000000102000093740FC550AC324095DE2F4F40034740958CFAB64DAC32400EAEE3F31C044740F87A25D84DAC32405D411D7B1D0447407B59523E4EAC3240F37A15FE1D044740E24933E64EAC3240511790781E0447405D4F7E0195AD3240EF8DD9E6DD044740B3C568DF95AD3240915D5852DE044740A0AFDAEF96AD3240A4F0AEAEDE04474003D9712A98AD32400CE005F9DE044740B91AECEC92B53240CB6A0F266B0647402B4B181497CE324069B09C67691247409F8197F5ABD23240887367927D154740B317B8B1ACD232400F3AC6047E154740543139A4ADD2324069130A6A7E1547407FA3B7C5AED23240B5471DBF7E15474044802A92F2DC3240B32B6DCD021847407AD00926F4DC3240BEB6751B03184740C2134BE0F5DC3240B973124A031847403059F3F3A2E53240840032F6951847405A5BB92109E53240099F70CB411C47409A09391E09E5324038AA03F5411C47407862F1ABFFE43240CA0BB61CE523474002024DACFFE43240FB0BBB2BE523474065441D0A27E53240C80E425CD22647408A2033627DE03240A24762BEB22E4740857BDD4FFEDC324068F8BDF05F324740202BEBEBFDDC32407611979660324740B9526CF5FDDC32408AEAF83F613247406D5EE66BFEDC32402F7C5AE46132474070CA3FDAEBE632400838891E953B47407AE4E7F651DB3240C0A0F376314A4740E4FE14D98CD63240DA8706511A4E47403D80B2618CD632402B643AD21A4E47406492562F8CD6324078D8B4581B4E47407767A1438CD63240ED871EE01B4E47401B50EB9D8CD632406B5C18641C4E4740C0244A3B8DD63240EBA65FE01C4E474050F01494D0D7324086892C21E84E4740379A0EF544DD3240189C91E4555247407EFEE9F845DD32404364C665565247405D09DA4447DD324094FAA4D156524740C02079CA48DD32401BA97F2357524740292DE1784ADD3240E794C95757524740B7DCA10573F13240F7B46E88FF5347402940D25E8DFC3240B733293F4F5947401C0BB45089FC3240F523FEEBA45B4740DFC2B6ED6CFA32409C810FD9295D47405914B47DCFF4324027A76535006147402AE3A7E5CEF43240FA7DF4BB00614740FEA66AC039F43240C90441A4B66147406B2F7A42B3EF32402AE4B8B07A644740AE4E0514B3EF32406A64A8CE7A6447402436F85AF9EC32400285A3AD556647405EBC849481E9324088A754B08E684740802D240381E9324028DA9C238F68474017757DAB80E932408834939D8F684740DA50FE8F80E93240D49BD61A9068474019C8CFF9A5E932408A810B14BE6E474075C9F52DA6E9324036BF5AB1BE6E4740AE89AAC0A6E93240928D7847BF6E4740C9E866BD46ED3240A6ACACB277714740723A5A3B47ED3240DBEEB60378714740B7A5E1222DF23240BABFDA2634744740E313123796F33240A2D23CBC607747402A4F7245F0F13240A6FF9325757A474080858508BEEF3240A9A678487C7D47407CA3C4C7BDEF3240DE0DF3F27C7D47404E5D72F9BDEF32404EDC049E7D7D4740B709AA3CE2F13240902936D1DF804740B87CA1526BF2324051C1A530D88347400E47EB1254F03240BA9B6750018547406DC50093B8EC3240A0FA35E9FE854740B75760D1CFE2324031D17787B78847405E8B5A81CEE23240C3D307FAB7884740C27CBE80CDE2324039CC7982B8884740D66B66DBCCE23240E15B801AB9884740AADE69124CDE3240CAD01E5FCA8E47400408F3E24BDE3240B21C6EB2CA8E4740BD488C2AE8DB3240DE486842C194474032294317E8DB324073DEC6C0C194474091362B42E8DB324002F1773EC2944740B11F123EF9DE3240716CCDFDEA9947405A48BD96F9DE32401A0B4B69EB9947401311FC1CFADE32403A0826CFEB9947409EA5B2371FE33240BE795474879C4740445D4B4F1FE33240282BCA82879C4740E33909574FE53240FD2C50EED59D4740B8D4A917B9E73240BA9E2AAAD2A14740F8C482AB23E73240904BAA541BA54740D71D4BB423E732405A0C49D31BA547404C0934FB23E732404F489F4F1CA5474020243E7E24E732405A482CC61CA547405B369AD658EC3240FB07B6D1D5A84740C902D8EB77EF32406D4F194747AB4740C4E00A8617F03240136A9A1643AE47408C48C2D517F032407CE741B043AE474073EEC88018F032405DC30E4144AE4740811881B6E1F332407BE45395B4B0474092993CDCE2F332407A256D26B5B04740CFFEFC5CE4F3324016E6749CB5B04740AA70973594F832406C635601D7B147409786897905FB3240FC5A11D16DB2474026C5DCA806FB3240BDBE860E6EB247400DE108F107FB3240F290E43A6EB2474058F92E89D4023340196FF6503FB34740A987FB02A10833406C2BDE2C66B54740783ABBE4D00A334043B98088E5B847400123CCEF040C3340A97392FFD5BA47409C84D00FC50C3340C5A2FCD298BC4740367E85382E0833408A388AD0D8BF47407DD8C5A72D08334046CC0556D9BF474038FD80632D083340304856E2D9BF4740FB557E66A10733407BAB7CAF87C2474077B4306FA1073340E4EF0A3888C2474044E86BC0A10733408A97D4BD88C2474080C5F653AB083340CE74785FB2C3474011EE6C95C60E3340105097548ACA4740A22807644212334003853313EACE4740CA34ECEB4212334086676990EACE47408A3AE6B24312334088F09303EBCE474056EFBDB2441233404C171A69EBCE4740A4A764E60914334061C638F581CF4740EF83F0035D11334080ECB97746D3474035A844C85C1133406228BA0747D347407CFA73DF5C11334044DCEB9847D3474050D17CA4CE1533408CCBBCB62CDD4740F41D28BD2A1433407B74AE89D4DE4740553AE24E00113340F22C81516FE04740357A678AFF103340D68A5ECC6FE04740D079670CFF10334098AF555170E04740021032D9FE10334064C3D9DB70E047403E0F5CC8DF103340C162185FBEE1474058D571CBDF103340DFB2ECA4BEE14740FCF050DD3C1133402E3F75ACBEE347406D58C966F6FD3240ED4C52E16CE64740950CC0CB48FD3240BC947FAA21E647409BF46D5D7DF732402447934A55E2474012E515957CF73240F785A9DE54E247404766C6997BF73240635AA37F54E24740E0B7A6727AF73240742F353054E2474094759F0010F032402C69971BA8E047401BF01B520EF0324043C8D6CFA7E047408A49447D0CF03240A8DB2EA5A7E0474051282C980AF0324040D5A19DA7E047406D1AABB908F032408EBA8AB9A7E0474072C99707FCEA3240F82F24FF24E147408E4FE398FAEA324001E9C22E25E14740D5588A48F9EA3240E9A2457325E147406DCBB9785EE73240ED5785E408E247405E73B30B5DE73240A6D5565509E247409D8333F15BE73240184374DE09E2474088280E375BE73240D95D27790AE247408562AB01A3E43240B0AF71724BE5474036F7EF85D9DD324078CAC5D9E3E54740B9F1D6ACD7DD3240175B3817E4E547409DA6E408D6DD3240A457F276E4E5474048C09F47B3D8324007D32ABB5FE747408CFFF158B8D0324032E1B68E58E747401CB49BC3B6D032405668B29958E74740DDD625A9A8CA32403C1300C4B2E74740D3B2F98D2FC63240A8697D9C78E74740DACABEE8C1C132403AD1105415E74740CE0772A6DEBF324095B5384C59E64740B49D899CB1BC32408E3A9DD2D3E447402789C69F54BD32409E1148FB7AE447405743445855BD3240D18F1D7E7AE44740927F16C955BD32400468A1F779E4474044505EEE55BD3240C4D3706C79E44740D047D4C655BD3240285F52E178E44740D5B3D35355BD3240D0F60B5B78E4474012B24E9954BD324060FB38DE77E44740B487AB9D53BD3240A8CA216F77E44740766B8C6952BD32401622961177E44740C0F5E02D66B63240939351A8B9E24740E609ADE273B2324082FC54F233E147405EF83CD1D5B03240620E99303CE04740514D34BBD4B0324088CE55AD3BE047402DEAC658D3B03240DF3800413BE047402DF927BAD1B03240E5EB8BF03AE047406E260BA30EAF32400C5352E6F7DF474089E1A5FF0CAF3240575705B8F7DF4740CBA3430282A93240CBC1A3D78DDF47408937F8777FA932408752E5C78DDF4740D3C71F82E0A03240ACCE3535C5DF474027E6E74CDFA0324034A15444C5DF474042DBF2A690933240FAD8175EBEE04740853E9D1D548C3240A9AB80091AE14740ED69D6893C843240DFCB45B794DF4740A734311E3B8432408B94928094DF4740C93F8D9B39843240127B7A6094DF474002F5290E38843240D5C2015894DF4740BCC56B94127A32409C63DAE0AADF474005A48EAD107A32402FCD3CF7AADF4740E658EDE00E7A3240228EEC30ABDF47405C53C0440D7A3240DE43218BABDF474098B93A12A97632405E5597039BE04740945DD3D6367232402514495D49E047409CE9B2FD666C32409A197C0870DF47408B331D32666C324012019FEE6FDF4740BEFC3FE6725B32402B288DCB97DD47406F427154715B32409C5433AD97DD47402D35F3B86F5B3240779E36A897DD474041BEB8216E5B3240F54CC2BC97DD474050C68F9C6C5B3240C31424EA97DD4740B66AA9366B5B32404723D22E98DD47406F8327FC695B32401D78788898DD4740EC5AB3F7685B324029190DF498DD47406E292132685B3240B671EA6D99DD4740D100C8B0D5573240A2BC773F62E0474094A25E2DD5573240418D6CC862E0474051557FF9D4573240B3AC4D5763E047408F950D17D55732403D6CE7E663E0474077F0F584D55732400564FF7164E04740630A383FD6573240862D85F364E047408AE90B3FD75732407096C16665E047406B29217BD8573240489482C765E04740E2C9F5E7D9573240EB5E421266E04740F0704178DB5732409645484466E04740BC5FC9EEE26A32404ACDF03919E247408BF90DA5D56F32407E62C996E2E24740EFA200ADD76F3240CA6977D0E2E24740651DF0CED96F3240D30BE2DDE2E24740D292EE7E8E7A324077079C91B4E2474038D5F986907A32409304CC73B4E24740A64912F82E83324076778917D9E14740C5E8BBCC04863240A6AD92C4E7E14740BEB441F3BA8B3240E0405DB250E34740ADDADA44BC8B3240827C25F750E34740BA1B09B5BD8B32402DE9E22651E3474096335D38BF8B3240CFF6194051E34740A1A0CFC2C08B32409D2B024251E347407248194EE0963240CB52DCF109E34740B05F4120E2963240B98930D509E34740878C0FD6E39632404F42169809E347403E34E55BE596324071784A3D09E34740558F4D126F9A324011C3386602E247405BFD7E86DB9D32401EA7C55CA7E147400E19BD19B7A93240A51A506650E24740177FC21981AF32401463367080E34740F5BC9E382DB33240092FBA2DD6E44740D95B4D9692B43240900D78D1CAE5474068A4FBD192B43240E25E89F7CAE547408FD6C96551B732409D29A49B6DE74740561A45E151B732403AC519DD6DE747405F8F6720F9BB32404D8063B6A2E94740CFD97F5FFABB3240CF7F9B2FA3E94740373915E4FBBB3240923B198FA3E94740C0953E9CFDBB324051F375D0A3E947408D3CB273FFBB3240A568AEF0A3E9474077F260A3B8BE32404ED84FBFB9E947407F7CACE8B9BE3240D5CC7DC1B9E947402DA4DD9BF6C532402D5C44B198E94740AD9B1EAF0BCC324081FEE3D4E7E947405CE3A0CE0DCC3240A12406DAE7E947403A7C61D2E2D23240079DEF7AB0E94740A2315138E4D2324045A69C65B0E947408FC79C6C86D932401649696D1AE9474027E2E8FC87D932401239E83B1AE947405F061B6A89D93240E9E2C2F119E94740D3D5F8A68AD93240F3CFA89119E94740281908A88BD932402F21151F19E947405F2DF9638CD93240EB472E9E18E94740725AFDD38CD93240EF899F1318E94740A1F205F48CD93240EEB56D8417E9474033F1E9C28CD93240D999C8F516E94740E3BB70428CD9324071EADA6C16E9474063A341778BD932403D5A9AEE15E9474003BCB8688AD93240109C997F15E947408D5A51BD89D9324057EB8C4515E94740ABB3031954E6324066DF6E874EE847409B65769355E632401063AA644EE847401D7D1AF656E632402847332C4EE8474040AE103658E6324075B2C4DF4DE84740A8D9894959E63240AB7FB6814DE84740480CF1A843EA324014D8FC15B5E64740FD4A9CA744EA324035144F95B4E647409E350C5345EA32402C80D705B4E64740120B0DA445EA324069129D6DB3E64740860008FFEEEA324085B3D8C9B8E3474038AB019AD6EC324018988E7A19E347402557140DF1EF3240B2114346F4E24740DF043AD975F6324080DEACF3FDE647404D9069E076F63240B871A274FEE64740D1AD936B54FD32407EECD340B4E9474071B20E9E55FD324040E5B1A4B4E94740C6DC2D0357FD3240E5BB33F3B4E947409CA6018E58FD324079748129B5E9474052E53C305AFD32409082A345B5E947401F12E45F58083340F4554EDF15EA4740B8D9F9FE59083340622481E015EA474082E498975B0833401E51E8C715EA474050E01E9C7F163340CAB1AA66C4E8474054E22C0D811633402CC01B38C4E84740D28F4C6082163340D0CD7EF4C3E847400F39008B83163340E450EB9DC3E84740F30FB50291203340B2841DE248E547404A841A11922033409D9C3D7048E54740061570D992203340C59FF7EE47E54740F8E2679C47243340E709E35631E247409D719F0B48243340C115BBDD30E24740D18A133D4824334008D2016030E24740E5D16EB5D6243340532B717241DE474054ADF9B3D62433409D61682141DE4740BA437453AB233340486BCCCAA8D74740A424533BAB233340F9AE8980A8D74740F1C0EF14A6213340E183E67D65D34740824D85D4A52133401182421E65D3474092664C48FC1C334067D448B016CE474034B99FBFFB1C3340518D193A16CE4740BF704FFEFA1C33405B7C54CD15CE4740C30939BEF01A334058500B2821CD47408B76D2E3CA17334099D009AAA7CB4740B4A0CFA49C173340A3CA43576ACB474075285E699C173340DA9A37156ACB4740B164181426163340D1411B8205CA4740ED9D777DBB143340057E2CDE98C7474003EA8362BB143340E98DDCB598C7474059D5547A6E1433403B4AAFBB32C74740AB578C386E1433401372AC7332C74740CC8BD665C10F3340B497A766DBC24740C346DDA0940E33407B54FD2FC4C14740D4A42DE7110E334030130A4216C0474050A160BFDF133340F744B2BEE7BC47408803C986E0133340222CF332E7BC4740CC339EF5E01333400A06549CE6BC4740347A2F07E113334052A13401E6BC4740FB1895530A13334030BA5D8181B84740BC3D8EF509133340F021DCD380B84740506C5723091333403110803280B847408B6624B3B112334029656BF34DB847404AE882AEDC0F334062213C5CADB6474073375886FA0C33406692CAF222B3474028F2D7FAF90C3340462F997422B347401C40702FF90C3340FBFBD70022B34740656B9E2AF80C3340C560389B21B34740BB45D5FDEE043340E77D493D83B04740DCF6A7DBED043340259B72ED82B04740A8A23496EC04334022BC3DAF82B0474072E2AC36EB04334076BE6C8482B04740DDBCA34170FD3240541BF738D5AF4740DF505C2970FC3240B2B13BE1B1AF4740B3DFE75834F93240953311A53FAF47401A324A59DCF6324002080C1A56AD4740361C1DD3A7F5324031EFB16F65AA4740F81CB549A7F53240A496A9BF64AA4740E0EDD86E8AF23240B8C568F1BEA747408D0BFF258AF2324028CBFEB9BEA747409F650B5274EE324066AF5EBCF1A447401F9FE1FA86EE32408EB8C5821CA147408D1635C986EE3240C6D3F8DE1BA14740977DB63ED3EB3240DE2CC488D69C4740A6AB7660D2EB3240D6CB66BDD59C4740F7C285CC4EE93240BD5073F9449B47406EDA5F1AC6E83240EB501EDBEF9A4740241049A2C5E832401B46BB98EF9A474048F89B8657E5324066543DE93D994740FDF84DC1E7E232405FCD66DBA8944740D434D9B650E53240FBAC7AC08D8F474053214236C2E7324079175339188B474083CF979167F532400186A046F1864740D489ABEC68F53240D3E072C0F0864740B582A83CBAFA324017C01B994F8447402805BB20BBFA3240583AFA084F844740BB2F6AA4BBFA3240A01F6A6B4E8447402B7F80C1BBFA3240715AD9C74D8447400F5D04D14BFA3240D9A9E60A32814740901FB99B4BFA3240E5C373863181474041E0EC224BFA32401E674C0731814740780B3FDED8F63240068A94AB6C7E47406C491449C2F93240E1ACC74EF57747408DFD1259C2F9324035212695F4774740627256EA8AF832405FA71FE08673474076A396A28AF83240505B7D5B86734740CFDA14178AF83240481F5ADD857347406050CB43ADF5324061A4D329807147409EB198DBACF532404D1E97E87F714740B3A1837FA6F232404D65480FCF6F474015F4EAFAF6EF324007A183CB0F6E4740F416C0E80FF03240457D0C4B066947401F5A83E7CEF132403A8BC26544684740E8D39A5122F332402F4C382CB16747403706C88287F5324007F8315F1B6847403D3EC91489F53240A3D98F941B6847404BDB65BD8AF532407792FAAD1B6847406BBE4B6C8CF532403F0978AA1B6847405BEDEA108EF5324064C72A8A1B684740F18B189B8FF5324039A5504E1B68474077F2ADFB90F53240589236F91A6847407DC31D2592F532408AF2218E1A6847400D46F90B93F53240E16D30111A6847403083ED26630333404F2EB70FAF5E47406166BCD263033340ADA05A6FAE5E4740326F2E1164033340FA18D1C5AD5E4740BFE451376603334036A82492725E474089D196BBE0073340632BC3409E5B47403B449C66E10733403EB2A9B49D5B4740A5EA8FBCE10733408F3A9F1F9D5B47403FE5F5B9E10733405B51AE879C5B4740EDEE917E870633404DE3877B44574740121D9917870633402CE342DA43574740B3252C4D860633400EAA8E44435747402888FB288506334079A795C1425747407D9AB18790FE3240B236E75467544740789C0549CCF932408CAE873D1B5247403032D76131F7324034DCEBD4D9504740C16D054330F7324015C93F64D95047406F8C39E92EF7324089FF5009D95047408F8615622DF732407E3DB5C7D85047407FF604BD2BF7324097AA02A2D8504740BA77A10A2AF7324076BDB599D85047403E8F90E334F63240A9FB5D51DC504740078A61D881E532402944186B7C4F47400F8F8A919AE23240BBE426E80E4E474041D33FAAC7E23240018A14C6D54D4740B581F2F559ED3240B250E43A784047404EAE941629F23240E92628942C3C4740C5F6578329F232406E7B7D102C3C474068B274A929F232406E9E33882B3C4740FEC0A98729F232406DF5C6FF2A3C474052E5131F29F23240E30AB57B2A3C47402CE2427B21E83240E563E855E33247401B366829CAF032403DB92B7C39244740979C9454CAF0324029CEE3CF38244740811B800DCAF03240677EB92438244740DB3FC0221FF03240CB3C6A64572347404B56531A4FF03240F9A67077DF224740BEB9532D4FF03240E19E90F2DE224740E388BEFC4EF032407DE9986EDE2247403532A5F6E6EE324072973432A3204740782736BDEBEE324042B122CE431C47404A34CF4C04F2324005CC970AAD184740C05D379D04F23240F3A7A17DAC1847402A96399F04F23240D7E7EEEDAB184740403EC35204F23240A814B560AB1847406FEE99BA03F2324076C512DBAA184740770FE58F4DEC324088CA1852C7144740B9A971EA1AEB32408B0226D890134740ABA6562E1AEB32408E6C074B90134740170CFD2219EB324063884DCE8F13474039F0BED317EB3240321944678F134740F663D84E16EB3240301F4B1A8F13474034B8CCA414EB32406E49A7EA8E1347409FFFB2E712EB3240536F5EDA8E134740A361B7C288DE3240AAA432A08C13474010D709C2FADD32405DB0E6817E13474036800C5BF9DD3240348858697E134740BC924AEDF7DD32406B1E14667E1347401F7B97E29BDD324091F0964680134740EB800EA49CDD3240B80D2D767713474056CD068A9CDD3240B93914E9761347409DEBB8249CDD3240DD16256076134740DDFEB2779BDD3240AADD2DE075134740977C07899ADD3240D633AC6D75134740F49E166199DD3240DFD3A40C75134740B324430A98DD324006737FC074134740EE02959096DD3240EF29E88B74134740A7828175D0DC32403CB5E53360134740B64AC2488CBC32409958B5F3EB034740FF7BE0398BBC32402DE59A88EB034740FFC8F0F589BC3240B07C2D31EB0347405E01898888BC324075908DF0EA0347403B5A75EBD8B432402F766FE3DC0247404A52B0F1E5B432407727C469DF00474099BDE6F1D3D23240DE18662F55F54640576DD8CB9AD5324082E6BC8AAAF44640BE0E510B9CD5324097F7F62CAAF4464004FE36119DD53240F00184BBA9F44640FD02C8D39DD5324089349E3AA9F44640952CC44B9ED53240241B13AFA8F446401AF8B2749ED53240ABCD151EA8F4464003F60D4D9ED53240E5560D8DA7F4464094554FD69DD53240C12B6101A7F44640AFCCE3149DD53240AF9E4580A6F4464045106B251BD432409A27492ED8F34640E81F9CEC19D432404AF985AAD7F3464023F3CE6618D43240E689BE42D7F34640194D0DA816D43240579248FCD6F346409FBEF9F7D6D3324005A468D8CFF34640F4C0F741D5D3324050EE48B8CFF34640967A6582D3D33240EEBA53B8CFF34640A33A70CCD1D33240619388D8CFF346401FDEDB32D0D33240BF338617D0F3464022FC34C7CED3324097AD9972D0F3464024681099CDD332407802DCE5D0F34640904960B5CCD33240A5F15C6CD1F346405B1BE625CCD332402C235900D2F34640803BA38492D33240DA51A4D92AF44640FDF5273E15D332406A38B80B90F4464053E8478855D232403FB6D7C70FF54640BB4299A9B1CE324011DF1E949DF346406DB6C650D5CE32402FFB4B528AF346401252F610D6CE3240DEE467D089F346409E82CE85D6CE3240F298044489F346404C07EDAAD6CE3240F77D66B288F346400E5FED7ED6CE32402935042188F34640FC277603D6CE3240E620529587F346407343293DD5CE3240A4008E1487F3464051577733D4CE3240CC998CA386F3464031B9549663CD32400B0959A805F34640CC60624362CD32408E07A44705F34640B89695BF60CD3240954EC00005F346404C5AD41A5FCD3240F0DB95D604F34640D7865E665DCD32402838DFCA04F346406BCB18B45BCD3240255217DE04F34640E6E0D0155ACD32400075740F05F34640F1B0829C58CD3240EF8CF05C05F34640E716A65757CD32407C645EC305F346401F93C5715FAC324065F853FEB9FF464005F7EE835EAC3240AD2D7C6CBAFF4640FF1290D35DAC32400E4AE1E7BAFF46408F5A8B665DAC3240C858656CBBFF464007FB83405DAC3240617D9CF5BBFF464093740FC550AC324095DE2F4F40034740 HU Stretch \N 2019-06-14 12:42:26.396645+02 Intevation t +RS_stretch_1 ["(RS,XXX,00001,00000,8460)","(RS,XXX,00001,00000,14330)") 0106000020E610000001000000010300000001000000BC0200002F1304F5523E33404B6C3CBA1B6C4640C9C3CAD8C32033400F8257E2666A464012085DE2E40533404ABF958FDE674640AA75DD45E30533402099C277DE674640E09D3FA4E1053340C7B12E7DDE6746407E54B90DE0053340CB27A49FDE6746402E351292DE053340DB90CCDDDE674640A1D60640DD05334054443E35DF674640F65AB624DC053340D25494A2DF674640520C204BDB053340904A9021E06746406415B6BBDA053340794F44ADE0674640A693097CDA053340EB294440E1674640D200B6B03D033340937B10A0F0784640BECBA0C33D033340E683AA35F1784640EDFA55293E0333408795FFC6F1784640D4FED4DD3E0333409BA5574EF2784640EA9403DA3F033340A6475FC6F2784640D653F5134103334065545D2AF3784640A5A24F7F42033340AE7E6276F3784640C96D66A18219334058F3DB21997C4640DDC7961A84193340D85AE650997C4640D75576F8E73C334015656E16B67F46404215F400E83C334088262B17B67F46407F35952F7455334016702374D181464043FE0171407F3340326AFC783C8646409CDDE3CD417F3340AB2FB2923C864640D790FB31437F33405DA66E973C8646409FF15193447F3340D1DF0F873C8646408A79970563A633403B693F7A36834640BA162D5664A6334007BE895536834640FA42189165A633405FF6A81D368346401EFEBBAD66A63340B45124D435834640F7A5AACBF7D333402407105036754640DEAA18E4F8D3334087C251E7357546400D8533BFF9D33340A96D826D35754640A94FF354FAD33340260019E7347546403BEEDA9FFAD3334076B00259347546409059B390D8D63340776F2D69CE694640FE41073002E833408D69A595CD624640B4D9E8EBF20434406C17545E53634640923AE697F4043440CCC5815653634640F404313740253440BFEDB1648C614640B3CAA6AC404134400049B5C09C624640BF9B9722B25234401F46CEE08466464020AAE23BB2523440785160E684664640B74A51CE3A5C34401A63E6AB956846407E532931F95F3440E3A608F53A6C4640CFEAFFC3685D34409736CA07CA6C46402396A40491593440F9F29D4E646D46400F3775AE8F59344023D44B92646D4640F09008818E59344008C52BEB646D46407CAE9E868D593440B6133856656D4640BEB3EB5BE6483440D10925C802764640CE6AB8B3E54834407A3DBF2F03764640222DAD3BE5483440EBCA7B9F037646401E02084D1044344079A5B26DDC7B464022D1F3F80F443440EE902521DD7B4640142E7D31D14334400AA55084D67D4640A20CF835D1433440E6FEC1E0D67D4640C2977A6562443440F66F05FE6580464067AFEFAB62443440F8EE168C668046409C7A443D63443440831ED01267804640D83F2B1464443440695B468D67804640DB50CC2865443440738F01F767804640DF4E0F71664434400FF2254C68804640F6C2EBA35F4A3440AEFDAE27AA8146404830EFE9604A34402429935FAA8146404810F045624A34407B601083AA8146405F6ADDAD634A34407BD71F91AA814640A2019D6AA34F344001A0F836B6814640EBE47353FF543440A42F09C33A83464072F105338D503440916010BE9C8846404292EB26BD4934409FBD8411DA8946405C3453B8BB493440A7A30F66DA8946402DA62A82BA4934406EE555D3DA894640C10B8291B94934405250BD54DB8946403DBABD05F7443440CD7E6090188D46409B145445F64434400F5BD54C198D464013837F86B74334401F556CED208F4640D7F11787FF2E3440C46512DD8A9446401B1686F11513344072A4485E09944640770CD87F2C033440ED040B9B879346403E4B7A092B033440A3CABA9A879346406661B79829033440BC9590B187934640F016E838280334402486D8DE879346406DCBC6F4F7F33340FC4D964809964640A8DDED23F6F33340EA43DFB009964640D346A93D73F13340931E7911C7964640C02EB345F0EC33407A41FD36E89746402BEC4BFCEEEC33408D9FDA9CE8974640ABDE89F4EDEC3340397E5218E9974640E3C93BC9C5E233404B4520A3D69D4640E7C01149FADC33404DC2215A079C46402C2259E1F8DC3340932052FF069C4640AAEC704CF7DC334047319DC0069C46403CEECC7E03D23340C5CE70B6C99A4640A7A5872801D23340BADFB392C99A46406BE05487DDB83340F36FFF758F9A46400CFD5E84079D33405A74EDA4D79946401AC96C21079D334069742AA3D79946407BE7C0684F8F3340D2ED2989B5994640414C2DD74D8F33406364A092B59946404281C0514C8F334060378DB6B59946401B794EE64A8F3340E0D5A9F3B59946407CFEBEA1498F334048BBCA47B69946405764988F488F3340F328F3AFB6994640E2A15BCBDF8A33402DD9BCF2BD9B4640EF241671DF8A33407F77891FBE9B4640F77C2E95D2873340B60EB107619D46402919A14B4A70334055C7ABDBF99B46406584F13C49703340ED24B0D1F99B4640F039EFB870523340E23B09218B9B464048C00E7E6F52334003469C248B9B46400EA417486E5233407B0983388B9B4640C8952D511A4033404A49A600389D4640280A9023194033403980D224389D4640B6AC751EF23433404351A671E49E464044E6F4CCF1343340B91D957EE49E4640985FF109B61C3340B1E55A9AF2A24640FDEA88F8B41C3340227A0AD1F2A24640E84EC2ABB81933408232850EA7A34640B51DFCA8B719334020DE4756A7A346405DA276C8B6193340A5E934ABA7A346400072E22A6A1433401835B318FFA546405E4B4DFE68143340EEBF34CBFFA54640918567EF28113340100C1581B9A8464046F773D905FF324054F3038A97AA4640AE56A80404FF3240197D7AD097AA46404BE0606C02FF32404092063C98AA4640446A093750F53240AB85AD15D9AD464072E13B1B4FF532404DCA728AD9AD4640125272484EF53240CFB21111DAAD464025A7F90280F032401795329CD4B1464055E08B867FF032400D7DF226D5B146400661FE577FF03240F7B187B7D5B14640B9070C797FF0324030CD9248D6B14640446A7AE87FF032402F06B0D4D6B14640258425A280F032404A78AA56D7B1464035E019E963F532400E4098D791B44640E8D8E6405FF83240C4CCE10710B846400D9A10DB9EF632404DF6BD6CCDC04640B2999BE79EF6324090490D03CEC04640C73AA6489FF632406F468195CEC04640B29556FA9FF632402AFD491ECFC0464001659FF5A0F63240FEB9F997CFC0464019AA8730A2F63240652CBCFDCFC04640D6FE8F9EA3F63240EE77874BD0C04640E58E3131A5F63240353C457ED0C04640B6AE71D8A6F632400EF3F193D0C04640DED6AC0DFD0B3340901BD4CC25C1464094A24980CA1333401446D67673C146407026CBFE55033340DCAEBF09B3C3464060C7C08033FC324090C9729208C34640F13EDC77ABF33240CAFD8FA6EEC1464092EDD4C9A9F33240DBD52D80EEC1464025BC8A0EA8F332408044AE79EEC14640C242EA58A6F332405A4E5893EEC146401A36A2BBA4F33240357913CCEEC14640F8634EA29FE83240D35D7A5CEDC34640E2FDD7A29EE83240A035E292EDC346405F60A72587DB3240AE5EB5C62BC7464005EFFED085DB32408652852F2CC74640D7EA6FC284DB3240C84F15AF2CC74640EF9FFE0584DB324032F0BA3F2DC74640AFB009A483DB3240668C09DB2DC7464001EBEAA083DB3240CA471B7A2EC746403ACFC5FC83DB3240717EDF152FC74640A43645CF1CE132402FCD4AE651CD4640B499DB58F6E232407CFB28659FD04640278CC9BEF6E2324081558BE19FD0464075B0CA5FF7E23240E4D7FD55A0D04640CC3E2337F8E232407A1314BFA0D046402ED0010701EC3240848A52B751D446401951424845EB3240ADC8ED39B6D54640806AF4448EE53240703228CC5AD7464039E749F78CE53240D46A11445BD746405BBD4AFD8BE532409CC7D0D25BD74640A4D9F9F0ADE13240C1A66DD53DDA4640085F5EEDADE13240684421D83DDA4640542E62BEACE032409988796DFFDA464078596B43ACE03240294764E2FFDA464089930A01ACE03240183ECD5C00DB4640987303A975DF3240CFC04E7606DF46401C7B4A9855DE324001FF7F7B66E14640C9BE53400CD832402A0FE3E1DFE2464098E561290BD83240FEFDB12FE0E2464010C4E63A0AD83240EE7F868CE0E246404A0D687B09D83240E1A4D6F5E0E24640C94EA08219D432407195F7CA7FE54640819F75D918D4324024692E6080E54640CED2548E18D43240158788FE80E54640EEB63192F8D232407FCFBA7C48EC4640C984FDFAFECF32409AAFAB0A55ED4640E5678C05FECF32403398357255ED464005A29348FDCF324048C251E755ED464080C33F8918CA32407F005C53E4F1464024A4F4FE17CA3240AFB040E3E4F14640103AEAC917CA324014C3E579E5F1464085AA45EC17CA3240A79B3311E6F14640A748A36418CA3240AFCA0BA3E6F14640E1F6242E19CA3240FC658829E7F14640188BA4401ACA3240E118399FE7F1464059F3BA6DC3CE32408C9E951E89F346400656A002A0CE3240B193ED3F9CF346406F0DC9499FCE3240332079BB9CF34640FB1A2DD59ECE3240FBB0C6409DF34640968CC6A89ECE3240C07D4ACB9DF34640970819C69ECE3240A93D4B569EF34640DC94242C9FCE3240B2640BDD9EF34640FF506ED79FCE32407386F25A9FF346407AD71EC2A0CE3240C374B5CB9FF346401E4A17F650D23240A414E2E516F54640F1EB722752D23240D133C04917F54640430A348A53D23240052E399717F546400FF7111155D23240BF5B66CB17F5464022D669AD56D232409E9253E417F546400CEBCA4F58D232400CE011E117F54640A39C8AE859D23240D87BC0C117F5464056A35A685BD23240F79C8B8717F546406DC2DBC05CD23240983BA13417F54640A58D27E55DD232405E2C1CCC16F5464080124CCA5ED23240105DE65116F54640B3BECB5A24D332403F6928AF92F44640A89445A024D3324090D5557C92F4464011733D56A2D33240439505F02CF44640D56438D2A2D332401026546B2CF44640EFA92396DAD33240312FB371D6F346405DF971A30ED432406F2C9E47DCF34640AD223C804CD73240C3B408EC97F54640CB9565904DD73240DCA6C36198F54640A9865DDE4ED73240D4DD30C298F54640BEDDB95C50D73240C8D2700999F54640A2E71EFC51D732406CE1A63499F54640E941DDAB53D73240B6B5164299F546401A6D9D5A55D73240CA24363199F54640691F12F756D73240C8B9B20299F546407D2EAA7058D7324043BD6AB898F54640A8EA3AB859D732402BFF595598F54640C4139CC05AD7324092287BDD97F54640F3232F7F5BD7324016D19E5597F54640CE487CDA38DC324038F3579601F146400C7533E538DC324046A1018C01F14640A474C54951DF3240DF0DDE01F3ED46403D2177C151DF32400F688033F2ED4640B39F06F6A3DF3240E7A9B6CD13EC4640D11F93B276E43240AC503019FBE5464060C12E2FD2E93240D9155AD2FBE146409714EFB0D2E93240777E3556FBE146403F9DE29C72EE3240F9B8CADFF6DB4640C30978DEBAFF324002758D2826D7464068BEFF1BBCFF32400F5566BB25D74640AFCFC812BDFF3240B906B73925D7464028D94CB8BDFF3240A17007A924D7464086C57C05BEFF32405541830F24D746409DDF0DF7BDFF32403A90B67323D74640B0CBDB574EFE3240283816C474D34640EFC63BF94DFE3240CFF2733774D346402DB7EB4F4DFE324002EFB7B373D3464072F91F624CFE3240C8FEB53D73D34640DF5C8F384BFE3240D42DC1D972D34640117F6D5DB3F53240F0C90CC611D14640A538D39C38EC32404F4D6DEC8AC94640CBD0DDB0FEF832408FC832FE33C7464000305DE9C9FB324089040EFBF1C84640FC6DF2EACAFB324056CB9F7AF2C84640DBA0DB31CCFB324055D8D0E4F2C84640D39010B0CDFB32403B4B1235F3C8464054672955CFFB32403642F267F3C84640D8F4120FD1FB324081B4417BF3C8464032F72149F70233408007F43C00C946401C8674B1F902334070DEAE2100C94640B7363B38620B33405834F0772EC8464046200953640B33400BDA33262EC84640B315FE4E5117334083CE2002A4C54640617B3F8752173340DBD32CB1A3C54640EB80F69053173340E6EBCE4DA3C5464010057863541733402FF544DBA2C5464013C5DAB668193340EAD70C143EC446400C696FAE881D3340639AE0FC4FC346402373F2F8891D3340797D15A14FC34640D89B1F0A8B1D33402C3962304FC34640ACD074D78B1D33400B9C1CAF4EC34640FC150C598C1D3340A1A43D224EC34640E64DE9898C1D33409989308F4DC3464064D0292AC31D3340D5A12B4224BF4640E197FA04C31D334002D807A823BF464061343987C21D33400A00CB1323BF46409EA22DB6C11D3340EDC4AE8B22BF4640B14B9F9AC01D334060706A1522BF4640D655086BDB163340877755B0CABC464004707309DA1633404039274FCABC4640DF4D2676D8163340CB6CF609CABC46404B23C3C2D61633408887C9E3C9BC464083475302D516334087D64BDEC9BC4640E8A11F43EA04334004F27C333ABD4640E945CE2834063340A16673044BBA46405FE24B99870B334017335344B5B4464066B8D0FE870B334031E6689CB4B446409FFEF8F5870B3340A846C2F0B3B44640D5D3397F870B33407C3E404AB3B4464023D0AD87110933401B7355BB65B24640317A4DDB10093340567A4C3E65B24640ED11C5F00F093340C79984CE64B24640C96D08D00E0933403B1DC86F64B246409DE5E1820D093340A05C4D2564B24640F192B2D6F5003340D449A931EEB04640AB03204DCE093340C3EA8F863BAF4640EFB7931D751A3340D869C25A12AD46404534C379761A33402C897A2012AD46405F88ABB2771A3340CCCD22D111AD4640AD2729BE781A3340975C4D6F11AD4640A0419193791A334043BC25FE10AD4640DB83772F8B2333401A0FD25329A7464034393E71923A33406D29562AF4A24640DCD5C81A3348334053955E20FAA046403D4EFB53CC543340CFF714C367A046400587994FF1623340E6FDDECCDA9F4640848DA21F1A6E3340F1580270FA9F4640FEEB1460F68333402C37D0F8F2A14640F78823CDF8833340A9C6750FF3A1464023EA70F3A58C33406FDEC4AAD0A146400520D586A78C33402259C796D0A14640BFBE2A08A98C33406EA22368D0A146407E857569AA8C3340A9118B20D0A14640D87F1A7B34923340D8576A376DA04640526400BE35923340E5F0FCD36CA0464009B52B1B6B9933407BD48C94B59D464014F011F05DA633405D0F4964869E4640BB63022A5EA63340E795A367869E4640D0A7FFAC0AB23340118A3E37249F4640EEAC8CCD0BB233408B55733F249F464004BF779F92BA3340DB5C40C82D9F46402462AB597BD43340B87E7281DE9F4640027F99275ECF3340853598E64CA44640D42D22AE5DCF3340F4682E784DA4464067799C895DCF334074BE660F4EA446406C3082BB5DCF334040FD24A64EA446409334CF415ECF334020DB51364FA44640755416175FCF3340B7FD19BA4FA44640B76CB93260CF3340293D2A2C50A44640EA8B428961CF3340C8B8E68750A44640307FDA0C63CF3340DA839AC950A4464055FDD7AD64CF334074FD9DEE50A4464072A7615B66CF3340AC4672F550A446408AEF245AB7DD334025EF666C08A44640218CCA28B9DD33407A4F005108A446407A459DA0EAEA334001721D0EB6A24640387DD459ECEA33408DBC5DCEB5A24640180D15E0EDEA33402172B16DB5A246400D68FA1FEFEA3340F863E6F0B4A24640446E036257EE3340894268FB08A1464094950BDFE3FC334027541C18D89A4640186440CD99063440CD5DA6ABEF9746408EC9F091DC1234406C3D2FB7C19746406825EA58233234400F0EB8B93E9A4640815B6BE6472F34403A6C231F169F4640DF55F6DD2F1F344073FAFB1889B44640640DA19D2BFC334073F0747D70C6464029B8FBE62AFC3340073C30EE70C646407DF8F5692AFC33403F313D6871C646401D83402A2AFC3340049301E871C64640E8C0BC292AFC334021F2B76972C64640F95DC41C3BFF33407963D43720D3464022925F4F3BFF33408D1F7BA620D346406E0A21B03BFF3340E554491121D346407FA3CC68A90F34407533B5B671E146407247EA172B0A3440F1A5CE2760F34640904757BBF10234408BE06CC7420547406E3E2CACF10234404E5D60F842054740A95A3A2C2BFF33402E6003DCBD164740E63898382BFF33408DBDE576BE1647408DD7BD9F2BFF33406978A40DBF164740BAE4525D2CFF33406EECE599BF16474003EE5A692DFF33401A93C115C0164740357F8BB82EFF3340F1BAFF7BC0164740CEE4C53C30FF3340DFCB51C8C01647402E71AFE531FF3340C3B980F7C016474066DA61A133FF33405EB08F07C11647402E5F42E3D1283440B2EE9307C11647406B3DAE89D328344010C007F9C0164740D2B9E71FD528344099283ECEC01647407C537096D6283440A1F2D888C016474048FBFEDED728344037B77D2BC0164740DE900BEDD8283440CF05BCB9BF164740D43F49B6D9283440649FEA37BF16474046120B33DA283440AF18FDAABE164740D2E28E5EDA283440EA805318BE164740590295BB2C293440A2EEF936B8FF464094656EE3C72A3440DA14AF6F9DF44640CF247494D43234409F04EDF793E14640B3DCC5AAD4323440BFE43D7593E146400D32B879AD3134404A23C25CABD24640091BE34DAD3134404CBB46D8AAD24640199944E0AC31344054E69058AAD2464077031E75D2233440AE044F5782C646406E92FAAC89473440EF770B1FB0B446402698297F8A4734403E5CAD9BAFB44640728808038B473440318D380CAFB4464016E3E3F4E751344008BC7208C6A34640EB8B5519E8513440BF50FFB7C5A34640C32FFF8B00593440FB12314AD48B46400063EA7E3E5F3440CD3CB0B019884640891D644B3F5F344013C5BE0C1988464084B016CF1B633440660A4F87A083464000E3DD1B1C63344045FA0308A0834640027ED8291C6334406E33F0859F834640072C9CF81B633440644BF1049F834640AC819F891B6334401E9DDC889E8346403DE9ABAB075F344089507E5622804640A5C119F0065F344072CFF8D82180464034A292F5055F34408F8D226A21804640CCB6F4C4045F344098E4E70D2180464047611E507750344060DAE6E77F7C4640D51EF4283F53344067A199983A794640326172EAA156344032F0521D0C794640125A1881A35634407510A4F80B79464005D08BFBA4563440DA8D52B80B7946405F8B114BA65634404655DF5E0B794640131D9A62A7563440B8C2C5EF0A794640FB903D51BD6734407875E64FB770464035E49030878234406FAD9D87D16E4640BD2442F00E9F34409BC11D648A7046408E9D6BC4109F3440E8EA976D8A704640EB370693129F3440D70653528A70464063D18645149F34404E46A3138A7046403A299724B5AC3440FFF50616EA6D46405B841372B6AC344070EF5BC6E96D46403140668FB7AC3440BEA0C761E96D46406DD15872B8AC3440F1B1E3EBE86D4640719ACB12B9AC3440F76BE868E86D4640885B006BB9AC3440750D86DDE76D46400DD3CE77B9AC344043D4B94EE76D464041ABC138B9AC34407745A0C1E66D4640AE49E7DD52A73440FA2DD4187266464008CB8F01C4A8344093015A773763464091C55B714DB63440EC824FD6C25C4640CE21FD7E4DB6344001A6BACFC25C4640B5BA9E1BD9BC3440B000A80A90594640721A15D555C63440BB14E8A9DB564640DF9D0B4E30D03440E33D75C80E5646401A0F67F3AEDD344025E9EE70BA564640960C08968AE9344020013FAB0259464044B55F282DFB34404C8782A6475D4640A3731E762EFB3440BB6C6AE8475D4640AA8E9DDF2FFB34409EE9EA13485D464070D200273E093540FB690A437B5E464099BF17263F09354022FEFB527B5E464038014CE7F3163540A359D722085F4640328B1423E822354089377E2DD76046405B7561F7972A354037B645660164464004135362992A3540CBAE8FDC01644640494A057F9C3E3540FC631C0724694640AF9CC57D9C3E3540B25A2E47D96B4640B0D285A69C3E35405B736FDAD96B4640DC5A361F9D3E35404A400968DA6B46404B0235E39D3E3540BF028CEADA6B4640016FFBEA9E3E3540B4FBF45CDB6B4640FB14692CA03E354086ABDFBADB6B464039BF269BA13E35407BFEB000DC6B46409DDA1F29A33E354061BDBA2BDC6B464063DA0CC7A43E35404FE6553ADC6B464042A17365F75C3540C052C645DC6B46402CA2A600FA5C3540D89DEF77C06D46403F5C232AFA5C354087890A0BC16D4640B8BF6CA3FA5C35403ACC7398C16D4640F2B0DC67FB5C354031CDBF1AC26D4640EEA8EB6FFC5C35407502F08CC26D4640CC967AB1FD5C3540A1F2A3EAC26D46406A303620FF5C35409E274430C36D4640C9E30FAE005D3540FE6C255BC36D46405FC6C74B025D3540FFFFA269C36D4640EAE462C8D489354005763884BF6D464021CE9563D6893540D8629F75BF6D464038CD0BEFD7893540A6EAF94ABF6D46408D6ACA5BD9893540708FE505BF6D4640778D07BB45A53540B75EB4C63F674640666D1DEA46A53540510F716F3F67464036FB39E747A535405987E9053F6746400B69D1A948A5354037F0AD8D3E674640C3EFBAA5AAAB35406CADF7994B62464020E78C8256B735403706C597235F4640011AD70A50D33540EAE5A471E15D4640DF45794D51D335403D36D959E15D464010A09E834B073640D2C54B0E7D584640230188F44C07364060C101DA7C58464058F996434E0736408108138E7C584640DCE503654F0736405C062B2D7C58464060DBA14E500736405FEBB1BA7B584640F1ACCE597F0B3640CC6FD85BF75546401422D5AAB31136403E5AB382E454464094B8DCFBB41136400015CC39E4544640CB412921B6113640DD54DBDBE354464065448E10B71136409F49236CE354464048F3BDC1B7113640290284EEE25446406AEA922EB811364005035967E25446400BC24653B8113640889452DBE1544640CCAC775CB81136406A09A351084F4640F6C4D0325E273640CD5D9401AB4E4640BBED0CBAA73A36400188671398564640CEC7363E4C4436405BE80AD745604640918ABEF94C4436409BDE4A6346604640C991DD014E443640B371E6DE4660464031B4654B4F4436400525A24447604640D8F263C8504436405E872F904760464090A2B76852443640BEDD5BBE476046401031C11A54443640CBCB32CD476046401F58161F4F7A3640FC913F0E1D60464061E063A7F98F3640AD353B0E1D604640A94B8878FB8F3640B9D9BAFB1C604640485CEE32FD8F3640D4F44CC51C6046406D26E3B84DB136407990AC04775A46406665AB1F4FB13640F7024FB7765A46400119AA5450B1364069874052765A46402E95C14B51B13640E78477D9755A4640199141FB51B13640566BB051755A4640DF67485C52B13640EC283EC0745A46404B2B086B52B1364010B9D42A745A46406CD3EC2652B1364025E54F97735A4640691F87E922AA3640A7321ED4E550464015954F3F09B53640FCDFF09D714F46400C819C2C1ECD3640A9BDD79D714F4640F586E9C81FCD364054C5428F714F4640082E555521CD364095B83E64714F4640E435A6C222CD36401B7C721E714F46409228D50224CD36406F408CC0704F4640C146960925CD3640DC27274E704F4640AB69D2CC25CD3640E6D2A7CB6F4F464007360A4526CD3640F02F113E6F4F4640ECD09F6D26CD36407736D3AA6E4F4640D149446A26CD3640DB1E04FC9D3D4640A66B214026CD364090A0D5659D3D46404E4D62C325CD36405773A7D59C3D4640983D03F924CD36409BB53C519C3D46404CB91AE923CD36404F2BE0DD9B3D46406AAB869E22CD364057192E809B3D46400E3F7D2621CD3640411AE53B9B3D464090FE9D0727A63640CEE0A035303846406DEB9C555C9236403A42478FB0344640DCC2E4DD4C923640B8AAACC8492E4640D62CF984A9B83640251AA4184E2E4640E534921FABB8364022FA2E0A4E2E464062906BAAACB83640337446DF4D2E4640AA0D5A16AEB83640208590994D2E4640EE8B6255AFB8364015C1BA3B4D2E4640D27A435BB0B836401FFD5FC94C2E46403663ED1DB1B8364064DBE4464C2E4640B5D7E595B1B83640B0964CB94B2E4640D4FF90BEB1B8364058B607264B2E46405AE8FC42B8B836402EE71CFDFF1E4640F1DF0514B8B836404E48E05DFF1E46401C04B188B7B83640E6AEC7C5FE1E4640EB9242A7B6B83640954BAA3BFE1E4640421DDE79B5B836409F54BEC5FD1E4640279E06F9D5AF3640BFD4B4072F1C46400E27AE69D5AF3640AEAE2FDE2E1C4640A521F43A81A43640CC9F4D182F1946404B69B1FB7FA4364072BA90D22E194640926A209F7EA43640B01F49A22E194640137A4A307DA436402F25FE882E1946403701CDBA7BA4364051CE7C872E19464088A49F14D88836405C347179F31946404EF51F81D68836400BA7FF92F319464024371C03D588364001A441C8F3194640AB1121A9D388364084E72F17F41946408CD95B80D2883640EEDDC87CF41946408B161A94D1883640F7F22DF5F4194640754F5BEDD0883640C74BC97BF519464034FF80136D7B36400985B51965284640583F51F9726B3640FE4E3FD063344640DE4E1F5F726B3640284D596F643446409B42292B726B36401F19BE166534464055877F6E796B3640B5B3C9D9D43E46401FC64D94796B364028885967D53E4640145E99037A6B3640A933DDEFD53E4640C4C06FB87A6B364032267D6ED63E4640DEEB66AC7B6B3640BB9BBBDED63E464072A6D7D67C6B364062649D3CD73E46402F132C2D7E6B3640BE0ACE84D73E464048CE3FA37F6B36406610BEB4D73E46404EB9E8F4F2833640A1525E1D1141464041896CFEF28336400B1EEF46504B4640DFBE3CC17E7D36409A89110D04524640AF7DF4228674364013B124E96C524640312285267655364049F0A56508524640CFBBD46F6D543640D928B1ACA74E4640FCFDF0686D543640D391A898A74E4640F5B97883234E3640AC9E51B4263E4640CEA3542A234E3640C8772F2B263E464048269D8B224E364032FB5BAA253E4640DDE7D6AC214E36405BC25136253E4640EDB0C095204E3640589919D3243E4640FF7B0E501F4E364091962684243E4640671913E71D4E36401567374C243E4640F9665B671C4E36409BE03D2D243E4640C04A65A72B3B364018278234433D4640673831CED53436407ECA13289B374640E4842C0DD53436409B916BA39A374640A23DF206D4343640C883FF2E9A374640C316CDC5D2343640BF5C61CF99374640CFB95756D1343640DBD05188993746405D22FEC6CF343640B8D89A5C99374640BDB76C27CE343640C6ABF34D993746400DDD2CFB3B06364070D2164D9937464029F7625D3A06364041439D5B993746408B0B9BCF380636405556F4869937464015004F6137063640C3606CCD993746405327BF2036063640CC83472C9A3746407C4F641A350636404CFBD49F9A374640168A7358340636408ADF95239B3746408B8178E2330636402DEC69B29B37464007078EC951003640E1E7CC649D4246402062036D28FB354034732C8FD0444640E25E82DE27FB3540CB8758D3D044464088B77B33B7EC3540784720E9974C4640E1167F2453D535404F5D03549E4E464066CBE6A893A13540B32AB0359E4E46409D1D5D1292A13540691697439E4E4640CE53E48A90A13540B50A256D9E4E4640D3F716218FA13540A72FCDB09E4E4640783C74E28DA13540A666090C9F4E4640BA18DFDA8CA13540CB64727B9F4E4640F07F128C0D9135406023F86522574640BE8257710D91354072F9137422574640AB2F48261E8B35408B04FFBF575A4640F199D4EA4F8635409C1F8E9CDA5B46409C028C6A6D5A3540F13A62BF065E4640CBC9A3C56B5A3540E2D2FDE3065E4640B7A86C3E6A5A354043A55826075E46401EE541E5685A3540337CAC83075E464095E891C8675A3540A86F12F8075E464077CA43F4665A3540E9A8AC7E085E4640E5E93771665A3540E478DA11095E46407CEBE844665A3540249474AB095E464086B8F52D665A35401D1F3E8C3A624640A3ACD2EAA73E3540E29B168B3A624640A70AC080A72C35408F89827E945C46407C7CFC87952635405237B395295A464025185D2394263540A9B26624295A464095BE9B809226354063107BD2285A4640530FC8121D2135406F626D9E5C5946406C94F7C41A2135404105D7695C594640A206F58D361E354045418DA841594640CD02B9B1351E35401774B3A4415946403C6E29782407354021FB05014759464076D3F38FD3FC3440A05C8AB408594640295C109150F234405004FBB1655546404F1B8CC14FF234402E62DD72655546405529BB0EDFEE3440DB2680BA7A5446409AA6AFEDDCEE3440397C91517A544640EC42BDED16E2344065737AB3D25246400EC8B9AB14E23440AC4AD887D2524640117160D022D034400347099661524640A050441A21D0344001B6729B6152464054189540A9C234400DB57E9A0C534640CA66F35CA7C2344061F6B4C70C53464067DFEC51E6B83440E98604E76A544640A6BA8E16E5B83440FC81641E6B544640EF2739F9E3B834400DA4A1676B5446402C32CB01E3B834402EB6B6C06B5446402708DCA656B4344030549E105B564640795C09D8CFA034404B495C1B615E46408E501DE6CEA0344009961595615E4640759578FAA69A34406D3093F23B62464092AAC745A69A344030EB5E863C624640D33F46EDA59A34403DA775243D62464056AA9EFF64993440EAED7B7930674640C96B850D27883440CCA9D7FB1E684640990807B5DA7E3440DB772A3397664640A27AB15E226C3440B399E7A01D5A46406787529A216C344097CA09351D5A4640EDA478A5206C34400F0D9ED61C5A46408FABB442AF4E344092BF9956855046409D4ED512AE4E34405BCC1204855046404CC15BBEAC4E3440B67865C684504640C33A6050AB4E3440DA45949F84504640F1B9CFD4A94E34400703E39084504640FE4EC5533E243440594C00563C5046403CEC78FF56063440A418086E214C46403755669B5506344069E07649214C46406FDBEC2A54063440B2C7AB3B214C4640D5AF5EB952063440E44B1345214C4640DA52CDC63ADD3340F3715B85774E464018A4F97439DD3340D890C8A2774E4640EDDB383538DD33400D9296D3774E46400C25311037DD33407A817316784E4640127A4048F3C133403E35ADEFDE554640978D6A7986A63340926BED220758464011CF92EA84A63340CFE6605107584640469A3F7D83A63340166DF99A075846406AB8CA3F82A6334048E6D2FC075846401194AC3E81A63340C153157308584640A5D1FE8380A633406C771BF90858464059BD161780A63340068BA18909584640A0979BA36A9E33409CE08CC37D694640341A8021488E334095F4F4DACF6B4640E42DE8BE478E3340CEB929EACF6B4640F503D28A707B33405085E4DDEA6E46405A85373DA0633340DFA80E13CA6C46400E8998A19E633340312525FDC96C46402F1304F5523E33404B6C3CBA1B6C4640 RS Stretch \N 2019-06-14 12:43:36.283574+02 Intevation t +AT_stretch_1 ["(AT,XXX,00001,00000,18727)","(AT,XXX,00001,00000,22232)") 0106000020E61000000100000001030000000100000054010000AC1D394632192D404B2EF2A7CC1F484026090E9EF82E2D404471E2D4A71E4840DD713DC3FB2E2D404F9EB69BA71E4840DF875D97FE2E2D40F69FB349A71E4840038449FF002F2D40A374ECE1A61E4840427A6693FF4C2D40AA53EC0F801848400AF8BEC3A55A2D408E8A871D4417484051AEF9AC38A82D40744B88E35B1A4840B22EB75717AB2D40BC6A5C43081B48402234FEF280AB2D4070E455CFC91D48407709555A81AB2D40E180075ECA1D484033CAC36182AB2D405EEDDCE6CA1D48403269BCFF83AB2D402C9ADF64CB1D4840B8053B2586AB2D40E7767DD3CB1D4840B95651BE88AB2D403363B32ECC1D4840F845A563F4B92D408DC163AF6A1F4840100E558FF7B92D401FDEA5F76A1F4840FDF1D101FBB92D4094F0F7226B1F48407B898E96FEB92D40F19F8E2F6B1F48407CB755E915EB2D40746D4324401F4840A6C7D79019EB2D40D4378810401F484049CC780B1DEB2D403EBCD0DC3F1F48404213743220EB2D408C485D8B3F1F4840320DA9E222EB2D404582B91F3F1F484076BE22FE24EB2D4021E4949E3E1F48406F8352CA91F62D40821E52B7C91B48407302F14E94262E40B338A3043F1B4840644041E297262E4043E437EA3E1B484066ADDE419B262E40179A12B13E1B4840274E43499E262E40380B9E5B3E1B48406E275031022F2E4043A7106A181A48400332455A89482E408441C698011E4840BEC2F84B8C482E40C0DB11F6011E4840FD07C6A08F482E403B685C37021E4840BDF4EA3393482E40D575D559021E48402C4FB4EF4E8D2E404116E39D5B1F484069FA0A134CBA2E40024509523B244840B9FCA956FCC32E406CA61D700D2F484047AEE611FDC32E40E11F7BF10D2F48403308A152FEC32E4022505B6B0E2F4840753CE00E00C42E406A25F4D90E2F4840FF54D43802C42E40AD53D5390F2F4840606A8EAC9EF82E40C6E77266AC36484067F66C6DA1F82E40E4140FBAAC3648408405ED80A4F82E40EE6EDDF5AC364840A5385FCAA7F82E400C46B017AD36484058241D2BABF82E403B334C1EAD3648402D88961D5D3D2F40CE0DFD15193648406D6CC25C8DC82F40525C7DE30836484053E0618D90C82F40EB0788D60836484042E79DA293C82F40B4404EB108364840CAAEA38296C82F4078D60775083648407D1D5E1599C82F402DAAAD230836484055A98E4991EF2F404E6799413B30484027CA5259F31930405A43DDC08C304840D877FA60EA2930405EE4921C603248409195EBEFEB29304024F2063D60324840FF7EE689ED2930400C01F94460324840EAD4989950393040F68AC1FA343248405B023A47523930404B092EE83432484085785BC8884C3040EDFBC066BD3048402E0B4D4D8A4C3040549F5B3CBD3048408A1E00B58B4C3040852559FBBC3048409B11B8F38C4C30400998D8A5BC304840CFDA9BE72E5730401398457E4F2D4840B07392F32F57304068B295164F2D4840F180F0C23057304070BA79A04E2D484051818D36205D3040DC99AD5A16294840115EB7AF5D6B304040717212821F4840169D588D5C823040A83FF50A7017484061DB17E8329D3040C7CD56EF5A13484099E7CF15F8BD3040AA22BB2B1913484074521F7D3ADB3040EA2AE00E1B13484082DDC17F11E1304095FD6C982C1748401E25F79012E13040613399292D1748406DEC2AFD13E1304096EF62A22D174840D2F88AB115E130406A388CFC2D1748405A4D1FE8EBEF30408E910A88821948400332A1F1DCEF3040002B772B2A1D4840702EF41ADDEF304085A739BF2A1D48403F850C9ADDEF3040D6B36C4D2B1D48405C8BFF69DEEF3040860990D02B1D48407DD6C182DFEF3040C9ED90432C1D484013E876D9E0EF3040966FFCA12C1D4840C9BDDC60E2EF30404A772BE82C1D48404A1ECF09E4EF30407AF366132D1D4840FA8DDDC3E5EF3040BCBC02222D1D4840E4EDD11C2AF730400290BE132D1D4840A80CD1C52BF730402AA339062D1D484082D39A5F2DF730406A7C3ADE2C1D4840A5B58ADB2EF73040C5FA2E9D2C1D4840C3370D2C30F730406C1E6A452C1D484069201C4531F73040E3C50EDA2B1D48403376AC1C32F73040A4FDF25E2B1D4840BA82E8D12C003140A3033E6FB316484016520FC6350D3140CB70F27F071448403BC69218370D3140CAD0E82A0714484032669F35380D3140FED634C206144840D8322A13390D314060E28649061448401DFC64A9390D3140516B1FC50514484099406DEC081131409046F17D640F484062668F35091131400B1DF7F3630F484087CC3731091131404811D767630F484029D08CDF08113140868B66DE620F4840A6A55F43081131405A3C635C620F48403E771362071131400D3F49E6610F484093D16D4306113140FE7E2B80610F4840330252F10411314011BE8F2D610F4840A7835138810B3140086D8265470E48405033F9A87F0B314084929D26470E48401876ADFC7D0B31406B9CFD02470E4840C9ECDB437C0B3140B65B00FC460E4840E12E6D8F7A0B3140E771EA11470E4840E2C21EF0780B31401CAFE443470E48405CEB3DC37EF9304041423A9121114840616F15E2EBE130404DD8BCBFF00B4840D4139150EAE130409D8F7279F00B4840DC2F2E9DE8E13040A3BC7D4FF00B4840042D89D9E6E1304043D49043F00B4840815489C7DFBA304014A3A9CD360C48408418390CDFBA30400AB38AD1360C4840836D1934069A3040A58947BD580D4840BFB87049049A30400B81E2E0580D4840C7C495791F873040B1F673C3790F48405E1C5C8A1E87304092438FE3790F484069C2A74FA5743040BD9827405F124840C6EB606EA3743040650310A65F124840C4CD2D17DB5730404369A7B0511A4840DE10EA9ED95730409D3CE734521A4840799BA490D85730404EA579D3521A4840F8ECC9F1B6483040BF5B5139602648406D8F3E62B63D30407B3F78D06A28484043A913ACF4193040C6F05C35E22748401FFE0F55F4193040A9D39834E22748405BDDA80874F12F40B3BBA482CB2748406ED332C66FF12F40A0533A97CB274840638C84C16BF12F4055E1FBD6CB27484097A58F70CEAE2F4086D83F4B872D4840585278DF4F772F400B125F36862D48405B6095F34A772F40BDD2E653862D4840C9ED866AD33F2F40BC0D4E712E304840C3F036BA28FD2E404A667D9E942E484000A6C08F7FE52E403231DDD57F2B4840DFEB85088ADE2E40ED974E60572448406E660E0189DE2E4007847CC156244840489C453187DE2E406470FE2F56244840CBE12BEC1BD12E40B99B9EA00C214840D8FB69DC18D12E40BA59F60D0C2148400855468425A42E40EF3D8541901A484085F34BDD22A42E407D2674F08F1A4840D835A8E81FA42E40B03EA5B58F1A484094FD2FC01CA42E40517F1A938F1A4840591A23C370742E4055C6D4C5491948400A58A4A46E742E400673DCBC49194840791DCD66C34B2E4013140952061948403BCE708FE8482E40A54049E74E154840373C19DDE7482E407C3A2D614E154840781B589CE6482E407A38B2E24D1548408777CED7E4482E404E2F09704D154840544A7B9EE2482E4099CDFE0C4D154840FD443C03E0482E409840DBBC4C15484014693117ED3A2E40B0788650ED134840407EC25BEA3A2E4064059618ED13484038106771E73A2E404BA080F5EC134840B095286EE43A2E40BC784FE8EC134840FC89994EDE292E4027D45A2CE11348405D04177CDA292E40F741973BE1134840AC8683D4D6292E401B1BE86DE1134840E6674284D3292E402E3FEAC0E1134840B96A92B3D0292E40CD79AD30E21348406E964F32431A2E40EB34332CE21648402E3A77AA12182E4047FC094191164840FD5598C00F182E40E36AA7E990164840630EFF7C0C182E409A9915AD901648400499B00109182E4007D5CB8D9016484076C9F67205182E40A238108D901648404B86DBBF6AE82D405A8E0E08541748400F59837E67E82D40A907BB2254174840D884BE6964E82D40035D015754174840D4ED6A9D61E82D4027C408A3541748403749D7325FE82D408E9B210455174840F639DE3F5DE82D4081B5DD7655174840F2248D2647DB2D4098D521DC061B484082629114D4C22D408110677FE81A4840BF97D64AF9BD2D401582B0D1AE1748403E428117F8BD2D405A017E43AE174840A7C6CC40F6BD2D40A5CF63C2AD17484044549DD9F3BD2D408E5B9053AD174840B584A3FAF0BD2D40C74C76FBAC1748400AB05EC1EDBD2D406ED19EBDAC174840C9D90FDFC5632D40AB049431A4124840D9144968C2632D4004590710A4124840669E4FDBBE632D405C66E90CA4124840B526105DBB632D40C5965A28A4124840A0916B12363D2D4021349AD7811448409B7D45D7323D2D40F43DE60E82144840FF2930ED2F3D2D401F5A4C60821448407EBC1DF020122D4078ACA569491A48409E3DC967CFCF2C40ADDB8AEC1E1D48400190F87C9AAC2C406FA44DC7E71D484066B54B8897AC2C407A794EE3E71D4840134067BB94AC2C4056CC7E14E81D48405285622B92AC2C40FA246C59E81D484006B79B1B8B982C4013B694586F2048404F30E26688982C406167C1C46F204840A3D79D4886982C409DE9AE4670204840A02BAFD884982C4090AFA4D870204840E041D51A14902C4009434DAB1A2548408C9996E7CC6C2C40903F63167C25484035A5E92472392C40D29D817F9F2448405F7530BE6E392C40D2F1DA7E9F244840FC59DA666B392C4002E90D9A9F244840D1539A3E68392C40457618D09F24484033AA646365392C4041E2F91EA024484011BB52F062392C40C5CBC583A024484007E1A1FC60392C40EFE3BFFAA02448405C07A8181F352C401351865BE22548409DF2E406F2242C408464522B2E2648406B8F39FBED242C40D2BB32532E264840F900EA43EA242C40231548A22E26484004FDD8F878FD2B40127627C17C2A4840F601C46976FD2B40D16DF5177D2A48402AEFB84574FD2B40784961817D2A48403DEF719F72FD2B40FFD5D0F97D2A48400C045D8571FD2B408888267D7E2A4840BCCB1D0171FD2B40667EE5067F2A4840802D391771FD2B4047BF58927F2A4840BB46332EBF002C401DCCFB981A2F4840D9BB21773CEB2B40BF3CEAB53D3248405C45EACF0ED82B4073B5D3E386314840894FE3B70BD82B40C33851D2863148404316B49908D82B4020BF3DD886314840A2E92B8E05D82B403A256AF58631484049AE85AD02D82B408147EE2887314840CB1C604AD7BE2B4073186E3CBD334840E7C5DDDBD4BE2B40F7165E7EBD33484002BC017503892B4070991DEB823A4840004A5CC601892B40E9469628833A48404F2E28FEAA6C2B40CCE34631183F4840CBCC8FB1A86C2B4085E9B5A5183F4840AA7066FDA66C2B401DAA632B193F4840946262F3A56C2B404873E2BC193F4840F120519EA56C2B40BABA49541A3F4840A610A701A66C2B40268A73EB1A3F48400E915B19A76C2B40DF693C7C1B3F484009E912DAA86C2B408531C3001C3F48406E599431AB6C2B408127A6731C3F4840E1898707AE6C2B40B8F33AD01C3F4840D19E713EB16C2B40E91FBF121D3F48403B3A31EB826E2B40CFE3C379393F4840589E9BBB9A402B40EBF2C87609434840DEB7C7339A402B405B248682094348408FECB90F480C2B4049E5A5CABC4748401C6A8C5D450C2B40A8F4C516BD4748401DFA170A430C2B40ADED6B76BD4748405B362429410C2B4067726AE6BD4748403908ABCA3F0C2B4079240963BE474840ADCC50FA3E0C2B40C84724E8BE474840365301BF3E0C2B4013F64F71BF4748408F4EAFE87C0C2B4030835EE3CC4948402A3C3616D7DB2A409EFB401C194C4840D7C7EFE0D3DB2A4073D5B051194C4840E51849F9D0DB2A40E71668A0194C4840B18F377BCEDB2A40AA2371051A4C48403F5EB87ECCDB2A401B8EFF7C1A4C48405DA5E916CBDB2A407FA694021B4C4840B8735251CADB2A40D6BD2A911B4C4840F9916035CADB2A40037C65231C4C4840390121C4CADB2A401978C5B31C4C484035DC35F8CBDB2A403422DD3C1D4C4840D474A3E0CCDD2A4097F99397CB4C4840AFACD5A1CEDD2A40F6646E11CC4C4840691974E5D0DD2A40EF2E117BCC4C4840ABF1BA96D3DD2A404288B3D0CC4C4840CFB6F89CD6DD2A403112440FCD4C4840D9AC70DCD9DD2A4069018534CD4C4840903D5937DDDD2A407AAC203FCD4C4840D5BB4A7CD0162B40702326159A4C484019501C6CD4162B40A1CFA4FE994C4840B3509F24D8162B40926C96C3994C4840A9D849E1274A2B4080DDC2BE4548484081410D20284A2B402EAB5AB945484840880CBD30047D2B40F687796ECC43484034814113077D2B4094C7241DCC434840A609AC88097D2B40FC4A8FB5CB43484010630D790B7D2B406072A93BCB434840FA6385D10C7D2B404CE615B4CA434840EDBBFA840D7D2B408D77FC23CA43484038769A8C0D7D2B40F7EED790C9434840A3661AE80C7D2B4063B54000C9434840C9F9BB9D0B7D2B40755BB677C8434840FA272195E07A2B40BE7E57481743484025E9DA34BD852B408C1769A6014348408E8344B5C0852B40AEE6649001434840F2398C09C4852B4027AB465D014348401AC8CC0FC7852B4010D7160F0143484083583BA9C9852B405574F1A800434840F50561BBCB852B40EF7BE62E00434840384C2831CD852B408D79D0A5FF424840A0B0B3FBCD852B40E7202313FF424840781B6EF784872B406196133DBD404840C9B51C1871B52B401F3B4859393A4840F810AACE1CBE2B40030C3070C03B4840FF59E3221FBE2B40D3A83BC8C03B4840A33398CA21BE2B40F934920DC13B48408857CDB024BE2B4042C10F3EC13B48407E9599BE27BE2B40521D3558C13B4840C41FED8656E22B405990138E6B3C484025ECF9205AE22B40DA03498F6B3C4840622C79A95DE22B404CAC7E716B3C4840DADA18FB60E22B403435EF356B3C4840C691CAF263E22B4071BE0FDF6A3C4840FDD6357166E22B40E3E675706A3C48404635035C68E22B4091EFB1EE693C4840BA79F29E69E22B409E871E5F693C48403188C9778BE92B40AAC2CE3AE1374840E1A5E51AA3012C40A35C4AACCD374840F00D49B4A6012C4007BB8499CD374840F7536923AA012C40741AF067CD374840B7157643AD012C4020FE9F19CD37484009AAEEF2AF012C4043EDDBB1CC374840D8480915B2012C40154BFC34CC37484084A9334DB61A2C4074AE1BA8A03048409E9132D4B71A2C4098893116A0304840C16DF599B81A2C401FF2D6799F30484087959E95B81A2C40B7620EDA9E304840932A940EDC182C407FB10CDDD32D4840751E59F9643E2C40687CCF5E5F2A4840477A526ED8642C402E5C3AA7922C4840DD2E3159DC642C40367C01CC922C48402226005CE0642C40F6C02FCA922C48405830B01D4E992C40CC853EE5792B48406311B6FC52992C40BE7BF6AB792B4840A1192CD776B22C402DCC5719A4294840857393F679B22C40A6FB00CEA3294840EA8954AA7CB22C4004325169A32948402E63F7D57EB22C40CA386DEFA2294840F71C9E6280B22C40103E5965A22948401B78865249BD2C40C14250A8A0244840AC1D394632192D404B2EF2A7CC1F4840 AT Stretch \N 2019-06-14 12:31:25.661431+02 Intevation t +SK_stretch_1 ["(SK,XXX,00001,00000,17500)","(SK,XXX,00001,00000,18727)") 0106000020E6100000010000000103000000010000000D0100002893CCA6AA0E3140E4C44F512F1248405413D2AC280D3140BB115E340414484062E98762280D31405926A3C2041448409D3EA16A280D3140274B0953051448409F20D2C4280D3140CE0B46E005144840DF97CC6D290D3140B59B2C650614484024A65F5F2A0D31409160DEDC061448401A59B1902B0D3140909FF8420714484082D091F62C0D314095A0BD9307144840322DE4832E0D3140C4C537CC07144840A690192A300D3140F04D55EA071448405CABB9D9310D3140D1BDFBEC0714484066AB21F61015314048183E6FD313484021A4266B12153140C451DF5AD3134840C769C3D013153140CB49F231D3134840B54B06255C1B31401F87D7F9E6124840139788137823314018FDE63EE61248401A1A4BF8782331409CA3E93AE612484003599398102831403CD6A090BD12484020C207341228314043494075BD124840360035B913283140A7CDD740BD1248400242A21A152831401BD237F5BC124840C386134C162831408E83FE94BC124840AA09F64217283140169A8023BC124840B7F4BDF61728314041D4ABA4BB1248408AC46AC1222A31401B5971DBDB104840B7A70B32232A314045423846DB104840220D849B252B3140606376E68B0E484013B5B0AF252B314095FAF24E8B0E4840AEBDF468252B3140435F25B98A0E48401EE12BCA242B31405C311B2B8A0E4840BCACC0D9232B3140BAC191AA890E48407820E17EC3283140180F2742830D4840B0A76AAD2F2C31403BA18124AB094840C6C334A0E0343140C6F63C16D90848404606A7A6E13431405CBA75F7D808484089016558D53A314037CE20ED01084840A0994342D63A3140770C9FC60108484003AB06EE85413140FA10244BBD06484057E69A35874131405B0778FFBC064840735452508841314049D5A4A1BC0648409095573589413140A7F69834BC06484053CB82DD89413140BEA7BCBBBB06484050D592438A4131405DA4D63ABB064840D04B61AF8542314090ABD0E5D204484005B76EE1EC4F3140787DAA4F440248402B476FADF958314017B7A86D6501484049A7EEF2FB58314001212416650148407E897CDDED5E3140C7FA5D1022004840025FFDCBB362314085ACE0E290FF4740A6887309B56231407FF26CA890FF474033C8D426B66231407D7FA05D90FF4740ACC9F39FE9843140167EF1CAFAF447401BEB4FC3E9843140BE75BBBFFAF44740817F0267A58C3140618E9BF778F24740BCE5A67CA68C31403D86928A78F24740DCFCD94FA78C3140E4C4D30D78F2474072864BC9F78F31406B691EC8FCEF47400DB70BB1959E3140D02BABC030EA4740EB89A04E81AB314090EBF3382FE64740B7A4290DDAAE3140B44CFF3F37E64740D70127FDDBAE3140D7DEFC3137E64740262FB4D7DDAE31406BEE69FF36E64740F0235F85DFAE3140EC21C6AA36E6474068D906BA4DB131405ACC7A6A9AE547405B66B83A4FB13140623675EF99E547400CAD15F559B63140545F71C48DE34740AEAAE21A52BA3140747DE72061E24740B3D0DA82B5BF314060E6D79D38E1474035D6D00FC1C43140AA29213BC6E0474010BB6D6F9FC6314088B36D27B1E04740BECAD9CD29CB3140E5F81197E5E0474038BB02A22BCB31401E227F9BE5E04740EE96A56E2DCB3140E65FF77EE5E047407F4A931F2FCB31407BBABA42E5E047409391D3A130CB314049E36CE9E4E0474038FF2C92B9CD31405D64C7592AE04740085F3932C0D03140FEC3AE9BF5DF4740897FA42060D431401D53A773F3DF4740901EAADB8EDC31405B1461563CE047409605DC3390DC31404E6D59593CE04740E657548991DC3140C27D794A3CE04740625B23D92BE431405352825AB3DF474088053CF331EB3140DE9303B2CDE0474065A0843834EB31404F0E7BEECDE04740EB482C40BCFA31404EA33DAEA9E14740A091E1C5BDFA3140A70911B8A9E14740FA5BB74ABFFA3140C22CE2AAA9E14740C90CD1C2C0FA3140A7001887A9E14740067DB522C2FA31404705CA4DA9E14740A27924DE1BFE31403739D9EFFCE04740CE4C1CB9D7003240F4E24FAED4E04740F73EE26730033240F86C447131E147407BD4F5A5A20A3240E234F07670E24740A802B771A40A3240727CAEAF70E24740DD461357A60A324014945CC570E24740BAA2DFD84F15324082E748E284E24740E4026C57511532409391FFD984E2474060EAF71591263240686F9B51A3E1474061DC31EC9226324089737A27A3E14740A766499C94263240806213DCA2E14740202CCF11962632401624F772A2E147401EC99E04F0293240C18483DE75E04740F13740A8462D32402174AE1B1CE04740BA9DD7191C313240DC7EAFF6C8DF4740B552810DE43B3240B4D085EA1CE04740F577A00BE63B32401F1049E61CE04740CAF209ABC6463240F447C25199DF47401C1165E2C7463240E5744C3B99DF47400978E66BEF4B3240600BEE4018DF4740B75B6287695232402C1C2ACAE9DF47407D7F0E5B6A52324035C9ECE0E9DF474072C4D679DB5732403EB5334466E04740AFC18A39DD5732401F99215C66E047401A055CFEDE5732406404225566E04740177CB1B5E05732406A8C7E2F66E0474003DA7F4DE2573240BCEFC2EC65E04740B35107B5E357324017D5AC8F65E0474025B183DDE4573240D6F90E1C65E04740D0A3C7BAE55732401DFFA89664E047403D12BB3A785B324001AFDCC49BDD4740FF395FBB785B3240F708DE3F9BDD4740EDDDFBF0785B32403E5E25B59ADD47400FC9B8D9785B32404A9278299ADD4740BEE56276785B32409CEEA5A199DD47401E3065CA775B324024CE592299DD4740709AAADB765B32408E73F5AF98DD4740B7EC69B2755B32400E75684E98DD4740C46ADD58745B32406D110E0198DD4740FEBDE8DA725B3240B19F8FCA97DD4740DD1C3629375532401C888AE5ECDC4740A67AB18F355532408F0D8FC7ECDC474084342C5E9C453240F0A309024ADC47400A1851B59A453240534564FE49DC4740680D181299453240A2D7F0154ADC47404E38A883974532408273D5474ADC47400FB02B8E17413240DD55DB3E06DD47408926B418E63032405B2A987E51DD47406BE6B4A5E430324029BADF8F51DD4740F7C3AEAC621632405B64F75252DF4740FDCBCDCBC0093240291433838EDF474093C5A3C7F2073240BD25FBD450DF47409DA2BC71F2073240413C31CA50DF4740C5B0665FA502324044122BE0B0DE4740278CED91A30232401304B5BBB0DE4740A94E09B8A1023240AE2BDDB8B0DE47403675EF193001324006BF73C3BBDE474079D33276BC003240236214E4B0DE4740CCA2049FBA00324037F3A2C9B0DE47406512353BB5FF314048BE03ADABDE4740CE0ADDCAB3FF31401CD70FB0ABDE4740CC750061B2FF31405C2877C7ABDE4740C57D31C258FF31402AF40235B4DE4740DDE819ED56FF3140D3A12E75B4DE4740E70AD04E55FF3140EEFD49D7B4DE474080A9B3B9ECFE314067083020D4DE47402E9E17821DF93140EC1BF57C0BDF474080A57D076FF33140F9ABA76275DE474088D394A36DF3314054685F4875DE47404683ABCC10E73140EB7C9B0AE5DD474085F3923F10E73140724DB105E5DD47400C8D7F4316E2314008E2B553C6DD4740AA4873DF71DD31407FB4C41996DD4740790E009C66DC31402574924A7FDD47402856AC4A64DC3140E551AD337FDD474047D81C6C23D93140852CF6CE84DD4740C7692BAA21D9314043607AE184DD4740C4EB89FC1FD931408EB3381285DD47402B51DF741ED93140D574305F85DD4740D15F461222D8314050777850C3DD47409B319E6F5DD53140DA9A3A7C35DE47405DA12B8B9BD4314024D7AA9539DE4740CD3A19D36DD33140EEACAFBC3FDE474023DB6A421DD23140230D96E11EDE4740D3B40BB01BD23140D9417BC71EDE47400EC04E161AD231400D8D93C61EDE4740EFF1F48218D23140E5B5E6DE1EDE4740A95C880317D2314041B5A30F1FDE474020854D0CBACE3140BA711212ACDE47408AE1CE2017C93140141904FF1BDE474096194E7115C93140DBD516E31BDE4740D034F1B913C931403F3B28E41BDE4740C3A41FE393C43140A5985A0645DE4740B4233F2B92C43140B68F5B2545DE4740FDC89F8E90C431407B56656145DE4740D208EA1D8FC43140756E0BB845DE4740D00BE91B28C131401700B0BF41DF4740273D6236E7B83140070E9E205EDF4740796D0084E5B8314003D7ED345EDF474017ACB7E5E3B83140103E6E655EDF47402E401222DAB63140A1915593AFDF47408200B381D9B631408876F9AEAFDF47406481C9D242B531401A61AAE1FCDF4740A386A36141B5314044835D39FDDF474017B3D45CB7B43140D1E6D39E25E04740645A0244B6B4314052D76A0126E0474057DF4B4B95B23140560E1DC70BE14740AAE855F294B23140D01448EF0BE147403B571566A0B13140B68CAE5B82E147402798A019A0B131401B2B4B8382E147408EC638A8CDB03140B780EA62F7E147406514ABB2CCB03140FA354E23F8E14740079B381A96B031408F53E6673BE247401EFD6E91FEAC3140F8587972BDE247402CFF32FCFDAC31405C22C889BDE24740E9C501960EAB3140A7E45F7C12E34740714C6E3E0EAB3140A75A398C12E347403CABF4D775A93140081FEA6F60E34740D560CC1A74A93140C6CB69DF60E34740D2A51EFED7A7314077C952C0E5E347404622A29F24A03140AC23D9A368E44740D80FF62223A031405DD626C968E4474020CC5BA1829C314013FAC0B3E2E44740149C577A809C3140BCDF631CE3E44740B1FF37F80E9C31400F8FED7B00E54740862D608F0D9C314057EB22F100E54740E526F47C0C9C3140C392747E01E5474088C98E84169B31403E2484C2A5E54740403D18F7159B314083A3F638A6E547402531F69F8D9A31403304B5D93BE64740A4617707DB99314015BC47B878E64740AAA30B26DA993140CB30281279E6474071AFD970D9993140BC9FBF7679E647401CA2C01480973140A81E81CD0AE847405749F0986A9731407E1C752419E847405AFA5EC86293314047732A8D18EA4740B8F883A2FF8C314012AAB1ADFBEC4740A246245E1084314080051DA478F0474023752F331084314025FA62B578F04740B8886D0E197E3140E478B272F1F2474067F7218643723140643D9A32CFF647409ECC37033A5F3140F1E01F057AFC474046512B79E8593140A5555BBD31FD47402213E20CF94F31406825261A4EFE4740CF7E35C227453140BC5F226D29FE4740A9CDEAFB2545314010AB8E7629FE4740B86D984424453140BB18829E29FE47406F4142AE22453140F64359E329FE474096E7914921453140658141422AFE474024EAE449E6333140F2FEE4FDC8034840E7C97F87E53331404CF7F045C9034840162CC4325331314029029647DF0448402DEFE9F2462B31409AE8E0908B06484005C95AD7452B3140424D97EE8B0648405247B25E3122314057227F06210A4840173BF45A3022314017850985210A4840B89511A92F223140C03D9412220A48406C966A133E20314031FCEB69430C4840D13062C33D203140BB1E4EE6430C48406228E4B23D203140C6A56C65440C484097A77C738520314084D794168E0E484005826BC585203140A80586C38E0E4840829F9058D2213140E6E2F46C1B10484081DC254CB3213140BD21376CBE1048409FE3EF51901B314049F3472225114840A67167897D17314065345132A60F48406070A9637C1731407A6BF5D7A50F48406330EF127B1731405E655A90A50F4840735DC5A179173140FC6EBE5DA50F4840D4C7BC1B781731406B6FB741A50F48407C126A8401113140DAF8E7C8600F4840B2E46BBAFF1031405F0BA2C5600F484033BDE9F7FD10314096D86EE1600F4840B2B8804FFC103140CF54281B610F484054E9B9D2FA103140CEEF6B70610F484074DD5091F9103140CACEB3DD610F484099378D98F8103140550F7C5E620F4840A937B6F2F71031404F8972ED620F48402893CCA6AA0E3140E4C44F512F124840 SK Stretch \N 2019-06-14 12:37:32.528618+02 Intevation t +RO_stretch_1 ["(RO,XXX,00001,00000,6100)","(RO,XXX,00001,00000,8460)") 0106000020E610000001000000010300000001000000A00100008A51DC40131F3740EB4009621FE44540AF46ED865EFF3640BDBB909790E34540E9CEF4EE5CFF36404C83CB9E90E34540FE6AB6625BFF36403160B6C290E3454044326AF159FF36407029F00191E345404C4A3FA958FF364048330B5A91E34540AB6FD09657FF3640D02FA5C791E34540F106A8C456FF3640D674884692E345405D78D83A56FF3640FC5FD5D192E345405ED1ACFE55FF36402242326493E345405D01ADFB3AFF36406C72D81B58E44540A68453F49EDF36402EC28B92B9E34540B52F685C9DDF3640FAF4F398B9E345408C2DC3CF9BDF3640B1010CBCB9E34540A8169D5D9ADF364006267BFAB9E34540B6392A1499DF36403609DC51BAE3454021110F0098DF36408545D4BEBAE345405110E42B97DF3640E158353DBBE34540A18CCD9F96DF364071B925C8BBE34540B4C02B6196DF36402B7A505ABCE345405266E4AED4DE36402EEF0CBBA1E8454087F5D53ED0CB364049ED8FBF48E84540227670A6CECB364019328FC648E845409C24A919CDCB3640BAE944EA48E84540DB9FBFA7CBCB36406EC1512949E84540E835EB5ECACB3640046B498149E84540B507CF4BC9CB36408A73CAEE49E8454009B5FD78C8CB3640C3859F6D4AE84540CF5791EEC7CB364025D1E8F84AE845400BCEDBB1C7CB36402AFE4B8B4BE845401156B97E29CA364046C7431CCAF345400A9B159229CA3640A67B26B0CAF34540E31AE5F429CA36408ADBD33FCBF3454055655BA32ACA3640D1E2C5C5CBF34540A680C3962BCA3640F153D63CCCF3454007EBC1C52CCA3640B56571A0CCF3454000B2B0242ECA36408FCFC2ECCCF34540B21512A62FCA36404D79DB1ECDF34540954F153B31CA3640375BCE34CDF345402332AE60D6D036405FB3E741ECF345401BA1D8A678CF36404713CAF49FFD4540137BCF0487CE364075733E70D50246405BDF381387CE36401FF9B506D60246404323177487CE364045AD2799D6024640625D902388CE3640D80BC121D7024640D096AA1A89CE364096C4139BD70246404ACC924F8ACE3640D1014D00D8024640DDEB00B68BCE3640C180664DD802464079D5B43F8DCE3640A8874F7FD8024640126607DD8ECE3640F7180C94D8024640784AE2EBDEE13640A1F742201C0346403AC7B46466E036403D0A9011A40D4640D01F8DB949CD3640A0A9FC404D0D4640DE7F941F48CD3640CBF124484D0D46400CFF579146CD36404741F46B4D0D464074261E1E45CD364079F40AAB4D0D4640AC4424D443CD36407089FD024E0D46407A9A12C042CD364018636C704E0D4640CE1080EC41CD36408FE924EF4E0D4640683C8A6141CD364023C24A7A4F0D464057AC852441CD3640608A870C500D4640390B683E81CC3640424AE55C96124640CCD3B5F962B936405CA73E7A3B1246409B23165F61B9364014A513813B12464090610DD05FB93640CC089EA43B124640654CF05B5EB93640614280E33B124640E4DB0A115DB93640FAD14F3B3C1246402EA313FC5BB93640440BADA83C12464014C6AE275BB93640344464273D124640494F059C5AB93640A82897B23D124640FFEC745E5AB93640C69CEC443E1246407F27983574B8364021726A3B7018464032CFFE4552A53640283A3C5613184640BD81F7AA50A5364084DEE65C131846408C9A731B4FA536400B454A801318464049B0CDA64DA53640DD430ABF131846401F06585B4CA536400F7FBD1614184640F4A5CF454BA536407E220584141846400B0DDF704AA53640800AAE02151846403B3CB5E449A536408215DA8D151846400634B5A649A53640DC07302016184640FBC7305619A53640BB0C13335D1946404E092F6919A5364089970EC85D194640F64B36CD19A53640976DCA585E1946409A985F7E1AA53640151AA1DF5E19464025A3C1751BA536409FFA4F575F19464040D0B5A91CA5364027C82BBB5F194640524F462CCBAF364035577B7E331C4640F065233E90B73640C4592293A81E4640D3B516BC91B73640D5F61EF3A81E464062AF846B93B73640EA167932A91E464025D3303795B73640516B124EA91E46402CC71D46CBCA3640A1881AA8081F4640BE545EE2CCCA3640F81B70A1081F4640304C0A73CECA3640B09EEE7D081F46404130ABE8CFCA3640A2D9F43E081F464006B2D534D1CA3640FCF9F0E6071F46400126B84AD2CA3640438E4879071F4640DD29991FD3CA364057F736FA061F4640A29741ABD3CA36400599A36E061F46409AAF4DE8D3CA36402267F1DB051F464007179446B1CB3640E9FCD0D4D1184640A1A5E91EE5DE3640BD59B7F9281946407F179EB9E6DE3640FE2A6CF228194640A5DC7C48E8DE36408DFF76CE2819464022EA36BCE9DE36409323398F281946408FE78706EBDE36403EF61F3728194640F65CC21AECDE36408C108DC927194640C8424CEEECDE36404E0CB54A27194640FA2B0779EDDE36402B3276BF26194640DD0AA0B5EDDE364053A4282D26194640ABACBA8BB0DF3640DC9E10FBA6134640C06735C3C0F23640B9EB94AFFE134640E33FF55DC2F2364072DB5DA8FE13464020D7E6ECC3F23640A4D87084FE134640B63EB460C5F23640776D2F45FE134640A1A012ABC6F23640751608EDFD134640D8E54EBFC7F236409C545E7FFD134640C1AFCA92C8F2364062546900FD134640F6D6641DC9F23640A5710A75FC1346401B6BC959C9F23640EA309DE2FB13464054B148ED69F33640C1BE4179650F46400DFF07064D133740682D4333F40F4640433C79A04E133740D30BCD2BF40F4640E090FC2E501337402A63A407F40F46408F0241A251133740F2F72CC8F30F4640F5A901EC52133740E13CD76FF30F4640F91792FF53133740DB520802F30F4640DA075BD25413374074A1F882F20F46403E93425C55133740C2508AF7F10F4640E7E6FB9755133740F13C1965F10F46403C44792AC41537401BBB344E8CFD4540D4C5C015C4153740B6F661BA8BFD4540DB238DB1C31537403403DC2A8BFD45400138B801C315374000EE26A58AFD4540E1F0030DC21537406331662E8AFD4540B0D5D7DCC01537405E262ACB89FD4540857FE47CBF153740E41D437F89FD4540C496B0FABD1537408FDB9B4D89FD454020C01365BC153740A7E21C3889FD4540FA3FA755B402374081BC0FAF34FD4540710C7DC8F2033740605AC76BD7F44540A88720B6F2033740FB2890D7D6F44540C28AEF53F203374055BD8147D6F44540CBAFB4A5F1033740D3082CC1D5F44540B12C2AB2F003374096E4BE49D5F445406353B782EF0337403CCCD6E5D4F44540279E1323EE03374064494F99D4F44540EDDED2A0EC03374053D21C67D4F44540700ADF0AEB033740C1942F51D4F44540A7BDF6806DFD3640DAA52A37B6F44540DBF7FDCB89FE3640EDA11FD57CEA45403F2B8D72351E3740CAD0B1980BEB45406082AA83E31D37400B65F2739AED45401FFE8B99E31D3740FAB350089BED454089C84FFFE31D374069AD42989BED4540B50405B1E41D3740AF44351E9CED45406FF1C9A7E51D37402F8AF8949CED4540862210DAE61D37406518F3F79CED4540083EFB3BE81D374074AC4F439DED45403392D6BFE91D37406D2623749DED45406BF69C56EB1D3740307889889DED454088CB0BCAAB3D37404C871A990EEE4540DC0B561F2F7D3740B7655CC86EEF4540F6DBB9D22E7D3740A9E68E5571EF45400C6C87E92E7D3740B42F4EE971EF4540F71B934F2F7D37409DEA9A7872EF4540DB2DF100307D3740078BF3FD72EF454056FED0F6307D37405D6C387473EF4540FE0CC027327D3740C337DED673EF454069E90688337D37402C971A2274EF4540D4721C0A357D37401A7E095374EF4540B9FC2A9F367D37400B99C96774EF4540AF86BBAE4B90374020FBEEC9BEEF45407FB93D474D903740D23091C1BEEF454093E762D34E9037405E8E889CBEEF45405645F14350903740B876415CBEEF4540597DBE8A51903740A85C3403BEEF45402E113B9B52903740CF73CD94BDEF4540B8EFED6A5390374066034B15BDEF4540CA80DBF153903740DAA59389BCEF45404430D42A549037406C1006F7BBEF454002088119E59037403A73325ECDEA45403EE00ACBA6B03740B5A7729044EB4540CF651363A8B03740AC3CD08744EB4540721B9FEEA9B03740C58E8B6244EB4540B1607D5EABB03740E400132244EB45403DAF8DA4ACB037401064E0C843EB4540757D4AB4ADB037403BA0605A43EB45402D584483AEB037405407D2DA42EB4540A4798809AFB03740849D1A4F42EB4540FAECEE41AFB03740CEF097BC41EB45404DABD6CAD2B037407D0C42AF02EA4540F27B64E59BD037406511777479EA4540A412FE7E9DD03740F5B7B56B79EA45400483ED0B9FD037409068184679EA4540A5F9D47CA0D037408EEA130579EA454086716CC3A1D0374023992CAB78EA4540543D0FD3A2D037407671DD3B78EA4540835439A1A3D03740619475BB77EA45407B8AEF25A4D03740C391ED2E77EA454005A70E5CA4D03740CE24B69B76EA4540A8EE99E0DDD037403A8386ED0DE8454063C3839D0ED1374023BBF31242E6454097E73B72C3F03740DE378BF5B8E64540AFFB7E0AC5F037409602DFECB8E6454084EB3896C6F03740A0F17EC7B8E64540F25C2D06C8F03740B365DB86B8E6454043AF314CC9F037409076712DB8E645402C9CB85BCAF03740936BB2BEB7E6454077EE4D2ACBF0374096CDE13EB7E64540048BFDAFCBF037408960EBB2B6E6454091D4A1E7CBF03740D0A23220B6E645408AF34B622DF13740461687941AE34540B70C230FFD10384024289D838FE34540788207A8FE1038406DE2C57A8FE34540691D3E3400113840B8081E558FE34540B27775A4011138408A4A1A148FE34540134471EA02113840301E3EBA8EE34540863297F9031138403DE0024B8EE34540B1AB6BC7041138404171B5CA8DE34540B090F94B0511384019A64B3E8DE3454068FC208205113840253033AB8CE345401E1DA640641138406BF57FF39EDF45400BF406BE26313840CA2D8409CEDF4540B269AA502831384091E087FDCDDF4540B5D556D5293138403B6396D5CDDF45403A406A3D2B3138405DAD3093CDDF4540F250567B2C31384005ACD638CDDF4540E4F522832D3138401E2AEFC9CCDF454074BEE14A2E313840D207A74ACCDF4540BA920DCB2E313840D3FCC8BFCBDF4540D12CD3FE2E31384066698F2ECBDF4540243E19EB643138407E58D1975BDD4540BC24B01524513840BD72393887DD4540617F8D34D4503840C3B306B062E245402510E853D4503840C86D324563E245405F79DBC3D4503840740732D563E2454067680180D550384048BB5C5A64E24540F4E9F480D6503840B0BD76CF64E24540B8CE9CBCD7503840D6E4E52F65E24540D0449126D95038403FF6DF7765E24540DDA798B0DA5038406EC890A465E2454006A0364BDC503840C6B836B465E245403440921F6D703840871E40A373E245400ED2634B2C703840A09B3EA26BE545403A51D8662C7038403F1ED3356CE545400C5942D12C703840122EA1C46CE54540332C8B862D70384053132C496DE54540E893BB7F2E7038406F085CBE6DE545404F6440B32F703840C952B01F6EE5454087AB481531703840D48D6B696EE54540FEEC399832703840A874B8986EE54540A7F1352D3470384058C0C5AB6EE545407DC47445478338402E9D93B4A4E545403BA582077F9638408C08BB2AD9E54540F6CDEB9E809638404F338120D9E54540C0F4FE288296384088A0B0F9D8E5454024779796839638407025C7B7D8E54540ECDBA8D984963840AE274D5DD8E545400407C9E585963840D1B2BCEDD7E545408059AAB0869638407D445F6DD7E545407D0C8132879638401AA023E1D6E54540C0E14F668796384080486D4ED6E54540E0FA9C05B8963840B04119DC77E34540FBB5F76CAFA9384052540D708DE34540CEF00800B1A93840ADD58A638DE34540D76ED284B2A938405E9E093B8DE345406FA9A8ECB3A93840F1F010F88CE34540B3C0F729B5A9384019B8279D8CE345404CA3C630B6A93840B61DBC2D8CE34540C5B52AF7B6A93840FB6702AE8BE34540359CA775B7A93840025DCC228BE34540148977A7B7A93840FBB45A918AE345405C9A42E5F9A938405EB389A4F5DF454048F7314794BC3840E36382DA2CE045401FC970E495BC384000494AD02CE045408A0FEC7397BC3840EF189EA82CE04540C781D2E598BC384076F60F652CE04540F0B07E2B9ABC384002A54C082CE04540D47D0B389BBC3840A06B00962BE045404ACED6009CBC3840D5D9B1122BE045401C55ED7D9CBC384000E893832AE045400F285BAA9CBC38401F4451EE29E04540192E0F9AC8BC384084D9AD3138D84540A5485D5DC8BC38402E77B47637D84540DA6E155BD3BB38401DB94AC4CFD645403C62ADF8D2BB384069FA6CF298D64540D14DB3D0D2BB38409BD4166198D6454074614E5CD2BB38401E7D45D597D645405C57DB9FD1BB38403265365497D64540E2386AA2D0BB3840FCC4BFE296D64540729B7A6DCFBB3840DD33228596D64540437FA00CCEBB38405FDCDF3E96D64540243A158DCCBB384017D39A1296D645402F9838FDCABB38406FD3FB0196D645402359C1ABACAA3840FE22E92B7AD645409965CAFF999738408FCADD9947D64540476B386998973840755217A447D64540A00DF5DF96973840B82DE7CA47D64540DDA51C73959738400496CF0C48D64540BD05B430949738404C3D486748D645403A921E2593973840D136D7D648D64540F967A45A92973840CE28335749D645403C380DD99197384086766DE349D6454008C153A591973840FDC322764AD645400709512A3F973840B8E1A2FB4EDA45400DB78F8D3B843840A6943C5D1BDA4540A98201F238713840EC103664E5D945406466ACFEB4713840AC7F5843CFD545408E57ECE6B47138402C66B1ACCED54540E2720E7DB4713840C97FC41ACED545405A854EC5B371384009AC6793CDD545404FA905C7B2713840E7A7041CCDD54540B50C5F8CB1713840D4A361B9CCD5454089D7EF21B0713840FD63706FCCD545402E5C3696AE71384029DF2541CCD545405FB805F9AC713840AFF95B30CCD545406EEF4948D651384057AB546FA8D54540B45B7C0DE9513840A5059E2DDAD44540DF9767F2E85138404F7CCC98D9D44540C3E83887E8513840D5DDD108D9D44540D50820D0E7513840E5CD4D83D8D4454026C343D4E65138403551770DD8D44540EB707A9DE5513840B3A8E8ABD7D445407A9CE737E4513840664C7162D7D4454030A182B1E2513840D5D1EF33D7D44540FD058B19E1513840193B3522D7D44540A70C7C321443384054C8A0E6BAD445405EB2777125323840093EFB068ED4454078D0B664253238402559FF008ED4454080F0DA2F2432384078339B9F8DD44540EFE76FCC22323840202F0E568DD4454015E6384821323840086431278DD44540BC343EB21F323840C75BD5148DD44540EF8A3DA3721238409E86D01C40D4454067FF390F71123840BA38322740D4454066616C886F123840A5C2D04D40D44540C256A91D6E123840E2F4348F40D445407C1AB5DC6C123840B288E3E840D4454024BFBDD16B123840C03B755741D44540D7DAE4066B12384048E0B7D641D44540621ADD836A123840A420D76142D44540C1779F4D6A123840406A8BF342D44540E9EB73AD2C123840E5A5F510A3D64540162FEA64FA063840774BE53D88D645400107FE3E55F23740909D452640D6454048E8FBA753F23740F0FB292F40D64540AFFB931D52F23740DE54B45440D64540860FEFAE50F237404246739540D64540D2C8246A4FF23740F5BCE9EE40D64540BCF9B05B4EF237404A71A75D41D64540E0CBF88D4DF237408CBC6ADD41D645405277E4084DF23740BC7A4A6942D645408F7491D14CF237403D5CE6FB42D645400588CE7DE0F137408E2A15FB4EDA45403A57AA8051D237409EA232D5D7D94540A0675EE84FD2374012DFA7DDD7D945404387845C4ED237401DE4EA02D8D94540C2E866EC4CD237407B3F8B43D8D94540E87F3DA64BD23740AFE9099DD8D94540EF69A1964AD23740B0F4F10BD9D94540665B10C849D237401CBAFA8BD9D9454096E3844249D23740CF363218DAD945401E87270B49D2374042F12DABDAD945407EB80E14D9D13740584214B118DE45405877C66833B23740186A5382BDDD454066810DD431B2374015E3FD8BBDDD4540C4C32D4C30B23740AB74ECB1BDDD4540AF6106E02EB23740BC9AAEF2BDDD4540B230699D2DB237402031CF4BBEDD4540257694902CB23740E353ECB9BEDD454012F5BBC32BB23740603BD838BFDD45403CD0A53E2BB2374069D5C1C3BFDD454013035F062BB23740B5906355C0DD45405522A8DE68B13740733F3E0E59E44540AED7ECCC9491374069F59F6CE0E345407787F831939137406D5A2B75E0E3454037ACABA391913740C7C4CF9AE0E34540ACFB9031909137403D3015DCE0E34540AD8419EA8E913740BB9A6F36E1E34540A76C0CDA8D913740457558A6E1E345407F4B070C8D913740BDDB7127E2E34540A92014888C913740B633B2B4E2E34540EB0459538C913740767E9648E3E345405ECE7D6E85913740597AC1D737E44540C3969EB0907E3740E6B21DA7EDE3454053F1AF188F7E3740CDC955AFEDE345405B97058D8D7E374065D63AD4EDE3454045F1D41C8C7E37400DCC6114EEE34540B20B45D68A7E37406766536DEEE345406954E3C5897E3740FF6CA4DBEEE34540BA1528F6887E37409757175BEFE34540E06F0F6F887E3740D207C6E6EFE3454005C6CA35887E3740D5FD5179F0E34540595F0903FF7D3740C445794382E84540529B1765415E37404026C18508E84540FCED4359863E3740323D82ED84E745400CDB5805E23E37405DFCC57CACE44540D748E8EFE13E37408C271BE9ABE445400A3C6B8BE13E374001E7C859ABE44540218ABCDBE03E374083AC4ED4AAE445401C7399E7DF3E3740743ECB5DAAE44540BD725FB8DE3E3740CF6FCAFAA9E445408E48B059DD3E3740447B18AFA9E44540D6BDFFD8DB3E3740D6B79C7DA9E44540378B0F45DA3E37403B153D68A9E44540E60A7DAC1B1F3740421CCFD61CE44540D20498131A1F3740E63335DE1CE4454070839486181F3740AC4C6B021DE445402E0DC414171F3740C1B80B421DE445408B7F6BCC151F37405DFEA19A1DE44540F91D36BA141F37407E17C3081EE445406A6EB8E8131F3740F4342F881EE445407FB70760131F37401FB7FB131FE445408A51DC40131F3740EB4009621FE44540 RO Stretch \N 2019-06-14 12:44:46.923051+02 Intevation t +\. + +INSERT INTO users.stretch_countries(stretch_id,country) + (SELECT id, substring(name for 2) FROM users.stretches + WHERE name + IN ('BG_stretch_1','HU_stretch_1','RS_stretch_1', + 'AT_stretch_1','SK_stretch_1','RO_stretch_1'))
--- a/schema/gemma.sql Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/gemma.sql Fri Sep 20 15:35:16 2019 +0200 @@ -4,7 +4,7 @@ -- SPDX-License-Identifier: AGPL-3.0-or-later -- License-Filename: LICENSES/AGPL-3.0.txt --- Copyright (C) 2018,2019 by via donau +-- Copyright (C) 2018, 2019 by via donau -- – Österreichische Wasserstraßen-Gesellschaft mbH -- Software engineering by Intevation GmbH @@ -256,59 +256,6 @@ -- GEMMA data -- --- Namespace not to be accessed directly by any user -CREATE SCHEMA internal - -- Profile data are only accessible via the view users.list_users. - CREATE TABLE user_profiles ( - username varchar PRIMARY KEY CHECK(octet_length(username) <= 63), - -- keep username length compatible with role identifier - map_extent box2d NOT NULL, - email_address varchar NOT NULL - ) - -- Columns referencing user-visible schemas added below. -; - - --- Namespace to be accessed by sys_admin only -CREATE SCHEMA sys_admin - CREATE TABLE system_config ( - config_key varchar PRIMARY KEY, - config_val varchar - ) - - CREATE TABLE password_reset_requests ( - hash varchar(32) PRIMARY KEY, - issued timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - username varchar NOT NULL UNIQUE - REFERENCES internal.user_profiles(username) - ON DELETE CASCADE ON UPDATE CASCADE - ) - - -- Tables with geo data to be published with GeoServer. - CREATE TABLE external_services ( - local_name varchar PRIMARY KEY, - remote_url varchar NOT NULL, - is_wfs boolean NOT NULL DEFAULT TRUE - ) - - CREATE TABLE published_services ( - schema varchar CHECK(to_regnamespace(schema) IS NOT NULL), - name varchar, - PRIMARY KEY (schema, name), - -- SQL statement used for an SQL view in GeoServer: - view_def text CHECK (is_valid_from_item(view_def)), - -- SRID to be used with SQL view: - srid int REFERENCES spatial_ref_sys, - -- SLD style document: - style xml CHECK(style IS DOCUMENT), - as_wms boolean NOT NULL DEFAULT TRUE, - as_wfs boolean NOT NULL DEFAULT TRUE, - -- Either give a valid relation or a SQL statement: - CHECK (to_regclass(schema || '.' || name) IS NOT NULL - OR view_def IS NOT NULL) - ) -; - -- -- Look-up tables with data that are static in a running system -- @@ -396,12 +343,86 @@ 'report' ); + +-- Namespace not to be accessed directly by any user +CREATE SCHEMA internal + -- Profile data are only accessible via the view users.list_users. + CREATE TABLE user_profiles ( + username varchar PRIMARY KEY CHECK(octet_length(username) <= 63), + -- keep username length compatible with role identifier + country char(2) NOT NULL REFERENCES countries, + map_extent box2d NOT NULL, + email_address varchar NOT NULL + ) + -- Columns referencing user-visible schemas added below. +; + + +-- Namespace to be accessed by sys_admin only +CREATE SCHEMA sys_admin + CREATE TABLE system_config ( + config_key varchar PRIMARY KEY, + config_val varchar + ) + + CREATE TABLE password_reset_requests ( + hash varchar(32) PRIMARY KEY, + issued timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + username varchar NOT NULL UNIQUE + REFERENCES internal.user_profiles(username) + ON DELETE CASCADE ON UPDATE CASCADE + ) + + -- Tables with geo data to be published with GeoServer. + CREATE TABLE external_services ( + local_name varchar PRIMARY KEY, + remote_url varchar NOT NULL, + is_wfs boolean NOT NULL DEFAULT TRUE + ) + + CREATE TABLE published_services ( + schema varchar CHECK(to_regnamespace(schema) IS NOT NULL), + name varchar, + PRIMARY KEY (schema, name), + -- SQL statement used for an SQL view in GeoServer: + view_def text CHECK (is_valid_from_item(view_def)), + -- SRID to be used with SQL view: + srid int REFERENCES spatial_ref_sys, + -- SLD style document: + style xml CHECK(style IS DOCUMENT), + as_wms boolean NOT NULL DEFAULT TRUE, + as_wfs boolean NOT NULL DEFAULT TRUE, + -- Either give a valid relation or a SQL statement: + CHECK (to_regclass(schema || '.' || name) IS NOT NULL + OR view_def IS NOT NULL) + ) +; + + -- Namespace for user management related data CREATE SCHEMA users - CREATE TABLE responsibility_areas ( - country char(2) PRIMARY KEY REFERENCES countries, - area geography(MULTIPOLYGON, 4326) - CHECK(ST_IsValid(CAST(area AS geometry))) + CREATE TABLE stretches ( + id int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, + name varchar NOT NULL, + stretch isrsrange NOT NULL, + area geography(MULTIPOLYGON, 4326) NOT NULL + CHECK(ST_IsValid(CAST(area AS geometry))), + objnam varchar NOT NULL, + nobjnam varchar, + date_info timestamp with time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, + source_organization varchar NOT NULL, + staging_done boolean NOT NULL DEFAULT false, + UNIQUE(name, staging_done) + ) + CREATE TRIGGER stretches_date_info + BEFORE UPDATE ON stretches + FOR EACH ROW EXECUTE PROCEDURE update_date_info() + + CREATE TABLE stretch_countries ( + stretch_id int NOT NULL REFERENCES stretches(id) + ON DELETE CASCADE, + country char(2) NOT NULL REFERENCES countries, + PRIMARY KEY(stretch_id, country) ) CREATE TABLE templates ( @@ -415,8 +436,7 @@ CREATE TRIGGER templates_date_info BEFORE UPDATE ON templates FOR EACH ROW EXECUTE PROCEDURE update_date_info() ; -ALTER TABLE internal.user_profiles ADD - country char(2) NOT NULL REFERENCES users.responsibility_areas; + -- Namespace for waterway data that can change in a running system CREATE SCHEMA waterway @@ -502,9 +522,6 @@ CREATE CONSTRAINT TRIGGER waterway_gauge_measurements_reference_gauge AFTER INSERT OR UPDATE OF location ON gauge_measurements FOR EACH ROW EXECUTE FUNCTION check_valid_gauge_ts('location','measure_date') - -- For fast retrieval of newest measurement per location: - CREATE INDEX gauge_measurements_location_measure_date_desc - ON waterway.gauge_measurements (location, measure_date DESC) CREATE TABLE gauge_predictions ( location isrs NOT NULL, @@ -575,30 +592,6 @@ check (pk_policy in ('sequence', 'assigned', 'autogenerated')) ) - CREATE TABLE stretches ( - id int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, - name varchar NOT NULL, - stretch isrsrange NOT NULL, - area geography(MULTIPOLYGON, 4326) NOT NULL - CHECK(ST_IsValid(CAST(area AS geometry))), - objnam varchar NOT NULL, - nobjnam varchar, - date_info timestamp with time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, - source_organization varchar NOT NULL, - staging_done boolean NOT NULL DEFAULT false, - UNIQUE(name, staging_done) - ) - CREATE TRIGGER stretches_date_info - BEFORE UPDATE ON stretches - FOR EACH ROW EXECUTE PROCEDURE update_date_info() - - CREATE TABLE stretch_countries ( - stretches_id int NOT NULL REFERENCES stretches(id) - ON DELETE CASCADE, - country_code char(2) NOT NULL REFERENCES countries(country_code), - UNIQUE(stretches_id, country_code) - ) - -- Like stretches without the countries CREATE TABLE sections ( id int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, @@ -614,7 +607,7 @@ UNIQUE(name, staging_done) ) CREATE TRIGGER sections_date_info - BEFORE UPDATE ON stretches + BEFORE UPDATE ON sections FOR EACH ROW EXECUTE PROCEDURE update_date_info() CREATE TABLE waterway_profiles (
--- a/schema/install-db.sh Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/install-db.sh Fri Sep 20 15:35:16 2019 +0200 @@ -5,7 +5,7 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # License-Filename: LICENSES/AGPL-3.0.txt # -# Copyright (C) 2018 by via donau +# Copyright (C) 2018, 2019 by via donau # – Österreichische Wasserstraßen-Gesellschaft mbH # Software engineering by Intevation GmbH # @@ -121,9 +121,9 @@ if [[ drop -eq 0 ]] ; then # Default operation: create schema createdb -p "$port" "$db" - psql -q -p "$port" -f "$BASEDIR/roles.sql" -d "$db" psql -qtv ON_ERROR_STOP= -p "$port" -d "$db" \ -c "SET client_min_messages TO WARNING;" \ + -f "$BASEDIR/roles.sql" \ -f "$BASEDIR/isrs.sql" \ -f "$BASEDIR/gemma.sql" \ -f "$BASEDIR/geo_functions.sql" \ @@ -133,19 +133,18 @@ -f "$BASEDIR/auth.sql" \ -f "$BASEDIR/isrs_functions.sql" \ -f "$BASEDIR/default_sysconfig.sql" \ + -f "$BASEDIR/countries.sql" \ -f "$BASEDIR/version.sql" # setup initial login roles with given passwords: psql -qt -P pager=off -p "$port" -d "$db" \ - -v adminpw="$adminpw" -v metapw="$metapw" \ + -v ON_ERROR_STOP= -v adminpw="$adminpw" -v metapw="$metapw" \ -f "$BASEDIR/std_login_roles.sql" if [[ $demo -eq 1 ]] ; then psql -qv ON_ERROR_STOP= -p "$port" -d "$db" \ - -f "$BASEDIR/demo-data/responsibility_areas.sql" \ -f "$BASEDIR/demo-data/users.sql" \ - -f "$BASEDIR/demo-data/published_services.sql" \ - -f "$BASEDIR/demo-data/fake_stretches.sql" + -f "$BASEDIR/demo-data/stretches.sql" psql -q -p "$port" -f "$BASEDIR/demo-data/roles.sql" \ -d "$db" fi
--- a/schema/isrs.sql Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/isrs.sql Fri Sep 20 15:35:16 2019 +0200 @@ -58,32 +58,42 @@ CREATE FUNCTION isrslt(a isrs, b isrs) RETURNS boolean AS $$ - SELECT isrs_cmp(a, b) < 0 -$$ LANGUAGE sql +BEGIN + RETURN public.isrs_cmp(a, b) < 0; +END; +$$ LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE; CREATE FUNCTION isrsle(a isrs, b isrs) RETURNS boolean AS $$ - SELECT isrs_cmp(a, b) <= 0 -$$ LANGUAGE sql +BEGIN + RETURN public.isrs_cmp(a, b) <= 0; +END; +$$ LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE; CREATE FUNCTION isrseq(a isrs, b isrs) RETURNS boolean AS $$ - SELECT isrs_cmp(a, b) = 0 -$$ LANGUAGE sql +BEGIN + RETURN public.isrs_cmp(a, b) = 0; +END; +$$ LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE; CREATE FUNCTION isrsge(a isrs, b isrs) RETURNS boolean AS $$ - SELECT isrs_cmp(a, b) >= 0 -$$ LANGUAGE sql +BEGIN + RETURN public.isrs_cmp(a, b) >= 0; +END; +$$ LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE; CREATE FUNCTION isrsgt(a isrs, b isrs) RETURNS boolean AS $$ - SELECT isrs_cmp(a, b) > 0 -$$ LANGUAGE sql +BEGIN + RETURN public.isrs_cmp(a, b) > 0; +END; +$$ LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE; CREATE OPERATOR <~ ( @@ -131,7 +141,7 @@ CREATE FUNCTION isrs_diff(a isrs, b isrs) RETURNS double precision AS $$ - SELECT CAST(isrs_cmp(a, b) AS double precision) + SELECT CAST(public.isrs_cmp(a, b) AS double precision) $$ LANGUAGE sql IMMUTABLE PARALLEL SAFE;
--- a/schema/isrs_tests.sql Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/isrs_tests.sql Fri Sep 20 15:35:16 2019 +0200 @@ -81,6 +81,15 @@ isrs_fromText('ATXXX000000000006570')), 'isrsrange: Overlap depends on hectometre'); +SELECT lives_ok($$ + SET search_path TO ''; + SELECT public.isrs_diff( + CAST('(AT,XXX,00000,00000,0)' as public.isrs), + CAST('(AT,XXX,00000,00000,1)' as public.isrs)); + RESET search_path; + $$, + 'Support function runs with empty search path (as during autovacuum)'); + -- -- Geometry processing --
--- a/schema/manage_users.sql Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/manage_users.sql Fri Sep 20 15:35:16 2019 +0200 @@ -63,11 +63,16 @@ AS $$ DECLARE utm_area geometry; BEGIN - SELECT ST_Transform(area::geometry, best_utm(area)) + SELECT ST_Union(ST_Transform(area::geometry, z)) INTO STRICT utm_area - FROM users.responsibility_areas - WHERE country = (SELECT country - FROM users.list_users WHERE username = current_user); + FROM (SELECT area, + best_utm(ST_Collect(area::geometry) OVER ()) AS z + FROM users.stretches st + JOIN users.stretch_countries stc + ON stc.stretch_id = st.id + WHERE country = (SELECT country + FROM users.list_users + WHERE username = current_user)) AS st; RETURN utm_area; END; $$ @@ -90,8 +95,9 @@ IF NEW.map_extent IS NULL THEN NEW.map_extent = ST_Extent(CAST(area AS geometry)) - FROM users.responsibility_areas ra - WHERE ra.country = NEW.country; + FROM users.stretches st + JOIN users.stretch_countries stc ON stc.stretch_id = st.id + WHERE stc.country = NEW.country; END IF; INSERT INTO internal.user_profiles ( username, country, map_extent, email_address)
--- a/schema/manage_users_tests.sql Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/manage_users_tests.sql Fri Sep 20 15:35:16 2019 +0200 @@ -25,12 +25,17 @@ SELECT ST_SRID(users.current_user_area_utm()) $$, $$ - SELECT best_utm(area) - FROM users.responsibility_areas + SELECT best_utm(ST_Collect(area::geometry)) + FROM users.stretches st + JOIN users.stretch_countries stc ON stc.stretch_id = st.id WHERE country = users.current_user_country() $$, 'Geometry has SRID corresponding to best_utm()'); +SELECT ok( + ST_IsValid(users.current_user_area_utm()), + 'Returns valid geometry for stretches that touch each other'); + -- -- Role listing -- @@ -51,9 +56,17 @@ SET SESSION AUTHORIZATION test_sys_admin1; SELECT set_eq($$ - SELECT count(*) FROM users.list_users + SELECT username FROM users.list_users $$, - ARRAY[6], + ARRAY[ + 'sysadmin', + 'test_admin_at', + 'test_admin_at2', + 'test_admin_ro', + 'test_sys_admin1', + 'test_user_at', + 'test_user_ro' + ], 'System admin can see all users'); --
--- a/schema/roles.sql Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/roles.sql Fri Sep 20 15:35:16 2019 +0200 @@ -4,25 +4,84 @@ -- SPDX-License-Identifier: AGPL-3.0-or-later -- License-Filename: LICENSES/AGPL-3.0.txt --- Copyright (C) 2018 by via donau +-- Copyright (C) 2018, 2019 by via donau -- – Österreichische Wasserstraßen-Gesellschaft mbH -- Software engineering by Intevation GmbH -- Author(s): -- * Tom Gottfried <tom@intevation.de> --- --- Primary GEMMA roles --- -CREATE ROLE waterway_user; -CREATE ROLE waterway_admin IN ROLE waterway_user; -CREATE ROLE sys_admin IN ROLE waterway_admin; +CREATE PROCEDURE create_roles() +AS $$ +DECLARE + -- Role names + wwuser CONSTANT varchar = 'waterway_user'; + wwadmin CONSTANT varchar = 'waterway_admin'; + sysadmin CONSTANT varchar = 'sys_admin'; + metarole CONSTANT varchar = 'metamorph'; + + -- Messages + warn_message CONSTANT varchar = 'Role %I already exists'; + warn_detail CONSTANT varchar = + 'Role attributes and memberships are kept as is'; + err_message CONSTANT varchar = + 'Role %I already exists but lacks necessary privileges'; +BEGIN + -- + -- Primary GEMMA roles + -- + IF to_regrole(wwuser) IS NULL THEN + EXECUTE format('CREATE ROLE %I', wwuser); + ELSE + RAISE WARNING USING + MESSAGE = format(warn_message, wwuser), + DETAIL = warn_detail; + END IF; --- --- Special roles --- + IF to_regrole(wwadmin) IS NULL THEN + EXECUTE format('CREATE ROLE %I IN ROLE %I', wwadmin, wwuser); + ELSE + IF pg_has_role(wwadmin, wwuser, 'USAGE') THEN + RAISE WARNING USING + MESSAGE = format(warn_message, wwadmin), + DETAIL = warn_detail; + ELSE + RAISE USING MESSAGE = format(err_message, wwadmin); + END IF; + END IF; + + IF to_regrole(sysadmin) IS NULL THEN + EXECUTE format('CREATE ROLE %I IN ROLE %I', sysadmin, wwadmin); + ELSE + IF pg_has_role(sysadmin, wwadmin, 'USAGE') THEN + RAISE WARNING USING + MESSAGE = format(warn_message, sysadmin), + DETAIL = warn_detail; + ELSE + RAISE USING MESSAGE = format(err_message, sysadmin); + END IF; + END IF; --- A role that is intended to be used for backend- or --- GeoServer-connections on which SET ROLE has to be used to --- gain privileges of a specific role -CREATE ROLE metamorph NOINHERIT; + -- + -- Special roles + -- + + -- A role that is intended to be used for backend- or + -- GeoServer-connections on which SET ROLE has to be used to + -- gain privileges of a specific role + IF to_regrole(metarole) IS NULL THEN + EXECUTE format('CREATE ROLE %I NOINHERIT', metarole); + ELSE + IF (SELECT NOT rolinherit FROM pg_roles WHERE rolname = metarole) THEN + RAISE WARNING USING + MESSAGE = format(warn_message, metarole), + DETAIL = warn_detail; + ELSE + RAISE USING MESSAGE = format(err_message, metarole); + END IF; + END IF; + +END; +$$ LANGUAGE plpgsql; +CALL create_roles(); +DROP PROCEDURE create_roles();
--- a/schema/run_tests.sh Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/run_tests.sh Fri Sep 20 15:35:16 2019 +0200 @@ -80,7 +80,7 @@ -c 'SET client_min_messages TO WARNING' \ -c "DROP ROLE IF EXISTS $TEST_ROLES" \ -f "$BASEDIR"/tap_tests_data.sql \ - -c "SELECT plan(76 + ( + -c "SELECT plan(78 + ( SELECT count(*)::int FROM information_schema.tables WHERE table_schema = 'waterway'))" \
--- a/schema/search_functions.sql Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/search_functions.sql Fri Sep 20 15:35:16 2019 +0200 @@ -149,7 +149,7 @@ objnam AS name, ST_AsGeoJSON(ST_Envelope(area::geometry))::json AS geom, 'stretch' AS type - FROM waterway.stretches + FROM users.stretches WHERE objnam ILIKE '%' || search_string || '%' OR nobjnam ILIKE '%' || search_string || '%' ORDER BY name) r;
--- a/schema/std_login_roles.sql Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/std_login_roles.sql Fri Sep 20 15:35:16 2019 +0200 @@ -4,7 +4,7 @@ -- SPDX-License-Identifier: AGPL-3.0-or-later -- License-Filename: LICENSES/AGPL-3.0.txt --- Copyright (C) 2018 by via donau +-- Copyright (C) 2018, 2019 by via donau -- – Österreichische Wasserstraßen-Gesellschaft mbH -- Software engineering by Intevation GmbH @@ -21,34 +21,76 @@ -- NOTE: Passwords for these roles must be set during initial setup of -- the database. --- --- Admin User --- --- We need an empty dummy country for the default admin, as the user is --- not supposed to work on data, it should be only used to create --- personalized accounts. -INSERT INTO countries (country_code) VALUES ('--'); -INSERT INTO users.responsibility_areas (country, area) - VALUES ('--', ST_GeomFromText('MULTIPOLYGON(((0 0, 1 0, 1 1, 0 1, 0 0)))', 4326)); +CREATE PROCEDURE create_login_roles(adminpw varchar, metapw varchar) +AS $$ +DECLARE + dummy_country CONSTANT varchar = '--'; + + -- Role names and attributes + admin CONSTANT varchar = 'sysadmin'; + adminrole CONSTANT varchar = 'sys_admin'; + box CONSTANT box2d = 'BOX(9.52115482500011 46.3786430870001, + 17.1483378500001 49.0097744750001)'; + meta CONSTANT varchar = 'meta_login'; + metarole CONSTANT varchar = 'metamorph'; + + -- Messages + warn_message CONSTANT varchar = 'Role %I already exists'; + warn_detail CONSTANT varchar = + 'Password, role attributes and memberships are kept as is'; + err_message CONSTANT varchar = + 'Role %I already exists but lacks necessary privileges'; +BEGIN + -- + -- Admin User + -- + -- We need an empty dummy country for the default admin, as the user is + -- not supposed to work on data, it should be only used to create + -- personalized accounts. + INSERT INTO countries (country_code) VALUES (dummy_country); --- This initial Admin account is used to bootstrap the personalized accounts. -INSERT INTO users.list_users VALUES ( - 'sys_admin', - 'sysadmin', - :'adminpw', - '--', - 'BOX(9.52115482500011 46.3786430870001,17.1483378500001 49.0097744750001)', - ''); + -- Initial Admin account used to bootstrap the personalized accounts + IF to_regrole(admin) IS NULL THEN + INSERT INTO users.list_users VALUES ( + adminrole, admin, adminpw, dummy_country, box, ''); + RAISE NOTICE 'Default admin user ''%'' created with password ''%''', + admin, adminpw; + ELSE + IF pg_has_role(admin, adminrole, 'USAGE') THEN + RAISE WARNING USING + MESSAGE = format(warn_message, admin), + DETAIL = warn_detail; + INSERT INTO internal.user_profiles ( + username, map_extent, email_address, country) + VALUES (admin, box, '', dummy_country); + ELSE + RAISE USING MESSAGE = format(err_message, admin); + END IF; + END IF; --- --- Functional Users --- + -- + -- Functional Users + -- --- Used by GeoServer and backend -CREATE ROLE meta_login IN ROLE metamorph LOGIN PASSWORD :'metapw'; + -- Used by GeoServer and backend + IF to_regrole(meta) IS NULL THEN + EXECUTE format('CREATE ROLE %I IN ROLE %I LOGIN PASSWORD %L', + meta, metarole, metapw); + RAISE NOTICE 'Backend user ''%'' created with password ''%''', + meta, metapw; + ELSE + IF pg_has_role(meta, metarole, 'USAGE') THEN + RAISE WARNING USING + MESSAGE = format(warn_message, meta), + DETAIL = warn_detail; + ELSE + RAISE USING MESSAGE = format(err_message, admin); + END IF; + END IF; --- Emit messages to the client if everything went ok -SELECT 'Default admin user ''sysadmin'' created with password ' || :'adminpw'; -SELECT 'Backend user ''meta_login'' created with password ' || :'metapw'; +END; +$$ LANGUAGE plpgsql; +CALL create_login_roles(:'adminpw', :'metapw'); +DROP PROCEDURE create_login_roles(varchar, varchar); COMMIT;
--- a/schema/tap_tests_data.sql Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/tap_tests_data.sql Fri Sep 20 15:35:16 2019 +0200 @@ -4,7 +4,7 @@ -- SPDX-License-Identifier: AGPL-3.0-or-later -- License-Filename: LICENSES/AGPL-3.0.txt --- Copyright (C) 2018 by via donau +-- Copyright (C) 2018, 2019 by via donau -- – Österreichische Wasserstraßen-Gesellschaft mbH -- Software engineering by Intevation GmbH @@ -16,13 +16,40 @@ -- Test data used in *_tests.sql scripts -- -INSERT INTO countries VALUES ('AT'), ('RO'), ('DE'); +INSERT INTO countries VALUES ('AT'), ('RO'), ('DE') + ON CONFLICT (country_code) DO NOTHING; INSERT INTO language_codes VALUES ('DE'); INSERT INTO depth_references VALUES ('ZPG'); -INSERT INTO users.responsibility_areas VALUES - ('AT', ST_geomfromtext('MULTIPOLYGON(((0 0, 0 1, 1 1, 1 0, 0 0)))', 4326)), - ('RO', ST_geomfromtext('MULTIPOLYGON(((1 0, 1 1, 2 1, 2 0, 1 0)))', 4326)); +WITH insert_st AS ( + INSERT INTO users.stretches ( + name, stretch, area, objnam, source_organization, staging_done + ) VALUES ( + 'AT', + isrsrange(('AT', 'XXX', '00001', '00000', 0)::isrs, + ('AT', 'XXX', '00001', '00000', 1)::isrs), + ST_geomfromtext('MULTIPOLYGON(((-1 0, -1 1, 0 1, 0 0, -1 0)))', 4326), + 'AT', + 'AT', + true + ), ( + 'AT_RO', + isrsrange(('AT', 'XXX', '00001', '00000', 1)::isrs, + ('AT', 'XXX', '00001', '00000', 2)::isrs), + ST_geomfromtext('MULTIPOLYGON(((0 0, 0 1, 1 1, 1 0, 0 0)))', 4326), + 'AT', + 'AT', + true + ), ( + 'RO', + isrsrange(('RO', 'XXX', '00001', '00000', 0)::isrs, + ('RO', 'XXX', '00001', '00000', 1)::isrs), + ST_geomfromtext('MULTIPOLYGON(((1 0, 1 1, 2 1, 2 0, 1 0)))', 4326), + 'RO', + 'RO', + true + ) RETURNING id, objnam) +INSERT INTO users.stretch_countries SELECT id, objnam FROM insert_st; INSERT INTO users.list_users VALUES ( 'waterway_user', 'test_user_at', 'user_at1$', 'AT', NULL, 'xxx');
--- a/schema/updates/1112/01.cleanup_views.sql Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/updates/1112/01.cleanup_views.sql Fri Sep 20 15:35:16 2019 +0200 @@ -1,3 +1,7 @@ +-- Avoid orphaned entries due to changed OIDs +ALTER TABLE sys_admin.published_services ADD _name varchar; +UPDATE sys_admin.published_services SET _name = name; + DROP VIEW waterway.gauges_geoserver CASCADE; CREATE VIEW waterway.gauges_geoserver AS SELECT @@ -114,6 +118,10 @@ ON isrs_fromtext(g.isrs_code) <@ s.section GROUP BY s.id; +-- Avoid orphaned entries due to changed OIDs +UPDATE sys_admin.published_services SET name = _name; +ALTER TABLE sys_admin.published_services DROP _name; + UPDATE waterway.gt_pk_metadata SET pk_column = 'isrs_code' WHERE table_schema = 'waterway' AND table_name = 'gauges_geoserver';
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/updates/1200/01.st_as_resp_area.sql Fri Sep 20 15:35:16 2019 +0200 @@ -0,0 +1,134 @@ +-- This is Free Software under GNU Affero General Public License v >= 3.0 +-- without warranty, see README.md and license for details. + +-- SPDX-License-Identifier: AGPL-3.0-or-later +-- License-Filename: LICENSES/AGPL-3.0.txt + +-- Copyright (C) 2019 by via donau +-- – Österreichische Wasserstraßen-Gesellschaft mbH +-- Software engineering by Intevation GmbH + +-- Author(s): +-- * Sascha Wilde <sascha.wilde@intevation.de> + +DROP TABLE users.responsibility_areas CASCADE; + +ALTER TABLE waterway.stretches SET SCHEMA users; +ALTER TABLE waterway.stretch_countries SET SCHEMA users; + +ALTER TABLE users.stretch_countries + RENAME COLUMN stretches_id TO stretch_id; +ALTER TABLE users.stretch_countries + RENAME COLUMN country_code TO country; + +ALTER TABLE internal.user_profiles + ADD CONSTRAINT user_profiles_country_fkey + FOREIGN KEY (country) REFERENCES countries; + +-- +-- geoserver view: + +CREATE OR REPLACE VIEW waterway.stretches_geoserver AS + SELECT + s.id, + s.name, + (s.stretch).lower::varchar as lower, + (s.stretch).upper::varchar as upper, + s.area::Geometry(MULTIPOLYGON, 4326), + s.objnam, + s.nobjnam, + s.date_info, + s.source_organization, + (SELECT string_agg(country, ', ') + FROM users.stretch_countries + WHERE stretch_id = s.id) AS countries, + s.staging_done, + min(g.gm_measuredate) AS gm_measuredate, + min(g.gm_n_14d) AS gm_n_14d, + max(g.forecast_accuracy_3d) AS forecast_accuracy_3d, + max(g.forecast_accuracy_1d) AS forecast_accuracy_1d + FROM users.stretches s + LEFT JOIN waterway.gauges_geoserver g + ON isrs_fromtext(g.isrs_code) <@ s.stretch + GROUP BY s.id; + +-- +-- auth: + +GRANT INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA users TO sys_admin; + + +-- +-- manage_users: + +CREATE OR REPLACE FUNCTION users.current_user_area_utm() + RETURNS geometry + AS $$ + DECLARE utm_area geometry; + BEGIN + SELECT ST_Union(ST_Transform(area::geometry, z)) + INTO STRICT utm_area + FROM (SELECT area, + best_utm(ST_Collect(area::geometry) OVER ()) AS z + FROM users.stretches st + JOIN users.stretch_countries stc + ON stc.stretch_id = st.id + WHERE country = (SELECT country + FROM users.list_users + WHERE username = current_user)) AS st; + RETURN utm_area; + END; +$$ + LANGUAGE plpgsql + STABLE PARALLEL SAFE; + +CREATE OR REPLACE FUNCTION internal.create_user() RETURNS trigger +AS $$ +BEGIN + IF NEW.map_extent IS NULL + THEN + NEW.map_extent = ST_Extent(CAST(area AS geometry)) + FROM users.stretches st + JOIN users.stretch_countries stc ON stc.stretch_id = st.id + WHERE stc.country = NEW.country; + END IF; + INSERT INTO internal.user_profiles ( + username, country, map_extent, email_address) + VALUES (NEW.username, NEW.country, NEW.map_extent, NEW.email_address); + EXECUTE format( + 'CREATE ROLE %I IN ROLE %I LOGIN PASSWORD %L', + NEW.username, + NEW.rolname, + internal.check_password(NEW.pw)); + + -- Do not leak new password + NEW.pw = ''; + RETURN NEW; +END; +$$ + LANGUAGE plpgsql + SECURITY DEFINER; + + +-- +-- search_functions: + +CREATE OR REPLACE FUNCTION search_stretches(search_string text) RETURNS jsonb + LANGUAGE plpgsql STABLE PARALLEL SAFE + AS $$ +DECLARE + _result jsonb; +BEGIN + SELECT COALESCE(json_agg(r),'[]') + INTO _result + FROM (SELECT id, + objnam AS name, + ST_AsGeoJSON(ST_Envelope(area::geometry))::json AS geom, + 'stretch' AS type + FROM users.stretches + WHERE objnam ILIKE '%' || search_string || '%' + OR nobjnam ILIKE '%' || search_string || '%' + ORDER BY name) r; + RETURN _result; +END; +$$;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/updates/1200/02.add_demo_stretch_countries.sql Fri Sep 20 15:35:16 2019 +0200 @@ -0,0 +1,5 @@ +INSERT INTO users.stretch_countries(stretch_id,country) + (SELECT id, substring(name for 2) FROM users.stretches + WHERE name + IN ('BG_stretch_1','HU_stretch_1','RS_stretch_1', + 'AT_stretch_1','SK_stretch_1','RO_stretch_1'))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/updates/1201/01.fix_support_functions.sql Fri Sep 20 15:35:16 2019 +0200 @@ -0,0 +1,45 @@ +CREATE OR REPLACE FUNCTION isrslt(a isrs, b isrs) RETURNS boolean +AS $$ +BEGIN + RETURN public.isrs_cmp(a, b) < 0; +END; +$$ LANGUAGE plpgsql + IMMUTABLE PARALLEL SAFE; + +CREATE OR REPLACE FUNCTION isrsle(a isrs, b isrs) RETURNS boolean +AS $$ +BEGIN + RETURN public.isrs_cmp(a, b) <= 0; +END; +$$ LANGUAGE plpgsql + IMMUTABLE PARALLEL SAFE; + +CREATE OR REPLACE FUNCTION isrseq(a isrs, b isrs) RETURNS boolean +AS $$ +BEGIN + RETURN public.isrs_cmp(a, b) = 0; +END; +$$ LANGUAGE plpgsql + IMMUTABLE PARALLEL SAFE; + +CREATE OR REPLACE FUNCTION isrsge(a isrs, b isrs) RETURNS boolean +AS $$ +BEGIN + RETURN public.isrs_cmp(a, b) >= 0; +END; +$$ LANGUAGE plpgsql + IMMUTABLE PARALLEL SAFE; + +CREATE OR REPLACE FUNCTION isrsgt(a isrs, b isrs) RETURNS boolean +AS $$ +BEGIN + RETURN public.isrs_cmp(a, b) > 0; +END; +$$ LANGUAGE plpgsql + IMMUTABLE PARALLEL SAFE; + +CREATE OR REPLACE FUNCTION isrs_diff(a isrs, b isrs) RETURNS double precision +AS $$ + SELECT CAST(public.isrs_cmp(a, b) AS double precision) +$$ LANGUAGE sql + IMMUTABLE PARALLEL SAFE;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/updates/1202/01.fix_data_availability.sql Fri Sep 20 15:35:16 2019 +0200 @@ -0,0 +1,3 @@ +\ir ../../geoserver_views.sql; + +DROP INDEX waterway.gauge_measurements_location_measure_date_desc
--- a/schema/updates/1300/02.views_to_geoservers.sql Mon Sep 16 16:56:11 2019 +0200 +++ b/schema/updates/1300/02.views_to_geoservers.sql Fri Sep 20 15:35:16 2019 +0200 @@ -19,7 +19,7 @@ r.rwls AS reference_water_levels, wl.measure_date AS gm_measuredate, wl.water_level AS gm_waterlevel, - wl_14d.n AS gm_n_14d, + wl.n AS gm_n_14d, fca.forecast_accuracy_3d, fca.forecast_accuracy_1d FROM waterway.gauges g @@ -32,29 +32,32 @@ LEFT JOIN (SELECT DISTINCT ON (location) location, measure_date, - water_level - FROM waterway.gauge_measurements - ORDER BY location, measure_date DESC) AS wl - USING (location) - LEFT JOIN (SELECT location, count(water_level) AS n + water_level, + count(*) OVER (PARTITION BY location) AS n FROM waterway.gauge_measurements -- consider all measurements within 14 days plus a tolerance WHERE measure_date >= current_timestamp - '14 days 00:15'::interval - GROUP BY location) AS wl_14d + ORDER BY location, measure_date DESC) AS wl USING (location) - LEFT JOIN (SELECT location, - max(acc) FILTER (WHERE - measure_date <= current_timestamp + '1 day'::interval) - AS forecast_accuracy_1d, - max(acc) AS forecast_accuracy_3d - FROM waterway.gauge_predictions, - GREATEST(water_level - lower(conf_interval), - upper(conf_interval) - water_level) AS acc (acc) - WHERE measure_date - BETWEEN current_timestamp - AND current_timestamp + '3 days'::interval - GROUP BY location) AS fca + LEFT JOIN (SELECT DISTINCT ON (location) + location, + max(acc) FILTER (WHERE measure_date + <= current_timestamp + '1 day'::interval) + OVER loc_date_issue AS forecast_accuracy_1d, + max(acc) OVER loc_date_issue AS forecast_accuracy_3d + FROM (SELECT location, date_issue, measure_date, + GREATEST(water_level - lower(conf_interval), + upper(conf_interval) - water_level) AS acc + FROM waterway.gauge_predictions + -- consider predictions made within last 14 days ... + WHERE date_issue + >= current_timestamp - '14 days 00:15'::interval + -- ... for the next three days from now + AND measure_date BETWEEN current_timestamp + AND current_timestamp + '3 days'::interval) AS acc + WINDOW loc_date_issue AS (PARTITION BY location, date_issue) + ORDER BY location, date_issue DESC) AS fca USING (location) $$); @@ -115,15 +118,15 @@ s.nobjnam, s.date_info, s.source_organization, - (SELECT string_agg(country_code, ', ') - FROM waterway.stretch_countries - WHERE stretches_id = s.id) AS countries, + (SELECT string_agg(country, ', ') + FROM users.stretch_countries + WHERE stretch_id = s.id) AS countries, s.staging_done, min(g.gm_measuredate) AS gm_measuredate, min(g.gm_n_14d) AS gm_n_14d, max(g.forecast_accuracy_3d) AS forecast_accuracy_3d, max(g.forecast_accuracy_1d) AS forecast_accuracy_1d - FROM waterway.stretches s + FROM users.stretches s LEFT JOIN ( $$ || (SELECT def FROM base_views WHERE name = 'gauges_base_view') || $$ WHERE NOT erased) AS g
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/yarn.lock Fri Sep 20 15:35:16 2019 +0200 @@ -0,0 +1,22 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +sanitize-filename@^1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" + integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== + dependencies: + truncate-utf8-bytes "^1.0.0" + +truncate-utf8-bytes@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" + integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys= + dependencies: + utf8-byte-length "^1.0.1" + +utf8-byte-length@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" + integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=