[data-update] Synced the data with upstream datasources (#1601)

* Synced the data with upstream * Added coordinates * fixed more building changes * made sure that streaming and power sockets are handled more properly in the NAT parser * fixed keepout zones for the NAT --------- Co-authored-by: CommanderStorm <[email protected]> Co-authored-by: Frank Elsinga <[email protected]>
TUM-Dev · Oct 18, 2024 · 48ce4d0 · 48ce4d0
1 parent 5040084
commit 48ce4d0
Show file tree

Hide file tree

Showing 13 changed files with 31,460 additions and 28,488 deletions.
diff --git a/data/external/models/nat.py b/data/external/models/nat.py
@@ -67,8 +67,6 @@ class Room(PydanticConfiguration):
     schedule_url: str | None
     seatings: list[SeatingPlan]
     seats: int | None
-    steckdosen: TranslatableStr | None
-    streaming: str | None
     teaching: bool
     # semi-random sets of ids
     # pylint: disable-next=invalid-name
@@ -79,7 +77,10 @@ class Room(PydanticConfiguration):
     room_identifier: str | None
     campus_id: str | None
     building_code: str
+    steckdosen: TranslatableStr | None = None
     org_id: int | None = None
+    streaming_webcam: bool = False
+    streaming_tumlive: bool = False
 
     @classmethod
     def load_all(cls) -> dict[str, "Room"]:

diff --git a/data/external/results/buildings_nat.json b/data/external/results/buildings_nat.json
@@ -468,13 +468,27 @@
     "building_name": "Bildungscampus C",
     "building_short": null
   },
+  {
+    "address": "Edisonstr. 3",
+    "building_code": "1912",
+    "building_id": 3449,
+    "building_name": "Edisonstr.3",
+    "building_short": null
+  },
   {
     "address": "Etzelstr. 38",
     "building_code": "1915",
     "building_id": 3191,
     "building_name": "Bildungscampus/Etzelstr.38",
     "building_short": null
   },
+  {
+    "address": "Berliner Platz 12",
+    "building_code": "1920",
+    "building_id": 3389,
+    "building_name": "Bildungscampus K3",
+    "building_short": null
+  },
   {
     "address": "Bildungscampus 3",
     "building_code": "1998",
@@ -609,7 +623,7 @@
     "building_short": null
   },
   {
-    "address": "Connollystr. 32",
+    "address": "Kolehmainenweg 7",
     "building_code": "2309",
     "building_id": 607,
     "building_name": "(SZ) Tennis Geb\u00e4ude",
@@ -644,7 +658,7 @@
     "building_short": null
   },
   {
-    "address": "Connollystr. 32",
+    "address": "Am Olympiacampus 13",
     "building_code": "2315",
     "building_id": 612,
     "building_name": "(SZ) Pr\u00e4ventionszentrum",
@@ -686,7 +700,7 @@
     "building_short": null
   },
   {
-    "address": "Connollystr. 32",
+    "address": "Am Olympiacampus 11",
     "building_code": "2330",
     "building_id": 2749,
     "building_name": "CiO/SG Seminarr\u00e4ume",
@@ -3478,6 +3492,13 @@
     "building_name": "MW Bibliothek u. Verwaltung",
     "building_short": null
   },
+  {
+    "address": "Boltzmannstr. 15",
+    "building_code": "5512",
+    "building_id": 3409,
+    "building_name": "Au\u00dfenfl\u00e4chen MW",
+    "building_short": null
+  },
   {
     "address": "Boltzmannstr. 15",
     "building_code": "5513",

diff --git a/data/external/results/buildings_tumonline.json b/data/external/results/buildings_tumonline.json
@@ -529,6 +529,16 @@
     "name": "Bildungscampus C",
     "tumonline_id": 3189
   },
