WIP: Modes

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>

android/app/src/main/res/layout/fragment_editor.xml

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    android:background="@color/bg_editor"
+    android:background="?colorSurfaceContainerLow"
     tools:context=".editor.EditorActivity">
   <LinearLayout
       android:layout_width="match_parent"

android/app/src/main/res/layout/fragment_phone.xml

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/frameLayout"
-        android:background="@color/bg_editor"
+        android:background="?colorSurfaceContainerLow"
         android:layout_marginBottom="@dimen/margin_quarter">
 
         <androidx.recyclerview.widget.RecyclerView

android/app/src/main/res/layout/fragment_timetable.xml

@@ -9,7 +9,7 @@
     style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_editor"
+    android:background="?colorSurfaceContainerLow"
     android:layout_above="@+id/tv__mode_switch"
     android:layout_below="@id/toolbar"/>
 
@@ -19,7 +19,7 @@
     android:layout_height="wrap_content"
     android:layout_alignTop="@+id/tv__mode_switch"
     android:layout_alignParentBottom="true"
-    android:background="@color/bg_editor"/>
+    android:background="?colorSurfaceContainerLow"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__mode_switch"

android/app/src/main/res/layout/fragment_timetable_advanced.xml

@@ -5,7 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/bg_editor">
+  android:background="?colorSurfaceContainerLow">
 
   <LinearLayout
     android:layout_width="match_parent"

android/app/src/main/res/layout/fragment_timetable_simple.xml

@@ -4,7 +4,7 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/bg_editor"
+  android:background="?colorSurfaceContainerLow"
   android:paddingStart="@dimen/margin_half"
   android:paddingEnd="@dimen/margin_half"
   android:scrollbars="vertical"/>

android/app/src/main/res/layout/localized_name.xml

@@ -7,7 +7,6 @@
   android:orientation="vertical"
   android:paddingEnd="@dimen/margin_base"
   android:paddingStart="@dimen/margin_base"
-  android:background="@color/fg_editor"
   android:animateLayoutChanges="true">
 
   <com.google.android.material.textview.MaterialTextView
@@ -25,7 +24,6 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/fg_editor"
     android:scrollbars="vertical"/>
 
   <com.google.android.material.button.MaterialButton

android/app/src/main/res/values-night/colors.xml

@@ -16,8 +16,6 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#FF588157</color>
   <color name="bg_app">#10140F</color>
-  <color name="bg_editor">#161b14</color>
-  <color name="fg_editor">#282e25</color>
 
   <color name="bg_menu">#CC2D3237</color>
 

android/app/src/main/res/values/colors.xml

@@ -65,8 +65,6 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
   <color name="bg_app">@android:color/white</color>
-  <color name="bg_editor">#ebefe4</color>
-  <color name="fg_editor">#f9faf2</color>
 
   <color name="bg_dialog_translucent">#BB000000</color>
   <color name="bg_text_translucent">#99FFFFFF</color>

android/app/src/main/res/values/styles-editor.xml

@@ -89,7 +89,7 @@
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_marginBottom">@dimen/margin_half</item>
-    <item name="cardBackgroundColor">@color/fg_editor</item>
+    <item name="cardBackgroundColor">?appBackground</item>
     <item name="android:padding">@dimen/margin_base</item>
     <item name="cardPreventCornerOverlap">false</item>
   </style>

data/styles/cycling/dark/colors.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/dark/colors.mapcss");

data/styles/cycling/dark/style.mapcss

@@ -0,0 +1,9 @@
+@import("colors.mapcss");
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/subways.mapcss");
+@import("../../default/dark/dynamic_colors.mapcss");

data/styles/cycling/include/Basemap.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/basemap.mapcss");

data/styles/cycling/include/Basemap_label.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/basemap_label.mapcss");

data/styles/cycling/include/Icons.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/icons.mapcss");

data/styles/cycling/include/Subways.mapcss

@@ -1,2 +1,2 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/Subways.mapcss");
+@import("../../default/include/subways.mapcss");

data/styles/cycling/include/icons_label_colors.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/icons_label_colors.mapcss");

data/styles/cycling/include/priorities_1_BG-by-size.prio.txt

@@ -0,0 +1,258 @@
+# This file is automatically re-formatted and re-sorted in priorities descending order
+# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
+# are generated automatically for information only. Custom formatting and comments are not preserved.
+#
+# BG-by-size geometry: background areas rendered below BG-top and everything else.
+# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box).
+# So effectively priority values of BG-by-size areas are not used at the moment.
+# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature.
+# Keep them in a logical importance order please.
+#
+# Priorities ranges' rendering order overview:
+# - overlays (icons, captions...)
+# - FG: foreground areas and lines
+# - BG-top: water (linear and areal)
+# - BG-by-size: landcover areas sorted by their size
+
+leisure-stadium                                     # area z13- (also has icon z13-, caption(optional) z13-)
+=== 250
+
+amenity-place_of_worship                            # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-buddhist                   # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian                  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-jehovahs_witness  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-mormon           # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-hindu                      # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-jewish                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
+landuse-religious                                   # area z13-
+=== 240
+
+amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
+leisure-swimming_pool                               # area z13- (also has icon z17-, caption(optional) z17-)
+leisure-swimming_pool-private                       # area z13- (also has icon z17-, caption(optional) z17-)
+=== 230
+
+landuse-landfill                                    # area z13- (also has icon z15-, caption(optional) z15-)
+=== 220
+
+leisure-playground                                  # area z15- (also has icon z17-, caption(optional) z17-)
+=== 200
+
+amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
+leisure-fitness_centre-sport-yoga                   # area z16- (also has icon z16-, caption(optional) z17-)
+leisure-sports_centre                               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-american_football       # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-archery                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-athletics               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-australian_football     # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-badminton               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-baseball                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-basketball              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-beachvolleyball         # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-bowls                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-climbing                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-cricket                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-curling                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-equestrian              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-field_hockey            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-futsal                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-golf                    # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-gymnastics              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-handball                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-ice_hockey              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-multi                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-padel                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-pelota                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-scuba_diving            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-shooting                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-skateboard              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-skiing                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-soccer                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-swimming                # area z13- (also has icon z15-, caption(optional) z15-)
+leisure-sports_centre-sport-table_tennis            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-tennis                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-volleyball              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-yoga                    # area z13- (also has icon z16-, caption(optional) z16-)
+=== 190
+
+amenity-grave_yard                                  # area z10- (also has icon z17-, caption(optional) z17-)
+amenity-grave_yard-christian                        # area z10- (also has icon z17-, caption(optional) z17-)
+landuse-cemetery                                    # area z10- (also has icon z14-, caption(optional) z15-)
+landuse-cemetery-christian                          # area z10- (also has icon z14-, caption(optional) z15-)
+=== 180
+
+amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-charging_station                            # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-bicycle                    # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-carless                    # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
+amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-fire_station                                # area z15- (also has icon z16-, caption(optional) z17-)
+amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-police                                      # area z15- (also has icon z16-, caption(optional) z17-)
+amenity-ranger_station                              # area z13- (also has icon z15-, caption(optional) z15-)
+amenity-recycling-centre                            # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
+emergency-mountain_rescue                           # area z13- (also has icon z16-, caption(optional) z16-)
+highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
+highway-rest_area                                   # area z13- (also has icon z15-, caption(optional) z15-)
+highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
+landuse-garages                                     # area z13- (also has caption z15-)
+leisure-dog_park                                    # area z15- (also has icon z16-, caption(optional) z16-)
+leisure-resort                                      # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
+office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
+tourism-camp_site                                   # area z13- (also has icon z16-, caption(optional) z16-)
+tourism-information-office                          # area z15- (also has icon z15-, caption(optional) z15-)
+tourism-information-visitor_centre                  # area z13- (also has icon z15-, caption(optional) z15-)
+=== 170
+
+highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
+leisure-track-area                                  # area z15- (also has caption z16-)
+=== 160
+
+aeroway-terminal                                    # area z14- (also has caption z15-)
+=== 150
+
+leisure-golf_course                                 # area z12- (also has icon z15-, caption(optional) z17-)
+leisure-miniature_golf                              # area z14- (also has icon z16-, caption(optional) z17-)
+=== 140
+
+landuse-flowerbed                                   # area z16-
+natural-scrub                                       # area z11-
+=== 130
+
+landuse-grass                                       # area z11-
+natural-grassland                                   # area z11-
+natural-heath                                       # area z11-
+=== 120
+
+area:highway-footway                                # area z14- (also has caption z15-)
+area:highway-living_street                          # area z14-
+area:highway-pedestrian                             # area z14- (also has caption z15-)
+public_transport-platform                           # area z16- (also has caption z17-)
+railway-platform                                    # area z16- (also has caption z16-)
+=== 110
+
+amenity-bicycle_parking                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-bicycle_parking-covered                     # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-car_pooling                                 # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-motorcycle_parking                          # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-parking                                     # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-fee                                 # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-lane                                # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-lane-fee                            # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-lane-private                        # area z17- (also has icon z19-, caption(optional) z19-)
+amenity-parking-multi-storey                        # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-multi-storey-fee                    # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-no-access                           # area z15- (also has icon z18-, caption(optional) z18-)
+amenity-parking-park_and_ride                       # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-permissive                          # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-private                             # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-street_side                         # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-street_side-fee                     # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-street_side-private                 # area z17- (also has icon z18-, caption(optional) z18-)
+=== 100
+
+natural-wetland                                     # area z11- (also has caption z16-)
+natural-wetland-bog                                 # area z11- (also has caption z16-)
+natural-wetland-fen                                 # area z11- (also has caption z16-)
+natural-wetland-mangrove                            # area z11- (also has caption z16-)
+natural-wetland-marsh                               # area z11- (also has caption z16-)
+natural-wetland-reedbed                             # area z11- (also has caption z16-)
+natural-wetland-saltmarsh                           # area z11- (also has caption z16-)
+natural-wetland-saltmarsh-tidal                     # area z11- (also has caption z16-)
+natural-wetland-swamp                               # area z11- (also has caption z16-)
+natural-wetland-tidalflat                           # area z11- (also has caption z16-)
+=== 90
+
+landuse-farmyard                                    # area z10- (also has caption z15-)
+=== 81
+
+landuse-allotments                                  # area z12- (also has caption z15-)
+landuse-farmland                                    # area z10- (also has caption z15-)
+landuse-meadow                                      # area z11-
+landuse-orchard                                     # area z12- (also has caption z15-)
+landuse-recreation_ground                           # area z12- (also has caption z15-)
+landuse-village_green                               # area z12-
+landuse-vineyard                                    # area z12- (also has caption z15-)
+leisure-fitness_station                             # area z15- (also has icon z17-, caption(optional) z17-)
+leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
+natural-bare_rock                                   # area z11- (also has caption z14-)
+natural-scree                                       # area z11-
+natural-shingle                                     # area z12-
+=== 80
+
+landuse-plant_nursery                               # area z12- (also has icon z17-, caption(optional) z17-)
+leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
+leisure-garden-residential                          # area z12-
+leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-)
+=== 70
+
+landuse-forest                                      # area z10- (also has icon z13-, caption(optional) z14-)
+landuse-forest-coniferous                           # area z10- (also has icon z13-, caption(optional) z14-)
+landuse-forest-deciduous                            # area z10- (also has icon z13-, caption(optional) z14-)
+landuse-forest-mixed                                # area z10- (also has icon z13-, caption(optional) z14-)
+=== 60
+
+amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z18-)
+landuse-construction                                # area z13- (also has caption z15-)
+landuse-industrial                                  # area z13- (also has caption z15-)
+landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-railway                                     # area z13- (also has caption z15-)
+man_made-wastewater_plant                           # area z13- (also has caption z15-)
+man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
+power-generator                                     # area z13- (also has icon z17-)
+power-generator-gas                                 # area z13- (also has icon z17-)
+power-generator-hydro                               # area z13- (also has icon z17-)
+power-generator-solar                               # area z13-
+power-generator-wind                                # area z13- (also has icon z15-, caption(optional) z18-)
+power-plant                                         # area z13- (also has icon z17-)
+power-plant-coal                                    # area z13- (also has icon z17-)
+power-plant-gas                                     # area z13- (also has icon z17-)
+power-plant-hydro                                   # area z13- (also has icon z17-)
+power-plant-solar                                   # area z13- (also has icon z17-)
+power-plant-wind                                    # area z13- (also has icon z15-, caption(optional) z16-)
+power-substation                                    # area z13- (also has icon z17-, caption(optional) z18-)
+=== 50
+
+amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-clinic                                      # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
+amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
+amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-school                                      # area z13- (also has icon z16-, caption(optional) z16-)
+amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
+=== 40
+
+aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
+aeroway-aerodrome-international                     # area z10- (also has icon z7-, caption(optional) z10-)
+landuse-education                                   # area z13-
+landuse-retail                                      # area z13- (also has caption z16-)
+leisure-beach_resort                                # area z10- (also has icon z16-, caption(optional) z16-)
+natural-beach                                       # area z10- (also has caption z15-)
+natural-beach-gravel                                # area z10- (also has caption z15-)
+natural-beach-sand                                  # area z10- (also has caption z15-)
+natural-desert                                      # area z1- (also has caption z14-)
+natural-glacier                                     # area z1-
+natural-sand                                        # area z1- (also has caption z15-)
+=== 30
+
+natural-land                                        # area z1-
+place-islet                                         # area z10- (also has caption z14-)
+=== 20
+
+natural-coastline                                   # area z1-
+=== 10

data/styles/cycling/include/priorities_2_BG-top.prio.txt

@@ -0,0 +1,46 @@
+# This file is automatically re-formatted and re-sorted in priorities descending order
+# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
+# are generated automatically for information only. Custom formatting and comments are not preserved.
+#
+# BG-top geometry: background lines and areas that should be always below foreground ones
+# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size),
+# because ordering by size doesn't always work with e.g. water mapped over a forest,
+# so water should be on top of other landcover always, but linear waterways should be hidden beneath it.
+# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature
+# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas
+# are displayed above layer=0 BG-top.
+#
+# Priorities ranges' rendering order overview:
+# - overlays (icons, captions...)
+# - FG: foreground areas and lines
+# - BG-top: water (linear and areal)
+# - BG-by-size: landcover areas sorted by their size
+
+landuse-basin                                       # area z12-
+landuse-reservoir                                   # area z12- (also has caption z10-)
+landuse-salt_pond                                   # area z1-
+natural-water                                       # area z1- (also has caption z10-)
+natural-water-basin                                 # area z1- (also has caption z10-)
+natural-water-ditch                                 # area z13- (also has caption z17-)
+natural-water-drain                                 # area z13- (also has caption z17-)
+natural-water-lake                                  # area z1- (also has caption z10-)
+natural-water-lock                                  # area z1- (also has caption z10-)
+natural-water-moat                                  # area z1- (also has caption z17-)
+natural-water-pond                                  # area z1- (also has caption z10-)
+natural-water-reservoir                             # area z1- (also has caption z10-)
+natural-water-river                                 # area z1- (also has caption z10-)
+natural-water-tunnel                                # area z15-
+natural-water-wastewater                            # area z12- (also has caption z17-)
+waterway-dock                                       # area z1-
+=== 20
+
+natural-strait                                      # line z13- (also has caption z13-)
+waterway-canal                                      # line z13- (also has pathtext z13-)
+waterway-ditch                                      # line z13-
+waterway-drain                                      # line z13-
+waterway-fish_pass                                  # line z13- (also has pathtext z13-)
+waterway-river                                      # line z10- (also has pathtext z11-)
+waterway-stream                                     # line z13- (also has pathtext z13-)
+waterway-stream-ephemeral                           # line z13- (also has pathtext z13-)
+waterway-stream-intermittent                        # line z13- (also has pathtext z13-)
+=== 10

data/styles/cycling/include/priorities_3_FG.prio.txt

