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

[styles] Added generic icon for monorail stations

Browse source 
added [railway=halt][station=monorail] to the existing [railway=station][station=monorail] in the mapping as it’s quite often used, but the difference between station and halt doesn’t matter for maps

Signed-off-by: Jenny Em <ubahnverleih@gmail.com>
This commit is contained in:
Jenny Em 2024-12-11 22:06:15 +01:00 • committed by Konstantin Pastbin
parent a634c76ac5
commit a0590b3b1f
7 changed files with 76 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/mapcss-mapping.csv
View file

@ -1124,7 +1124,7 @@ public_transport|platform;1008;
junction;[junction];;name;int_name;1009;
aeroway|aerodrome|international;[aeroway=aerodrome][aerodrome=international],[aeroway=aerodrome][aerodrome:type=international];;name;int_name;1010;
railway|station|light_rail;[railway=station][station=light_rail],[railway=station][transport=light_rail];;name;int_name;1011;
railway|station|monorail;[railway=station][station=monorail],[railway=station][transport=monorail];;name;int_name;1012;
railway|station|monorail;[railway=station][station=monorail],[railway=station][transport=monorail],[railway=halt][station=monorail];;name;int_name;1012;
railway|station|subway|london;[railway=station][transport=subway][city=london],[railway=station][station=subway][city=london];;name;int_name;1013;
railway|station|subway|newyork;[railway=station][transport=subway][city=newyork],[railway=station][station=subway][city=newyork];;name;int_name;1014;
railway|station|subway|moscow;[railway=station][transport=subway][city=moscow],[railway=station][station=subway][city=moscow];;name;int_name;1015;

Can't render this file because it contains an unexpected character in line 7 and column 16.

1
data/strings/types_strings.txt
View file

@ -23332,6 +23332,7 @@
ref = type.railway.station
en = Monorail Station
af = Lugspoorstasie
de = Einschienenbahn-Station
zh-Hans = 单轨车站
zh-Hant = 單軌車站

15
data/styles/default/dark/symbols/monorail-m.svg Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18" height="18" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g id="train-m">
<path id="Rectangle" d="M18,1.875L18,16.125C18,17.16 17.16,18 16.125,18L1.875,18C0.84,18 0,17.16 0,16.125L0,1.875C0,0.84 0.84,0 1.875,0L16.125,0C17.16,0 18,0.84 18,1.875Z" style="fill:#000;fill-opacity:0.6;"/>
<path id="Rectangle1" d="M17.25,2.25L17.25,15.75C17.25,16.578 16.578,17.25 15.75,17.25L2.25,17.25C1.422,17.25 0.75,16.578 0.75,15.75L0.75,2.25C0.75,1.422 1.422,0.75 2.25,0.75L15.75,0.75C16.578,0.75 17.25,1.422 17.25,2.25Z" style="fill:#2F6499;"/>
<g id="Shape" transform="matrix(1.13476,0,0,1.13476,3.86241,3)">
<path d="M8.4,1.65C8.4,0.75 7.65,0 6.675,0L2.325,0C1.35,0 0.6,0.75 0.6,1.65L0.3,7.65L0.3,7.725C0.3,8.7 1.05,9.45 2.025,9.45L2.778,9.45L2.787,8.626C2.787,8.251 3.133,7.951 3.508,7.951L5.6,7.948C5.975,7.948 6.275,8.248 6.275,8.623L6.275,9.373L7.05,9.375L7.125,9.375C8.1,9.3 8.775,8.55 8.775,7.575L8.4,1.65ZM5.537,6.6C5.537,6.75 5.387,6.9 5.237,6.9L3.812,6.9C3.662,6.9 3.512,6.75 3.512,6.6L3.512,6.45C3.512,6.3 3.662,6.15 3.812,6.15L5.237,6.15C5.387,6.15 5.537,6.3 5.537,6.45L5.537,6.6ZM6.525,5.325L2.475,5.325C2.025,5.325 1.65,4.95 1.65,4.425L1.65,4.35L1.725,2.1C1.725,1.65 2.1,1.275 2.55,1.275L6.375,1.275C6.825,1.275 7.2,1.65 7.2,2.1L7.275,4.35C7.35,4.875 7.05,5.325 6.525,5.325Z" style="fill:#000;fill-rule:nonzero;"/>
</g>
<g id="Path" transform="matrix(1.25697,0,0,1.13476,3.20448,3.05726)">
<path d="M4.822,8.765L4.35,8.765C4.05,8.765 3.825,9 3.825,9.3L3.825,10.05C3.825,10.35 4.05,10.575 4.35,10.575L4.875,10.575C5.175,10.575 5.4,10.35 5.4,10.05L5.4,9.3C5.405,8.971 5.165,8.761 4.822,8.765Z" style="fill:#000;fill-rule:nonzero;"/>
</g>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

