Merge branch 'main' into vector-db

TUM-Dev · Jul 28, 2024 · c373a4c · c373a4c
2 parents c581451 + e851a5f
commit c373a4c
Show file tree

Hide file tree

Showing 198 changed files with 4,724 additions and 5,246 deletions.
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -44,7 +44,5 @@ jobs:
             PR comes from [this Workflow Run](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
             
             [ 1 ]: https://github.com/peter-evans/create-pull-request
-          assignees: CommanderStorm
-          reviewers: CommanderStorm
           branch: chore/formatting-fixes
           delete-branch: true
diff --git a/.github/workflows/update-data.yml b/.github/workflows/update-data.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v3
         with:
-          version: 9.1.3
+          version: 9.5.0
           package_json_file: webclient/package.json
           run_install: |
             - cwd: webclient
@@ -24,7 +24,8 @@ jobs:
           python-version: '3.12'
       - name: Install python dependencies
         run: pip install -r data/requirements.txt -r requirements-dev.txt
-      - run: rm -rf data/external/results/*
+      - run: rm data/external/results/*tumonline.json
+      - run: rm data/external/results/*nat.json
       - name: Download public_transport data
         continue-on-error: true # a PR deleting all data will be created if this fails => fail obvious
         run: |
@@ -42,12 +43,6 @@ jobs:
           CONNECTUM_OAUTH_CLIENT_ID: ${{ secrets.CONECTUM_OAUTH_CLIENT_ID }}
           CONNECTUM_OAUTH_CLIENT_SECRET: ${{ secrets.CONECTUM_OAUTH_CLIENT_SECRET }}
         working-directory: data/external
-      - name: Download mytum data
-        continue-on-error: true # a PR deleting all data will be created if this fails => fail obvious
-        run: PYTHONPATH=$PYTHONPATH:.. python3 scrapers/roomfinder.py
-        env:
-          TQDM_MININTERVAL: 100
-        working-directory: data/external
       - continue-on-error: true # a PR deleting all data will be created if this fails => fail obvious
         run: ls -lah data/external/results
       - continue-on-error: true # a PR deleting all data will be created if this fails => fail obvious

diff --git a/README.md b/README.md
@@ -1,15 +1,12 @@
-# NavigaTUM
+[![Website Uptime over 30 days](https://nav-monitoring.mm.rbg.tum.de/api/badge/4/uptime/720?label=Website%20Uptime/30d)](https://nav-monitoring.mm.rbg.tum.de/status/navigatum)
+[![API Uptime over 30 days](https://nav-monitoring.mm.rbg.tum.de/api/badge/2/uptime/720?label=API%20Uptime/30d)](https://nav-monitoring.mm.rbg.tum.de/status/navigatum)
+[![CDN Uptime over 30 days](https://nav-monitoring.mm.rbg.tum.de/api/badge/1/uptime/720?label=CDN%20Uptime/30d)](https://nav-monitoring.mm.rbg.tum.de/status/navigatum)
 
-[![Website Uptime over 30 days](https://nav-monitoring.mm.rbg.tum.de/api/badge/5/uptime/720?label=Website%20Uptime/30&labelSuffix=d)](https://nav-monitoring.mm.rbg.tum.de/status/navigatum)
-[![API Uptime over 30 days](https://nav-monitoring.mm.rbg.tum.de/api/badge/2/uptime/720?label=API%20Uptime/30&labelSuffix=d)](https://nav-monitoring.mm.rbg.tum.de/status/navigatum)
-[![CDN Uptime over 30 days](https://nav-monitoring.mm.rbg.tum.de/api/badge/1/uptime/720?label=CDN%20Uptime/30&labelSuffix=d)](https://nav-monitoring.mm.rbg.tum.de/status/navigatum)
+# NavigaTUM
 
 NavigaTUM is a tool developed by students for students, to help you get around at [TUM](https://tum.de).
 Feel free to contribute, we are open to new people 😄.
 
-> [!NOTE]
-> Not all buildings in NavigaTUM are owned by TUM, but are instead being used by TUM departments.
-
 ## Features/Roadmap
 
 - [x] 🗺️ Interactive/static maps to look up the position of rooms or buildings

diff --git a/data/compile.py b/data/compile.py
@@ -10,7 +10,6 @@
     merge,
     nat,
     poi,
-    public_transport,
     roomfinder,
     search,
     sections,
@@ -110,9 +109,6 @@ def main() -> None:
     sections.generate_buildings_overview(data)
     sections.generate_rooms_overview(data)
 
-    logging.info("-- 82 Generate public transport")
-    public_transport.add_nearby_public_transport(data)
-
     logging.info("-- 90 Search: Build base ranking")
     search.add_ranking_base(data)
 

diff --git a/data/external/results/buildings_nat.json b/data/external/results/buildings_nat.json
@@ -3716,6 +3716,13 @@
     "building_name": "Siemens Science Center Garching",
     "building_short": null
   },
+  {
+    "address": "Friedrich-Ludwig-Bauer-Str. 5",
+    "building_code": "5933",
+    "building_id": 3229,
+    "building_name": "SAP Labs Munich (AM)",
+    "building_short": null
+  },
   {
     "address": "Hans-Piloty-Stra\u00dfe 5",
     "building_code": "5998",

diff --git a/data/external/results/buildings_tumonline.json b/data/external/results/buildings_tumonline.json
@@ -4116,9 +4116,19 @@
       "zip_code": 85748
     },
     "area_id": 57,
-    "name": "Siemens Science Center Garching",
+    "name": "Siemens Technology Center (STC)",
     "tumonline_id": 3169
   },
+  "5933": {
+    "address": {
+      "place": "Garching b. M\u00fcnchen",
+      "street": "Friedrich-Ludwig-Bauer-Str. 5",
+      "zip_code": 85748
+    },
+    "area_id": 57,
+    "name": "SAP Labs Munich (AM)",
+    "tumonline_id": 3229
+  },
   "6101": {
     "address": {
       "place": "Garching b. M\u00fcnchen",

diff --git a/data/external/results/rooms_nat.json b/data/external/results/rooms_nat.json
@@ -4091,7 +4091,7 @@
     "teaching": true
   },
   "5101.EG.501": {
-    "area": 292.96,
+    "area": 335.39,
     "building_code": "5101",
     "campus_id": "2",
     "coordinates": {
@@ -4174,7 +4174,7 @@
     "teaching": true
   },
   "5101.EG.502": {
-    "area": 179.35,
+    "area": 178.65,
     "building_code": "5101",
     "campus_id": "2",
     "coordinates": {
@@ -4257,7 +4257,7 @@
     "teaching": true
   },
   "5101.EG.503": {
-    "area": 94.06,
+    "area": 95.51,
     "building_code": "5101",
     "campus_id": "2",
     "coordinates": {