@@ -0,0 +1,481 @@
+# This file is automatically re-formatted and re-sorted in priorities descending order
+# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
+# are generated automatically for information only. Custom formatting and comments are not preserved.
+#
+# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays
+# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature
+# is layer=-10 (as tunnels should be visibile over landcover and water).
+#
+# Priorities ranges' rendering order overview:
+# - overlays (icons, captions...)
+# - FG: foreground areas and lines
+# - BG-top: water (linear and areal)
+# - BG-by-size: landcover areas sorted by their size
+
+aerialway-cable_car::dash                           # line::dash z12- (also has line z12-, pathtext z15-)
+aerialway-chair_lift::dash                          # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-drag_lift::dash                           # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-gondola::dash                             # line::dash z12- (also has line z12-, pathtext z15-)
+aerialway-j-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-magic_carpet::dash                        # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-mixed_lift::dash                          # line::dash z12- (also has line z12-, pathtext z15-)
+aerialway-platter::dash                             # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-rope_tow::dash                            # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-t-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
+=== 380
+
+aerialway-cable_car                                 # line z12- (also has line::dash z12-, pathtext z15-)
+aerialway-chair_lift                                # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-drag_lift                                 # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-gondola                                   # line z12- (also has line::dash z12-, pathtext z15-)
+aerialway-j-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-magic_carpet                              # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-mixed_lift                                # line z12- (also has line::dash z12-, pathtext z15-)
+aerialway-platter                                   # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-rope_tow                                  # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-t-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
+=== 370
+
+historic-citywalls                                  # line z14- (also has pathtext z16-)
+=== 360
+
+power-line                                          # line z19- (also has line::dash z19-)
+=== 350
+
+power-line::dash                                    # line::dash z19- (also has line z19-)
+=== 340
+
+highway-ladder                                      # line z15- (also has icon z17-, pathtext z17-)
+highway-steps                                       # line z15- (also has pathtext z16-)
+highway-steps-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
+hwtag-oneway::arrows                                # line::arrows z15-
+waterway-weir                                       # line z14- (also has pathtext z15-)
+=== 330
+
+barrier-city_wall                                   # line z14- (also has pathtext z16-)
+barrier-fence                                       # line z16-
+barrier-guard_rail                                  # line z17-
+barrier-hedge                                       # line z16-
+barrier-wall                                        # line z16-
+barrier-yes                                         # line z16- (also has icon z16-, caption(optional) z16-)
+railway-funicular                                   # line z12-
+railway-funicular-bridge                            # line z12-
+railway-funicular-tunnel                            # line z12-
+railway-monorail                                    # line z14-
+railway-monorail-bridge                             # line z14-
+railway-monorail-tunnel                             # line z14-
+railway-narrow_gauge                                # line z15-
+railway-narrow_gauge-bridge                         # line z15-
+railway-narrow_gauge-tunnel                         # line z15-
+railway-tram                                        # line z13-
+railway-tram-bridge                                 # line z13-
+railway-tram-tunnel                                 # line z13-
+=== 320
+
+highway-motorway                                    # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-world_level                                 # line z4-9
+highway-world_towns_level                           # line z6-9
+=== 310
+
+# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# === 309
+
+highway-primary                                     # line z8- (also has pathtext z10-, shield::shield z10-)
+highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
+railway-rail-branch::dash                           # line::dash z16- (also has line z11-)
+railway-rail-branch-bridge::dash                    # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-branch-tunnel::dash                    # line::dash z16- (also has line z11-, line(casing) z14-)
+railway-rail-highspeed::dash                        # line::dash z16- (also has line z10-)
+railway-rail-highspeed-bridge::dash                 # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-highspeed-tunnel::dash                 # line::dash z16- (also has line z10-, line(casing) z14-)
+railway-rail-main::dash                             # line::dash z16- (also has line z10-)
+railway-rail-main-bridge::dash                      # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-main-tunnel::dash                      # line::dash z16- (also has line z10-, line(casing) z14-)
+railway-rail-tourism::dash                          # line::dash z16- (also has line z10-, pathtext z14-)
+railway-rail-tourism-bridge::dash                   # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-)
+railway-rail-tourism-tunnel::dash                   # line::dash z16- (also has line z10-, line(casing) z14-, pathtext z14-)
+=== 290
+
+# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
+# === 289
+
+railway-rail-branch                                 # line z11- (also has line::dash z16-)
+railway-rail-branch-bridge                          # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-branch-tunnel                          # line z11- (also has line::dash z16-, line(casing) z14-)
+railway-rail-highspeed                              # line z10- (also has line::dash z16-)
+railway-rail-highspeed-bridge                       # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-highspeed-tunnel                       # line z10- (also has line::dash z16-, line(casing) z14-)
+railway-rail-main                                   # line z10- (also has line::dash z16-)
+railway-rail-main-bridge                            # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-main-tunnel                            # line z10- (also has line::dash z16-, line(casing) z14-)
+railway-rail-tourism                                # line z10- (also has line::dash z16-, pathtext z14-)
+railway-rail-tourism-bridge                         # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-, pathtext z14-)
+railway-rail-tourism-tunnel                         # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z14-)
+=== 280
+
+# railway-rail-branch-tunnel                        # line(casing) z14- (also has line z11-, line::dash z16-)
+# railway-rail-highspeed-tunnel                     # line(casing) z14- (also has line z10-, line::dash z16-)
+# railway-rail-main-tunnel                          # line(casing) z14- (also has line z10-, line::dash z16-)
+# railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-)
+# === 279
+
+highway-secondary                                   # line z10- (also has pathtext z10-, shield::shield z12-)
+highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
+=== 270
+
+# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
+# === 269
+
+highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
+highway-unclassified                                # line z11- (also has pathtext z13-)
+highway-unclassified-area                           # line z11- (also has pathtext z13-)
+highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
+highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
+=== 250
+
+# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
+# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
+# === 249
+
+highway-living_street                               # line z12- (also has pathtext z14-)
+highway-living_street-bridge                        # line z12- (also has pathtext z14-)
+highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
+highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-road                                        # line z12- (also has pathtext z14-)
+highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-road-tunnel                                 # line z12- (also has pathtext z14-)
+=== 230
+
+# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
+# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
+# === 229
+
+highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+=== 228
+
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# === 227
+
+highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
+highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
+=== 226
+
+# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
+# === 225
+
+highway-secondary_link                              # line z13- (also has pathtext z16-)
+highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
+=== 224
+
+# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
+highway-tertiary_link                               # line z14- (also has pathtext z18-)
+highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
+highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
+=== 223
+
+highway-busway                                      # line z15- (also has pathtext z16-)
+highway-busway-bridge                               # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
+highway-service                                     # line z15- (also has pathtext z16-)
+highway-service-area                                # line z15- (also has pathtext z16-)
+highway-service-bridge                              # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-service-driveway                            # line z16- (also has pathtext z16-)
+highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
+highway-service-tunnel                              # line z15- (also has line(casing) z15-, pathtext z16-)
+# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
+=== 222
+
+# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, pathtext z16-)
+# highway-service-tunnel                            # line(casing) z15- (also has line z15-, pathtext z16-)
+railway-light_rail::dash                            # line::dash z16- (also has line z13-)
+railway-light_rail-bridge::dash                     # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail::dash                                  # line::dash z16- (also has line z11-)
+railway-rail-bridge::dash                           # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-service::dash                          # line::dash z17- (also has line z16-)
+railway-rail-service-bridge::dash                   # line::dash z17- (also has line z16-, line::bridgeblack z16-, line::bridgewhite z16-)
+railway-rail-service-tunnel::dash                   # line::dash z17- (also has line(casing) z16-, line z16-)
+railway-rail-spur::dash                             # line::dash z17- (also has line z15-)
+railway-rail-spur-bridge::dash                      # line::dash z17- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-)
+railway-rail-spur-tunnel::dash                      # line::dash z17- (also has line(casing) z15-, line z15-)
+railway-rail-tunnel::dash                           # line::dash z16- (also has line z11-, line(casing) z14-)
+railway-rail-utility::dash                          # line::dash z17- (also has line z13-)
+railway-rail-utility-bridge::dash                   # line::dash z17- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-utility-tunnel::dash                   # line::dash z17- (also has line z13-, line(casing) z14-)
+railway-subway::dash                                # line::dash z16- (also has line z13-)
+railway-subway-bridge::dash                         # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
+=== 221
+
+highway-footway-bicycle                             # line z15- (also has line::cycleline z15-, pathtext z15-)
+highway-path-bicycle                                # line z15- (also has line::cycleline z14-, pathtext z15-)
+=== 220
+
+highway-footway-bicycle::cycleline                  # line::cycleline z15- (also has line z15-, pathtext z15-)
+highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z15-, pathtext z15-)
+=== 219
+
+highway-cycleway                                    # line z13- (also has pathtext z15-)
+highway-cycleway-bridge                             # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-cycleway-tunnel                             # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+=== 218
+
+railway-light_rail                                  # line z13- (also has line::dash z16-)
+railway-light_rail-bridge                           # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail                                        # line z11- (also has line::dash z16-)
+railway-rail-bridge                                 # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-service                                # line z16- (also has line::dash z17-)
+railway-rail-service-bridge                         # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-, line::dash z17-)
+railway-rail-service-tunnel                         # line z16- (also has line(casing) z16-, line::dash z17-)
+railway-rail-spur                                   # line z15- (also has line::dash z17-)
+railway-rail-spur-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z17-)
+railway-rail-spur-tunnel                            # line z15- (also has line(casing) z15-, line::dash z17-)
+railway-rail-tunnel                                 # line z11- (also has line::dash z16-, line(casing) z14-)
+railway-rail-utility                                # line z13- (also has line::dash z17-)
+railway-rail-utility-bridge                         # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z17-)
+railway-rail-utility-tunnel                         # line z13- (also has line::dash z17-, line(casing) z14-)
+railway-subway                                      # line z13- (also has line::dash z16-)
+railway-subway-bridge                               # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+=== 210
+
+# railway-rail-service-tunnel                       # line(casing) z16- (also has line z16-, line::dash z17-)
+# railway-rail-spur-tunnel                          # line(casing) z15- (also has line z15-, line::dash z17-)
+# railway-rail-tunnel                               # line(casing) z14- (also has line z11-, line::dash z16-)
+# railway-rail-utility-tunnel                       # line(casing) z14- (also has line z13-, line::dash z17-)
+# === 209
+
+highway-ford                                        # line z13- (also has icon z16-, pathtext z16-)
+highway-pedestrian                                  # line z13- (also has pathtext z14-)
+highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
+=== 200
+
+# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, pathtext z14-)
+# === 199
+
+highway-bridleway                                   # line z14- (also has pathtext z15-)
+highway-bridleway-bridge                            # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-bridleway-tunnel                            # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+highway-footway                                     # line z15- (also has pathtext z15-)
+highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
+highway-footway-crossing                            # line z16-
+highway-path                                        # line z15- (also has pathtext z15-)
+highway-path-difficult                              # line z15- (also has pathtext z15-)
+highway-path-expert                                 # line z15- (also has pathtext z15-)
+highway-raceway                                     # line z14- (also has pathtext z16-)
+highway-track                                       # line z15- (also has pathtext z15-)
+highway-track-area                                  # line z15- (also has pathtext z15-)
+highway-track-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-track-no-access                             # line z15- (also has pathtext z15-)
+highway-track-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+=== 180
+
+highway-construction                                # line z13- (also has pathtext z15-)
+leisure-track                                       # line z15- (also has caption z16-)
+railway-abandoned                                   # line z16-
+railway-construction                                # line z15-
+railway-disused                                     # line z16-
+railway-disused-bridge                              # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+railway-disused-tunnel                              # line z16-
+railway-miniature                                   # line z16-
+railway-miniature-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+railway-miniature-tunnel                            # line z16-
+railway-preserved                                   # line z15-
+railway-preserved-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-)
+railway-preserved-tunnel                            # line z15-
+railway-turntable                                   # line z17-
+=== 160
+
+highway-footway-bridge                              # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-footway-sidewalk                            # line z16-
+highway-footway-tunnel                              # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+highway-path-bridge                                 # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-path-horse                                  # line z15- (also has pathtext z15-)
+highway-path-tunnel                                 # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+=== 155
+
+highway-bridleway-tunnel::tunnelBackground          # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-)
+highway-cycleway-tunnel::tunnelBackground           # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-)
+highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
+highway-path-tunnel::tunnelBackground               # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
+highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z16-)
+highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
+=== 154
+
+highway-bridleway-tunnel::tunnelCasing              # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-)
+highway-cycleway-tunnel::tunnelCasing               # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-)
+highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
+highway-path-tunnel::tunnelCasing                   # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
+highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z16-)
+highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
+=== 153
+
+highway-bridleway-bridge::bridgewhite               # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
+highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
+highway-cycleway-bridge::bridgewhite                # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-)
+highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
+highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
+highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
+highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
+highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
+highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
+highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
+highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
+highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
+railway-disused-bridge::bridgewhite                 # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
+railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
+railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
+railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-)
+railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
+railway-rail-bridge::bridgewhite                    # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
+railway-rail-highspeed-bridge::bridgewhite          # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
+railway-rail-main-bridge::bridgewhite               # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
+railway-rail-service-bridge::bridgewhite            # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-, line::dash z17-)
+railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z17-)
+railway-rail-tourism-bridge::bridgewhite            # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-, pathtext z14-)
+railway-rail-utility-bridge::bridgewhite            # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z17-)
+railway-subway-bridge::bridgewhite                  # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
+=== 150
+
+highway-bridleway-bridge::bridgeblack               # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-)
+highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-cycleway-bridge::bridgeblack                # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-)
+highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
+highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
+highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
+highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
+highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
+highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
+highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
+highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
+railway-disused-bridge::bridgeblack                 # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
+railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
+railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
+railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-)
+railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-highspeed-bridge::bridgeblack          # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-main-bridge::bridgeblack               # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-service-bridge::bridgeblack            # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-, line::dash z17-)
+railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z17-)
+railway-rail-tourism-bridge::bridgeblack            # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-, pathtext z14-)
+railway-rail-utility-bridge::bridgeblack            # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z17-)
+railway-subway-bridge::bridgeblack                  # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
+=== 140
+
+building                                            # area z14- (also has caption z17-)
+building-garage                                     # area z14- (also has caption z17-)
+building-guardhouse                                 # area z14- (also has icon z18-, caption(optional) z18-)
+building-has_parts                                  # area z14- (also has caption z17-)
+building-train_station                              # area z14- (also has icon z17-, caption(optional) z17-)
+=== 130
+
+piste:type-connection                               # line z15-
+piste:type-downhill                                 # line z14- (also has pathtext z15-)
+piste:type-downhill-advanced                        # line z14- (also has pathtext z15-)
+piste:type-downhill-easy                            # line z14- (also has pathtext z15-)
+piste:type-downhill-expert                          # line z14- (also has pathtext z15-)
+piste:type-downhill-freeride                        # line z14- (also has pathtext z15-)
+piste:type-downhill-intermediate                    # line z14- (also has pathtext z15-)
+piste:type-downhill-novice                          # line z14- (also has pathtext z15-)
+piste:type-hike                                     # line z15- (also has pathtext z15-)
+piste:type-nordic                                   # line z14- (also has pathtext z15-)
+piste:type-skitour                                  # line z14- (also has pathtext z15-)
+piste:type-sled                                     # line z14- (also has pathtext z15-)
+=== 120
+
+building:part                                       # area z16-
+=== 110
+
+barrier-retaining_wall                              # line z16-
+man_made-embankment                                 # line z16- (also has pathtext z18-)
+natural-cliff                                       # line z14- (also has pathtext z16-)
+natural-earth_bank                                  # line z14-
+=== 100
+
+boundary-administrative-2                           # line z2-
+boundary-administrative-3                           # line z4
+boundary-administrative-4                           # line z5-
+=== 90
+
+man_made-cutline                                    # line z14-
+route-ferry                                         # line z7- (also has pathtext z10-)
+=== 80
+
+aeroway-runway                                      # line z12-
+aeroway-taxiway                                     # line z14-
+barrier-ditch                                       # line z16-
+=== 70
+
+isoline-step_10                                     # line z15- (also has pathtext z17-)
+isoline-step_100                                    # line z12- (also has pathtext z14-)
+isoline-step_1000                                   # line z11- (also has pathtext z11-)
+isoline-step_50                                     # line z14- (also has pathtext z16-)
+isoline-step_500                                    # line z11- (also has pathtext z12-)
+isoline-zero                                        # line z15- (also has pathtext z17-)
+=== 60
+
+man_made-breakwater                                 # line z14- and area z12- (also has caption z17-)
+man_made-pier                                       # line z14- and area z12- (also has caption z17-)
+waterway-dam                                        # line z14- and area z14- (also has pathtext z15-)
+=== 30
+
+landuse-military                                    # area z12- (also has icon z16-, caption(optional) z17-)
+landuse-military-danger_area                        # area z10- (also has icon z16-, caption(optional) z17-)
+=== 25
+
+amenity-prison                                      # area z12- (also has icon z17-, caption(optional) z17-)
+boundary-aboriginal_lands                           # line z10- and area z10-16 (also has caption z10-16)
+boundary-national_park                              # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
+boundary-protected_area-1                           # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
+leisure-nature_reserve                              # area z10-17 (also has icon z11-17, caption(optional) z12-17, caption z18-)
+=== 20
+
+piste:type-snow_park                                # area z14- (also has caption z15-)
+=== 15
+
+man_made-bridge                                     # area z14-
+=== 10

data/styles/cycling/include/ways.mapcss

@@ -0,0 +1,42 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/ways.mapcss");
+
+
+line|z13[highway=cycleway]
+{width: 2.0;}
+line|z14[highway=cycleway],
+{width: 2.2;}
+line|z15[highway=cycleway],
+{width: 2.5;}
+line|z16[highway=cycleway],
+{width: 3;}
+line|z17[highway=cycleway],
+{width: 3.4;}
+line|z18[highway=cycleway],
+{width: 4.2;}
+line|z19-[highway=cycleway],
+{width: 5.2;}
+
+line|z14[highway=path][bicycle=designated]::cycleline,
+{width: 1.5;}
+line|z15[highway=path][bicycle=designated]::cycleline,
+{width: 1.6;}
+line|z16[highway=path][bicycle=designated]::cycleline,
+{width: 2.2;}
+line|z17[highway=path][bicycle=designated]::cycleline,
+{width: 2;}
+line|z18[highway=path][bicycle=designated]::cycleline,
+{width: 2.4;}
+line|z19-[highway=path][bicycle=designated]::cycleline,
+{width: 2.8;}
+
+line|z15[highway=footway][bicycle=designated]::cycleline,
+{width: 1.7;}
+line|z16[highway=footway][bicycle=designated]::cycleline,
+{width: 1.8;}
+line|z17[highway=footway][bicycle=designated]::cycleline,
+{width: 2.1;}
+line|z18[highway=footway][bicycle=designated]::cycleline,
+{width: 2.4;}
+line|z19-[highway=footway][bicycle=designated]::cycleline,
+{width: 3.0;}

data/styles/cycling/include/ways_label.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/ways_label.mapcss");

data/styles/cycling/light/colors.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/light/colors.mapcss");

data/styles/cycling/light/style.mapcss

@@ -0,0 +1,9 @@
+@import("colors.mapcss");
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/subways.mapcss");
+@import("../../default/light/dynamic_colors.mapcss");

data/styles/default/dark/dynamic_colors.mapcss

