AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[styles] Fix some roads and waterways in vehicle style

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2023-09-15 21:05:44 +03:00 • committed by Viktor Govako
parent 9c292d0b6f
commit d97b3414e4
8 changed files with 42 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/styles/vehicle/include/Basemap.mapcss
View file

@ -263,13 +263,6 @@ line|z15-[waterway=stream][intermittent=yes]
node|z16-[waterway=lock_gate],
{icon-image: dot-m.svg;}
line|z13-[waterway=ditch],
line|z13-[waterway=drain],
{opacity: 1; color: @water_bad; width: 1.5; dashes: 2.7,2.7;}
line|z16-[waterway=ditch],
line|z16-[waterway=drain],
{width: 3;}
/* Do not draw tunnel waterways */
line[waterway][tunnel]

15
data/styles/vehicle/include/Basemap_label.mapcss
View file

@ -383,10 +383,7 @@ area|z10-[landuse=reservoir][bbox_area>=4000000],
area|z10-[natural=water][!tunnel][bbox_area>=4000000],
line|z11-[waterway=river],
line|z11-[waterway=riverbank],
line|z13-[waterway=canal],
line|z13-[natural=strait],
node|z14-[natural=bay],
node|z14-[natural=strait],
node|z16-[natural=wetland],
area|z16-[natural=wetland],
{text:name;text-color: @water_label;}
@ -445,23 +442,17 @@ area|z10-[natural=water][water=wastewater],
line[waterway]
{text-position: line;}
line[waterway][tunnel]
{text: none;}
line|z11-14[waterway=river],
line|z11-14[waterway=riverbank],
line|z13-14[waterway=canal]
line|z13-14[natural=strait]
{font-size: 9.5;text:name;text-color: @water_label;}
line|z15-17[waterway=canal],
line|z15-17[natural=strait],
{font-size: 10;text:name;text-color: @water_label;}
line|z15-[waterway=river],
line|z15-[waterway=riverbank],
line|z18-[waterway=canal],
line|z18-[natural=strait],
{font-size: 11;text:name;text-color: @water_label;}
line[waterway][tunnel]
{text: none;}
/* 7. LANDUSE*/
/*7.2 Hostital 7.3 University & Sport */

100
data/styles/vehicle/include/Roads.mapcss
View file

