diff options
| author | Ilya Zverev <zverik@textual.ru> | 2016-08-12 18:42:42 +0300 |
|---|---|---|
| committer | Ilya Zverev <zverik@textual.ru> | 2016-08-12 19:18:18 +0300 |
| commit | daadf26b1a118ff0561427d492a484927ecf5544 (patch) | |
| tree | 7cb6176eb55db9d9e9c759813d6b6972f3370b37 /tools | |
| parent | 5b89867fe920c2397957146fe943f21feada2813 (diff) | |
[generator] Update docs, add OSC parameter, new test
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/unix/generate_planet.sh | 4 | ||||
| -rwxr-xr-x | tools/unix/test_planet.sh | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh index 85a11243b6..74c18ed928 100755 --- a/tools/unix/generate_planet.sh +++ b/tools/unix/generate_planet.sh @@ -278,6 +278,10 @@ if [ "$MODE" == "coast" ]; then ( cd "$OSMCTOOLS" # osmupdate requires osmconvert in a current directory ./osmupdate --drop-author --drop-version --out-o5m -v "$PLANET_ABS" "$PLANET_ABS.new.o5m" + if [ -f "${OSC-}" ]; then + ./osmconvert "$PLANET_ABS.new.o5m" "$OSC" -o="$PLANET_ABS.merged.o5m" + mv -f "$PLANET_ABS.merged.o5m" "$PLANET_ABS.new.o5m" + fi ) >> "$PLANET_LOG" 2>&1 mv "$PLANET.new.o5m" "$PLANET" fi diff --git a/tools/unix/test_planet.sh b/tools/unix/test_planet.sh index 70d68db662..f98c6f14c8 100755 --- a/tools/unix/test_planet.sh +++ b/tools/unix/test_planet.sh @@ -54,6 +54,9 @@ if [ -n "$DELTA_WITH" ]; then echo echo "### SIZE DIFFERENCE WITH $DELTA_WITH" python "$SCRIPT_PATH/diff_size.py" "$TARGET" "$DELTA_WITH" 5 + echo + echo "Size of old data: $(ls -l "$DELTA_WITH/*.mwm" | awk '{ total += $5 }; END { print total/1024/1024/1024 }') GB" + echo "Size of new data: $(ls -l "$TARGET/*.mwm" | awk '{ total += $5 }; END { print total/1024/1024/1024 }') GB" fi # For generator_tool, we create a temporary directory with symlinks to all maps @@ -108,7 +111,7 @@ echo '### INTEGRATION TESTS' # Step 5: run consistency tests echo echo '### CONSISTENCY TEST' -"$(dirname "$GENERATOR_TOOL")/routing_consistency_test" "--data_path=$FTARGET/../" "--user_resource_path=$OMIM_PATH/data/" "--input_file=$OMIM_PATH/data/routing_statistics.log" 2>&1 +"$(dirname "$GENERATOR_TOOL")/routing_consistency_test" "--data_path=$FTARGET/../" "--user_resource_path=$OMIM_PATH/data/" "--input_file=$OMIM_PATH/data/routing_statistics.log" 2>&1 || true # Clean the temporary directory rm -r "$FTARGET" |