Merge branch 'master' of https://github.com/openmaptiles/openmaptiles

UPDATE.md

@@ -28,8 +28,12 @@ docker-compose run import-osm-diff
 
 ## Generate Changed Tiles
 
-After the import has finished **imposm3** will store a list of tiles in text format in the `diffdir`.
-Copy the as `tiles.txt` to the import folder.
+After the import has finished **imposm3** will store lists of tiles in text format in subfolders of the `diffdir`,
+named for the date(s) on which the import took place (`YYYYMMDD`).
+Copy and merge the files to `tiles.txt` in the import folder (`data`), either manually or with the following command, which also removes duplicate tiles so they are only generated once:  
+```
+cd data && sort ./*/*.tiles | uniq > tiles.txt
+```
 
 Now run the command to read the tilelist and write the vector tiles for it to a new MBTiles.
 

quickstart.sh

@@ -57,7 +57,7 @@ docker         --version
 docker-compose --version
 
 # based on: http://stackoverflow.com/questions/16989598/bash-comparing-version-numbers
-function version { echo "$@" | tr -cs '0-9.' '.' | gawk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }'; }
+function version { echo "$@" | tr -cs '0-9.' '.' | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }'; }
 
 COMPOSE_VER=$(docker-compose version --short)
 if [ "$(version "$COMPOSE_VER")" -lt "$(version "$MIN_COMPOSE_VER")" ]; then