@@ -1,12 +1,3 @@
-@import("colors.mapcss");
-@import("../include/defaults_new.mapcss");
-@import("../include/Basemap.mapcss");
-@import("../include/Basemap_label.mapcss");
-@import("../include/Roads.mapcss");
-@import("../include/Roads_label.mapcss");
-@import("../include/Icons.mapcss");
-@import("../include/Subways.mapcss");
-
 colors
 {
   GuiText-color: #FFFFFF;
@@ -113,8 +104,8 @@ colors
   BookmarkYellow-color: #FFC800;
   BookmarkOrange-color: #FF9600;
   BookmarkDeepOrange-color: #F06432;
-  BookmarkBrown-color: #804633;
-  BookmarkGray-color: #737373;
+  BookmarkBrown-color: #8C4E39;
+  BookmarkGray-color: #808080;
   BookmarkBlueGray-color: #597380;
   SearchmarkPreparing-color: #597380;
   SearchmarkNotAvailable-color: #597380;

data/styles/default/dark/style.mapcss

@@ -1,134 +1,9 @@
 @import("colors.mapcss");
-@import("../include/defaults_new.mapcss");
-@import("../include/Basemap.mapcss");
-@import("../include/Basemap_label.mapcss");
-@import("../include/Roads.mapcss");
-@import("../include/Roads_label.mapcss");
-@import("../include/Icons.mapcss");
-@import("../include/Subways.mapcss");
-
-colors
-{
-  GuiText-color: #FFFFFF;
-  GuiText-opacity: 0.7;
-  MyPositionAccuracy-color: #FFFFFF;
-  MyPositionAccuracy-opacity: 0.06;
-  Selection-color: #FFFFFF;
-  Selection-opacity: 0.64;
-  Route-color: #0087FF;
-  RouteOutline-color: #055FCD;
-  RouteTrafficG0-color: #5E0F0D;
-  RouteTrafficG1-color: #7F1311;
-  RouteTrafficG2-color: #7F1311;
-  RouteTrafficG3-color: #9E8216;
-  RouteTrafficG3-opacity: 0.0;
-  RoutePedestrian-color: #FFB94B;
-  RoutePedestrian-opacity: 0.7;
-  RouteBicycle-color: #FF4B8C;
-  RouteBicycle-opacity: 0.7;
-  RouteRuler-color: #924ab5;
-  RouteRuler-opacity: 0.7;
-  RoutePreview-color: #FFFFFF;
-  RoutePreview-opacity: 0.3;
-  RouteMaskCar-color: #000000;
-  RouteMaskCar-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskCar-color: #055FCD;
-  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
-  RouteArrowsMaskCar-color: #055FCD;
-  RouteArrowsMaskCar-opacity: 0.3;
-  RouteMaskBicycle-color: #000000;
-  RouteMaskBicycle-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskBicycle-color: #FF4B8C;
-  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
-  RouteArrowsMaskBicycle-color: #FF4B8C;
-  RouteArrowsMaskBicycle-opacity: 0.5;
-  RouteMaskPedestrian-color: #000000;
-  RouteMaskPedestrian-opacity: 0.5;
-  RouteFake-color: #A8A8A8;
-  RouteFakeOutline-color: #717171;
-  Arrow3D-color: #41C8FF;
-  Arrow3DObsolete-color: #82AAC8;
-  Arrow3DObsolete-opacity: 0.72;
-  Arrow3DShadow-color: #3C3C3C;
-  Arrow3DShadow-opacity: 0.24;
-  Arrow3DOutline-color: #FFFFFF;
-  TrackHumanSpeed-color: #FF9800;
-  TrackCarSpeed-color: #FFCA28;
-  TrackPlaneSpeed-color: #FFF5A0;
-  TrackUnknownDistance-color: #969696;
-  TrafficG0-color: #4C120F;
-  TrafficG1-color: #731816;
-  TrafficG2-color: #731816;
-  TrafficG3-color: #8C7012;
-  TrafficG3-opacity: 0.0;
-  TrafficG4-color: #376222;
-  TrafficG5-color: #376222;
-  TrafficTempBlock-color: #232323;
-  TrafficUnknown-color: #000000;
-  TrafficArrowLight-color: #C4C4C4;
-  TrafficArrowDark-color: #191919;
-  TrafficOutline-color: #383838;
-  RoadShieldBlackText-color: #212121;
-  RoadShieldWhiteText-color: #B7B6B6;
-  RoadShieldUKYellowText-color: #B49E0E;
-  RoadShieldWhiteBackground-color: #999999;
-  RoadShieldGreenBackground-color: #136C30;
-  RoadShieldBlueBackground-color: #294C88;
-  RoadShieldRedBackground-color: #9F1A17;
-  RoadShieldOrangeBackground-color: #B58E1B;
-  PoiHotelTextOutline-color: #000000;
-  PoiHotelTextOutline-opacity: 0.6;
-  PoiDeletedMask-color: #FFFFFF;
-  PoiDeletedMask-opacity: 0.3;
-  PoiVisitedMask-color: #FFFFFF;
-  PoiVisitedMask-opacity: 0.7;
-  DefaultTrackColor-color: #1E96F0;
-  RouteMarkPrimaryText-color: #888888;
-  RouteMarkPrimaryTextOutline-color: #000000;
-  RouteMarkSecondaryText-color: #888888;
-  RouteMarkSecondaryTextOutline-color: #000000;
-  TransitMarkPrimaryText-color: #888888;
-  TransitMarkPrimaryTextOutline-color: #000000;
-  TransitMarkSecondaryText-color: #888888;
-  TransitMarkSecondaryTextOutline-color: #000000;
-  TransitTransferOuterMarker-color: #000000;
-  TransitTransferInnerMarker-color: #888888;
-  TransitStopInnerMarker-color: #000000;
-  LocalAdsPrimaryText-color: #888888;
-  LocalAdsPrimaryTextOutline-color: #000000;
-  LocalAdsSecondaryText-color: #888888;
-  LocalAdsSecondaryTextOutline-color: #000000;
-  TransitBackground-color: #000000;
-  TransitBackground-opacity: 0.4;
-  BookmarkRed-color: #E51B23;
-  BookmarkPink-color: #FF4182;
-  BookmarkPurple-color: #9B24B2;
-  BookmarkDeepPurple-color: #6639BF;
-  BookmarkBlue-color: #0066CC;
-  BookmarkLightBlue-color: #249CF2;
-  BookmarkCyan-color: #14BECD;
-  BookmarkTeal-color: #00A58C;
-  BookmarkGreen-color: #3C8C3C;
-  BookmarkLime-color: #93BF39;
-  BookmarkYellow-color: #FFC800;
-  BookmarkOrange-color: #FF9600;
-  BookmarkDeepOrange-color: #F06432;
-  BookmarkBrown-color: #8C4E39;
-  BookmarkGray-color: #808080;
-  BookmarkBlueGray-color: #597380;
-  SearchmarkPreparing-color: #597380;
-  SearchmarkNotAvailable-color: #597380;
-  SearchmarkSelectedNotAvailable-color: #F06432;
-  RatingBad-color: #F06432;
-  RatingGood-color: #3C8C3C;
-  RatingNone-color: #249CF2;
-  SearchmarkDefault-color: #249CF2;
-  RatingText-color: #FFFFFF;
-  UGCRatingText-color: #B8B8B8;
-  SpeedCameraMarkText-color: #FFFFFF;
-  SpeedCameraMarkBg-color: #F51E30;
-  SpeedCameraMarkOutline-color: #FFFFFF;
-  GuideCityMarkText-color: #6639BF;
-  GuideOutdoorMarkText-color: #3C8C3C;
-  HotelPriceText-color: #000000;
-}
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/subways.mapcss");
+@import("dynamic_colors.mapcss");

data/styles/default/include/Basemap.mapcss

@@ -1,6 +1,6 @@
 /* ~~~~ CONTENT OF BASEMAP ~~~~~
 
-1.Z-INDEX of BASEMAP
+1.BASICS
 2.LAND
 3.BOUNDARY
   3.1 Countries
@@ -28,6 +28,35 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
+
+/* 1. BASICS */
+
+way|z1-12::*
+{
+  linejoin: bevel;
+}
+
+way|z13-::*
+{
+  linejoin: round;
+}
+
+way|z1-15::*
+{
+  linecap: butt;
+}
+
+way|z16-::*
+{
+  linecap: round;
+}
+
+*::int_name
+{
+  text-offset: 1;
+}
+
+
 /* 2.LAND */
 
 area|z0-[natural=coastline],

data/styles/default/include/Icons.mapcss

@@ -22,7 +22,6 @@
  6.1 Craft
 7.CAR
  7.1 Parking
-8. COLORED LABELS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
@@ -2536,8 +2535,4 @@ node|z17-[amenity=motorcycle_parking],
 {icon-image: motorcycle-parking-m.svg;}
 
 node|z18-[amenity=parking_space][parking_space=disabled],
-{icon-image: parking-disabled-m.svg;}
-
-/* 8. Colored Labels */
-
-@import("../../default/include/Icons_Label_Colors.mapcss");
+{icon-image: parking-disabled-m.svg;}

data/styles/default/include/defaults_new.mapcss

@@ -1,24 +0,0 @@
-way|z1-12::*
-{
-  linejoin: bevel;
-}
-
-way|z13-::*
-{
-  linejoin: round;
-}
-
-way|z1-15::*
-{
-  linecap: butt;
-}
-
-way|z16-::*
-{
-  linecap: round;
-}
-
-*::int_name
-{
-  text-offset: 1;
-}

data/styles/default/light/dynamic_colors.mapcss

@@ -1,14 +1,3 @@
-@import("colors.mapcss");
-@import("../include/defaults_new.mapcss");
-@import("../include/Basemap.mapcss");
-@import("../include/Basemap_label.mapcss");
-@import("../include/Roads.mapcss");
-@import("../include/Roads_label.mapcss");
-@import("../include/Icons.mapcss");
-@import("../include/Subways.mapcss");
-
-/* TODO: move to a separete base file */
-
 colors
 {
   GuiText-color: #4D4D4D;

data/styles/default/light/style.mapcss

@@ -1,134 +1,9 @@
 @import("colors.mapcss");
-@import("../include/defaults_new.mapcss");
-@import("../include/Basemap.mapcss");
-@import("../include/Basemap_label.mapcss");
-@import("../include/Roads.mapcss");
-@import("../include/Roads_label.mapcss");
-@import("../include/Icons.mapcss");
-@import("../include/Subways.mapcss");
-
-colors
-{
-  GuiText-color: #4D4D4D;
-  GuiText-opacity: 0.86;
-  MyPositionAccuracy-color: #000000;
-  MyPositionAccuracy-opacity: 0.08;
-  Selection-color: #1E96F0;
-  Selection-opacity: 0.64;
-  Route-color: #0087FF;
-  RouteOutline-color: #055FCD;
-  RouteTrafficG0-color: #9B2300;
-  RouteTrafficG1-color: #E82705;
-  RouteTrafficG2-color: #E82705;
-  RouteTrafficG3-color: #FFE500;
-  RouteTrafficG3-opacity: 0.0;
-  RoutePedestrian-color: #1D339E;
-  RoutePedestrian-opacity: 0.8;
-  RouteBicycle-color: #9C27B0;
-  RouteBicycle-opacity: 0.8;
-  RouteRuler-color: #66347F;
-  RouteRuler-opacity: 0.9;
-  RoutePreview-color: #000000;
-  RoutePreview-opacity: 0.3;
-  RouteMaskCar-color: #000000;
-  RouteMaskCar-opacity: 0.3;
-  RouteFirstSegmentArrowsMaskCar-color: #033B80;
-  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
-  RouteArrowsMaskCar-color: #033B80;
-  RouteArrowsMaskCar-opacity: 0.2;
-  RouteMaskBicycle-color: #000000;
-  RouteMaskBicycle-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskBicycle-color: #9C27B0;
-  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
-  RouteArrowsMaskBicycle-color: #9C27B0;
-  RouteArrowsMaskBicycle-opacity: 0.2;
-  RouteMaskPedestrian-color: #000000;
-  RouteMaskPedestrian-opacity: 0.5;
-  RouteFake-color: #A8A8A8;
-  RouteFakeOutline-color: #717171;
-  Arrow3D-color: #50AAFF;
-  Arrow3DObsolete-color: #82AAC8;
-  Arrow3DObsolete-opacity: 0.72;
-  Arrow3DShadow-color: #3C3C3C;
-  Arrow3DShadow-opacity: 0.24;
-  Arrow3DOutline-color: #FFFFFF;
-  TrackHumanSpeed-color: #1D339E;
-  TrackCarSpeed-color: #7C8EDE;
-  TrackPlaneSpeed-color: #A8B7ED;
-  TrackUnknownDistance-color: #616161;
-  TrafficG0-color: #7E1712;
-  TrafficG1-color: #E42300;
-  TrafficG2-color: #E42300;
-  TrafficG3-color: #FCDE00;
-  TrafficG3-opacity: 0.0;
-  TrafficG4-color: #39962E;
-  TrafficG5-color: #39962E;
-  TrafficTempBlock-color: #525252;
-  TrafficUnknown-color: #000000;
-  TrafficArrowLight-color: #FFFFFF;
-  TrafficArrowDark-color: #473635;
-  TrafficOutline-color: #E8E6DC;
-  RoadShieldBlackText-color: #000000;
-  RoadShieldWhiteText-color: #FFFFFF;
-  RoadShieldUKYellowText-color: #FFD400;
-  RoadShieldWhiteBackground-color: #FFFFFF;
-  RoadShieldGreenBackground-color: #309302;
-  RoadShieldBlueBackground-color: #1A5EC1;
-  RoadShieldRedBackground-color: #E63534;
-  RoadShieldOrangeBackground-color: #FFBE00;
-  PoiHotelTextOutline-color: #FFFFFF;
-  PoiHotelTextOutline-opacity: 0.6;
-  PoiDeletedMask-color: #FFFFFF;
-  PoiDeletedMask-opacity: 0.3;
-  PoiVisitedMask-color: #FFFFFF;
-  PoiVisitedMask-opacity: 0.7;
-  DefaultTrackColor-color: #1E96F0;
-  RouteMarkPrimaryText-color: #000000;
-  RouteMarkPrimaryTextOutline-color: #FFFFFF;
-  RouteMarkSecondaryText-color: #000000;
-  RouteMarkSecondaryTextOutline-color: #FFFFFF;
-  TransitMarkPrimaryText-color: #000000;
-  TransitMarkPrimaryTextOutline-color: #FFFFFF;
-  TransitMarkSecondaryText-color: #000000;
-  TransitMarkSecondaryTextOutline-color: #FFFFFF;
-  TransitTransferOuterMarker-color: #000000;
-  TransitTransferInnerMarker-color: #FFFFFF;
-  TransitStopInnerMarker-color: #FFFFFF;
-  LocalAdsPrimaryText-color: #000000;
-  LocalAdsPrimaryTextOutline-color: #FFFFFF;
-  LocalAdsSecondaryText-color: #000000;
-  LocalAdsSecondaryTextOutline-color: #FFFFFF;
-  TransitBackground-color: #FFFFFF;
-  TransitBackground-opacity: 0.4;
-  BookmarkRed-color: #E51B23;
-  BookmarkPink-color: #FF4182;
-  BookmarkPurple-color: #9B24B2;
-  BookmarkDeepPurple-color: #6639BF;
-  BookmarkBlue-color: #0066CC;
-  BookmarkLightBlue-color: #249CF2;
-  BookmarkCyan-color: #14BECD;
-  BookmarkTeal-color: #00A58C;
-  BookmarkGreen-color: #3C8C3C;
-  BookmarkLime-color: #93BF39;
-  BookmarkYellow-color: #FFC800;
-  BookmarkOrange-color: #FF9600;
-  BookmarkDeepOrange-color: #F06432;
-  BookmarkBrown-color: #804633;
-  BookmarkGray-color: #737373;
-  BookmarkBlueGray-color: #597380;
-  SearchmarkPreparing-color: #597380;
-  SearchmarkNotAvailable-color: #597380;
-  SearchmarkSelectedNotAvailable-color: #F06432;
-  RatingBad-color: #F06432;
-  RatingGood-color: #3C8C3C;
-  RatingNone-color: #249CF2;
-  SearchmarkDefault-color: #249CF2;
-  RatingText-color: #FFFFFF;
-  UGCRatingText-color: #000000;
-  SpeedCameraMarkText-color: #FFFFFF;
-  SpeedCameraMarkBg-color: #F51E30;
-  SpeedCameraMarkOutline-color: #FFFFFF;
-  GuideCityMarkText-color: #6639BF;
-  GuideOutdoorMarkText-color: #3C8C3C;
-  HotelPriceText-color: #000000;
-}
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/subways.mapcss");
+@import("dynamic_colors.mapcss");

data/styles/driving/dark/colors.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/dark/colors.mapcss");

data/styles/driving/dark/style.mapcss

@@ -0,0 +1,9 @@
+@import("colors.mapcss");
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/subways.mapcss");
+@import("../../default/dark/dynamic_colors.mapcss");

data/styles/driving/include/Basemap.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/basemap.mapcss");

data/styles/driving/include/Basemap_label.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/basemap_label.mapcss");

data/styles/driving/include/Icons.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/icons.mapcss");

data/styles/driving/include/Subways.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/subways.mapcss");

data/styles/driving/include/icons_label_colors.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/icons_label_colors.mapcss");

data/styles/driving/include/priorities_1_BG-by-size.prio.txt

@@ -0,0 +1,258 @@
+# This file is automatically re-formatted and re-sorted in priorities descending order
+# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
+# are generated automatically for information only. Custom formatting and comments are not preserved.
+#
+# BG-by-size geometry: background areas rendered below BG-top and everything else.
+# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box).
+# So effectively priority values of BG-by-size areas are not used at the moment.
+# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature.
+# Keep them in a logical importance order please.
+#
+# Priorities ranges' rendering order overview:
+# - overlays (icons, captions...)
+# - FG: foreground areas and lines
+# - BG-top: water (linear and areal)
+# - BG-by-size: landcover areas sorted by their size
+
+leisure-stadium                                     # area z13- (also has icon z13-, caption(optional) z13-)
+=== 250
+
+amenity-place_of_worship                            # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-buddhist                   # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian                  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-jehovahs_witness  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-mormon           # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-hindu                      # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-jewish                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
+landuse-religious                                   # area z13-
+=== 240
+
+amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
+leisure-swimming_pool                               # area z13- (also has icon z17-, caption(optional) z17-)
+leisure-swimming_pool-private                       # area z13- (also has icon z17-, caption(optional) z17-)
+=== 230
+
+landuse-landfill                                    # area z13- (also has icon z15-, caption(optional) z15-)
+=== 220
+
+leisure-playground                                  # area z15- (also has icon z17-, caption(optional) z17-)
+=== 200
+
+amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
+leisure-fitness_centre-sport-yoga                   # area z16- (also has icon z16-, caption(optional) z17-)
+leisure-sports_centre                               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-american_football       # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-archery                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-athletics               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-australian_football     # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-badminton               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-baseball                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-basketball              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-beachvolleyball         # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-bowls                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-climbing                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-cricket                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-curling                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-equestrian              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-field_hockey            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-futsal                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-golf                    # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-gymnastics              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-handball                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-ice_hockey              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-multi                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-padel                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-pelota                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-scuba_diving            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-shooting                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-skateboard              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-skiing                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-soccer                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-swimming                # area z13- (also has icon z15-, caption(optional) z15-)
+leisure-sports_centre-sport-table_tennis            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-tennis                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-volleyball              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-yoga                    # area z13- (also has icon z16-, caption(optional) z16-)
+=== 190
+
+amenity-grave_yard                                  # area z10- (also has icon z17-, caption(optional) z17-)
+amenity-grave_yard-christian                        # area z10- (also has icon z17-, caption(optional) z17-)
+landuse-cemetery                                    # area z10- (also has icon z14-, caption(optional) z15-)
+landuse-cemetery-christian                          # area z10- (also has icon z14-, caption(optional) z15-)
+=== 180
+
+amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-charging_station                            # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-bicycle                    # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-carless                    # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
+amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-fire_station                                # area z15- (also has icon z16-, caption(optional) z17-)
+amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-police                                      # area z15- (also has icon z16-, caption(optional) z17-)
+amenity-ranger_station                              # area z13- (also has icon z15-, caption(optional) z15-)
+amenity-recycling-centre                            # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
+emergency-mountain_rescue                           # area z13- (also has icon z16-, caption(optional) z16-)
+highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
+highway-rest_area                                   # area z13- (also has icon z15-, caption(optional) z15-)
+highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
+landuse-garages                                     # area z13- (also has caption z15-)
+leisure-dog_park                                    # area z15- (also has icon z16-, caption(optional) z16-)
+leisure-resort                                      # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
+office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
+tourism-camp_site                                   # area z13- (also has icon z16-, caption(optional) z16-)
+tourism-information-office                          # area z15- (also has icon z15-, caption(optional) z15-)
+tourism-information-visitor_centre                  # area z13- (also has icon z15-, caption(optional) z15-)
+=== 170
+
+highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
+leisure-track-area                                  # area z15- (also has caption z16-)
+=== 160
+
+aeroway-terminal                                    # area z14- (also has caption z15-)
+=== 150
+
+leisure-golf_course                                 # area z12- (also has icon z15-, caption(optional) z17-)
+leisure-miniature_golf                              # area z14- (also has icon z16-, caption(optional) z17-)
+=== 140
+
+landuse-flowerbed                                   # area z16-
+natural-scrub                                       # area z11-
+=== 130
+
+landuse-grass                                       # area z11-
+natural-grassland                                   # area z11-
+natural-heath                                       # area z11-
+=== 120
+
+area:highway-footway                                # area z14- (also has caption z15-)
+area:highway-living_street                          # area z14-
+area:highway-pedestrian                             # area z14- (also has caption z15-)
+public_transport-platform                           # area z16- (also has caption z17-)
+railway-platform                                    # area z16- (also has caption z16-)
+=== 110
+
+amenity-bicycle_parking                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-bicycle_parking-covered                     # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-car_pooling                                 # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-motorcycle_parking                          # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-parking                                     # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-fee                                 # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-lane                                # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-lane-fee                            # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-lane-private                        # area z17- (also has icon z19-, caption(optional) z19-)
+amenity-parking-multi-storey                        # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-multi-storey-fee                    # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-no-access                           # area z15- (also has icon z18-, caption(optional) z18-)
+amenity-parking-park_and_ride                       # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-permissive                          # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-private                             # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-street_side                         # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-street_side-fee                     # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-street_side-private                 # area z17- (also has icon z18-, caption(optional) z18-)
+=== 100
+
+natural-wetland                                     # area z11- (also has caption z16-)
+natural-wetland-bog                                 # area z11- (also has caption z16-)
+natural-wetland-fen                                 # area z11- (also has caption z16-)
+natural-wetland-mangrove                            # area z11- (also has caption z16-)
+natural-wetland-marsh                               # area z11- (also has caption z16-)
+natural-wetland-reedbed                             # area z11- (also has caption z16-)
+natural-wetland-saltmarsh                           # area z11- (also has caption z16-)
+natural-wetland-saltmarsh-tidal                     # area z11- (also has caption z16-)
+natural-wetland-swamp                               # area z11- (also has caption z16-)
+natural-wetland-tidalflat                           # area z11- (also has caption z16-)
+=== 90
+
+landuse-farmyard                                    # area z10- (also has caption z15-)
+=== 81
+
+landuse-allotments                                  # area z12- (also has caption z15-)
+landuse-farmland                                    # area z10- (also has caption z15-)
+landuse-meadow                                      # area z11-
+landuse-orchard                                     # area z12- (also has caption z15-)
+landuse-recreation_ground                           # area z12- (also has caption z15-)
+landuse-village_green                               # area z12-
+landuse-vineyard                                    # area z12- (also has caption z15-)
+leisure-fitness_station                             # area z15- (also has icon z17-, caption(optional) z17-)
+leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
+natural-bare_rock                                   # area z11- (also has caption z14-)
+natural-scree                                       # area z11-
+natural-shingle                                     # area z12-
+=== 80
+
+landuse-plant_nursery                               # area z12- (also has icon z17-, caption(optional) z17-)
+leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
+leisure-garden-residential                          # area z12-
+leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-)
+=== 70
+
+landuse-forest                                      # area z10- (also has icon z13-, caption(optional) z14-)
+landuse-forest-coniferous                           # area z10- (also has icon z13-, caption(optional) z14-)
+landuse-forest-deciduous                            # area z10- (also has icon z13-, caption(optional) z14-)
+landuse-forest-mixed                                # area z10- (also has icon z13-, caption(optional) z14-)
+=== 60
+
+amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z18-)
+landuse-construction                                # area z13- (also has caption z15-)
+landuse-industrial                                  # area z13- (also has caption z15-)
+landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-railway                                     # area z13- (also has caption z15-)
+man_made-wastewater_plant                           # area z13- (also has caption z15-)
+man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
+power-generator                                     # area z13- (also has icon z17-)
+power-generator-gas                                 # area z13- (also has icon z17-)
+power-generator-hydro                               # area z13- (also has icon z17-)
+power-generator-solar                               # area z13-
+power-generator-wind                                # area z13- (also has icon z15-, caption(optional) z18-)
+power-plant                                         # area z13- (also has icon z17-)
+power-plant-coal                                    # area z13- (also has icon z17-)
+power-plant-gas                                     # area z13- (also has icon z17-)
+power-plant-hydro                                   # area z13- (also has icon z17-)
+power-plant-solar                                   # area z13- (also has icon z17-)
+power-plant-wind                                    # area z13- (also has icon z15-, caption(optional) z16-)
+power-substation                                    # area z13- (also has icon z17-, caption(optional) z18-)
+=== 50
+
+amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-clinic                                      # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
+amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
+amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-school                                      # area z13- (also has icon z16-, caption(optional) z16-)
+amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
+=== 40
+
+aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
+aeroway-aerodrome-international                     # area z10- (also has icon z7-, caption(optional) z10-)
+landuse-education                                   # area z13-
+landuse-retail                                      # area z13- (also has caption z16-)
+leisure-beach_resort                                # area z10- (also has icon z16-, caption(optional) z16-)
+natural-beach                                       # area z10- (also has caption z15-)
+natural-beach-gravel                                # area z10- (also has caption z15-)
+natural-beach-sand                                  # area z10- (also has caption z15-)
+natural-desert                                      # area z1- (also has caption z14-)
+natural-glacier                                     # area z1-
+natural-sand                                        # area z1- (also has caption z15-)
+=== 30
+
+natural-land                                        # area z1-
+place-islet                                         # area z10- (also has caption z14-)
+=== 20
+
+natural-coastline                                   # area z1-
+=== 10

