Merge pull request #3738 from Zverik/new_subways

[generator] New subway cities

1 files changed, 16 insertions, 0 deletions

diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp
index 69adbb490e..4e1c14d12c 100644
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -333,22 +333,30 @@ namespace ftype
   string MatchCity(OsmElement const * p)
   {
     static map<string, m2::RectD> const cities = {
+        {"almaty", {76.7223358154, 43.1480920701, 77.123336792, 43.4299852362}},
         {"amsterdam", {4.65682983398, 52.232846171, 5.10040283203, 52.4886341706}},
         {"baires", {-58.9910888672, -35.1221551064, -57.8045654297, -34.2685661867}},
+        {"bangkok", {100.159606934, 13.4363737155, 100.909423828, 14.3069694978}},
         {"barcelona", {1.94458007812, 41.2489025224, 2.29614257812, 41.5414776668}},
         {"beijing", {115.894775391, 39.588757277, 117.026367187, 40.2795256688}},
         {"berlin", {13.0352783203, 52.3051199211, 13.7933349609, 52.6963610783}},
+        {"boston", {-71.2676239014, 42.2117365893, -70.8879089355, 42.521711682}},
         {"brussel", {4.2448425293, 50.761653413, 4.52499389648, 50.9497757762}},
         {"budapest", {18.7509155273, 47.3034470439, 19.423828125, 47.7023684666}},
         {"chicago", {-88.3163452148, 41.3541338721, -87.1270751953, 42.2691794924}},
         {"delhi", {76.8026733398, 28.3914003758, 77.5511169434, 28.9240352884}},
         {"dnepro", {34.7937011719, 48.339820521, 35.2798461914, 48.6056737841}},
+        {"dubai", {55.01953125, 24.9337667594, 55.637512207, 25.6068559937}},
         {"ekb", {60.3588867188, 56.6622647682, 61.0180664062, 57.0287738515}},
         {"frankfurt", {8.36334228516, 49.937079757, 8.92364501953, 50.2296379179}},
+        {"guangzhou", {112.560424805, 22.4313401564, 113.766174316, 23.5967112789}},
         {"hamburg", {9.75860595703, 53.39151869, 10.2584838867, 53.6820686709}},
         {"helsinki", {24.3237304688, 59.9989861206, 25.48828125, 60.44638186}},
+        {"hongkong", {114.039459229, 22.1848617608, 114.305877686, 22.3983322415}},
         {"kazan", {48.8067626953, 55.6372985742, 49.39453125, 55.9153515154}},
         {"kiev", {30.1354980469, 50.2050332649, 31.025390625, 50.6599083609}},
+        {"koln", {6.7943572998, 50.8445380881, 7.12669372559, 51.0810964366}},
+        {"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}},
         {"madrid", {-4.00451660156, 40.1536868578, -3.32885742188, 40.6222917831}},
@@ -356,6 +364,7 @@ namespace ftype
         {"milan", {9.02252197266, 45.341528405, 9.35760498047, 45.5813674681}},
         {"minsk", {27.2845458984, 53.777934972, 27.8393554688, 54.0271334441}},
         {"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.2530267576}},
         {"newyork", {-74.4104003906, 40.4134960497, -73.4600830078, 41.1869224229}},
         {"nnov", {43.6431884766, 56.1608472541, 44.208984375, 56.4245355509}},
@@ -363,13 +372,20 @@ namespace ftype
         {"osaka", {134.813232422, 34.1981730963, 136.076660156, 35.119908571}},
         {"oslo", {10.3875732422, 59.7812868211, 10.9286499023, 60.0401604652}},
         {"paris", {2.09014892578, 48.6637569323, 2.70538330078, 49.0414689141}},
+        {"rio", {-43.4873199463, -23.0348745407, -43.1405639648, -22.7134898498}},
         {"roma", {12.3348999023, 41.7672146942, 12.6397705078, 42.0105298189}},
         {"sanfran", {-122.72277832, 37.1690715771, -121.651611328, 38.0307856938}},
+        {"santiago", {-71.015625, -33.8133843291, -70.3372192383, -33.1789392606}},
+        {"saopaulo", {-46.9418334961, -23.8356009866, -46.2963867187, -23.3422558351}},
         {"seoul", {126.540527344, 37.3352243593, 127.23815918, 37.6838203267}},
         {"shanghai", {119.849853516, 30.5291450367, 122.102050781, 32.1523618947}},
+        {"shenzhen", {113.790893555, 22.459263801, 114.348449707, 22.9280416657}},
+        {"singapore", {103.624420166, 1.21389843409, 104.019927979, 1.45278619819}},
         {"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}},
+        {"taipei", {121.368713379, 24.9312761454, 121.716156006, 25.1608229799}},
         {"tokyo", {139.240722656, 35.2186974963, 140.498657227, 36.2575628263}},
         {"warszawa", {20.7202148438, 52.0322181041, 21.3024902344, 52.4091212523}},
         {"washington", {-77.4920654297, 38.5954071994, -76.6735839844, 39.2216149801}},