Skip to content

Commit 979a3aa

Browse files
committed
updated list of locations
1 parent d9fdb3e commit 979a3aa

File tree

2 files changed

+154
-15
lines changed

2 files changed

+154
-15
lines changed

data/plotted_locations.json

+141-8
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,25 @@
1313
"num_users": 1,
1414
"country_code": "CH"
1515
},
16+
{
17+
"common_name": "Olomouc",
18+
"id_name": "Olomoucký kraj",
19+
"stage": "Production",
20+
"num_users": 1,
21+
"country_code": "CZ"
22+
},
1623
{
1724
"common_name": "Aachen",
1825
"id_name": "Städteregion Aachen",
1926
"stage": "Production",
20-
"num_users": 4,
27+
"num_users": 2,
2128
"country_code": "DE"
2229
},
2330
{
2431
"common_name": "Berlin",
2532
"id_name": "Berlin",
2633
"stage": "Interested",
27-
"num_users": 4,
34+
"num_users": 2,
2835
"country_code": "DE"
2936
},
3037
{
@@ -49,7 +56,7 @@
4956
"country_code": "DE"
5057
},
5158
{
52-
"common_name": "Colonge",
59+
"common_name": "Cologne",
5360
"id_name": "Köln, Kreisfreie Stadt",
5461
"stage": "Production",
5562
"num_users": 1,
@@ -72,7 +79,7 @@
7279
{
7380
"common_name": "Duisburg-Essen",
7481
"id_name": "Duisburg, Kreisfreie Stadt",
75-
"stage": "Interested",
82+
"stage": "Production",
7683
"num_users": 1,
7784
"country_code": "DE"
7885
},
@@ -94,7 +101,7 @@
94101
"common_name": "Freiburg",
95102
"id_name": "Freiburg im Breisgau, Stadtkreis",
96103
"stage": "Production",
97-
"num_users": 1,
104+
"num_users": 3,
98105
"country_code": "DE"
99106
},
100107
{
@@ -115,14 +122,14 @@
115122
"common_name": "Halle",
116123
"id_name": "Halle (Saale), Kreisfreie Stadt",
117124
"stage": "Production",
118-
"num_users": 1,
125+
"num_users": 2,
119126
"country_code": "DE"
120127
},
121128
{
122129
"common_name": "Hannover",
123130
"id_name": "Region Hannover",
124131
"stage": "Interested",
125-
"num_users": 1,
132+
"num_users": 2,
126133
"country_code": "DE"
127134
},
128135
{
@@ -181,11 +188,18 @@
181188
"num_users": 1,
182189
"country_code": "DE"
183190
},
191+
{
192+
"common_name": "Marburg",
193+
"id_name": "Marburg-Biedenkopf",
194+
"stage": "Interested",
195+
"num_users": 1,
196+
"country_code": "DE"
197+
},
184198
{
185199
"common_name": "Munich",
186200
"id_name": "München, Kreisfreie Stadt",
187201
"stage": "Production",
188-
"num_users": 3,
202+
"num_users": 5,
189203
"country_code": "DE"
190204
},
191205
{
@@ -202,6 +216,13 @@
202216
"num_users": 1,
203217
"country_code": "DE"
204218
},
219+
{
220+
"common_name": "Potsdam",
221+
"id_name": "Potsdam, Kreisfreie Stadt",
222+
"stage": "Interested",
223+
"num_users": 1,
224+
"country_code": "DE"
225+
},
205226
{
206227
"common_name": "Regensburg",
207228
"id_name": "Regensburg, Kreisfreie Stadt",
@@ -223,6 +244,27 @@
223244
"num_users": 1,
224245
"country_code": "DE"
225246
},
247+
{
248+
"common_name": "Siegen",
249+
"id_name": "Siegen-Wittgenstein",
250+
"stage": "Interested",
251+
"num_users": 1,
252+
"country_code": "DE"
253+
},
254+
{
255+
"common_name": "Tübingen",
256+
"id_name": "Tübingen, Landkreis",
257+
"stage": "Interested",
258+
"num_users": 1,
259+
"country_code": "DE"
260+
},
261+
{
262+
"common_name": "Ulm",
263+
"id_name": "Ulm, Stadtkreis",
264+
"stage": "Interested",
265+
"num_users": 1,
266+
"country_code": "DE"
267+
},
226268
{
227269
"common_name": "Würzburg",
228270
"id_name": "Würzburg, Kreisfreie Stadt",
@@ -244,6 +286,20 @@
244286
"num_users": 1,
245287
"country_code": "FR"
246288
},
289+
{
290+
"common_name": "Mulhouse",
291+
"id_name": "Haut-Rhin",
292+
"stage": "Production",
293+
"num_users": 1,
294+
"country_code": "FR"
295+
},
296+
{
297+
"common_name": "Bari",
298+
"id_name": "Bari",
299+
"stage": "Interested",
300+
"num_users": 1,
301+
"country_code": "IT"
302+
},
247303
{
248304
"common_name": "Nijmegen",
249305
"id_name": "Arnhem/Nijmegen",
@@ -258,20 +314,83 @@
258314
"num_users": 1,
259315
"country_code": "NL"
260316
},
317+
{
318+
"common_name": "Ljubljana",
319+
"id_name": "Osrednjeslovenska",
320+
"stage": "Interested",
321+
"num_users": 1,
322+
"country_code": "SI"
323+
},
324+
{
325+
"common_name": "Beijing",
326+
"id_name": "Beijing",
327+
"stage": "Interested",
328+
"num_users": 1,
329+
"country_code": "CN"
330+
},
261331
{
262332
"common_name": "Chennai",
263333
"id_name": "Chennai",
264334
"stage": "Interested",
265335
"num_users": 1,
266336
"country_code": "IN"
267337
},
338+
{
339+
"common_name": "Pune",
340+
"id_name": "Pune",
341+
"stage": "Interested",
342+
"num_users": 2,
343+
"country_code": "IN"
344+
},
345+
{
346+
"common_name": "Bangkok",
347+
"id_name": "Bangkok",
348+
"stage": "Interested",
349+
"num_users": 1,
350+
"country_code": "TH"
351+
},
352+
{
353+
"common_name": "Meram",
354+
"id_name": "Konya",
355+
"stage": "Interested",
356+
"num_users": 1,
357+
"country_code": "TR"
358+
},
268359
{
269360
"common_name": "London",
270361
"id_name": "Camden and City of London",
271362
"stage": "Interested",
272363
"num_users": 1,
273364
"country_code": "UK"
274365
},
366+
{
367+
"common_name": "Newcastle upon Tyne",
368+
"id_name": "Tyneside",
369+
"stage": "Interested",
370+
"num_users": 1,
371+
"country_code": "UK"
372+
},
373+
{
374+
"common_name": "Atlanta",
375+
"id_name": "Atlanta",
376+
"stage": "Interested",
377+
"num_users": 1,
378+
"country_code": "US"
379+
},
380+
{
381+
"common_name": "Denver",
382+
"id_name": "Denver",
383+
"stage": "Interested",
384+
"num_users": 1,
385+
"country_code": "US"
386+
},
387+
{
388+
"common_name": "Ithaca",
389+
"id_name": "Ithaca",
390+
"stage": "Interested",
391+
"num_users": 1,
392+
"country_code": "US"
393+
},
275394
{
276395
"common_name": "Lexington",
277396
"id_name": "Lexington",
@@ -285,5 +404,19 @@
285404
"stage": "Interested",
286405
"num_users": 1,
287406
"country_code": "US"
407+
},
408+
{
409+
"common_name": "Richland",
410+
"id_name": "Richland",
411+
"stage": "Interested",
412+
"num_users": 1,
413+
"country_code": "US"
414+
},
415+
{
416+
"common_name": "New York",
417+
"id_name": "New York",
418+
"stage": "Interested",
419+
"num_users": 1,
420+
"country_code": "US"
288421
}
289422
]

