WIP: Modes

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

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/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/include/icons.mapcss

@@ -22,7 +22,6 @@
  6.1 Craft
 7.CAR
  7.1 Parking
-8. COLORED LABELS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
@@ -2374,16 +2373,16 @@ area|z14-[highway=services],
 area|z15-[highway=rest_area],
 {text-position: center;}
 
-node|z14-[amenity=fuel],
-node|z15-[amenity=charging_station][motorcar?][!capacity],
-node|z15-[amenity=charging_station][motorcar?][capacity=1],
-node|z15-[amenity=charging_station][motorcar?][capacity=2],
-node|z14-[amenity=charging_station][motorcar?][capacity?],
+node|z15-[amenity=fuel],
+node|z17-[amenity=charging_station][motorcar?][!capacity],
+node|z17-[amenity=charging_station][motorcar?][capacity=1],
+node|z17-[amenity=charging_station][motorcar?][capacity=2],
+node|z16-[amenity=charging_station][motorcar?][capacity?],
 area|z14-[highway=services],
 area|z15-[highway=rest_area],
 area|z15-[landuse=garages],
 node|z15-[amenity=sanitary_dump_station],
-node|z16-[amenity=charging_station],
+node|z18-[amenity=charging_station],
 node|z17-[amenity=bicycle_parking],
 node|z17-[amenity=motorcycle_parking],
 node|z17-[amenity=car_wash],
@@ -2396,46 +2395,30 @@ node|z18-[amenity=car_sharing],
 area|z18-[landuse=garages],
 {font-size: 11;}
 
-node|z14[amenity=fuel],
-{icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;}
-node|z15[amenity=fuel],
-{icon-image: fuel-m.svg; icon-min-distance: 20;}
-node|z16[amenity=fuel],
-{icon-image: fuel-m.svg; icon-min-distance: 10;}
-node|z17-[amenity=fuel],
-{icon-image: fuel-m.svg;}
-node|z18-[amenity=fuel],
-{font-size: 11;}
+node|z15-[amenity=fuel],
+{icon-image: fuel-m.svg; text-offset: 1;}
 
-node|z15-[amenity=charging_station][motorcar?],
-node|z16-[amenity=charging_station][motorcycle?],
-node|z16-[amenity=charging_station][bicycle?],
-node|z16-[amenity=charging_station][motorcar=not],
-node|z16-[amenity=charging_station],
+node|z17-[amenity=charging_station][motorcar?],
+node|z18-[amenity=charging_station][motorcycle?],
+node|z18-[amenity=charging_station][bicycle?],
+node|z18-[amenity=charging_station][motorcar=not],
+node|z18-[amenity=charging_station],
 {icon-image: charging_station-small-m.svg;}
 
-node|z14[amenity=charging_station][motorcar?][capacity?],
-{icon-image: charging_station-s.svg;}
-node|z15-[amenity=charging_station][motorcar?][capacity?],
+node|z16-[amenity=charging_station][motorcar?][capacity?],
 {icon-image: charging_station-m.svg;}
 
-node|z14[amenity=charging_station][motorcar?][!capacity],
-node|z14[amenity=charging_station][motorcar?][capacity=1],
-node|z14[amenity=charging_station][motorcar?][capacity=2],
+node|z16[amenity=charging_station][motorcar?][!capacity],
+node|z16[amenity=charging_station][motorcar?][capacity=1],
+node|z16[amenity=charging_station][motorcar?][capacity=2],
 {icon-image: none;}
-node|z15-[amenity=charging_station][motorcar?][!capacity],
-node|z15-[amenity=charging_station][motorcar?][capacity=1],
-node|z15-[amenity=charging_station][motorcar?][capacity=2],
+node|z17-[amenity=charging_station][motorcar?][!capacity],
+node|z17-[amenity=charging_station][motorcar?][capacity=1],
+node|z17-[amenity=charging_station][motorcar?][capacity=2],
 {icon-image: charging_station-small-m.svg;}
 
-node|z14[amenity=charging_station][motorcar?],
-{text-offset: 1;font-size: 10;icon-min-distance: 20;}
-node|z15[amenity=charging_station][motorcar?],
-{icon-min-distance: 20;}
-node|z16[amenity=charging_station],
-{icon-min-distance: 10;}
-node|z18-[amenity=charging_station],
-{font-size: 11;}
+node|z16[amenity=charging_station][motorcar?],
+{text-offset: 1;font-size: 10;}
 
 area|z14[highway=services],
 {icon-image: car-repair-s.svg; icon-min-distance: 20;}
