Regenerate for waterways

[styles] Fix waterway-ditch/drain/weir priorities
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-02-16 14:53:29 +00:00 · 2023-02-16 14:53:29 +00:00 · 2023-02-16 14:53:29 +00:00 · 2023-02-16 14:53:29 +00:00 · 2023-02-16 14:53:26 +00:00 · 2023-02-16 14:50:11 +00:00
12 changed files with 10035 additions and 6100 deletions
--- a/data/drules_proto_clear.bin
+++ b/data/drules_proto_clear.bin
--- a/data/drules_proto_clear.prios.txt
+++ b/data/drules_proto_clear.prios.txt
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@ -4250,7 +4250,7 @@ cont {
        offset_y: 1
        is_optional: true
      }
-      priority: 15500
+      priority: 15647
    }
  }
  element {
@ -4318,7 +4318,7 @@ cont {
        offset_y: 1
        is_optional: true
      }
-      priority: 15500
+      priority: 15647
    }
  }
  element {
@ -4335,7 +4335,7 @@ cont {
        offset_y: 1
        is_optional: true
      }
-      priority: 15500
+      priority: 15647
    }
  }
  element {
@ -4352,7 +4352,7 @@ cont {
        offset_y: 1
        is_optional: true
      }
-      priority: 15500
+      priority: 15647
    }
  }
  element {
@ -5468,7 +5468,7 @@ cont {
        offset_y: 1
        is_optional: true
      }
-      priority: 15500
+      priority: 15647
    }
  }
  element {
@ -5485,7 +5485,7 @@ cont {
        offset_y: 1
        is_optional: true
      }
-      priority: 15500
+      priority: 15647
    }
  }
  element {
@ -5502,7 +5502,7 @@ cont {
        offset_y: 1
        is_optional: true
      }
-      priority: 15500
+      priority: 15647
    }
  }
  element {
@ -12696,14 +12696,14 @@ cont {
    scale: 14
    area {
      color: 2160707771
-      priority: 1962
+      priority: 1267
    }
  }
  element {
    scale: 15
    area {
      color: 1724500155
-      priority: 1962
+      priority: 1267
    }
  }
  element {
@ -100886,7 +100886,7 @@ cont {
        dd: 1.0
        dd: 1.0
      }
-      priority: 1971
+      priority: 1142
    }
  }
  element {
@ -100898,7 +100898,7 @@ cont {
        dd: 1.0
        dd: 1.0
      }
-      priority: 1971
+      priority: 1142
    }
  }
  element {
@ -100910,7 +100910,7 @@ cont {
        dd: 1.0
        dd: 1.0
      }
-      priority: 1971
+      priority: 1142
    }
  }
 }
@ -101067,7 +101067,7 @@ cont {
        dd: 1.0
        dd: 1.0
      }
-      priority: 1971
+      priority: 1142
    }
  }
  element {
@ -101079,7 +101079,7 @@ cont {
        dd: 1.0
        dd: 1.0
      }
-      priority: 1971
+      priority: 1142
    }
  }
  element {
@ -101091,7 +101091,7 @@ cont {
        dd: 1.0
        dd: 1.0
      }
-      priority: 1971
+      priority: 1142
    }
  }
 }
@ -102061,7 +102061,7 @@ cont {
    lines {
      width: 1.5
      color: 1304608947
-      priority: 1971
+      priority: 1476
      cap: BUTTCAP
    }
  }
--- a/data/drules_proto_vehicle_clear.bin
+++ b/data/drules_proto_vehicle_clear.bin
--- a/data/drules_proto_vehicle_clear.prios.txt
+++ b/data/drules_proto_vehicle_clear.prios.txt
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@ -149,7 +149,6 @@ area[amenity=fountain],

 area[waterway=dam],
 line[waterway=dam],
-line[waterway=weir],
 node[waterway=lock_gate],
 {z-index: 110;}

--- a/data/styles/clear/include/Basemap_label.mapcss
+++ b/data/styles/clear/include/Basemap_label.mapcss
@ -104,7 +104,8 @@ line[waterway=riverbank],
 line[waterway=stream],
 line[waterway=canal],
 line[natural=strait],
-line[waterway],
+line[waterway=dock],
+line[waterway=dam],
 {z-index: 10000;}

 /* 2.CONTINENTS */
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@ -534,9 +534,6 @@ node[railway=subway_entrance][city=moscow],
 node[railway=station][transport=subway]
 {z-index: 2990;}

-area[building=train_station],
-{z-index: 3000;}
-
 /* 2. NATURAL */

 node|z10-[natural=volcano],
@ -2793,13 +2790,13 @@ area|z18-[amenity=car_sharing]

 node|z14[amenity=fuel],
 area|z14[amenity=fuel]
