Mercurial > gemma
changeset 2239:3fce60e34395
Merged.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Wed, 13 Feb 2019 14:38:51 +0100 |
parents | 4ca41516115b (current diff) a78f19ff7cde (diff) |
children | c3cc21dee75d |
files | |
diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/store/map.js Wed Feb 13 14:38:28 2019 +0100 +++ b/client/src/store/map.js Wed Feb 13 14:38:51 2019 +0100 @@ -231,7 +231,11 @@ lineDash: [5, 5], width: 2 }) - }) + }), + // TODO: Set layer in layertree active/inactive depending on + // resolution. + maxResolution: 5, + minResolution: 0 }), isVisible: true, showInLegend: true @@ -248,7 +252,9 @@ lineDash: [5, 5], width: 2 }) - }) + }), + maxResolution: 2.5, + minResolution: 0 }), isVisible: true, showInLegend: true
--- a/docker/Dockerfile.geoserv Wed Feb 13 14:38:28 2019 +0100 +++ b/docker/Dockerfile.geoserv Wed Feb 13 14:38:51 2019 +0100 @@ -14,6 +14,7 @@ ENV CATALINA_TMPDIR /tmp/tomcat8-tmp ENV GS_URL https://downloads.sourceforge.net/project/geoserver/GeoServer + ENV GS_VERSION 2.14.2 ENV GS_DATADIR /opt/geoserver/data