diff options
| author | Ilya Zverev <zverik@textual.ru> | 2015-09-29 13:17:04 +0300 |
|---|---|---|
| committer | Ilya Zverev <zverik@textual.ru> | 2015-09-29 13:17:04 +0300 |
| commit | 23636fd5fafb8427a7e34257d72384ed1c76f48d (patch) | |
| tree | 371968d139adbf8af0741b05fffffee376bf1bf0 /tools | |
| parent | af00bd720c2f21a4328997330ee0405c160ec955 (diff) | |
[generator] Fix COASTS parameter processing
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/unix/generate_planet.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh index b8a66ac75a..404163b330 100755 --- a/tools/unix/generate_planet.sh +++ b/tools/unix/generate_planet.sh @@ -226,7 +226,7 @@ if [ "$MODE" == "coast" ]; then [ ! -r "$PLANET" ] && fail "Planet file $PLANET is not found" INTCOASTSDIR="$INTDIR/coasts" mkdir -p "$INTCOASTSDIR" - COASTS="$INTCOASTSDIR/coastlines-latest.o5m" + COASTS_O5M="$INTCOASTSDIR/coastlines-latest.o5m" TRY_AGAIN=1 while [ -n "$TRY_AGAIN" ]; do TRY_AGAIN= @@ -241,14 +241,14 @@ if [ "$MODE" == "coast" ]; then fi if [ -n "$OPT_COAST" ]; then - log "STATUS" "Step 2: Creating and processing new coastline in $COASTS" + log "STATUS" "Step 2: Creating and processing new coastline in $COASTS_O5M" # Strip coastlines from the planet to speed up the process - "$OSMCTOOLS/osmfilter" "$PLANET" --keep= --keep-ways="natural=coastline" "-o=$COASTS" + "$OSMCTOOLS/osmfilter" "$PLANET" --keep= --keep-ways="natural=coastline" "-o=$COASTS_O5M" # Preprocess coastlines to separate intermediate directory - "$GENERATOR_TOOL" --intermediate_data_path="$INTCOASTSDIR/" --node_storage=map --osm_file_type=o5m --osm_file_name="$COASTS" \ + "$GENERATOR_TOOL" --intermediate_data_path="$INTCOASTSDIR/" --node_storage=map --osm_file_type=o5m --osm_file_name="$COASTS_O5M" \ -preprocess 2>> "$LOG_PATH/WorldCoasts.log" # Generate temporary coastlines file in the coasts intermediate dir - if ! "$GENERATOR_TOOL" --intermediate_data_path="$INTCOASTSDIR/" --node_storage=map --osm_file_type=o5m --osm_file_name="$COASTS" \ + if ! "$GENERATOR_TOOL" --intermediate_data_path="$INTCOASTSDIR/" --node_storage=map --osm_file_type=o5m --osm_file_name="$COASTS_O5M" \ --user_resource_path="$DATA_PATH/" -make_coasts -fail_on_coasts 2>&1 | tee -a "$LOG_PATH/WorldCoasts.log" | { grep -i 'not merged\|coastline polygons' || true; } then log "STATUS" "Coastline merge failed" |