pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Cross-mwm routing in generate_mwm; display coastline errors in generate_planet

Browse source
This commit is contained in:
Ilya Zverev 2015-05-19 20:33:18 +03:00 • committed by Alex Zolotarev
parent 675e2312dc
commit d233f7b4f0
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/unix/generate_mwm.sh
View file

@ -110,5 +110,12 @@ elif [ "$MODE" == "routing" ]; then
rm "$PBF"
"$OSRM_BUILD_PATH/osrm-prepare" --config "$PREPARE_CFG" --profile "$PROFILE" "$OSRM" || fail
"$OSRM_BUILD_PATH/osrm-mapsme" -i "$OSRM" || fail
$GENERATOR_TOOL --make_routing=true --osrm_file_name="$OSRM" --data_path="$TARGET" --output="$BASE_NAME"
if [ -n "${BORDERS_PATH-}" -a ! -d "$TARGET/borders" ]; then
[ ! -e "$BORDERS_PATH/$BASE_NAME.poly" ] && fail "You should have a polygon for processed file: $BORDERS_PATH/$BASE_NAME.poly"
CROSS_MWM="--make_cross_section"
mkdir "$TARGET/borders"
cp "$BORDERS_PATH"/*.poly "$TARGET/borders/"
fi
$GENERATOR_TOOL --make_routing=true ${CROSS_MWM-} --osrm_file_name="$OSRM" --data_path="$TARGET" --user_resource_path="$DATA_PATH" --output="$BASE_NAME"
[ -n "${CROSS_MWM-}" ] && rm -r "$TARGET/borders"
fi

3
tools/unix/generate_planet.sh
View file

@ -87,6 +87,7 @@ done
EXIT_ON_ERROR=${EXIT_ON_ERROR-1}
[ -n "${EXIT_ON_ERROR-}" ] && set -e # Exit when any of commands fail
set -o pipefail # Capture all errors in command chains
set -u # Fail on undefined variables
#set -x # Echo every script line
@ -210,7 +211,7 @@ if [ "$MODE" == "coast" ]; then
# Generate temporary coastlines file in the coasts intermediate dir
log "TIMEMARK" "Generate coastlines"
"$GENERATOR_TOOL" --intermediate_data_path="$INTCOASTSDIR/" --node_storage=map --osm_file_type=o5m --osm_file_name="$COASTS" \
--user_resource_path="$DATA_PATH/" -make_coasts -fail_on_coasts 2>> "$GENERATOR_LOG"
--user_resource_path="$DATA_PATH/" -make_coasts -fail_on_coasts 2>&1 | tee "$GENERATOR_LOG"
EXIT_CODE=$?
[ -n "${EXIT_ON_ERROR-}" ] && set -e