From 01463816ff77cb1278a72c826ed6808e0c14c464 Mon Sep 17 00:00:00 2001
From: Etienne Trimaille <etienne.trimaille@gmail.com>
Date: Tue, 29 Dec 2015 15:33:49 +0100
Subject: [PATCH 1/2] add management command styles

---
 .gitignore         |  4 +---
 Makefile           | 22 ++++++++++++++++++++++
 docker-compose.yml |  2 ++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index b799086..88239b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,6 @@ cache
 import_done
 import_queue
 settings/*.pbf
-settings/*.state.txt
-settings/*.poly
+BACKUP-STYLES.sql
 settings/last.state.txt
-settings/custom_url_diff.txt
 settings/timestamp.txt
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 6088609..8e46a54 100644
--- a/Makefile
+++ b/Makefile
@@ -56,3 +56,25 @@ timestamp:
 	@echo "Timestamp"
 	@echo "------------------------------------------------------------------"
 	@docker exec -t -i $(PROJECT_ID)_imposm cat /home/settings/timestamp.txt
+
+import_styles: remove_styles
+	@echo
+	@echo "------------------------------------------------------------------"
+	@echo "Importing QGIS styles"
+	@echo "------------------------------------------------------------------"
+	@docker exec -i $(PROJECT_ID)_db su - postgres -c "psql -f /home/settings/qgis_style.sql gis"
+
+remove_styles:
+	@echo
+	@echo "------------------------------------------------------------------"
+	@echo "Removing QGIS styles"
+	@echo "------------------------------------------------------------------"
+	@docker exec -t -i $(PROJECT_ID)_db /bin/su - postgres -c "psql gis -c 'DROP TABLE IF EXISTS layer_styles;'"
+
+backup_styles:
+	@echo
+	@echo "------------------------------------------------------------------"
+	@echo "Backup QGIS styles to BACKUP.sql"
+	@echo "------------------------------------------------------------------"
+	@echo "SET XML OPTION DOCUMENT;" > BACKUP-STYLES.sql
+	@ docker exec -t $(PROJECT_ID)_db su - postgres -c "/usr/bin/pg_dump --format plain --inserts --table public.layer_styles gis" >> BACKUP-STYLES.sql
diff --git a/docker-compose.yml b/docker-compose.yml
index 230b6b5..f043df5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,8 @@ db:
   environment:
     - USERNAME=docker
     - PASS=docker
+  volumes_from:
+    - storage
 
 imposm:
   build: docker-imposm3

From 08fd58a767b40e4327d3e204e2c990f575d03aaf Mon Sep 17 00:00:00 2001
From: ImreSamu <ImreSamu@users.noreply.github.com>
Date: Tue, 29 Dec 2015 18:29:08 +0100
Subject: [PATCH 2/2] correct imposm3 version  like : 0.1dev-20151229-901b40b

--- old
docker run -i -t dockerosm_imposm imposm3 version
0.1

--- new
docker run -i -t dockerosm_imposm imposm3 version
0.1dev-20151229-901b40b
---
 docker-imposm3/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-imposm3/Dockerfile b/docker-imposm3/Dockerfile
index 935b37b..536f7b3 100644
--- a/docker-imposm3/Dockerfile
+++ b/docker-imposm3/Dockerfile
@@ -11,7 +11,7 @@ RUN ln -s /usr/lib/libgeos_c.so /usr/lib/libgeos.so
 WORKDIR $GOPATH
 RUN go get github.com/tools/godep
 RUN git clone https://github.com/omniscale/imposm3 src/github.com/omniscale/imposm3
-RUN cd src/github.com/omniscale/imposm3 && godep go install ./
+RUN cd src/github.com/omniscale/imposm3 && make update_version && godep go install ./
 
 ADD requirements.txt /home/requirements.txt
 RUN pip install -r /home/requirements.txt