-{icon-image: fuel-s.svg;text-offset: 1;-x-me-text-priority:15500;icon-min-distance: 20;}
+{icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;}
 node|z15[amenity=fuel],
 area|z15[amenity=fuel]
-{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;}
+{icon-image: fuel-m.svg; icon-min-distance: 20;}
 node|z16[amenity=fuel],
 area|z16[amenity=fuel]
-{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 10;}
+{icon-image: fuel-m.svg; icon-min-distance: 10;}
 node|z17-[amenity=fuel],
 area|z17-[amenity=fuel]
 {icon-image: fuel-m.svg;}
@ -2809,13 +2806,13 @@ area|z18-[amenity=fuel]

 node|z14[amenity=charging_station][motorcar?],
 area|z14[amenity=charging_station][motorcar?],
-{icon-image: charging-station-s.svg;text-offset: 1;font-size: 10;-x-me-text-priority:15500;icon-min-distance: 20;}
+{icon-image: charging-station-s.svg;text-offset: 1;font-size: 10;icon-min-distance: 20;}
 node|z15[amenity=charging_station][motorcar?],
 area|z15[amenity=charging_station][motorcar?],
-{icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;}
+{icon-image: charging-station-m.svg;icon-min-distance: 20;}
 node|z16[amenity=charging_station],
 area|z16[amenity=charging_station]
-{icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 10;}
+{icon-image: charging-station-m.svg;icon-min-distance: 10;}
 node|z17-[amenity=charging_station],
 area|z17-[amenity=charging_station]
 {icon-image: charging-station-m.svg;}
@ -2844,20 +2841,19 @@ area|z15-[amenity=sanitary_dump_station]
 node|z16[amenity=parking],
 area|z16[amenity=parking]
 {icon-image: parking-s.svg;icon-min-distance: 25;}
-node|z16[amenity=parking][access=permissive],
-node|z16[amenity=parking][access=private]
-{icon-image: zero-icon.svg;}

-node|z17[amenity=parking],
-area|z17[amenity=parking]
+node|z17-[amenity=parking],
+area|z17-[amenity=parking]
 {icon-image: parking-m.svg;}
-node|z17[amenity=parking][access=permissive],
-node|z17[amenity=parking][access=private]
-{icon-image: zero-icon.svg;}

 node|z18-[amenity=parking],
 area|z18-[amenity=parking]
-{icon-image: parking-m.svg;font-size: 11;text-optional: true;}
+{font-size: 11;}
+
+node|z16-17[amenity=parking][access=permissive],
+node|z16-17[amenity=parking][access=private],
+{icon-image: zero-icon.svg;}
+

 node|z17[amenity=parking_entrance],
 area|z17[amenity=parking_entrance]
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@ -164,7 +164,6 @@ line[barrier=fence],
 line[barrier=hedge],
 line[barrier=city_wall],
 line[historic=citywalls],
-area[amenity=parking],
 area[amenity=parking_space],
 {z-index: 950;}

--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@ -55,8 +55,6 @@ line[man_made=breakwater],
 node[man_made=pier],
 node[man_made=breakwater],
 line[waterway=dam],
-line[waterway=weir],
-node[waterway=weir],
 area[landuse=military],
 node[landuse=military]
 {z-index: 1000;}
@ -96,7 +94,8 @@ line[waterway=river],
 line[waterway=riverbank],
 line[waterway=canal],
 line[natural=strait],
-line[waterway],
+line[waterway=dock],
+line[waterway=dam],
 {z-index: 4500;}

 /* 2.CONTINENTS */
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@ -165,9 +165,8 @@ node[amenity=charging_station],
 area[amenity=charging_station]
 {z-index: 3590;}

-area[building=train_station],
 node[highway=speed_camera],
-{z-index: 8000;}
+{z-index: 75000;}

 /* 2. NATURAL */

@ -934,19 +933,19 @@ area|z18-[amenity=car_sharing]

 node|z12[amenity=fuel],
 area|z12[amenity=fuel]
-{icon-image: fuel-s.svg;text-offset: 1;-x-me-text-priority:15500;icon-min-distance: 20;}
+{icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;}
 node|z13[amenity=fuel],
 area|z13[amenity=fuel]
-{icon-image: fuel-m.svg;text-offset: 1;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 11.75;}
+{icon-image: fuel-m.svg; text-offset: 1; icon-min-distance: 20; font-size: 11.75;}
 node|z14[amenity=fuel],
 area|z14[amenity=fuel]
-{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 12.25;}
+{icon-image: fuel-m.svg; icon-min-distance: 20; font-size: 12.25;}
 node|z15[amenity=fuel],
 area|z15[amenity=fuel]
-{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 12.5;}
+{icon-image: fuel-m.svg; icon-min-distance: 20; font-size: 12.5;}
 node|z16[amenity=fuel],
 area|z16[amenity=fuel]