data/styles/driving/include/priorities_2_BG-top.prio.txt

@@ -0,0 +1,46 @@
+# This file is automatically re-formatted and re-sorted in priorities descending order
+# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
+# are generated automatically for information only. Custom formatting and comments are not preserved.
+#
+# BG-top geometry: background lines and areas that should be always below foreground ones
+# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size),
+# because ordering by size doesn't always work with e.g. water mapped over a forest,
+# so water should be on top of other landcover always, but linear waterways should be hidden beneath it.
+# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature
+# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas
+# are displayed above layer=0 BG-top.
+#
+# Priorities ranges' rendering order overview:
+# - overlays (icons, captions...)
+# - FG: foreground areas and lines
+# - BG-top: water (linear and areal)
+# - BG-by-size: landcover areas sorted by their size
+
+landuse-basin                                       # area z12-
+landuse-reservoir                                   # area z12- (also has caption z10-)
+landuse-salt_pond                                   # area z1-
+natural-water                                       # area z1- (also has caption z10-)
+natural-water-basin                                 # area z1- (also has caption z10-)
+natural-water-ditch                                 # area z13- (also has caption z17-)
+natural-water-drain                                 # area z13- (also has caption z17-)
+natural-water-lake                                  # area z1- (also has caption z10-)
+natural-water-lock                                  # area z1- (also has caption z10-)
+natural-water-moat                                  # area z1- (also has caption z17-)
+natural-water-pond                                  # area z1- (also has caption z10-)
+natural-water-reservoir                             # area z1- (also has caption z10-)
+natural-water-river                                 # area z1- (also has caption z10-)
+natural-water-tunnel                                # area z15-
+natural-water-wastewater                            # area z12- (also has caption z17-)
+waterway-dock                                       # area z1-
+=== 20
+
+natural-strait                                      # line z13- (also has caption z13-)
+waterway-canal                                      # line z13- (also has pathtext z13-)
+waterway-ditch                                      # line z13-
+waterway-drain                                      # line z13-
+waterway-fish_pass                                  # line z13- (also has pathtext z13-)
+waterway-river                                      # line z10- (also has pathtext z11-)
+waterway-stream                                     # line z13- (also has pathtext z13-)
+waterway-stream-ephemeral                           # line z13- (also has pathtext z13-)
+waterway-stream-intermittent                        # line z13- (also has pathtext z13-)
+=== 10

data/styles/driving/include/priorities_3_FG.prio.txt

@@ -0,0 +1,481 @@
+# This file is automatically re-formatted and re-sorted in priorities descending order
+# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
+# are generated automatically for information only. Custom formatting and comments are not preserved.
+#
+# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays
+# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature
+# is layer=-10 (as tunnels should be visibile over landcover and water).
+#
+# Priorities ranges' rendering order overview:
+# - overlays (icons, captions...)
+# - FG: foreground areas and lines
+# - BG-top: water (linear and areal)
+# - BG-by-size: landcover areas sorted by their size
+
+aerialway-cable_car::dash                           # line::dash z12- (also has line z12-, pathtext z15-)
+aerialway-chair_lift::dash                          # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-drag_lift::dash                           # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-gondola::dash                             # line::dash z12- (also has line z12-, pathtext z15-)
+aerialway-j-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-magic_carpet::dash                        # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-mixed_lift::dash                          # line::dash z12- (also has line z12-, pathtext z15-)
+aerialway-platter::dash                             # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-rope_tow::dash                            # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-t-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
+=== 380
+
+aerialway-cable_car                                 # line z12- (also has line::dash z12-, pathtext z15-)
+aerialway-chair_lift                                # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-drag_lift                                 # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-gondola                                   # line z12- (also has line::dash z12-, pathtext z15-)
+aerialway-j-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-magic_carpet                              # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-mixed_lift                                # line z12- (also has line::dash z12-, pathtext z15-)
+aerialway-platter                                   # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-rope_tow                                  # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-t-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
+=== 370
+
+historic-citywalls                                  # line z14- (also has pathtext z16-)
+=== 360
+
+power-line                                          # line z19- (also has line::dash z19-)
+=== 350
+
+power-line::dash                                    # line::dash z19- (also has line z19-)
+=== 340
+
+highway-ladder                                      # line z15- (also has icon z17-, pathtext z17-)
+highway-steps                                       # line z15- (also has pathtext z16-)
+highway-steps-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
+hwtag-oneway::arrows                                # line::arrows z15-
+waterway-weir                                       # line z14- (also has pathtext z15-)
+=== 330
+
+barrier-city_wall                                   # line z14- (also has pathtext z16-)
+barrier-fence                                       # line z16-
+barrier-guard_rail                                  # line z17-
+barrier-hedge                                       # line z16-
+barrier-wall                                        # line z16-
+barrier-yes                                         # line z16- (also has icon z16-, caption(optional) z16-)
+railway-funicular                                   # line z12-
+railway-funicular-bridge                            # line z12-
+railway-funicular-tunnel                            # line z12-
+railway-monorail                                    # line z14-
+railway-monorail-bridge                             # line z14-
+railway-monorail-tunnel                             # line z14-
+railway-narrow_gauge                                # line z15-
+railway-narrow_gauge-bridge                         # line z15-
+railway-narrow_gauge-tunnel                         # line z15-
+railway-tram                                        # line z13-
+railway-tram-bridge                                 # line z13-
+railway-tram-tunnel                                 # line z13-
+=== 320
+
+highway-motorway                                    # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-world_level                                 # line z4-9
+highway-world_towns_level                           # line z6-9
+=== 310
+
+# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# === 309
+
+highway-primary                                     # line z8- (also has pathtext z10-, shield::shield z10-)
+highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
+railway-rail-branch::dash                           # line::dash z16- (also has line z11-)
+railway-rail-branch-bridge::dash                    # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-branch-tunnel::dash                    # line::dash z16- (also has line z11-, line(casing) z14-)
+railway-rail-highspeed::dash                        # line::dash z16- (also has line z10-)
+railway-rail-highspeed-bridge::dash                 # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-highspeed-tunnel::dash                 # line::dash z16- (also has line z10-, line(casing) z14-)
+railway-rail-main::dash                             # line::dash z16- (also has line z10-)
+railway-rail-main-bridge::dash                      # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-main-tunnel::dash                      # line::dash z16- (also has line z10-, line(casing) z14-)
+railway-rail-tourism::dash                          # line::dash z16- (also has line z10-, pathtext z14-)
+railway-rail-tourism-bridge::dash                   # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-)
+railway-rail-tourism-tunnel::dash                   # line::dash z16- (also has line z10-, line(casing) z14-, pathtext z14-)
+=== 290
+
+# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
+# === 289
+
+railway-rail-branch                                 # line z11- (also has line::dash z16-)
+railway-rail-branch-bridge                          # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-branch-tunnel                          # line z11- (also has line::dash z16-, line(casing) z14-)
+railway-rail-highspeed                              # line z10- (also has line::dash z16-)
+railway-rail-highspeed-bridge                       # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-highspeed-tunnel                       # line z10- (also has line::dash z16-, line(casing) z14-)
+railway-rail-main                                   # line z10- (also has line::dash z16-)
+railway-rail-main-bridge                            # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-main-tunnel                            # line z10- (also has line::dash z16-, line(casing) z14-)
+railway-rail-tourism                                # line z10- (also has line::dash z16-, pathtext z14-)
+railway-rail-tourism-bridge                         # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-, pathtext z14-)
+railway-rail-tourism-tunnel                         # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z14-)
+=== 280
+
+# railway-rail-branch-tunnel                        # line(casing) z14- (also has line z11-, line::dash z16-)
+# railway-rail-highspeed-tunnel                     # line(casing) z14- (also has line z10-, line::dash z16-)
+# railway-rail-main-tunnel                          # line(casing) z14- (also has line z10-, line::dash z16-)
+# railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-)
+# === 279
+
+highway-secondary                                   # line z10- (also has pathtext z10-, shield::shield z12-)
+highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
+=== 270
+
+# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
+# === 269
+
+highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
+highway-unclassified                                # line z11- (also has pathtext z13-)
+highway-unclassified-area                           # line z11- (also has pathtext z13-)
+highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
+highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
+=== 250
+
+# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
+# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
+# === 249
+
+highway-living_street                               # line z12- (also has pathtext z14-)
+highway-living_street-bridge                        # line z12- (also has pathtext z14-)
+highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
+highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-road                                        # line z12- (also has pathtext z14-)
+highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-road-tunnel                                 # line z12- (also has pathtext z14-)
+=== 230
+
+# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
+# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
+# === 229
+
+highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+=== 228
+
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# === 227
+
+highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
+highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
+=== 226
+
+# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
+# === 225
+
+highway-secondary_link                              # line z13- (also has pathtext z16-)
+highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
+=== 224
+
+# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
+highway-tertiary_link                               # line z14- (also has pathtext z18-)
+highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
+highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
+=== 223
+
+highway-busway                                      # line z15- (also has pathtext z16-)
+highway-busway-bridge                               # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
+highway-service                                     # line z15- (also has pathtext z16-)
+highway-service-area                                # line z15- (also has pathtext z16-)
+highway-service-bridge                              # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-service-driveway                            # line z16- (also has pathtext z16-)
+highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
+highway-service-tunnel                              # line z15- (also has line(casing) z15-, pathtext z16-)
+# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
+=== 222
+
+# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, pathtext z16-)
+# highway-service-tunnel                            # line(casing) z15- (also has line z15-, pathtext z16-)
+railway-light_rail::dash                            # line::dash z16- (also has line z13-)
+railway-light_rail-bridge::dash                     # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail::dash                                  # line::dash z16- (also has line z11-)
+railway-rail-bridge::dash                           # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-service::dash                          # line::dash z17- (also has line z16-)
+railway-rail-service-bridge::dash                   # line::dash z17- (also has line z16-, line::bridgeblack z16-, line::bridgewhite z16-)
+railway-rail-service-tunnel::dash                   # line::dash z17- (also has line(casing) z16-, line z16-)
+railway-rail-spur::dash                             # line::dash z17- (also has line z15-)
+railway-rail-spur-bridge::dash                      # line::dash z17- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-)
+railway-rail-spur-tunnel::dash                      # line::dash z17- (also has line(casing) z15-, line z15-)
+railway-rail-tunnel::dash                           # line::dash z16- (also has line z11-, line(casing) z14-)
+railway-rail-utility::dash                          # line::dash z17- (also has line z13-)
+railway-rail-utility-bridge::dash                   # line::dash z17- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-utility-tunnel::dash                   # line::dash z17- (also has line z13-, line(casing) z14-)
+railway-subway::dash                                # line::dash z16- (also has line z13-)
+railway-subway-bridge::dash                         # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
+=== 221
+
+highway-footway-bicycle                             # line z15- (also has line::cycleline z15-, pathtext z15-)
+highway-path-bicycle                                # line z15- (also has line::cycleline z14-, pathtext z15-)
+=== 220
+
+highway-footway-bicycle::cycleline                  # line::cycleline z15- (also has line z15-, pathtext z15-)
+highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z15-, pathtext z15-)
+=== 219
+
+highway-cycleway                                    # line z13- (also has pathtext z15-)
+highway-cycleway-bridge                             # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-cycleway-tunnel                             # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+=== 218
+
+railway-light_rail                                  # line z13- (also has line::dash z16-)
+railway-light_rail-bridge                           # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail                                        # line z11- (also has line::dash z16-)
+railway-rail-bridge                                 # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-service                                # line z16- (also has line::dash z17-)
+railway-rail-service-bridge                         # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-, line::dash z17-)
+railway-rail-service-tunnel                         # line z16- (also has line(casing) z16-, line::dash z17-)
+railway-rail-spur                                   # line z15- (also has line::dash z17-)
+railway-rail-spur-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z17-)
+railway-rail-spur-tunnel                            # line z15- (also has line(casing) z15-, line::dash z17-)
+railway-rail-tunnel                                 # line z11- (also has line::dash z16-, line(casing) z14-)
+railway-rail-utility                                # line z13- (also has line::dash z17-)
+railway-rail-utility-bridge                         # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z17-)
+railway-rail-utility-tunnel                         # line z13- (also has line::dash z17-, line(casing) z14-)
+railway-subway                                      # line z13- (also has line::dash z16-)
+railway-subway-bridge                               # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+=== 210
+
+# railway-rail-service-tunnel                       # line(casing) z16- (also has line z16-, line::dash z17-)
+# railway-rail-spur-tunnel                          # line(casing) z15- (also has line z15-, line::dash z17-)
+# railway-rail-tunnel                               # line(casing) z14- (also has line z11-, line::dash z16-)
+# railway-rail-utility-tunnel                       # line(casing) z14- (also has line z13-, line::dash z17-)
+# === 209
+
+highway-ford                                        # line z13- (also has icon z16-, pathtext z16-)
+highway-pedestrian                                  # line z13- (also has pathtext z14-)
+highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
+=== 200
+
+# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, pathtext z14-)
+# === 199
+
+highway-bridleway                                   # line z14- (also has pathtext z15-)
+highway-bridleway-bridge                            # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-bridleway-tunnel                            # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+highway-footway                                     # line z15- (also has pathtext z15-)
+highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
+highway-footway-crossing                            # line z16-
+highway-path                                        # line z15- (also has pathtext z15-)
+highway-path-difficult                              # line z15- (also has pathtext z15-)
+highway-path-expert                                 # line z15- (also has pathtext z15-)
+highway-raceway                                     # line z14- (also has pathtext z16-)
+highway-track                                       # line z15- (also has pathtext z15-)
+highway-track-area                                  # line z15- (also has pathtext z15-)
+highway-track-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-track-no-access                             # line z15- (also has pathtext z15-)
+highway-track-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+=== 180
+
+highway-construction                                # line z13- (also has pathtext z15-)
+leisure-track                                       # line z15- (also has caption z16-)
+railway-abandoned                                   # line z16-
+railway-construction                                # line z15-
+railway-disused                                     # line z16-
+railway-disused-bridge                              # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+railway-disused-tunnel                              # line z16-
+railway-miniature                                   # line z16-
+railway-miniature-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+railway-miniature-tunnel                            # line z16-
+railway-preserved                                   # line z15-
+railway-preserved-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-)
+railway-preserved-tunnel                            # line z15-
+railway-turntable                                   # line z17-
+=== 160
+
+highway-footway-bridge                              # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-footway-sidewalk                            # line z16-
+highway-footway-tunnel                              # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+highway-path-bridge                                 # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-path-horse                                  # line z15- (also has pathtext z15-)
+highway-path-tunnel                                 # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+=== 155
+
+highway-bridleway-tunnel::tunnelBackground          # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-)
+highway-cycleway-tunnel::tunnelBackground           # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-)
+highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
+highway-path-tunnel::tunnelBackground               # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
+highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z16-)
+highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
+=== 154
+
+highway-bridleway-tunnel::tunnelCasing              # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-)
+highway-cycleway-tunnel::tunnelCasing               # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-)
+highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
+highway-path-tunnel::tunnelCasing                   # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
+highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z16-)
+highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
+=== 153
+
+highway-bridleway-bridge::bridgewhite               # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
+highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
+highway-cycleway-bridge::bridgewhite                # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-)
+highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
+highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
+highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
+highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
+highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
+highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
+highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
+highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
+highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
+railway-disused-bridge::bridgewhite                 # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
+railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
+railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
+railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-)
+railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
+railway-rail-bridge::bridgewhite                    # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
+railway-rail-highspeed-bridge::bridgewhite          # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
+railway-rail-main-bridge::bridgewhite               # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
+railway-rail-service-bridge::bridgewhite            # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-, line::dash z17-)
+railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z17-)
+railway-rail-tourism-bridge::bridgewhite            # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-, pathtext z14-)
+railway-rail-utility-bridge::bridgewhite            # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z17-)
+railway-subway-bridge::bridgewhite                  # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
+=== 150
+
+highway-bridleway-bridge::bridgeblack               # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-)
+highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-cycleway-bridge::bridgeblack                # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-)
+highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
+highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
+highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
+highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
+highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
+highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
+highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
+highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
+railway-disused-bridge::bridgeblack                 # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
+railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
+railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
+railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-)
+railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-highspeed-bridge::bridgeblack          # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-main-bridge::bridgeblack               # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-service-bridge::bridgeblack            # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-, line::dash z17-)
+railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z17-)
+railway-rail-tourism-bridge::bridgeblack            # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-, pathtext z14-)
+railway-rail-utility-bridge::bridgeblack            # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z17-)
+railway-subway-bridge::bridgeblack                  # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
+=== 140
+
+building                                            # area z14- (also has caption z17-)
+building-garage                                     # area z14- (also has caption z17-)
+building-guardhouse                                 # area z14- (also has icon z18-, caption(optional) z18-)
+building-has_parts                                  # area z14- (also has caption z17-)
+building-train_station                              # area z14- (also has icon z17-, caption(optional) z17-)
+=== 130
+
+piste:type-connection                               # line z15-
+piste:type-downhill                                 # line z14- (also has pathtext z15-)
+piste:type-downhill-advanced                        # line z14- (also has pathtext z15-)
+piste:type-downhill-easy                            # line z14- (also has pathtext z15-)
+piste:type-downhill-expert                          # line z14- (also has pathtext z15-)
+piste:type-downhill-freeride                        # line z14- (also has pathtext z15-)
+piste:type-downhill-intermediate                    # line z14- (also has pathtext z15-)
+piste:type-downhill-novice                          # line z14- (also has pathtext z15-)
+piste:type-hike                                     # line z15- (also has pathtext z15-)
+piste:type-nordic                                   # line z14- (also has pathtext z15-)
+piste:type-skitour                                  # line z14- (also has pathtext z15-)
+piste:type-sled                                     # line z14- (also has pathtext z15-)
+=== 120
+
+building:part                                       # area z16-
+=== 110
+
+barrier-retaining_wall                              # line z16-
+man_made-embankment                                 # line z16- (also has pathtext z18-)
+natural-cliff                                       # line z14- (also has pathtext z16-)
+natural-earth_bank                                  # line z14-
+=== 100
+
+boundary-administrative-2                           # line z2-
+boundary-administrative-3                           # line z4
+boundary-administrative-4                           # line z5-
+=== 90
+
+man_made-cutline                                    # line z14-
+route-ferry                                         # line z7- (also has pathtext z10-)
+=== 80
+
+aeroway-runway                                      # line z12-
+aeroway-taxiway                                     # line z14-
+barrier-ditch                                       # line z16-
+=== 70
+
+isoline-step_10                                     # line z15- (also has pathtext z17-)
+isoline-step_100                                    # line z12- (also has pathtext z14-)
+isoline-step_1000                                   # line z11- (also has pathtext z11-)
+isoline-step_50                                     # line z14- (also has pathtext z16-)
+isoline-step_500                                    # line z11- (also has pathtext z12-)
+isoline-zero                                        # line z15- (also has pathtext z17-)
+=== 60
+
+man_made-breakwater                                 # line z14- and area z12- (also has caption z17-)
+man_made-pier                                       # line z14- and area z12- (also has caption z17-)
+waterway-dam                                        # line z14- and area z14- (also has pathtext z15-)
+=== 30
+
+landuse-military                                    # area z12- (also has icon z16-, caption(optional) z17-)
+landuse-military-danger_area                        # area z10- (also has icon z16-, caption(optional) z17-)
+=== 25
+
+amenity-prison                                      # area z12- (also has icon z17-, caption(optional) z17-)
+boundary-aboriginal_lands                           # line z10- and area z10-16 (also has caption z10-16)
+boundary-national_park                              # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
+boundary-protected_area-1                           # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
+leisure-nature_reserve                              # area z10-17 (also has icon z11-17, caption(optional) z12-17, caption z18-)
+=== 20
+
+piste:type-snow_park                                # area z14- (also has caption z15-)
+=== 15
+
+man_made-bridge                                     # area z14-
+=== 10

