From f7386981f0162e0448a04ba540d660b78edaa83e Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sun, 30 Jul 2023 14:15:33 +0300 Subject: [PATCH] [tools] Update kothic (Group types with same priorities) Temporary disable dark drules generation. Signed-off-by: Konstantin Pastbin --- tools/kothic | 2 +- tools/unix/generate_drules.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/kothic b/tools/kothic index 98755e5d6a..41e9860567 160000 --- a/tools/kothic +++ b/tools/kothic @@ -1 +1 @@ -Subproject commit 98755e5d6a94bc596350e18f7f5c97424752ff1e +Subproject commit 41e9860567c81bf1605ea1fb763356f0585c3fb8 diff --git a/tools/unix/generate_drules.sh b/tools/unix/generate_drules.sh index b677b43866..088b98bca9 100755 --- a/tools/unix/generate_drules.sh +++ b/tools/unix/generate_drules.sh @@ -22,7 +22,7 @@ function BuildDrawingRules() { } # Cleanup -cleanup=(classificator.txt types.txt visibility.txt colors.txt patterns.txt) +cleanup=(classificator.txt types.txt visibility.txt patterns.txt) for item in ${cleanup[*]} do rm $DATA_PATH/$item || true @@ -30,16 +30,16 @@ done # Building drawing rules BuildDrawingRules clear clear _clear -BuildDrawingRules clear night _dark +#BuildDrawingRules clear night _dark BuildDrawingRules vehicle clear _vehicle_clear -BuildDrawingRules vehicle night _vehicle_dark +#BuildDrawingRules vehicle night _vehicle_dark # In designer mode we use drules_proto_design file instead of standard ones cp $OMIM_PATH/data/drules_proto_clear.bin $OMIM_PATH/data/drules_proto_design.bin -echo "Exporting transit colors" -python3 "$OMIM_PATH/tools/python/transit/transit_colors_export.py" \ - "$DATA_PATH/colors.txt" > /dev/null +#echo "Exporting transit colors" +#python3 "$OMIM_PATH/tools/python/transit/transit_colors_export.py" \ +# "$DATA_PATH/colors.txt" > /dev/null echo "Merging default and vehicle styles" python3 "$OMIM_PATH/tools/python/stylesheet/drules_merge.py" \