+  "1912": {
+    "address": {
+      "place": "Heilbronn",
+      "street": "Edisonstr. 3",
+      "zip_code": 74076
+    },
+    "area_id": 243,
+    "name": "Edisonstr.3",
+    "tumonline_id": 3449
+  },
   "1915": {
     "address": {
       "place": "Heilbronn",
@@ -539,25 +549,25 @@
     "name": "Bildungscampus/Etzelstr.38",
     "tumonline_id": 3191
   },
-  "1998": {
+  "1920": {
     "address": {
       "place": "Heilbronn",
-      "street": "Bildungscampus 3",
-      "zip_code": 74076
+      "street": "Berliner Platz 12",
+      "zip_code": 74072
     },
     "area_id": 243,
-    "name": "Interim, Bildungscampus 3",
-    "tumonline_id": 3289
+    "name": "Bildungscampus K3",
+    "tumonline_id": 3389
   },
-  "1999": {
+  "1998": {
     "address": {
       "place": "Heilbronn",
-      "street": "Weipertstr. 8-10",
+      "street": "Bildungscampus 3",
       "zip_code": 74076
     },
     "area_id": 243,
-    "name": "Containerburg CB",
-    "tumonline_id": 3190
+    "name": "Interim, Bildungscampus 3",
+    "tumonline_id": 3289
   },
   "2103": {
     "address": {
@@ -632,7 +642,7 @@
   "2309": {
     "address": {
       "place": "M\u00fcnchen",
-      "street": "Connollystr. 32",
+      "street": "Kolehmainenweg 7",
       "zip_code": 80809
     },
     "area_id": 18,
@@ -642,7 +652,7 @@
   "2310": {
     "address": {
       "place": "M\u00fcnchen",
-      "street": "Connollystr. 32",
+      "street": "Kolehmainenweg 7",
       "zip_code": 80809
     },
     "area_id": 18,
@@ -659,20 +669,10 @@
     "name": "(SZ) Sport-, Aussenanlagen/Teil-Umbau",
     "tumonline_id": 610
   },
-  "2313": {
-    "address": {
-      "place": "M\u00fcnchen",
-      "street": "Connollystr. 32",
-      "zip_code": 80809
-    },
-    "area_id": 18,
-    "name": "(SZ) Wetterschutzhaus",
-    "tumonline_id": 611
-  },
   "2315": {
     "address": {
       "place": "M\u00fcnchen",
-      "street": "Connollystr. 32",
+      "street": "Am Olympiacampus 13",
       "zip_code": 80809
     },
     "area_id": 18,
@@ -732,7 +732,7 @@
   "2330": {
     "address": {
       "place": "M\u00fcnchen",
-      "street": "Connollystr. 32",
+      "street": "Am Olympiacampus 11",
       "zip_code": 80809
     },
     "area_id": 18,
@@ -742,7 +742,7 @@
   "2331": {
     "address": {
       "place": "M\u00fcnchen",
-      "street": "Connollystr. 32",
+      "street": "Am Olympiacampus 11",
       "zip_code": 80809
     },
     "area_id": 18,
@@ -752,7 +752,7 @@
   "2332": {
     "address": {
       "place": "M\u00fcnchen",
-      "street": "Connollystr. 32",
+      "street": "Am Olympiacampus 11",
       "zip_code": 80809
     },
     "area_id": 18,
@@ -762,7 +762,7 @@
   "2333": {
     "address": {
       "place": "M\u00fcnchen",
-      "street": "Connollystr. 32",
+      "street": "Am Olympiacampus 11",
       "zip_code": 80809
     },
     "area_id": 18,
@@ -772,7 +772,7 @@
   "2334": {
     "address": {
       "place": "M\u00fcnchen",
-      "street": "Connollystr. 32",
+      "street": "Am Olympiacampus 11",
       "zip_code": 80809
     },
     "area_id": 18,
@@ -3829,6 +3829,16 @@
     "name": "H\u00f6rsaal, Bibliothek u. Verwaltungsgeb\u00e4ud",
     "tumonline_id": 842
   },
+  "5512": {
+    "address": {
+      "place": "Garching b. M\u00fcnchen",
+      "street": "Boltzmannstr. 15",
+      "zip_code": 85748
+    },
+    "area_id": 34,
+    "name": "Au\u00dfenfl\u00e4chen MW",
+    "tumonline_id": 3409
+  },
   "5513": {
     "address": {
       "place": "Garching b. M\u00fcnchen",