diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2018-08-27 15:33:52 +0300 |
|---|---|---|
| committer | mpimenov <mpimenov@users.noreply.github.com> | 2018-09-11 20:36:13 +0300 |
| commit | 3a7f97687030a1840e6ff68f7de2fe9cbe1680ae (patch) | |
| tree | 7cfde2c283e8de069e8786064a4bb7e171a2f1b5 /tools | |
| parent | 864081aa35091819e3c11ae2a9f591062547d81a (diff) | |
City roads section and tests.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/unix/generate_mwm.sh | 4 | ||||
| -rwxr-xr-x | tools/unix/generate_planet.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/unix/generate_mwm.sh b/tools/unix/generate_mwm.sh index e89d460508..178bd1e610 100755 --- a/tools/unix/generate_mwm.sh +++ b/tools/unix/generate_mwm.sh @@ -71,10 +71,11 @@ else INTDIR=$(mktemp -d) fi trap "rm -rf \"${INTDIR}\"" EXIT SIGINT SIGTERM +CITIES_BOUNDARIES_DATA="${CITIES_BOUNDARIES_DATA:-$INTDIR/cities_boundaries.bin}" # Create MWM file INTDIR_FLAG="--intermediate_data_path=$INTDIR/ --node_storage=map" -GENERATE_EVERYTHING='--generate_features=true --generate_geometry=true --generate_index=true --generate_search_index=true' +GENERATE_EVERYTHING="--generate_features --generate_geometry --generate_index --generate_search_index --dump_cities_boundaries --cities_boundaries_data=$CITIES_BOUNDARIES_DATA" [ -n "${HOTELS-}" ] && GENERATE_EVERYTHING="$GENERATE_EVERYTHING --booking_data=$HOTELS" COASTS="${COASTS-WorldCoasts.geom}" if [ -f "$COASTS" ]; then @@ -110,6 +111,7 @@ if [ "$SOURCE_TYPE" == "o5m" ]; then $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" --cities_boundaries_data="$CITIES_BOUNDARIES_DATA" --make_city_roads --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 diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh index b6b0469dd6..ab6dbcdc86 100755 --- a/tools/unix/generate_planet.sh +++ b/tools/unix/generate_planet.sh @@ -511,7 +511,7 @@ if [ "$MODE" == "mwm" ]; then fi if [ -z "$NO_REGIONS" ]; then - PARAMS_WITH_SEARCH="$PARAMS -generate_search_index" + PARAMS_WITH_SEARCH="$PARAMS --generate_search_index --cities_boundaries_data=$CITIES_BOUNDARIES_DATA --make_city_roads" [ -n "${SRTM_PATH-}" -a -d "${SRTM_PATH-}" ] && PARAMS_WITH_SEARCH="$PARAMS_WITH_SEARCH --srtm_path=$SRTM_PATH" [ -f "$UGC_FILE" ] && PARAMS_WITH_SEARCH="$PARAMS_WITH_SEARCH --ugc_data=$UGC_FILE" [ -f "$POPULAR_PLACES_FILE" ] && PARAMS_WITH_SEARCH="$PARAMS_WITH_SEARCH --popular_places_data=$POPULAR_PLACES_FILE" |