# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1550065131 -3600
# Node ID 3fce60e34395361ec3f79e4e2db77e0ca6bc8433
# Parent  4ca41516115b3dc26b97394dfa2155144741fbca# Parent  a78f19ff7cde9e7c4cb43333809271b4c1e01902
Merged.

diff -r 4ca41516115b -r 3fce60e34395 client/src/store/map.js
--- 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
diff -r 4ca41516115b -r 3fce60e34395 docker/Dockerfile.db
diff -r 4ca41516115b -r 3fce60e34395 docker/Dockerfile.geoserv
--- 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