generate_map.py

+13-7
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
overlay_icon = "https://raw.githubusercontent.com/harivyasi/ELNmap/main/data/favicon.ico"
2424
legend_header = "<a href='https://chemotion.net/'>Chemotion</a>"
2525
if only_germany:
26-
legend_location = (0.2, 0.7)
26+
legend_location = (0.7, 0.4)
2727
color_based_on = "NUTS_NAME"
2828
map_filename = "germany.svg"
2929
elif no_germany:
30-
legend_location = (0.7, 0.3)
30+
legend_location = (0.8, 0.25)
3131
color_based_on = "CNTR_CODE"
3232
map_filename = "restofeur.svg"
3333
else:
34-
legend_location = (0.7, 0.3)
34+
legend_location = (0.5, 0.7)
3535
color_based_on = "CNTR_CODE"
3636
map_filename = "europe.svg"
3737

@@ -56,9 +56,15 @@
5656
eur_country_list = ["DE"]
5757
eur_country = eur_country[eur_country.CNTR_CODE.isin(eur_country_list)]
5858
else:
59+
eur_country_list = locations["country_code"].unique().tolist()
60+
try:
61+
# limit geographical boundary for conciseness
62+
eur_country_list.remove("TR")
63+
except ValueError:
64+
pass
5965
eur_country = eur_country[eur_country.CNTR_CODE.isin(
60-
locations["country_code"].unique().tolist())]
61-
eur_country_list = eur_country.CNTR_CODE.unique().tolist()
66+
eur_country_list)]
67+
eur_country_list = list(eur_country.CNTR_CODE.unique().tolist())
6268
if no_germany:
6369
eur_country.drop(
6470
eur_country[eur_country.CNTR_CODE.isin(["DE"])].index, inplace=True)
@@ -67,11 +73,11 @@
6773
except ValueError:
6874
pass
6975
if not len(eur_country_list):
70-
print("WARNING: No European to be plotted.")
76+
print("WARNING: No European country to be plotted.")
7177

7278
# modifications to eur map, if any
7379
# keep only mainland parts for conciseness
74-
eur_country_drop_parts = {"FR": ["FRY", "FRM"], "ES": ["ES7"]}
80+
eur_country_drop_parts = {"FR": ["FRY", "FRM"], "ES": ["ES7"], "IT": ["ITG"]}
7581
for v in eur_country_drop_parts.values():
7682
eur_country.drop(eur_country[eur_country.FID.isin(v)].index, inplace=True)
7783

0 commit comments

Comments
 (0)