Merged in feature/implement-OpenTopoMap (pull request ncareol#1)

Feature/implement OpenTopoMap

Author: bbouffaut

.gitignore

@@ -0,0 +1 @@
+docker-compose.yml

Dockerfile

@@ -8,13 +8,9 @@
 # <http://switch2osm.org/serving-tiles/manually-building-a-tile-server-12-04/>.
 #
 
-FROM ncareol/baseimage:0.9.18
+FROM phusion/baseimage:latest
 MAINTAINER Erik Johnson <[email protected]>
 
-# Set the locale. This affects the encoding of the Postgresql template
-# databases.
-ENV LANG C.UTF-8
-RUN update-locale LANG=C.UTF-8
 
 # Ensure `add-apt-repository` is present
 RUN apt-get update -y
@@ -23,12 +19,15 @@ RUN apt-get install -y software-properties-common python-software-properties
 RUN apt-get install -y libboost-dev libboost-filesystem-dev libboost-program-options-dev libboost-python-dev libboost-regex-dev libboost-system-dev libboost-thread-dev
 
 # Install remaining dependencies
-RUN apt-get install -y subversion git-core tar unzip wget bzip2 build-essential autoconf libtool libxml2-dev libgeos-dev libpq-dev libbz2-dev munin-node munin libprotobuf-c0-dev protobuf-c-compiler libfreetype6-dev libpng12-dev libtiff4-dev libicu-dev libgdal-dev libcairo-dev libcairomm-1.0-dev apache2 apache2-dev libagg-dev liblua5.2-dev ttf-unifont
+RUN apt-get install -y subversion git-core tar unzip wget bzip2 build-essential autoconf libtool libxml2-dev libgeos-dev libpq-dev libbz2-dev munin-node munin libprotobuf-c0-dev protobuf-c-compiler libfreetype6-dev libpng12-dev libtiff5-dev libicu-dev libgdal-dev libcairo-dev libcairomm-1.0-dev apache2 apache2-dev libagg-dev liblua5.2-dev ttf-unifont
 
-RUN apt-get install -y autoconf apache2-dev libtool libxml2-dev libbz2-dev libgeos-dev libgeos++-dev libproj-dev gdal-bin libgdal1-dev mapnik-utils python-mapnik libmapnik-dev
+RUN apt-get install -y autoconf apache2-dev libtool libxml2-dev libbz2-dev libgeos-dev libgeos++-dev libproj-dev gdal-bin libgdal1-dev sudo
+
+# Install OpenTopoMap dependencies
+RUN apt-get install -y python3-setuptools python3-matplotlib python3-bs4 python3-numpy python3-gdal python-gdal
 
 # Install postgresql and postgis
-RUN apt-get install -y postgresql-9.3-postgis-2.1 postgresql-contrib postgresql-server-dev-9.3
+RUN apt-get install -y postgresql postgresql-contrib postgis postgresql-9.5-postgis-2.2
 
 # Install osm2pgsql
 RUN cd /tmp && git clone git://github.com/openstreetmap/osm2pgsql.git && \
@@ -39,17 +38,9 @@ RUN cd /tmp && git clone git://github.com/openstreetmap/osm2pgsql.git && \
     make && make install && \
     cd /tmp && rm -rf /tmp/osm2pgsql
 
-# TODO: mapnik 3.0.5
 
 # Install the Mapnik library
-RUN cd /tmp && git clone git://github.com/mapnik/mapnik && \
-    cd /tmp/mapnik && \
-    git checkout 2.2.x && \
-    python scons/scons.py configure INPUT_PLUGINS=all OPTIMIZATION=3 SYSTEM_FONTS=/usr/share/fonts/truetype/ && \
-    python scons/scons.py && \
-    python scons/scons.py install && \
-    ldconfig && \
-    cd /tmp && rm -rf /tmp/mapnik
+RUN apt-get install -y libmapnik3.0 libmapnik-dev mapnik-utils python-mapnik unifont
 
 # Verify that Mapnik has been installed correctly
 RUN python -c 'import mapnik'
@@ -65,12 +56,22 @@ RUN cd /tmp && git clone git://github.com/openstreetmap/mod_tile.git && \
     ldconfig && \
     cd /tmp && rm -rf /tmp/mod_tile
 
+# Install phyghtmap (OpenTopoMap)
+RUN cd /tmp && wget http://katze.tfiu.de/projects/phyghtmap/phyghtmap_2.20.orig.tar.gz && \
+    tar -xvzf phyghtmap_2.20.orig.tar.gz && \
+    rm *.gz && \
+    cd phyghtmap-2.20 && \
+    python3 setup.py install
+
 # Install the Mapnik stylesheet
 RUN cd /usr/local/src && svn co http://svn.openstreetmap.org/applications/rendering/mapnik mapnik-style
 
 # Install the coastline data
 RUN cd /usr/local/src/mapnik-style && ./get-coastlines.sh /usr/local/share
 
+# Download OpenTopoMap data
+RUN cd /root && git clone https://github.com/der-stefan/OpenTopoMap.git && chmod go+rx /root/ && ln -s /data /root/OpenTopoMap/mapnik/ && chown -R www-data OpenTopoMap
+
 # Configure mapnik style-sheets
 RUN cd /usr/local/src/mapnik-style/inc && cp fontset-settings.xml.inc.template fontset-settings.xml.inc
 ADD datasource-settings.sed /tmp/
@@ -79,27 +80,32 @@ ADD settings.sed /tmp/
 RUN cd /usr/local/src/mapnik-style/inc && sed --file /tmp/settings.sed  settings.xml.inc.template > settings.xml.inc
 
 # Configure renderd
-ADD renderd.conf.sed /tmp/
-RUN cd /usr/local/etc && sed --file /tmp/renderd.conf.sed --in-place renderd.conf
+ADD renderd.conf /tmp/
+RUN cd /usr/local/etc && mv /tmp/renderd.conf .
 
 # Create the files required for the mod_tile system to run
 RUN mkdir /var/run/renderd && chown www-data: /var/run/renderd
 RUN mkdir /var/lib/mod_tile && chown www-data /var/lib/mod_tile
 
 # Replace default apache index page with OpenLayers demo
-ADD index.html /var/www/html/index.html
+ADD www/* /var/www/html/
 
 # Configure mod_tile
 ADD mod_tile.load /etc/apache2/mods-available/
 ADD mod_tile.conf /etc/apache2/mods-available/
 RUN a2enmod mod_tile
 
 # Ensure the webserver user can connect to the gis database
-RUN sed -i -e 's/local   all             all                                     peer/local gis www-data peer/' /etc/postgresql/9.3/main/pg_hba.conf
+RUN sed -i -e 's/local   all             all                                     peer/host all all 0\.0\.0\.0\/0 trust/' /etc/postgresql/9.5/main/pg_hba.conf
+RUN echo 'local gis www-data peer' >> /etc/postgresql/9.5/main/pg_hba.conf && \
+    echo 'local lowzoom www-data peer' >> /etc/postgresql/9.5/main/pg_hba.conf && \
+    echo 'local postgres www-data peer' >> /etc/postgresql/9.5/main/pg_hba.conf && \
+    echo 'local template1 www-data peer' >> /etc/postgresql/9.5/main/pg_hba.conf && \
+    echo 'local contours www-data peer' >> /etc/postgresql/9.5/main/pg_hba.conf
 
 # Tune postgresql
 ADD postgresql.conf.sed /tmp/
-RUN sed --file /tmp/postgresql.conf.sed --in-place /etc/postgresql/9.3/main/postgresql.conf
+RUN sed --file /tmp/postgresql.conf.sed --in-place /etc/postgresql/9.5/main/postgresql.conf
 
 # Define the application logging logic
 ADD syslog-ng.conf /etc/syslog-ng/conf.d/local.conf
@@ -121,7 +127,7 @@ RUN update-service --add /etc/sv/renderd
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Expose the webserver and database ports
-EXPOSE 80 5432
+EXPOSE 80 80
 
 # We need the volume for importing data from
 VOLUME ["/data"]
@@ -140,5 +146,6 @@ ADD help.txt /usr/local/share/doc/run/help.txt
 ADD run.sh /usr/local/sbin/run
 ENTRYPOINT ["/sbin/my_init", "--", "/usr/local/sbin/run"]
 
+
 # Default to showing the usage text
 CMD ["help"]

postgresql.conf.sed

@@ -7,3 +7,4 @@ s/#autovacuum = on/autovacuum = off/
 s/#log_destination = 'stderr'/log_destination = 'stderr,syslog'/
 s/#syslog_facility/syslog_facility/
 s/#syslog_ident/syslog_ident/
+s/#listen_addresses = 'localhost'/listen_addresses = '*'/

postgresql/down

@@ -8,6 +8,6 @@
 # permissions setting.
 chown -R postgres /var/lib/postgresql/ || exit 1
 
-exec /sbin/setuser postgres /usr/lib/postgresql/9.3/bin/postgres \
-    -D /var/lib/postgresql/9.3/main \
-    -c config_file=/etc/postgresql/9.3/main/postgresql.conf
+exec /sbin/setuser postgres /usr/lib/postgresql/9.5/bin/postgres \
+    -D /var/lib/postgresql/9.5/main \
+    -c config_file=/etc/postgresql/9.5/main/postgresql.conf

postgresql/run

@@ -0,0 +1,59 @@
+[renderd]
+socketname=/var/run/renderd/renderd.sock
+num_threads=4
+tile_dir=/var/lib/mod_tile
+stats_file=/var/run/renderd/renderd.stats
+
+;[renderd01]
+;iphostname=::1
+;ipport=7654
+;num_threads=4
+;tile_dir=rados://tiles/etc/ceph/ceph.conf
+;stats_file=/var/run/renderd/renderd.stats
+
+;[renderd02]
+;iphostname=::1
+;ipport=7654
+;num_threads=4
+;tile_dir=memcached://
+;stats_file=/var/run/renderd/renderd.stats
+
+[mapnik]
+plugins_dir=/usr/lib/mapnik/3.0/input
+font_dir=/usr/share/fonts/truetype/ttf-dejavu
+font_dir_recurse=1
+
+[default]
+URI=/osm_tiles/
+TILEDIR=/var/lib/mod_tile/PATH_TO_BE_REPLACED
+XML=/usr/local/src/mapnik-style/osm.xml
+HOST=localhost
+TILESIZE=256
+;HTCPHOST=proxy.openstreetmap.org
+;** config options used by mod_tile, but not renderd **
+;MINZOOM=0
+;MAXZOOM=18
+;TYPE=png image/png
+;DESCRIPTION=This is a description of the tile layer used in the tile json request
+;ATTRIBUTION=&copy;<a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and <a href=\"http://wiki.openstreetmap.org/wiki/Contributors\">contributors</a>, <a href=\"http://opendatacommons.org/licenses/odbl/\">ODbL</a>
+;SERVER_ALIAS=http://localhost/
+;CORS=http://www.openstreetmap.org
+;ASPECTX=1
+;ASPECTY=1
+;SCALE=1.0
+
+;[style2]
+;URI=/osm_tiles2/
+;TILEDIR=rados://tiles/etc/ceph/ceph.conf
+;TILESIZE=512
+;XML=/usr/local/src/mapnik-style/osm.xml
+;HOST=localhost
+;HTCPHOST=proxy.openstreetmap.org
+;** config options used by mod_tile, but not renderd **
+;MINZOOM=0
+;MAXZOOM=22
+;TYPE=png image/png
+;DESCRIPTION=This is a description of the tile layer used in the tile json request
+;ATTRIBUTION=&copy;<a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and <a href=\"http://wiki.openstreetmap.org/wiki/Contributors\">contributors</a>, <a href=\"http://opendatacommons.org/licenses/odbl/\">ODbL</a>
+;SERVER_ALIAS=http://localhost/
+;CORS=*