Skip to content

Commit 96f975f

Browse files
lloeschelloesche
authored
Merge pull request #10 from someengineering/lloesche/regions
Update Regions
2 parents a018859 + 3940824 commit 96f975f

File tree

2 files changed

+125
-46
lines changed

2 files changed

+125
-46
lines changed

‎fixinventorydata/__main__.py‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,18 @@ def gen_gcp_regions() -> dict:
8383
r = requests.get(locations_url)
8484
soup = BeautifulSoup(r.text, "html.parser")
8585
for loc in soup.find_all("span", {"class": "zone"}):
86-
long_region = loc.previous_sibling
86+
long_region = loc.previous_sibling.text.strip()
87+
if len(long_region) == 0:
88+
previous_element = loc.previous_element
89+
while previous_element:
90+
if (
91+
previous_element.name == "a"
92+
and "cloud-link" in previous_element.get("class", [])
93+
and len(previous_element.text.strip()) > 2
94+
):
95+
long_region = previous_element.text.strip()
96+
break
97+
previous_element = previous_element.previous_element
8798
short_region = loc.text
8899
if "(" in short_region and ")" in short_region:
89100
short_region = short_region[short_region.find("(") + 1 : short_region.find(")")]
@@ -148,6 +159,8 @@ def write_regions(regions: dict) -> None:
148159
"europe-west4": "Eemshaven, Netherlands",
149160
"europe-north1": "Hamina, Finland",
150161
"southamerica-west1": "Santiago, Chile",
162+
"me-central1": "Doha, Qatar",
163+
"me-central2": "Dammam, Saudi Arabia",
151164
}
152165

153166

‎fixinventorydata/data/regions.json‎

