diff options
| author | Mikhail Gorbushin <m.gorbushin@corp.mail.ru> | 2018-09-04 16:28:01 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <bykoianko@gmail.com> | 2018-09-05 13:34:30 +0300 |
| commit | 7af77c0e44ef6040effe9c6b5aff31dc2a8d0717 (patch) | |
| tree | 254a0a952b9d8305e35bc2ebacecab234e079f05 /tools | |
| parent | 3c31b8bcf3bc5f8b963516bc93137837972bd5eb (diff) | |
[routing] Add speed camera section + tests for it.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/unix/generate_mwm.sh | 4 | ||||
| -rwxr-xr-x | tools/unix/generate_planet.sh | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/unix/generate_mwm.sh b/tools/unix/generate_mwm.sh index 7c82150c00..e89d460508 100755 --- a/tools/unix/generate_mwm.sh +++ b/tools/unix/generate_mwm.sh @@ -106,9 +106,11 @@ if [ "$SOURCE_TYPE" == "o5m" ]; then CROSS_MWM="--make_cross_mwm" fi + GENERATE_CAMERA_SECTION="--generate_cameras" + $GENERATOR_TOOL $INTDIR_FLAG --osm_file_type=o5m --osm_file_name="$SOURCE_FILE" --preprocess=true || fail "Preprocessing failed" $GENERATOR_TOOL $INTDIR_FLAG --osm_file_type=o5m --osm_file_name="$SOURCE_FILE" --data_path="$TARGET" --user_resource_path="$DATA_PATH" $GENERATE_EVERYTHING --output="$BASE_NAME" - $GENERATOR_TOOL $INTDIR_FLAG --data_path="$TARGET" --user_resource_path="$DATA_PATH" ${CROSS_MWM-} --make_routing_index --generate_traffic_keys --output="$BASE_NAME" + $GENERATOR_TOOL $INTDIR_FLAG --data_path="$TARGET" --user_resource_path="$DATA_PATH" ${CROSS_MWM-} ${GENERATE_CAMERA_SECTION-} --make_routing_index --generate_traffic_keys --output="$BASE_NAME" else echo "Unsupported source type: $SOURCE_TYPE" >&2 fi diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh index bdd13f09ad..b6b0469dd6 100755 --- a/tools/unix/generate_planet.sh +++ b/tools/unix/generate_planet.sh @@ -193,6 +193,7 @@ LOG_PATH="${LOG_PATH:-$TARGET/logs}" mkdir -p "$LOG_PATH" PLANET_LOG="$LOG_PATH/generate_planet.log" TEST_LOG="$LOG_PATH/test_planet.log" +GENERATE_CAMERA_SECTION="--generate_cameras" [ -n "${MAIL-}" ] && trap "grep STATUS \"$PLANET_LOG\" | mailx -s \"Generate_planet: build failed at $(hostname)\" \"$MAIL\"; exit 1" SIGTERM ERR echo -e "\n\n----------------------------------------\n\n" >> "$PLANET_LOG" log "STATUS" "Start ${DESC-}" @@ -541,7 +542,7 @@ if [ "$MODE" == "routing" ]; then BASENAME="$(basename "$file" .mwm)" ( "$GENERATOR_TOOL" --data_path="$TARGET" --intermediate_data_path="$INTDIR/" --user_resource_path="$DATA_PATH/" \ - --make_cross_mwm --disable_cross_mwm_progress --make_routing_index --generate_traffic_keys --output="$BASENAME" 2>> "$LOG_PATH/$BASENAME.log" + --make_cross_mwm --disable_cross_mwm_progress ${GENERATE_CAMERA_SECTION-} --make_routing_index --generate_traffic_keys --output="$BASENAME" 2>> "$LOG_PATH/$BASENAME.log" "$GENERATOR_TOOL" --data_path="$TARGET" --intermediate_data_path="$INTDIR/" --user_resource_path="$DATA_PATH/" \ --make_transit_cross_mwm --transit_path="$DATA_PATH" --output="$BASENAME" 2>> "$LOG_PATH/$BASENAME.log" ) & |