diff options
| author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2020-06-16 23:02:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 23:02:57 +0200 |
| commit | a9337cae4e1f5eecb1fa8dc0e83e7bf837f7e351 (patch) | |
| tree | 5b122a2981029972cbb51d444ade6d10389a0a42 | |
| parent | 0441793c47020c7648cff88964263912501c1c05 (diff) | |
| parent | 22290e097e86fd329c43ca169ef88ac23941b557 (diff) | |
| download | navit-a9337cae4e1f5eecb1fa8dc0e83e7bf837f7e351.tar.gz | |
Merge branch 'trunk' into multipolygon_duplicate
| -rw-r--r-- | navit/navit_layout_car_dark_shipped.xml | 14 | ||||
| -rw-r--r-- | navit/navit_layout_car_shipped.xml | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/navit/navit_layout_car_dark_shipped.xml b/navit/navit_layout_car_dark_shipped.xml index c9ea0e2a2..d96e969f9 100644 --- a/navit/navit_layout_car_dark_shipped.xml +++ b/navit/navit_layout_car_dark_shipped.xml @@ -224,10 +224,6 @@ <polygon color="#041705"/> <text text_size="5"/> </itemgra> - <itemgra item_types="poly_playground" order="10-"> - <polygon color="#05190d"/> - <text text_size="5"/> - </itemgra> <itemgra item_types="poly_sport" order="10-"> <polygon color="#051c0d"/> </itemgra> @@ -271,9 +267,16 @@ <itemgra item_types="poly_cemetery" order="8-"> <polygon color="#061b16"/> </itemgra> + <itemgra item_types="poly_car_parking" order="8-"> + <polygon color="#071b0d"/> + </itemgra> <itemgra item_types="poly_meadow" order="0-"> <polygon color="#051d11"/> </itemgra> + <itemgra item_types="poly_playground" order="10-"> + <polygon color="#05190d"/> + <text text_size="5"/> + </itemgra> <itemgra item_types="poly_land" order="0-"> <polygon color="#011001"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> @@ -438,9 +441,6 @@ <itemgra item_types="poly_terminal" order="7-"> <polygon color="#282424"/> </itemgra> - <itemgra item_types="poly_car_parking" order="8-"> - <polygon color="#071b0d"/> - </itemgra> <itemgra item_types="poly_artwork" order="10-"> <polygon color="#082015"/> <text text_size="5"/> diff --git a/navit/navit_layout_car_shipped.xml b/navit/navit_layout_car_shipped.xml index 44e321c80..c1d78ef93 100644 --- a/navit/navit_layout_car_shipped.xml +++ b/navit/navit_layout_car_shipped.xml @@ -197,10 +197,6 @@ <polygon color="#88bb33"/> <text text_size="5"/> </itemgra> - <itemgra item_types="poly_playground" order="10-"> - <polygon color="#b4c479"/> - <text text_size="5"/> - </itemgra> <itemgra item_types="poly_sport" order="10-"> <polygon color="#a5dc72"/> </itemgra> @@ -244,10 +240,17 @@ <itemgra item_types="poly_cemetery" order="1-"> <polygon color="#ccddcc" src="cemetery.png" w="32" h="32"/> </itemgra> + <itemgra item_types="poly_car_parking" order="1-"> + <polygon color="#eedd77"/> + </itemgra> <itemgra item_types="poly_meadow" order="0-"> <polygon color="#bbee99"/> <polyline color="#79c691"/> </itemgra> + <itemgra item_types="poly_playground" order="10-"> + <polygon color="#b4c479"/> + <text text_size="5"/> + </itemgra> <itemgra item_types="poly_water_tiled" order="0-"> <polygon color="#82c8ea"/> </itemgra> @@ -433,9 +436,6 @@ <itemgra item_types="poly_terminal" order="7-"> <polygon color="#e3c6a6"/> </itemgra> - <itemgra item_types="poly_car_parking" order="1-"> - <polygon color="#eedd77"/> - </itemgra> <itemgra item_types="poly_artwork" order="10-"> <polygon color="#fefbc5"/> <text text_size="5"/> |