From 969294cd9188b13d960e0c75df745bca0b4e81af Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Fri, 17 Feb 2023 19:35:42 +0000 Subject: [PATCH] Regenerate for world level highways --- data/drules_proto_clear.prios.txt | 10 ++-------- data/drules_proto_clear.txt | 8 ++++---- data/drules_proto_vehicle_clear.prios.txt | 10 ++-------- data/drules_proto_vehicle_clear.txt | 8 ++++---- 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/data/drules_proto_clear.prios.txt b/data/drules_proto_clear.prios.txt index 7df0af659b..c07d255474 100644 --- a/data/drules_proto_clear.prios.txt +++ b/data/drules_proto_clear.prios.txt @@ -1695,8 +1695,8 @@ GEOM line1 highway-trunk-bridge z[7-12] GEOM line3 highway-trunk-bridge z[13-19] GEOM line1 highway-trunk-tunnel z[7-11] GEOM line2 highway-trunk-tunnel z[12-19] -GEOM line1 highway-world_level z[4-7] -GEOM line1 highway-world_towns_level z[6-7] +GEOM line1 highway-world_level z[4-9] +GEOM line1 highway-world_towns_level z[6-9] GEOM line1 highway-motorway-tunnel z[12-19] GEOM line1 highway-trunk-tunnel z[12-19] GEOM line1 highway-motorway_link z[10-19] @@ -1716,8 +1716,6 @@ GEOM line1 highway-primary-bridge z[8-13] GEOM line3 highway-primary-bridge z[14-19] GEOM line1 highway-primary-tunnel z[8-13] GEOM line2 highway-primary-tunnel z[14-19] -GEOM line1 highway-world_level z[8-9] -GEOM line1 highway-world_towns_level z[8-9] GEOM line1 highway-primary-tunnel z[14-19] GEOM line1 highway-primary_link z[11-19] GEOM line1 highway-primary_link-bridge z[11-13] @@ -2189,10 +2187,6 @@ highway-unclassified-bridge line1 z[14-19] 1277 highway-unclassified-bridge line1 z[11-13] 1365 highway-unclassified-tunnel line1 z[16-19] 1364 highway-unclassified-tunnel line1 z[11-15] 1365 -highway-world_level line1 z[8-9] 1432 -highway-world_level line1 z[4-7] 1451 -highway-world_towns_level line1 z[8-9] 1432 -highway-world_towns_level line1 z[6-7] 1451 railway-light_rail-bridge line1 z[16-19] 1047 railway-light_rail-bridge line1 z[14-15] 1056 railway-light_rail-bridge line1 z[13] 1346 diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index f075856259..fb114e823e 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -31180,7 +31180,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1432 + priority: 1451 join: BEVELJOIN cap: BUTTCAP } @@ -31190,7 +31190,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1432 + priority: 1451 join: BEVELJOIN cap: BUTTCAP } @@ -31223,7 +31223,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1432 + priority: 1451 join: BEVELJOIN cap: BUTTCAP } @@ -31233,7 +31233,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1432 + priority: 1451 join: BEVELJOIN cap: BUTTCAP } diff --git a/data/drules_proto_vehicle_clear.prios.txt b/data/drules_proto_vehicle_clear.prios.txt index 6212375009..50d09fc54c 100644 --- a/data/drules_proto_vehicle_clear.prios.txt +++ b/data/drules_proto_vehicle_clear.prios.txt @@ -958,8 +958,8 @@ GEOM line3 highway-trunk-bridge z[13] GEOM line4 highway-trunk-bridge z[14-19] GEOM line1 highway-trunk-tunnel z[7-11] GEOM line2 highway-trunk-tunnel z[12-19] -GEOM line1 highway-world_level z[4-7] -GEOM line1 highway-world_towns_level z[6-7] +GEOM line1 highway-world_level z[4-9] +GEOM line1 highway-world_towns_level z[6-9] GEOM line1 highway-motorway z[14-19] GEOM line3 highway-motorway-bridge z[14-19] GEOM line1 highway-motorway-tunnel z[12-19] @@ -988,8 +988,6 @@ GEOM line1 highway-primary-bridge z[8-13] GEOM line4 highway-primary-bridge z[14-19] GEOM line1 highway-primary-tunnel z[8-13] GEOM line2 highway-primary-tunnel z[14-19] -GEOM line1 highway-world_level z[8-9] -GEOM line1 highway-world_towns_level z[8-9] GEOM line1 highway-primary z[14-19] GEOM line3 highway-primary-bridge z[14-19] GEOM line1 highway-primary-tunnel z[14-19] @@ -1463,10 +1461,6 @@ highway-unclassified-bridge line1 z[14-19] 1304 highway-unclassified-bridge line1 z[11-13] 1411 highway-unclassified-tunnel line1 z[16-19] 1410 highway-unclassified-tunnel line1 z[11-15] 1411 -highway-world_level line1 z[8-9] 1482 -highway-world_level line1 z[4-7] 1505 -highway-world_towns_level line1 z[8-9] 1482 -highway-world_towns_level line1 z[6-7] 1505 railway-light_rail-bridge line1 z[16-19] 1069 railway-light_rail-bridge line1 z[14-15] 1081 railway-light_rail-bridge line1 z[13] 1388 diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index bbe07e29dc..d190e3b0a8 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -18478,7 +18478,7 @@ cont { lines { width: 1.1 color: 16746306 - priority: 1482 + priority: 1505 join: BEVELJOIN cap: BUTTCAP } @@ -18488,7 +18488,7 @@ cont { lines { width: 1.2 color: 16746306 - priority: 1482 + priority: 1505 join: BEVELJOIN cap: BUTTCAP } @@ -18521,7 +18521,7 @@ cont { lines { width: 1.1 color: 16746306 - priority: 1482 + priority: 1505 join: BEVELJOIN cap: BUTTCAP } @@ -18531,7 +18531,7 @@ cont { lines { width: 1.2 color: 16746306 - priority: 1482 + priority: 1505 join: BEVELJOIN cap: BUTTCAP }