15
data/styles/default/dark/symbols/monorail-s.svg Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="12" height="12" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g id="train-s">
<path id="Rectangle" d="M12,1.875L12,10.125C12,11.16 11.16,12 10.125,12L1.875,12C0.84,12 0,11.16 0,10.125L0,1.875C0,0.84 0.84,0 1.875,0L10.125,0C11.16,0 12,0.84 12,1.875Z" style="fill:#000;fill-opacity:0.6;"/>
<path id="Rectangle1" d="M11.5,2L11.5,10C11.5,10.828 10.828,11.5 10,11.5L2,11.5C1.172,11.5 0.5,10.828 0.5,10L0.5,2C0.5,1.172 1.172,0.5 2,0.5L10,0.5C10.828,0.5 11.5,1.172 11.5,2Z" style="fill:#2F6499;"/>
</g>
<g id="Shape" transform="matrix(0.745847,0,0,0.745847,2.61572,2.06621)">
<path d="M8.548,1.249C8.548,0.349 8.187,-0.091 7.212,-0.091L1.858,-0.087C0.883,-0.087 0.525,0.36 0.525,1.26L0.486,7.96C0.486,8.935 0.381,9.29 1.356,9.29L1.858,9.29L1.866,8.626C1.866,8.251 2.213,7.951 2.588,7.951L6.549,7.956C6.924,7.956 7.224,8.256 7.224,8.631L7.224,9.306L7.8,9.305C8.761,9.294 8.553,8.921 8.553,7.946L8.548,1.249ZM5.537,6.298C5.537,6.448 5.387,6.598 5.237,6.598L3.812,6.598C3.662,6.598 3.512,6.448 3.512,6.298L3.512,6.148C3.512,5.998 3.662,5.848 3.812,5.848L5.237,5.848C5.387,5.848 5.537,5.998 5.537,6.148L5.537,6.298ZM6.549,4.605L2.526,4.605C2.076,4.605 1.856,4.46 1.856,3.935L1.852,1.918C1.852,1.468 2.076,1.252 2.526,1.252L6.549,1.256C6.999,1.256 7.226,1.468 7.226,1.918L7.222,3.935C7.228,4.371 7.074,4.605 6.549,4.605Z" style="fill:#000;fill-rule:nonzero;"/>
</g>
<g id="Path" transform="matrix(1.26636,0,0,0.550798,0.159002,4.17278)">
<path d="M4.822,8.765L4.35,8.765C4.05,8.765 3.823,8.777 3.825,9.3L3.825,10.05C3.823,10.576 4.05,10.575 4.35,10.575L4.875,10.575C5.175,10.575 5.396,10.574 5.4,10.05L5.4,9.3C5.405,8.762 5.165,8.761 4.822,8.765Z" style="fill:#000;fill-rule:nonzero;"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

14
data/styles/default/include/Subways.mapcss
View file