data/styles/driving/include/ways.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/ways.mapcss");

data/styles/driving/include/ways_label.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/ways_label.mapcss");

data/styles/driving/light/colors.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/light/colors.mapcss");

data/styles/driving/light/style.mapcss

@@ -0,0 +1,9 @@
+@import("colors.mapcss");
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/subways.mapcss");
+@import("../../default/light/dynamic_colors.mapcss");

data/styles/hiking/dark/style.mapcss

@@ -0,0 +1,9 @@
+@import("colors.mapcss");
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/subways.mapcss");
+@import("../../default/dark/dynamic_colors.mapcss");

data/styles/hiking/include/Basemap.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/Basemap.mapcss");
+@import("../../default/include/basemap.mapcss");
 
 
 /* 6.WATER */

data/styles/hiking/include/Basemap_label.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/Basemap_label.mapcss");
+@import("../../default/include/basemap_label.mapcss");
 
 /* Barriers, cliffs */
 

data/styles/hiking/include/Icons.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/Icons.mapcss");
+@import("../../default/include/icons.mapcss");
 
 
 /* 2. NATURAL */

data/styles/hiking/include/Subways.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/subways.mapcss");

data/styles/hiking/include/icons_label_colors.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/icons_label_colors.mapcss");

data/styles/hiking/include/ways.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/Roads.mapcss");
+@import("../../default/include/ways.mapcss");
 
 
 /* Make all roads more contrast */

data/styles/hiking/include/ways_label.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/Roads_label.mapcss");
+@import("../../default/include/ways_label.mapcss");
 
 
 line|z13-[highway=track],

data/styles/hiking/light/style.mapcss

@@ -0,0 +1,9 @@
+@import("colors.mapcss");
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/subways.mapcss");
+@import("../../default/light/dynamic_colors.mapcss");

data/styles/outdoors/include/defaults_new.mapcss

@@ -1,24 +0,0 @@
-way|z1-12::*
-{
-  linejoin: bevel;
-}
-
-way|z13-::*
-{
-  linejoin: round;
-}
-
-way|z1-15::*
-{
-  linecap: butt;
-}
-
-way|z16-::*
-{
-  linecap: round;
-}
-
-*::int_name
-{
-  text-offset: 1;
-}

data/styles/publictransport/dark/colors.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/dark/colors.mapcss");

data/styles/publictransport/dark/style.mapcss

@@ -0,0 +1,9 @@
+@import("colors.mapcss");
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/subways.mapcss");
+@import("../../default/dark/dynamic_colors.mapcss");

data/styles/publictransport/include/Basemap.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/basemap.mapcss");

data/styles/publictransport/include/Basemap_label.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/basemap_label.mapcss");

data/styles/publictransport/include/Icons.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/icons.mapcss");

data/styles/publictransport/include/Subways.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/subways.mapcss");

data/styles/publictransport/include/icons_label_colors.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/icons_label_colors.mapcss");

data/styles/publictransport/include/priorities_1_BG-by-size.prio.txt

@@ -0,0 +1,258 @@
+# This file is automatically re-formatted and re-sorted in priorities descending order
+# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
+# are generated automatically for information only. Custom formatting and comments are not preserved.
+#
+# BG-by-size geometry: background areas rendered below BG-top and everything else.
+# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box).
+# So effectively priority values of BG-by-size areas are not used at the moment.
+# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature.
+# Keep them in a logical importance order please.
+#
+# Priorities ranges' rendering order overview:
+# - overlays (icons, captions...)
+# - FG: foreground areas and lines
+# - BG-top: water (linear and areal)
+# - BG-by-size: landcover areas sorted by their size
+
+leisure-stadium                                     # area z13- (also has icon z13-, caption(optional) z13-)
+=== 250
+
+amenity-place_of_worship                            # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-buddhist                   # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian                  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-jehovahs_witness  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-mormon           # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-hindu                      # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-jewish                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
+landuse-religious                                   # area z13-
+=== 240
+
+amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
+leisure-swimming_pool                               # area z13- (also has icon z17-, caption(optional) z17-)
+leisure-swimming_pool-private                       # area z13- (also has icon z17-, caption(optional) z17-)
+=== 230
+
+landuse-landfill                                    # area z13- (also has icon z15-, caption(optional) z15-)
+=== 220
+
+leisure-playground                                  # area z15- (also has icon z17-, caption(optional) z17-)
+=== 200
+
+amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
+leisure-fitness_centre-sport-yoga                   # area z16- (also has icon z16-, caption(optional) z17-)
+leisure-sports_centre                               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-american_football       # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-archery                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-athletics               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-australian_football     # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-badminton               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-baseball                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-basketball              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-beachvolleyball         # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-bowls                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-climbing                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-cricket                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-curling                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-equestrian              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-field_hockey            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-futsal                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-golf                    # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-gymnastics              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-handball                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-ice_hockey              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-multi                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-padel                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-pelota                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-scuba_diving            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-shooting                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-skateboard              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-skiing                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-soccer                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-swimming                # area z13- (also has icon z15-, caption(optional) z15-)
+leisure-sports_centre-sport-table_tennis            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-tennis                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-volleyball              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-yoga                    # area z13- (also has icon z16-, caption(optional) z16-)
+=== 190
+
+amenity-grave_yard                                  # area z10- (also has icon z17-, caption(optional) z17-)
+amenity-grave_yard-christian                        # area z10- (also has icon z17-, caption(optional) z17-)
+landuse-cemetery                                    # area z10- (also has icon z14-, caption(optional) z15-)
+landuse-cemetery-christian                          # area z10- (also has icon z14-, caption(optional) z15-)
+=== 180
+
+amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-charging_station                            # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-bicycle                    # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-carless                    # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
+amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-fire_station                                # area z15- (also has icon z16-, caption(optional) z17-)
+amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-police                                      # area z15- (also has icon z16-, caption(optional) z17-)
+amenity-ranger_station                              # area z13- (also has icon z15-, caption(optional) z15-)
+amenity-recycling-centre                            # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
+emergency-mountain_rescue                           # area z13- (also has icon z16-, caption(optional) z16-)
+highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
+highway-rest_area                                   # area z13- (also has icon z15-, caption(optional) z15-)
+highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
+landuse-garages                                     # area z13- (also has caption z15-)
+leisure-dog_park                                    # area z15- (also has icon z16-, caption(optional) z16-)
+leisure-resort                                      # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
+office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
+tourism-camp_site                                   # area z13- (also has icon z16-, caption(optional) z16-)
+tourism-information-office                          # area z15- (also has icon z15-, caption(optional) z15-)
+tourism-information-visitor_centre                  # area z13- (also has icon z15-, caption(optional) z15-)
+=== 170
+
+highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
+leisure-track-area                                  # area z15- (also has caption z16-)
+=== 160
+
+aeroway-terminal                                    # area z14- (also has caption z15-)
+=== 150
+
+leisure-golf_course                                 # area z12- (also has icon z15-, caption(optional) z17-)
+leisure-miniature_golf                              # area z14- (also has icon z16-, caption(optional) z17-)
+=== 140
+
+landuse-flowerbed                                   # area z16-
+natural-scrub                                       # area z11-
+=== 130
+
+landuse-grass                                       # area z11-
+natural-grassland                                   # area z11-
+natural-heath                                       # area z11-
+=== 120
+
+area:highway-footway                                # area z14- (also has caption z15-)
+area:highway-living_street                          # area z14-
+area:highway-pedestrian                             # area z14- (also has caption z15-)
+public_transport-platform                           # area z16- (also has caption z17-)
+railway-platform                                    # area z16- (also has caption z16-)
+=== 110
+
+amenity-bicycle_parking                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-bicycle_parking-covered                     # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-car_pooling                                 # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-motorcycle_parking                          # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-parking                                     # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-fee                                 # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-lane                                # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-lane-fee                            # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-lane-private                        # area z17- (also has icon z19-, caption(optional) z19-)
+amenity-parking-multi-storey                        # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-multi-storey-fee                    # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-no-access                           # area z15- (also has icon z18-, caption(optional) z18-)
+amenity-parking-park_and_ride                       # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-permissive                          # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-private                             # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-street_side                         # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-street_side-fee                     # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-street_side-private                 # area z17- (also has icon z18-, caption(optional) z18-)
+=== 100
+
+natural-wetland                                     # area z11- (also has caption z16-)
+natural-wetland-bog                                 # area z11- (also has caption z16-)
+natural-wetland-fen                                 # area z11- (also has caption z16-)
+natural-wetland-mangrove                            # area z11- (also has caption z16-)
+natural-wetland-marsh                               # area z11- (also has caption z16-)
+natural-wetland-reedbed                             # area z11- (also has caption z16-)
+natural-wetland-saltmarsh                           # area z11- (also has caption z16-)
+natural-wetland-saltmarsh-tidal                     # area z11- (also has caption z16-)
+natural-wetland-swamp                               # area z11- (also has caption z16-)
+natural-wetland-tidalflat                           # area z11- (also has caption z16-)
+=== 90
+
+landuse-farmyard                                    # area z10- (also has caption z15-)
+=== 81
+
+landuse-allotments                                  # area z12- (also has caption z15-)
+landuse-farmland                                    # area z10- (also has caption z15-)
+landuse-meadow                                      # area z11-
+landuse-orchard                                     # area z12- (also has caption z15-)
+landuse-recreation_ground                           # area z12- (also has caption z15-)
+landuse-village_green                               # area z12-
+landuse-vineyard                                    # area z12- (also has caption z15-)
+leisure-fitness_station                             # area z15- (also has icon z17-, caption(optional) z17-)
+leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
+natural-bare_rock                                   # area z11- (also has caption z14-)
+natural-scree                                       # area z11-
+natural-shingle                                     # area z12-
+=== 80
+
+landuse-plant_nursery                               # area z12- (also has icon z17-, caption(optional) z17-)
+leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
+leisure-garden-residential                          # area z12-
+leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-)
+=== 70
+
+landuse-forest                                      # area z10- (also has icon z13-, caption(optional) z14-)
+landuse-forest-coniferous                           # area z10- (also has icon z13-, caption(optional) z14-)
+landuse-forest-deciduous                            # area z10- (also has icon z13-, caption(optional) z14-)
+landuse-forest-mixed                                # area z10- (also has icon z13-, caption(optional) z14-)
+=== 60
+
+amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z18-)
+landuse-construction                                # area z13- (also has caption z15-)
+landuse-industrial                                  # area z13- (also has caption z15-)
+landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-railway                                     # area z13- (also has caption z15-)
+man_made-wastewater_plant                           # area z13- (also has caption z15-)
+man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
+power-generator                                     # area z13- (also has icon z17-)
+power-generator-gas                                 # area z13- (also has icon z17-)
+power-generator-hydro                               # area z13- (also has icon z17-)
+power-generator-solar                               # area z13-
+power-generator-wind                                # area z13- (also has icon z15-, caption(optional) z18-)
+power-plant                                         # area z13- (also has icon z17-)
+power-plant-coal                                    # area z13- (also has icon z17-)
+power-plant-gas                                     # area z13- (also has icon z17-)
+power-plant-hydro                                   # area z13- (also has icon z17-)
+power-plant-solar                                   # area z13- (also has icon z17-)
+power-plant-wind                                    # area z13- (also has icon z15-, caption(optional) z16-)
+power-substation                                    # area z13- (also has icon z17-, caption(optional) z18-)
+=== 50
+
+amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-clinic                                      # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
+amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
+amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-school                                      # area z13- (also has icon z16-, caption(optional) z16-)
+amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
+=== 40
+
+aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
+aeroway-aerodrome-international                     # area z10- (also has icon z7-, caption(optional) z10-)
+landuse-education                                   # area z13-
+landuse-retail                                      # area z13- (also has caption z16-)
+leisure-beach_resort                                # area z10- (also has icon z16-, caption(optional) z16-)
+natural-beach                                       # area z10- (also has caption z15-)
+natural-beach-gravel                                # area z10- (also has caption z15-)
+natural-beach-sand                                  # area z10- (also has caption z15-)
+natural-desert                                      # area z1- (also has caption z14-)
+natural-glacier                                     # area z1-
+natural-sand                                        # area z1- (also has caption z15-)
+=== 30
+
+natural-land                                        # area z1-
+place-islet                                         # area z10- (also has caption z14-)
+=== 20
+
+natural-coastline                                   # area z1-
+=== 10

data/styles/publictransport/include/priorities_2_BG-top.prio.txt

@@ -0,0 +1,46 @@
+# This file is automatically re-formatted and re-sorted in priorities descending order
+# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
+# are generated automatically for information only. Custom formatting and comments are not preserved.
+#
+# BG-top geometry: background lines and areas that should be always below foreground ones
+# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size),
+# because ordering by size doesn't always work with e.g. water mapped over a forest,
+# so water should be on top of other landcover always, but linear waterways should be hidden beneath it.
+# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature
+# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas
+# are displayed above layer=0 BG-top.
+#
+# Priorities ranges' rendering order overview:
+# - overlays (icons, captions...)
+# - FG: foreground areas and lines
+# - BG-top: water (linear and areal)
+# - BG-by-size: landcover areas sorted by their size
+
+landuse-basin                                       # area z12-
+landuse-reservoir                                   # area z12- (also has caption z10-)
+landuse-salt_pond                                   # area z1-
+natural-water                                       # area z1- (also has caption z10-)
+natural-water-basin                                 # area z1- (also has caption z10-)
+natural-water-ditch                                 # area z13- (also has caption z17-)
+natural-water-drain                                 # area z13- (also has caption z17-)
+natural-water-lake                                  # area z1- (also has caption z10-)
+natural-water-lock                                  # area z1- (also has caption z10-)
+natural-water-moat                                  # area z1- (also has caption z17-)
+natural-water-pond                                  # area z1- (also has caption z10-)
+natural-water-reservoir                             # area z1- (also has caption z10-)
+natural-water-river                                 # area z1- (also has caption z10-)
+natural-water-tunnel                                # area z15-
+natural-water-wastewater                            # area z12- (also has caption z17-)
+waterway-dock                                       # area z1-
+=== 20
+
+natural-strait                                      # line z13- (also has caption z13-)
+waterway-canal                                      # line z13- (also has pathtext z13-)
+waterway-ditch                                      # line z13-
+waterway-drain                                      # line z13-
+waterway-fish_pass                                  # line z13- (also has pathtext z13-)
+waterway-river                                      # line z10- (also has pathtext z11-)
+waterway-stream                                     # line z13- (also has pathtext z13-)
+waterway-stream-ephemeral                           # line z13- (also has pathtext z13-)
+waterway-stream-intermittent                        # line z13- (also has pathtext z13-)
+=== 10

