Merge branch 'main' into modal_for_roomfinder

.github/pull_request_template.md

@@ -0,0 +1 @@
+

.github/workflows/server.yml

@@ -91,7 +91,7 @@ jobs:
       - uses: actions/checkout@v3.0.0
       - uses: ATiltedTree/setup-rust@v1.0.5
         with:
-          rust-version: 1.62.1
+          rust-version: 1.65
       # run project's dependencies
       - run: cargo build
         working-directory: server

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11.0rc2-bullseye as build-stage
+FROM python:3.11-bullseye as build-stage
 WORKDIR /app
 
 ARG GIT_COMMIT_SHA
@@ -29,7 +29,7 @@ COPY search_synonyms.json output/
 # compress data (only using gzip, because brotli on ngnix is a royal pain)
 RUN gzip --force --keep --recursive output/
 
-FROM nginx as production-stage
+FROM nginx:latest as production-stage
 RUN mkdir /cdn
 COPY --from=build-stage /app/output /cdn
 COPY nginx.conf /etc/nginx/nginx.conf

data/external/main.py

@@ -1,7 +1,7 @@
 import logging
 import os
 
-from external.scrapers import roomfinder, tumonline
+from external.scrapers import nat, roomfinder, tumonline
 from external.scraping_utils import CACHE_PATH
 from utils import setup_logging
 
@@ -11,6 +11,7 @@
     os.makedirs(CACHE_PATH, exist_ok=True)
     os.makedirs(CACHE_PATH / "filter", exist_ok=True)
     os.makedirs(CACHE_PATH / "tumonline", exist_ok=True)
+    os.makedirs(CACHE_PATH / "nat", exist_ok=True)
     os.makedirs(CACHE_PATH / "room", exist_ok=True)
     os.makedirs(CACHE_PATH / "maps" / "roomfinder", exist_ok=True)
     os.makedirs(CACHE_PATH / "maps" / "roomfinder" / "kmz", exist_ok=True)
@@ -19,9 +20,11 @@
     # The downloader will automatically create a cache in `cache/`.
     roomfinder.scrape_buildings()
     tumonline.scrape_buildings()
+    nat.scrape_buildings()
 
     roomfinder.scrape_rooms()
     tumonline.scrape_rooms()
+    nat.scrape_rooms()
 
     tumonline.scrape_usages()