@ -12,10 +12,12 @@ the bbox to MatchCity() in generator/osm2type.cpp
/* reset style for generic station because railway-station inherited from icons.mapcss */
node|z0-[railway=station][transport=subway],
node|z0-[railway=station][station=light_rail],
node|z0-[railway=station][station=monorail],
{icon-image: none; text: none;}
node|z0-[railway=station][transport=subway]::int_name,
node|z0-[railway=station][station=light_rail]::int_name,
node|z0-[railway=station][station=monorail]::int_name,
{icon-image: none; text: none;}
/*TODO: for some reason, int_name rules and normal rules have to be
separate, otherwise generating drules fails with a priority error */
@ -28,32 +30,44 @@ node|z13-[railway=station][station=light_rail],
{icon-image: train-s.svg;}
node|z15-[railway=station][station=light_rail],
{icon-image: train-m.svg;}
node|z13-[railway=station][station=monorail],
{icon-image: monorail-s.svg;}
node|z15-[railway=station][station=monorail],
{icon-image: monorail-m.svg;}
node|z14-[railway=station][transport=subway],
node|z14-[railway=station][station=light_rail],
node|z14-[railway=station][station=monorail],
{text: name;text-offset: 1;font-size: 11;text-color: @label_dark;text-halo-radius: 1;text-halo-color: @label_halo_light;text-halo-opacity: 0.8;}
node|z14-[railway=station][transport=subway]::int_name,
node|z14-[railway=station][station=light_rail]::int_name,
node|z14-[railway=station][station=monorail]::int_name,
{text: int_name;text-offset: 1;font-size: 9;text-color: @label_dark;text-halo-radius: 1;text-halo-color: @label_halo_light;text-halo-opacity: 0.8;}
node|z15-[railway=station][transport=subway],
node|z15-[railway=station][station=light_rail],
node|z15-[railway=station][station=monorail],
{font-size: 12;}
node|z16-[railway=station][transport=subway],
node|z16-[railway=station][station=light_rail],
node|z16-[railway=station][station=monorail],
{font-size: 13;}
node|z17-[railway=station][transport=subway],
node|z17-[railway=station][station=light_rail],
node|z17-[railway=station][station=monorail],
{text-halo-opacity: 0.9;}
node|z15-[railway=station][transport=subway]::int_name,
node|z15-[railway=station][station=light_rail]::int_name,
node|z15-[railway=station][station=monorail]::int_name,
{font-size: 10;}
node|z16-[railway=station][transport=subway]::int_name,
node|z16-[railway=station][station=light_rail]::int_name
node|z16-[railway=station][station=monorail]::int_name
{font-size: 11}
node|z17-[railway=station][transport=subway]::int_name,
node|z17-[railway=station][station=light_rail]::int_name,
node|z17-[railway=station][station=monorail]::int_name,
{text-halo-opacity: 0.9;}
node|z16-[railway=subway_entrance],

15
data/styles/default/light/symbols/monorail-m.svg Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
<g>
<g id="train-m">
<path id="Rectangle" d="M18,1.875L18,16.125C18,17.16 17.16,18 16.125,18L1.875,18C0.84,18 0,17.16 0,16.125L0,1.875C0,0.84 0.84,0 1.875,0L16.125,0C17.16,0 18,0.84 18,1.875Z" style="fill:white;fill-opacity:0.6;"/>
<path id="Rectangle1" d="M17.25,2.25L17.25,15.75C17.25,16.578 16.578,17.25 15.75,17.25L2.25,17.25C1.422,17.25 0.75,16.578 0.75,15.75L0.75,2.25C0.75,1.422 1.422,0.75 2.25,0.75L15.75,0.75C16.578,0.75 17.25,1.422 17.25,2.25Z" style="fill:rgb(47,100,153);"/>
<g id="Shape" transform="matrix(1.13476,0,0,1.13476,3.86241,3)">
<path d="M8.4,1.65C8.4,0.75 7.65,0 6.675,0L2.325,0C1.35,0 0.6,0.75 0.6,1.65L0.3,7.65L0.3,7.725C0.3,8.7 1.05,9.45 2.025,9.45L2.778,9.45L2.787,8.626C2.787,8.251 3.133,7.951 3.508,7.951L5.6,7.948C5.975,7.948 6.275,8.248 6.275,8.623L6.275,9.373L7.05,9.375L7.125,9.375C8.1,9.3 8.775,8.55 8.775,7.575L8.4,1.65ZM5.537,6.6C5.537,6.75 5.387,6.9 5.237,6.9L3.812,6.9C3.662,6.9 3.512,6.75 3.512,6.6L3.512,6.45C3.512,6.3 3.662,6.15 3.812,6.15L5.237,6.15C5.387,6.15 5.537,6.3 5.537,6.45L5.537,6.6ZM6.525,5.325L2.475,5.325C2.025,5.325 1.65,4.95 1.65,4.425L1.65,4.35L1.725,2.1C1.725,1.65 2.1,1.275 2.55,1.275L6.375,1.275C6.825,1.275 7.2,1.65 7.2,2.1L7.275,4.35C7.35,4.875 7.05,5.325 6.525,5.325Z" style="fill:white;fill-rule:nonzero;"/>
</g>
<g id="Path" transform="matrix(1.25697,0,0,1.13476,3.20448,3.05726)">
<path d="M4.822,8.765L4.35,8.765C4.05,8.765 3.825,9 3.825,9.3L3.825,10.05C3.825,10.35 4.05,10.575 4.35,10.575L4.875,10.575C5.175,10.575 5.4,10.35 5.4,10.05L5.4,9.3C5.405,8.971 5.165,8.761 4.822,8.765Z" style="fill:white;fill-rule:nonzero;"/>
</g>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