-{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 10;font-size: 12.75;}
+{icon-image: fuel-m.svg; icon-min-distance: 10; font-size: 12.75;}
 node|z17[amenity=fuel],
 area|z17[amenity=fuel]
 {icon-image: fuel-m.svg;font-size: 13.75;}
@ -956,13 +955,13 @@ area|z18-[amenity=fuel]

 node|z14[amenity=charging_station][motorcar?],
 area|z14[amenity=charging_station][motorcar?],
-{icon-image: charging-station-m.svg;text-offset: 1;font-size: 12.25;-x-me-text-priority:15500;icon-min-distance: 20;}
+{icon-image: charging-station-m.svg;text-offset: 1;font-size: 12.25;icon-min-distance: 20;}
 node|z15[amenity=charging_station][motorcar?],
 area|z15[amenity=charging_station][motorcar?],
-{icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 12.5;}
+{icon-image: charging-station-m.svg;icon-min-distance: 20;font-size: 12.5;}
 node|z16[amenity=charging_station],
 area|z16[amenity=charging_station]
-{icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 10;font-size: 12.75;}
+{icon-image: charging-station-m.svg;icon-min-distance: 10;font-size: 12.75;}
 node|z17[amenity=charging_station],
 area|z17[amenity=charging_station]
 {icon-image: charging-station-m.svg; font-size: 13.75;}
@ -971,9 +970,9 @@ area|z18-[amenity=charging_station]
 {icon-image: charging-station-m.svg;font-size: 14.75;}

 node|z13[highway=speed_camera]
-{icon-image: speedcam-s.svg; z-index: 75000;}
+{icon-image: speedcam-s.svg;}
 node|z14-[highway=speed_camera]
-{icon-image: speedcam-m.svg; z-index: 75000;}
+{icon-image: speedcam-m.svg;}

 node|z17[amenity=car_wash],
 area|z17[amenity=car_wash]
@ -1006,30 +1005,25 @@ area|z16-[amenity=water_point],

 /* 7.1 Parking */

-node|z15-16[amenity=parking],
-area|z15-16[amenity=parking]
-{icon-image: parking-m.svg;icon-min-distance: 3;z-index: 20000;}
-node|z15-16[amenity=parking][access=permissive],
-node|z15-16[amenity=parking][access=private]
-{icon-image: zero-icon.svg; icon-min-distance: 3;z-index: 20000;}
+node|z15-[amenity=parking],
+area|z15-[amenity=parking]
+{icon-image: parking-m.svg; icon-min-distance: 3;}

 node|z17[amenity=parking],
 area|z17[amenity=parking]
-{icon-image: parking-m.svg;icon-min-distance: 15;}
-node|z17[amenity=parking][access=permissive],
-node|z17[amenity=parking][access=private]
-{icon-image: zero-icon.svg;z-index: 6;icon-min-distance: 7;}
+{icon-min-distance: 15;}

 node|z18[amenity=parking],
 area|z18[amenity=parking]
-{icon-image: parking-m.svg;icon-min-distance: 10;}
-node|z18[amenity=parking][access=permissive],
-node|z18[amenity=parking][access=private]
-{icon-image: zero-icon.svg;}
+{icon-min-distance: 10;}

 node|z19-[amenity=parking],
 area|z19-[amenity=parking]
-{icon-image: parking-m.svg;icon-min-distance: 6;}
+{icon-min-distance: 6;}
+
+node|z15-18[amenity=parking][access=permissive],
+node|z15-18[amenity=parking][access=private],
+{icon-image: zero-icon.svg;}

 /*node|z17-[amenity=bicycle_parking],
 area|z17-[amenity=bicycle_parking]
Author	SHA1	Message	Date
Konstantin Pastbin	857875f323	Regenerate for waterways	2023-02-16 14:53:29 +00:00
Konstantin Pastbin	d713d83f01	[styles] Fix waterway-ditch/drain/weir priorities Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2023-02-16 14:53:29 +00:00
Konstantin Pastbin	226038ae37	Regenerate for building-train_station	2023-02-16 14:53:29 +00:00
Konstantin Pastbin	200e4a831d	[styles] Fix building-train_station area priorities Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2023-02-16 14:53:29 +00:00
Konstantin Pastbin	8619e10fbb	Regenerate for fuel and charging stations	2023-02-16 14:53:26 +00:00
Konstantin Pastbin	7a2aefe022	[styles] Fix fuel and charging stations priorities Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2023-02-16 14:50:11 +00:00
Konstantin Pastbin	2db7b99e62	Regenerate for parkings	2023-02-16 14:50:11 +00:00
Konstantin Pastbin	78df77666d	[styles] Fix parkings priorities in vehicle style Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2023-02-16 14:50:11 +00:00
Konstantin Pastbin	3422a153df	Temporary add priority files	2023-02-16 14:50:10 +00:00