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

[generator] Update docs, add OSC parameter, new test

Browse source
This commit is contained in:
Ilya Zverev 2016-08-12 18:42:42 +03:00
parent 5b89867fe9
commit daadf26b1a
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/MAPS.md
View file

@ -139,6 +139,12 @@ Default is 40.
* `DELTA_WITH`: a path to an older map directory, to compare with the freshly
generated data in the testing step.
Can be empty. Example: `$(ls ../../data/borders/{UK*,Ireland}.poly)`.
* `OSRM_URL`: address of an OSRM server to calculate worldwide routes.
* `SRTM_PATH`: a path to `*.zip` files with SRTM data.
* `OSC`: a path to an osmChange file to apply after updating the planet.
* `BOOKING_FILE`: a path to hotels.csv with booking data.
* `BOOKING_USER` and `BOOKING_PATH`: user name and password for booking.com API
to download hotels data.
### Testing

4
tools/unix/generate_planet.sh
View file

@ -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

5
tools/unix/test_planet.sh
View file

@ -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"