data/styles/publictransport/include/priorities_3_FG.prio.txt

@@ -0,0 +1,481 @@
+# This file is automatically re-formatted and re-sorted in priorities descending order
+# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
+# are generated automatically for information only. Custom formatting and comments are not preserved.
+#
+# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays
+# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature
+# is layer=-10 (as tunnels should be visibile over landcover and water).
+#
+# Priorities ranges' rendering order overview:
+# - overlays (icons, captions...)
+# - FG: foreground areas and lines
+# - BG-top: water (linear and areal)
+# - BG-by-size: landcover areas sorted by their size
+
+aerialway-cable_car::dash                           # line::dash z12- (also has line z12-, pathtext z15-)
+aerialway-chair_lift::dash                          # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-drag_lift::dash                           # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-gondola::dash                             # line::dash z12- (also has line z12-, pathtext z15-)
+aerialway-j-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-magic_carpet::dash                        # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-mixed_lift::dash                          # line::dash z12- (also has line z12-, pathtext z15-)
+aerialway-platter::dash                             # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-rope_tow::dash                            # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-t-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
+=== 380
+
+aerialway-cable_car                                 # line z12- (also has line::dash z12-, pathtext z15-)
+aerialway-chair_lift                                # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-drag_lift                                 # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-gondola                                   # line z12- (also has line::dash z12-, pathtext z15-)
+aerialway-j-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-magic_carpet                              # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-mixed_lift                                # line z12- (also has line::dash z12-, pathtext z15-)
+aerialway-platter                                   # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-rope_tow                                  # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-t-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
+=== 370
+
+historic-citywalls                                  # line z14- (also has pathtext z16-)
+=== 360
+
+power-line                                          # line z19- (also has line::dash z19-)
+=== 350
+
+power-line::dash                                    # line::dash z19- (also has line z19-)
+=== 340
+
+highway-ladder                                      # line z15- (also has icon z17-, pathtext z17-)
+highway-steps                                       # line z15- (also has pathtext z16-)
+highway-steps-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
+hwtag-oneway::arrows                                # line::arrows z15-
+waterway-weir                                       # line z14- (also has pathtext z15-)
+=== 330
+
+barrier-city_wall                                   # line z14- (also has pathtext z16-)
+barrier-fence                                       # line z16-
+barrier-guard_rail                                  # line z17-
+barrier-hedge                                       # line z16-
+barrier-wall                                        # line z16-
+barrier-yes                                         # line z16- (also has icon z16-, caption(optional) z16-)
+railway-funicular                                   # line z12-
+railway-funicular-bridge                            # line z12-
+railway-funicular-tunnel                            # line z12-
+railway-monorail                                    # line z14-
+railway-monorail-bridge                             # line z14-
+railway-monorail-tunnel                             # line z14-
+railway-narrow_gauge                                # line z15-
+railway-narrow_gauge-bridge                         # line z15-
+railway-narrow_gauge-tunnel                         # line z15-
+railway-tram                                        # line z13-
+railway-tram-bridge                                 # line z13-
+railway-tram-tunnel                                 # line z13-
+=== 320
+
+highway-motorway                                    # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-world_level                                 # line z4-9
+highway-world_towns_level                           # line z6-9
+=== 310
+
+# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# === 309
+
+highway-primary                                     # line z8- (also has pathtext z10-, shield::shield z10-)
+highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
+railway-rail-branch::dash                           # line::dash z16- (also has line z11-)
+railway-rail-branch-bridge::dash                    # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-branch-tunnel::dash                    # line::dash z16- (also has line z11-, line(casing) z14-)
+railway-rail-highspeed::dash                        # line::dash z16- (also has line z10-)
+railway-rail-highspeed-bridge::dash                 # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-highspeed-tunnel::dash                 # line::dash z16- (also has line z10-, line(casing) z14-)
+railway-rail-main::dash                             # line::dash z16- (also has line z10-)
+railway-rail-main-bridge::dash                      # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-main-tunnel::dash                      # line::dash z16- (also has line z10-, line(casing) z14-)
+railway-rail-tourism::dash                          # line::dash z16- (also has line z10-, pathtext z14-)
+railway-rail-tourism-bridge::dash                   # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-)
+railway-rail-tourism-tunnel::dash                   # line::dash z16- (also has line z10-, line(casing) z14-, pathtext z14-)
+=== 290
+
+# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
+# === 289
+
+railway-rail-branch                                 # line z11- (also has line::dash z16-)
+railway-rail-branch-bridge                          # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-branch-tunnel                          # line z11- (also has line::dash z16-, line(casing) z14-)
+railway-rail-highspeed                              # line z10- (also has line::dash z16-)
+railway-rail-highspeed-bridge                       # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-highspeed-tunnel                       # line z10- (also has line::dash z16-, line(casing) z14-)
+railway-rail-main                                   # line z10- (also has line::dash z16-)
+railway-rail-main-bridge                            # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-main-tunnel                            # line z10- (also has line::dash z16-, line(casing) z14-)
+railway-rail-tourism                                # line z10- (also has line::dash z16-, pathtext z14-)
+railway-rail-tourism-bridge                         # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-, pathtext z14-)
+railway-rail-tourism-tunnel                         # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z14-)
+=== 280
+
+# railway-rail-branch-tunnel                        # line(casing) z14- (also has line z11-, line::dash z16-)
+# railway-rail-highspeed-tunnel                     # line(casing) z14- (also has line z10-, line::dash z16-)
+# railway-rail-main-tunnel                          # line(casing) z14- (also has line z10-, line::dash z16-)
+# railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-)
+# === 279
+
+highway-secondary                                   # line z10- (also has pathtext z10-, shield::shield z12-)
+highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
+=== 270
+
+# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
+# === 269
+
+highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
+highway-unclassified                                # line z11- (also has pathtext z13-)
+highway-unclassified-area                           # line z11- (also has pathtext z13-)
+highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
+highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
+=== 250
+
+# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
+# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
+# === 249
+
+highway-living_street                               # line z12- (also has pathtext z14-)
+highway-living_street-bridge                        # line z12- (also has pathtext z14-)
+highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
+highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-road                                        # line z12- (also has pathtext z14-)
+highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-road-tunnel                                 # line z12- (also has pathtext z14-)
+=== 230
+
+# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
+# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
+# === 229
+
+highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+=== 228
+
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# === 227
+
+highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
+highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
+=== 226
+
+# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
+# === 225
+
+highway-secondary_link                              # line z13- (also has pathtext z16-)
+highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
+=== 224
+
+# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
+highway-tertiary_link                               # line z14- (also has pathtext z18-)
+highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
+highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
+=== 223
+
+highway-busway                                      # line z15- (also has pathtext z16-)
+highway-busway-bridge                               # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
+highway-service                                     # line z15- (also has pathtext z16-)
+highway-service-area                                # line z15- (also has pathtext z16-)
+highway-service-bridge                              # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-service-driveway                            # line z16- (also has pathtext z16-)
+highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
+highway-service-tunnel                              # line z15- (also has line(casing) z15-, pathtext z16-)
+# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
+=== 222
+
+# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, pathtext z16-)
+# highway-service-tunnel                            # line(casing) z15- (also has line z15-, pathtext z16-)
+railway-light_rail::dash                            # line::dash z16- (also has line z13-)
+railway-light_rail-bridge::dash                     # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail::dash                                  # line::dash z16- (also has line z11-)
+railway-rail-bridge::dash                           # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-service::dash                          # line::dash z17- (also has line z16-)
+railway-rail-service-bridge::dash                   # line::dash z17- (also has line z16-, line::bridgeblack z16-, line::bridgewhite z16-)
+railway-rail-service-tunnel::dash                   # line::dash z17- (also has line(casing) z16-, line z16-)
+railway-rail-spur::dash                             # line::dash z17- (also has line z15-)
+railway-rail-spur-bridge::dash                      # line::dash z17- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-)
+railway-rail-spur-tunnel::dash                      # line::dash z17- (also has line(casing) z15-, line z15-)
+railway-rail-tunnel::dash                           # line::dash z16- (also has line z11-, line(casing) z14-)
+railway-rail-utility::dash                          # line::dash z17- (also has line z13-)
+railway-rail-utility-bridge::dash                   # line::dash z17- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-utility-tunnel::dash                   # line::dash z17- (also has line z13-, line(casing) z14-)
+railway-subway::dash                                # line::dash z16- (also has line z13-)
+railway-subway-bridge::dash                         # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
+=== 221
+
+highway-footway-bicycle                             # line z15- (also has line::cycleline z15-, pathtext z15-)
+highway-path-bicycle                                # line z15- (also has line::cycleline z14-, pathtext z15-)
+=== 220
+
+highway-footway-bicycle::cycleline                  # line::cycleline z15- (also has line z15-, pathtext z15-)
+highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z15-, pathtext z15-)
+=== 219
+
+highway-cycleway                                    # line z13- (also has pathtext z15-)
+highway-cycleway-bridge                             # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-cycleway-tunnel                             # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+=== 218
+
+railway-light_rail                                  # line z13- (also has line::dash z16-)
+railway-light_rail-bridge                           # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail                                        # line z11- (also has line::dash z16-)
+railway-rail-bridge                                 # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-service                                # line z16- (also has line::dash z17-)
+railway-rail-service-bridge                         # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-, line::dash z17-)
+railway-rail-service-tunnel                         # line z16- (also has line(casing) z16-, line::dash z17-)
+railway-rail-spur                                   # line z15- (also has line::dash z17-)
+railway-rail-spur-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z17-)
+railway-rail-spur-tunnel                            # line z15- (also has line(casing) z15-, line::dash z17-)
+railway-rail-tunnel                                 # line z11- (also has line::dash z16-, line(casing) z14-)
+railway-rail-utility                                # line z13- (also has line::dash z17-)
+railway-rail-utility-bridge                         # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z17-)
+railway-rail-utility-tunnel                         # line z13- (also has line::dash z17-, line(casing) z14-)
+railway-subway                                      # line z13- (also has line::dash z16-)
+railway-subway-bridge                               # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+=== 210
+
+# railway-rail-service-tunnel                       # line(casing) z16- (also has line z16-, line::dash z17-)
+# railway-rail-spur-tunnel                          # line(casing) z15- (also has line z15-, line::dash z17-)
+# railway-rail-tunnel                               # line(casing) z14- (also has line z11-, line::dash z16-)
+# railway-rail-utility-tunnel                       # line(casing) z14- (also has line z13-, line::dash z17-)
+# === 209
+
+highway-ford                                        # line z13- (also has icon z16-, pathtext z16-)
+highway-pedestrian                                  # line z13- (also has pathtext z14-)
+highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
+=== 200
+
+# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, pathtext z14-)
+# === 199
+
+highway-bridleway                                   # line z14- (also has pathtext z15-)
+highway-bridleway-bridge                            # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-bridleway-tunnel                            # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+highway-footway                                     # line z15- (also has pathtext z15-)
+highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
+highway-footway-crossing                            # line z16-
+highway-path                                        # line z15- (also has pathtext z15-)
+highway-path-difficult                              # line z15- (also has pathtext z15-)
+highway-path-expert                                 # line z15- (also has pathtext z15-)
+highway-raceway                                     # line z14- (also has pathtext z16-)
+highway-track                                       # line z15- (also has pathtext z15-)
+highway-track-area                                  # line z15- (also has pathtext z15-)
+highway-track-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-track-no-access                             # line z15- (also has pathtext z15-)
+highway-track-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+=== 180
+
+highway-construction                                # line z13- (also has pathtext z15-)
+leisure-track                                       # line z15- (also has caption z16-)
+railway-abandoned                                   # line z16-
+railway-construction                                # line z15-
+railway-disused                                     # line z16-
+railway-disused-bridge                              # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+railway-disused-tunnel                              # line z16-
+railway-miniature                                   # line z16-
+railway-miniature-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+railway-miniature-tunnel                            # line z16-
+railway-preserved                                   # line z15-
+railway-preserved-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-)
+railway-preserved-tunnel                            # line z15-
+railway-turntable                                   # line z17-
+=== 160
+
+highway-footway-bridge                              # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-footway-sidewalk                            # line z16-
+highway-footway-tunnel                              # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+highway-path-bridge                                 # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-path-horse                                  # line z15- (also has pathtext z15-)
+highway-path-tunnel                                 # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+=== 155
+
+highway-bridleway-tunnel::tunnelBackground          # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-)
+highway-cycleway-tunnel::tunnelBackground           # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-)
+highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
+highway-path-tunnel::tunnelBackground               # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
+highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z16-)
+highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
+=== 154
+
+highway-bridleway-tunnel::tunnelCasing              # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-)
+highway-cycleway-tunnel::tunnelCasing               # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-)
+highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
+highway-path-tunnel::tunnelCasing                   # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
+highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z16-)
+highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
+=== 153
+
+highway-bridleway-bridge::bridgewhite               # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
+highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
+highway-cycleway-bridge::bridgewhite                # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-)
+highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
+highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
+highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
+highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
+highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
+highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
+highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
+highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
+highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
+railway-disused-bridge::bridgewhite                 # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
+railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
+railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
+railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-)
+railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
+railway-rail-bridge::bridgewhite                    # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
+railway-rail-highspeed-bridge::bridgewhite          # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
+railway-rail-main-bridge::bridgewhite               # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
+railway-rail-service-bridge::bridgewhite            # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-, line::dash z17-)
+railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z17-)
+railway-rail-tourism-bridge::bridgewhite            # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-, pathtext z14-)
+railway-rail-utility-bridge::bridgewhite            # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z17-)
+railway-subway-bridge::bridgewhite                  # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
+=== 150
+
+highway-bridleway-bridge::bridgeblack               # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-)
+highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-cycleway-bridge::bridgeblack                # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-)
+highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
+highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
+highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
+highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
+highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
+highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
+highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
+highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
+railway-disused-bridge::bridgeblack                 # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
+railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
+railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
+railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-)
+railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-highspeed-bridge::bridgeblack          # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-main-bridge::bridgeblack               # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-service-bridge::bridgeblack            # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-, line::dash z17-)
+railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z17-)
+railway-rail-tourism-bridge::bridgeblack            # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-, pathtext z14-)
+railway-rail-utility-bridge::bridgeblack            # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z17-)
+railway-subway-bridge::bridgeblack                  # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
+=== 140
+
+building                                            # area z14- (also has caption z17-)
+building-garage                                     # area z14- (also has caption z17-)
+building-guardhouse                                 # area z14- (also has icon z18-, caption(optional) z18-)
+building-has_parts                                  # area z14- (also has caption z17-)
+building-train_station                              # area z14- (also has icon z17-, caption(optional) z17-)
+=== 130
+
+piste:type-connection                               # line z15-
+piste:type-downhill                                 # line z14- (also has pathtext z15-)
+piste:type-downhill-advanced                        # line z14- (also has pathtext z15-)
+piste:type-downhill-easy                            # line z14- (also has pathtext z15-)
+piste:type-downhill-expert                          # line z14- (also has pathtext z15-)
+piste:type-downhill-freeride                        # line z14- (also has pathtext z15-)
+piste:type-downhill-intermediate                    # line z14- (also has pathtext z15-)
+piste:type-downhill-novice                          # line z14- (also has pathtext z15-)
+piste:type-hike                                     # line z15- (also has pathtext z15-)
+piste:type-nordic                                   # line z14- (also has pathtext z15-)
+piste:type-skitour                                  # line z14- (also has pathtext z15-)
+piste:type-sled                                     # line z14- (also has pathtext z15-)
+=== 120
+
+building:part                                       # area z16-
+=== 110
+
+barrier-retaining_wall                              # line z16-
+man_made-embankment                                 # line z16- (also has pathtext z18-)
+natural-cliff                                       # line z14- (also has pathtext z16-)
+natural-earth_bank                                  # line z14-
+=== 100
+
+boundary-administrative-2                           # line z2-
+boundary-administrative-3                           # line z4
+boundary-administrative-4                           # line z5-
+=== 90
+
+man_made-cutline                                    # line z14-
+route-ferry                                         # line z7- (also has pathtext z10-)
+=== 80
+
+aeroway-runway                                      # line z12-
+aeroway-taxiway                                     # line z14-
+barrier-ditch                                       # line z16-
+=== 70
+
+isoline-step_10                                     # line z15- (also has pathtext z17-)
+isoline-step_100                                    # line z12- (also has pathtext z14-)
+isoline-step_1000                                   # line z11- (also has pathtext z11-)
+isoline-step_50                                     # line z14- (also has pathtext z16-)
+isoline-step_500                                    # line z11- (also has pathtext z12-)
+isoline-zero                                        # line z15- (also has pathtext z17-)
+=== 60
+
+man_made-breakwater                                 # line z14- and area z12- (also has caption z17-)
+man_made-pier                                       # line z14- and area z12- (also has caption z17-)
+waterway-dam                                        # line z14- and area z14- (also has pathtext z15-)
+=== 30
+
+landuse-military                                    # area z12- (also has icon z16-, caption(optional) z17-)
+landuse-military-danger_area                        # area z10- (also has icon z16-, caption(optional) z17-)
+=== 25
+
+amenity-prison                                      # area z12- (also has icon z17-, caption(optional) z17-)
+boundary-aboriginal_lands                           # line z10- and area z10-16 (also has caption z10-16)
+boundary-national_park                              # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
+boundary-protected_area-1                           # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
+leisure-nature_reserve                              # area z10-17 (also has icon z11-17, caption(optional) z12-17, caption z18-)
+=== 20
+
+piste:type-snow_park                                # area z14- (also has caption z15-)
+=== 15
+
+man_made-bridge                                     # area z14-
+=== 10

data/styles/publictransport/include/ways.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/ways.mapcss");

data/styles/publictransport/include/ways_label.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/ways_label.mapcss");

data/styles/publictransport/light/colors.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/light/colors.mapcss");

data/styles/publictransport/light/style.mapcss

@@ -0,0 +1,9 @@
+@import("colors.mapcss");
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/subways.mapcss");
+@import("../../default/light/dynamic_colors.mapcss");

data/styles/vehicle/dark/style.mapcss

@@ -1,135 +1,9 @@
 @import("colors.mapcss");
