- parking areas a light grey area below roads

asamm · May 28, 2024 · 360327f · 360327f
1 parent 01934e2
commit 360327f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/android/src/main/assets/themes/mapsforgeV4/base/theme.xml b/android/src/main/assets/themes/mapsforgeV4/base/theme.xml
@@ -7039,7 +7039,7 @@
 							</rule>
 							<rule e="way" k="highway" v="track">
 								<rule e="way" k="tracktype" v="grade1">
-									<line stroke="#8a8a8a" stroke-width="1.1533333333333333"/>
+									<line stroke="#8a8a8a" stroke-width="4.033333333333333"/>
 								</rule>
 							</rule>
 							<rule e="way" k="highway" v="residential">
@@ -7926,7 +7926,7 @@
 					</rule>
 					<rule e="way" k="highway" v="track" zoom-min="0" zoom-max="127" closed="any">
 						<rule e="way" k="tracktype" v="grade1" zoom-min="0" zoom-max="127" closed="any">
-							<line dy="0.0" scale="stroke" stroke="#908a8a8a" stroke-width="1.1533333333333333" stroke-dasharray="20,8" stroke-linecap="butt" stroke-linejoin="round"/>
+							<line dy="0.0" scale="stroke" stroke="#908a8a8a" stroke-width="4.033333333333333" stroke-dasharray="20,8" stroke-linecap="butt" stroke-linejoin="round"/>
 						</rule>
 					</rule>
 					<rule e="way" k="highway" v="residential" zoom-min="0" zoom-max="127" closed="any">

diff --git a/theme-generator/xml_templates/theme_template.xml b/theme-generator/xml_templates/theme_template.xml
@@ -842,6 +842,10 @@
 				<area src="file:patterns/tidalflat_64.svg" symbol-width="96"/>
 			</rule>
 		</rule>
+		<!-- parking areas -->
+		<rule e="any" k="amenity" v="parking" zoom-min="14" closed="yes">
+			<area fill="${lighten('#C1C1C1', 75)}" stroke="$color_unclassified_case" stroke-width="${$highway_case_z16/2}" />
+		</rule>
 
 		<!-- runways casings and areas -->
 		<rule e="way" k="aeroway" v="*" zoom-min="12">
@@ -1034,9 +1038,6 @@
 			<!-- highway -->
 			<rule e="way" k="highway|route|mtb:scale|osmc|toll|amenity" v="*">
 				<!-- OUTLINE FOR HIGHWAY AREA -->
-				<rule e="any" k="amenity" v="parking" zoom-min="14" closed="yes">
-					<area stroke="$color_unclassified_case" stroke-width="$highway_case_z16"/>
-				</rule>
 				<rule e="way" k="highway" v="footway|footpath|path|pedestrian" zoom-min="14" closed="yes">
 					<area stroke="#d0d0d0" stroke-width="0.1"/>
 				</rule>
@@ -2331,9 +2332,6 @@
 
 				<!-- =========================  Highways TOPO core =========================== -->
 				<!-- OUTLINE FOR HIGHWAY AREA -->
-				<rule e="any" k="amenity" v="parking" zoom-min="14" closed="yes">
-					<area fill="$color_unclassified"/>
-				</rule>
 				<rule cat="highways_topo" e="way" k="area" v="~|no|false">
 					<rule e="way" k="*" v="*" zoom-min="11">
 						<rule e="way" k="highway" v="construction">
@@ -2430,7 +2428,7 @@
 							<rule e="way" k="tracktype" v="grade3|grade4" zoom-min="14">
 								<line stroke="$color_track" stroke-width="$track_grade3_4_width_z14" stroke-dasharray="15,7" stroke-linecap="butt"/>
 							</rule>
-							<rule e="way" k="tracktype" v="~|no|false">
+							<rule e="way" k="tracktype" v="~">
 								<line stroke="$color_track" stroke-width="$track_grade3_4_width_z14" stroke-dasharray="15,7" stroke-linecap="butt"/>
 							</rule>
 						</rule>
@@ -2531,7 +2529,7 @@
 							<rule e="way" k="tracktype" v="grade5">
 								<line stroke="$color_track" stroke-width="$track_grade5_width_z15" stroke-dasharray="1.5,1" scale="all"/>
 							</rule>
-							<rule e="way" k="tracktype" v="~|no|false">
+							<rule e="way" k="tracktype" v="~">
 								<line stroke="$color_track" stroke-width="$track_grade3_4_width_z15" stroke-dasharray="2.5,1.5"  scale="all"/>
 							</rule>
 						</rule>

diff --git a/theme/theme.xml b/theme/theme.xml
@@ -812,6 +812,9 @@
 				<area src="file:patterns/tidalflat_64.svg" symbol-width="96"/>
 			</rule>
 		</rule>
