Merge branch 'develop' into clipping

Conflicts:
	.gitignore

.gitignore

@@ -4,10 +4,8 @@ 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
 settings/clip/clip.dbf
 settings/clip/clip.prj

Makefile

@@ -70,3 +70,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

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