diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index a898ceeb46..953e197ec3 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1573,7 +1573,7 @@ railway|subway_entrance|lausanne;[railway=subway_entrance][city=lausanne];;name; railway|subway_entrance|lille;[railway=subway_entrance][city=lille];;name;int_name;1499; railway|subway_entrance|lima;[railway=subway_entrance][city=lima];;name;int_name;1500; railway|subway_entrance|lisboa;[railway=subway_entrance][city=lisboa];;name;int_name;1501; -deprecated|deprecated;1502;x +railway|subway_entrance|tehran;[railway=subway_entrance][city=tehran];;name;int_name;1502; railway|subway_entrance|lyon;[railway=subway_entrance][city=lyon];;name;int_name;1503; railway|subway_entrance|malaga;[railway=subway_entrance][city=malaga];;name;int_name;1504; railway|subway_entrance|manila;[railway=subway_entrance][city=manila];;name;int_name;1505; @@ -1636,3 +1636,4 @@ shop|herbalist;1561; shop|camera;1562; shop|auction;1563; shop|collector;1564; +railway|station|subway|tehran;[railway=station][transport=subway][city=tehran],[railway=station][station=subway][city=tehran];;name;int_name;1565; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 187d3b9374..604c265b88 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -20389,6 +20389,9 @@ [type.railway.station.subway.tbilisi] ref = type.railway.station.subway + [type.railway.station.subway.tehran] + ref = type.railway.station.subway + [type.railway.station.subway.tianjin] ref = type.railway.station.subway @@ -20804,6 +20807,9 @@ [type.railway.subway_entrance.tbilisi] ref = type.railway.subway_entrance + [type.railway.subway_entrance.tehran] + ref = type.railway.subway_entrance + [type.railway.subway_entrance.tianjin] ref = type.railway.subway_entrance diff --git a/data/styles/clear/include/Subways.mapcss b/data/styles/clear/include/Subways.mapcss index 9220db1682..000350b9ee 100644 --- a/data/styles/clear/include/Subways.mapcss +++ b/data/styles/clear/include/Subways.mapcss @@ -848,6 +848,13 @@ node|z15-16[railway=station][transport=subway][city=tbilisi] {icon-image: subway node|z17-[railway=station][transport=subway][city=tbilisi] {icon-image: subway-tbilisi-m.svg;} node|z16-[railway=subway_entrance][city=tbilisi] {icon-image: subway-tbilisi-s.svg;} +/* Tehran Subway Station */ +node|z13[railway=station][transport=subway][city=tehran] {icon-image: subway-tehran-s.svg;icon-min-distance: 1;} +node|z14[railway=station][transport=subway][city=tehran] {icon-image: subway-tehran-s.svg;} +node|z15-16[railway=station][transport=subway][city=tehran] {icon-image: subway-tehran-m.svg;} +node|z17-[railway=station][transport=subway][city=tehran] {icon-image: subway-tehran-m.svg;} +node|z16-[railway=subway_entrance][city=tehran] {icon-image: subway-tehran-s.svg;} + /* Tianjin Subway Station */ node|z13[railway=station][transport=subway][city=tianjin] {icon-image: subway-tianjin-s.svg;icon-min-distance: 1;} node|z14[railway=station][transport=subway][city=tianjin] {icon-image: subway-tianjin-s.svg;} diff --git a/data/styles/clear/style-clear/symbols/subway-tehran-m.svg b/data/styles/clear/style-clear/symbols/subway-tehran-m.svg new file mode 100644 index 0000000000..a348e61574 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/subway-tehran-m.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/subway-tehran-s.svg b/data/styles/clear/style-clear/symbols/subway-tehran-s.svg new file mode 100644 index 0000000000..75c82b5a27 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/subway-tehran-s.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/subway-tehran-m.svg b/data/styles/clear/style-night/symbols/subway-tehran-m.svg new file mode 100644 index 0000000000..a348e61574 --- /dev/null +++ b/data/styles/clear/style-night/symbols/subway-tehran-m.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/subway-tehran-s.svg b/data/styles/clear/style-night/symbols/subway-tehran-s.svg new file mode 100644 index 0000000000..75c82b5a27 --- /dev/null +++ b/data/styles/clear/style-night/symbols/subway-tehran-s.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/data/styles/vehicle/include/Subways.mapcss b/data/styles/vehicle/include/Subways.mapcss index 9d44380e39..a5d69165f6 100644 --- a/data/styles/vehicle/include/Subways.mapcss +++ b/data/styles/vehicle/include/Subways.mapcss @@ -825,6 +825,13 @@ node|z15-16[railway=station][transport=subway][city=tbilisi] {icon-image: subway node|z17-[railway=station][transport=subway][city=tbilisi] {icon-image: subway-tbilisi-m.svg;} node|z16-[railway=subway_entrance][city=tbilisi] {icon-image: subway-tbilisi-s.svg;} +/* Tehran Subway Station */ +node|z13[railway=station][transport=subway][city=tehran] {icon-image: subway-tehran-s.svg;icon-min-distance: 1;} +node|z14[railway=station][transport=subway][city=tehran] {icon-image: subway-tehran-s.svg;} +node|z15-16[railway=station][transport=subway][city=tehran] {icon-image: subway-tehran-m.svg;} +node|z17-[railway=station][transport=subway][city=tehran] {icon-image: subway-tehran-m.svg;} +node|z16-[railway=subway_entrance][city=tehran] {icon-image: subway-tehran-s.svg;} + /* Tianjin Subway Station */ node|z13[railway=station][transport=subway][city=tianjin] {icon-image: subway-tianjin-s.svg;icon-min-distance: 1;} node|z14[railway=station][transport=subway][city=tianjin] {icon-image: subway-tianjin-s.svg;} diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index 94abc2ea82..8cd90dc43d 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -404,19 +404,19 @@ string MatchCity(OsmElement const * p) {"kunming", {102.0983,24.3319,103.5969,25.7119}}, {"kyoto", {135.619598, 34.874916, 135.878442, 35.113709}}, {"lausanne", {6.583868,46.504301,6.720813,46.602578}}, - {"lille", {2.789132,50.441626,3.329113,50.794609}}, + {"lille", {2.789132,50.441626,3.329113,50.794609}}, {"lima", {-77.2750854492, -12.3279274859, -76.7999267578, -11.7988014362}}, {"lisboa", {-9.42626953125, 38.548165423, -8.876953125, 38.9166815364}}, {"london", {-0.4833984375, 51.3031452592, 0.2197265625, 51.6929902115}}, {"la", {-118.944112, 32.806553, -117.644787, 34.822766}}, {"lyon", {4.5741, 45.5842, 5.1603, 45.9393}}, {"madrid", {-4.00451660156, 40.1536868578, -3.32885742188, 40.6222917831}}, - {"malaga", {-5.611777,36.310352,-3.765967,37.282445}}, - {"manila", {120.936229,14.550825,121.026167,14.639547}}, - {"maracaibo", {-71.812942,10.570632,-71.581199,10.758897}}, - {"mashhad", {59.302159,36.13267,59.83225,36.530945}}, + {"malaga", {-5.611777,36.310352,-3.765967,37.282445}}, + {"manila", {120.936229,14.550825,121.026167,14.639547}}, + {"maracaibo", {-71.812942,10.570632,-71.581199,10.758897}}, + {"mashhad", {59.302159,36.13267,59.83225,36.530945}}, {"mecca", {39.663307, 21.274985, 40.056236, 21.564195}}, - {"medellin", {-75.719423,6.162617,-75.473408,6.376421}}, + {"medellin", {-75.719423,6.162617,-75.473408,6.376421}}, {"mexico", {-99.3630981445, 19.2541083164, -98.879699707, 19.5960192403}}, {"milan", {9.02252197266, 45.341528405, 9.35760498047, 45.5813674681}}, {"minsk", {27.2845458984, 53.777934972, 27.8393554688, 54.0271334441}}, @@ -424,50 +424,51 @@ string MatchCity(OsmElement const * p) {"moscow", {36.9964599609, 55.3962717136, 38.1884765625, 56.1118730004}}, {"mumbai", {72.7514648437, 18.8803004445, 72.9862976074, 19.2878132403}}, {"munchen", {11.3433837891, 47.9981928195, 11.7965698242, 48.2730267576}}, - {"nagoya", {136.791969,35.025951,137.060899,35.260229}}, + {"nagoya", {136.791969,35.025951,137.060899,35.260229}}, {"newyork", {-74.4104003906, 40.4134960497, -73.4600830078, 41.1869224229}}, {"nnov", {43.6431884766, 56.1608472541, 44.208984375, 56.4245355509}}, {"novosibirsk", {82.4578857422, 54.8513152597, 83.2983398438, 55.2540770671}}, {"osaka", {134.813232422, 34.1981730963, 136.076660156, 35.119908571}}, {"oslo", {10.3875732422, 59.7812868211, 10.9286499023, 60.0401604652}}, - {"palma", {2.556669,39.503227,2.841284,39.670445}}, + {"palma", {2.556669,39.503227,2.841284,39.670445}}, {"panama", {-79.633827, 8.880788, -79.367367, 9.149179}}, {"paris", {2.09014892578, 48.6637569323, 2.70538330078, 49.0414689141}}, {"philadelphia", {-75.276761, 39.865446, -74.964493, 40.137768}}, {"pyongyang", {125.48888, 38.780932, 126.12748, 39.298738}}, - {"rennes", {-2.28897,47.934093,-1.283944,48.379636}}, + {"rennes", {-2.28897,47.934093,-1.283944,48.379636}}, {"rio", {-43.4873199463, -23.0348745407, -43.1405639648, -22.7134898498}}, {"roma", {12.3348999023, 41.7672146942, 12.6397705078, 42.0105298189}}, {"rotterdam", {3.940749, 51.842118, 4.601808, 52.004528}}, {"samara", {50.001145, 53.070867, 50.434992, 53.339216}}, {"santiago", {-71.015625, -33.8133843291, -70.3372192383, -33.1789392606}}, - {"santo_domingo", {-70.029669,18.390645,-69.831571,18.573966}}, + {"santo_domingo", {-70.029669,18.390645,-69.831571,18.573966}}, {"saopaulo", {-46.9418334961, -23.8356009866, -46.2963867187, -23.3422558351}}, - {"sapporo", {141.160343,42.945651,141.577136,43.243986}}, - {"sendai", {140.469472,38.050849,141.260304,38.454699}}, + {"sapporo", {141.160343,42.945651,141.577136,43.243986}}, + {"sendai", {140.469472,38.050849,141.260304,38.454699}}, {"seoul", {126.540527344, 37.3352243593, 127.23815918, 37.6838203267}}, {"sf", {-122.72277832, 37.1690715771, -121.651611328, 38.0307856938}}, {"shanghai", {119.849853516, 30.5291450367, 122.102050781, 32.1523618947}}, {"shenzhen", {113.790893555, 22.459263801, 114.348449707, 22.9280416657}}, - {"shiraz", {52.382254,29.498738,52.667513,29.840346}}, + {"shiraz", {52.382254,29.498738,52.667513,29.840346}}, {"singapore", {103.624420166, 1.21389843409, 104.019927979, 1.45278619819}}, {"sofia", {23.195085, 42.574041, 23.503569, 42.835375}}, {"spb", {29.70703125, 59.5231755354, 31.3110351562, 60.2725145948}}, {"stockholm", {17.5726318359, 59.1336814082, 18.3966064453, 59.5565918857}}, {"stuttgart", {9.0877532959, 48.7471343254, 9.29306030273, 48.8755544436}}, {"sydney", {150.42755127, -34.3615762875, 151.424560547, -33.4543597895}}, - {"tabriz", {46.18432,38.015584,46.4126,38.15366}}, + {"tabriz", {46.18432,38.015584,46.4126,38.15366}}, {"taipei", {121.368713379, 24.9312761454, 121.716156006, 25.1608229799}}, - {"taoyuan", {110.8471,28.4085,111.6109,29.4019}}, + {"taoyuan", {110.8471,28.4085,111.6109,29.4019}}, {"tashkent", {69.12171, 41.163421, 69.476967, 41.398638}}, {"tbilisi", {44.596922, 41.619315, 45.019694, 41.843421}}, - {"tianjin", {116.7022,38.555,118.0587,40.252}}, + {"tehran", {50.6575, 35.353216, 52.007904, 35.974672}}, + {"tianjin", {116.7022,38.555,118.0587,40.252}}, {"tokyo", {139.240722656, 35.2186974963, 140.498657227, 36.2575628263}}, {"valencia", {-0.432551, 39.27845, -0.272521, 39.566609}}, {"vienna", {16.0894775391, 48.0633965378, 16.6387939453, 48.3525987075}}, {"warszawa", {20.7202148438, 52.0322181041, 21.3024902344, 52.4091212523}}, {"washington", {-77.4920654297, 38.5954071994, -76.6735839844, 39.2216149801}}, - {"wuhan", {113.6925,29.972,115.0769,31.3622}}, + {"wuhan", {113.6925,29.972,115.0769,31.3622}}, {"yerevan", {44.359899, 40.065411, 44.645352, 40.26398}}, {"yokohama", {139.464781, 35.312501, 139.776935, 35.592738}}, };