@ -597,56 +597,29 @@ line|z19-[highway=service]
/* 8.OTHERS ROADS 13-22 ZOOM */
line|z13-[highway=pedestrian],
line|z13-[highway=ford]
{color: @pedestrian;opacity: 1;}
line|z13-[highway=cycleway]
{color: @cycleway;opacity: 1;}
line|z13-[highway=construction],
line|z13-[highway=proposed]
{color: @construction;opacity: 1;}
line|z13-[highway=pedestrian][bridge?]::bridgewhite,
line|z13-[highway=footway][bridge?]::bridgewhite,
line|z16-[highway=steps][bridge?]::bridgewhite,
line|z18-[highway=pedestrian][bridge?]::bridgewhite,
line|z18-[highway=footway][bridge?]::bridgewhite,
line|z18-[highway=steps][bridge?]::bridgewhite,
line|z16-[highway=road][bridge?]::bridgewhite,
line|z16-[highway=service][bridge?]::bridgewhite
{casing-linecap: butt;casing-color:@bridge_background;}
line|z13-[highway=pedestrian][bridge?]::bridgeblack,
line|z13-[highway=footway][bridge?]::bridgeblack,
line|z16-[highway=steps][bridge?]::bridgeblack,
line|z18-[highway=pedestrian][bridge?]::bridgeblack,
line|z18-[highway=footway][bridge?]::bridgeblack,
line|z18-[highway=steps][bridge?]::bridgeblack,
line|z16-[highway=road][bridge?]::bridgeblack,
line|z16-[highway=service][bridge?]::bridgeblack
{casing-linecap: butt;casing-color:@bridge_casing;}
/* 8.1 Pedestrian & ford 13-22 ZOOM */
/* 8.1 Pedestrian 18-22 ZOOM */
/*line|z13[highway=pedestrian],
line|z13[highway=ford]
{width: 1;dashes: 2,1;}
line|z14[highway=pedestrian],
line|z14[highway=ford]
{width: 1.6;dashes: 3.6,1.6;}
line|z15[highway=pedestrian],
line|z15[highway=ford]
{width: 2;dashes: 5,2.2;}
line|z16[highway=pedestrian],
line|z16[highway=ford]
{width: 2.4;dashes: 5.4,2.7;}
line|z17[highway=pedestrian],
line|z17[highway=ford]
{width: 3;dashes: 5,2;}
line|z18[highway=pedestrian],
line|z18[highway=ford]
{width: 4;dashes: 7,3;}
line|z19-[highway=pedestrian],
line|z19-[highway=ford]
{width: 5;dashes: 16.2,8.1;}*/
/* 8.2 Pedestrian & ford tunnel 16-22 ZOOM */
/*line|z16-[highway=pedestrian][tunnel?]
{casing-dashes: 5,5;}*/
line|z18-[highway=pedestrian],
{color: @pedestrian; opacity: 1; width: 2; dashes: 7,3;}
line|z18-[highway=pedestrian][tunnel?],
{width: 0;}
/* 8.3 Pedestrian & other brige 13-22 ZOOM */
@ -673,22 +646,12 @@ line|z16-[highway=pedestrian][bridge?]::bridgeblack,
line|z16-[highway=footway][bridge?]::bridgeblack,
{casing-width-add: 0.6;}*/
/* 8.4 Cycleway 13-22 ZOOM */
/* 8.4 Cycleway 18-22 ZOOM */
/*line|z13[highway=cycleway]
{width: 1;}
line|z14[highway=cycleway]
{width: 1.2;}
line|z15[highway=cycleway]
{width: 1.4;}
line|z16[highway=cycleway]
{width: 1.6;}
line|z17[highway=cycleway]
{width: 1.8;}
line|z18[highway=cycleway]
{width: 2;}
line|z19-[highway=cycleway]
{width: 2.2;}*/
line|z18-[highway=cycleway],
{color: @cycleway; opacity: 1; width: 1;}
line|z18-[highway=cycleway][tunnel?],
{width: 0;}
/* 8.5 Construction & Proposed 13-22 ZOOM */
@ -751,7 +714,8 @@ line|z18[highway=track],
{width: 1.9; dashes: 7,3;}
line|z19-[highway=track],
{width: 2.5; dashes: 7,3;}
line|z16-[highway=track][tunnel?],
{width: 0;}
line|z17-[highway=path],
line|z17-[route=hiking],
@ -765,32 +729,24 @@ line|z19-[highway=path],
line|z19-[route=hiking],
line|z19-[highway=footway][sac_scale],
{width: 1.5; dashes: 4,2.5;}
line|z17-[highway=path][tunnel?],
{width: 0;}
/* 8.7 Footway & Steps 18-22 ZOOM */
line|z18-[highway=footway],
line|z18-[highway=steps],
{color: @footway; opacity: 1; width: 1.5; dashes: 5,2;}
line|z19-[highway=footway],
line|z19-[highway=steps],
{width: 2; dashes: 5,2;}
line|z18-[highway=footway][tunnel?],
line|z18-[highway=steps][tunnel?],
{width: 0;}
/* 8.9 Bridleway 18-22 ZOOM */
/* 8.9 Bridleway 14-22 ZOOM */
/*line|z14[highway=bridleway]
{width: 0.9;dashes: 2.7,1.26;}
line|z15[highway=bridleway]
{width: 1.4;dashes: 2.7,1.26;}
line|z16[highway=bridleway]
{width: 1.8;dashes: 3.6,1.8;}
line|z17[highway=bridleway]
{width: 2;dashes: 4.5,1.8;}
line|z18[highway=bridleway]
{width: 3;dashes: 7.2,2.7;}
line|z19-[highway=bridleway]
{width: 4;dashes: 9,3.6;}*/
line|z18-[highway=bridleway],
{color: @bridleway; opacity: 1; width: 0.9; dashes: 3.6,1.8;}
line|z18-[highway=bridleway][tunnel?],
{width: 0;}
/* 8.11 Runway 12-22 ZOOM */

5
data/styles/vehicle/include/Roads_label.mapcss
View file

@ -264,30 +264,25 @@ line|z18-[highway=tertiary_link]
line|z14-[highway=unclassified],
line|z14-[highway=road],
line|z14-[highway=living_street],
line|z14-[highway=pedestrian],
line|z16-[highway=service],
{text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_medium;}
line|z14[highway=unclassified],
line|z14[highway=living_street],
line|z14[highway=pedestrian],
line|z14[highway=road],
{font-size: 12.5;}
line|z15[highway=unclassified],
line|z15[highway=living_street],
line|z15[highway=pedestrian],
line|z15[highway=road],
{font-size: 13.5;}
line|z16-17[highway=unclassified],
line|z16-17[highway=living_street],
{font-size: 14.5;text-halo-color: @label_halo_light;}
line|z16-17[highway=pedestrian],
line|z16-17[highway=service],
line|z16-17[highway=road],
{font-size: 15.5;text-halo-color: @label_halo_light;}
line|z18-[highway=unclassified],
line|z18-[highway=living_street],
line|z18-[highway=pedestrian],
line|z18-[highway=service],
line|z18-[highway=road],
{font-size: 15.75;text-halo-opacity: 1;text-halo-color: @label_halo_light;}

