Mercurial > gemma
changeset 996:839526f44f0f persistent-import-queue
Merged default into persistent-import-queue branch.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Mon, 22 Oct 2018 14:49:00 +0200 |
parents | 6421c51309eb (current diff) e03fab882b47 (diff) |
children | 75e65599ea52 |
files | |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/morphtool/Morphtool.vue Mon Oct 22 13:03:38 2018 +0200 +++ b/client/src/morphtool/Morphtool.vue Mon Oct 22 14:49:00 2018 +0200 @@ -96,7 +96,7 @@ ...mapState("identifystore", ["identifiedFeatures"]), ...mapState("morphstore", ["selectedMorph"]), selectedBottleneck: function() { - if (this.identifiedFeatures && !this.drawMode) { + if (this.identifiedFeatures) { for (let feature of this.identifiedFeatures) { let id = feature.getId(); // RegExp.prototype.test() works with number, str and undefined
--- a/pkg/controllers/search.go Mon Oct 22 13:03:38 2018 +0200 +++ b/pkg/controllers/search.go Mon Oct 22 14:49:00 2018 +0200 @@ -14,7 +14,7 @@ searchHectometreSQL = `SELECT COALESCE(json_agg(r),'[]') FROM (SELECT (location_code).hectometre || ' rhm' AS name, ST_AsGeoJSON(geom)::json AS geom - FROM waterway.distance_marks + FROM waterway.distance_marks_virtual WHERE (location_code).hectometre = $1) r` searchBottleneckSQL = `SELECT COALESCE(json_agg(r),'[]') FROM (SELECT objnam AS name,