Merge branch 'master' into quickstart_v2

This commit is contained in:
ImreSamu
2016-11-29 15:12:23 +01:00
28 changed files with 23 additions and 337 deletions

View File

@@ -1,8 +1,5 @@
all: build/openmaptiles.tm2source/data.yml build/mapping.yaml build/tileset.sql
.PHONY: docs
docs: layers/railway/README.md layers/boundary/README.md layers/water/README.md layers/building/README.md layers/highway/README.md layers/highway_name/README.md layers/poi/README.md layers/place/README.md layers/waterway/README.md layers/water_name/README.md layers/landcover/README.md layers/landuse/README.md layers/housenumber/README.md
build/openmaptiles.tm2source/data.yml:
mkdir -p build/openmaptiles.tm2source && generate-tm2source openmaptiles.yaml --host="postgres" --port=5432 --database="openmaptiles" --user="openmaptiles" --password="openmaptiles" > build/openmaptiles.tm2source/data.yml
@@ -12,49 +9,7 @@ build/mapping.yaml:
build/tileset.sql:
mkdir -p build && generate-sql openmaptiles.yaml > build/tileset.sql
layers/poi/README.md:
generate-doc layers/poi/poi.yaml --diagram layers/poi/mapping > layers/poi/README.md
layers/highway/README.md:
generate-doc layers/highway/highway.yaml --diagram layers/highway/mapping > layers/highway/README.md
layers/highway_name/README.md:
generate-doc layers/highway_name/highway_name.yaml > layers/highway_name/README.md
layers/railway/README.md:
generate-doc layers/railway/railway.yaml --diagram layers/railway/mapping > layers/railway/README.md
layers/boundary/README.md:
generate-doc layers/boundary/boundary.yaml --diagram layers/boundary/mapping > layers/boundary/README.md
layers/water_name/README.md:
generate-doc layers/water_name/water_name.yaml > layers/water_name/README.md
layers/water/README.md:
generate-doc layers/water/water.yaml --diagram layers/water/mapping > layers/water/README.md
layers/waterway/README.md:
generate-doc layers/waterway/waterway.yaml --diagram layers/waterway/mapping > layers/waterway/README.md
layers/building/README.md:
generate-doc layers/building/building.yaml > layers/building/README.md
layers/place/README.md:
generate-doc layers/place/place.yaml --diagram layers/place/mapping > layers/place/README.md
layers/landuse/README.md:
generate-doc layers/landuse/landuse.yaml --diagram layers/landuse/mapping > layers/landuse/README.md
layers/landcover/README.md:
generate-doc layers/landcover/landcover.yaml --diagram layers/landcover/mapping > layers/landcover/README.md
layers/housenumber/README.md:
generate-doc layers/housenumber/housenumber.yaml > layers/housenumber/README.md
clean:
rm -f build/openmaptiles.tm2source/data.yml && rm -f build/mapping.yaml && rm -f build/tileset.sql && rm -f layers/**/README.md&& rm -f layers/**/*.png
clean_build:
rm -f build/openmaptiles.tm2source/data.yml && rm -f build/mapping.yaml && rm -f build/tileset.sql
clean-docker:
@@ -139,7 +94,7 @@ download-geofabrik-list:
start-mapbox-studio:
docker-compose up mapbox-studio
etlgraph:
test_etlgraph:
generate-etlgraph layers/boundary/boundary.yaml
generate-etlgraph layers/highway/highway.yaml
generate-etlgraph layers/housenumber/housenumber.yaml
@@ -153,4 +108,3 @@ etlgraph:
generate-etlgraph layers/place/place.yaml
generate-etlgraph layers/railway/railway.yaml
generate-etlgraph layers/water_name/water_name.yaml