Mercurial > gemma
changeset 2235:39586a34979c
LAYERS.WATERWAYPROFILES: Set max- and minResolution. Modelled after d4d.
| author | Bjoern Schilberg <bjoern@intevation.de> |
|---|---|
| date | Wed, 13 Feb 2019 13:50:59 +0100 |
| parents | 9b2f8e94671e |
| children | 32441ac04c7c |
| files | client/src/store/map.js docker/Dockerfile.db docker/Dockerfile.geoserv |
| diffstat | 3 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/store/map.js Wed Feb 13 12:45:48 2019 +0100 +++ b/client/src/store/map.js Wed Feb 13 13:50:59 2019 +0100 @@ -248,7 +248,9 @@ lineDash: [5, 5], width: 2 }) - }) + }), + maxResolution: 2.5, + minResolution: 0 }), isVisible: true, showInLegend: true
--- a/docker/Dockerfile.db Wed Feb 13 12:45:48 2019 +0100 +++ b/docker/Dockerfile.db Wed Feb 13 13:50:59 2019 +0100 @@ -15,6 +15,7 @@ apt-key add - &&\ apt-get update &&\ apt-get -y install postgresql-11-postgis-2.5 postgresql-11-pgtap +RUN apt-get -y install --no-install-recommends postgis xsltproc jq USER postgres ENV PGBIN /usr/lib/postgresql/11/bin @@ -38,8 +39,9 @@ WORKDIR /opt/gemma COPY schema/*.sql schema/*.sh ./ COPY schema/demo-data ./demo-data/ +COPY schema/geonames-import ./geonames-import/ RUN $PGBIN/pg_ctl start -wo "--config_file=$PGCONF" && \ - ./install-db.sh --demo --metapw "geo2Serv" && \ + ./install-db.sh --demo -G --metapw "geo2Serv" && \ $PGBIN/pg_ctl stop -m smart # Set the default command to run when starting the container
--- a/docker/Dockerfile.geoserv Wed Feb 13 12:45:48 2019 +0100 +++ b/docker/Dockerfile.geoserv Wed Feb 13 13:50:59 2019 +0100 @@ -13,7 +13,9 @@ ENV CATALINA_BASE /var/lib/tomcat8 ENV CATALINA_TMPDIR /tmp/tomcat8-tmp -ENV GS_URL https://downloads.sourceforge.net/project/geoserver/GeoServer +#ENV GS_URL https://downloads.sourceforge.net/project/geoserver/GeoServer +ENV GS_URL https://netcologne.dl.sourceforge.net/project/geoserver/GeoServer + ENV GS_VERSION 2.14.2 ENV GS_DATADIR /opt/geoserver/data