diff --git a/Makefile b/Makefile
index 61cf903..a998628 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
PROJECT_ID := dockerosm
-COMPOSE_FILE := docker-compose.yml
+COMPOSE_FILE := docker-compose-web.yml
+# COMPOSE_FILE := docker-compose.yml
build:
diff --git a/docker-compose-web.yml b/docker-compose-web.yml
new file mode 100644
index 0000000..9734e84
--- /dev/null
+++ b/docker-compose-web.yml
@@ -0,0 +1,117 @@
+storage:
+ image: ubuntu:latest
+ container_name: dockerosm_storage
+ hostname: storage
+ volumes:
+ # These are sharable to other containers
+ - ./settings:/home/settings
+ - /home/import_done
+ - /home/import_queue
+ - /home/cache
+ #- ./import_done:/home/import_done
+ #- ./import_queue:/home/import_queue
+ #- ./cache:/home/cache
+
+db:
+ # About the postgresql version, it should match in the dockerfile of docker-imposm3
+ image: kartoza/postgis:9.4-2.1
+ container_name: dockerosm_db
+ hostname: db
+ environment:
+ - USERNAME=docker
+ - PASS=docker
+ volumes_from:
+ - storage
+ ports:
+ - "5433:5432"
+
+imposm:
+ build: docker-imposm3
+ container_name: dockerosm_imposm
+ volumes_from:
+ - storage
+ links:
+ - db:db
+ environment:
+ - USER=docker
+ - PASSWORD=docker
+ - PORT=5432
+ - HOST=db
+ - DATABASE=gis
+ # seconds between 2 executions of the script
+ - TIME=120
+ # folder for settings (with *.json and *.sql)
+ - SETTINGS=settings
+ # folder for caching
+ - CACHE=cache
+ # folder for diff which has been imported
+ - IMPORT_DONE=import_done
+ # folder for diff which hasn't been imported yet
+ - IMPORT_QUEUE=import_queue
+ # it can be 3857
+ - SRID=4326
+ # see http://imposm.org/docs/imposm3/latest/tutorial.html#optimize
+ - OPTIMIZE=false
+ # see http://imposm.org/docs/imposm3/latest/tutorial.html#deploy-production-tables
+ - DBSCHEMA_PRODUCTION=public
+ # http://imposm.org/docs/imposm3/latest/tutorial.html#deploy-production-tables
+ - DBSCHEMA_IMPORT=import
+ # http://imposm.org/docs/imposm3/latest/tutorial.html#deploy-production-tables
+ - DBSCHEMA_BACKUP=backup
+ # Install some styles if you are using the default mapping. It can be 'yes' or 'no'
+ - QGIS_STYLE=yes
+ # Use clip in the database
+ - CLIP=no
+
+
+osmupdate:
+ build: docker-osmupdate
+ container_name: dockerosm_osmupdate
+ volumes_from:
+ - storage
+ environment:
+ # These are all currently the defaults but listed here for your
+ # convenience if you want to change them
+ # the maximum time range to assamble a cumulated changefile.
+ - MAX_DAYS=100
+ # osmupdate uses a combination of minutely, hourly and daily changefiles. This value can be minute, hour, day or sporadic.
+ - DIFF=sporadic
+ # argument to determine the maximum number of parallely processed changefiles.
+ - MAX_MERGE=7
+ # define level for gzip compression. values between 1 (low compression but fast) and 9 (high compression but slow)
+ - COMPRESSION_LEVEL=1
+ # change the URL to use a custom URL to fetch regional file updates.
+ - BASE_URL=http://planet.openstreetmap.org/replication/
+ # folder for diff which hasn't been imported yet
+ - IMPORT_QUEUE=import_queue
+ # folder for diff which has been imported
+ - IMPORT_DONE=import_done
+ # seconds between 2 executions of the script
+ - TIME=120
+
+qgisserver:
+ image: kartoza/qgis-server:2.14
+ hostname: dockerosm_qgisserver
+ container_name: dockerosm_qgisserver
+ #volumes_from:
+ # - btsync
+ volumes:
+ - ./logs:/var/log/apache2
+ - ./web:/web
+ links:
+ - db:db
+ ports:
+ - 8198:80
+ restart: on-failure:5
+
+#btsync:
+# image: kartoza/btsync
+# container_name: dockerosm_btsync
+# hostname: dockerosm_btsync
+# volumes:
+# - /web
+# environment:
+# This should be the read only key
+# - SECRET=BBEBVOOYDPGO3GIIEQUMAIEJQNINOLX7V
+# - DEVICE=readonly-
+# restart: on-failure:5
\ No newline at end of file
diff --git a/web/index.html b/web/index.html
new file mode 100644
index 0000000..bfeed35
--- /dev/null
+++ b/web/index.html
@@ -0,0 +1,25 @@
+
+Docker OSM
+
+
+
+
+
\ No newline at end of file
diff --git a/web/project.qgs b/web/project.qgs
new file mode 100644
index 0000000..7515767
--- /dev/null
+++ b/web/project.qgs
@@ -0,0 +1,2271 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ degrees
+
+ -512.43968497770254089
+ -626.1671100158301897
+ 909.01370690209625991
+ 355.37267513088306714
+
+ 0
+ 0
+
+
+ +proj=longlat +datum=WGS84 +no_defs
+ 3452
+ 4326
+ EPSG:4326
+ WGS 84
+ longlat
+ WGS84
+ true
+
+
+ 0
+
+
+
+
+ - osm_admin20160719163043785
+ - osm_buildings20160719163043848
+ - osm_places20160719163043915
+ - osm_roads20160719163043925
+ - osm_waterareas20160719163043974
+ - osm_waterways20160719163043986
+
+
+
+
+
+
+ -16.48855256720590035
+ 10.86045754913959982
+ -13.8444800376543995
+ 12.68623839947360032
+
+ osm_admin20160719163043785
+ dbname='gis' host=localhost port=5432 user='docker' password='docker' sslmode=disable key='id' srid=4326 type=Polygon table="public"."osm_admin" (geometry) sql=
+
+
+
+ osm_admin
+
+
+ +proj=longlat +datum=WGS84 +no_defs
+ 3452
+ 4326
+ EPSG:4326
+ WGS 84
+ longlat
+ WGS84
+ true
+
+
+ postgres
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 0
+ name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+ -16.54550361633300071
+ 11.47879123687740055
+ -14.79559993743900037
+ 12.31059169769289952
+
+ osm_buildings20160719163043848
+ dbname='gis' host=localhost port=5433 user='docker' password='docker' sslmode=disable key='id' srid=4326 type=Polygon table="public"."osm_buildings" (geometry) sql=
+
+
+
+ osm_buildings
+
+
+ +proj=longlat +datum=WGS84 +no_defs
+ 3452
+ 4326
+ EPSG:4326
+ WGS 84
+ longlat
+ WGS84
+ true
+
+
+ postgres
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 0
+ name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+ -16.6649723052979013
+ 10.99381256103520066
+ -13.63364601135249998
+ 12.6874570846558008
+
+ osm_places20160719163043915
+ dbname='gis' host=localhost port=5433 user='docker' password='docker' sslmode=disable key='id' srid=4326 type=Point table="public"."osm_places" (geometry) sql=
+
+
+
+ osm_places
+
+
+ +proj=longlat +datum=WGS84 +no_defs
+ 3452
+ 4326
+ EPSG:4326
+ WGS 84
+ longlat
+ WGS84
+ true
+
+
+ postgres
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 0
+ name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+ -16.66467475891110084
+ 10.99235820770259942
+ -13.61931133270259942
+ 12.75120353698729936
+
+ osm_roads20160719163043925
+ dbname='gis' host=localhost port=5433 user='docker' password='docker' sslmode=disable key='id' srid=4326 type=LineString table="public"."osm_roads" (geometry) sql=
+
+
+
+ osm_roads
+
+
+ +proj=longlat +datum=WGS84 +no_defs
+ 3452
+ 4326
+ EPSG:4326
+ WGS 84
+ longlat
+ WGS84
+ true
+
+
+ postgres
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 0
+ name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+ -16.55597305297850141
+ 10.95377540588379972
+ -13.76440334320069958
+ 12.66372680664060013
+
+ osm_waterareas20160719163043974
+ dbname='gis' host=localhost port=5433 user='docker' password='docker' sslmode=disable key='id' srid=4326 type=MultiPolygon table="public"."osm_waterareas" (geometry) sql=
+
+
+
+ osm_waterareas
+
+
+ +proj=longlat +datum=WGS84 +no_defs
+ 3452
+ 4326
+ EPSG:4326
+ WGS 84
+ longlat
+ WGS84
+ true
+
+
+ postgres
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 0
+ name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+ -16.71288681030269885
+ 10.87495326995849965
+ -13.45248031616210049
+ 12.78677368164060013
+
+ osm_waterways20160719163043986
+ dbname='gis' host=localhost port=5433 user='docker' password='docker' sslmode=disable key='id' srid=4326 type=LineString table="public"."osm_waterways" (geometry) sql=
+
+
+
+ osm_waterways
+
+
+ +proj=longlat +datum=WGS84 +no_defs
+ 3452
+ 4326
+ EPSG:4326
+ WGS 84
+ longlat
+ WGS84
+ true
+
+
+ postgres
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 0
+ name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ false
+
+
+
+
+
+ 2
+ true
+ MU
+
+
+
+ true
+
+
+ false
+
+ NONE
+
+ 8
+
+
+
+
+
+
+ 0
+ 255
+ 255
+ 255
+ 255
+ 255
+ 255
+
+
+ 2
+
+ osm_admin20160719163043785
+ osm_buildings20160719163043848
+ osm_places20160719163043915
+ osm_roads20160719163043925
+ osm_waterareas20160719163043974
+ osm_waterways20160719163043986
+
+
+ disabled
+ disabled
+ disabled
+ disabled
+ disabled
+ disabled
+
+ current_layer
+
+
+ 2
+ 2
+ 2
+ 2
+ 2
+ 2
+
+
+ to_vertex_and_segment
+ to_vertex_and_segment
+ to_vertex_and_segment
+ to_vertex_and_segment
+ to_vertex_and_segment
+ to_vertex_and_segment
+
+ off
+ 0
+
+ 0.000000
+ 0.000000
+ 0.000000
+ 0.000000
+ 0.000000
+ 0.000000
+
+
+
+
+
+
+
+
+ None
+
+
+
+ +proj=longlat +datum=WGS84 +no_defs
+ EPSG:4326
+ 3452
+ 0
+
+
+
+
+
+ true
+ 255
+
+
+ conditions unknown
+ 90
+
+ meters
+ m2
+
+
+
+
+