cerxes/openmaptiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix import-borders if runs multiple times (#916)

Browse Source 
Running './quickstart monaco' twice in a row will cause an error the second time.
This commit is contained in:
Yuri Astrakhan 2020-06-05 12:48:48 -04:00 committed by GitHub
parent 1a9f6132c3
commit 805d95df09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -73,7 +73,7 @@ ifeq ($(strip $(area)),)
# if $area is not set. set it to the name of the *.osm.pbf file, but only if there is only one # if $area is not set. set it to the name of the *.osm.pbf file, but only if there is only one
data_files := $(wildcard data/*.osm.pbf) data_files := $(wildcard data/*.osm.pbf)
ifneq ($(word 2,$(data_files)),) ifneq ($(word 2,$(data_files)),)
AREA_ERROR := The 'area' parameter (or env var) has not been set, and there are more than one data/*.osm.pbf files. Set area to one of these IDs, or a new one: $(patsubst data/%.osm.pbf,'%',$(data_files)) AREA_ERROR := The 'area' parameter (or env var) has not been set, and there are more than one data/*.osm.pbf files: $(patsubst data/%.osm.pbf,'%',$(data_files))
else else
ifeq ($(word 1,$(data_files)),) ifeq ($(word 1,$(data_files)),)
AREA_ERROR := The 'area' parameter (or env var) has not been set, and there are no data/*.osm.pbf files AREA_ERROR := The 'area' parameter (or env var) has not been set, and there are no data/*.osm.pbf files
@ -121,6 +121,7 @@ AREA_DC_CONFIG_FILE ?= data/$(area).dc-config.yml
ifeq ($(strip $(area)),) ifeq ($(strip $(area)),)
define assert_area_is_given define assert_area_is_given
@echo ""
@echo "ERROR: $(AREA_ERROR)" @echo "ERROR: $(AREA_ERROR)"
@echo "" @echo ""
@echo " make $@ area=<area-id>" @echo " make $@ area=<area-id>"
@ -319,7 +320,7 @@ import-borders: start-db-nowait
@$(assert_area_is_given) @$(assert_area_is_given)
# If CSV borders file already exists, use it without re-parsing # If CSV borders file already exists, use it without re-parsing
$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c \ $(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c \
'pgwait && import-borders $$([ -f "$(BORDERS_CSV_FILE)" ] && echo 'load' || echo 'import') $(PBF_FILE)' 'pgwait && import-borders $$([ -f "$(BORDERS_CSV_FILE)" ] && echo load $(BORDERS_CSV_FILE) || echo import $(PBF_FILE))'
.PHONY: import-sql .PHONY: import-sql
import-sql: all start-db-nowait import-sql: all start-db-nowait