From 88d081979d16361e16aed120bd49db5c51ff5ea1 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 29 Nov 2023 19:49:29 +0200 Subject: [PATCH 1/5] [generator] Add _named surrogate tag Signed-off-by: Konstantin Pastbin --- generator/osm2type.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index 25a843ecf3..1f3922a87c 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -1174,6 +1174,8 @@ void GetNameAndType(OsmElement * p, FeatureBuilderParams & params, NamesExtractor namesExtractor(params); ForEachTag(p, namesExtractor); namesExtractor.Finish(); + if (!params.name.IsEmpty()) + p->AddTag("_named", "yes"); // Stage3: Process base feature tags. std::string houseName, houseNumber, conscriptionHN, streetHN, addrPostcode; -- 2.45.3 From f285fbce3746bdb76bbf50f86a03ec02604cd8fa Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 29 Nov 2023 19:50:41 +0200 Subject: [PATCH 2/5] [generator] Pull route=hiking tag and trail names from relations Signed-off-by: Konstantin Pastbin --- generator/relation_tags.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/generator/relation_tags.cpp b/generator/relation_tags.cpp index a83792ba52..b668305d84 100644 --- a/generator/relation_tags.cpp +++ b/generator/relation_tags.cpp @@ -144,7 +144,25 @@ void RelationTagsWay::Process(RelationElement const & e) if (route == "bicycle") Base::AddCustomTag({"bicycle", "yes"}); else if (route == "foot" || route == "hiking") + { Base::AddCustomTag({"foot", "yes"}); + + if (route == "hiking") + { + auto const hwValue = m_current->GetTag("highway"); + if (hwValue == "path" || hwValue == "track") + { + Base::AddCustomTag({"route", "hiking"}); + + if (!Base::IsKeyTagExists("name")) + { + std::string name(e.GetTagValue("name")); + if (!name.empty()) //pastk: prefer name from the most local network + Base::AddCustomTag({"name", std::move(name)}); + } + } + } + } } if (!fetchTags) -- 2.45.3 From 084b13ca2bce1423578b19120e4ba5c0c70ed8a3 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 29 Nov 2023 19:51:59 +0200 Subject: [PATCH 3/5] WIP [classif] Add -route, -named and -surface_good hiking trails Signed-off-by: Konstantin Pastbin --- data/mapcss-mapping.csv | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 092eb10e0a..107560decb 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -184,7 +184,7 @@ amenity|recycling|container;[amenity=recycling][recycling_type=container];;name; leisure|garden;110; landuse|commercial;111; railway|station;112; -highway|path|hiking;[highway=path][route=hiking],[highway=path][sac_scale=hiking];;name;int_name;113; +highway|path|hiking;[highway=path][sac_scale=hiking];;name;int_name;113; amenity|hospital;114; waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115; highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116; @@ -1677,3 +1677,9 @@ amenity|compressed_air;1592; leisure|hackerspace;1593; railway|station|subway|singapore;[railway=station][transport=subway][city=singapore],[railway=station][station=subway][city=singapore];;name;int_name;1594; railway|subway_entrance|singapore;[railway=subway_entrance][city=singapore];;name;int_name;1595; +highway|path|route;[highway=path][route?];;name;int_name;1600; +highway|path|named;[highway=path][_named];;name;int_name;1601; +highway|path|surface_good;[highway=path][psurface=unpaved_good];;name;int_name;1602; +highway|track|route;[highway=track][route?];;name;int_name;1603; +highway|track|named;[highway=track][_named];;name;int_name;1604; +highway|track|surface_good;[highway=track][psurface=unpaved_good],[highway=track][psurface=paved_good],[highway=track][psurface=paved_bad],[highway=track][tracktype=grade1],[highway=track][tracktype=grade2];;name;int_name;1605; -- 2.45.3 From c9fdc200c6c55dc9b5e8daee6cb5a10c2f2c1e84 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 29 Nov 2023 19:52:40 +0200 Subject: [PATCH 4/5] WIP [styles] Highlight major hiking trails Signed-off-by: Konstantin Pastbin --- data/styles/clear/include/Roads.mapcss | 31 +++++++++++++++++++ .../clear/include/priorities_3_FG.prio.txt | 10 ++++++ .../include/priorities_4_overlays.prio.txt | 10 ++++++ .../outdoors/include/priorities_3_FG.prio.txt | 10 ++++++ .../include/priorities_4_overlays.prio.txt | 14 +++++++-- .../vehicle/include/priorities_3_FG.prio.txt | 10 ++++++ 6 files changed, 83 insertions(+), 2 deletions(-) diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss index 0a1363b982..969c614445 100644 --- a/data/styles/clear/include/Roads.mapcss +++ b/data/styles/clear/include/Roads.mapcss @@ -611,6 +611,17 @@ line|z15-[leisure=track][!area], line|z14-[highway=path], line|z14-[highway=footway][sac_scale], {color: @path;opacity: 1;} + +line|z12-[highway=path][route?], +line|z12-[highway=track][route?], +{color: red;opacity: 1;} +line|z12-[highway=path][psurface=unpaved_good], +line|z12-[highway=track][psurface=unpaved_good], +{color: green;opacity: 1;} +line|z12-[highway=path][_named], +line|z12-[highway=track][_named], +{color: blue;opacity: 1;} + line|z14-[highway=bridleway] {color: @bridleway;opacity: 1;} line|z15-[highway=footway], @@ -773,6 +784,14 @@ line|z15[highway=track], {width: 1.4; dashes: 6,2.5;} line|z16[highway=track], {width: 1.9; dashes: 7,3;} + +line|z14-15[highway=track], +{width: 1.7;} +line|z12-[highway=track][route?], +line|z12-[highway=track][psurface=unpaved_good], +line|z12-[highway=track][_named], +{width: 2.3; dashes: 7,3;} + line|z17[highway=track], {width: 2.5; dashes: 7,3;} line|z18[highway=track], @@ -792,9 +811,21 @@ line|z16[highway=footway][sac_scale], line|z17[highway=path], line|z17[highway=footway][sac_scale], {width: 2; dashes: 4,2.5;} + +line|z14-15[highway=path], +{width: 1.5;} +line|z12-[highway=path][route?], +line|z12-[highway=path][_named], +line|z12-[highway=path][psurface=unpaved_good], +{width: 2.0; dashes: 4,2.5;} + +line|z18[highway=path][_named], +line|z18[highway=path][psurface=unpaved_good], line|z18[highway=path], line|z18[highway=footway][sac_scale], {width: 3; dashes: 6,3.5;} +line|z19-[highway=path][_named], +line|z19-[highway=path][psurface=unpaved_good], line|z19-[highway=path], line|z19-[highway=footway][sac_scale], {width: 4; dashes: 8,4.5;} diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt index 746e1b45ec..61e65e38ef 100644 --- a/data/styles/clear/include/priorities_3_FG.prio.txt +++ b/data/styles/clear/include/priorities_3_FG.prio.txt @@ -260,6 +260,16 @@ highway-service-parking_aisle # line z15- (also has pathte highway-service-tunnel # line z15- (also has pathtext z16-) === 190 +highway-path-route # line z12- (also has pathtext z15-) +highway-track-route # line z12- (also has pathtext z15-) +=== 187 + +highway-path-named # line z12- (also has pathtext z15-) +highway-path-surface_good # line z12- (also has pathtext z15-) +highway-track-named # line z12- (also has pathtext z15-) +highway-track-surface_good # line z12- (also has pathtext z15-) +=== 185 + highway-footway # line z15- (also has pathtext z15-) highway-footway-alpine_hiking # line z14- (also has pathtext z15-) highway-footway-area # line z15- and area z14- (also has pathtext z15-) diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 82f7e4d127..8f39477bbc 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -751,6 +751,16 @@ amenity-shelter # icon z16- (also has captio highway-ford # icon z16- and pathtext z16- (also has line z13-) === 2850 +highway-path-route # pathtext z15- (also has line z12-) +highway-track-route # pathtext z15- (also has line z12-) +=== 2820 + +highway-path-named # pathtext z15- (also has line z12-) +highway-path-surface_good # pathtext z15- (also has line z12-) +highway-track-named # pathtext z15- (also has line z12-) +highway-track-surface_good # pathtext z15- (also has line z12-) +=== 2810 + highway-bridleway # pathtext z15- (also has line z14-) highway-bridleway-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-) highway-bridleway-permissive # pathtext z15- (also has line z14-) diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 2fa0bd5e29..191f5b38c7 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -260,6 +260,16 @@ highway-service-parking_aisle # line z15- (also has pathte highway-service-tunnel # line z13- (also has pathtext z16-) === 190 +highway-path-route # line z11- (also has pathtext z13-) +highway-track-route # line z11- (also has pathtext z13-) +=== 187 + +highway-path-named # line z11- (also has pathtext z13-) +highway-path-surface_good # line z11- (also has pathtext z13-) +highway-track-named # line z11- (also has pathtext z13-) +highway-track-surface_good # line z11- (also has pathtext z13-) +=== 185 + highway-footway # line z15- (also has pathtext z15-) highway-footway-alpine_hiking # line z11- (also has pathtext z15-) highway-footway-area # line z15- and area z14- (also has pathtext z15-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index e3b5a15271..b5087da246 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -136,6 +136,7 @@ railway-station-subway-paris # icon z12- (also has captio railway-station-subway-roma # icon z12- (also has caption(optional) z14-) railway-station-subway-sf # icon z12- (also has caption(optional) z14-) railway-station-subway-shanghai # icon z12- (also has caption(optional) z14-) +railway-station-subway-singapore # icon z13- (also has caption(optional) z14-) railway-station-subway-stockholm # icon z12- (also has caption(optional) z14-) railway-station-subway-tokyo # icon z14- (also has caption(optional) z14-) railway-station-subway-vienna # icon z12- (also has caption(optional) z14-) @@ -244,7 +245,6 @@ railway-station-subway-saopaulo # icon z13- (also has captio railway-station-subway-sapporo # icon z13- (also has caption(optional) z14-) railway-station-subway-sendai # icon z13- (also has caption(optional) z14-) railway-station-subway-shiraz # icon z13- (also has caption(optional) z14-) -railway-station-subway-singapore # icon z13- (also has caption(optional) z14-) railway-station-subway-sofia # icon z13- (also has caption(optional) z14-) railway-station-subway-tabriz # icon z13- (also has caption(optional) z14-) railway-station-subway-taipei # icon z13- (also has caption(optional) z14-) @@ -751,6 +751,16 @@ amenity-shelter # icon z13- (also has captio highway-ford # icon z14- and pathtext z16- (also has line z13-) === 2850 +highway-path-route # pathtext z13- (also has line z11-) +highway-track-route # pathtext z13- (also has line z11-) +=== 2820 + +highway-path-named # pathtext z13- (also has line z11-) +highway-path-surface_good # pathtext z13- (also has line z11-) +highway-track-named # pathtext z13- (also has line z11-) +highway-track-surface_good # pathtext z13- (also has line z11-) +=== 2810 + highway-bridleway # pathtext z15- (also has line z14-) highway-bridleway-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-) highway-bridleway-permissive # pathtext z15- (also has line z14-) @@ -1360,6 +1370,7 @@ amenity-parking_entrance-private # icon z19- (also has captio # railway-station-subway-roma # caption(optional) z14- (also has icon z12-) # railway-station-subway-sf # caption(optional) z14- (also has icon z12-) # railway-station-subway-shanghai # caption(optional) z14- (also has icon z12-) +# railway-station-subway-singapore # caption(optional) z14- (also has icon z13-) # railway-station-subway-stockholm # caption(optional) z14- (also has icon z12-) # railway-station-subway-tokyo # caption(optional) z14- (also has icon z14-) # railway-station-subway-vienna # caption(optional) z14- (also has icon z12-) @@ -1464,7 +1475,6 @@ amenity-parking_entrance-private # icon z19- (also has captio # railway-station-subway-sapporo # caption(optional) z14- (also has icon z13-) # railway-station-subway-sendai # caption(optional) z14- (also has icon z13-) # railway-station-subway-shiraz # caption(optional) z14- (also has icon z13-) -# railway-station-subway-singapore # caption(optional) z14- (also has icon z13-) # railway-station-subway-sofia # caption(optional) z14- (also has icon z13-) # railway-station-subway-tabriz # caption(optional) z14- (also has icon z13-) # railway-station-subway-taipei # caption(optional) z14- (also has icon z13-) diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 93ca801596..37f2dbcb2a 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -235,6 +235,16 @@ highway-service-parking_aisle # line z14- (also has pathte highway-service-tunnel # line z14- (also has pathtext z16-) === 140 +highway-path-route # line z17- +highway-track-route # line z16- +=== 137 + +highway-path-named # line z17- +highway-path-surface_good # line z14- +highway-track-named # line z16- +highway-track-surface_good # line z14- +=== 135 + highway-bridleway # line z18- highway-bridleway-bridge # line z18- highway-bridleway-permissive # line z18- -- 2.45.3 From 1ff3a2714928cd0156fca1f7527ce9d0b0e8d122 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 29 Nov 2023 22:24:53 +0200 Subject: [PATCH 5/5] [styles] Regenerate Signed-off-by: Konstantin Pastbin --- data/classificator.txt | 6 + data/colors.txt | 3 + data/drules_proto.bin | Bin 422838 -> 426317 bytes data/drules_proto.txt | 1302 +++++++++++++++++++++++--- data/drules_proto_clear.bin | Bin 414383 -> 417586 bytes data/drules_proto_clear.txt | 1080 ++++++++++++++++++++- data/drules_proto_dark.bin | Bin 412508 -> 415711 bytes data/drules_proto_dark.txt | 1080 ++++++++++++++++++++- data/drules_proto_outdoors_clear.bin | Bin 426897 -> 430676 bytes data/drules_proto_outdoors_clear.txt | 1194 ++++++++++++++++++++++- data/drules_proto_outdoors_dark.bin | Bin 425004 -> 428783 bytes data/drules_proto_outdoors_dark.txt | 1194 ++++++++++++++++++++++- data/drules_proto_vehicle_clear.bin | Bin 291074 -> 292613 bytes data/drules_proto_vehicle_clear.txt | 406 ++++++++ data/drules_proto_vehicle_dark.bin | Bin 290516 -> 292055 bytes data/drules_proto_vehicle_dark.txt | 406 ++++++++ data/types.txt | 10 + data/visibility.txt | 6 + 18 files changed, 6444 insertions(+), 243 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index f4cee2114e..e6645637b8 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -454,7 +454,10 @@ world + hiking - horse - mountain_hiking - + named - permissive - + route - + surface_good - tunnel - {} pedestrian + @@ -518,8 +521,11 @@ world + grade3 - grade4 - grade5 - + named - no-access - permissive - + route - + surface_good - tunnel - {} traffic_signals - diff --git a/data/colors.txt b/data/colors.txt index 9e918f8ae8..b9b6ec6dbc 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -1,4 +1,5 @@ 0 +255 6425 8738 9758 @@ -10,6 +11,7 @@ 21569 26316 26972 +32768 34815 39468 42380 @@ -299,6 +301,7 @@ 16575614 16579778 16579836 +16711680 16728450 16733986 16740096 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 725acd928688503f768a6b5c0a968cd4d486dfec..71e5c576e6eb2f5cdb6221f2ce111d620d234e63 100644 GIT binary patch delta 4046 zcmcgu-Afcv6z_~vuIuXV&g`ro54wK4>Y}DWVV3;^QQ$*Hn2YYJh-rRM(Tj#qe?ga` zhkEKQf~-Y^u!kavpeQP`2PMSF7hig@&olR~Gk3mLaoq+6cIWrIznOE+J@@>ctQEb! zRy;KeZD&YR7Zi}YLl9)Y-ZXQ+q^x|YhBS6TAz2>8=N$(jhaBmGe1bG@BGe0~fW*#1 zRr)Hv&)^{o=Ri(h>UTGk>{JEg@MU$nyyVXU#uuuETs=O5@hOSY9;gv^D(8@;X-HE5 z)BGw9jp?gY4(>cR4#D8JJa~`Ax;zB_^grm)Fw~^2QadZUrGdfzflJXVkn+IT4d0Se3AzfT^ip*|aXj^Q=bYv=DOOtx`4Jp z9kziZcnmXb111|m!A3ZWiLSJ2Cp&>L{M#}ljX~2a5Uv-PhO9AYjs?Os17ieIFt8g= zjzK7mZcyh)XX4H{eCy6`q1R91Ux8}=PdVvX0nzXzSKY^3{FSdpekt*;LnqnD1yADX zJIDim>0T)lRNf#zK0xWN)iKUcInGx}&bfU{z5E@%rH_g1&`q^h_4trSLsAIN+XIP` zPv94J{n8Z4Vj-c~C?KO>z?Ioocw3SaXse2QSam%RZ|i?~%b^UvCHz=)%Uj3T#8|X< z$S}m?^b+VWYhE%BaVL}waWl#faeIsnaWj@YyYwM$L$Dj-qW0CvvyCa}L)=3NCzee! zS|8#PC7fP05%eK$A>grfbrmWzx4{?Jpdw@H^^2Cxzyqm@^zjz(&ca(vc-Qyezwr-`hAM9W delta 1336 zcmX@xB(?3iWWyFl>xk*?T8vxRXUznGkJ}lO8S@#Zr$#ZVPVX_q5dZg*k!SjW7)D`i zn*PQy%7Mh!F^6#QPxowOlwmo)aZ0e;dA+Co91<2{e(|`Q{`nV>GQEvN$D#m?ruyC3l z_=-`9n@32U6B=+J0W}oa=?h*lvLK5nO#kqhk&QhK48DOh$ZyZT!x+Fg9q0$1=`FVz z1(B6g$@qLm$_zE*WmK6S{0bPzK(~rc2Sz2^_80dU1(_%_7FSRJQLB4`~PHd?025 PVrC#_+5YPXYj6hu@m5TC diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 0a3a7c6813..74de38e689 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -27004,7 +27004,7 @@ cont { element { scale: 11 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27017,7 +27017,7 @@ cont { element { scale: 12 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27030,7 +27030,7 @@ cont { element { scale: 13 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27043,7 +27043,7 @@ cont { element { scale: 14 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27056,7 +27056,7 @@ cont { element { scale: 15 lines { - width: 1.1 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27180,7 +27180,7 @@ cont { element { scale: 11 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27193,7 +27193,7 @@ cont { element { scale: 12 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27206,7 +27206,7 @@ cont { element { scale: 13 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27219,7 +27219,7 @@ cont { element { scale: 14 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27232,7 +27232,7 @@ cont { element { scale: 15 lines { - width: 1.1 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27356,7 +27356,7 @@ cont { element { scale: 11 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27369,7 +27369,7 @@ cont { element { scale: 12 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27382,7 +27382,7 @@ cont { element { scale: 13 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27395,7 +27395,7 @@ cont { element { scale: 14 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27408,7 +27408,7 @@ cont { element { scale: 15 lines { - width: 1.1 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27532,7 +27532,7 @@ cont { element { scale: 11 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27545,7 +27545,7 @@ cont { element { scale: 12 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27558,7 +27558,7 @@ cont { element { scale: 13 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27571,7 +27571,7 @@ cont { element { scale: 14 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27584,13 +27584,13 @@ cont { element { scale: 15 lines { - width: 3.2 + width: 4.0 color: 15592411 priority: 150 cap: BUTTCAP } lines { - width: 1.1 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27768,7 +27768,7 @@ cont { element { scale: 11 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27781,7 +27781,7 @@ cont { element { scale: 12 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27794,7 +27794,7 @@ cont { element { scale: 13 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27807,7 +27807,7 @@ cont { element { scale: 14 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27820,7 +27820,7 @@ cont { element { scale: 15 lines { - width: 1.1 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27944,7 +27944,7 @@ cont { element { scale: 11 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27957,7 +27957,7 @@ cont { element { scale: 12 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27970,7 +27970,7 @@ cont { element { scale: 13 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27983,7 +27983,7 @@ cont { element { scale: 14 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -27996,7 +27996,7 @@ cont { element { scale: 15 lines { - width: 1.1 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28120,7 +28120,7 @@ cont { element { scale: 11 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28133,7 +28133,7 @@ cont { element { scale: 12 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28146,7 +28146,7 @@ cont { element { scale: 13 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28159,7 +28159,7 @@ cont { element { scale: 14 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28172,7 +28172,7 @@ cont { element { scale: 15 lines { - width: 1.1 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28296,7 +28296,7 @@ cont { element { scale: 11 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28309,7 +28309,7 @@ cont { element { scale: 12 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28322,7 +28322,7 @@ cont { element { scale: 13 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28335,7 +28335,7 @@ cont { element { scale: 14 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28348,7 +28348,7 @@ cont { element { scale: 15 lines { - width: 1.1 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28472,7 +28472,7 @@ cont { element { scale: 11 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28485,7 +28485,7 @@ cont { element { scale: 12 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28498,7 +28498,7 @@ cont { element { scale: 13 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28511,7 +28511,7 @@ cont { element { scale: 14 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28524,7 +28524,7 @@ cont { element { scale: 15 lines { - width: 1.1 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28648,7 +28648,7 @@ cont { element { scale: 11 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28661,7 +28661,7 @@ cont { element { scale: 12 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28674,7 +28674,7 @@ cont { element { scale: 13 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28687,7 +28687,7 @@ cont { element { scale: 14 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28700,7 +28700,7 @@ cont { element { scale: 15 lines { - width: 1.1 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28819,12 +28819,190 @@ cont { } } } +cont { + name: "highway-path-named" + element { + scale: 11 + lines { + width: 2.0 + color: 255 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 2.0 + color: 255 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 2.0 + color: 255 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 2.0 + color: 255 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 255 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 16 + lines { + width: 2.0 + color: 255 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 255 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 255 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 255 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 20 + lines { + width: 4.0 + color: 255 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } +} cont { name: "highway-path-permissive" element { scale: 11 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28837,7 +29015,7 @@ cont { element { scale: 12 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28850,7 +29028,7 @@ cont { element { scale: 13 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28863,7 +29041,7 @@ cont { element { scale: 14 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28876,7 +29054,7 @@ cont { element { scale: 15 lines { - width: 1.1 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -28995,12 +29173,368 @@ cont { } } } +cont { + name: "highway-path-route" + element { + scale: 11 + lines { + width: 2.0 + color: 16711680 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 187 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 2.0 + color: 16711680 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 187 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 2.0 + color: 16711680 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 187 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 2.0 + color: 16711680 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 187 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 16711680 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 187 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2820 + } + } + element { + scale: 16 + lines { + width: 2.0 + color: 16711680 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 187 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2820 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 16711680 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 187 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2820 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 16711680 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 187 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2820 + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 16711680 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 187 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2820 + } + } + element { + scale: 20 + lines { + width: 4.0 + color: 16711680 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 187 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2820 + } + } +} +cont { + name: "highway-path-surface_good" + element { + scale: 11 + lines { + width: 2.0 + color: 32768 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 2.0 + color: 32768 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 2.0 + color: 32768 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 2.0 + color: 32768 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 32768 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 16 + lines { + width: 2.0 + color: 32768 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 32768 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 32768 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 32768 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 20 + lines { + width: 4.0 + color: 32768 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } +} cont { name: "highway-path-tunnel" element { scale: 11 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -29013,7 +29547,7 @@ cont { element { scale: 12 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -29026,7 +29560,7 @@ cont { element { scale: 13 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -29039,7 +29573,7 @@ cont { element { scale: 14 lines { - width: 0.9 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -29052,7 +29586,7 @@ cont { element { scale: 15 lines { - width: 1.1 + width: 1.5 color: 10506258 dashdot { dd: 3.5 @@ -37186,7 +37720,7 @@ cont { element { scale: 11 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37199,7 +37733,7 @@ cont { element { scale: 12 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37212,7 +37746,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37225,7 +37759,7 @@ cont { element { scale: 14 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37238,7 +37772,7 @@ cont { element { scale: 15 lines { - width: 1.4 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37362,7 +37896,7 @@ cont { element { scale: 11 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37375,7 +37909,7 @@ cont { element { scale: 12 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37388,7 +37922,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37401,7 +37935,7 @@ cont { element { scale: 14 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37414,7 +37948,7 @@ cont { element { scale: 15 lines { - width: 1.4 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37538,7 +38072,7 @@ cont { element { scale: 11 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37551,7 +38085,7 @@ cont { element { scale: 12 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37564,7 +38098,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37577,7 +38111,7 @@ cont { element { scale: 14 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37590,13 +38124,13 @@ cont { element { scale: 15 lines { - width: 3.8 + width: 4.4 color: 15592411 priority: 150 cap: BUTTCAP } lines { - width: 1.4 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37774,7 +38308,7 @@ cont { element { scale: 11 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37787,7 +38321,7 @@ cont { element { scale: 12 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37800,7 +38334,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37813,7 +38347,7 @@ cont { element { scale: 14 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37826,7 +38360,7 @@ cont { element { scale: 15 lines { - width: 1.4 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37950,7 +38484,7 @@ cont { element { scale: 11 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37963,7 +38497,7 @@ cont { element { scale: 12 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37976,7 +38510,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -37989,7 +38523,7 @@ cont { element { scale: 14 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38002,7 +38536,7 @@ cont { element { scale: 15 lines { - width: 1.4 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38126,7 +38660,7 @@ cont { element { scale: 11 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38139,7 +38673,7 @@ cont { element { scale: 12 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38152,7 +38686,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38165,7 +38699,7 @@ cont { element { scale: 14 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38178,7 +38712,7 @@ cont { element { scale: 15 lines { - width: 1.4 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38302,7 +38836,7 @@ cont { element { scale: 11 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38315,7 +38849,7 @@ cont { element { scale: 12 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38328,7 +38862,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38341,7 +38875,7 @@ cont { element { scale: 14 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38354,7 +38888,7 @@ cont { element { scale: 15 lines { - width: 1.4 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38478,7 +39012,7 @@ cont { element { scale: 11 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38491,7 +39025,7 @@ cont { element { scale: 12 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38504,7 +39038,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38517,7 +39051,7 @@ cont { element { scale: 14 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38530,7 +39064,7 @@ cont { element { scale: 15 lines { - width: 1.4 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38649,12 +39183,190 @@ cont { } } } +cont { + name: "highway-track-named" + element { + scale: 11 + lines { + width: 2.3 + color: 255 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 2.3 + color: 255 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 2.3 + color: 255 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 2.3 + color: 255 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.3 + color: 255 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 16 + lines { + width: 2.3 + color: 255 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 17 + lines { + width: 2.5 + color: 255 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 18 + lines { + width: 3.5 + color: 255 + dashdot { + dd: 9.0 + dd: 3.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 19 + lines { + width: 4.5 + color: 255 + dashdot { + dd: 12.0 + dd: 3.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 20 + lines { + width: 4.5 + color: 255 + dashdot { + dd: 12.0 + dd: 3.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } +} cont { name: "highway-track-no-access" element { scale: 11 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38667,7 +39379,7 @@ cont { element { scale: 12 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38680,7 +39392,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38693,7 +39405,7 @@ cont { element { scale: 14 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38706,7 +39418,7 @@ cont { element { scale: 15 lines { - width: 1.4 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38830,7 +39542,7 @@ cont { element { scale: 11 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38843,7 +39555,7 @@ cont { element { scale: 12 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38856,7 +39568,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38869,7 +39581,7 @@ cont { element { scale: 14 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -38882,7 +39594,7 @@ cont { element { scale: 15 lines { - width: 1.4 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -39001,12 +39713,368 @@ cont { } } } +cont { + name: "highway-track-route" + element { + scale: 11 + lines { + width: 2.3 + color: 16711680 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 187 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 2.3 + color: 16711680 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 187 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 2.3 + color: 16711680 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 187 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 2.3 + color: 16711680 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 187 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.3 + color: 16711680 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 187 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2820 + } + } + element { + scale: 16 + lines { + width: 2.3 + color: 16711680 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 187 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2820 + } + } + element { + scale: 17 + lines { + width: 2.5 + color: 16711680 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 187 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2820 + } + } + element { + scale: 18 + lines { + width: 3.5 + color: 16711680 + dashdot { + dd: 9.0 + dd: 3.5 + } + priority: 187 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2820 + } + } + element { + scale: 19 + lines { + width: 4.5 + color: 16711680 + dashdot { + dd: 12.0 + dd: 3.5 + } + priority: 187 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2820 + } + } + element { + scale: 20 + lines { + width: 4.5 + color: 16711680 + dashdot { + dd: 12.0 + dd: 3.5 + } + priority: 187 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2820 + } + } +} +cont { + name: "highway-track-surface_good" + element { + scale: 11 + lines { + width: 2.3 + color: 32768 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 2.3 + color: 32768 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 2.3 + color: 32768 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 2.3 + color: 32768 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.3 + color: 32768 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 16 + lines { + width: 2.3 + color: 32768 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 17 + lines { + width: 2.5 + color: 32768 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 18 + lines { + width: 3.5 + color: 32768 + dashdot { + dd: 9.0 + dd: 3.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 19 + lines { + width: 4.5 + color: 32768 + dashdot { + dd: 12.0 + dd: 3.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } + element { + scale: 20 + lines { + width: 4.5 + color: 32768 + dashdot { + dd: 12.0 + dd: 3.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2810 + } + } +} cont { name: "highway-track-tunnel" element { scale: 11 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -39019,7 +40087,7 @@ cont { element { scale: 12 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -39032,7 +40100,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -39045,7 +40113,7 @@ cont { element { scale: 14 lines { - width: 1.1 + width: 1.7 color: 6510384 dashdot { dd: 6.0 @@ -39058,7 +40126,7 @@ cont { element { scale: 15 lines { - width: 1.4 + width: 1.7 color: 6510384 dashdot { dd: 6.0 diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 83cc3fbe03c28d4567313591dacb4677dc98dbd9..c486255dc4e167127e7b0a122eb71191153deea6 100644 GIT binary patch delta 2735 zcma)-%}*0S7>9kARkjWEW49lagFq;h78*2gFj4%7o;;WmOAHaxR9Zk3iwH3$kZ>Tv zMH5b=p1hcN6OBpJG#V4b!Kgq?<54gE0iMyIZ)eKx?C!Ls$sXwM+1c6OygYsNBJ}2c zXyq*g62z5+Ao)EC0g~$j2MH#@mERnP6p+F&bk&I8Z9@}zbQQE3%*7EnuE(B+q~a!b zZ{t_KBzOrvC7k~;0uf0^?3;Kw3MXsCOV^>lMto(Qd%k7yB@o^?mx71lgtpSNCOg&X zn^V*G(+}cv>4oX|o%C!rqxLFIYQ%Abea?IS0oh1^zoh^t;1sA)rCIH=rGWy=Tvf9n z#VyF7Kp+Z!-=1GRt$5T<+rkK>n?YlMw;rJCfI>I^ItzYWVK{!Uf~Er=3S78m0esZ~ z*dycygoRbpLSs*@h0f;|7qV&`3ym6YwzBfKkyhGTWR><}rCi~9-cl@=+N-#PDHMs< z2b!$o_(i$Pz-mAp!Y;W(;*oNj4Dr@SR2{)S=_<6*B5jndqUi`WN)g&AkN9dK1FHci zk)0vaAl_S?pG;3=Q&YKIM(xA;dieSz+FqzKkTGnp+a3q$M8>eZs^M82NkLedNk7iy z8SF7^U%N7tjPTYaRGpwLN`xCrwuYt?v_y$;bIAx_4FU&qECcPr!TgYc{jtUY`uRgT zzCt(uM_ays2NFQsDHP!BNAU8YknGrkHXdpx>mzvY-AnbbK+ zKN2(0j8&c1lvk%XW9qbKl`%EcDF8(3l=Xd8#+a>OsI!Rz!(S|BG}Nh5U}M_?80xeE zIHAkC5UzWsm%c$~Jt+3fRz9y;y#;g;*_?qu$Yfbt9ONWhB|L|oh&XIv#kYRlw<4l^ z0*o+pizjffIb6dKvSC|10;*Da2)s%S+hWHQp~t`@hHVANAlmkc>})j;uRyolyP&Ud zh|RjS#k_8-giN=#(571vL2IN!HgrpCWScVy+0ZSmQ6k(ZTXjn-!rv2PmaV$A6FAID c2|B9JY1w?qwcQfnCE?Y8mz>`%9sRldA6!s2hWOtrj6BnOgBgXf zX>tx_l$)N%!N@tCPnA)QIfR3Mx?2&W9OK97KtoNo-wS0_XToOaibzJo>37sHEUSrT z)W@dYFBWJIy80eQR3|0GGfrc~PzChb;uJrXU zUN!O;xNxCKL%JYw;R7VGK3Exr4Q_R1f+qUS9cJcsUhO24G(Erj-P?0dPWts>==<|f z?j@x9>8l~AqnE?bMAwF(M*8H*=LVo3s5k)aR&pAw6kPb=JcL!*OT!1CO&d;ecpx9U z01=1E82A1?3`cF`wGlXMBQK3|2QUu5GzR-^R)>=iv6ed)1Q(gUIyHSOc{_G9nVpW^ zNM27(kf`V;5$7KH>GS>ry4eqb`eir*CxCQ{)ui2^2A5^6#!~AQJti6~(_bGT;NJ<5 z9??r$4TBMwDS}T1YRdsc1w?l6mJtZxgsov^f=>m!444_!0e))$cIfsM41i_Mx*qEd z&7|kDDH20NJGEby%l)llmNpb*OQUEhXSk}@7bH`oVvUV@3T-u83k7Cua6U+S(OB-r z)bWT&*2+k2d4#A4n#-mzdkf57d5TX(&|ZcxgL%Ynhs5WDE-JV}C8?a9%SNsQ5ohaEjEKsa7%kBiA{(;m0_0B(@n^bQpRt~U~ZpHK(kqHr3xFQp=$8ZZx^94 z|1v?RB|_=tghD2=d533I=OZpI;~{6ml% zSg*=Smh0DCle<^1aY>eo*91_K%(pJHke!Q5azfN9ml;SGS0RXiS>G~mXz{%c(8|^T nV3OCrK#O%qrQVyB`qoX)u0nWWWdrba;JX)JA-}S*Zz=m9v`XY) delta 758 zcmcb=Uh>W~$%ZYAsR7eV)fjczXUznGkJ}T281osYa|AJ}PM@cOD&EJ4P3fdiMmdnU zI&%mI|MdPMMmffh(}AX#Y}XBARA<641!(&BNJc|!;-{k-^|6W1jRjhP?i!#uaq*0@ z*qkJn$f%A@{ihU0rRi(97&)icsWGacdHHP?#2@gW0C}Q#x+E_n|MYuNjMCfhWHUaG zg=v~T@iL?Q^#A7>+1b;;;M;bf2*gc15+y~6$=SMzMX8BG+8lgB>YUKf#i>i}ETcTC z(PkXL7?^yS(P;ajvy9?QsFLXRwlVS>5n~fjoiQ=$`WOk?XG)AY!0_n5#i)eeFrcE4 uJB-Q%6$L#)4+>f`l5%vNGQiwMjt~TGi@6yP#hX zf{2S;L|Y4jRy`yrh&Iupa-rRsJ34cJfs5ht%{dI;-0w8+xW90u3lNQAIs_I&SlkP2 zV9W!fP{K+G#>p|eOb-j#ppLKtW711Py1EVTCgfEK$SI4{oiab`Tu8Fm|VtEn4yR gSMQvhETEExUKZ79M}R_L6+j`2=>e$R1*qH) X$XxU3x%w+@+PA22O}AUfhrwMka-Od-a-|y+mU>~=H#y;$72EtZy|&SjmHNlJo#%#aW(zo4P>6l;|ALkZZs2mJx`VwqJP5Jp0CUm$NJ))9a71a8D13WwDq(`z#Cpbe#rP z&go9Cm@THi266d8+@|+HuJt*XY|(2Vw;Ppv8I1QYK&*Qp Z)*?$5i|Oxwu}HT!TxZ$daGf=OGXO1_JGB4+ diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 47f4001f90..3353f18411 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -29030,6 +29030,200 @@ cont { } } } +cont { + name: "highway-path-named" + element { + scale: 11 + lines { + width: 1.0 + color: 9718290 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.1 + color: 9718290 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 9718290 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 9718290 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 9718290 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 9718290 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 17 + lines { + width: 3.3 + color: 9718290 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 18 + lines { + width: 4.0 + color: 9718290 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 9718290 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 20 + lines { + width: 4.0 + color: 9718290 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } +} cont { name: "highway-path-permissive" element { @@ -29224,6 +29418,394 @@ cont { } } } +cont { + name: "highway-path-route" + element { + scale: 11 + lines { + width: 1.0 + color: 9718290 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 187 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.1 + color: 9718290 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 187 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 9718290 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 187 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 9718290 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 187 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 9718290 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 187 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 9718290 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 187 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 17 + lines { + width: 3.3 + color: 9718290 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 187 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 18 + lines { + width: 4.0 + color: 9718290 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 187 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 9718290 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 187 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 20 + lines { + width: 4.0 + color: 9718290 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 187 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } +} +cont { + name: "highway-path-surface_good" + element { + scale: 11 + lines { + width: 1.0 + color: 9718290 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.1 + color: 9718290 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 9718290 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 9718290 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 9718290 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 9718290 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 17 + lines { + width: 3.3 + color: 9718290 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 18 + lines { + width: 4.0 + color: 9718290 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 9718290 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 20 + lines { + width: 4.0 + color: 9718290 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } +} cont { name: "highway-path-tunnel" element { @@ -39006,6 +39588,200 @@ cont { } } } +cont { + name: "highway-track-named" + element { + scale: 11 + lines { + width: 1.1 + color: 6247213 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.3 + color: 6247213 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.6 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 14 + lines { + width: 2.0 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 15 + lines { + width: 2.5 + color: 6247213 + dashdot { + dd: 9.0 + dd: 3.5 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 16 + lines { + width: 3.2 + color: 6247213 + dashdot { + dd: 9.0 + dd: 3.5 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 17 + lines { + width: 4.0 + color: 6247213 + dashdot { + dd: 12.0 + dd: 4.0 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 18 + lines { + width: 5.0 + color: 6247213 + dashdot { + dd: 12.0 + dd: 4.0 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 19 + lines { + width: 5.0 + color: 6247213 + dashdot { + dd: 12.0 + dd: 4.0 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 20 + lines { + width: 5.0 + color: 6247213 + dashdot { + dd: 12.0 + dd: 4.0 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } +} cont { name: "highway-track-no-access" element { @@ -39394,6 +40170,394 @@ cont { } } } +cont { + name: "highway-track-route" + element { + scale: 11 + lines { + width: 1.1 + color: 6247213 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 187 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.3 + color: 6247213 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 187 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.6 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 187 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 14 + lines { + width: 2.0 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 187 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 15 + lines { + width: 2.5 + color: 6247213 + dashdot { + dd: 9.0 + dd: 3.5 + } + priority: 187 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 16 + lines { + width: 3.2 + color: 6247213 + dashdot { + dd: 9.0 + dd: 3.5 + } + priority: 187 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 17 + lines { + width: 4.0 + color: 6247213 + dashdot { + dd: 12.0 + dd: 4.0 + } + priority: 187 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 18 + lines { + width: 5.0 + color: 6247213 + dashdot { + dd: 12.0 + dd: 4.0 + } + priority: 187 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 19 + lines { + width: 5.0 + color: 6247213 + dashdot { + dd: 12.0 + dd: 4.0 + } + priority: 187 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 20 + lines { + width: 5.0 + color: 6247213 + dashdot { + dd: 12.0 + dd: 4.0 + } + priority: 187 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } +} +cont { + name: "highway-track-surface_good" + element { + scale: 11 + lines { + width: 1.1 + color: 6247213 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.3 + color: 6247213 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 185 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.6 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 14 + lines { + width: 2.0 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 15 + lines { + width: 2.5 + color: 6247213 + dashdot { + dd: 9.0 + dd: 3.5 + } + priority: 185 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 16 + lines { + width: 3.2 + color: 6247213 + dashdot { + dd: 9.0 + dd: 3.5 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 17 + lines { + width: 4.0 + color: 6247213 + dashdot { + dd: 12.0 + dd: 4.0 + } + priority: 185 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 18 + lines { + width: 5.0 + color: 6247213 + dashdot { + dd: 12.0 + dd: 4.0 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 19 + lines { + width: 5.0 + color: 6247213 + dashdot { + dd: 12.0 + dd: 4.0 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 20 + lines { + width: 5.0 + color: 6247213 + dashdot { + dd: 12.0 + dd: 4.0 + } + priority: 185 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 2810 + } + } +} cont { name: "highway-track-tunnel" element { @@ -97496,7 +98660,7 @@ cont { scale: 13 symbol { name: "subway-singapore-s" - priority: 6300 + priority: 6650 min_distance: 1 } } @@ -97504,7 +98668,7 @@ cont { scale: 14 symbol { name: "subway-singapore-s" - priority: 6300 + priority: 6650 min_distance: 1 } caption { @@ -97522,14 +98686,14 @@ cont { offset_y: 1 is_optional: true } - priority: -3700 + priority: -3350 } } element { scale: 15 symbol { name: "subway-singapore-m" - priority: 6300 + priority: 6650 } caption { primary { @@ -97546,14 +98710,14 @@ cont { offset_y: 1 is_optional: true } - priority: -3700 + priority: -3350 } } element { scale: 16 symbol { name: "subway-singapore-m" - priority: 6300 + priority: 6650 } caption { primary { @@ -97570,14 +98734,14 @@ cont { offset_y: 1 is_optional: true } - priority: -3700 + priority: -3350 } } element { scale: 17 symbol { name: "subway-singapore-m" - priority: 6300 + priority: 6650 } caption { primary { @@ -97594,14 +98758,14 @@ cont { offset_y: 1 is_optional: true } - priority: -3700 + priority: -3350 } } element { scale: 18 symbol { name: "subway-singapore-m" - priority: 6300 + priority: 6650 } caption { primary { @@ -97618,14 +98782,14 @@ cont { offset_y: 1 is_optional: true } - priority: -3700 + priority: -3350 } } element { scale: 19 symbol { name: "subway-singapore-m" - priority: 6300 + priority: 6650 } caption { primary { @@ -97642,14 +98806,14 @@ cont { offset_y: 1 is_optional: true } - priority: -3700 + priority: -3350 } } element { scale: 20 symbol { name: "subway-singapore-m" - priority: 6300 + priority: 6650 } caption { primary { @@ -97666,7 +98830,7 @@ cont { offset_y: 1 is_optional: true } - priority: -3700 + priority: -3350 } } } diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index bc29071ed507367373ac1a100b4d3f33388b761e..edb3ad148bb019a47779ab37bda386e25e2c76e7 100644 GIT binary patch delta 382 zcmZpAB-r{+aD)7k$^DB2S@RNeQ&T3tFVkdfpL~9i7Le>;0wU)v1d*~!PJvYw<(HPE zf>m{bRds?@b%InWbTV?CVd9d^$V|^DPps4}NG!?FEiNreOH59UPtVU!nXLNA&pi+~uee%HtT0l~M35dME6ht~LJq1$5Qj}j> zGWpG}C7LfRaB zLh92Uq?nW$+ov%y>TtC)S}+P}atH{iPQN3~q|DULh|B)XT+8;wi@#yy5{4OHQk0mS ztqXSabOT04psS}dvNM958v74OPT#-?<}CaVO^dCMawXbDo1Y#y2X5PM*okcwz08d?qWdHyG delta 42 vcmccqQt--M!3{1;C$ld*vH9VOJ@MOnI2oTawr}DEVJ0AE-oA;KMKv7&&Jhxy diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 5c57f5662e..cdadfda165 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -12746,6 +12746,57 @@ cont { } } } +cont { + name: "highway-path-named" + element { + scale: 17 + lines { + width: 0.9 + color: 9718290 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 135 + } + } + element { + scale: 18 + lines { + width: 1.1 + color: 9718290 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 135 + } + } + element { + scale: 19 + lines { + width: 1.5 + color: 9718290 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 135 + } + } + element { + scale: 20 + lines { + width: 1.5 + color: 9718290 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 135 + } + } +} cont { name: "highway-path-permissive" element { @@ -12797,6 +12848,146 @@ cont { } } } +cont { + name: "highway-path-route" + element { + scale: 17 + lines { + width: 0.9 + color: 9718290 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 137 + } + } + element { + scale: 18 + lines { + width: 1.1 + color: 9718290 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 137 + } + } + element { + scale: 19 + lines { + width: 1.5 + color: 9718290 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 137 + } + } + element { + scale: 20 + lines { + width: 1.5 + color: 9718290 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 137 + } + } +} +cont { + name: "highway-path-surface_good" + element { + scale: 14 + lines { + width: 1.4 + color: 5064516 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 135 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 5064516 + dashdot { + dd: 2.2 + dd: 1.26 + } + priority: 135 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 5064516 + dashdot { + dd: 3.3 + dd: 1.8 + } + priority: 135 + } + } + element { + scale: 17 + lines { + width: 0.9 + color: 9718290 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 135 + } + } + element { + scale: 18 + lines { + width: 1.1 + color: 9718290 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 135 + } + } + element { + scale: 19 + lines { + width: 1.5 + color: 9718290 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 135 + } + } + element { + scale: 20 + lines { + width: 1.5 + color: 9718290 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 135 + } + } +} cont { name: "highway-pedestrian" element { @@ -20829,6 +21020,69 @@ cont { } } } +cont { + name: "highway-track-named" + element { + scale: 16 + lines { + width: 1.1 + color: 6247213 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 135 + } + } + element { + scale: 17 + lines { + width: 1.4 + color: 6247213 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 135 + } + } + element { + scale: 18 + lines { + width: 1.9 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 135 + } + } + element { + scale: 19 + lines { + width: 2.5 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 135 + } + } + element { + scale: 20 + lines { + width: 2.5 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 135 + } + } +} cont { name: "highway-track-no-access" element { @@ -20955,6 +21209,158 @@ cont { } } } +cont { + name: "highway-track-route" + element { + scale: 16 + lines { + width: 1.1 + color: 6247213 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 137 + } + } + element { + scale: 17 + lines { + width: 1.4 + color: 6247213 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 137 + } + } + element { + scale: 18 + lines { + width: 1.9 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 137 + } + } + element { + scale: 19 + lines { + width: 2.5 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 137 + } + } + element { + scale: 20 + lines { + width: 2.5 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 137 + } + } +} +cont { + name: "highway-track-surface_good" + element { + scale: 14 + lines { + width: 1.4 + color: 5064516 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 135 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 5064516 + dashdot { + dd: 2.2 + dd: 1.26 + } + priority: 135 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 1.1 + color: 6247213 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 135 + } + } + element { + scale: 17 + lines { + width: 1.4 + color: 6247213 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 135 + } + } + element { + scale: 18 + lines { + width: 1.9 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 135 + } + } + element { + scale: 19 + lines { + width: 2.5 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 135 + } + } + element { + scale: 20 + lines { + width: 2.5 + color: 6247213 + dashdot { + dd: 7.0 + dd: 3.0 + } + priority: 135 + } + } +} cont { name: "highway-trunk" element { diff --git a/data/types.txt b/data/types.txt index 5ccbca1812..7d0c51d1d8 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1593,3 +1593,13 @@ amenity|recycling|container *leisure|hackerspace *railway|station|subway|singapore *railway|subway_entrance|singapore +mapswithme +mapswithme +mapswithme +mapswithme +*highway|path|route +*highway|path|named +*highway|path|surface_good +*highway|track|route +*highway|track|named +*highway|track|surface_good diff --git a/data/visibility.txt b/data/visibility.txt index e04b52dd67..3bce13dcd8 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -454,7 +454,10 @@ world 000000000000000000000 + hiking 000000000000000001111 - horse 000000000000000001111 - mountain_hiking 000000000000000001111 - + named 000000000000000001111 - permissive 000000000000000001111 - + route 000000000000000001111 - + surface_good 000000000000001111111 - tunnel 000000000000000000000 - {} pedestrian 000000000000000000111 + @@ -518,8 +521,11 @@ world 000000000000000000000 + grade3 000000000000000011111 - grade4 000000000000000011111 - grade5 000000000000000011111 - + named 000000000000000011111 - no-access 000000000000000011111 - permissive 000000000000000011111 - + route 000000000000000011111 - + surface_good 000000000000001111111 - tunnel 000000000000000000000 - {} traffic_signals 000000000000000000000 - -- 2.45.3