diff --git a/src/routers/geoint.py b/src/routers/geoint.py index 40fd76a..756a06d 100644 --- a/src/routers/geoint.py +++ b/src/routers/geoint.py @@ -51,34 +51,70 @@ _FLIGHT_GRID = [ (55.0, 25.0), # Baltikum (60.0, 25.0), # Skandinavien-Ost (52.0, 30.0), # Osteuropa - # Naher Osten - (33.0, 36.0), # Levante - (25.0, 45.0), # Arabien - (33.0, 52.0), # Iran - # Nordafrika - (34.0, 2.0), # Maghreb - (30.0, 31.0), # Aegypten + (45.0, 37.0), # Schwarzes Meer / Tuerkei Ost # UK / Island (54.0, -2.0), # UK (63.0, -19.0), # Island + # Naher Osten (erweitert) + (33.0, 36.0), # Levante (Syrien/Libanon/Israel) + (30.0, 31.0), # Aegypten / Kairo + (25.0, 45.0), # Saudi-Arabien Zentral + (26.5, 56.0), # Strasse von Hormuz / VAE + (25.0, 51.5), # Katar / Bahrain + (33.0, 44.0), # Irak (Bagdad) + (33.0, 52.0), # Iran (Teheran) + (15.0, 45.0), # Jemen / Rotes Meer + (21.0, 40.0), # Saudi-Arabien West (Dschidda) + # Nordafrika + (34.0, 2.0), # Maghreb (Algier) + (33.0, -7.0), # Marokko (Casablanca) + (32.0, 13.0), # Libyen (Tripolis) + # Zentralasien + (41.0, 69.0), # Usbekistan (Taschkent) + (39.0, 63.0), # Turkmenistan # Nordamerika Ostkueste (40.0, -74.0), # New York (33.0, -84.0), # Atlanta (42.0, -88.0), # Chicago + (26.0, -80.0), # Florida (Miami) + (45.0, -74.0), # Montreal # Nordamerika Westkueste (34.0, -118.0), # Los Angeles (47.0, -122.0), # Seattle + (37.0, -122.0), # San Francisco + # Nordamerika Zentral + (30.0, -97.0), # Texas (Austin) + (39.0, -105.0), # Denver # Ostasien - (35.0, 140.0), # Japan - (37.0, 127.0), # Korea + (35.0, 140.0), # Japan (Tokio) + (37.0, 127.0), # Korea (Seoul) (31.0, 121.0), # Shanghai + (40.0, 117.0), # Peking (22.0, 114.0), # Hongkong + (25.0, 121.0), # Taiwan # Suedasien (19.0, 73.0), # Mumbai (28.0, 77.0), # Delhi + (13.0, 80.0), # Chennai + (7.0, 80.0), # Sri Lanka # Suedostasien (1.0, 104.0), # Singapur (14.0, 101.0), # Bangkok + (-6.0, 107.0), # Jakarta + (10.0, 107.0), # Ho-Chi-Minh + # Ozeanien + (-34.0, 151.0), # Sydney + (-37.0, 175.0), # Neuseeland + # Afrika + (-1.0, 37.0), # Nairobi + (-34.0, 18.0), # Kapstadt + (6.0, 3.0), # Lagos + (9.0, 39.0), # Addis Abeba + # Suedamerika + (-23.0, -43.0), # Rio de Janeiro + (-34.0, -58.0), # Buenos Aires + (-12.0, -77.0), # Lima + (4.0, -74.0), # Bogota ] _flight_lock = asyncio.Lock() diff --git a/src/static/js/geoint.js b/src/static/js/geoint.js index d537d3c..35dbea2 100644 --- a/src/static/js/geoint.js +++ b/src/static/js/geoint.js @@ -87,7 +87,7 @@ const GEOINT = { var self = this; var items = [ ['flights', 'Flugverkehr', 'flights'], - ['ships', 'Schiffsverkehr', 'ships'], + ['ships', 'Schiffe (Nordeuropa)', 'ships'], ['quakes', 'Erdbeben', 'quakes'], ['gdelt', 'Nachrichten', 'gdelt'], ['_sep'],