Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from
Oct 18, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f743e33
Synced the data with upstream
CommanderStorm Oct 17, 2024
fcf636f
Added coordinates
CommanderStorm Oct 17, 2024
608ac84
fixed more building changes
CommanderStorm Oct 17, 2024
e626629
made sure that streaming and power sockets are handled more properly …
CommanderStorm Oct 18, 2024
282012b
fixed keepout zones for the NAT
CommanderStorm Oct 18, 2024
3ac98ea
Merge branch 'main' into chore/data-update
CommanderStorm Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions data/external/models/nat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]:
Expand Down
27 changes: 24 additions & 3 deletions data/external/results/buildings_nat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
64 changes: 37 additions & 27 deletions data/external/results/buildings_tumonline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -632,7 +642,7 @@
"2309": {
"address": {
"place": "M\u00fcnchen",
"street": "Connollystr. 32",
"street": "Kolehmainenweg 7",
"zip_code": 80809
},
"area_id": 18,
Expand All @@ -642,7 +652,7 @@
"2310": {
"address": {
"place": "M\u00fcnchen",
"street": "Connollystr. 32",
"street": "Kolehmainenweg 7",
"zip_code": 80809
},
"area_id": 18,
Expand All @@ -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,
Expand Down Expand Up @@ -732,7 +732,7 @@
"2330": {
"address": {
"place": "M\u00fcnchen",
"street": "Connollystr. 32",
"street": "Am Olympiacampus 11",
"zip_code": 80809
},
"area_id": 18,
Expand All @@ -742,7 +742,7 @@
"2331": {
"address": {
"place": "M\u00fcnchen",
"street": "Connollystr. 32",
"street": "Am Olympiacampus 11",
"zip_code": 80809
},
"area_id": 18,
Expand All @@ -752,7 +752,7 @@
"2332": {
"address": {
"place": "M\u00fcnchen",
"street": "Connollystr. 32",
"street": "Am Olympiacampus 11",
"zip_code": 80809
},
"area_id": 18,
Expand All @@ -762,7 +762,7 @@
"2333": {
"address": {
"place": "M\u00fcnchen",
"street": "Connollystr. 32",
"street": "Am Olympiacampus 11",
"zip_code": 80809
},
"area_id": 18,
Expand All @@ -772,7 +772,7 @@
"2334": {
"address": {
"place": "M\u00fcnchen",
"street": "Connollystr. 32",
"street": "Am Olympiacampus 11",
"zip_code": 80809
},
"area_id": 18,
Expand Down Expand Up @@ -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",
Expand Down
Loading