From 60b735f5f664d4bf21baa79af7b441d328a9cba1 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 15 Jul 2023 22:42:24 +0300 Subject: [PATCH 1/3] [styles] Add major railways to the World map Signed-off-by: Konstantin Pastbin --- data/styles/clear/include/Roads.mapcss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss index c84e0ea9f6..ce9cc58d52 100644 --- a/data/styles/clear/include/Roads.mapcss +++ b/data/styles/clear/include/Roads.mapcss @@ -1102,8 +1102,8 @@ line|z16-[railway=rail]::dash, {color: @railway_dash; opacity:1;} -line|z10-[railway=rail][highspeed?], -line|z10-[railway=rail][usage=main], +line|z7-[railway=rail][highspeed?], +line|z8-[railway=rail][usage=main], line|z11-[railway=rail][usage=branch], {color: @railway; opacity: 1;} line|z10-[railway=rail][usage=tourism], @@ -1191,7 +1191,7 @@ line|z16[railway=rail][service=service]::dash, {width: 0;} -line|z10-11[railway=rail][usage=main], +line|z8-11[railway=rail][usage=main], line|z10-11[railway=rail][usage=tourism], line|z11[railway=rail][usage=branch], line|z13[railway=rail][usage=utility], @@ -1201,7 +1201,7 @@ line|z12[railway=rail][usage=tourism], line|z12[railway=rail][usage=branch], line|z14[railway=rail][usage=utility], {width: 1.1;} -line|z10[railway=rail][highspeed?], +line|z7-10[railway=rail][highspeed?], line|z13[railway=rail][usage=main], line|z13[railway=rail][usage=tourism], line|z13[railway=rail][usage=branch], -- 2.45.3 From 71e2eb3fd6c9d82519c0d412a3cfca62a6def5d7 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 15 Jul 2023 22:44:21 +0300 Subject: [PATCH 2/3] [styles] Regenerate for World railways Signed-off-by: Konstantin Pastbin --- data/drules_proto.bin | Bin 333896 -> 334301 bytes data/drules_proto.txt | 150 ++++++++++++++++++++++++++++++++++++ data/drules_proto_clear.bin | Bin 334505 -> 334910 bytes data/drules_proto_clear.txt | 150 ++++++++++++++++++++++++++++++++++++ data/drules_proto_dark.bin | Bin 332840 -> 333245 bytes data/drules_proto_dark.txt | 150 ++++++++++++++++++++++++++++++++++++ 6 files changed, 450 insertions(+) diff --git a/data/drules_proto.bin b/data/drules_proto.bin index b5f40b8627eed6d833d3be9562c7cbe1aca9c246..fa470986a0448534f9627b0fb563867f2044e0d5 100644 GIT binary patch delta 266 zcmX@HLFDdck%kt=Elhm(8UIe_zt1GY$UeRPF_RP{2ZZ7TQ_~+lVDg`S_A!&>_R05| zv=|v*Pv7@|Ng1o!?Lf7aOpL!kDx|ndO7rqkbA%*0a2mTEXsjiZ>obtp< zT@bCCo0ypg)WVICOM!xk>s}n<$-qJ0!fKZ dk9)<$i7F4#AA1XEVf*_xAk4h|{Tr4@Z2+roXVd@y delta 162 zcmcb+S>(h9k%kt=Elhm(8P`nbzt1Eyz4;-N|MUY-m?XD9xzD7<$T({{|3fC_?Lgs5 zCdQQ@jucx-X*kC6m*3ph8Qg_Lg@b%)Gtj9ZRG( E0H=6B@Bjb+ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 41b6e86ccb..d9957b1acc 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -60694,6 +60694,36 @@ cont { } cont { name: "railway-rail-highspeed" + element { + scale: 7 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -60822,6 +60852,36 @@ cont { } cont { name: "railway-rail-highspeed-bridge" + element { + scale: 7 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -61016,6 +61076,36 @@ cont { } cont { name: "railway-rail-highspeed-tunnel" + element { + scale: 7 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -61204,6 +61294,26 @@ cont { } cont { name: "railway-rail-main" + element { + scale: 8 + lines { + width: 1.0 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.0 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -61332,6 +61442,26 @@ cont { } cont { name: "railway-rail-main-bridge" + element { + scale: 8 + lines { + width: 1.0 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.0 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -61526,6 +61656,26 @@ cont { } cont { name: "railway-rail-main-tunnel" + element { + scale: 8 + lines { + width: 1.0 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.0 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index a0f89e06eef80b45fd3c3e3bd597060086fcf23e..98babd6c0e2ea90f533199b7a0b9403c50e663dc 100644 GIT binary patch delta 248 zcmZ3vRb<}|k%kt=Elln=8UIfAxXC2L$Ua^AHj@-12ZZ7TQ`=K+GEHJ+d_Dd9Ehc5G zDy9Qf_;1g=&7{S|_-p!FKW?GRa}e`)?P&1hhus7Au!TQDSCJd19q5h}O+b%*@j*Db34E%@LC1Kry!+ PXf6;lZ(s0)h0_cGwT)Mj delta 176 zcmdnDLuBPvk%kt=Elln=8P`nrxXC2L$Thv;CX>|m3pbg{85w6y_qffZ3>BLW6f@b* zeTPYliE-t0vwJ8KzSHMEW8&E^cb`dwNpv|gmtaw1W=?rxr7nop%}vbA+g|&SX(}V* z)aehOGKo&#_?by;dhbIfr|Fzum{hh~Ut(foVq5}}lbhb~kSSyP`YTKdOznGLfH3p+ Jy)RfAjR9YlMcV)X diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index fe0249e1bd..f3ea8cbca4 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -60155,6 +60155,36 @@ cont { } cont { name: "railway-rail-highspeed" + element { + scale: 7 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -60283,6 +60313,36 @@ cont { } cont { name: "railway-rail-highspeed-bridge" + element { + scale: 7 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -60477,6 +60537,36 @@ cont { } cont { name: "railway-rail-highspeed-tunnel" + element { + scale: 7 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.2 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -60665,6 +60755,26 @@ cont { } cont { name: "railway-rail-main" + element { + scale: 8 + lines { + width: 1.0 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.0 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -60793,6 +60903,26 @@ cont { } cont { name: "railway-rail-main-bridge" + element { + scale: 8 + lines { + width: 1.0 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.0 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -60987,6 +61117,26 @@ cont { } cont { name: "railway-rail-main-tunnel" + element { + scale: 8 + lines { + width: 1.0 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.0 + color: 9868678 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index a9a2e37ca716c92248e7d4b3ffaf223e3306dd33..f746d38822908ccee2cd1477f1efa504fbc22b47 100644 GIT binary patch delta 284 zcmZ3nLS*l1k%kt=ElkfZv;1V{5}U4ngGr1Dsyq*@t|!i??PZ!pO)N#11U5-dv0 z%qdT-)CJMHxrv#1K(}yApKu1~7ETDo1*WFE-)Hijo^yqXXM6l@pd{n*=~Z`__Y0S;pF delta 169 zcmdnHT4covk%kt=ElkfZv#em|5}SVU29wxy` zce=^szkT^NCN(C;r66JD?Ld(hCeg*rT!KZ3nK|W&mAW8WH#adeZ@b_friqL)6Ir<= zFywTTiZWBuQ>O!!1Z{V_2QqNM^xOwba??fbFl9_%b(4vw-Si<75HoK#eaO;b0st;( BK~(?% diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index da828458e6..9679a2d85f 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -60240,6 +60240,36 @@ cont { } cont { name: "railway-rail-highspeed" + element { + scale: 7 + lines { + width: 1.2 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 1.2 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.2 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -60368,6 +60398,36 @@ cont { } cont { name: "railway-rail-highspeed-bridge" + element { + scale: 7 + lines { + width: 1.2 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 1.2 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.2 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -60562,6 +60622,36 @@ cont { } cont { name: "railway-rail-highspeed-tunnel" + element { + scale: 7 + lines { + width: 1.2 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 1.2 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.2 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -60750,6 +60840,26 @@ cont { } cont { name: "railway-rail-main" + element { + scale: 8 + lines { + width: 1.0 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.0 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -60878,6 +60988,26 @@ cont { } cont { name: "railway-rail-main-bridge" + element { + scale: 8 + lines { + width: 1.0 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.0 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { @@ -61072,6 +61202,26 @@ cont { } cont { name: "railway-rail-main-tunnel" + element { + scale: 8 + lines { + width: 1.0 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.0 + color: 4470602 + priority: 411 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 10 lines { -- 2.45.3 From 7d5efe18fba4f3a4f6905ed2ce6317af32633e4a Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 22 Jul 2023 15:22:13 +0300 Subject: [PATCH 3/3] [generator] Do not truncate railway-rail-* types for World map Signed-off-by: Konstantin Pastbin --- generator/feature_merger.hpp | 3 +++ generator/world_map_generator.hpp | 16 +++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/generator/feature_merger.hpp b/generator/feature_merger.hpp index a7d65f33f1..a465524a24 100644 --- a/generator/feature_merger.hpp +++ b/generator/feature_merger.hpp @@ -95,6 +95,9 @@ class FeatureTypesProcessor static uint32_t GetType(char const * arr[], size_t n); + // Truncates the types to leave first two parts only (e.g. highway-motorway), + // unless the type is added into exceptions. + // Then optionally maps into a different type if a mapping was set before. void CorrectType(uint32_t & t) const; class do_change_types diff --git a/generator/world_map_generator.hpp b/generator/world_map_generator.hpp index c7ad602a55..63d313308f 100644 --- a/generator/world_map_generator.hpp +++ b/generator/world_map_generator.hpp @@ -100,17 +100,23 @@ public: , m_boundaryChecker(rawGeometryFileName) , m_popularPlacesFilename(popularPlacesFilename) { - // Do not strip last types for given tags, + // By default all line types are truncated to 2 parts only. + // Do not strip last parts for given types, // for example, do not cut 'admin_level' in 'boundary-administrative-XXX'. char const * arr1[][3] = {{"boundary", "administrative", "2"}, {"boundary", "administrative", "3"}, - {"boundary", "administrative", "4"}}; - + {"boundary", "administrative", "4"}, + {"railway", "rail", "highspeed"}, + {"railway", "rail", "main"}}; for (size_t i = 0; i < ARRAY_SIZE(arr1); ++i) m_typesCorrector.SetDontNormalizeType(arr1[i]); - char const * arr2[] = {"boundary", "administrative", "4", "state"}; - m_typesCorrector.SetDontNormalizeType(arr2); + char const * arr2[][4] = {{"railway", "rail", "highspeed", "bridge"}, + {"railway", "rail", "highspeed", "tunnel"}, + {"railway", "rail", "main", "bridge"}, + {"railway", "rail", "main", "tunnel"}}; + for (size_t i = 0; i < ARRAY_SIZE(arr2); ++i) + m_typesCorrector.SetDontNormalizeType(arr2[i]); if (popularPlacesFilename.empty()) LOG(LWARNING, ("popular_places_data option not set. Popular atractions will not be added to World.mwm")); -- 2.45.3