diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 2fe7a6e863..2642cbc847 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1214,8 +1214,8 @@ shop|watches;1215;
shop|second_hand;1216;
shop|craft;1217;
shop|sewing;1218;
-deprecated|deprecated;1219;x
-deprecated|deprecated;1220;x
+railway|station|subway|warszawa;[railway=station][transport=subway][city=warszawa],[railway=station][station=subway][city=warszawa];;name;int_name;1219;
+railway|subway_entrance|warszawa;[railway=subway_entrance][city=warszawa];;name;int_name;1220;
deprecated|deprecated;1221;x
deprecated|deprecated;1222;x
deprecated|deprecated;1223;x
@@ -1351,3 +1351,197 @@ recycling|shoes;[recycling:shoes=yes];;name;int_name;1352;
recycling|green_waste;[recycling:green_waste=yes];;name;int_name;1353;
recycling|cartons;[recycling:cartons=yes];;name;int_name;1354;
amenity|parking_space|disabled;[amenity=parking_space][parking_space=disabled];;name;int_name;1355;
+railway|station|subway|adana;[railway=station][transport=subway][city=adana],[railway=station][station=subway][city=adana];;name;int_name;1356;
+railway|station|subway|algiers;[railway=station][transport=subway][city=algiers],[railway=station][station=subway][city=algiers];;name;int_name;1357;
+railway|station|subway|almaty;[railway=station][transport=subway][city=almaty],[railway=station][station=subway][city=almaty];;name;int_name;1358;
+railway|station|subway|amsterdam;[railway=station][transport=subway][city=amsterdam],[railway=station][station=subway][city=amsterdam];;name;int_name;1359;
+railway|station|subway|ankara;[railway=station][transport=subway][city=ankara],[railway=station][station=subway][city=ankara];;name;int_name;1360;
+railway|station|subway|athens;[railway=station][transport=subway][city=athens],[railway=station][station=subway][city=athens];;name;int_name;1361;
+railway|station|subway|baku;[railway=station][transport=subway][city=baku],[railway=station][station=subway][city=baku];;name;int_name;1362;
+railway|station|subway|bangkok;[railway=station][transport=subway][city=bangkok],[railway=station][station=subway][city=bangkok];;name;int_name;1363;
+railway|station|subway|beijing;[railway=station][transport=subway][city=beijing],[railway=station][station=subway][city=beijing];;name;int_name;1364;
+railway|station|subway|bengalore;[railway=station][transport=subway][city=bengalore],[railway=station][station=subway][city=bengalore];;name;int_name;1365;
+railway|station|subway|brasilia;[railway=station][transport=subway][city=brasilia],[railway=station][station=subway][city=brasilia];;name;int_name;1366;
+railway|station|subway|brescia;[railway=station][transport=subway][city=brescia],[railway=station][station=subway][city=brescia];;name;int_name;1367;
+railway|station|subway|brussels;[railway=station][transport=subway][city=brussels],[railway=station][station=subway][city=brussels];;name;int_name;1368;
+railway|station|subway|bucharest;[railway=station][transport=subway][city=bucharest],[railway=station][station=subway][city=bucharest];;name;int_name;1369;
+railway|station|subway|budapest;[railway=station][transport=subway][city=budapest],[railway=station][station=subway][city=budapest];;name;int_name;1370;
+railway|station|subway|buenos_aires;[railway=station][transport=subway][city=buenos_aires],[railway=station][station=subway][city=buenos_aires];;name;int_name;1371;
+railway|station|subway|bursa;[railway=station][transport=subway][city=bursa],[railway=station][station=subway][city=bursa];;name;int_name;1372;
+railway|station|subway|cairo;[railway=station][transport=subway][city=cairo],[railway=station][station=subway][city=cairo];;name;int_name;1373;
+railway|station|subway|caracas;[railway=station][transport=subway][city=caracas],[railway=station][station=subway][city=caracas];;name;int_name;1374;
+railway|station|subway|catania;[railway=station][transport=subway][city=catania],[railway=station][station=subway][city=catania];;name;int_name;1375;
+railway|station|subway|changchun;[railway=station][transport=subway][city=changchun],[railway=station][station=subway][city=changchun];;name;int_name;1376;
+railway|station|subway|chengdu;[railway=station][transport=subway][city=chengdu],[railway=station][station=subway][city=chengdu];;name;int_name;1377;
+railway|station|subway|chicago;[railway=station][transport=subway][city=chicago],[railway=station][station=subway][city=chicago];;name;int_name;1378;
+railway|station|subway|chongqing;[railway=station][transport=subway][city=chongqing],[railway=station][station=subway][city=chongqing];;name;int_name;1379;
+railway|station|subway|dalian;[railway=station][transport=subway][city=dalian],[railway=station][station=subway][city=dalian];;name;int_name;1380;
+railway|station|subway|delhi;[railway=station][transport=subway][city=delhi],[railway=station][station=subway][city=delhi];;name;int_name;1381;
+railway|station|subway|dnepro;[railway=station][transport=subway][city=dnepro],[railway=station][station=subway][city=dnepro];;name;int_name;1382;
+railway|station|subway|dubai;[railway=station][transport=subway][city=dubai],[railway=station][station=subway][city=dubai];;name;int_name;1383;
+railway|station|subway|ekb;[railway=station][transport=subway][city=ekb],[railway=station][station=subway][city=ekb];;name;int_name;1384;
+railway|station|subway|fukuoka;[railway=station][transport=subway][city=fukuoka],[railway=station][station=subway][city=fukuoka];;name;int_name;1385;
+railway|station|subway|glasgow;[railway=station][transport=subway][city=glasgow],[railway=station][station=subway][city=glasgow];;name;int_name;1386;
+railway|station|subway|guangzhou;[railway=station][transport=subway][city=guangzhou],[railway=station][station=subway][city=guangzhou];;name;int_name;1387;
+railway|station|subway|hamburg;[railway=station][transport=subway][city=hamburg],[railway=station][station=subway][city=hamburg];;name;int_name;1388;
+railway|station|subway|helsinki;[railway=station][transport=subway][city=helsinki],[railway=station][station=subway][city=helsinki];;name;int_name;1389;
+railway|station|subway|hiroshima;[railway=station][transport=subway][city=hiroshima],[railway=station][station=subway][city=hiroshima];;name;int_name;1390;
+railway|station|subway|isfahan;[railway=station][transport=subway][city=isfahan],[railway=station][station=subway][city=isfahan];;name;int_name;1391;
+railway|station|subway|istanbul;[railway=station][transport=subway][city=istanbul],[railway=station][station=subway][city=istanbul];;name;int_name;1392;
+railway|station|subway|izmir;[railway=station][transport=subway][city=izmir],[railway=station][station=subway][city=izmir];;name;int_name;1393;
+railway|station|subway|kazan;[railway=station][transport=subway][city=kazan],[railway=station][station=subway][city=kazan];;name;int_name;1394;
+railway|station|subway|kharkiv;[railway=station][transport=subway][city=kharkiv],[railway=station][station=subway][city=kharkiv];;name;int_name;1395;
+railway|station|subway|kobe;[railway=station][transport=subway][city=kobe],[railway=station][station=subway][city=kobe];;name;int_name;1396;
+railway|station|subway|kolkata;[railway=station][transport=subway][city=kolkata],[railway=station][station=subway][city=kolkata];;name;int_name;1397;
+railway|station|subway|kunming;[railway=station][transport=subway][city=kunming],[railway=station][station=subway][city=kunming];;name;int_name;1398;
+railway|station|subway|kyoto;[railway=station][transport=subway][city=kyoto],[railway=station][station=subway][city=kyoto];;name;int_name;1399;
+railway|station|subway|la;[railway=station][transport=subway][city=la],[railway=station][station=subway][city=la];;name;int_name;1400;
+railway|station|subway|lausanne;[railway=station][transport=subway][city=lausanne],[railway=station][station=subway][city=lausanne];;name;int_name;1401;
+railway|station|subway|lille;[railway=station][transport=subway][city=lille],[railway=station][station=subway][city=lille];;name;int_name;1402;
+railway|station|subway|lima;[railway=station][transport=subway][city=lima],[railway=station][station=subway][city=lima];;name;int_name;1403;
+railway|station|subway|lisboa;[railway=station][transport=subway][city=lisboa],[railway=station][station=subway][city=lisboa];;name;int_name;1404;
+railway|station|subway|lisbon;[railway=station][transport=subway][city=lisbon],[railway=station][station=subway][city=lisbon];;name;int_name;1405;
+railway|station|subway|lyon;[railway=station][transport=subway][city=lyon],[railway=station][station=subway][city=lyon];;name;int_name;1406;
+railway|station|subway|malaga;[railway=station][transport=subway][city=malaga],[railway=station][station=subway][city=malaga];;name;int_name;1407;
+railway|station|subway|manila;[railway=station][transport=subway][city=manila],[railway=station][station=subway][city=manila];;name;int_name;1408;
+railway|station|subway|maracaibo;[railway=station][transport=subway][city=maracaibo],[railway=station][station=subway][city=maracaibo];;name;int_name;1409;
+railway|station|subway|mashhad;[railway=station][transport=subway][city=mashhad],[railway=station][station=subway][city=mashhad];;name;int_name;1410;
+railway|station|subway|mecca;[railway=station][transport=subway][city=mecca],[railway=station][station=subway][city=mecca];;name;int_name;1411;
+railway|station|subway|medellin;[railway=station][transport=subway][city=medellin],[railway=station][station=subway][city=medellin];;name;int_name;1412;
+railway|station|subway|mexico;[railway=station][transport=subway][city=mexico],[railway=station][station=subway][city=mexico];;name;int_name;1413;
+railway|station|subway|milan;[railway=station][transport=subway][city=milan],[railway=station][station=subway][city=milan];;name;int_name;1414;
+railway|station|subway|montreal;[railway=station][transport=subway][city=montreal],[railway=station][station=subway][city=montreal];;name;int_name;1415;
+railway|station|subway|munchen;[railway=station][transport=subway][city=munchen],[railway=station][station=subway][city=munchen];;name;int_name;1416;
+railway|station|subway|nagoya;[railway=station][transport=subway][city=nagoya],[railway=station][station=subway][city=nagoya];;name;int_name;1417;
+railway|station|subway|nnov;[railway=station][transport=subway][city=nnov],[railway=station][station=subway][city=nnov];;name;int_name;1418;
+railway|station|subway|novosibirsk;[railway=station][transport=subway][city=novosibirsk],[railway=station][station=subway][city=novosibirsk];;name;int_name;1419;
+railway|station|subway|osaka;[railway=station][transport=subway][city=osaka],[railway=station][station=subway][city=osaka];;name;int_name;1420;
+railway|station|subway|oslo;[railway=station][transport=subway][city=oslo],[railway=station][station=subway][city=oslo];;name;int_name;1421;
+railway|station|subway|palma;[railway=station][transport=subway][city=palma],[railway=station][station=subway][city=palma];;name;int_name;1422;
+railway|station|subway|panama;[railway=station][transport=subway][city=panama],[railway=station][station=subway][city=panama];;name;int_name;1423;
+railway|station|subway|philadelphia;[railway=station][transport=subway][city=philadelphia],[railway=station][station=subway][city=philadelphia];;name;int_name;1424;
+railway|station|subway|pyongyang;[railway=station][transport=subway][city=pyongyang],[railway=station][station=subway][city=pyongyang];;name;int_name;1425;
+railway|station|subway|rennes;[railway=station][transport=subway][city=rennes],[railway=station][station=subway][city=rennes];;name;int_name;1426;
+railway|station|subway|rio;[railway=station][transport=subway][city=rio],[railway=station][station=subway][city=rio];;name;int_name;1427;
+railway|station|subway|rotterdam;[railway=station][transport=subway][city=rotterdam],[railway=station][station=subway][city=rotterdam];;name;int_name;1428;
+railway|station|subway|samara;[railway=station][transport=subway][city=samara],[railway=station][station=subway][city=samara];;name;int_name;1429;
+railway|station|subway|santiago;[railway=station][transport=subway][city=santiago],[railway=station][station=subway][city=santiago];;name;int_name;1430;
+railway|station|subway|santo_domingo;[railway=station][transport=subway][city=santo_domingo],[railway=station][station=subway][city=santo_domingo];;name;int_name;1431;
+railway|station|subway|saopaulo;[railway=station][transport=subway][city=saopaulo],[railway=station][station=subway][city=saopaulo];;name;int_name;1432;
+railway|station|subway|sapporo;[railway=station][transport=subway][city=sapporo],[railway=station][station=subway][city=sapporo];;name;int_name;1433;
+railway|station|subway|sendai;[railway=station][transport=subway][city=sendai],[railway=station][station=subway][city=sendai];;name;int_name;1434;
+railway|station|subway|sf;[railway=station][transport=subway][city=sf],[railway=station][station=subway][city=sf];;name;int_name;1435;
+railway|station|subway|shanghai;[railway=station][transport=subway][city=shanghai],[railway=station][station=subway][city=shanghai];;name;int_name;1436;
+railway|station|subway|shiraz;[railway=station][transport=subway][city=shiraz],[railway=station][station=subway][city=shiraz];;name;int_name;1437;
+railway|station|subway|sofia;[railway=station][transport=subway][city=sofia],[railway=station][station=subway][city=sofia];;name;int_name;1438;
+railway|station|subway|stockholm;[railway=station][transport=subway][city=stockholm],[railway=station][station=subway][city=stockholm];;name;int_name;1439;
+railway|station|subway|tabriz;[railway=station][transport=subway][city=tabriz],[railway=station][station=subway][city=tabriz];;name;int_name;1440;
+railway|station|subway|taipei;[railway=station][transport=subway][city=taipei],[railway=station][station=subway][city=taipei];;name;int_name;1441;
+railway|station|subway|taoyuan;[railway=station][transport=subway][city=taoyuan],[railway=station][station=subway][city=taoyuan];;name;int_name;1442;
+railway|station|subway|tashkent;[railway=station][transport=subway][city=tashkent],[railway=station][station=subway][city=tashkent];;name;int_name;1443;
+railway|station|subway|tbilisi;[railway=station][transport=subway][city=tbilisi],[railway=station][station=subway][city=tbilisi];;name;int_name;1444;
+railway|station|subway|tianjin;[railway=station][transport=subway][city=tianjin],[railway=station][station=subway][city=tianjin];;name;int_name;1445;
+railway|station|subway|tokyo;[railway=station][transport=subway][city=tokyo],[railway=station][station=subway][city=tokyo];;name;int_name;1446;
+railway|station|subway|valencia;[railway=station][transport=subway][city=valencia],[railway=station][station=subway][city=valencia];;name;int_name;1447;
+railway|station|subway|vienna;[railway=station][transport=subway][city=vienna],[railway=station][station=subway][city=vienna];;name;int_name;1448;
+railway|station|subway|washington;[railway=station][transport=subway][city=washington],[railway=station][station=subway][city=washington];;name;int_name;1449;
+railway|station|subway|wuhan;[railway=station][transport=subway][city=wuhan],[railway=station][station=subway][city=wuhan];;name;int_name;1450;
+railway|station|subway|yerevan;[railway=station][transport=subway][city=yerevan],[railway=station][station=subway][city=yerevan];;name;int_name;1451;
+railway|station|subway|yokohama;[railway=station][transport=subway][city=yokohama],[railway=station][station=subway][city=yokohama];;name;int_name;1452;
+railway|subway_entrance|adana;[railway=subway_entrance][city=adana];;name;int_name;1453;
+railway|subway_entrance|algiers;[railway=subway_entrance][city=algiers];;name;int_name;1454;
+railway|subway_entrance|almaty;[railway=subway_entrance][city=almaty];;name;int_name;1455;
+railway|subway_entrance|amsterdam;[railway=subway_entrance][city=amsterdam];;name;int_name;1456;
+railway|subway_entrance|ankara;[railway=subway_entrance][city=ankara];;name;int_name;1457;
+railway|subway_entrance|athens;[railway=subway_entrance][city=athens];;name;int_name;1458;
+railway|subway_entrance|baku;[railway=subway_entrance][city=baku];;name;int_name;1459;
+railway|subway_entrance|bangkok;[railway=subway_entrance][city=bangkok];;name;int_name;1460;
+railway|subway_entrance|beijing;[railway=subway_entrance][city=beijing];;name;int_name;1461;
+railway|subway_entrance|bengalore;[railway=subway_entrance][city=bengalore];;name;int_name;1462;
+railway|subway_entrance|brasilia;[railway=subway_entrance][city=brasilia];;name;int_name;1463;
+railway|subway_entrance|brescia;[railway=subway_entrance][city=brescia];;name;int_name;1464;
+railway|subway_entrance|brussels;[railway=subway_entrance][city=brussels];;name;int_name;1465;
+railway|subway_entrance|bucharest;[railway=subway_entrance][city=bucharest];;name;int_name;1466;
+railway|subway_entrance|budapest;[railway=subway_entrance][city=budapest];;name;int_name;1467;
+railway|subway_entrance|buenos_aires;[railway=subway_entrance][city=buenos_aires];;name;int_name;1468;
+railway|subway_entrance|bursa;[railway=subway_entrance][city=bursa];;name;int_name;1469;
+railway|subway_entrance|cairo;[railway=subway_entrance][city=cairo];;name;int_name;1470;
+railway|subway_entrance|caracas;[railway=subway_entrance][city=caracas];;name;int_name;1471;
+railway|subway_entrance|catania;[railway=subway_entrance][city=catania];;name;int_name;1472;
+railway|subway_entrance|changchun;[railway=subway_entrance][city=changchun];;name;int_name;1473;
+railway|subway_entrance|chengdu;[railway=subway_entrance][city=chengdu];;name;int_name;1474;
+railway|subway_entrance|chicago;[railway=subway_entrance][city=chicago];;name;int_name;1475;
+railway|subway_entrance|chongqing;[railway=subway_entrance][city=chongqing];;name;int_name;1476;
+railway|subway_entrance|dalian;[railway=subway_entrance][city=dalian];;name;int_name;1477;
+railway|subway_entrance|delhi;[railway=subway_entrance][city=delhi];;name;int_name;1478;
+railway|subway_entrance|dnepro;[railway=subway_entrance][city=dnepro];;name;int_name;1479;
+railway|subway_entrance|dubai;[railway=subway_entrance][city=dubai];;name;int_name;1480;
+railway|subway_entrance|ekb;[railway=subway_entrance][city=ekb];;name;int_name;1481;
+railway|subway_entrance|fukuoka;[railway=subway_entrance][city=fukuoka];;name;int_name;1482;
+railway|subway_entrance|glasgow;[railway=subway_entrance][city=glasgow];;name;int_name;1483;
+railway|subway_entrance|guangzhou;[railway=subway_entrance][city=guangzhou];;name;int_name;1484;
+railway|subway_entrance|hamburg;[railway=subway_entrance][city=hamburg];;name;int_name;1485;
+railway|subway_entrance|helsinki;[railway=subway_entrance][city=helsinki];;name;int_name;1486;
+railway|subway_entrance|hiroshima;[railway=subway_entrance][city=hiroshima];;name;int_name;1487;
+railway|subway_entrance|isfahan;[railway=subway_entrance][city=isfahan];;name;int_name;1488;
+railway|subway_entrance|istanbul;[railway=subway_entrance][city=istanbul];;name;int_name;1489;
+railway|subway_entrance|izmir;[railway=subway_entrance][city=izmir];;name;int_name;1490;
+railway|subway_entrance|kazan;[railway=subway_entrance][city=kazan];;name;int_name;1491;
+railway|subway_entrance|kharkiv;[railway=subway_entrance][city=kharkiv];;name;int_name;1492;
+railway|subway_entrance|kobe;[railway=subway_entrance][city=kobe];;name;int_name;1493;
+railway|subway_entrance|kolkata;[railway=subway_entrance][city=kolkata];;name;int_name;1494;
+railway|subway_entrance|kunming;[railway=subway_entrance][city=kunming];;name;int_name;1495;
+railway|subway_entrance|kyoto;[railway=subway_entrance][city=kyoto];;name;int_name;1496;
+railway|subway_entrance|la;[railway=subway_entrance][city=la];;name;int_name;1497;
+railway|subway_entrance|lausanne;[railway=subway_entrance][city=lausanne];;name;int_name;1498;
+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;
+railway|subway_entrance|lisbon;[railway=subway_entrance][city=lisbon];;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;
+railway|subway_entrance|maracaibo;[railway=subway_entrance][city=maracaibo];;name;int_name;1506;
+railway|subway_entrance|mashhad;[railway=subway_entrance][city=mashhad];;name;int_name;1507;
+railway|subway_entrance|mecca;[railway=subway_entrance][city=mecca];;name;int_name;1508;
+railway|subway_entrance|medellin;[railway=subway_entrance][city=medellin];;name;int_name;1509;
+railway|subway_entrance|mexico;[railway=subway_entrance][city=mexico];;name;int_name;1510;
+railway|subway_entrance|milan;[railway=subway_entrance][city=milan];;name;int_name;1511;
+railway|subway_entrance|montreal;[railway=subway_entrance][city=montreal];;name;int_name;1512;
+railway|subway_entrance|munchen;[railway=subway_entrance][city=munchen];;name;int_name;1513;
+railway|subway_entrance|nagoya;[railway=subway_entrance][city=nagoya];;name;int_name;1514;
+railway|subway_entrance|nnov;[railway=subway_entrance][city=nnov];;name;int_name;1515;
+railway|subway_entrance|novosibirsk;[railway=subway_entrance][city=novosibirsk];;name;int_name;1516;
+railway|subway_entrance|osaka;[railway=subway_entrance][city=osaka];;name;int_name;1517;
+railway|subway_entrance|oslo;[railway=subway_entrance][city=oslo];;name;int_name;1518;
+railway|subway_entrance|palma;[railway=subway_entrance][city=palma];;name;int_name;1519;
+railway|subway_entrance|panama;[railway=subway_entrance][city=panama];;name;int_name;1520;
+railway|subway_entrance|philadelphia;[railway=subway_entrance][city=philadelphia];;name;int_name;1521;
+railway|subway_entrance|pyongyang;[railway=subway_entrance][city=pyongyang];;name;int_name;1522;
+railway|subway_entrance|rennes;[railway=subway_entrance][city=rennes];;name;int_name;1523;
+railway|subway_entrance|rio;[railway=subway_entrance][city=rio];;name;int_name;1524;
+railway|subway_entrance|rotterdam;[railway=subway_entrance][city=rotterdam];;name;int_name;1525;
+railway|subway_entrance|samara;[railway=subway_entrance][city=samara];;name;int_name;1526;
+railway|subway_entrance|santiago;[railway=subway_entrance][city=santiago];;name;int_name;1527;
+railway|subway_entrance|santo_domingo;[railway=subway_entrance][city=santo_domingo];;name;int_name;1528;
+railway|subway_entrance|saopaulo;[railway=subway_entrance][city=saopaulo];;name;int_name;1529;
+railway|subway_entrance|sapporo;[railway=subway_entrance][city=sapporo];;name;int_name;1530;
+railway|subway_entrance|sendai;[railway=subway_entrance][city=sendai];;name;int_name;1531;
+railway|subway_entrance|sf;[railway=subway_entrance][city=sf];;name;int_name;1532;
+railway|subway_entrance|shanghai;[railway=subway_entrance][city=shanghai];;name;int_name;1533;
+railway|subway_entrance|shiraz;[railway=subway_entrance][city=shiraz];;name;int_name;1534;
+railway|subway_entrance|sofia;[railway=subway_entrance][city=sofia];;name;int_name;1535;
+railway|subway_entrance|stockholm;[railway=subway_entrance][city=stockholm];;name;int_name;1536;
+railway|subway_entrance|tabriz;[railway=subway_entrance][city=tabriz];;name;int_name;1537;
+railway|subway_entrance|taipei;[railway=subway_entrance][city=taipei];;name;int_name;1538;
+railway|subway_entrance|taoyuan;[railway=subway_entrance][city=taoyuan];;name;int_name;1539;
+railway|subway_entrance|tashkent;[railway=subway_entrance][city=tashkent];;name;int_name;1540;
+railway|subway_entrance|tbilisi;[railway=subway_entrance][city=tbilisi];;name;int_name;1541;
+railway|subway_entrance|tianjin;[railway=subway_entrance][city=tianjin];;name;int_name;1542;
+railway|subway_entrance|tokyo;[railway=subway_entrance][city=tokyo];;name;int_name;1543;
+railway|subway_entrance|valencia;[railway=subway_entrance][city=valencia];;name;int_name;1544;
+railway|subway_entrance|vienna;[railway=subway_entrance][city=vienna];;name;int_name;1545;
+railway|subway_entrance|washington;[railway=subway_entrance][city=washington];;name;int_name;1546;
+railway|subway_entrance|wuhan;[railway=subway_entrance][city=wuhan];;name;int_name;1547;
+railway|subway_entrance|yerevan;[railway=subway_entrance][city=yerevan];;name;int_name;1548;
+railway|subway_entrance|yokohama;[railway=subway_entrance][city=yokohama];;name;int_name;1549;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index afcb3bac49..452adf4236 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -16683,39 +16683,333 @@
zh-Hans = 地铁车站
zh-Hant = 地鐵車站
+ [type.railway.station.subway.adana]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.algiers]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.almaty]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.amsterdam]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.ankara]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.athens]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.baku]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.bangkok]
+ ref = type.railway.station.subway
+
[type.railway.station.subway.barcelona]
ref = type.railway.station.subway
+ [type.railway.station.subway.beijing]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.bengalore]
+ ref = type.railway.station.subway
+
[type.railway.station.subway.berlin]
ref = type.railway.station.subway
+ [type.railway.station.subway.brasilia]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.brescia]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.brussels]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.bucharest]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.budapest]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.buenos_aires]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.bursa]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.cairo]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.caracas]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.catania]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.changchun]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.chengdu]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.chicago]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.chongqing]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.dalian]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.delhi]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.dnepro]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.dubai]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.ekb]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.fukuoka]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.glasgow]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.guangzhou]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.hamburg]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.helsinki]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.hiroshima]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.isfahan]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.istanbul]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.izmir]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.kazan]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.kharkiv]
+ ref = type.railway.station.subway
+
[type.railway.station.subway.kiev]
ref = type.railway.station.subway
+ [type.railway.station.subway.kobe]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.kolkata]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.kunming]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.kyoto]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.la]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.lausanne]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.lille]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.lima]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.lisboa]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.lisbon]
+ ref = type.railway.station.subway
+
[type.railway.station.subway.london]
ref = type.railway.station.subway
+ [type.railway.station.subway.lyon]
+ ref = type.railway.station.subway
+
[type.railway.station.subway.madrid]
ref = type.railway.station.subway
+ [type.railway.station.subway.malaga]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.manila]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.maracaibo]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.mashhad]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.mecca]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.medellin]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.mexico]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.milan]
+ ref = type.railway.station.subway
+
[type.railway.station.subway.minsk]
ref = type.railway.station.subway
+ [type.railway.station.subway.montreal]
+ ref = type.railway.station.subway
+
[type.railway.station.subway.moscow]
ref = type.railway.station.subway
+ [type.railway.station.subway.munchen]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.nagoya]
+ ref = type.railway.station.subway
+
[type.railway.station.subway.newyork]
ref = type.railway.station.subway
+ [type.railway.station.subway.nnov]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.novosibirsk]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.osaka]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.oslo]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.palma]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.panama]
+ ref = type.railway.station.subway
+
[type.railway.station.subway.paris]
ref = type.railway.station.subway
+ [type.railway.station.subway.philadelphia]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.pyongyang]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.rennes]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.rio]
+ ref = type.railway.station.subway
+
[type.railway.station.subway.roma]
ref = type.railway.station.subway
+ [type.railway.station.subway.rotterdam]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.samara]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.santiago]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.santo_domingo]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.saopaulo]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.sapporo]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.sendai]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.sf]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.shanghai]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.shiraz]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.sofia]
+ ref = type.railway.station.subway
+
[type.railway.station.subway.spb]
ref = type.railway.station.subway
+ [type.railway.station.subway.stockholm]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.tabriz]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.taipei]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.taoyuan]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.tashkent]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.tbilisi]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.tianjin]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.tokyo]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.valencia]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.vienna]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.warszawa]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.washington]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.wuhan]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.yerevan]
+ ref = type.railway.station.subway
+
+ [type.railway.station.subway.yokohama]
+ ref = type.railway.station.subway
+
[type.railway.subway]
en = Subway Line
de = U-Bahn
@@ -16788,38 +17082,332 @@
zh-Hans = 地铁入口
zh-Hant = 地鐵入口
- [type.railway.subway_entrance.barcelona]
- ref = type.railway.subway_entrance
+ [type.railway.subway_entrance.adana]
+ ref = type.railway.subway_entrance
- [type.railway.subway_entrance.berlin]
- ref = type.railway.subway_entrance
+ [type.railway.subway_entrance.algiers]
+ ref = type.railway.subway_entrance
- [type.railway.subway_entrance.kiev]
- ref = type.railway.subway_entrance
+ [type.railway.subway_entrance.almaty]
+ ref = type.railway.subway_entrance
- [type.railway.subway_entrance.london]
- ref = type.railway.subway_entrance
+ [type.railway.subway_entrance.amsterdam]
+ ref = type.railway.subway_entrance
- [type.railway.subway_entrance.madrid]
- ref = type.railway.subway_entrance
+ [type.railway.subway_entrance.ankara]
+ ref = type.railway.subway_entrance
- [type.railway.subway_entrance.minsk]
- ref = type.railway.subway_entrance
+ [type.railway.subway_entrance.athens]
+ ref = type.railway.subway_entrance
- [type.railway.subway_entrance.moscow]
- ref = type.railway.subway_entrance
+ [type.railway.subway_entrance.baku]
+ ref = type.railway.subway_entrance
- [type.railway.subway_entrance.newyork]
- ref = type.railway.subway_entrance
+ [type.railway.subway_entrance.bangkok]
+ ref = type.railway.subway_entrance
- [type.railway.subway_entrance.paris]
- ref = type.railway.subway_entrance
+ [type.railway.subway_entrance.barcelona]
+ ref = type.railway.subway_entrance
- [type.railway.subway_entrance.roma]
- ref = type.railway.subway_entrance
+ [type.railway.subway_entrance.beijing]
+ ref = type.railway.subway_entrance
- [type.railway.subway_entrance.spb]
- ref = type.railway.subway_entrance
+ [type.railway.subway_entrance.bengalore]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.berlin]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.brasilia]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.brescia]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.brussels]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.bucharest]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.budapest]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.buenos_aires]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.bursa]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.cairo]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.caracas]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.catania]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.changchun]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.chengdu]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.chicago]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.chongqing]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.dalian]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.delhi]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.dnepro]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.dubai]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.ekb]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.fukuoka]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.glasgow]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.guangzhou]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.hamburg]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.helsinki]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.hiroshima]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.isfahan]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.istanbul]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.izmir]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.kazan]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.kharkiv]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.kiev]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.kobe]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.kolkata]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.kunming]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.kyoto]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.la]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.lausanne]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.lille]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.lima]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.lisboa]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.lisbon]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.london]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.lyon]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.madrid]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.malaga]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.manila]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.maracaibo]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.mashhad]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.mecca]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.medellin]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.mexico]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.milan]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.minsk]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.montreal]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.moscow]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.munchen]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.nagoya]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.newyork]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.nnov]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.novosibirsk]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.osaka]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.oslo]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.palma]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.panama]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.paris]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.philadelphia]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.pyongyang]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.rennes]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.rio]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.roma]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.rotterdam]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.samara]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.santiago]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.santo_domingo]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.saopaulo]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.sapporo]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.sendai]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.sf]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.shanghai]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.shiraz]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.sofia]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.spb]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.stockholm]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.tabriz]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.taipei]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.taoyuan]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.tashkent]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.tbilisi]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.tianjin]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.tokyo]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.valencia]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.vienna]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.warszawa]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.washington]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.wuhan]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.yerevan]
+ ref = type.railway.subway_entrance
+
+ [type.railway.subway_entrance.yokohama]
+ ref = type.railway.subway_entrance
[type.railway.tram]
en = Tram Line
diff --git a/data/styles/clear/include/Subways.mapcss b/data/styles/clear/include/Subways.mapcss
index 73fce52332..03b4c88221 100644
--- a/data/styles/clear/include/Subways.mapcss
+++ b/data/styles/clear/include/Subways.mapcss
@@ -86,11 +86,11 @@ node|z17[railway=subway_entrance][city=beijing] {icon-image: subway-beijing-s.sv
node|z18-[railway=subway_entrance][city=beijing] {icon-image: subway-beijing-m.svg;text-optional: true;}
/* Berlin Subway Station*/
-node|z13[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-s.svg;icon-min-distance: 1;}
-node|z14[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-s.svg;}
-node|z15-16[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;}
-node|z17-[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;text-optional: true;}
-node|z17-[railway=subway_entrance][city=berlin] {icon-image: subway-berlin-s.svg;text-optional: true;}
+node|z13[railway=station][transport=subway][city=berlin] {icon-image: subway-ubahn-s.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=berlin] {icon-image: subway-ubahn-s.svg;}
+node|z15-16[railway=station][transport=subway][city=berlin] {icon-image: subway-ubahn-m.svg;}
+node|z17-[railway=station][transport=subway][city=berlin] {icon-image: subway-ubahn-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=berlin] {icon-image: subway-ubahn-s.svg;text-optional: true;}
/* Bengaluru Subway Station*/
node|z13[railway=station][transport=subway][city=bengalore] {icon-image: subway-bengaluru-s.svg;icon-min-distance: 1;}
@@ -100,11 +100,13 @@ node|z17-[railway=station][transport=subway][city=bengalore] {icon-image: subway
node|z17-[railway=subway_entrance][city=bengalore] {icon-image: subway-bengaluru-s.svg;text-optional: true;}
/* Bilbao Subway Station*/
+/* TODO: add Bilbao Subway icon
node|z13[railway=station][transport=subway][city=bilbao] {icon-image: subway-bilbao-s.svg;icon-min-distance: 1;}
node|z14[railway=station][transport=subway][city=bilbao] {icon-image: subway-bilbao-s.svg;}
node|z15-16[railway=station][transport=subway][city=bilbao] {icon-image: subway-bilbao-m.svg;}
node|z17-[railway=station][transport=subway][city=bilbao] {icon-image: subway-bilbao-m.svg;text-optional: true;}
node|z17-[railway=subway_entrance][city=bilbao] {icon-image: subway-bilbao-s.svg;text-optional: true;}
+*/
/* Brasilia Subway Station*/
node|z13[railway=station][transport=subway][city=brasilia] {icon-image: subway-brasilia-s.svg;icon-min-distance: 1;}
@@ -281,12 +283,12 @@ node|z17[railway=subway_entrance][city=guangzhou] {icon-image: subway-guangzhou-
node|z18-[railway=subway_entrance][city=guangzhou] {icon-image: subway-guangzhou-m.svg;text-optional: true;}
/* Hamburg Subway Station */
-node|z13[railway=station][transport=subway][city=hamburg] {icon-image: subway-hamburg-s.svg;icon-min-distance: 1;}
-node|z14[railway=station][transport=subway][city=hamburg] {icon-image: subway-hamburg-s.svg;}
-node|z15-16[railway=station][transport=subway][city=hamburg] {icon-image: subway-hamburg-m.svg;}
-node|z17-[railway=station][transport=subway][city=hamburg] {icon-image: subway-hamburg-m.svg;text-optional: true;}
-node|z17[railway=subway_entrance][city=hamburg] {icon-image: subway-hamburg-s.svg;text-optional: true;}
-node|z18-[railway=subway_entrance][city=hamburg] {icon-image: subway-hamburg-m.svg;text-optional: true;}
+node|z13[railway=station][transport=subway][city=hamburg] {icon-image: subway-ubahn-s.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=hamburg] {icon-image: subway-ubahn-s.svg;}
+node|z15-16[railway=station][transport=subway][city=hamburg] {icon-image: subway-ubahn-m.svg;}
+node|z17-[railway=station][transport=subway][city=hamburg] {icon-image: subway-ubahn-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=hamburg] {icon-image: subway-ubahn-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=hamburg] {icon-image: subway-ubahn-m.svg;text-optional: true;}
/* Helsinki Subway Station */
node|z13[railway=station][transport=subway][city=helsinki] {icon-image: subway-helsinki-s.svg;icon-min-distance: 1;}
@@ -587,12 +589,12 @@ node|z17[railway=subway_entrance][city=montreal] {icon-image: subway-montreal-s.
node|z18-[railway=subway_entrance][city=montreal] {icon-image: subway-montreal-m.svg;text-optional: true;}
/* Munchen Subway Station */
-node|z13[railway=station][transport=subway][city=munchen] {icon-image: subway-munchen-s.svg;icon-min-distance: 1;}
-node|z14[railway=station][transport=subway][city=munchen] {icon-image: subway-munchen-s.svg;}
-node|z15-16[railway=station][transport=subway][city=munchen] {icon-image: subway-munchen-m.svg;}
-node|z17-[railway=station][transport=subway][city=munchen] {icon-image: subway-munchen-m.svg;text-optional: true;}
-node|z17[railway=subway_entrance][city=munchen] {icon-image: subway-munchen-s.svg;text-optional: true;}
-node|z18-[railway=subway_entrance][city=munchen] {icon-image: subway-munchen-m.svg;text-optional: true;}
+node|z13[railway=station][transport=subway][city=munchen] {icon-image: subway-ubahn-s.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=munchen] {icon-image: subway-ubahn-s.svg;}
+node|z15-16[railway=station][transport=subway][city=munchen] {icon-image: subway-ubahn-m.svg;}
+node|z17-[railway=station][transport=subway][city=munchen] {icon-image: subway-ubahn-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=munchen] {icon-image: subway-ubahn-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=munchen] {icon-image: subway-ubahn-m.svg;text-optional: true;}
/* Nagoya Subway Station */
node|z13[railway=station][transport=subway][city=nagoya] {icon-image: subway-nagoya-s.svg;icon-min-distance: 1;}
diff --git a/data/styles/clear/style-clear/symbols/subway-lausanne-s.svg b/data/styles/clear/style-clear/symbols/subway-lausanne-s.svg
new file mode 100644
index 0000000000..6b70b397df
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/subway-lausanne-s.svg
@@ -0,0 +1,6 @@
+
diff --git a/data/styles/clear/style-clear/symbols/subway-berlin-m.svg b/data/styles/clear/style-clear/symbols/subway-ubahn-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-berlin-m.svg
rename to data/styles/clear/style-clear/symbols/subway-ubahn-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-berlin-s.svg b/data/styles/clear/style-clear/symbols/subway-ubahn-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-berlin-s.svg
rename to data/styles/clear/style-clear/symbols/subway-ubahn-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lausanne-m.svg b/data/styles/clear/style-night/symbols/subway-lausanne-m.svg
new file mode 100644
index 0000000000..11a73d9a31
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-lausanne-m.svg
@@ -0,0 +1,6 @@
+
diff --git a/data/styles/clear/style-night/symbols/subway-lausanne-s.svg b/data/styles/clear/style-night/symbols/subway-lausanne-s.svg
new file mode 100644
index 0000000000..b73d4921df
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-lausanne-s.svg
@@ -0,0 +1,6 @@
+
diff --git a/data/styles/clear/style-night/symbols/subway-lille-m.svg b/data/styles/clear/style-night/symbols/subway-lille-m.svg
new file mode 100644
index 0000000000..c211b71829
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-lille-m.svg
@@ -0,0 +1,9 @@
+
diff --git a/data/styles/clear/style-night/symbols/subway-lille-s.svg b/data/styles/clear/style-night/symbols/subway-lille-s.svg
new file mode 100644
index 0000000000..66eb37b79d
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-lille-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-night/symbols/subway-lima-m.svg b/data/styles/clear/style-night/symbols/subway-lima-m.svg
new file mode 100644
index 0000000000..101cacb873
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-lima-m.svg
@@ -0,0 +1,8 @@
+
diff --git a/data/styles/clear/style-night/symbols/subway-lima-s.svg b/data/styles/clear/style-night/symbols/subway-lima-s.svg
new file mode 100644
index 0000000000..13f7944f14
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-lima-s.svg
@@ -0,0 +1,8 @@
+
diff --git a/data/styles/clear/style-night/symbols/subway-lisboa-m.svg b/data/styles/clear/style-night/symbols/subway-lisboa-m.svg
new file mode 100644
index 0000000000..7a0954594f
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-lisboa-m.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-night/symbols/subway-lisboa-s.svg b/data/styles/clear/style-night/symbols/subway-lisboa-s.svg
new file mode 100644
index 0000000000..8d69ad396f
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-lisboa-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-night/symbols/subway-losangeles-m.svg b/data/styles/clear/style-night/symbols/subway-losangeles-m.svg
new file mode 100644
index 0000000000..533f6847c8
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-losangeles-m.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-night/symbols/subway-losangeles-s.svg b/data/styles/clear/style-night/symbols/subway-losangeles-s.svg
new file mode 100644
index 0000000000..568ef6083b
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-losangeles-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-night/symbols/subway-lucknow-m.svg b/data/styles/clear/style-night/symbols/subway-lucknow-m.svg
new file mode 100644
index 0000000000..8379550566
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-lucknow-m.svg
@@ -0,0 +1,6 @@
+
diff --git a/data/styles/clear/style-night/symbols/subway-lucknow-s.svg b/data/styles/clear/style-night/symbols/subway-lucknow-s.svg
new file mode 100644
index 0000000000..01f6d2ffad
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-lucknow-s.svg
@@ -0,0 +1,6 @@
+
diff --git a/data/styles/clear/style-night/symbols/subway-lyon-m.svg b/data/styles/clear/style-night/symbols/subway-lyon-m.svg
new file mode 100644
index 0000000000..98745cf1ec
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-lyon-m.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-night/symbols/subway-lyon-s.svg b/data/styles/clear/style-night/symbols/subway-lyon-s.svg
new file mode 100644
index 0000000000..cd9601fb29
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-lyon-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-night/symbols/subway-berlin-m.svg b/data/styles/clear/style-night/symbols/subway-ubahn-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-berlin-m.svg
rename to data/styles/clear/style-night/symbols/subway-ubahn-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-berlin-s.svg b/data/styles/clear/style-night/symbols/subway-ubahn-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-berlin-s.svg
rename to data/styles/clear/style-night/symbols/subway-ubahn-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-wien-m.svg b/data/styles/clear/style-night/symbols/subway-vienna-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-wien-m.svg
rename to data/styles/clear/style-night/symbols/subway-vienna-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-wien-s.svg b/data/styles/clear/style-night/symbols/subway-vienna-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-wien-s.svg
rename to data/styles/clear/style-night/symbols/subway-vienna-s.svg
diff --git a/data/styles/vehicle/include/Subways.mapcss b/data/styles/vehicle/include/Subways.mapcss
index 45ff02a5f7..a330fbc5b5 100644
--- a/data/styles/vehicle/include/Subways.mapcss
+++ b/data/styles/vehicle/include/Subways.mapcss
@@ -86,11 +86,11 @@ node|z17[railway=subway_entrance][city=beijing] {icon-image: subway-beijing-s.sv
node|z18-[railway=subway_entrance][city=beijing] {icon-image: subway-beijing-m.svg;}
/* Berlin Subway Station*/
-node|z13[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-s.svg;icon-min-distance: 1;}
-node|z14[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-s.svg;}
-node|z15-16[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;}
-node|z17-[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;}
-node|z17-[railway=subway_entrance][city=berlin] {icon-image: subway-berlin-s.svg;}
+node|z13[railway=station][transport=subway][city=berlin] {icon-image: subway-ubahn-s.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=berlin] {icon-image: subway-ubahn-s.svg;}
+node|z15-16[railway=station][transport=subway][city=berlin] {icon-image: subway-ubahn-m.svg;}
+node|z17-[railway=station][transport=subway][city=berlin] {icon-image: subway-ubahn-m.svg;}
+node|z17-[railway=subway_entrance][city=berlin] {icon-image: subway-ubahn-s.svg;}
/* Bengaluru Subway Station*/
node|z13[railway=station][transport=subway][city=bengalore] {icon-image: subway-bengaluru-s.svg;icon-min-distance: 1;}
@@ -281,12 +281,12 @@ node|z17[railway=subway_entrance][city=guangzhou] {icon-image: subway-guangzhou-
node|z18-[railway=subway_entrance][city=guangzhou] {icon-image: subway-guangzhou-m.svg;}
/* Hamburg Subway Station */
-node|z13[railway=station][transport=subway][city=hamburg] {icon-image: subway-hamburg-s.svg;icon-min-distance: 1;}
-node|z14[railway=station][transport=subway][city=hamburg] {icon-image: subway-hamburg-s.svg;}
-node|z15-16[railway=station][transport=subway][city=hamburg] {icon-image: subway-hamburg-m.svg;}
-node|z17-[railway=station][transport=subway][city=hamburg] {icon-image: subway-hamburg-m.svg;}
-node|z17[railway=subway_entrance][city=hamburg] {icon-image: subway-hamburg-s.svg;}
-node|z18-[railway=subway_entrance][city=hamburg] {icon-image: subway-hamburg-m.svg;}
+node|z13[railway=station][transport=subway][city=hamburg] {icon-image: subway-ubahn-s.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=hamburg] {icon-image: subway-ubahn-s.svg;}
+node|z15-16[railway=station][transport=subway][city=hamburg] {icon-image: subway-ubahn-m.svg;}
+node|z17-[railway=station][transport=subway][city=hamburg] {icon-image: subway-ubahn-m.svg;}
+node|z17[railway=subway_entrance][city=hamburg] {icon-image: subway-ubahn-s.svg;}
+node|z18-[railway=subway_entrance][city=hamburg] {icon-image: subway-ubahn-m.svg;}
/* Helsinki Subway Station */
node|z13[railway=station][transport=subway][city=helsinki] {icon-image: subway-helsinki-s.svg;icon-min-distance: 1;}
@@ -575,12 +575,12 @@ node|z17[railway=subway_entrance][city=montreal] {icon-image: subway-montreal-s.
node|z18-[railway=subway_entrance][city=montreal] {icon-image: subway-montreal-m.svg;}
/* Munchen Subway Station */
-node|z13[railway=station][transport=subway][city=munchen] {icon-image: subway-munchen-s.svg;icon-min-distance: 1;}
-node|z14[railway=station][transport=subway][city=munchen] {icon-image: subway-munchen-s.svg;}
-node|z15-16[railway=station][transport=subway][city=munchen] {icon-image: subway-munchen-m.svg;}
-node|z17-[railway=station][transport=subway][city=munchen] {icon-image: subway-munchen-m.svg;}
-node|z17[railway=subway_entrance][city=munchen] {icon-image: subway-munchen-s.svg;}
-node|z18-[railway=subway_entrance][city=munchen] {icon-image: subway-munchen-m.svg;}
+node|z13[railway=station][transport=subway][city=munchen] {icon-image: subway-ubahn-s.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=munchen] {icon-image: subway-ubahn-s.svg;}
+node|z15-16[railway=station][transport=subway][city=munchen] {icon-image: subway-ubahn-m.svg;}
+node|z17-[railway=station][transport=subway][city=munchen] {icon-image: subway-ubahn-m.svg;}
+node|z17[railway=subway_entrance][city=munchen] {icon-image: subway-ubahn-s.svg;}
+node|z18-[railway=subway_entrance][city=munchen] {icon-image: subway-ubahn-m.svg;}
/* Nagoya Subway Station */
node|z13[railway=station][transport=subway][city=nagoya] {icon-image: subway-nagoya-s.svg;icon-min-distance: 1;}