organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

WIP: WIP Add major railways to the World map #5548

Draft
pastk wants to merge 3 commits from pastk-styles-world-railways into master
pull from: pastk-styles-world-railways
merge into: organicmaps:master
Conversation 0 Commits 3 Files changed 9 +468 -9
9 changed files with 468 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/drules_proto.bin
View file

Binary file not shown.

150
data/drules_proto.txt
View file

@ -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 {

BIN
data/drules_proto_clear.bin
View file

Binary file not shown.

150
data/drules_proto_clear.txt
View file

@ -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 {

BIN
data/drules_proto_dark.bin
View file

Binary file not shown.

150
data/drules_proto_dark.txt
View file

@ -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 {

8
data/styles/clear/include/Roads.mapcss
View file

@ -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],

3
generator/feature_merger.hpp
View file

@ -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

16
generator/world_map_generator.hpp
View file

@ -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"));