2
data/styles/vehicle/include/priorities_2_BG-top.prio.txt
View file

@ -34,7 +34,5 @@ waterway-dock # area z1-
waterway-riverbank # line z10- and area z1- (also has pathtext z11-)
=== 20
waterway-ditch # line z13-
waterway-drain # line z13-
waterway-river # line z10- (also has pathtext z11-)
=== 10

13
data/styles/vehicle/include/priorities_3_FG.prio.txt
View file

@ -17,7 +17,6 @@ historic-citywalls # line z15-
highway-steps # line z18-
highway-steps-bridge # line z18-
highway-steps-tunnel # line z18-
hwtag-oneway::arrows # line::arrows z15-
railway-tram::centerline # line::centerline z16- (also has line z16-)
railway-tram-bridge::centerline # line::centerline z16- (also has line z16-)
@ -237,6 +236,12 @@ highway-service-parking_aisle # line z14- (also has pathte
highway-service-tunnel # line z14- (also has pathtext z16-)
=== 140
highway-bridleway # line z18-
highway-bridleway-bridge # line z18-
highway-bridleway-permissive # line z18-
highway-cycleway # line z18-
highway-cycleway-bridge # line z18-
highway-cycleway-permissive # line z18-
highway-footway # line z18-
highway-footway-alpine_hiking # line z17-
highway-footway-area # line z18-
@ -247,7 +252,6 @@ highway-footway-difficult_alpine_hiking # line z17-
highway-footway-hiking # line z17-
highway-footway-mountain_hiking # line z17-
highway-footway-permissive # line z18-
highway-footway-tunnel # line z18-
highway-path # line z17-
highway-path-alpine_hiking # line z17-
highway-path-bicycle # line z17-
@ -259,7 +263,9 @@ highway-path-hiking # line z17-
highway-path-horse # line z17-
highway-path-mountain_hiking # line z17-
highway-path-permissive # line z17-
highway-path-tunnel # line z17-
highway-pedestrian # line z18-
highway-pedestrian-area # line z18-
highway-pedestrian-bridge # line z18-
highway-track # line z16-
highway-track-area # line z16-
highway-track-bridge # line z16-
@ -270,7 +276,6 @@ highway-track-grade4 # line z16-
highway-track-grade5 # line z16-
highway-track-no-access # line z16-
highway-track-permissive # line z16-
highway-track-tunnel # line z16-
=== 130
highway-construction # line z13-

10
data/styles/vehicle/include/priorities_4_overlays.prio.txt
View file

@ -440,15 +440,7 @@ tourism-theme_park # icon z14- (also has captio
shop-supermarket # icon z14- (also has caption(optional) z14-)
=== 1650
highway-pedestrian # pathtext z14-
highway-pedestrian-area # pathtext z14-
highway-pedestrian-bridge # pathtext z14-
highway-pedestrian-tunnel # pathtext z14-
=== 1600
natural-strait # caption z13-
waterway-river # pathtext z11- (also has line z10-)
waterway-river-tunnel # pathtext z11-
waterway-riverbank # pathtext z11- (also has line z10-, area z1-)
=== 1550
@ -457,8 +449,6 @@ natural-water-basin # caption z10- (also has are
natural-water-lock # caption z10- (also has area z1-)
natural-water-pond # caption z10- (also has area z1-)
shop-mall # icon z14- (also has caption(optional) z14-)
waterway-canal # pathtext z13-
waterway-canal-tunnel # pathtext z13-
=== 1500
natural-desert # caption z14- (also has area z1-)

4
generator/generator_tests/osm_type_test.cpp
View file

@ -2621,8 +2621,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
{{"tourism", "information", "guidepost"}, {{"tourism", "information"}, {"information", "guidepost"}}},
{{"tourism", "information", "map"}, {{"tourism", "information"}, {"information", "map"}}},
{{"tourism", "information", "office"}, {{"tourism", "information"}, {"information", "office"}}},
{{"waterway", "canal", "tunnel"}, {{"waterway", "canal"}, {"tunnel", "any_value"}}},
{{"waterway", "river", "tunnel"}, {{"waterway", "river"}, {"tunnel", "any_value"}}},
//{{"waterway", "canal", "tunnel"}, {{"waterway", "canal"}, {"tunnel", "any_value"}}},
//{{"waterway", "river", "tunnel"}, {{"waterway", "river"}, {"tunnel", "any_value"}}},
{{"waterway", "stream", "ephemeral"}, {{"waterway", "stream"}, {"intermittent", "ephemeral"}}},
{{"waterway", "stream", "intermittent"}, {{"waterway", "stream"}, {"intermittent", "yes"}}},
};