From dba51a3af3eb6c0077f522203397323bf83e97c2 Mon Sep 17 00:00:00 2001 From: map per Date: Sun, 28 May 2023 17:45:05 +0200 Subject: [PATCH 1/2] [styles] Rendering for track numbers Signed-off-by: map per --- data/mapcss-mapping.csv | 2 +- data/styles/clear/include/Icons.mapcss | 9 ++++++++- data/styles/clear/style-clear/colors.mapcss | 1 + data/styles/clear/style-night/colors.mapcss | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 2b5997e898..614c0fcd5b 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -447,7 +447,7 @@ deprecated|deprecated;446;x railway|yard;447; deprecated|deprecated;448;x natural|meadow;449;landuse|meadow -deprecated|deprecated;450;x +public_transport|stop_position;[public_transport=stop_position];;ref;name;450; railway|razed;451; highway|footway|demanding_mountain_hiking;[highway=footway][sac_scale=demanding_mountain_hiking];;name;int_name;452; deprecated|deprecated;453;x diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 6833913126..63869b5a0e 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -156,7 +156,8 @@ area|z18-[craft], node[amenity=bbq], area[amenity=bbq], node[amenity=toilets], -area[amenity=toilets] +area[amenity=toilets], +node[public_transport=stop_position] {z-index: 2400;} /* Bigger than leisure=playground, sports_centre, pitch */ @@ -721,6 +722,9 @@ node|z14-[railway=station][transport=subway]::int_name, node|z17-[railway=subway_entrance]::int_name, {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;} +node|z18-[public_transport=stop_position], +{text: ref;text-color: @train_stop_position;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;} + node|z17-[railway=tram_stop], area|z17-[railway=tram_stop] {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;} @@ -794,6 +798,9 @@ node|z17-[railway=station]::int_name, node|z17-[railway=halt]::int_name, {text-offset: 1;font-size: 12;text-halo-opacity: 0.9;} +node|z18-[public_transport=stop_position], +{text-offset: 0;font-size: 12;} + /* 3.2 Subway Station */ node|z13[railway=station][transport=subway] diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss index 2b8cf49886..5811036772 100644 --- a/data/styles/clear/style-clear/colors.mapcss +++ b/data/styles/clear/style-clear/colors.mapcss @@ -148,6 +148,7 @@ @powerline: #969586; @tram: #7A7A7A; @ferry: #4499Bb; +@train_stop_position: #2F6499; /* 6.LABELS COLORS */ /* 6.1 Main labels */ diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss index 1b00cdff5d..dcca9fa26e 100644 --- a/data/styles/clear/style-night/colors.mapcss +++ b/data/styles/clear/style-night/colors.mapcss @@ -148,6 +148,7 @@ @powerline: #333333; @tram: #5C5C51; @ferry: #2A4541; +@train_stop_position: #2F6499; /* 6.LABELS COLORS */ /* 6.1 Main labels */ -- 2.45.3 From 2b0d92f156f0e69f7182b549dd9c995cd10e39ab Mon Sep 17 00:00:00 2001 From: map per Date: Sun, 28 May 2023 17:45:53 +0200 Subject: [PATCH 2/2] [styles] Regenerated Signed-off-by: map per --- data/classificator.txt | 1 + data/colors.txt | 1 + data/drules_proto.bin | Bin 318787 -> 318879 bytes data/drules_proto.txt | 27 +++++++++++++++++++++++++++ data/drules_proto_clear.bin | Bin 319494 -> 319586 bytes data/drules_proto_clear.txt | 27 +++++++++++++++++++++++++++ data/drules_proto_dark.bin | Bin 317812 -> 317904 bytes data/drules_proto_dark.txt | 27 +++++++++++++++++++++++++++ data/types.txt | 2 +- data/visibility.txt | 1 + 10 files changed, 85 insertions(+), 1 deletion(-) diff --git a/data/classificator.txt b/data/classificator.txt index fba346a4ec..a11c305707 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -811,6 +811,7 @@ world + {} public_transport + platform - + stop_position - {} railway + abandoned + diff --git a/data/colors.txt b/data/colors.txt index 3900f57260..dd28eacf07 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -76,6 +76,7 @@ 2828327 2836760 2894874 +3105945 3155515 3156522 3158064 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index a6ba5a7d445f8ff961cbb0f0882b30b8c388cdca..7a20f19e0936342078e1d328b6f87496be73ccb8 100644 GIT binary patch delta 119 zcmX@SOL+cn;f5B*ElkX7qocUw3QCi5GLz#=iW2jR3-XIfbc;*!3*rm%i!)0y^YetH yIfS&txr8`)1ZJMx%P8^x|NrZZM$AR2X%a6gfs(>FCEJ2*6;NJ|+ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 8bbabf1b3d..383418d38f 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -57638,6 +57638,33 @@ cont { } } } +cont { + name: "public_transport-stop_position" + element { + scale: 18 + caption { + primary { + height: 12 + color: 3105945 + stroke_color: 452984831 + text: "ref" + } + priority: 15592 + } + } + element { + scale: 19 + caption { + primary { + height: 12 + color: 3105945 + stroke_color: 452984831 + text: "ref" + } + priority: 15592 + } + } +} cont { name: "railway-abandoned" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index ceae79d4e00706b5b97515a021e98b233ed2d442..82161c4b926de48b7d3bb8bbe9581a4d950da8cb 100644 GIT binary patch delta 119 zcmZoWApGcna6=2@7N&X2qocUw3QCi5GLz#=iW2jR3-XIfbc;*!3*rm%i!)0y^YetH zIfS&txr8`)1ZJMx%P8^x|NrZZM$AR2X%a6gfs(>FCEMpNX98m8?Q@s2WLf|Kk$o*X delta 27 icmaEKK)CIIa6=2@7N&X2+kY)*0%GRvzm~IPSO5UNOATNE diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 09eda51253..b42f45e948 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -57140,6 +57140,33 @@ cont { } } } +cont { + name: "public_transport-stop_position" + element { + scale: 18 + caption { + primary { + height: 12 + color: 3105945 + stroke_color: 452984831 + text: "ref" + } + priority: 15592 + } + } + element { + scale: 19 + caption { + primary { + height: 12 + color: 3105945 + stroke_color: 452984831 + text: "ref" + } + priority: 15592 + } + } +} cont { name: "railway-abandoned" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 859164d5924f22ae40e677dca9edbe14d53f642c..2d13421a8c8b9b168e91ed81a55c3566ef7d9e2f 100644 GIT binary patch delta 119 zcmeyeN%+EM;f5B*ElhliqNBLv3QCi5GLz#=iW2jR3-XIfbc;*!3*rm%i!)0y^YetH yIfS&txr8`)1ZJMx%P7&X=*R^|Bj%#iG>I3LKuKYolI^^Un1GmhJMSWvbaMa(z9{Gb delta 32 ncmcbxS@_E);f5B*Elhlirgv{<;%P5i#0135+shWQM41Bs>aGn% diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 3a12b21413..cc5ce51182 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -57225,6 +57225,33 @@ cont { } } } +cont { + name: "public_transport-stop_position" + element { + scale: 18 + caption { + primary { + height: 12 + color: 3105945 + stroke_color: 437326080 + text: "ref" + } + priority: 15592 + } + } + element { + scale: 19 + caption { + primary { + height: 12 + color: 3105945 + stroke_color: 437326080 + text: "ref" + } + priority: 15592 + } + } +} cont { name: "railway-abandoned" element { diff --git a/data/types.txt b/data/types.txt index bcfe0d7836..ad0e936f17 100644 --- a/data/types.txt +++ b/data/types.txt @@ -447,7 +447,7 @@ mapswithme *railway|yard mapswithme landuse|meadow -mapswithme +*public_transport|stop_position *railway|razed *highway|footway|demanding_mountain_hiking mapswithme diff --git a/data/visibility.txt b/data/visibility.txt index 1d2353fbb2..13afb451b4 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -811,6 +811,7 @@ world 00000000000000000000 + {} public_transport 00000000000000000000 + platform 00000000000000000000 - + stop_position 00000000000000000000 - {} railway 00000000000000000000 + abandoned 00000000000000001111 + -- 2.45.3