City sizes

merge-requests/30/head
Bob Mottram 2021-05-18 18:46:40 +01:00
parent 9b71708649
commit ba13c0963c
2 changed files with 117 additions and 137 deletions

View File

@ -2112,60 +2112,51 @@ GRENCHEN, SWITZERLAND:47.1814:7.41694
ZURICH, SWITZERLAND:47.4647:8.54917 ZURICH, SWITZERLAND:47.4647:8.54917
ALTENRHEIN, SWITZERLAND:47.485:9.56056 ALTENRHEIN, SWITZERLAND:47.485:9.56056
SAMEDAN, SWITZERLAND:46.5325:9.88278 SAMEDAN, SWITZERLAND:46.5325:9.88278
ANKARA ACC/FIR/FIC, TURKEY:40:32 ANKARA, TURKEY:39.93:32.85:24521
ANKARA, TURKEY:39.9347:32.7406 ADANA, TURKEY:37:35.321333:1945
ANKARA, TURKEY:40.1281:32.995 AFYON, TURKEY:38.7261:30.6011:1025
ANKARA, TURKEY:39.9497:32.6886 ANTALYA, TURKEY:36.9014:30.7917:1417
ANKARA, TURKEY:40.0789:32.5656 GAZIANTEP, TURKEY:36.9481:37.4792:6819
ADANA, TURKEY:36.9819:35.2803 ISKENDERUN, TURKEY:36.5733:36.1539:636
ADANA, TURKEY:37.0019:35.4258 KASTAMONU, TURKEY:41.3139:33.7958:1834
AFYON, TURKEY:38.7261:30.6011 KONYA, TURKEY:37.9789:32.5617:38873
ANTALYA, TURKEY:36.9014:30.7917 MERZIFON, TURKEY:40.8292:35.5219:972
GAZIANTEP, TURKEY:36.9481:37.4792 SAMSUN, TURKEY:41.2764:36.3036:1055
ISKENDERUN, TURKEY:36.5733:36.1539 SIVAS, TURKEY:39.8136:36.9033:2768
KASTAMONU, TURKEY:41.3139:33.7958 ZONGULDAK, TURKEY:41.5158:32.0997:633
KONYA, TURKEY:37.9789:32.5617 MALATYA, TURKEY:38.4358:38.0917:1582
MERZIFON, TURKEY:40.8292:35.5219
SAMSUN, TURKEY:41.2764:36.3036
SIVAS, TURKEY:39.8136:36.9033
ZONGULDAK, TURKEY:41.5158:32.0997
MALATYA, TURKEY:38.4358:38.0917
KAYSERI, TURKEY:38.7703:35.4953 KAYSERI, TURKEY:38.7703:35.4953
SIVRIHISAR, TURKEY:39.4514:31.3653 SIVRIHISAR, TURKEY:39.4514:31.3653:2987
TOKAT, TURKEY:40.305:36.3678 TOKAT, TURKEY:40.305:36.3678:1923
EREGLI, TURKEY:41.2544:31.415 EREGLI, TURKEY:41.2544:31.415:976
DENIZLI, TURKEY:37.785:29.7011 DENIZLI, TURKEY:37.785:29.7011:798
NEVSEHIR, TURKEY:38.7717:34.5342 NEVSEHIR, TURKEY:38.7717:34.5342:5467
ISTANBUL, TURKEY:41.05497681583172:28.908688006982437 ISTANBUL, TURKEY:41.05497681583172:28.908688006982437:5343
AYDIN, TURKEY:37.8158:27.8861 AYDIN, TURKEY:37.8158:27.8861:1582
BURSA, TURKEY:40.2317:29.0092 BURSA, TURKEY:40.2317:29.0092:1036
BALIKESIR, TURKEY:39.6189:27.9247 BANDIRMA, TURKEY:40.3178:27.9775:713
BANDIRMA, TURKEY:40.3178:27.9775 CANAKKALE, TURKEY:40.1375:26.4267:1016
CANAKKALE, TURKEY:40.1375:26.4267 ESKISEHIR, TURKEY:39.7839:30.5819:2678
ESKISEHIR, TURKEY:39.7839:30.5819 IZMIR, TURKEY:38.2922:27.1569:11891
IZMIR, TURKEY:38.2922:27.1569 ISPARTA, TURKEY:37.7853:30.5817:1049
ISPARTA, TURKEY:37.7853:30.5817 KUTAHYA, TURKEY:39.4267:30.0164:2484
KUTAHYA, TURKEY:39.4267:30.0164 USAK, TURKEY:38.6811:29.4714:1309
USAK, TURKEY:38.6811:29.4714 YALOVA, TURKEY:40.6833:29.3786:167
YALOVA, TURKEY:40.6833:29.3786 YENISEHIR, TURKEY:40.255:29.5625:786
TOPEL, TURKEY:40.735:30.0831 DALAMAN, TURKEY:36.7131:28.7925:616
YENISEHIR, TURKEY:40.255:29.5625 AKHISAR, TURKEY:38.8086:27.8336:93
DALAMAN, TURKEY:36.7131:28.7925 CORLU, TURKEY:41.1381:27.9189:899
AKHISAR, TURKEY:38.8086:27.8336 ESKISSEHIR, TURKEY:39.8097:30.5194:2678
CORLU, TURKEY:41.1381:27.9189 ELAZIG, TURKEY:38.6067:39.2914:2211
ESKISSEHIR, TURKEY:39.8097:30.5194
ELAZIG, TURKEY:38.6067:39.2914
DIYABAKIR, TURKEY:37.8936:40.2006 DIYABAKIR, TURKEY:37.8936:40.2006
ERZINCAN, TURKEY:39.71:39.5261 ERZINCAN, TURKEY:39.71:39.5261:89
ERZURUM, TURKEY:39.9564:41.17 ERZURUM, TURKEY:39.9564:41.17
KARS, TURKEY:40.5622:43.115 KARS, TURKEY:40.5622:43.115:1804
TRABZON, TURKEY:40.995:39.7897 SANLIURFA, TURKEY:37.0919:38.8461:3668
SANLIURFA, TURKEY:37.0919:38.8461 VAN, TURKEY:38.4681:43.3322:1938
VAN, TURKEY:38.4681:43.3322 BATMAN, TURKEY:37.9289:41.1161:563
BATMAN, TURKEY:37.9289:41.1161 MUS, TURKEY:38.7544:41.6611:2604
MUS, TURKEY:38.7544:41.6611 SIIRT, TURKEY:37.9786:41.8403:284
SIIRT, TURKEY:37.9786:41.8403
NINIOP, TURKEY:42.0189:35.0792
SALTSY, MOLDOVA:47.8378:27.7811 SALTSY, MOLDOVA:47.8378:27.7811
KICHINAU FIR/ACC/COM, MOLDOVA:46.9278:28.9314 KICHINAU FIR/ACC/COM, MOLDOVA:46.9278:28.9314
OHRID, FORMER MACEDONIA:41.1797:20.7422 OHRID, FORMER MACEDONIA:41.1797:20.7422
@ -3505,93 +3496,81 @@ MUSTIQUE, ST.VINCENT/GRENADINES:12.8875:W61.18
KINGSTOWN, ST.VINCENT/GRENADINES:13.1442:W61.2108 KINGSTOWN, ST.VINCENT/GRENADINES:13.1442:W61.2108
ALMA-ATA, KAZAKHSTAN:43.3519:77.0403 ALMA-ATA, KAZAKHSTAN:43.3519:77.0403
BALKHASH, RUSSIA:46.8942:75.0047 BALKHASH, RUSSIA:46.8942:75.0047
TSELINOGRAD, RUSSIA:51.0222:71.4672 BISHKEK, RUSSIA:43.0617:74.4783:169
BISHKEK, RUSSIA:43.0617:74.4783 OSH, RUSSIA:40.6089:72.7931:182
OSH, RUSSIA:40.6089:72.7931 CHIMKENT, RUSSIA:42.3644:69.4792:1170
CHIMKENT, RUSSIA:42.3644:69.4792
DZHEZKAZGAN, RUSSIA:47.7083:67.7333 DZHEZKAZGAN, RUSSIA:47.7083:67.7333
URALSK, RUSSIA:51.1517:51.5456 AKTYUBINSK, RUSSIA:50.245:57.2033:400
SEMIPLATINSK, RUSSIA:50.3511:80.2342 KUSTANAY, RUSSIA:53.2064:63.5508:240
SHEVCHENKO, RUSSIA:43.86:51.0919 BAKU, RUSSIA:40.4675:50.0467:2140
AKTYUBINSK, RUSSIA:50.245:57.2033 ALDAN, RUSSIA:34.8042:W96.6711:33
KUSTANAY, RUSSIA:53.2064:63.5508 YAKUTSK, RUSSIA:62.0931:129.771:122
BAKU, RUSSIA:40.4675:50.0467 YEREVAN, RUSSIA:40.1483:44.3967:223
ALDAN, RUSSIA:34.8042:W96.6711 TBILISI, GEORGIA:41.6692:44.9547:726
YAKUTSK, RUSSIA:62.0931:129.771 SUKHUMI, GEORGIA:42.8581:41.1281:27
POLYARNY, RUSSIA:66.4167:112.05 BLAGOVESCHENSK, RUSSIA:50.4217:127.41:321
YEREVAN, RUSSIA:40.1483:44.3967 KHABAROVSK, RUSSIA:48.5278:135.188:383
TBILISI, GEORGIA:41.6692:44.9547 ANADYR, RUSSIA:64.7347:177.741:20
SUKHUMI, GEORGIA:42.8581:41.1281 MAGADAN, RUSSIA:59.91:150.717:295
BLAGOVESCHENSK, RUSSIA:50.4217:127.41 PEVEK, RUSSIA:67.5:171:60
KHABAROVSK, RUSSIA:48.5278:135.188 PETROPAVLOVSK, RUSSIA:53.1664:158.453:400
ANADYR, RUSSIA:64.7347:177.741 OKHA, RUSSIA:53.515:142.888:15254
PROVIDENIYA BAY, RUSSIA:64.38:W173.247 YUZHNO-SAKHALINSK, RUSSIA:46.8886:142.717:164
MAGADAN, RUSSIA:59.91:150.717 VLADIVOSTOK, RUSSIA:43.3989:132.151:331
PEVEK, RUSSIA:67.5:171 CHITA, RUSSIA:52.0261:113.305:534
PETROPAVLOVSK, RUSSIA:53.1664:158.453 BRATSK, RUSSIA:56.3708:101.699:262
OKHA, RUSSIA:53.515:142.888 IRKUTSK, RUSSIA:52.2669:104.395:280
YUZHNO-SAKHALINSK, RUSSIA:46.8886:142.717 ULAN-UDE, RUSSIA:51.8067:107.438:347
VLADIVOSTOK, RUSSIA:43.3989:132.151 KIEV, RUSSIA:50.345:30.895:839
CHITA, RUSSIA:52.0261:113.305 DONETSK, RUSSIA:48.0733:37.74:358
BRATSK, RUSSIA:56.3708:101.699 DNEPROPETROVSK, RUSSIA:48.3567:35.1017:409
IRKUTSK, RUSSIA:52.2669:104.395 SIMFEROPOL, RUSSIA:45.0386:33.9831:107
ULAN-UDE, RUSSIA:51.8067:107.438 KHARKOV, RUSSIA:49.3589:26.9339:350
KIEV, RUSSIA:50.345:30.895 LVOV, RUSSIA:49.8125:23.9561:182
DONETSK, RUSSIA:48.0733:37.74 ODESSA, RUSSIA:46.4269:30.6781:162
DNEPROPETROVSK, RUSSIA:48.3567:35.1017 ST. PETERSBURG, RUSSIA:59.8:30.265:1439
SIMFEROPOL, RUSSIA:45.0386:33.9831 MURMANSK, RUSSIA:68.7817:32.7506:154
KHARKOV, RUSSIA:49.3589:26.9339 GOMEL, RUSSIA:52.5269:31.0167:139
KIEV, RUSSIA:50.4017:30.4517 VITEBSK, RUSSIA:55.1667:30.1333:124
LVOV, RUSSIA:49.8125:23.9561 KALININGRAD, RUSSIA:54.89:20.5925:223
CHERNOVTSK, RUSSIA:48.26:25.9817 MINSK, RUSSIA:53.8644:27.5394:409
ODESSA, RUSSIA:46.4269:30.6781 ABAKAN, RUSSIA:53.74:91.385:112
ST. PETERSBURG, RUSSIA:59.8:30.265 BARNAUL, RUSSIA:53.3639:83.5419:321
MURMANSK, RUSSIA:68.7817:32.7506 KEMOROVO, RUSSIA:55.2697:86.1069:294
GOMEL, RUSSIA:52.5269:31.0167 OMSK, RUSSIA:54.9669:73.31:573
VITEBSK, RUSSIA:55.1667:30.1333 KRASNODAR, RUSSIA:45.035:39.1717:339
KALININGRAD, RUSSIA:54.89:20.5925 MAKHACHKALA, RUSSIA:42.8167:47.6522:468
MINSK, RUSSIA:53.8644:27.5394 MINERALNYE VODY, RUSSIA:44.225:43.0817:51
MINSK 2, RUSSIA:53.8822:28.0306
ABAKAN, RUSSIA:53.74:91.385
BARNAUL, RUSSIA:53.3639:83.5419
KEMOROVO, RUSSIA:55.2697:86.1069
OMSK, RUSSIA:54.9669:73.31
KRASNODAR, RUSSIA:45.035:39.1717
MAKHACHKALA, RUSSIA:42.8167:47.6522
MINERALNYE VODY, RUSSIA:44.225:43.0817
STAVROPOL, RUSSIA:45.1092:42.1128 STAVROPOL, RUSSIA:45.1092:42.1128
ROSTOV, RUSSIA:47.2581:39.8178 ROSTOV, RUSSIA:47.2581:39.8178:354
SOCHI, RUSSIA:43.4458:39.9475 SOCHI, RUSSIA:43.4458:39.9475:176
ASTRAKHAN, RUSSIA:46.2833:48.0061 ASTRAKHAN, RUSSIA:46.2833:48.0061:208
VOLGOGRAD, RUSSIA:48.7822:44.3447 VOLGOGRAD, RUSSIA:48.7822:44.3447:859
CHELYABINSK, RUSSIA:55.3033:61.5067 CHELYABINSK, RUSSIA:55.3033:61.5067:530
MAGNETIOGORSK, RUSSIA:53.3933:58.76 MAGNETIOGORSK, RUSSIA:53.3933:58.76:392
SALEKHARD, RUSSIA:66.59:66.6103 SALEKHARD, RUSSIA:66.59:66.6103:84
NIZHNEVARTOVSK, RUSSIA:60.95:76.4667 NIZHNEVARTOVSK, RUSSIA:60.95:76.4667:271
PERM, RUSSIA:57.9167:56.0256 PERM, RUSSIA:57.9167:56.0256:803
SURGUT, RUSSIA:61.25:73.5 SURGUT, RUSSIA:61.25:73.5:354
SVERDLOVSK, RUSSIA:56.7414:60.8036 SVERDLOVSK, RUSSIA:56.7414:60.8036:468
TOBOLSK, RUSSIA:37.1322:W92.0839 TOBOLSK, RUSSIA:37.1322:W92.0839:222
KURGAN, RUSSIA:55.475:65.4147 KURGAN, RUSSIA:55.475:65.4147:393
ASHKHABAD, RUSSIA:37.9917:58.3633 DUSHANBE, RUSSIA:38.5433:68.825:185
KRASNOVODSK, RUSSIA:40.0333:52.9833 NUKUS, RUSSIA:42.4864:59.6225:222
CHARDZHOU, RUSSIA:39.0833:63.6133 BUKHARA, RUSSIA:39.775:64.48:143
DUSHANBE, RUSSIA:38.5433:68.825 SAMARKAND, RUSSIA:39.7006:66.9847:120
NUKUS, RUSSIA:42.4864:59.6225 TERMEZ, RUSSIA:37.2864:67.3083:36
BUKHARA, RUSSIA:39.775:64.48 TASHKENT, UZBEKISTAN:41.2572:69.2817:334
SAMARKAND, RUSSIA:39.7006:66.9847 BRYANSK, RUSSIA:53.2142:34.1764:186
TERMEZ, RUSSIA:37.2864:67.3083 MOSCOW, RUSSIA:55.7504461:37.6174943:2511
TASHKENT, UZBEKISTAN:41.2572:69.2817 TVER, RUSSIA:56.8247:35.7575:152
BRYANSK, RUSSIA:53.2142:34.1764 VORONEZH, RUSSIA:51.8142:39.2297:596
MOSCOW, RUSSIA:55.7504461:37.6174943 SYKTYVKAR, RUSSIA:61.6475:50.8456:152
TVER, RUSSIA:56.8247:35.7575 KAZAN, RUSSIA:55.6078:49.2772:515
VORONEZH, RUSSIA:51.8142:39.2297 ORENBURG, RUSSIA:51.7956:55.4567:259
SYKTYVKAR, RUSSIA:61.6475:50.8456 PENZA, RUSSIA:28.9542:W98.5197:304
KAZAN, RUSSIA:55.6078:49.2772 UFA, RUSSIA:54.5575:55.8742:707
ORENBURG, RUSSIA:51.7956:55.4567 SAMARA, RUSSIA:53.5053:50.1644:541
PENZA, RUSSIA:28.9542:W98.5197
UFA, RUSSIA:54.5575:55.8742
SAMARA, RUSSIA:53.5053:50.1644
AHMEDABAD, INDIA:23.0747:72.6317 AHMEDABAD, INDIA:23.0747:72.6317
AKOLA, INDIA:20.6989:77.0564 AKOLA, INDIA:20.6989:77.0564
AURANGABAD, INDIA:19.8631:75.3981 AURANGABAD, INDIA:19.8631:75.3981

View File

@ -3604,7 +3604,8 @@ def testSpoofGeolocation() -> None:
'LOS ANGELES, USA:34.0536909:W118.242766:1214', 'LOS ANGELES, USA:34.0536909:W118.242766:1214',
'HOUSTON, USA:29.6072:W95.1586:1553', 'HOUSTON, USA:29.6072:W95.1586:1553',
'MANCHESTER, ENGLAND:53.4794892:W2.2451148:630', 'MANCHESTER, ENGLAND:53.4794892:W2.2451148:630',
'BERLIN, GERMANY:52.5170365:13.3888599:891' 'BERLIN, GERMANY:52.5170365:13.3888599:891',
'ANKARA, TURKEY:39.93:32.85:24521'
] ]
currTime = datetime.datetime.utcnow() currTime = datetime.datetime.utcnow()
decoySeed = 7634681 decoySeed = 7634681