diff --git a/Makefile b/Makefile index 6e674b5..4069f0c 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 3e30825..3879664 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 bcaf83a..cbbb899 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 c2b3818..a895735 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 7a102c4..ca19fec 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 12e4cea..53f4eef 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 6b52667..8a43f94 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 887f487..8d8341f 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 5dcd499..add427d 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 bcaf83a..a30e718 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 ba8f588..8fb941a 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 a0d708f..182658c 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 a89a48c..bf447a3 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 2ee445e..51a2ec9 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 403d43c..e9a5bd7 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 77e06db..e0c5ceb 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 4eb1ea5..2ee4242 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 0c59a6d..0f1a4ef 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 223187c..f63eb6c 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 d96830a..6a43d74 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 314855c..bbabf80 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 3fe9c14..f584a1a 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 82b331d..ba57d14 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 ef040b4..9bc4946 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 3d8e46d..cd90e76 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 936fe0c..8fad179 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 400bbda..2dce3fc 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 95d5006..b0e4a40 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 400bbda..2dce3fc 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 babd2a5..e2e229d 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 a622b6f..cd6c0b3 100644 Binary files a/layers/waterway/mapping_diagram.png and b/layers/waterway/mapping_diagram.png differ