From b6e75bdac1ef6912a80776cbec3e367ec17a1b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Fiti=C3=A9?= <jfitie@gmail.com>
Date: Mon, 15 Jun 2020 10:05:19 +0200
Subject: Make sure industry, sport, meadow, scrub, and cemetery render in
 correct order (#1021)

* Make sure industry, sport, meadow, and scrub render in correct order

* Move cemetery
---
 navit/navit_layout_car_dark_shipped.xml | 18 +++++++++---------
 navit/navit_layout_car_shipped.xml      | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/navit/navit_layout_car_dark_shipped.xml b/navit/navit_layout_car_dark_shipped.xml
index e50dd748e..c9ea0e2a2 100644
--- a/navit/navit_layout_car_dark_shipped.xml
+++ b/navit/navit_layout_car_dark_shipped.xml
@@ -82,6 +82,9 @@
 		<itemgra item_types="poly_town" order="0-">
 			<polygon color="#071912"/>
 		</itemgra>
+		<itemgra item_types="poly_industry,poly_place" order="0-">
+			<polygon color="#061b18"/>
+		</itemgra>
 		<itemgra item_types="poly_naval_base" order="10-">
 			<polygon color="#03140f"/>
 			<text text_size="5"/>
@@ -225,6 +228,9 @@
 			<polygon color="#05190d"/>
 			<text text_size="5"/>
 		</itemgra>
+		<itemgra item_types="poly_sport" order="10-">
+			<polygon color="#051c0d"/>
+		</itemgra>
 		<itemgra item_types="poly_fishing" order="10-">
 			<polygon color="#030700"/>
 			<text text_size="5"/>
@@ -262,6 +268,9 @@
 			<polyline color="#051912"/>
 			<text color="#55c4bd" background_color="#000000" text_size="5"/>
 		</itemgra>
+		<itemgra item_types="poly_cemetery" order="8-">
+			<polygon color="#061b16"/>
+		</itemgra>
 		<itemgra item_types="poly_meadow" order="0-">
 			<polygon color="#051d11"/>
 		</itemgra>
@@ -277,9 +286,6 @@
 			<polygon color="#041a06"/>
 			<text color="#55c4bd" background_color="#000000" text_size="5"/>
 		</itemgra>
-		<itemgra item_types="poly_sport" order="10-">
-			<polygon color="#051c0d"/>
-		</itemgra>
 		<itemgra item_types="poly_beach" order="0-">
 			<polygon color="#071d0d"/>
 			<text color="#55c4bd" background_color="#000000" text_size="5"/>
@@ -330,9 +336,6 @@
 			<polygon color="#041d0f"/>
 			<polyline color="#021709"/>
 		</itemgra>
-		<itemgra item_types="poly_industry,poly_place" order="0-">
-			<polygon color="#061b18"/>
-		</itemgra>
 		<itemgra item_types="poly_service" order="8-18">
 			<polygon color="#1a1a1a"/>
 			<polyline color="#282828" width="1"/>
@@ -435,9 +438,6 @@
 		<itemgra item_types="poly_terminal" order="7-">
 			<polygon color="#282424"/>
 		</itemgra>
-		<itemgra item_types="poly_cemetery" order="8-">
-			<polygon color="#061b16"/>
-		</itemgra>
 		<itemgra item_types="poly_car_parking" order="8-">
 			<polygon color="#071b0d"/>
 		</itemgra>
diff --git a/navit/navit_layout_car_shipped.xml b/navit/navit_layout_car_shipped.xml
index 4a3f2f46f..6f4dee338 100644
--- a/navit/navit_layout_car_shipped.xml
+++ b/navit/navit_layout_car_shipped.xml
@@ -78,6 +78,9 @@
 			<polygon color="#ffccaa"/>
 			<polyline color="#ebb481"/>
 		</itemgra>
+		<itemgra item_types="poly_industry,poly_place" order="0-">
+			<polygon color="#dddddd"/>
+		</itemgra>
 		<itemgra item_types="poly_naval_base" order="10-">
 			<polygon color="#6a9993"/>
 			<text text_size="5"/>
@@ -202,6 +205,9 @@
 			<polygon color="#b4c479"/>
 			<text text_size="5"/>
 		</itemgra>
+		<itemgra item_types="poly_sport" order="10-">
+			<polygon color="#a5dc72"/>
+		</itemgra>
 		<itemgra item_types="poly_fishing" order="10-">
 			<polygon color="#713907"/>
 			<text text_size="5"/>
@@ -239,6 +245,9 @@
 			<polyline color="#bbccaa"/>
 			<text text_size="5"/>
 		</itemgra>
+		<itemgra item_types="poly_cemetery" order="1-">
+			<polygon color="#ccddcc" src="cemetery.png" w="32" h="32"/>
+		</itemgra>
 		<itemgra item_types="poly_meadow" order="0-">
 			<polygon color="#bbee99"/>
 			<polyline color="#79c691"/>
@@ -259,9 +268,6 @@
 			<polygon color="#8ec78d" src="wood.png" w="100" h="100"/>
 			<text text_size="5"/>
 		</itemgra>
-		<itemgra item_types="poly_sport" order="10-">
-			<polygon color="#a5dc72"/>
-		</itemgra>
 		<itemgra item_types="poly_beach" order="0-">
 			<polygon color="#eeee77"/>
 			<text text_size="5"/>
@@ -319,9 +325,6 @@
 			<polygon color="#88ee88"/>
 			<polyline color="#55bb55"/>
 		</itemgra>
-		<itemgra item_types="poly_industry,poly_place" order="0-">
-			<polygon color="#dddddd"/>
-		</itemgra>
 		<itemgra item_types="poly_service" order="8-18">
 			<polygon color="#fefefe"/>
 			<polyline color="#d2d2d2" width="1"/>
@@ -434,9 +437,6 @@
 		<itemgra item_types="poly_terminal" order="7-">
 			<polygon color="#e3c6a6"/>
 		</itemgra>
-		<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>
-- 
cgit v1.2.1