From 857875f323bb34d9128e8a0e4c49914233499aa3 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Thu, 16 Feb 2023 14:06:26 +0000 Subject: [PATCH] Regenerate for waterways --- data/drules_proto_clear.prios.txt | 9 +++------ data/drules_proto_clear.txt | 14 +++++++------- data/drules_proto_vehicle_clear.prios.txt | 6 +++--- data/drules_proto_vehicle_clear.txt | 22 +++++++++++----------- 4 files changed, 24 insertions(+), 27 deletions(-) diff --git a/data/drules_proto_clear.prios.txt b/data/drules_proto_clear.prios.txt index 7742dad272..3be8553210 100644 --- a/data/drules_proto_clear.prios.txt +++ b/data/drules_proto_clear.prios.txt @@ -1743,9 +1743,6 @@ OVRL/z19 text entrance z[19] GEOM area man_made-breakwater z[17-19] GEOM area man_made-pier z[17-19] GEOM line1 waterway-dam z[14-19] -GEOM line1 waterway-ditch z[17-19] -GEOM line1 waterway-drain z[17-19] -GEOM line1 waterway-weir z[14] GEOM line2 aerialway-cable_car z[12-19] GEOM line2 aerialway-chair_lift z[12-19] GEOM line2 aerialway-drag_lift z[15-19] @@ -1785,7 +1782,7 @@ GEOM line3 highway-steps-tunnel z[17-19] GEOM line1 hwtag-oneway z[15-19] GEOM line1 man_made-breakwater z[14-19] GEOM line1 man_made-pier z[14-19] -GEOM line1 waterway-weir z[15-19] +GEOM line1 waterway-weir z[14-19] GEOM line1 barrier-city_wall z[14-19] GEOM line1 barrier-fence z[16-19] GEOM line1 barrier-hedge z[16-19] @@ -2059,6 +2056,8 @@ GEOM line1 route-ferry z[10-19] GEOM line1 aeroway-runway z[12-19] GEOM line1 aeroway-taxiway z[14-19] GEOM line1 barrier-ditch z[17-19] +GEOM line1 waterway-ditch z[17-19] +GEOM line1 waterway-drain z[17-19] GEOM line2 highway-footway-tunnel z[17-19] GEOM line2 highway-path-tunnel z[17-19] GEOM line2 highway-steps-tunnel z[17-19] @@ -2543,5 +2542,3 @@ tourism-information-office icon z[16-17] 16590 tourism-information-office icon z[18-19] 16600 tourism-information-office text z[16-17] 15590 tourism-information-office text z[18-19] 15600 -waterway-weir line1 z[15-19] 1476 -waterway-weir line1 z[14] 1971 diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index ad02503ecb..ad9b3c69e3 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -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 } } diff --git a/data/drules_proto_vehicle_clear.prios.txt b/data/drules_proto_vehicle_clear.prios.txt index a0f3b2c172..1b2519caf5 100644 --- a/data/drules_proto_vehicle_clear.prios.txt +++ b/data/drules_proto_vehicle_clear.prios.txt @@ -896,11 +896,8 @@ OVRL/z18 text amenity-car_rental z[18-19] OVRL/z18 text amenity-car_sharing z[18-19] OVRL/z18 text building-address z[18-19] GEOM line1 waterway-dam z[15-19] -GEOM line1 waterway-ditch z[17-19] -GEOM line1 waterway-drain z[17-19] GEOM line1 waterway-river z[10-19] GEOM line1 waterway-riverbank z[10-19] -GEOM line1 waterway-weir z[15-19] GEOM line1 historic-citywalls z[15-19] GEOM line1 highway-steps z[18-19] GEOM line1 highway-steps-bridge z[18-19] @@ -1162,11 +1159,14 @@ GEOM line1 boundary-administrative-2 z[2-19] GEOM line1 boundary-administrative-3 z[4] GEOM line1 boundary-administrative-4 z[5-19] GEOM line1 man_made-cutline z[15-19] +GEOM line1 waterway-weir z[15-19] GEOM area building z[15-19] GEOM area building-garage z[15-19] GEOM area building-has_parts z[15-19] GEOM area building-train_station z[15-19] GEOM line1 barrier-ditch z[17-19] +GEOM line1 waterway-ditch z[17-19] +GEOM line1 waterway-drain z[17-19] GEOM line1 railway-light_rail-bridge z[14-15] GEOM line2 railway-light_rail-bridge z[16-19] GEOM line1 railway-yard-bridge z[14-15] diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 9f68217289..14f44034ed 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -70806,7 +70806,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1963 + priority: 1180 } } element { @@ -70818,7 +70818,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1963 + priority: 1180 } } element { @@ -70830,7 +70830,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1963 + priority: 1180 } } } @@ -70987,7 +70987,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1963 + priority: 1180 } } element { @@ -70999,7 +70999,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1963 + priority: 1180 } } element { @@ -71011,7 +71011,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1963 + priority: 1180 } } } @@ -71565,7 +71565,7 @@ cont { lines { width: 2.0 color: 2160576191 - priority: 1963 + priority: 1204 cap: BUTTCAP } } @@ -71574,7 +71574,7 @@ cont { lines { width: 3.0 color: 2160576191 - priority: 1963 + priority: 1204 } } element { @@ -71582,7 +71582,7 @@ cont { lines { width: 4.5 color: 2160576191 - priority: 1963 + priority: 1204 } } element { @@ -71590,7 +71590,7 @@ cont { lines { width: 6.0 color: 2160576191 - priority: 1963 + priority: 1204 } } element { @@ -71598,7 +71598,7 @@ cont { lines { width: 8.0 color: 2160576191 - priority: 1963 + priority: 1204 } } }