@@ -2536,8 +2519,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/priorities_1_BG-by-size.prio.txt

@@ -85,15 +85,15 @@ landuse-cemetery-christian                          # area z10- (also has icon z
 === 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-charging_station                            # area z16- (also has icon z18-, caption(optional) z18-)
+amenity-charging_station-bicycle                    # area z16- (also has icon z18-, caption(optional) z18-)
+amenity-charging_station-carless                    # area z16- (also has icon z18-, caption(optional) z18-)
+amenity-charging_station-motorcar                   # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-motorcycle                 # area z16- (also has icon z18-, caption(optional) z18-)
+amenity-charging_station-small                      # area z15- (also has icon z17-, caption(optional) z18-)
 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-fuel                                        # area z15- (also has icon z15-, caption(optional) z15-)
 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-)

data/styles/default/include/priorities_4_overlays.prio.txt

@@ -374,11 +374,11 @@ tourism-attraction                                  # icon z14- (also has captio
 tourism-gallery                                     # icon z15- (also has caption(optional) z15-)
 === 4300
 
-amenity-charging_station-small                      # icon z15- (also has caption(optional) z16-, area z15-)
+amenity-charging_station-small                      # icon z17- (also has caption(optional) z18-, area z15-)
 === 4280
 
-amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-, area z15-)
-amenity-fuel                                        # icon z14- (also has caption(optional) z14-, area z15-)
+amenity-charging_station-motorcar                   # icon z16- (also has caption(optional) z16-, area z15-)
+amenity-fuel                                        # icon z15- (also has caption(optional) z15-, area z15-)
 === 4270
 
 highway-services                                    # icon z14- (also has caption(optional) z14-, area z13-)
@@ -429,16 +429,16 @@ tourism-chalet                                      # icon z16- (also has captio
 shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
 === 3800
 
-amenity-charging_station-motorcycle                 # icon z16- (also has caption(optional) z16-, area z16-)
+amenity-charging_station-motorcycle                 # icon z18- (also has caption(optional) z18-, area z16-)
 === 3752
 
-amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-, area z16-)
+amenity-charging_station-bicycle                    # icon z18- (also has caption(optional) z18-, area z16-)
 === 3751
 
-amenity-charging_station                            # icon z16- (also has caption(optional) z16-, area z16-)
+amenity-charging_station                            # icon z18- (also has caption(optional) z18-, area z16-)
 === 3750
 
-amenity-charging_station-carless                    # icon z16- (also has caption(optional) z16-, area z16-)
+amenity-charging_station-carless                    # icon z18- (also has caption(optional) z18-, area z16-)
 === 3749
 
 railway-subway_entrance                             # icon z16- (also has caption(optional) z17-)
@@ -1650,11 +1650,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-gallery                                   # caption(optional) z15- (also has icon z15-)
 # === -5700
 
-# amenity-charging_station-small                    # caption(optional) z16- (also has icon z15-, area z15-)
+# amenity-charging_station-small                    # caption(optional) z18- (also has icon z17-, area z15-)
 # === -5720
 
-# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-, area z15-)
-# amenity-fuel                                      # caption(optional) z14- (also has icon z14-, area z15-)
+# amenity-charging_station-motorcar                 # caption(optional) z16- (also has icon z16-, area z15-)
+# amenity-fuel                                      # caption(optional) z15- (also has icon z15-, area z15-)
 # === -5730
 
 # highway-services                                  # caption(optional) z14- (also has icon z14-, area z13-)
@@ -1705,16 +1705,16 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
 # === -6200
 
-# amenity-charging_station-motorcycle               # caption(optional) z16- (also has icon z16-, area z16-)
+# amenity-charging_station-motorcycle               # caption(optional) z18- (also has icon z18-, area z16-)
 # === -6248
 
-# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-, area z16-)
+# amenity-charging_station-bicycle                  # caption(optional) z18- (also has icon z18-, area z16-)
 # === -6249
 
-# amenity-charging_station                          # caption(optional) z16- (also has icon z16-, area z16-)
+# amenity-charging_station                          # caption(optional) z18- (also has icon z18-, area z16-)
 # === -6250
 
-# amenity-charging_station-carless                  # caption(optional) z16- (also has icon z16-, area z16-)
+# amenity-charging_station-carless                  # caption(optional) z18- (also has icon z18-, area z16-)
 # === -6251
 
 # railway-subway_entrance                           # caption(optional) z17- (also has icon z16-)