+		<rule e="any" k="amenity" v="parking" zoom-min="14" closed="yes">
+			<area fill="#efefef" stroke="#8a8a8a" stroke-width="0.2"/>
+		</rule>
 		<!-- runways casings and areas -->
 		<rule e="way" k="aeroway" v="*" zoom-min="12">
 			<rule e="way" k="aeroway" v="runway">
@@ -995,9 +998,9 @@
 			<!-- highway -->
 			<rule e="way" k="highway|route|mtb:scale|osmc|toll|amenity" v="*">
 				<!-- OUTLINE FOR HIGHWAY AREA -->
-				<rule e="any" k="amenity" v="parking" zoom-min="14" closed="yes">
-					<area stroke="#8a8a8a" stroke-width="0.4"/>
-				</rule>
+				<!--				<rule e="any" k="amenity" v="parking" zoom-min="14" closed="yes">-->
+				<!--					<area stroke="#8a8a8a" stroke-width="0.4"/>-->
+				<!--				</rule>-->
 				<rule e="way" k="highway" v="footway|footpath|path|pedestrian" zoom-min="14" closed="yes">
 					<area stroke="#d0d0d0" stroke-width="0.1"/>
 				</rule>
@@ -7201,9 +7204,9 @@
 				</rule>
 				<!-- =========================  Highways TOPO core =========================== -->
 				<!-- OUTLINE FOR HIGHWAY AREA -->
-				<rule e="any" k="amenity" v="parking" zoom-min="14" closed="yes">
-					<area fill="#ffffff"/>
-				</rule>
+				<!--				<rule e="any" k="amenity" v="parking" zoom-min="14" closed="yes">-->
+				<!--					<area fill="#ffffff"/>-->
+				<!--				</rule>-->
 				<rule cat="highways_topo" e="way" k="area" v="~|no|false">
 					<rule e="way" k="*" v="*" zoom-min="11">
 						<rule e="way" k="highway" v="construction">
@@ -7293,7 +7296,7 @@
 							<rule e="way" k="tracktype" v="grade3|grade4" zoom-min="14">
 								<line stroke="#8a8a8a" stroke-width="0.75" stroke-dasharray="15,7" stroke-linecap="butt"/>
 							</rule>
-							<rule e="way" k="tracktype" v="~|no|false">
+							<rule e="way" k="tracktype" v="~">
 								<line stroke="#8a8a8a" stroke-width="0.75" stroke-dasharray="15,7" stroke-linecap="butt"/>
 							</rule>
 						</rule>
@@ -7389,7 +7392,7 @@
 							<rule e="way" k="tracktype" v="grade5">
 								<line stroke="#8a8a8a" stroke-width="0.36" stroke-dasharray="1.5,1" scale="all"/>
 							</rule>
-							<rule e="way" k="tracktype" v="~|no|false">
+							<rule e="way" k="tracktype" v="~">
 								<line stroke="#8a8a8a" stroke-width="0.48" stroke-dasharray="2.5,1.5" scale="all"/>
 							</rule>
 						</rule>
@@ -8025,7 +8028,7 @@
 						<rule e="way" k="tracktype" v="grade3|grade4" zoom-min="14" zoom-max="127" closed="any">
 							<line dy="0.0" scale="stroke" stroke="#908a8a8a" stroke-width="0.75" stroke-dasharray="20,8" stroke-linecap="butt" stroke-linejoin="round"/>
 						</rule>
-						<rule e="way" k="tracktype" v="~|no|false" zoom-min="0" zoom-max="127" closed="any">
+						<rule e="way" k="tracktype" v="~" zoom-min="0" zoom-max="127" closed="any">
 							<line dy="0.0" scale="stroke" stroke="#908a8a8a" stroke-width="0.75" stroke-dasharray="20,8" stroke-linecap="butt" stroke-linejoin="round"/>
 						</rule>
 					</rule>
@@ -8117,7 +8120,7 @@
 						<rule e="way" k="tracktype" v="grade5" zoom-min="0" zoom-max="127" closed="any">
 							<line dy="0.0" scale="all" stroke="#908a8a8a" stroke-width="0.36" stroke-dasharray="20,8" stroke-linecap="butt" stroke-linejoin="round"/>
 						</rule>
-						<rule e="way" k="tracktype" v="~|no|false" zoom-min="0" zoom-max="127" closed="any">
+						<rule e="way" k="tracktype" v="~" zoom-min="0" zoom-max="127" closed="any">
 							<line dy="0.0" scale="all" stroke="#908a8a8a" stroke-width="0.48" stroke-dasharray="20,8" stroke-linecap="butt" stroke-linejoin="round"/>
 						</rule>
 					</rule>