-@import("../include/defaults_new.mapcss");
-@import("../include/Basemap.mapcss");
-@import("../include/Basemap_label.mapcss");
-@import("../include/Roads.mapcss");
-@import("../include/Roads_label.mapcss");
-@import("../include/Icons.mapcss");
-@import("../include/Subways.mapcss");
-
-
-colors
-{
-  GuiText-color: #FFFFFF;
-  GuiText-opacity: 0.7;
-  MyPositionAccuracy-color: #FFFFFF;
-  MyPositionAccuracy-opacity: 0.06;
-  Selection-color: #FFFFFF;
-  Selection-opacity: 0.64;
-  Route-color: #0087FF;
-  RouteOutline-color: #055FCD;
-  RouteTrafficG0-color: #5E0F0D;
-  RouteTrafficG1-color: #7F1311;
-  RouteTrafficG2-color: #7F1311;
-  RouteTrafficG3-color: #9E8216;
-  RouteTrafficG3-opacity: 0.0;
-  RoutePedestrian-color: #FFB94B;
-  RoutePedestrian-opacity: 0.7;
-  RouteBicycle-color: #FF4B8C;
-  RouteBicycle-opacity: 0.7;
-  RouteRuler-color: #FFB94B;
-  RouteRuler-opacity: 0.7;
-  RoutePreview-color: #FFFFFF;
-  RoutePreview-opacity: 0.3;
-  RouteMaskCar-color: #000000;
-  RouteMaskCar-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskCar-color: #055FCD;
-  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
-  RouteArrowsMaskCar-color: #055FCD;
-  RouteArrowsMaskCar-opacity: 0.3;
-  RouteMaskBicycle-color: #000000;
-  RouteMaskBicycle-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskBicycle-color: #FF4B8C;
-  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
-  RouteArrowsMaskBicycle-color: #FF4B8C;
-  RouteArrowsMaskBicycle-opacity: 0.5;
-  RouteMaskPedestrian-color: #000000;
-  RouteMaskPedestrian-opacity: 0.5;
-  RouteFake-color: #A8A8A8;
-  RouteFakeOutline-color: #717171;
-  Arrow3D-color: #41C8FF;
-  Arrow3DObsolete-color: #82AAC8;
-  Arrow3DObsolete-opacity: 0.72;
-  Arrow3DShadow-color: #3C3C3C;
-  Arrow3DShadow-opacity: 0.24;
-  Arrow3DOutline-color: #FFFFFF;
-  TrackHumanSpeed-color: #FF9800;
-  TrackCarSpeed-color: #FFCA28;
-  TrackPlaneSpeed-color: #FFF5A0;
-  TrackUnknownDistance-color: #969696;
-  TrafficG0-color: #4C120F;
-  TrafficG1-color: #731816;
-  TrafficG2-color: #731816;
-  TrafficG3-color: #8C7012;
-  TrafficG3-opacity: 0.0;
-  TrafficG4-color: #376222;
-  TrafficG5-color: #376222;
-  TrafficTempBlock-color: #232323;
-  TrafficUnknown-color: #000000;
-  TrafficArrowLight-color: #AAAAAA;
-  TrafficArrowDark-color: #1E1E1E;
-  TrafficOutline-color: #383838;
-  RoadShieldBlackText-color: #212121;
-  RoadShieldWhiteText-color: #B7B6B6;
-  RoadShieldUKYellowText-color: #B49E0E;
-  RoadShieldWhiteBackground-color: #999999;
-  RoadShieldGreenBackground-color: #136C30;
-  RoadShieldBlueBackground-color: #294C88;
-  RoadShieldRedBackground-color: #9F1A17;
-  RoadShieldOrangeBackground-color: #B58E1B;
-  PoiHotelTextOutline-color: #000000;
-  PoiHotelTextOutline-opacity: 0.6;
-  PoiDeletedMask-color: #FFFFFF;
-  PoiDeletedMask-opacity: 0.3;
-  PoiVisitedMask-color: #FFFFFF;
-  PoiVisitedMask-opacity: 0.7;
-  DefaultTrackColor-color: #1E96F0;
-  RouteMarkPrimaryText-color: #888888;
-  RouteMarkPrimaryTextOutline-color: #000000;
-  RouteMarkSecondaryText-color: #888888;
-  RouteMarkSecondaryTextOutline-color: #000000;
-  TransitMarkPrimaryText-color: #888888;
-  TransitMarkPrimaryTextOutline-color: #000000;
-  TransitMarkSecondaryText-color: #888888;
-  TransitMarkSecondaryTextOutline-color: #000000;
-  TransitTransferOuterMarker-color: #000000;
-  TransitTransferInnerMarker-color: #888888;
-  TransitStopInnerMarker-color: #000000;
-  LocalAdsPrimaryText-color: #888888;
-  LocalAdsPrimaryTextOutline-color: #000000;
-  LocalAdsSecondaryText-color: #888888;
-  LocalAdsSecondaryTextOutline-color: #000000;
-  TransitBackground-color: #000000;
-  TransitBackground-opacity: 0.4;
-  BookmarkRed-color: #E51B23;
-  BookmarkPink-color: #FF4182;
-  BookmarkPurple-color: #9B24B2;
-  BookmarkDeepPurple-color: #6639BF;
-  BookmarkBlue-color: #0066CC;
-  BookmarkLightBlue-color: #249CF2;
-  BookmarkCyan-color: #14BECD;
-  BookmarkTeal-color: #00A58C;
-  BookmarkGreen-color: #3C8C3C;
-  BookmarkLime-color: #93BF39;
-  BookmarkYellow-color: #FFC800;
-  BookmarkOrange-color: #FF9600;
-  BookmarkDeepOrange-color: #F06432;
-  BookmarkBrown-color: #737373;
-  BookmarkGray-color: #808080;
-  BookmarkBlueGray-color: #597380;
-  SearchmarkPreparing-color: #597380;
-  SearchmarkNotAvailable-color: #597380;
-  SearchmarkSelectedNotAvailable-color: #F06432;
-  RatingBad-color: #F06432;
-  RatingGood-color: #3C8C3C;
-  RatingNone-color: #249CF2;
-  SearchmarkDefault-color: #249CF2;
-  RatingText-color: #FFFFFF;
-  UGCRatingText-color: #B8B8B8;
-  SpeedCameraMarkText-color: #FFFFFF;
-  SpeedCameraMarkBg-color: #F51E30;
-  SpeedCameraMarkOutline-color: #FFFFFF;
-  GuideCityMarkText-color: #6639BF;
-  GuideOutdoorMarkText-color: #3C8C3C;
-  HotelPriceText-color: #000000;
-}
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/subways.mapcss");
+@import("../../default/dark/dynamic_colors.mapcss");

data/styles/vehicle/include/Icons.mapcss

@@ -85,10 +85,10 @@ node|z17-[railway=tram_stop]::int_name,
 
 node|z10-[aeroway=aerodrome][aerodrome=international],
 node|z14-[aeroway=aerodrome],
