summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan FitiƩ <jfitie@gmail.com>2020-06-16 23:02:30 +0200
committerViktor Verebelyi <vviktor2@gmail.com>2020-09-22 02:16:15 +0100
commitfd5a6660a8fe2fb2836a7e75b17fa3a5238f9f69 (patch)
treef2e2e02e71756c3f6af40833c24a8663bca089a0
parentf7bfa199a2ddfee41b5b75def7bbaad224fee2b1 (diff)
downloadnavit-fd5a6660a8fe2fb2836a7e75b17fa3a5238f9f69.tar.gz
fix:layout:Order Parking (can be covered by Meadow, Wood) and Playground (can cover Meadow) (#1023)
* Show Playground in Meadow * Show Meadow and Wood in Car_Parking
-rw-r--r--navit/navit_layout_car_dark_shipped.xml14
-rw-r--r--navit/navit_layout_car_shipped.xml14
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"/>