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

Merge pull request #3397 from Zverik/mergefix

Browse source 
[styles] Switch clear and legacy styles for merging
This commit is contained in:
Vladimir Byko-Ianko 2016-06-02 13:50:32 +03:00
commit 3704b002dd
3 changed files with 41174 additions and 34325 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/drules_proto.bin
View file

Binary file not shown.

75497
data/drules_proto.txt
View file

File diff suppressed because it is too large Load diff

2
tools/unix/generate_drules.sh
View file

@ -34,5 +34,5 @@ BuildDrawingRules legacy light _legacy
echo "Merging legacy and new styles"
python "$OMIM_PATH/tools/python/stylesheet/drules_merge.py" \
"$DATA_PATH/drules_proto_legacy.bin" "$DATA_PATH/drules_proto_clear.bin" \
"$DATA_PATH/drules_proto_clear.bin" "$DATA_PATH/drules_proto_legacy.bin" \
"$DATA_PATH/drules_proto.bin" "$DATA_PATH/drules_proto.txt" > /dev/null