Lines changed: 111 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
"ap-east-1": {
1010
"short_name": "ap-east-1",
1111
"long_name": "Asia Pacific (Hong Kong)",
12-
"latitude": 22.2793278,
13-
"longitude": 114.1628131
12+
"latitude": 22.350627,
13+
"longitude": 114.1849161
1414
},
1515
"ap-northeast-1": {
1616
"short_name": "ap-northeast-1",
1717
"long_name": "Asia Pacific (Tokyo)",
18-
"latitude": 35.6812665,
19-
"longitude": 139.757653
18+
"latitude": 35.6821936,
19+
"longitude": 139.762221
2020
},
2121
"ap-northeast-2": {
2222
"short_name": "ap-northeast-2",
@@ -27,14 +27,20 @@
2727
"ap-northeast-3": {
2828
"short_name": "ap-northeast-3",
2929
"long_name": "Asia Pacific (Osaka)",
30-
"latitude": 34.661629000000005,
31-
"longitude": 135.49992679245517
30+
"latitude": 34.6198813,
31+
"longitude": 135.490357
3232
},
3333
"ap-south-1": {
3434
"short_name": "ap-south-1",
3535
"long_name": "Asia Pacific (Mumbai)",
36-
"latitude": 19.0785451,
37-
"longitude": 72.878176
36+
"latitude": 18.9733536,
37+
"longitude": 72.82810491917377
38+
},
39+
"ap-south-2": {
40+
"short_name": "ap-south-2",
41+
"long_name": "Asia Pacific (Hyderabad)",
42+
"latitude": 17.360589,
43+
"longitude": 78.4740613
3844
},
3945
"ap-southeast-1": {
4046
"short_name": "ap-southeast-1",
@@ -51,21 +57,39 @@
5157
"ap-southeast-3": {
5258
"short_name": "ap-southeast-3",
5359
"long_name": "Asia Pacific (Jakarta)",
54-
"latitude": -6.1753942,
55-
"longitude": 106.827183
60+
"latitude": -6.175247,
61+
"longitude": 106.8270488
62+
},
63+
"ap-southeast-4": {
64+
"short_name": "ap-southeast-4",
65+
"long_name": "Asia Pacific (Melbourne)",
66+
"latitude": -37.8142454,
67+
"longitude": 144.9631732
5668
},
5769
"ca-central-1": {
5870
"short_name": "ca-central-1",
5971
"long_name": "Canada (Central)",
6072
"latitude": 45.5031824,
6173
"longitude": -73.5698065
6274
},
75+
"ca-west-1": {
76+
"short_name": "ca-west-1",
77+
"long_name": "Canada West (Calgary)",
78+
"latitude": 51.0456064,
79+
"longitude": -114.057541
80+
},
6381
"eu-central-1": {
6482
"short_name": "eu-central-1",
6583
"long_name": "Europe (Frankfurt)",
6684
"latitude": 50.1106444,
6785
"longitude": 8.6820917
6886
},
87+
"eu-central-2": {
88+
"short_name": "eu-central-2",
89+
"long_name": "Europe (Zurich)",
90+
"latitude": 47.3744489,
91+
"longitude": 8.5410422
92+
},
6993
"eu-north-1": {
7094
"short_name": "eu-north-1",
7195
"long_name": "Europe (Stockholm)",
@@ -78,24 +102,36 @@
78102
"latitude": 45.4641943,
79103
"longitude": 9.1896346
80104
},
105+
"eu-south-2": {
106+
"short_name": "eu-south-2",
107+
"long_name": "Europe (Spain)",
108+
"latitude": 39.3260685,
109+
"longitude": -4.8379791
110+
},
81111
"eu-west-1": {
82112
"short_name": "eu-west-1",
83113
"long_name": "Europe (Ireland)",
84-
"latitude": 53.3498006,
85-
"longitude": -6.2602964
114+
"latitude": 53.3493795,
115+
"longitude": -6.2605593
86116
},
87117
"eu-west-2": {
88118
"short_name": "eu-west-2",
89119
"long_name": "Europe (London)",
90-
"latitude": 51.5073359,
91-
"longitude": -0.12765
120+
"latitude": 51.4893335,
121+
"longitude": -0.14405508452768728
92122
},
93123
"eu-west-3": {
94124
"short_name": "eu-west-3",
95125
"long_name": "Europe (Paris)",
96126
"latitude": 48.8588897,
97127
"longitude": 2.3200410217200766
98128
},
129+
"il-central-1": {
130+
"short_name": "il-central-1",
131+
"long_name": "Israel (Tel Aviv)",
132+
"latitude": 32.0852997,
133+
"longitude": 34.7818064
134+
},
99135
"me-central-1": {
100136
"short_name": "me-central-1",
101137
"long_name": "Middle East (UAE)",
@@ -129,8 +165,8 @@
129165
"us-west-1": {
130166
"short_name": "us-west-1",
131167
"long_name": "US West (N. California)",
132-
"latitude": 37.7790262,
133-
"longitude": -122.419906
168+
"latitude": 37.7792588,
169+
"longitude": -122.4193286
134170
},
135171
"us-west-2": {
136172
"short_name": "us-west-2",
@@ -149,8 +185,8 @@
149185
"sfo1": {
150186
"short_name": "sfo1",
151187
"long_name": "San Francisco 1",
152-
"latitude": 37.7790262,
153-
"longitude": -122.419906
188+
"latitude": 37.7792588,
189+
"longitude": -122.4193286
154190
},
155191
"nyc2": {
156192
"short_name": "nyc2",
@@ -173,8 +209,8 @@
173209
"lon1": {
174210
"short_name": "lon1",
175211
"long_name": "London 1",
176-
"latitude": 51.5073359,
177-
"longitude": -0.12765
212+
"latitude": 51.4893335,
213+
"longitude": -0.14405508452768728
178214
},
179215
"nyc3": {
180216
"short_name": "nyc3",
@@ -203,8 +239,8 @@
203239
"sfo2": {
204240
"short_name": "sfo2",
205241
"long_name": "San Francisco 2",
206-
"latitude": 37.7790262,
207-
"longitude": -122.419906
242+
"latitude": 37.7792588,
243+
"longitude": -122.4193286
208244
},
209245
"blr1": {
210246
"short_name": "blr1",
@@ -215,8 +251,8 @@
215251
"sfo3": {
216252
"short_name": "sfo3",
217253
"long_name": "San Francisco 3",
218-
"latitude": 37.7790262,
219-
"longitude": -122.419906
254+
"latitude": 37.7792588,
255+
"longitude": -122.4193286
220256
},
221257
"syd1": {
222258
"short_name": "syd1",
@@ -307,8 +343,8 @@
307343
"europe-west2": {
308344
"short_name": "europe-west2",
309345
"long_name": "London",
310-
"latitude": 51.5073359,
311-
"longitude": -0.12765
346+
"latitude": 51.4893335,
347+
"longitude": -0.14405508452768728
312348
},
313349
"europe-west1": {
314350
"short_name": "europe-west1",
@@ -320,7 +356,7 @@
320356
"short_name": "europe-west4",
321357
"long_name": "Netherlands",
322358
"latitude": 53.44847365,
323-
"longitude": 6.849962720298231
359+
"longitude": 6.849962702578557
324360
},
325361
"europe-west6": {
326362
"short_name": "europe-west6",
@@ -343,8 +379,8 @@
343379
"europe-central2": {
344380
"short_name": "europe-central2",
345381
"long_name": "Warsaw",
346-
"latitude": 52.2319581,
347-
"longitude": 21.0067249
382+
"latitude": 52.2337172,
383+
"longitude": 21.071432235636493
348384
},
349385
"europe-west8": {
350386
"short_name": "europe-west8",
@@ -364,17 +400,29 @@
364400
"latitude": 48.8588897,
365401
"longitude": 2.3200410217200766
366402
},
403+
"europe-west12": {
404+
"short_name": "europe-west12",
405+
"long_name": "Turin",
406+
"latitude": 45.0677551,
407+
"longitude": 7.6824892
408+
},
409+
"europe-west10": {
410+
"short_name": "europe-west10",
411+
"long_name": "Berlin",
412+
"latitude": 52.5170365,
413+
"longitude": 13.3888599
414+
},
367415
"asia-south1": {
368416
"short_name": "asia-south1",
369417
"long_name": "Mumbai",
370-
"latitude": 19.0785451,
371-
"longitude": 72.878176
418+
"latitude": 18.9733536,
419+
"longitude": 72.82810491917377
372420
},
373421
"asia-south2": {
374422
"short_name": "asia-south2",
375423
"long_name": "Delhi",
376-
"latitude": 28.6517178,
377-
"longitude": 77.2219388
424+
"latitude": 28.6273928,
425+
"longitude": 77.1716954
378426
},
379427
"asia-southeast1": {
380428
"short_name": "asia-southeast1",
@@ -385,32 +433,32 @@
385433
"asia-southeast2": {
386434
"short_name": "asia-southeast2",
387435
"long_name": "Jakarta",
388-
"latitude": -6.1753942,
389-
"longitude": 106.827183
436+
"latitude": -6.175247,
437+
"longitude": 106.8270488
390438
},
391439
"asia-east2": {
392440
"short_name": "asia-east2",
393441
"long_name": "Hong Kong",
394-
"latitude": 22.2793278,
395-
"longitude": 114.1628131
442+
"latitude": 22.350627,
443+
"longitude": 114.1849161
396444
},
397445
"asia-east1": {
398446
"short_name": "asia-east1",
399447
"long_name": "Taiwan",
400-
"latitude": 23.9739374,
401-
"longitude": 120.9820179
448+
"latitude": 23.5983227,
449+
"longitude": 120.83537694479215
402450
},
403451
"asia-northeast1": {
404452
"short_name": "asia-northeast1",
405453
"long_name": "Tokyo",
406-
"latitude": 35.6812665,
407-
"longitude": 139.757653
454+
"latitude": 35.6821936,
455+
"longitude": 139.762221
408456
},
409457
"asia-northeast2": {
410458
"short_name": "asia-northeast2",
411459
"long_name": "Osaka",
412-
"latitude": 34.661629000000005,
413-
"longitude": 135.49992679245517
460+
"latitude": 34.6198813,
461+
"longitude": 135.490357
414462
},
415463
"australia-southeast1": {
416464
"short_name": "australia-southeast1",
@@ -421,8 +469,8 @@
421469
"australia-southeast2": {
422470
"short_name": "australia-southeast2",
423471
"long_name": "Melbourne",
424-
"latitude": -37.8142176,
425-
"longitude": 144.9631608
472+
"latitude": -37.8142454,
473+
"longitude": 144.9631732
426474
},
427475
"asia-northeast3": {
428476
"short_name": "asia-northeast3",
@@ -435,6 +483,24 @@
435483
"long_name": "Tel Aviv",
436484
"latitude": 32.0852997,
437485
"longitude": 34.7818064
486+
},
487+
"me-central1": {
488+
"short_name": "me-central1",
489+
"long_name": "Doha",
490+
"latitude": 25.2856329,
491+
"longitude": 51.5264162
492+
},
493+
"me-central2": {
494+
"short_name": "me-central2",
495+
"long_name": "Dammam",
496+
"latitude": 26.4367824,
497+
"longitude": 50.1039991
498+
},
499+
"africa-south1": {
500+
"short_name": "africa-south1",
501+
"long_name": "Johannesburg",
502+
"latitude": -26.205,
503+
"longitude": 28.049722
438504
}
439505
}
440506
}

0 commit comments

Comments
 (0)