-{text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
+{text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center; text-offset: 1;}
 node|z12-[aeroway=aerodrome][aerodrome=international]::int_name,
 node|z14-[aeroway=aerodrome]::int_name,
-{text: int_name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
+{text: int_name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center; text-offset: 1;}
 
 /* 3.1 Train Station */
 
@@ -804,8 +804,4 @@ node|z19-[amenity=parking_entrance][access=private],
 {icon-image: parking_entrance_private-m.svg; font-size: 12.5;}
 
 node|z17-[amenity=motorcycle_parking],
-{icon-image: motorcycle-parking-m.svg;}
-
-/* 8. Colored Labels */
-
-@import("../../default/include/Icons_Label_Colors.mapcss");
+{icon-image: motorcycle-parking-m.svg;}

data/styles/vehicle/include/Subways.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/Subways.mapcss");
+@import("../../default/include/subways.mapcss");
 
 
 /*only render captions from z16*/

data/styles/vehicle/include/defaults_new.mapcss

@@ -1,24 +0,0 @@
-way|z1-12::*
-{
-  linejoin: bevel;
-}
-
-way|z13-::*
-{
-  linejoin: round;
-}
-
-way|z1-15::*
-{
-  linecap: butt;
-}
-
-way|z16-::*
-{
-  linecap: round;
-}
-
-*::int_name
-{
-  text-offset: 1;
-}

data/styles/vehicle/include/icons_label_colors.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/icons_label_colors.mapcss");

data/styles/vehicle/light/style.mapcss

@@ -1,135 +1,9 @@
 @import("colors.mapcss");
-@import("../include/defaults_new.mapcss");
-@import("../include/Basemap.mapcss");
-@import("../include/Basemap_label.mapcss");
-@import("../include/Roads.mapcss");
-@import("../include/Roads_label.mapcss");
-@import("../include/Icons.mapcss");
-@import("../include/Subways.mapcss");
-
-
-colors
-{
-  GuiText-color: #4D4D4D;
-  GuiText-opacity: 0.86;
-  MyPositionAccuracy-color: #000000;
-  MyPositionAccuracy-opacity: 0.08;
-  Selection-color: #1E96F0;
-  Selection-opacity: 0.64;
-  Route-color: #0087FF;
-  RouteOutline-color: #055FCD;
-  RouteTrafficG0-color: #9B2300;
-  RouteTrafficG1-color: #E82705;
-  RouteTrafficG2-color: #E82705;
-  RouteTrafficG3-color: #FFE500;
-  RouteTrafficG3-opacity: 0.0;
-  RoutePedestrian-color: #1D339E;
-  RoutePedestrian-opacity: 0.8;
-  RouteBicycle-color: #9C27B0;
-  RouteBicycle-opacity: 0.8;
-  RouteRuler-color: #1D339E;
-  RouteRuler-opacity: 0.8;
-  RoutePreview-color: #000000;
-  RoutePreview-opacity: 0.3;
-  RouteMaskCar-color: #000000;
-  RouteMaskCar-opacity: 0.3;
-  RouteFirstSegmentArrowsMaskCar-color: #033B80;
-  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
-  RouteArrowsMaskCar-color: #033B80;
-  RouteArrowsMaskCar-opacity: 0.2;
-  RouteMaskBicycle-color: #000000;
-  RouteMaskBicycle-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskBicycle-color: #9C27B0;
-  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
-  RouteArrowsMaskBicycle-color: #9C27B0;
-  RouteArrowsMaskBicycle-opacity: 0.2;
-  RouteMaskPedestrian-color: #000000;
-  RouteMaskPedestrian-opacity: 0.5;
-  RouteFake-color: #A8A8A8;
-  RouteFakeOutline-color: #717171;
-  Arrow3D-color: #50AAFF;
-  Arrow3DObsolete-color: #82AAC8;
-  Arrow3DObsolete-opacity: 0.72;
-  Arrow3DShadow-color: #3C3C3C;
-  Arrow3DShadow-opacity: 0.24;
-  Arrow3DOutline-color: #FFFFFF;
-  TrackHumanSpeed-color: #1D339E;
-  TrackCarSpeed-color: #7C8EDE;
-  TrackPlaneSpeed-color: #A8B7ED;
-  TrackUnknownDistance-color: #616161;
-  TrafficG0-color: #7E1712;
-  TrafficG1-color: #E42300;
-  TrafficG2-color: #E42300;
-  TrafficG3-color: #FCDE00;
-  TrafficG3-opacity: 0.0;
-  TrafficG4-color: #39962E;
-  TrafficG5-color: #39962E;
-  TrafficTempBlock-color: #464646;
-  TrafficUnknown-color: #000000;
-  TrafficArrowLight-color: #FFFFFF;
-  TrafficArrowDark-color: #473635;
-  TrafficOutline-color: #F0F0F0;
-  RoadShieldBlackText-color: #000000;
-  RoadShieldWhiteText-color: #FFFFFF;
-  RoadShieldUKYellowText-color: #FFD400;
-  RoadShieldWhiteBackground-color: #FFFFFF;
-  RoadShieldGreenBackground-color: #309302;
-  RoadShieldBlueBackground-color: #1A5EC1;
-  RoadShieldRedBackground-color: #E63534;
-  RoadShieldOrangeBackground-color: #FFBE00;
-  PoiHotelTextOutline-color: #FFFFFF;
-  PoiHotelTextOutline-opacity: 0.6;
-  PoiDeletedMask-color: #FFFFFF;
-  PoiDeletedMask-opacity: 0.3;
-  PoiVisitedMask-color: #FFFFFF;
-  PoiVisitedMask-opacity: 0.7;
-  DefaultTrackColor-color: #1E96F0;
-  RouteMarkPrimaryText-color: #000000;
-  RouteMarkPrimaryTextOutline-color: #FFFFFF;
-  RouteMarkSecondaryText-color: #000000;
-  RouteMarkSecondaryTextOutline-color: #FFFFFF;
-  TransitMarkPrimaryText-color: #000000;
-  TransitMarkPrimaryTextOutline-color: #FFFFFF;
-  TransitMarkSecondaryText-color: #000000;
-  TransitMarkSecondaryTextOutline-color: #FFFFFF;
-  TransitTransferOuterMarker-color: #000000;
-  TransitTransferInnerMarker-color: #FFFFFF;
-  TransitStopInnerMarker-color: #FFFFFF;
-  LocalAdsPrimaryText-color: #000000;
-  LocalAdsPrimaryTextOutline-color: #FFFFFF;
-  LocalAdsSecondaryText-color: #000000;
-  LocalAdsSecondaryTextOutline-color: #FFFFFF;
-  TransitBackground-color: #FFFFFF;
-  TransitBackground-opacity: 0.4;
-  BookmarkRed-color: #E51B23;
-  BookmarkPink-color: #FF4182;
-  BookmarkPurple-color: #9B24B2;
-  BookmarkDeepPurple-color: #6639BF;
-  BookmarkBlue-color: #0066CC;
-  BookmarkLightBlue-color: #249CF2;
-  BookmarkCyan-color: #14BECD;
-  BookmarkTeal-color: #00A58C;
-  BookmarkGreen-color: #3C8C3C;
-  BookmarkLime-color: #93BF39;
-  BookmarkYellow-color: #FFC800;
-  BookmarkOrange-color: #FF9600;
-  BookmarkDeepOrange-color: #F06432;
-  BookmarkBrown-color: #804633;
-  BookmarkGray-color: #737373;
-  BookmarkBlueGray-color: #597380;
-  SearchmarkPreparing-color: #597380;
-  SearchmarkNotAvailable-color: #597380;
-  SearchmarkSelectedNotAvailable-color: #F06432;
-  RatingBad-color: #F06432;
-  RatingGood-color: #3C8C3C;
-  RatingNone-color: #249CF2;
-  SearchmarkDefault-color: #249CF2;
-  RatingText-color: #FFFFFF;
-  UGCRatingText-color: #000000;
-  SpeedCameraMarkText-color: #FFFFFF;
-  SpeedCameraMarkBg-color: #F51E30;
-  SpeedCameraMarkOutline-color: #FFFFFF;
-  GuideCityMarkText-color: #6639BF;
-  GuideOutdoorMarkText-color: #3C8C3C;
-  HotelPriceText-color: #000000;
-}
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/subways.mapcss");
+@import("../../default/light/dynamic_colors.mapcss");

docs/DEPLOY_YOUR_SERVER.md

@@ -1,66 +0,0 @@
-# Deploy your maps files server
-
-This doc explain how to deploy your own instance of a CoMaps server with files from official CDNs (We are working to be able to download maps files without hardcoded countries.txt file embedded in the app)
-We explain how to deploy with minimal config, but each tools have differents options to change server port or choose maps files that you want to download.
-
-## Deploy the server
-Our community has developped different tools to deploy easily an instance of a CoMaps server:
-- [comaps-map-distributor](https://codeberg.org/gedankenstuecke/comaps-map-distributor)
-- [comaps-server](https://github.com/myanesp/comaps-server)
-
-### Deploy comaps-map-distributor
-
-Prerequisites
-- python3 and pip
-
-- Launch your terminal
-- Run `pip install comaps-map-distributor`
-- Launch the tool with this command `comaps-map-distributor download-maps`
-- Choose maps files you want to download from official CDNs
-- Run `comaps-map-distributor serve-maps`
-- Go to your mobile device -> CoMaps -> settings -> Advanced -> Custom Maps server
-- Edit URL with your URL server and enjoy
-
-
-### Deploy comaps-server
-
-Prerequisites
-- Docker
-- Your server is accessible from your network
-
-
-#### Docker
-
-- Launch your terminal
-- Run ``` docker run -d \
-  --name comaps-server \
-  --restart unless-stopped \
-  -e MAPS=all \ 
-  -e OUTPUT_DIR=/maps \
-  -p "80:80" \
-  ghcr.io/myanesp/comaps-server:latest```
-- Go to your mobile device -> CoMaps -> settings -> Advanced -> Custom Maps server
-- Edit URL with your URL server and enjoy   
-
-#### Docker compose
-- Launch your terminal
-- Create a `compose.yml` file with this config:
-
-```services:
-  maps-server:
-    image: ghcr.io/myanesp/comaps-server
-    container_name: comaps-server
-    ports:
-      - "80:80"
-    environment:
-      - MAPS=World,WorldCoasts,Spain
-      - OUTPUT_DIR=/maps
-    volumes:
-      - ./maps:/maps
-      - TZ=Europe/Madrid```
-
-- Execute `docker compose up`	  
-- Go to your mobile device -> CoMaps -> settings -> Advanced -> Custom Maps server
-- Edit URL with your URL server and enjoy   
-
-You can find more details in the [FAQ articles](https://www.comaps.app/support/how-can-i-host-a-custom-map-server-for-downloads/) to deploy your own HTTP maps server and find more details [here](https://www.comaps.app/support/how-can-i-set-a-custom-map-server-for-downloads/) about restrictions.

iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm

@@ -31,34 +31,43 @@
 + (void)setTheme:(MWMTheme)theme {
   auto &f = GetFramework();
 
-  auto const style = f.GetMapStyle();
-  auto const isOutdoor = ^BOOL(MapStyle style) {
-    switch (style) {
-      case MapStyleOutdoorsLight:
-      case MapStyleOutdoorsDark:
-        return YES;
-      default:
-        return NO;
-    }
-  }(style);
-  auto const newStyle = ^MapStyle(MWMTheme theme) {
+  auto const mapAppearance = f.CurrentMapAppearance();
+  auto const newMapAppearance = ^MapAppearance(MWMTheme theme) {
     switch (theme) {
       case MWMThemeDay:
-        return isOutdoor ? MapStyleOutdoorsLight : MapStyleDefaultLight;
+        return MapAppearance::LIGHT;
       case MWMThemeVehicleDay:
-        return MapStyleVehicleLight;
+        return MapAppearance::LIGHT;
       case MWMThemeNight:
-        return isOutdoor ? MapStyleOutdoorsDark : MapStyleDefaultDark;
+        return MapAppearance::DARK;
       case MWMThemeVehicleNight:
-        return MapStyleVehicleDark;
+        return MapAppearance::DARK;
       case MWMThemeAuto:
         NSAssert(NO, @"Invalid theme");
-        return MapStyleDefaultLight;
+        return MapAppearance::LIGHT;
     }
   }(theme);
+  if (mapAppearance != newMapAppearance)
+    f.SwitchToMapAppearance(newMapAppearance);
 
-  if (style != newStyle)
-    f.SetMapStyle(newStyle);
+  auto const isUsingVehicleStyle = f.IsUsingVehicleStyle();
+  auto const newIsUsingVehicleStyle = ^bool(MWMTheme theme) {
+    switch (theme) {
+      case MWMThemeDay:
+        return false;
+      case MWMThemeVehicleDay:
+        return true;
+      case MWMThemeNight:
+        return false;
+      case MWMThemeVehicleNight:
+        return true;
+      case MWMThemeAuto:
+        NSAssert(NO, @"Invalid theme");
+        return false;
+    }
+  }(theme);
+  if (isUsingVehicleStyle != newIsUsingVehicleStyle)
+    f.SwitchToUsingVehicleStyle(newIsUsingVehicleStyle);
 }
 
 + (MWMDayTime)daytimeAtLocation:(CLLocation *)location {

iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.h

@@ -24,19 +24,20 @@ typedef NS_ENUM(NSUInteger, MWMMapOverlayIsolinesState) {
   MWMMapOverlayIsolinesStateNoData,
 } NS_SWIFT_NAME(MapOverlayTransitState);
 
-typedef NS_ENUM(NSUInteger, MWMMapOverlayOutdoorState) {
-  MWMMapOverlayOutdoorStateDisabled,
-  MWMMapOverlayOutdoorStateEnabled,
-} NS_SWIFT_NAME(MapOverlayOutdoorState);
+typedef NS_ENUM(NSUInteger, MWMMapMode) {
+  MWMMapModeDefault,
+  MWMMapModeHiking,
+  MWMMapModeCycling,
+  MWMMapModeDriving,
+  MWMMapModePublicTransport,
+} NS_SWIFT_NAME(MapMode);
 
 NS_SWIFT_NAME(MapOverlayManagerObserver)
 @protocol MWMMapOverlayManagerObserver <NSObject>
 
 @optional
 - (void)onTrafficStateUpdated;
-- (void)onTransitStateUpdated;
-- (void)onIsoLinesStateUpdated;
-- (void)onOutdoorStateUpdated;
+- (void)onMapModeUpdated;
 
 @end
 
@@ -47,19 +48,18 @@ NS_SWIFT_NAME(MapOverlayManager)
 + (void)removeObserver:(id<MWMMapOverlayManagerObserver>)observer;
 
 + (MWMMapOverlayTrafficState)trafficState;
-+ (MWMMapOverlayTransitState)transitState;
-+ (MWMMapOverlayIsolinesState)isolinesState;
-+ (MWMMapOverlayOutdoorState)outdoorState;
++ (MWMMapMode)mapMode;
++ (BOOL)defaultMapModeHasIsolines;
++ (BOOL)hikingMapModeHasIsolines;
++ (BOOL)cyclingMapModeHasIsolines;
++ (BOOL)publicTransportMapModeHasSubways;
 
 + (BOOL)trafficEnabled;
-+ (BOOL)transitEnabled;
-+ (BOOL)isoLinesEnabled;
-+ (BOOL)isolinesVisible;
-+ (BOOL)outdoorEnabled;
-
 + (void)setTrafficEnabled:(BOOL)enable;
-+ (void)setTransitEnabled:(BOOL)enable;
-+ (void)setIsoLinesEnabled:(BOOL)enable;
-+ (void)setOutdoorEnabled:(BOOL)enable;
++ (void)setMapMode:(MWMMapMode)mapMode;
++ (void)defaultMapModeSetIsolines:(BOOL)hasIsolines;
++ (void)hikingMapModeSetIsolines:(BOOL)hasIsolines;
++ (void)cyclingMapModeSetIsolines:(BOOL)hasIsolines;
++ (void)publicTransportMapModeSetSubways:(BOOL)hasSubways;
 
 @end

iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm

@@ -3,7 +3,7 @@
 #include "Framework.h"
 
 static NSString *kGuidesWasShown = @"guidesWasShown";
-static NSString *didChangeOutdoorMapStyle = @"didChangeOutdoorMapStyle";
+static NSString *didChangeMapMode = @"didChangeMapMode";
 
 @interface MWMMapOverlayManager ()
 
@@ -35,24 +35,10 @@ static NSString *didChangeOutdoorMapStyle = @"didChangeOutdoorMapStyle";
         }
       }
     });
-    GetFramework().GetTransitManager().SetStateListener([self](TransitReadManager::TransitSchemeState state) {
+    [NSNotificationCenter.defaultCenter addObserverForName:didChangeMapMode object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) {
       for (id<MWMMapOverlayManagerObserver> observer in self.observers) {
-        if ([observer respondsToSelector:@selector(onTransitStateUpdated)]) {
-          [observer onTransitStateUpdated];
-        }
-      }
-    });
-    GetFramework().GetIsolinesManager().SetStateListener([self](IsolinesManager::IsolinesState state) {
-      for (id<MWMMapOverlayManagerObserver> observer in self.observers) {
-        if ([observer respondsToSelector:@selector(onIsoLinesStateUpdated)]) {
-          [observer onIsoLinesStateUpdated];
-        }
-      }
-    });
-    [NSNotificationCenter.defaultCenter addObserverForName:didChangeOutdoorMapStyle object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) {
-      for (id<MWMMapOverlayManagerObserver> observer in self.observers) {
-        if ([observer respondsToSelector:@selector(onOutdoorStateUpdated)]) {
-          [observer onOutdoorStateUpdated];
+        if ([observer respondsToSelector:@selector(onMapModeUpdated)]) {
+          [observer onMapModeUpdated];
         }
       }
     }];
@@ -93,37 +79,18 @@ static NSString *didChangeOutdoorMapStyle = @"didChangeOutdoorMapStyle";
   }
 }
 
-+ (MWMMapOverlayTransitState)transitState {
-  switch (GetFramework().GetTransitManager().GetState()) {
-    case TransitReadManager::TransitSchemeState::Disabled:
-      return MWMMapOverlayTransitStateDisabled;
-    case TransitReadManager::TransitSchemeState::Enabled:
-      return MWMMapOverlayTransitStateEnabled;
-    case TransitReadManager::TransitSchemeState::NoData:
-      return MWMMapOverlayTransitStateNoData;
-  }
-}
-
-+ (MWMMapOverlayIsolinesState)isolinesState {
-  switch (GetFramework().GetIsolinesManager().GetState()) {
-    case IsolinesManager::IsolinesState::Disabled:
-      return MWMMapOverlayIsolinesStateDisabled;
-    case IsolinesManager::IsolinesState::Enabled:
-      return MWMMapOverlayIsolinesStateEnabled;
-    case IsolinesManager::IsolinesState::ExpiredData:
-      return MWMMapOverlayIsolinesStateExpiredData;
-    case IsolinesManager::IsolinesState::NoData:
-      return MWMMapOverlayIsolinesStateNoData;
-  }
-}
-
-+ (MWMMapOverlayOutdoorState)outdoorState {
-  switch (GetFramework().GetMapStyle()) {
-    case MapStyleOutdoorsLight:
-    case MapStyleOutdoorsDark:
-      return MWMMapOverlayOutdoorStateEnabled;
++ (MWMMapMode)mapMode {
+  switch (GetFramework().CurrentMapMode()) {
+    case MapMode::HIKING:
+      return MWMMapMode::MWMMapModeHiking;
+    case MapMode::CYCLING:
+      return MWMMapMode::MWMMapModeCycling;
+    case MapMode::DRIVING:
+      return MWMMapMode::MWMMapModeDriving;
+    case MapMode::PUBLICTRANSPORT:
+      return MWMMapMode::MWMMapModePublicTransport;
     default:
-      return MWMMapOverlayOutdoorStateDisabled;
+      return MWMMapMode::MWMMapModeDefault;
   }
 }
 
@@ -131,80 +98,78 @@ static NSString *didChangeOutdoorMapStyle = @"didChangeOutdoorMapStyle";
   return self.trafficState != MWMMapOverlayTrafficStateDisabled;
 }
 
-+ (BOOL)transitEnabled {
-  return self.transitState != MWMMapOverlayTransitStateDisabled;
-}
-
-+ (BOOL)isoLinesEnabled {
-  return self.isolinesState != MWMMapOverlayIsolinesStateDisabled;
-}
-
-+ (BOOL)isolinesVisible {
-  return GetFramework().GetIsolinesManager().IsVisible();
-}
-
-+ (BOOL)outdoorEnabled {
-  return self.outdoorState != MWMMapOverlayOutdoorStateDisabled;
-}
-
 + (void)setTrafficEnabled:(BOOL)enable {
-  if (enable) {
-    [self setTransitEnabled:false];
-    [self setIsoLinesEnabled:false];
-  }
-
   auto &f = GetFramework();
   f.GetTrafficManager().SetEnabled(enable);
   f.SaveTrafficEnabled(enable);
 }
 
-+ (void)setTransitEnabled:(BOOL)enable {
-  if (enable) {
-    [self setTrafficEnabled:!enable];
-    [self setIsoLinesEnabled:false];
-    [self setOutdoorEnabled:false];
-  }
-
++ (void)setMapMode:(MWMMapMode)mapMode {
   auto &f = GetFramework();
-  f.GetTransitManager().EnableTransitSchemeMode(enable);
-  f.SaveTransitSchemeEnabled(enable);
-}
-
-+ (void)setIsoLinesEnabled:(BOOL)enable {
-  if (enable) {
-    [self setTrafficEnabled:false];
-    [self setTransitEnabled:false];
-  }
-
-  auto &f = GetFramework();
-  f.GetIsolinesManager().SetEnabled(enable);
-  f.SaveIsolinesEnabled(enable);
-}
-
-+ (void)setOutdoorEnabled:(BOOL)enable {
-  if (enable) {
-    [self setTransitEnabled:false];
-    [self setTrafficEnabled:false];
-  }
-
-  auto &f = GetFramework();
-  switch (f.GetMapStyle()) {
-    case MapStyleDefaultLight:
-    case MapStyleVehicleLight:
-    case MapStyleOutdoorsLight:
-      f.SetMapStyle(enable ? MapStyleOutdoorsLight : MapStyleDefaultLight);
+  switch (mapMode) {
+    case MWMMapModeHiking:
+      f.SwitchToMapMode(MapMode::HIKING);
       break;
-    case MapStyleDefaultDark:
-    case MapStyleVehicleDark:
-    case MapStyleOutdoorsDark:
-      f.SetMapStyle(enable ? MapStyleOutdoorsDark : MapStyleDefaultDark);
+    case MWMMapModeCycling:
+      f.SwitchToMapMode(MapMode::CYCLING);
+      break;
+    case MWMMapModeDriving:
+      f.SwitchToMapMode(MapMode::DRIVING);
+      break;
+    case MWMMapModePublicTransport:
+      f.SwitchToMapMode(MapMode::PUBLICTRANSPORT);
       break;
     default:
+      f.SwitchToMapMode(MapMode::DEFAULT);
       break;
   }
 
   // TODO: - Observing for the selected/deselected state of the Outdoor style should be implemented not by NSNotificationCenter but the same way as for IsoLines with 'GetFramework().GetIsolinesManager().SetStateListener'.
-  [NSNotificationCenter.defaultCenter postNotificationName:didChangeOutdoorMapStyle object:nil];
+  [NSNotificationCenter.defaultCenter postNotificationName:didChangeMapMode object:nil];
+}
+
++ (BOOL)defaultMapModeHasIsolines {
+  auto &f = GetFramework();
+  return f.DefaultMapModeHasIsolines();
+}
+
++ (void)defaultMapModeSetIsolines:(BOOL)hasIsolines {
+  auto &f = GetFramework();
+  f.DefaultMapModeSetIsolines(hasIsolines);
+  [NSNotificationCenter.defaultCenter postNotificationName:didChangeMapMode object:nil];
+}
+
++ (BOOL)hikingMapModeHasIsolines {
+  auto &f = GetFramework();
+  return f.HikingMapModeHasIsolines();
+}
+
++ (void)hikingMapModeSetIsolines:(BOOL)hasIsolines {
+  auto &f = GetFramework();
+  f.HikingMapModeSetIsolines(hasIsolines);
+  [NSNotificationCenter.defaultCenter postNotificationName:didChangeMapMode object:nil];
+}
+
++ (BOOL)cyclingMapModeHasIsolines {
+  auto &f = GetFramework();
+  return f.CyclingMapModeHasIsolines();
+}
+
++ (void)cyclingMapModeSetIsolines:(BOOL)hasIsolines {
+  auto &f = GetFramework();
+  f.CyclingMapModeSetIsolines(hasIsolines);
+  [NSNotificationCenter.defaultCenter postNotificationName:didChangeMapMode object:nil];
+}
+
++ (BOOL)publicTransportMapModeHasSubways {
+  auto &f = GetFramework();
+  return f.PublicTransportMapModeHasSubways();
+}
+
++ (void)publicTransportMapModeSetSubways:(BOOL)hasSubways {
+  auto &f = GetFramework();
+  f.PublicTransportMapModeSetSubways(hasSubways);
+  [NSNotificationCenter.defaultCenter postNotificationName:didChangeMapMode object:nil];
 }
 
 @end

iphone/Maps/Bridging/BridgeControllers.swift

@@ -18,7 +18,45 @@ import UIKit
     }
 }
 
+final class BridgeCell<Content: View>: UITableViewCell {
+    private let hostingController = UIHostingController<Content?>(rootView: nil)
 
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        hostingController.view.backgroundColor = .clear
+    }
+
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("Has not been implemented")
+    }
+
+    func layout() {
+        self.hostingController.view.invalidateIntrinsicContentSize()
+    }
+    
+    func set(content: Content, parentController: UIViewController) {
+        self.hostingController.rootView = content
+        self.hostingController.view.invalidateIntrinsicContentSize()
+
+        let requiresControllerMove = hostingController.parent != parentController
+        if requiresControllerMove {
+            parentController.addChild(hostingController)
+        }
+
+        if !self.contentView.subviews.contains(hostingController.view) {
+            self.contentView.addSubview(hostingController.view)
+            hostingController.view.translatesAutoresizingMaskIntoConstraints = false
+            hostingController.view.leadingAnchor.constraint(equalTo: self.contentView.leadingAnchor).isActive = true
+            hostingController.view.trailingAnchor.constraint(equalTo: self.contentView.trailingAnchor).isActive = true
+            hostingController.view.topAnchor.constraint(equalTo: self.contentView.topAnchor).isActive = true
+            hostingController.view.bottomAnchor.constraint(equalTo: self.contentView.bottomAnchor).isActive = true
+        }
+
+        if requiresControllerMove {
+            hostingController.didMove(toParent: parentController)
+        }
+    }
+}
 
 /// Class for using the SwiftUI `AboutView` in the interface builder
 class AboutBridgeController: UIHostingController<AboutView> {

iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm

@@ -132,25 +132,6 @@ NSArray<UIImage *> *imagesWithName(NSString *name) {
   }
 }
 
-- (void)handleIsolinesState:(MWMMapOverlayIsolinesState)state {
-  switch (state) {
-    case MWMMapOverlayIsolinesStateDisabled:
-      break;
-    case MWMMapOverlayIsolinesStateEnabled:
-      if (![MWMMapOverlayManager isolinesVisible])
-        [Toast showWithText:L(@"isolines_toast_zooms_1_10")];
-      break;
-    case MWMMapOverlayIsolinesStateExpiredData:
-      [MWMAlertViewController.activeAlertController presentInfoAlert:L(@"isolines_activation_error_dialog")];
-      [MWMMapOverlayManager setIsoLinesEnabled:NO];
-      break;
-    case MWMMapOverlayIsolinesStateNoData:
-      [MWMAlertViewController.activeAlertController presentInfoAlert:L(@"isolines_location_error_dialog")];
-      [MWMMapOverlayManager setIsoLinesEnabled:NO];
-      break;
-  }
-}
-
 - (void)applyTheme {
   MWMButton *btn = static_cast<MWMButton *>(self.view);
   UIImageView *iv = btn.imageView;
@@ -159,15 +140,6 @@ NSArray<UIImage *> *imagesWithName(NSString *name) {
   [iv stopAnimating];
   if ([MWMMapOverlayManager trafficEnabled]) {
     [self handleTrafficState:[MWMMapOverlayManager trafficState]];
-  } else if ([MWMMapOverlayManager transitEnabled]) {
-    btn.imageName = @"btn_subway_on";
-    if ([MWMMapOverlayManager transitState] == MWMMapOverlayTransitStateNoData)
-      [Toast showWithText:L(@"subway_data_unavailable")];
-  } else if ([MWMMapOverlayManager isoLinesEnabled]) {
-    btn.imageName = @"btn_isoMap_on";
-    [self handleIsolinesState:[MWMMapOverlayManager isolinesState]];
-  } else if ([MWMMapOverlayManager outdoorEnabled]) {
-    btn.imageName = @"btn_isoMap_on";
   } else {
     btn.imageName = @"btn_layers";
   }
@@ -175,16 +147,10 @@ NSArray<UIImage *> *imagesWithName(NSString *name) {
 
 - (IBAction)buttonTouchUpInside {
   BOOL needsToDisableMapLayer =
-  [MWMMapOverlayManager trafficEnabled] ||
-  [MWMMapOverlayManager transitEnabled] ||
-  [MWMMapOverlayManager isoLinesEnabled] ||
-  [MWMMapOverlayManager outdoorEnabled];
+  [MWMMapOverlayManager trafficEnabled];
 
   if (needsToDisableMapLayer) {
     [MWMMapOverlayManager setTrafficEnabled:NO];
-    [MWMMapOverlayManager setTransitEnabled:NO];
-    [MWMMapOverlayManager setIsoLinesEnabled:NO];
-    [MWMMapOverlayManager setOutdoorEnabled:NO];
   } else {
     MWMMapViewControlsManager.manager.menuState = MWMBottomMenuStateLayers;
   }
@@ -203,13 +169,7 @@ NSArray<UIImage *> *imagesWithName(NSString *name) {
 - (void)onTrafficStateUpdated {
   [self applyTheme];
 }
-- (void)onTransitStateUpdated {
-  [self applyTheme];
-}
-- (void)onIsoLinesStateUpdated {
-  [self applyTheme];
-}
-- (void)onOutdoorStateUpdated {
+- (void)onMapModeUpdated {
   [self applyTheme];
 }
 

iphone/Maps/Images.xcassets/Interface/Mode Colors/Contents.json

@@ -0,0 +1,9 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "provides-namespace" : true
+  }
+}

iphone/Maps/Images.xcassets/Interface/Mode Colors/Cycling.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "0.541",
+          "red" : "0.545"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iphone/Maps/Images.xcassets/Interface/Mode Colors/Default.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.506",
+          "green" : "0.498",
+          "red" : "0.471"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iphone/Maps/Images.xcassets/Interface/Mode Colors/Driving.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.094",
+          "green" : "0.592",
+          "red" : "0.949"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iphone/Maps/Images.xcassets/Interface/Mode Colors/Hiking.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.435",
+          "green" : "0.788",
+          "red" : "0.725"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iphone/Maps/Images.xcassets/Interface/Mode Colors/Public Transport.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.600",
+          "green" : "0.392",
+          "red" : "0.184"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iphone/Maps/Images.xcassets/Interface/Symbols/cycling.symbolset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "symbols" : [
+    {
+      "filename" : "cycling.svg",
+      "idiom" : "universal"
+    }
+  ]
+}