diff --git a/Makefile b/Makefile index 6e674b5c..4069f0c8 100644 --- a/Makefile +++ b/Makefile @@ -154,7 +154,8 @@ etl-graph: # generate etl graph for a certain layer, e.g. etl-graph-building, etl-graph-place etl-graph-%: layers/% build/devdoc - docker run --rm -v $$(pwd):/tileset openmaptiles/openmaptiles-tools generate-etlgraph layers/$*/$*.yaml ./build/devdoc + docker run --rm -u $$(id -u $${USER}):$$(id -g $${USER}) -v $$(pwd):/tileset openmaptiles/openmaptiles-tools generate-etlgraph layers/$*/$*.yaml ./build/devdoc + cp ./build/devdoc/etl_$*.png layers/$*/etl_diagram.png mappingLayers = $(notdir $(patsubst %/mapping.yaml,%, $(wildcard layers/*/mapping.yaml))) # layers with mapping.yaml @@ -166,7 +167,8 @@ mapping-graph: @echo 'Valid layers: $(mappingLayers)' mapping-graph-%: ./layers/%/mapping.yaml build/devdoc - docker run --rm -v $$(pwd):/tileset openmaptiles/openmaptiles-tools generate-mapping-graph layers/$*/$*.yaml ./build/devdoc/mapping-diagram-$* + docker run --rm -u $$(id -u $${USER}):$$(id -g $${USER}) -v $$(pwd):/tileset openmaptiles/openmaptiles-tools generate-mapping-graph layers/$*/$*.yaml ./build/devdoc/mapping-diagram-$* + cp ./build/devdoc/mapping-diagram-$*.png layers/$*/mapping_diagram.png # generate all etl and mapping graphs generate-devdoc: $(addprefix etl-graph-,$(layers)) $(addprefix mapping-graph-,$(mappingLayers)) diff --git a/layers/aerodrome_label/etl_diagram.png b/layers/aerodrome_label/etl_diagram.png index 3e308256..38796644 100644 Binary files a/layers/aerodrome_label/etl_diagram.png and b/layers/aerodrome_label/etl_diagram.png differ diff --git a/layers/aerodrome_label/mapping_diagram.png b/layers/aerodrome_label/mapping_diagram.png index bcaf83aa..cbbb8991 100644 Binary files a/layers/aerodrome_label/mapping_diagram.png and b/layers/aerodrome_label/mapping_diagram.png differ diff --git a/layers/aeroway/etl_diagram.png b/layers/aeroway/etl_diagram.png index c2b38185..a895735f 100644 Binary files a/layers/aeroway/etl_diagram.png and b/layers/aeroway/etl_diagram.png differ diff --git a/layers/aeroway/mapping_diagram.png b/layers/aeroway/mapping_diagram.png index 7a102c44..ca19fec5 100644 Binary files a/layers/aeroway/mapping_diagram.png and b/layers/aeroway/mapping_diagram.png differ diff --git a/layers/boundary/etl_diagram.png b/layers/boundary/etl_diagram.png index 12e4ceaf..53f4eef7 100644 Binary files a/layers/boundary/etl_diagram.png and b/layers/boundary/etl_diagram.png differ diff --git a/layers/building/etl_diagram.png b/layers/building/etl_diagram.png index 6b52667a..8a43f94d 100644 Binary files a/layers/building/etl_diagram.png and b/layers/building/etl_diagram.png differ diff --git a/layers/building/mapping_diagram.png b/layers/building/mapping_diagram.png index 887f4871..8d8341f2 100644 Binary files a/layers/building/mapping_diagram.png and b/layers/building/mapping_diagram.png differ diff --git a/layers/housenumber/etl_diagram.png b/layers/housenumber/etl_diagram.png index 5dcd4997..add427d5 100644 Binary files a/layers/housenumber/etl_diagram.png and b/layers/housenumber/etl_diagram.png differ diff --git a/layers/housenumber/mapping_diagram.png b/layers/housenumber/mapping_diagram.png index bcaf83aa..a30e718a 100644 Binary files a/layers/housenumber/mapping_diagram.png and b/layers/housenumber/mapping_diagram.png differ diff --git a/layers/landcover/etl_diagram.png b/layers/landcover/etl_diagram.png index ba8f588a..8fb941a7 100644 Binary files a/layers/landcover/etl_diagram.png and b/layers/landcover/etl_diagram.png differ diff --git a/layers/landcover/mapping_diagram.png b/layers/landcover/mapping_diagram.png index a0d708f0..182658ca 100644 Binary files a/layers/landcover/mapping_diagram.png and b/layers/landcover/mapping_diagram.png differ diff --git a/layers/landuse/etl_diagram.png b/layers/landuse/etl_diagram.png index a89a48c3..bf447a39 100644 Binary files a/layers/landuse/etl_diagram.png and b/layers/landuse/etl_diagram.png differ diff --git a/layers/landuse/mapping_diagram.png b/layers/landuse/mapping_diagram.png index 2ee445e8..51a2ec91 100644 Binary files a/layers/landuse/mapping_diagram.png and b/layers/landuse/mapping_diagram.png differ diff --git a/layers/mountain_peak/etl_diagram.png b/layers/mountain_peak/etl_diagram.png index 403d43c3..e9a5bd78 100644 Binary files a/layers/mountain_peak/etl_diagram.png and b/layers/mountain_peak/etl_diagram.png differ diff --git a/layers/mountain_peak/mapping_diagram.png b/layers/mountain_peak/mapping_diagram.png index 77e06dbd..e0c5ceb3 100644 Binary files a/layers/mountain_peak/mapping_diagram.png and b/layers/mountain_peak/mapping_diagram.png differ diff --git a/layers/park/etl_diagram.png b/layers/park/etl_diagram.png index 4eb1ea52..2ee42423 100644 Binary files a/layers/park/etl_diagram.png and b/layers/park/etl_diagram.png differ diff --git a/layers/park/mapping_diagram.png b/layers/park/mapping_diagram.png index 0c59a6de..0f1a4efa 100644 Binary files a/layers/park/mapping_diagram.png and b/layers/park/mapping_diagram.png differ diff --git a/layers/place/etl_diagram.png b/layers/place/etl_diagram.png index 223187c2..f63eb6ca 100644 Binary files a/layers/place/etl_diagram.png and b/layers/place/etl_diagram.png differ diff --git a/layers/place/mapping_diagram.png b/layers/place/mapping_diagram.png index d96830ab..6a43d749 100644 Binary files a/layers/place/mapping_diagram.png and b/layers/place/mapping_diagram.png differ diff --git a/layers/poi/etl_diagram.png b/layers/poi/etl_diagram.png index 314855c5..bbabf808 100644 Binary files a/layers/poi/etl_diagram.png and b/layers/poi/etl_diagram.png differ diff --git a/layers/poi/mapping_diagram.png b/layers/poi/mapping_diagram.png index 3fe9c140..f584a1ab 100644 Binary files a/layers/poi/mapping_diagram.png and b/layers/poi/mapping_diagram.png differ diff --git a/layers/transportation/etl_diagram.png b/layers/transportation/etl_diagram.png index 82b331d0..ba57d14d 100644 Binary files a/layers/transportation/etl_diagram.png and b/layers/transportation/etl_diagram.png differ diff --git a/layers/transportation/mapping_diagram.png b/layers/transportation/mapping_diagram.png index ef040b47..9bc49466 100644 Binary files a/layers/transportation/mapping_diagram.png and b/layers/transportation/mapping_diagram.png differ diff --git a/layers/transportation_name/etl_diagram.png b/layers/transportation_name/etl_diagram.png index 3d8e46dc..cd90e764 100644 Binary files a/layers/transportation_name/etl_diagram.png and b/layers/transportation_name/etl_diagram.png differ diff --git a/layers/water/etl_diagram.png b/layers/water/etl_diagram.png index 936fe0cf..8fad1791 100644 Binary files a/layers/water/etl_diagram.png and b/layers/water/etl_diagram.png differ diff --git a/layers/water/mapping_diagram.png b/layers/water/mapping_diagram.png index 400bbda3..2dce3fcb 100644 Binary files a/layers/water/mapping_diagram.png and b/layers/water/mapping_diagram.png differ diff --git a/layers/water_name/etl_diagram.png b/layers/water_name/etl_diagram.png index 95d50066..b0e4a40b 100644 Binary files a/layers/water_name/etl_diagram.png and b/layers/water_name/etl_diagram.png differ diff --git a/layers/water_name/mapping_diagram.png b/layers/water_name/mapping_diagram.png index 400bbda3..2dce3fcb 100644 Binary files a/layers/water_name/mapping_diagram.png and b/layers/water_name/mapping_diagram.png differ diff --git a/layers/waterway/etl_diagram.png b/layers/waterway/etl_diagram.png index babd2a50..e2e229de 100644 Binary files a/layers/waterway/etl_diagram.png and b/layers/waterway/etl_diagram.png differ diff --git a/layers/waterway/mapping_diagram.png b/layers/waterway/mapping_diagram.png index a622b6f8..cd6c0b36 100644 Binary files a/layers/waterway/mapping_diagram.png and b/layers/waterway/mapping_diagram.png differ