15
data/styles/default/light/symbols/monorail-s.svg Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="12" height="12" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g id="train-s">
<path id="Rectangle" d="M12,1.875L12,10.125C12,11.16 11.16,12 10.125,12L1.875,12C0.84,12 0,11.16 0,10.125L0,1.875C0,0.84 0.84,0 1.875,0L10.125,0C11.16,0 12,0.84 12,1.875Z" style="fill:white;fill-opacity:0.6;"/>
<path id="Rectangle1" d="M11.5,2L11.5,10C11.5,10.828 10.828,11.5 10,11.5L2,11.5C1.172,11.5 0.5,10.828 0.5,10L0.5,2C0.5,1.172 1.172,0.5 2,0.5L10,0.5C10.828,0.5 11.5,1.172 11.5,2Z" style="fill:rgb(47,100,153);"/>
</g>
<g id="Shape" transform="matrix(0.745847,0,0,0.745847,2.61572,2.06621)">
<path d="M8.548,1.249C8.548,0.349 8.187,-0.091 7.212,-0.091L1.858,-0.087C0.883,-0.087 0.525,0.36 0.525,1.26L0.486,7.96C0.486,8.935 0.381,9.29 1.356,9.29L1.858,9.29L1.866,8.626C1.866,8.251 2.213,7.951 2.588,7.951L6.549,7.956C6.924,7.956 7.224,8.256 7.224,8.631L7.224,9.306L7.8,9.305C8.761,9.294 8.553,8.921 8.553,7.946L8.548,1.249ZM5.537,6.298C5.537,6.448 5.387,6.598 5.237,6.598L3.812,6.598C3.662,6.598 3.512,6.448 3.512,6.298L3.512,6.148C3.512,5.998 3.662,5.848 3.812,5.848L5.237,5.848C5.387,5.848 5.537,5.998 5.537,6.148L5.537,6.298ZM6.549,4.605L2.526,4.605C2.076,4.605 1.856,4.46 1.856,3.935L1.852,1.918C1.852,1.468 2.076,1.252 2.526,1.252L6.549,1.256C6.999,1.256 7.226,1.468 7.226,1.918L7.222,3.935C7.228,4.371 7.074,4.605 6.549,4.605Z" style="fill:white;fill-rule:nonzero;"/>
</g>
<g id="Path" transform="matrix(1.26636,0,0,0.550798,0.159002,4.17278)">
<path d="M4.822,8.765L4.35,8.765C4.05,8.765 3.823,8.777 3.825,9.3L3.825,10.05C3.823,10.576 4.05,10.575 4.35,10.575L4.875,10.575C5.175,10.575 5.396,10.574 5.4,10.05L5.4,9.3C5.405,8.762 5.165,8.761 4.822,8.765Z" style="fill:white;fill-rule:nonzero;"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB