diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index cf3621274..e4b9229c7 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -29,10 +29,10 @@ jobs: outputs: tags: ${{ steps.meta.outputs.tags }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - run: cp openapi.yaml data/output - name: Log in to the Container registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -40,13 +40,13 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - uses: docker/setup-buildx-action@v2 + - uses: docker/setup-buildx-action@v3 - name: Build and push Docker image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: ${{ inputs.context }} push: true diff --git a/.github/workflows/add-deployment.yaml b/.github/workflows/add-deployment.yaml index 517ff9ae7..42e3601a5 100644 --- a/.github/workflows/add-deployment.yaml +++ b/.github/workflows/add-deployment.yaml @@ -10,7 +10,7 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 with: ref: deployment - run: git config --global user.email "github-actions[bot]@users.noreply.github.com" diff --git a/.github/workflows/data-cicd.yml b/.github/workflows/data-cicd.yml index 77ee00cf2..9e51a4f3f 100644 --- a/.github/workflows/data-cicd.yml +++ b/.github/workflows/data-cicd.yml @@ -15,7 +15,7 @@ jobs: matrix: python-version: ["3.10", "3.11"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 20fbbc831..4de8263bf 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -12,7 +12,7 @@ jobs: linting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - uses: actions/setup-node@v3 with: cache: 'npm' diff --git a/.github/workflows/remove-deployment.yml b/.github/workflows/remove-deployment.yml index 476121d5a..f86763e7a 100644 --- a/.github/workflows/remove-deployment.yml +++ b/.github/workflows/remove-deployment.yml @@ -9,7 +9,7 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 with: ref: deployment - run: git config --global user.email "github-actions[bot]@users.noreply.github.com" diff --git a/.github/workflows/server-cicd.yml b/.github/workflows/server-cicd.yml index b2080097f..f6f5d0b45 100644 --- a/.github/workflows/server-cicd.yml +++ b/.github/workflows/server-cicd.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup | Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Setup | Rust uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 with: @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup | Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Setup | Rust uses: actions-rust-lang/setup-rust-toolchain@v1.5.0 with: @@ -60,30 +60,6 @@ jobs: permissions: contents: read packages: write - building-db-init-build: - uses: ./.github/workflows/_docker-build.yml - needs: - - tests - - linting - with: - image_suffix: building-db-init - context: ./server/main-api - dockerfile: Dockerfile.dbinit - permissions: - contents: read - packages: write - mieli-search-init-build: - uses: ./.github/workflows/_docker-build.yml - needs: - - tests - - linting - with: - image_suffix: mieli-search-init - context: ./server/main-api - dockerfile: Dockerfile.msinit - permissions: - contents: read - packages: write feedback-deployment: uses: ./.github/workflows/_restart-argocd.yml needs: @@ -104,8 +80,6 @@ jobs: uses: ./.github/workflows/_restart-argocd.yml needs: - server-build - - building-db-init-build - - mieli-search-init-build with: deployment: server secrets: diff --git a/.github/workflows/webclient-cicd.yml b/.github/workflows/webclient-cicd.yml index 4a153f27a..d004e55f8 100644 --- a/.github/workflows/webclient-cicd.yml +++ b/.github/workflows/webclient-cicd.yml @@ -20,7 +20,7 @@ jobs: image: cypress/browsers:node16.16.0-chrome107-ff107 options: --user 1001 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - uses: actions/setup-node@v3 with: cache: 'npm' @@ -35,7 +35,7 @@ jobs: webclient-linting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - uses: actions/setup-node@v3 with: cache: 'npm' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8d83c46a0..b7f651b51 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -47,11 +47,11 @@ repos: hooks: - id: isort - repo: https://github.com/asottile/add-trailing-comma - rev: v3.0.0 + rev: v3.1.0 hooks: - id: add-trailing-comma - repo: https://github.com/psf/black - rev: 23.3.0 + rev: 23.7.0 hooks: - id: black language_version: python3 @@ -61,7 +61,7 @@ repos: - id: python-check-blanket-noqa - id: python-use-type-annotations - repo: https://github.com/PyCQA/flake8 - rev: 6.0.0 + rev: 6.1.0 hooks: - id: flake8 additional_dependencies: @@ -88,7 +88,7 @@ repos: types: [python] exclude: migrations - repo: https://github.com/sourcery-ai/sourcery - rev: v1.5.0 + rev: v1.8.1b22 hooks: - id: sourcery # * review only changed lines: @@ -96,7 +96,7 @@ repos: args: [--diff=git diff HEAD, --no-summary] # markdown - repo: https://github.com/DavidAnson/markdownlint-cli2 - rev: v0.8.1 + rev: v0.9.2 hooks: - id: markdownlint-cli2-fix exclude: .github/pull_request_template.md diff --git a/.prettierignore b/.prettierignore index 83fa094bd..8f9f9f03b 100644 --- a/.prettierignore +++ b/.prettierignore @@ -6,6 +6,5 @@ data/sources/15_patches-rooms_tumonline.yaml data/sources/45_custom-maps.yaml data/sources/46_overlay-maps.yaml data/sources/img/img-sources.yaml -data/search_synonyms.json server/main-api/test/test-queries.yaml deployment/k3s diff --git a/README.md b/README.md index de527748d..2b9d74070 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,6 @@ download the latest compiled files: ```bash wget -P data/output https://nav.tum.de/cdn/api_data.json wget -P data/output https://nav.tum.de/cdn/search_data.json -wget -P data/output https://nav.tum.de/cdn/search_synonyms.json ``` Else you can follow the steps in the [data documentation](data/README.md). diff --git a/data/Dockerfile b/data/Dockerfile index 2c1148392..b19107a95 100644 --- a/data/Dockerfile +++ b/data/Dockerfile @@ -24,9 +24,6 @@ COPY output/openapi.yaml output/openapi.yaml # put all data into the cdn folder COPY external/results/maps/roomfinder output/maps/roomfinder -# Synonyms are also provided via the cdn for the server container build -COPY search_synonyms.json output/ - # compress data (only using gzip, because brotli on ngnix is a royal pain) RUN gzip --force --keep --recursive output/ diff --git a/data/README.md b/data/README.md index a9849dfd6..0b9f7fde8 100644 --- a/data/README.md +++ b/data/README.md @@ -79,8 +79,7 @@ data │ ├── img/ │ └── ├── compile.py # 🠔 The main script -├── data-format_*.yaml # 🠔 Data format specification -└── search_synonyms.json # 🠔 synonyms that MeiliSearch considers +└── data-format_*.yaml # 🠔 Data format specification ``` Deployment related there are also these files: diff --git a/data/external/results/orgs-de_tumonline.json b/data/external/results/orgs-de_tumonline.json index e651ebb10..5d1592920 100644 --- a/data/external/results/orgs-de_tumonline.json +++ b/data/external/results/orgs-de_tumonline.json @@ -1127,12 +1127,6 @@ "name": "Lehrstuhl f\u00fcr P\u00e4dagogische Psychologie (Prof. Seidel)", "path": "TUM/Schools/Social Sciences and Technology/Departments/Educational Sciences/P\u00e4dagogische Psychologie (Prof. Seidel)" }, - "TUEDS18": { - "code": "TUEDS18", - "id": 43860, - "name": "Lehrstuhl f\u00fcr Schulp\u00e4dagogik (N.N.)", - "path": "TUM/Schools/Social Sciences and Technology/Departments/Educational Sciences/Schulp\u00e4dagogik (N.N.)" - }, "TUEDS22": { "code": "TUEDS22", "id": 44904, @@ -1157,12 +1151,6 @@ "name": "Lehrstuhl f\u00fcr Lehren und Lernen mit Digitalen Medien (Prof. Bannert)", "path": "TUM/Schools/Social Sciences and Technology/Departments/Educational Sciences/Lehren und Lernen mit Digitalen Medien (Prof. Bannert)" }, - "TUEDS26": { - "code": "TUEDS26", - "id": 48757, - "name": "Professur f\u00fcr Pers\u00f6nlichkeits- und Sozialpsychologie (N.N.)", - "path": "TUM/Schools/Social Sciences and Technology/Departments/Educational Sciences/Pers\u00f6nlichkeits- und Sozialpsychologie (N.N.)" - }, "TUEDS27": { "code": "TUEDS27", "id": 48758, @@ -3063,13 +3051,13 @@ "code": "TUMEBB1", "id": 27418, "name": "Lehrstuhl f\u00fcr Biologische Bildgebung (HMGU) (Prof. Ntziachristos)", - "path": "TUM/Fakult\u00e4ten/Medizin/Biologische Bildgebung (HMGU) (Prof. Ntziachristos)" + "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Biologische Bildgebung (HMGU) (Prof. Ntziachristos)" }, "TUMEBB3": { "code": "TUMEBB3", "id": 51557, "name": "Professur f\u00fcr Translationale Optoakustik (HMGU) (Prof. Pleitez Rafael)", - "path": "TUM/Fakult\u00e4ten/Medizin/Translationale Optoakustik (HMGU) (Prof. Pleitez Rafael)" + "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Translationale Optoakustik (HMGU) (Prof. Pleitez Rafael)" }, "TUMEBDS": { "code": "TUMEBDS", @@ -3159,7 +3147,7 @@ "code": "TUMEDF2", "id": 44966, "name": "Lehrstuhl f\u00fcr Stoffwechselerkrankungen (HMGU) (Prof. Tsch\u00f6p)", - "path": "TUM/Fakult\u00e4ten/Medizin/Stoffwechselerkrankungen (HMGU) (Prof. Tsch\u00f6p)" + "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Stoffwechselerkrankungen (HMGU) (Prof. Tsch\u00f6p)" }, "TUMEDF3": { "code": "TUMEDF3", @@ -3531,7 +3519,7 @@ "code": "TUMELP0", "id": 45511, "name": "Lehrstuhl f\u00fcr Neuroproteomik (DZNE) (Prof. Lichtenthaler)", - "path": "TUM/Fakult\u00e4ten/Medizin/Neuroproteomik (DZNE) (Prof. Lichtenthaler)" + "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Neuroproteomik (DZNE) (Prof. Lichtenthaler)" }, "TUMEMA0": { "code": "TUMEMA0", @@ -3555,7 +3543,7 @@ "code": "TUMEMD0", "id": 47897, "name": "Lehrstuhl f\u00fcr Medizindidaktik, Medizinische Lehrentwicklung und Bildungsforschung (Prof. Berberat)", - "path": "TUM/Fakult\u00e4ten/Medizin/Medizindidaktik, Medizinische Lehrentwicklung und Bildungsforschung (Prof. Berberat)" + "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Medizindidaktik, Medizinische Lehrentwicklung und Bildungsforschung (Prof. Berberat)" }, "TUMEMI0": { "code": "TUMEMI0", @@ -3615,7 +3603,7 @@ "code": "TUMEMS0", "id": 54661, "name": "Lehrstuhl f\u00fcr Molekulare Stoffwechselkontrolle (HMGU) (Prof. Herzig)", - "path": "TUM/Fakult\u00e4ten/Medizin/Molekulare Stoffwechselkontrolle (HMGU) (Prof. Herzig)" + "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Molekulare Stoffwechselkontrolle (HMGU) (Prof. Herzig)" }, "TUMENC0": { "code": "TUMENC0", @@ -3639,7 +3627,7 @@ "code": "TUMEND0", "id": 54664, "name": "Professur f\u00fcr Neurobiologie des Diabetes (HMGU) (Prof. Pfluger)", - "path": "TUM/Fakult\u00e4ten/Medizin/Neurobiologie des Diabetes (HMGU) (Prof. Pfluger)" + "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Neurobiologie des Diabetes (HMGU) (Prof. Pfluger)" }, "TUMENL0": { "code": "TUMENL0", @@ -3897,7 +3885,7 @@ "code": "TUMESO0", "id": 54659, "name": "Lehrstuhl f\u00fcr Angewandte Stammzell- und Organoidsysteme (Prof. Hebrok)", - "path": "TUM/Fakult\u00e4ten/Medizin/Angewandte Stammzell- und Organoidsysteme (Prof. Hebrok)" + "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Angewandte Stammzell- und Organoidsysteme (Prof. Hebrok)" }, "TUMESSK": { "code": "TUMESSK", @@ -3945,13 +3933,13 @@ "code": "TUMETG0", "id": 54667, "name": "Lehrstuhl f\u00fcr Translationale Genomik (HMGU) (Prof. Zeggini)", - "path": "TUM/Fakult\u00e4ten/Medizin/Translationale Genomik (HMGU) (Prof. Zeggini)" + "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Translationale Genomik (HMGU) (Prof. Zeggini)" }, "TUMETIU": { "code": "TUMETIU", "id": 51637, "name": "Professur f\u00fcr Translationale Immunologie in der Umweltmedizin (UNIKA-T) (Prof. Renner)", - "path": "TUM/Fakult\u00e4ten/Medizin/Translationale Immunologie in der Umweltmedizin (UNIKA-T) (Prof. Renner)" + "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Translationale Immunologie in der Umweltmedizin (UNIKA-T) (Prof. Renner)" }, "TUMETU0": { "code": "TUMETU0", @@ -3981,7 +3969,7 @@ "code": "TUMEUM0", "id": 46577, "name": "Lehrstuhl f\u00fcr Umweltmedizin (Prof. Traidl-Hoffmann)", - "path": "TUM/Fakult\u00e4ten/Medizin/Umweltmedizin (Prof. Traidl-Hoffmann)" + "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Umweltmedizin (Prof. Traidl-Hoffmann)" }, "TUMEUR0": { "code": "TUMEUR0", @@ -5693,6 +5681,12 @@ "name": "Informatik Heilbronn 6 - Professur f\u00fcr Data Analytics & Statistics (Prof. Piribauer)", "path": "TUM/Schools/Computation, Information and Technology/Departments/Computer Science/Informatik Heilbronn 6 - Professur f\u00fcr Data Analytics & Statistics (Prof. Piribauer)" }, + "TUS1305": { + "code": "TUS1305", + "id": 55237, + "name": "Professur f\u00fcr AI Planning in Dynamic Environments (Prof. Khadiv)", + "path": "TUM/Schools/Computation, Information and Technology/Departments/Computer Engineering/AI Planning in Dynamic Environments (Prof. Khadiv)" + }, "TUS1306": { "code": "TUS1306", "id": 54757, @@ -6569,6 +6563,12 @@ "name": "School Office der TUM School of Medicine and Health in Gr\u00fcndung", "path": "TUM/Schools/Medicine and Health in Gr\u00fcndung/School Office" }, + "TUS5PL0": { + "code": "TUS5PL0", + "id": 55217, + "name": "Weitere Lehrst\u00fchle und Professuren", + "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren" + }, "TUS6000": { "code": "TUS6000", "id": 51900, @@ -8036,8 +8036,8 @@ "TUWZP9O": { "code": "TUWZP9O", "id": 15669, - "name": "Lehrstuhl f\u00fcr Tierhygiene (Prof. Langosch komm.)", - "path": "TUM/Schools/Life Sciences/Departments/Molecular Life Sciences/Tierhygiene (Prof. Langosch komm.)" + "name": "Lehrstuhl f\u00fcr Tierhygiene (N.N.)", + "path": "TUM/Schools/Life Sciences/Departments/Molecular Life Sciences/Tierhygiene (N.N.)" }, "TUWZQ3Z": { "code": "TUWZQ3Z", diff --git a/data/external/results/orgs-en_tumonline.json b/data/external/results/orgs-en_tumonline.json index 209358ac0..286b6c781 100644 --- a/data/external/results/orgs-en_tumonline.json +++ b/data/external/results/orgs-en_tumonline.json @@ -1127,12 +1127,6 @@ "name": "Chair of Educational Psychology (Prof. Seidel)", "path": "TUM/Schools/Social Sciences and Technology/Departments/Educational Sciences/Educational Psychology (Prof. Seidel)" }, - "TUEDS18": { - "code": "TUEDS18", - "id": 43860, - "name": "Chair of School Pedagogy (N.N.)", - "path": "TUM/Schools/Social Sciences and Technology/Departments/Educational Sciences/School Pedagogy (N.N.)" - }, "TUEDS22": { "code": "TUEDS22", "id": 44904, @@ -1157,12 +1151,6 @@ "name": "Chair of Teaching and Learning with Digital Media (Prof. Bannert)", "path": "TUM/Schools/Social Sciences and Technology/Departments/Educational Sciences/Teaching and Learning with Digital Media (Prof. Bannert)" }, - "TUEDS26": { - "code": "TUEDS26", - "id": 48757, - "name": "Assistant Professorship of Personality and Social Psychology (N.N.)", - "path": "TUM/Schools/Social Sciences and Technology/Departments/Educational Sciences/Personality and Social Psychology (N.N.)" - }, "TUEDS27": { "code": "TUEDS27", "id": 48758, @@ -3063,13 +3051,13 @@ "code": "TUMEBB1", "id": 27418, "name": "Chair of Biological Imaging (HMGU) (Prof. Ntziachristos)", - "path": "TUM/Academic department/Medicine/Biological Imaging (HMGU) (Prof. Ntziachristos)" + "path": "TUM/Academic department/Medicine/Further Chairs and Professorships/Biological Imaging (HMGU) (Prof. Ntziachristos)" }, "TUMEBB3": { "code": "TUMEBB3", "id": 51557, "name": "Assistant Professorship of Translationale Optoakustik (HMGU) (Prof. Pleitez Rafael)", - "path": "TUM/Academic department/Medicine/Translationale Optoakustik (HMGU) (Prof. Pleitez Rafael)" + "path": "TUM/Academic department/Medicine/Further Chairs and Professorships/Translationale Optoakustik (HMGU) (Prof. Pleitez Rafael)" }, "TUMEBDS": { "code": "TUMEBDS", @@ -3159,7 +3147,7 @@ "code": "TUMEDF2", "id": 44966, "name": "Chair of Metabolic Diseases (HMGU) (Prof. Tsch\u00f6p)", - "path": "TUM/Academic department/Medicine/Metabolic Diseases (HMGU) (Prof. Tsch\u00f6p)" + "path": "TUM/Academic department/Medicine/Further Chairs and Professorships/Metabolic Diseases (HMGU) (Prof. Tsch\u00f6p)" }, "TUMEDF3": { "code": "TUMEDF3", @@ -3531,7 +3519,7 @@ "code": "TUMELP0", "id": 45511, "name": "Chair of Neuroproteomik (DZNE) (Prof. Lichtenthaler)", - "path": "TUM/Academic department/Medicine/Neuroproteomik (DZNE) (Prof. Lichtenthaler)" + "path": "TUM/Academic department/Medicine/Further Chairs and Professorships/Neuroproteomik (DZNE) (Prof. Lichtenthaler)" }, "TUMEMA0": { "code": "TUMEMA0", @@ -3555,7 +3543,7 @@ "code": "TUMEMD0", "id": 47897, "name": "Chair of Medical Education (Prof. Berberat)", - "path": "TUM/Academic department/Medicine/Medical Education (Prof. Berberat)" + "path": "TUM/Academic department/Medicine/Further Chairs and Professorships/Medical Education (Prof. Berberat)" }, "TUMEMI0": { "code": "TUMEMI0", @@ -3615,7 +3603,7 @@ "code": "TUMEMS0", "id": 54661, "name": "Chair of Molecular Mechanisms of Metabolism (HMGU) (Prof. Herzig)", - "path": "TUM/Academic department/Medicine/Molecular Mechanisms of Metabolism (HMGU) (Prof. Herzig)" + "path": "TUM/Academic department/Medicine/Further Chairs and Professorships/Molecular Mechanisms of Metabolism (HMGU) (Prof. Herzig)" }, "TUMENC0": { "code": "TUMENC0", @@ -3639,7 +3627,7 @@ "code": "TUMEND0", "id": 54664, "name": "Associate Professorship of Neurobiology of Diabetes (HMGU) (Prof. Pfluger)", - "path": "TUM/Academic department/Medicine/Neurobiology of Diabetes (HMGU) (Prof. Pfluger)" + "path": "TUM/Academic department/Medicine/Further Chairs and Professorships/Neurobiology of Diabetes (HMGU) (Prof. Pfluger)" }, "TUMENL0": { "code": "TUMENL0", @@ -3897,7 +3885,7 @@ "code": "TUMESO0", "id": 54659, "name": "Chair of Applied Stem Cell and Organoidsystems (Prof. Hebrok)", - "path": "TUM/Academic department/Medicine/Applied Stem Cell and Organoidsystems (Prof. Hebrok)" + "path": "TUM/Academic department/Medicine/Further Chairs and Professorships/Applied Stem Cell and Organoidsystems (Prof. Hebrok)" }, "TUMESSK": { "code": "TUMESSK", @@ -3945,13 +3933,13 @@ "code": "TUMETG0", "id": 54667, "name": "Chair of Translational Genomics (HMGU) (Prof. Zeggini)", - "path": "TUM/Academic department/Medicine/Translational Genomics (HMGU) (Prof. Zeggini)" + "path": "TUM/Academic department/Medicine/Further Chairs and Professorships/Translational Genomics (HMGU) (Prof. Zeggini)" }, "TUMETIU": { "code": "TUMETIU", "id": 51637, "name": "Assistant Professorship of Translational Immunology in Environmental Health (UNIKA-T) (Prof. Renner)", - "path": "TUM/Academic department/Medicine/Translational Immunology in Environmental Health (UNIKA-T) (Prof. Renner)" + "path": "TUM/Academic department/Medicine/Further Chairs and Professorships/Translational Immunology in Environmental Health (UNIKA-T) (Prof. Renner)" }, "TUMETU0": { "code": "TUMETU0", @@ -3981,7 +3969,7 @@ "code": "TUMEUM0", "id": 46577, "name": "Chair of Umweltmedizin (Prof. Traidl-Hoffmann)", - "path": "TUM/Academic department/Medicine/Umweltmedizin (Prof. Traidl-Hoffmann)" + "path": "TUM/Academic department/Medicine/Further Chairs and Professorships/Umweltmedizin (Prof. Traidl-Hoffmann)" }, "TUMEUR0": { "code": "TUMEUR0", @@ -5693,6 +5681,12 @@ "name": "Chair of Informatics Heilbronn 6 - Assistant Professorship of Data Analytics and Statistics (Prof. Piribauer)", "path": "TUM/Schools/Computation, Information and Technology/Departments/Computer Science/Informatics Heilbronn 6 - Assistant Professorship of Data Analytics and Statistics (Prof. Piribauer)" }, + "TUS1305": { + "code": "TUS1305", + "id": 55237, + "name": "Assistant Professorship of AI Planning in Dynamic Environments (Prof. Khadiv)", + "path": "TUM/Schools/Computation, Information and Technology/Departments/Computer Engineering/AI Planning in Dynamic Environments (Prof. Khadiv)" + }, "TUS1306": { "code": "TUS1306", "id": 54757, @@ -6569,6 +6563,12 @@ "name": "School Office of the TUM School of Medicine and Health in formation", "path": "TUM/Schools/Medicine and Health in formation/School Office" }, + "TUS5PL0": { + "code": "TUS5PL0", + "id": 55217, + "name": "Further Chairs and Professorships", + "path": "TUM/Academic department/Medicine/Further Chairs and Professorships" + }, "TUS6000": { "code": "TUS6000", "id": 51900, @@ -8036,8 +8036,8 @@ "TUWZP9O": { "code": "TUWZP9O", "id": 15669, - "name": "Chair of Animal Hygiene (Prof. Langosch komm.)", - "path": "TUM/Schools/Life Sciences/Departments/Molecular Life Sciences/Animal Hygiene (Prof. Langosch komm.)" + "name": "Chair of Animal Hygiene (N.N.)", + "path": "TUM/Schools/Life Sciences/Departments/Molecular Life Sciences/Animal Hygiene (N.N.)" }, "TUWZQ3Z": { "code": "TUWZQ3Z", diff --git a/data/external/results/rooms_tumonline.json b/data/external/results/rooms_tumonline.json index 844eef484..244a00c96 100644 --- a/data/external/results/rooms_tumonline.json +++ b/data/external/results/rooms_tumonline.json @@ -4548,8 +4548,8 @@ { "address": "Staatsgut Thalhausen, 1.UG", "address_link": "ris.einzelraum?raumkey=48356", - "alt_name": "1408, L\u00fcftung und Heizung", - "arch_name": "1408@4602", + "alt_name": "ZO 01, L\u00fcftung und Heizung", + "arch_name": "ZO 01@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -6354,23 +6354,23 @@ }, { "address": "Boltzmannstr. 15, EG", - "address_link": "ris.einzelraum?raumkey=75170", - "alt_name": "0.001, H\u00f6rsaal 1", - "arch_name": "0.001@5539", + "address_link": "ris.einzelraum?raumkey=75173", + "alt_name": "0.001A, H\u00f6rsaal 1A", + "arch_name": "0.001A@5539", "b_area_id": 34, "b_filter_id": 3149, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=19691&cRes=33532&cReadonly=J", "extended": { - "additional_description": "0.001, H\u00f6rsaal 1", + "additional_description": "0.001A, H\u00f6rsaal 1A", "address": "Boltzmannstr. 15(5539), Erdgescho\u00df", - "architect_room_nr": "0.001@5539", - "area_m2": 898.0, + "architect_room_nr": "0.001A@5539", + "area_m2": 500.0, "building": "5539 Interims-Tentomax MW", "floor_number": "Erdgescho\u00df", - "floor_type": "Spannteppich", + "floor_type": "PVC", "purpose": "H\u00f6rsaal (NF5.1 - Unterrichtsr\u00e4ume mit festem Gest\u00fchl)", - "room_number": "001", - "seats": 720, + "room_number": "001A", + "seats": 400, "standing_places": 0, "wheelchair_spaces": 0, "zip_code_location": "85748 Garching b. M\u00fcnchen" @@ -6379,8 +6379,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=75170", - "roomcode": "5539.EG.001", + "room_link": "wbRaum.editRaum?pRaumNr=75173", + "roomcode": "5539.EG.001A", "usage": 20 }, { @@ -11864,19 +11864,19 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38753", - "alt_name": "N1428, Aufzug", - "arch_name": "N1428@0104", + "address_link": "ris.einzelraum?raumkey=38756", + "alt_name": "N1429, Teek\u00fcche", + "arch_name": "N1429@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "100", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=15376", + "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38753", - "roomcode": "0104.01.428", - "usage": 4 + "room_link": "wbRaum.editRaum?pRaumNr=38756", + "roomcode": "0104.01.429", + "usage": 198 }, { "address": "Theresienstr. 90, 2.OG", @@ -12072,19 +12072,19 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=63040", - "alt_name": "0710B, Treppe", - "arch_name": "0710B@0507", + "address_link": "ris.einzelraum?raumkey=14384", + "alt_name": "0710A, Werkstatt", + "arch_name": "0710A@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=15135&cRes=18771&cReadonly=J", "list_index": "100", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15135", + "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63040", - "roomcode": "0507.EG.710B", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=14384", + "roomcode": "0507.EG.710A", + "usage": 51 }, { "address": "Arcisstr. 21, 1.OG", @@ -12968,9 +12968,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45982", - "alt_name": "0241, Lager", - "arch_name": "0241@5302", + "address_link": "ris.einzelraum?raumkey=75373", + "alt_name": "00.056.C, B\u00fcro", + "arch_name": "00.056.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -12978,9 +12978,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45982", - "roomcode": "5302.EG.029B", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=75373", + "roomcode": "5302.EG.056C", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -13607,19 +13607,19 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38756", - "alt_name": "N1429, Teek\u00fcche", - "arch_name": "N1429@0104", + "address_link": "ris.einzelraum?raumkey=38762", + "alt_name": "N1430, WC-Damen", + "arch_name": "N1430@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "101", - "op_link": "webnav.navigate_to?corg=15376", - "operator": "[ TUEITEP ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38756", - "roomcode": "0104.01.429", - "usage": 198 + "room_link": "wbRaum.editRaum?pRaumNr=38762", + "roomcode": "0104.01.430", + "usage": 116 }, { "address": "Theresienstr. 90, 2.OG", @@ -13830,34 +13830,19 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=7973", - "alt_name": "0712, Seminar", - "arch_name": "0712@0507", + "address_link": "ris.einzelraum?raumkey=63040", + "alt_name": "0710B, Treppe", + "arch_name": "0710B@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=15103&cRes=15066&cReadonly=J", - "extended": { - "additional_description": "0712, Seminar", - "address": "Arcisstr. 21(0507), Erdgescho\u00df", - "architect_room_nr": "0712@0507", - "area_m2": 62.09, - "building": "0507 (Z7) Bestelmeyer Nord", - "floor_number": "Erdgescho\u00df", - "floor_type": "Linoleum", - "purpose": "Seminarraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", - "room_number": "712", - "seats": 30, - "standing_places": 0, - "wheelchair_spaces": 0, - "zip_code_location": "80333 M\u00fcnchen" - }, + "calendar": null, "list_index": "101", - "op_link": "webnav.navigate_to?corg=15103", - "operator": "[ TULRLFK ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=7973", - "roomcode": "0507.EG.712", - "usage": 41 + "room_link": "wbRaum.editRaum?pRaumNr=63040", + "roomcode": "0507.EG.710B", + "usage": 223 }, { "address": "Arcisstr. 21, 1.OG", @@ -14076,8 +14061,8 @@ "b_filter_id": 589, "calendar": null, "list_index": "101", - "op_link": "webnav.navigate_to?corg=14156", - "operator": "[ TUZVZA7 ]", + "op_link": "webnav.navigate_to?corg=39906", + "operator": "[ TUPELRZ ]", "plz_place": "80333 M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=65004", "roomcode": "2903.03.307A", @@ -14740,9 +14725,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45991", - "alt_name": "0256, B\u00fcro", - "arch_name": "0256@5302", + "address_link": "ris.einzelraum?raumkey=75370", + "alt_name": "00.057.C, B\u00fcro", + "arch_name": "00.057.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -14750,8 +14735,8 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45991", - "roomcode": "5302.EG.030", + "room_link": "wbRaum.editRaum?pRaumNr=75370", + "roomcode": "5302.EG.057C", "usage": 12 }, { @@ -15379,9 +15364,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38762", - "alt_name": "N1430, WC-Damen", - "arch_name": "N1430@0104", + "address_link": "ris.einzelraum?raumkey=64212", + "alt_name": "N1430A, WC-Vorraum Damen", + "arch_name": "N1430A@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -15389,9 +15374,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38762", - "roomcode": "0104.01.430", - "usage": 116 + "room_link": "wbRaum.editRaum?pRaumNr=64212", + "roomcode": "0104.01.430A", + "usage": 118 }, { "address": "Theresienstr. 90, 2.OG", @@ -15602,22 +15587,22 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=7983", - "alt_name": "0714, Seminar", - "arch_name": "0714@0507", + "address_link": "ris.einzelraum?raumkey=7973", + "alt_name": "0712, Seminar", + "arch_name": "0712@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=15103&cRes=15067&cReadonly=J", + "calendar": "tvKalender.wSicht?cOrg=15103&cRes=15066&cReadonly=J", "extended": { - "additional_description": "0714, Seminar", + "additional_description": "0712, Seminar", "address": "Arcisstr. 21(0507), Erdgescho\u00df", - "architect_room_nr": "0714@0507", - "area_m2": 80.94, + "architect_room_nr": "0712@0507", + "area_m2": 62.09, "building": "0507 (Z7) Bestelmeyer Nord", "floor_number": "Erdgescho\u00df", "floor_type": "Linoleum", "purpose": "Seminarraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", - "room_number": "714", + "room_number": "712", "seats": 30, "standing_places": 0, "wheelchair_spaces": 0, @@ -15627,8 +15612,8 @@ "op_link": "webnav.navigate_to?corg=15103", "operator": "[ TULRLFK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=7983", - "roomcode": "0507.EG.714", + "room_link": "wbRaum.editRaum?pRaumNr=7973", + "roomcode": "0507.EG.712", "usage": 41 }, { @@ -16280,8 +16265,8 @@ "b_filter_id": 657, "calendar": null, "list_index": "102", - "op_link": "webnav.navigate_to?corg=15593", - "operator": "[ TUWZY4Q ]", + "op_link": "webnav.navigate_to?corg=44624", + "operator": "[ TUWZB6A ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=47002", "roomcode": "4317.02.211", @@ -16497,9 +16482,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46004", - "alt_name": "0255, Gro\u00dfk\u00fcche", - "arch_name": "0255@5302", + "address_link": "ris.einzelraum?raumkey=75371", + "alt_name": "00.058.C, Auswertung/Dokum.", + "arch_name": "00.058.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -16507,9 +16492,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46004", - "roomcode": "5302.EG.031", - "usage": 28 + "room_link": "wbRaum.editRaum?pRaumNr=75371", + "roomcode": "5302.EG.058C", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -17120,9 +17105,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=64212", - "alt_name": "N1430A, WC-Vorraum Damen", - "arch_name": "N1430A@0104", + "address_link": "ris.einzelraum?raumkey=38766", + "alt_name": "N1431, WC-Herren", + "arch_name": "N1431@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -17130,9 +17115,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=64212", - "roomcode": "0104.01.430A", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=38766", + "roomcode": "0104.01.431", + "usage": 115 }, { "address": "Theresienstr. 90, 2.OG", @@ -17343,19 +17328,34 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=7986", - "alt_name": "0717, B\u00fcro", - "arch_name": "0717@0507", + "address_link": "ris.einzelraum?raumkey=7983", + "alt_name": "0714, Seminar", + "arch_name": "0714@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=15103&cRes=15067&cReadonly=J", + "extended": { + "additional_description": "0714, Seminar", + "address": "Arcisstr. 21(0507), Erdgescho\u00df", + "architect_room_nr": "0714@0507", + "area_m2": 80.94, + "building": "0507 (Z7) Bestelmeyer Nord", + "floor_number": "Erdgescho\u00df", + "floor_type": "Linoleum", + "purpose": "Seminarraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", + "room_number": "714", + "seats": 30, + "standing_places": 0, + "wheelchair_spaces": 0, + "zip_code_location": "80333 M\u00fcnchen" + }, "list_index": "103", - "op_link": "webnav.navigate_to?corg=51537", - "operator": "[ TUS2OTS ]", + "op_link": "webnav.navigate_to?corg=15103", + "operator": "[ TULRLFK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=7986", - "roomcode": "0507.EG.717", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=7983", + "roomcode": "0507.EG.714", + "usage": 41 }, { "address": "Arcisstr. 21, 1.OG", @@ -18237,9 +18237,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46156", - "alt_name": "0204, Lager", - "arch_name": "0204@5302", + "address_link": "ris.einzelraum?raumkey=75422", + "alt_name": "00.059.C, Pr\u00fcflabor Messraum", + "arch_name": "00.059.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -18247,9 +18247,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46156", - "roomcode": "5302.EG.032", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=75422", + "roomcode": "5302.EG.059C", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -18845,9 +18845,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38766", - "alt_name": "N1431, WC-Herren", - "arch_name": "N1431@0104", + "address_link": "ris.einzelraum?raumkey=64213", + "alt_name": "N1431A, WC-Vorraum Herren", + "arch_name": "N1431A@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -18855,9 +18855,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38766", - "roomcode": "0104.01.431", - "usage": 115 + "room_link": "wbRaum.editRaum?pRaumNr=64213", + "roomcode": "0104.01.431A", + "usage": 118 }, { "address": "Theresienstr. 90, 2.OG", @@ -19068,19 +19068,19 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=39527", - "alt_name": "0719, Lesen", - "arch_name": "0719@0507", + "address_link": "ris.einzelraum?raumkey=7986", + "alt_name": "0717, B\u00fcro", + "arch_name": "0717@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "104", - "op_link": "webnav.navigate_to?corg=51267", - "operator": "[ TUS2000 ]", + "op_link": "webnav.navigate_to?corg=51537", + "operator": "[ TUS2OTS ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39527", - "roomcode": "0507.EG.719", - "usage": 150 + "room_link": "wbRaum.editRaum?pRaumNr=7986", + "roomcode": "0507.EG.717", + "usage": 12 }, { "address": "Arcisstr. 21, 1.OG", @@ -19916,9 +19916,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46158", - "alt_name": "0258, Aufzug", - "arch_name": "0258@5302", + "address_link": "ris.einzelraum?raumkey=75368", + "alt_name": "00.060.D, Probenlager", + "arch_name": "00.060.D@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -19926,9 +19926,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46158", - "roomcode": "5302.EG.033A", - "usage": 4 + "room_link": "wbRaum.editRaum?pRaumNr=75368", + "roomcode": "5302.EG.060D", + "usage": 30 }, { "address": "Boltzmannstr. 19, EG", @@ -20524,9 +20524,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=64213", - "alt_name": "N1431A, WC-Vorraum Herren", - "arch_name": "N1431A@0104", + "address_link": "ris.einzelraum?raumkey=38772", + "alt_name": "N1450, Flur", + "arch_name": "N1450@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -20534,9 +20534,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=64213", - "roomcode": "0104.01.431A", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=38772", + "roomcode": "0104.01.450", + "usage": 222 }, { "address": "Theresienstr. 90, 2.OG", @@ -20732,19 +20732,19 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=39662", - "alt_name": "0721, Putzraum", - "arch_name": "0721@0507", + "address_link": "ris.einzelraum?raumkey=39527", + "alt_name": "0719, Lesen", + "arch_name": "0719@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "105", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=51267", + "operator": "[ TUS2000 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39662", - "roomcode": "0507.EG.721", - "usage": 205 + "room_link": "wbRaum.editRaum?pRaumNr=39527", + "roomcode": "0507.EG.719", + "usage": 150 }, { "address": "Arcisstr. 21, 1.OG", @@ -21610,9 +21610,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46181", - "alt_name": "0235, Putzraum", - "arch_name": "0235@5302", + "address_link": "ris.einzelraum?raumkey=75367", + "alt_name": "00.061.D, Pr\u00fcflabor Autoklav.", + "arch_name": "00.061.D@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -21620,9 +21620,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46181", - "roomcode": "5302.EG.035", - "usage": 205 + "room_link": "wbRaum.editRaum?pRaumNr=75367", + "roomcode": "5302.EG.061D", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -22217,9 +22217,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38772", - "alt_name": "N1450, Flur", - "arch_name": "N1450@0104", + "address_link": "ris.einzelraum?raumkey=38775", + "alt_name": "N1451, Treppenraum", + "arch_name": "N1451@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -22227,9 +22227,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38772", - "roomcode": "0104.01.450", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=38775", + "roomcode": "0104.01.451", + "usage": 223 }, { "address": "Theresienstr. 90, 2.OG", @@ -22440,9 +22440,9 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=69176", - "alt_name": "0721A, WC-Vorraum", - "arch_name": "0721A@0507", + "address_link": "ris.einzelraum?raumkey=39662", + "alt_name": "0721, WC-D", + "arch_name": "0721@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -22450,9 +22450,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=69176", - "roomcode": "0507.EG.721A", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=39662", + "roomcode": "0507.EG.721", + "usage": 116 }, { "address": "Arcisstr. 21, 1.OG", @@ -23287,9 +23287,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46339", - "alt_name": "0257, Treppenhaus", - "arch_name": "0257@5302", + "address_link": "ris.einzelraum?raumkey=75421", + "alt_name": "00.062.D, M\u00f6rtellabor", + "arch_name": "00.062.D@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -23297,9 +23297,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46339", - "roomcode": "5302.EG.037", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75421", + "roomcode": "5302.EG.062D", + "usage": 194 }, { "address": "Boltzmannstr. 19, EG", @@ -23879,9 +23879,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38775", - "alt_name": "N1451, Treppenraum", - "arch_name": "N1451@0104", + "address_link": "ris.einzelraum?raumkey=38777", + "alt_name": "N1452, Flur S\u00fcd/Archiv/Dokumentation", + "arch_name": "N1452@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -23889,9 +23889,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38775", - "roomcode": "0104.01.451", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=38777", + "roomcode": "0104.01.452", + "usage": 222 }, { "address": "Theresienstr. 90, 2.OG", @@ -24087,9 +24087,9 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=39666", - "alt_name": "0723, WC-Herren", - "arch_name": "0723@0507", + "address_link": "ris.einzelraum?raumkey=69176", + "alt_name": "0721A, Vorraum WC-D", + "arch_name": "0721A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -24097,9 +24097,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39666", - "roomcode": "0507.EG.723", - "usage": 115 + "room_link": "wbRaum.editRaum?pRaumNr=69176", + "roomcode": "0507.EG.721A", + "usage": 118 }, { "address": "Arcisstr. 21, 1.OG", @@ -24919,9 +24919,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46347", - "alt_name": "0254, Sp\u00fclk\u00fcche", - "arch_name": "0254@5302", + "address_link": "ris.einzelraum?raumkey=75418", + "alt_name": "00.063.D, Pr\u00fcflabor Thermoan.", + "arch_name": "00.063.D@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -24929,9 +24929,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46347", - "roomcode": "5302.EG.038", - "usage": 28 + "room_link": "wbRaum.editRaum?pRaumNr=75418", + "roomcode": "5302.EG.063D", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -25526,9 +25526,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38777", - "alt_name": "N1452, Flur S\u00fcd/Archiv/Dokumentation", - "arch_name": "N1452@0104", + "address_link": "ris.einzelraum?raumkey=38779", + "alt_name": "N1453, Flur Ost/Archiv/Dokumentation", + "arch_name": "N1453@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -25536,8 +25536,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38777", - "roomcode": "0104.01.452", + "room_link": "wbRaum.editRaum?pRaumNr=38779", + "roomcode": "0104.01.453", "usage": 222 }, { @@ -25734,9 +25734,9 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=69177", - "alt_name": "0723A, WC-Vorraum", - "arch_name": "0723A@0507", + "address_link": "ris.einzelraum?raumkey=39666", + "alt_name": "0723, WC-Herren", + "arch_name": "0723@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -25744,9 +25744,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=69177", - "roomcode": "0507.EG.723A", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=39666", + "roomcode": "0507.EG.723", + "usage": 115 }, { "address": "Arcisstr. 21, 1.OG", @@ -26581,9 +26581,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46356", - "alt_name": "0252, Ausgabe", - "arch_name": "0252@5302", + "address_link": "ris.einzelraum?raumkey=75435", + "alt_name": "00.064.F, Pr\u00fcflabor Ofenraum", + "arch_name": "00.064.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -26591,9 +26591,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46356", - "roomcode": "5302.EG.039", - "usage": 186 + "room_link": "wbRaum.editRaum?pRaumNr=75435", + "roomcode": "5302.EG.064F", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -27203,9 +27203,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38779", - "alt_name": "N1453, Flur Ost/Archiv/Dokumentation", - "arch_name": "N1453@0104", + "address_link": "ris.einzelraum?raumkey=38780", + "alt_name": "N1454, Flur Nord/Archiv/Dokumentation", + "arch_name": "N1454@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -27213,8 +27213,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38779", - "roomcode": "0104.01.453", + "room_link": "wbRaum.editRaum?pRaumNr=38780", + "roomcode": "0104.01.454", "usage": 222 }, { @@ -27426,19 +27426,19 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=8111", - "alt_name": "0725, B\u00fcro", - "arch_name": "0725@0507", + "address_link": "ris.einzelraum?raumkey=69177", + "alt_name": "0723A, Vorraum WC-H", + "arch_name": "0723A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "109", - "op_link": "webnav.navigate_to?corg=15103", - "operator": "[ TULRLFK ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8111", - "roomcode": "0507.EG.725", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=69177", + "roomcode": "0507.EG.723A", + "usage": 118 }, { "address": "Arcisstr. 21, 1.OG", @@ -28242,19 +28242,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46369", - "alt_name": "0253, Annahme/Ausgabe", - "arch_name": "0253@5302", + "address_link": "ris.einzelraum?raumkey=75355", + "alt_name": "00.065.F, Elektrochemielabor", + "arch_name": "00.065.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "109", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46369", - "roomcode": "5302.EG.040", - "usage": 186 + "room_link": "wbRaum.editRaum?pRaumNr=75355", + "roomcode": "5302.EG.065F", + "usage": 102 }, { "address": "Boltzmannstr. 19, EG", @@ -29169,7 +29169,7 @@ { "address": "Arcisstr. 21, 2.UG", "address_link": "ris.einzelraum?raumkey=72817", - "alt_name": "-2712, Treppenhaus", + "alt_name": "-2712, Treppe", "arch_name": "-2712@0507", "b_area_id": 23, "b_filter_id": 583, @@ -33450,9 +33450,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38780", - "alt_name": "N1454, Flur Nord/Archiv/Dokumentation", - "arch_name": "N1454@0104", + "address_link": "ris.einzelraum?raumkey=38792", + "alt_name": "N1454A, Flur Nord", + "arch_name": "N1454A@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -33460,8 +33460,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38780", - "roomcode": "0104.01.454", + "room_link": "wbRaum.editRaum?pRaumNr=38792", + "roomcode": "0104.01.454A", "usage": 222 }, { @@ -33658,19 +33658,19 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=19672", - "alt_name": "0726, ADV-Kleinrech.", - "arch_name": "0726@0507", + "address_link": "ris.einzelraum?raumkey=8111", + "alt_name": "0725, B\u00fcro", + "arch_name": "0725@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "110", - "op_link": "webnav.navigate_to?corg=15135", - "operator": "[ TUARZ03 ]", + "op_link": "webnav.navigate_to?corg=15103", + "operator": "[ TULRLFK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=19672", - "roomcode": "0507.EG.726", - "usage": 207 + "room_link": "wbRaum.editRaum?pRaumNr=8111", + "roomcode": "0507.EG.725", + "usage": 12 }, { "address": "Arcisstr. 21, 1.OG", @@ -34489,19 +34489,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46518", - "alt_name": "0251, Sp\u00fclk\u00fcche", - "arch_name": "0251@5302", + "address_link": "ris.einzelraum?raumkey=75357", + "alt_name": "00.066.F, Wewehrungsvermessung", + "arch_name": "00.066.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "110", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46518", - "roomcode": "5302.EG.041", - "usage": 28 + "room_link": "wbRaum.editRaum?pRaumNr=75357", + "roomcode": "5302.EG.066F", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -35095,20 +35095,20 @@ "usage": 103 }, { - "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38792", - "alt_name": "N1454A, Flur Nord", - "arch_name": "N1454A@0104", + "address": "Theresienstr. 90, 2.OG", + "address_link": "ris.einzelraum?raumkey=7586", + "alt_name": "N2401, B\u00fcro", + "arch_name": "N2401@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "111", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15364", + "operator": "[ TUEILNT ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38792", - "roomcode": "0104.01.454A", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=7586", + "roomcode": "0104.02.401", + "usage": 12 }, { "address": "Theresienstr. 90, 2.OG", @@ -35304,19 +35304,19 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=39704", - "alt_name": "0727, B\u00fcro", - "arch_name": "0727@0507", + "address_link": "ris.einzelraum?raumkey=19672", + "alt_name": "0726, ADV-Kleinrech.", + "arch_name": "0726@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=15135&cRes=26509&cReadonly=J", + "calendar": null, "list_index": "111", "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39704", - "roomcode": "0507.EG.727", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=19672", + "roomcode": "0507.EG.726", + "usage": 207 }, { "address": "Arcisstr. 21, 1.OG", @@ -36135,9 +36135,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46532", - "alt_name": "0268, Flur", - "arch_name": "0268@5302", + "address_link": "ris.einzelraum?raumkey=75366", + "alt_name": "00.067.F, Pr\u00fcflabor Hg-Druckpor.", + "arch_name": "00.067.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -36145,9 +36145,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46532", - "roomcode": "5302.EG.042", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=75366", + "roomcode": "5302.EG.067F", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -36742,9 +36742,9 @@ }, { "address": "Theresienstr. 90, 2.OG", - "address_link": "ris.einzelraum?raumkey=7586", - "alt_name": "N2401, B\u00fcro", - "arch_name": "N2401@0104", + "address_link": "ris.einzelraum?raumkey=7588", + "alt_name": "N2402, B\u00fcro", + "arch_name": "N2402@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -36752,8 +36752,8 @@ "op_link": "webnav.navigate_to?corg=15364", "operator": "[ TUEILNT ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=7586", - "roomcode": "0104.02.401", + "room_link": "wbRaum.editRaum?pRaumNr=7588", + "roomcode": "0104.02.402", "usage": 12 }, { @@ -36965,19 +36965,19 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=39714", - "alt_name": "0728, Treppenhaus", - "arch_name": "0728@0507", + "address_link": "ris.einzelraum?raumkey=39704", + "alt_name": "0727, B\u00fcro", + "arch_name": "0727@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=15135&cRes=26509&cReadonly=J", "list_index": "112", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15135", + "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39714", - "roomcode": "0507.EG.728", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=39704", + "roomcode": "0507.EG.727", + "usage": 12 }, { "address": "Arcisstr. 21, 1.OG", @@ -37765,9 +37765,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=59083", - "alt_name": "0268A, Treppe", - "arch_name": "0268A@5302", + "address_link": "ris.einzelraum?raumkey=75419", + "alt_name": "00.068.F, Pr\u00fcflabor Hg-Druckpor.", + "arch_name": "00.068.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -37775,9 +37775,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59083", - "roomcode": "5302.EG.042A", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75419", + "roomcode": "5302.EG.068F", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -38387,9 +38387,9 @@ }, { "address": "Theresienstr. 90, 2.OG", - "address_link": "ris.einzelraum?raumkey=7588", - "alt_name": "N2402, B\u00fcro", - "arch_name": "N2402@0104", + "address_link": "ris.einzelraum?raumkey=7589", + "alt_name": "N2403, Prof.-B\u00fcro", + "arch_name": "N2403@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -38397,8 +38397,8 @@ "op_link": "webnav.navigate_to?corg=15364", "operator": "[ TUEILNT ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=7588", - "roomcode": "0104.02.402", + "room_link": "wbRaum.editRaum?pRaumNr=7589", + "roomcode": "0104.02.403", "usage": 12 }, { @@ -38610,9 +38610,9 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=63042", - "alt_name": "0728B, Fluchttreppe (Reinigen)", - "arch_name": "0728B@0507", + "address_link": "ris.einzelraum?raumkey=39714", + "alt_name": "0728, Treppenhaus", + "arch_name": "0728@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -38620,9 +38620,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63042", - "roomcode": "0507.EG.728B", - "usage": 7 + "room_link": "wbRaum.editRaum?pRaumNr=39714", + "roomcode": "0507.EG.728", + "usage": 223 }, { "address": "Arcisstr. 21, 1.OG", @@ -39410,9 +39410,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46543", - "alt_name": "0247, Flur", - "arch_name": "0247@5302", + "address_link": "ris.einzelraum?raumkey=75360", + "alt_name": "00.069.F, Lager Elektronikwerkstatt", + "arch_name": "00.069.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -39420,9 +39420,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46543", - "roomcode": "5302.EG.044", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=75360", + "roomcode": "5302.EG.069F", + "usage": 30 }, { "address": "Boltzmannstr. 19, EG", @@ -40017,19 +40017,19 @@ }, { "address": "Theresienstr. 90, 2.OG", - "address_link": "ris.einzelraum?raumkey=7589", - "alt_name": "N2403, Prof.-B\u00fcro", - "arch_name": "N2403@0104", + "address_link": "ris.einzelraum?raumkey=38850", + "alt_name": "N2404, Pr\u00fcf.-Disputationsraum", + "arch_name": "N2404@0104", "b_area_id": 27, "b_filter_id": 564, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=15364&cRes=30392&cReadonly=J", "list_index": "114", "op_link": "webnav.navigate_to?corg=15364", "operator": "[ TUEILNT ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=7589", - "roomcode": "0104.02.403", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=38850", + "roomcode": "0104.02.404", + "usage": 196 }, { "address": "Theresienstr. 90, 2.OG", @@ -40225,9 +40225,9 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=72824", - "alt_name": "0728C, Flur", - "arch_name": "0728C@0507", + "address_link": "ris.einzelraum?raumkey=63042", + "alt_name": "0728B, Fluchttreppe (Reinigen)", + "arch_name": "0728B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -40235,9 +40235,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=72824", - "roomcode": "0507.EG.728C", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=63042", + "roomcode": "0507.EG.728B", + "usage": 7 }, { "address": "Arcisstr. 21, 1.OG", @@ -41025,9 +41025,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46551", - "alt_name": "0249, Flur", - "arch_name": "0249@5302", + "address_link": "ris.einzelraum?raumkey=75415", + "alt_name": "00.070.F, Labor/Elektronikwerkstatt/B\u00fcro", + "arch_name": "00.070.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -41035,9 +41035,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46551", - "roomcode": "5302.EG.044A", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=75415", + "roomcode": "5302.EG.070F", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -41632,19 +41632,34 @@ }, { "address": "Theresienstr. 90, 2.OG", - "address_link": "ris.einzelraum?raumkey=38850", - "alt_name": "N2404, Pr\u00fcf.-Disputationsraum", - "arch_name": "N2404@0104", + "address_link": "ris.einzelraum?raumkey=38857", + "alt_name": "N2405, Sem./Pr\u00fcf./Bibliothek", + "arch_name": "N2405@0104", "b_area_id": 27, "b_filter_id": 564, - "calendar": "tvKalender.wSicht?cOrg=15364&cRes=30392&cReadonly=J", + "calendar": "tvKalender.wSicht?cOrg=15364&cRes=21904&cReadonly=J", + "extended": { + "additional_description": "N2405, Sem./Pr\u00fcf./Bibliothek", + "address": "Theresienstr. 90(0104), 2.Obergescho\u00df", + "architect_room_nr": "N2405@0104", + "area_m2": 42.8, + "building": "0104 (N4) Elektro Physik", + "floor_number": "2.Obergescho\u00df", + "floor_type": "Spannteppich", + "purpose": "Seminarraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", + "room_number": "405", + "seats": 12, + "standing_places": 0, + "wheelchair_spaces": 0, + "zip_code_location": "80333 M\u00fcnchen" + }, "list_index": "115", "op_link": "webnav.navigate_to?corg=15364", "operator": "[ TUEILNT ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38850", - "roomcode": "0104.02.404", - "usage": 196 + "room_link": "wbRaum.editRaum?pRaumNr=38857", + "roomcode": "0104.02.405", + "usage": 41 }, { "address": "Theresienstr. 90, 2.OG", @@ -42655,9 +42670,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46703", - "alt_name": "0229, Anlieferung", - "arch_name": "0229@5302", + "address_link": "ris.einzelraum?raumkey=75361", + "alt_name": "00.071.F, Maschinenwerkstatt/B\u00fcro", + "arch_name": "00.071.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -42665,9 +42680,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46703", - "roomcode": "5302.EG.045", - "usage": 218 + "room_link": "wbRaum.editRaum?pRaumNr=75361", + "roomcode": "5302.EG.071F", + "usage": 51 }, { "address": "Boltzmannstr. 19, EG", @@ -43247,34 +43262,19 @@ }, { "address": "Theresienstr. 90, 2.OG", - "address_link": "ris.einzelraum?raumkey=38857", - "alt_name": "N2405, Sem./Pr\u00fcf./Bibliothek", - "arch_name": "N2405@0104", + "address_link": "ris.einzelraum?raumkey=38858", + "alt_name": "N2406, Studentencomputerraum 1", + "arch_name": "N2406@0104", "b_area_id": 27, "b_filter_id": 564, - "calendar": "tvKalender.wSicht?cOrg=15364&cRes=21904&cReadonly=J", - "extended": { - "additional_description": "N2405, Sem./Pr\u00fcf./Bibliothek", - "address": "Theresienstr. 90(0104), 2.Obergescho\u00df", - "architect_room_nr": "N2405@0104", - "area_m2": 42.8, - "building": "0104 (N4) Elektro Physik", - "floor_number": "2.Obergescho\u00df", - "floor_type": "Spannteppich", - "purpose": "Seminarraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", - "room_number": "405", - "seats": 12, - "standing_places": 0, - "wheelchair_spaces": 0, - "zip_code_location": "80333 M\u00fcnchen" - }, + "calendar": null, "list_index": "116", "op_link": "webnav.navigate_to?corg=15364", "operator": "[ TUEILNT ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38857", - "roomcode": "0104.02.405", - "usage": 41 + "room_link": "wbRaum.editRaum?pRaumNr=38858", + "roomcode": "0104.02.406", + "usage": 208 }, { "address": "Theresienstr. 90, 2.OG", @@ -44270,9 +44270,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46716", - "alt_name": "0245, Personen Aufzug", - "arch_name": "0245@5302", + "address_link": "ris.einzelraum?raumkey=75362", + "alt_name": "00.072.F, Pr\u00fcfraum Feinmessraum", + "arch_name": "00.072.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -44280,9 +44280,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46716", - "roomcode": "5302.EG.046", - "usage": 4 + "room_link": "wbRaum.editRaum?pRaumNr=75362", + "roomcode": "5302.EG.072F", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -44877,19 +44877,34 @@ }, { "address": "Theresienstr. 90, 2.OG", - "address_link": "ris.einzelraum?raumkey=38858", - "alt_name": "N2406, Studentencomputerraum 1", - "arch_name": "N2406@0104", + "address_link": "ris.einzelraum?raumkey=7598", + "alt_name": "N2407, Seminarraum", + "arch_name": "N2407@0104", "b_area_id": 27, "b_filter_id": 564, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=15364&cRes=15040&cReadonly=J", + "extended": { + "additional_description": "N2407, Seminarraum", + "address": "Theresienstr. 90(0104), 2.Obergescho\u00df", + "architect_room_nr": "N2407@0104", + "area_m2": 96.2, + "building": "0104 (N4) Elektro Physik", + "floor_number": "2.Obergescho\u00df", + "floor_type": "Linoleum", + "purpose": "Seminarraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", + "room_number": "407", + "seats": 40, + "standing_places": 0, + "wheelchair_spaces": 0, + "zip_code_location": "80333 M\u00fcnchen" + }, "list_index": "117", "op_link": "webnav.navigate_to?corg=15364", "operator": "[ TUEILNT ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38858", - "roomcode": "0104.02.406", - "usage": 208 + "room_link": "wbRaum.editRaum?pRaumNr=7598", + "roomcode": "0104.02.407", + "usage": 41 }, { "address": "Theresienstr. 90, 2.OG", @@ -45884,9 +45899,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46727", - "alt_name": "0244, Aufzugsmaschr.", - "arch_name": "0244@5302", + "address_link": "ris.einzelraum?raumkey=75437", + "alt_name": "00.073.F, Pr\u00fcflabor Frostpr\u00fcfung", + "arch_name": "00.073.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -45894,9 +45909,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46727", - "roomcode": "5302.EG.047", - "usage": 5 + "room_link": "wbRaum.editRaum?pRaumNr=75437", + "roomcode": "5302.EG.073F", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -46491,34 +46506,19 @@ }, { "address": "Theresienstr. 90, 2.OG", - "address_link": "ris.einzelraum?raumkey=7598", - "alt_name": "N2407, Seminarraum", - "arch_name": "N2407@0104", + "address_link": "ris.einzelraum?raumkey=38863", + "alt_name": "N2407A, Praktikum", + "arch_name": "N2407A@0104", "b_area_id": 27, "b_filter_id": 564, - "calendar": "tvKalender.wSicht?cOrg=15364&cRes=15040&cReadonly=J", - "extended": { - "additional_description": "N2407, Seminarraum", - "address": "Theresienstr. 90(0104), 2.Obergescho\u00df", - "architect_room_nr": "N2407@0104", - "area_m2": 114.11, - "building": "0104 (N4) Elektro Physik", - "floor_number": "2.Obergescho\u00df", - "floor_type": "Linoleum", - "purpose": "Seminarraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", - "room_number": "407", - "seats": 40, - "standing_places": 0, - "wheelchair_spaces": 0, - "zip_code_location": "80333 M\u00fcnchen" - }, + "calendar": "tvKalender.wSicht?cOrg=15364&cRes=32592&cReadonly=J", "list_index": "118", "op_link": "webnav.navigate_to?corg=15364", "operator": "[ TUEILNT ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=7598", - "roomcode": "0104.02.407", - "usage": 41 + "room_link": "wbRaum.editRaum?pRaumNr=38863", + "roomcode": "0104.02.407A", + "usage": 103 }, { "address": "Theresienstr. 90, 2.OG", @@ -47573,19 +47573,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46737", - "alt_name": "0259, Install.Schacht", - "arch_name": "0259@5302", + "address_link": "ris.einzelraum?raumkey=75411", + "alt_name": "00.074.F, Betondruckraum Kuka-Rob.", + "arch_name": "00.074.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "118", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46737", - "roomcode": "5302.EG.048", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=75411", + "roomcode": "5302.EG.074F", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -48165,18 +48165,18 @@ }, { "address": "Theresienstr. 90, 2.OG", - "address_link": "ris.einzelraum?raumkey=38863", - "alt_name": "N2407A, Praktikum", - "arch_name": "N2407A@0104", + "address_link": "ris.einzelraum?raumkey=70745", + "alt_name": "N2407B, Praktikum", + "arch_name": "N2407B@0104", "b_area_id": 27, "b_filter_id": 564, - "calendar": "tvKalender.wSicht?cOrg=15364&cRes=32592&cReadonly=J", + "calendar": "tvKalender.wSicht?cOrg=15364&cRes=30612&cReadonly=J", "list_index": "119", "op_link": "webnav.navigate_to?corg=15364", "operator": "[ TUEILNT ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38863", - "roomcode": "0104.02.407A", + "room_link": "wbRaum.editRaum?pRaumNr=70745", + "roomcode": "0104.02.407B", "usage": 103 }, { @@ -49172,9 +49172,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46896", - "alt_name": "0250, Speiseausgabe", - "arch_name": "0250@5302", + "address_link": "ris.einzelraum?raumkey=75436", + "alt_name": "00.075.F, Pr\u00fcflabor Dauerhaftig.", + "arch_name": "00.075.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -49182,9 +49182,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46896", - "roomcode": "5302.EG.050", - "usage": 186 + "room_link": "wbRaum.editRaum?pRaumNr=75436", + "roomcode": "5302.EG.075F", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -54235,19 +54235,19 @@ }, { "address": "Theresienstr. 90, 2.OG", - "address_link": "ris.einzelraum?raumkey=70745", - "alt_name": "N2407B, Praktikum", - "arch_name": "N2407B@0104", + "address_link": "ris.einzelraum?raumkey=75440", + "alt_name": "N2407C, Lager", + "arch_name": "N2407C@0104", "b_area_id": 27, "b_filter_id": 564, - "calendar": "tvKalender.wSicht?cOrg=15364&cRes=30612&cReadonly=J", + "calendar": null, "list_index": "120", "op_link": "webnav.navigate_to?corg=15364", "operator": "[ TUEILNT ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=70745", - "roomcode": "0104.02.407B", - "usage": 103 + "room_link": "wbRaum.editRaum?pRaumNr=75440", + "roomcode": "0104.02.407C", + "usage": 30 }, { "address": "Theresienstr. 90, 2.OG", @@ -55226,9 +55226,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46910", - "alt_name": "0262, Treppe", - "arch_name": "0262@5302", + "address_link": "ris.einzelraum?raumkey=75417", + "alt_name": "00.076.F, Pr\u00fcflabor", + "arch_name": "00.076.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -55236,9 +55236,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46910", - "roomcode": "5302.EG.051", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75417", + "roomcode": "5302.EG.076F", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -56839,9 +56839,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46921", - "alt_name": "0263, Flur", - "arch_name": "0263@5302", + "address_link": "ris.einzelraum?raumkey=75364", + "alt_name": "00.077.F, B\u00fcro", + "arch_name": "00.077.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -56849,9 +56849,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46921", - "roomcode": "5302.EG.052", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=75364", + "roomcode": "5302.EG.077F", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -58436,9 +58436,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=59082", - "alt_name": "0264, Treppe", - "arch_name": "0264@5302", + "address_link": "ris.einzelraum?raumkey=75439", + "alt_name": "00.078.F, B\u00fcro", + "arch_name": "00.078.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -58446,9 +58446,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59082", - "roomcode": "5302.EG.052A", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75439", + "roomcode": "5302.EG.078F", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -59987,9 +59987,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=47070", - "alt_name": "0265, Treppe", - "arch_name": "0265@5302", + "address_link": "ris.einzelraum?raumkey=75438", + "alt_name": "00.079.F, Auswertung/Dokum.", + "arch_name": "00.079.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -59997,9 +59997,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=47070", - "roomcode": "5302.EG.053", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75438", + "roomcode": "5302.EG.079F", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -61583,9 +61583,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=47080", - "alt_name": "0266, Treppe", - "arch_name": "0266@5302", + "address_link": "ris.einzelraum?raumkey=75363", + "alt_name": "00.080.F, B\u00fcro", + "arch_name": "00.080.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -61593,9 +61593,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=47080", - "roomcode": "5302.EG.054", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75363", + "roomcode": "5302.EG.080F", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -63118,9 +63118,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=47091", - "alt_name": "0267, Flur", - "arch_name": "0267@5302", + "address_link": "ris.einzelraum?raumkey=75416", + "alt_name": "00.081.F, Auswertung/Dokum.", + "arch_name": "00.081.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -63128,9 +63128,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=47091", - "roomcode": "5302.EG.055", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=75416", + "roomcode": "5302.EG.081F", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -64668,9 +64668,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=59081", - "alt_name": "0267A, Treppe", - "arch_name": "0267A@5302", + "address_link": "ris.einzelraum?raumkey=75359", + "alt_name": "00.082.F, Ger\u00e4telager", + "arch_name": "00.082.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -64678,9 +64678,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59081", - "roomcode": "5302.EG.055A", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75359", + "roomcode": "5302.EG.082F", + "usage": 18 }, { "address": "Boltzmannstr. 19, EG", @@ -65483,7 +65483,7 @@ { "address": "Arcisstr. 21, EG", "address_link": "ris.einzelraum?raumkey=39765", - "alt_name": "0743, Stra\u00dfe", + "alt_name": "0743, Durchfahrt", "arch_name": "0743@0507", "b_area_id": 23, "b_filter_id": 583, @@ -65494,7 +65494,7 @@ "plz_place": "80333 M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=39765", "roomcode": "0507.EG.743", - "usage": 204 + "usage": 13 }, { "address": "Arcisstr. 21, 2.OG", @@ -66202,19 +66202,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=47099", - "alt_name": "0269, Install.Schacht", - "arch_name": "0269@5302", + "address_link": "ris.einzelraum?raumkey=75356", + "alt_name": "00.084.E, Spannuingsrisskorrosionslabor", + "arch_name": "00.084.E@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "127", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=47099", - "roomcode": "5302.EG.056", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=75356", + "roomcode": "5302.EG.084E", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -67721,9 +67721,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=47108", - "alt_name": "0270, Install.Schacht", - "arch_name": "0270@5302", + "address_link": "ris.einzelraum?raumkey=75448", + "alt_name": "00.087.E, Dateiinstall.", + "arch_name": "00.087.E@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -67731,9 +67731,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=47108", - "roomcode": "5302.EG.057", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=75448", + "roomcode": "5302.EG.087E", + "usage": 207 }, { "address": "Boltzmannstr. 19, EG", @@ -68879,8 +68879,8 @@ "b_filter_id": 680, "calendar": null, "list_index": "129", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=15579", + "operator": "[ TUWZQ9I ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=48855", "roomcode": "4213.EG.301", @@ -69240,9 +69240,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44392", - "alt_name": "0271, Install.Schacht", - "arch_name": "0271@5302", + "address_link": "ris.einzelraum?raumkey=75433", + "alt_name": "00.088.E, Schleuse 1", + "arch_name": "00.088.E@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -69250,9 +69250,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44392", - "roomcode": "5302.EG.058", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=75433", + "roomcode": "5302.EG.088E", + "usage": 105 }, { "address": "Boltzmannstr. 19, EG", @@ -75073,9 +75073,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44406", - "alt_name": "0272, Install.Schacht", - "arch_name": "0272@5302", + "address_link": "ris.einzelraum?raumkey=75398", + "alt_name": "00.089.E, Konstantklima 5", + "arch_name": "00.089.E@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -75083,9 +75083,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44406", - "roomcode": "5302.EG.059", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=75398", + "roomcode": "5302.EG.089E", + "usage": 30 }, { "address": "Boltzmannstr. 19, EG", @@ -76246,8 +76246,8 @@ "b_filter_id": 680, "calendar": null, "list_index": "131", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=51917", + "operator": "[ TUS4F4C ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=49007", "roomcode": "4213.EG.303", @@ -76591,19 +76591,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44419", - "alt_name": "0260, Install. Schacht", - "arch_name": "0260@5302", + "address_link": "ris.einzelraum?raumkey=75447", + "alt_name": "00.090.E, Probenlager", + "arch_name": "00.090.E@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "131", - "op_link": "webnav.navigate_to?corg=25925", - "operator": "[ TUZV142 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44419", - "roomcode": "5302.EG.060", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=75447", + "roomcode": "5302.EG.090E", + "usage": 30 }, { "address": "Boltzmannstr. 19, EG", @@ -77764,8 +77764,8 @@ "b_filter_id": 680, "calendar": null, "list_index": "132", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=51917", + "operator": "[ TUS4F4C ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=49021", "roomcode": "4213.EG.304", @@ -78109,19 +78109,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44577", - "alt_name": "0261, Treppe", - "arch_name": "0261@5302", + "address_link": "ris.einzelraum?raumkey=75444", + "alt_name": "00.091.E, ZIP-Labor", + "arch_name": "00.091.E@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "132", - "op_link": "webnav.navigate_to?corg=25925", - "operator": "[ TUZV142 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44577", - "roomcode": "5302.EG.061", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75444", + "roomcode": "5302.EG.091E", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -79672,19 +79672,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44586", - "alt_name": "0263, Treppe", - "arch_name": "0263@5302", + "address_link": "ris.einzelraum?raumkey=75434", + "alt_name": "00.700.A, Flur", + "arch_name": "00.700.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "133", - "op_link": "webnav.navigate_to?corg=25925", - "operator": "[ TUZV142 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44586", - "roomcode": "5302.EG.062", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75434", + "roomcode": "5302.EG.700A", + "usage": 222 }, { "address": "Boltzmannstr. 19, EG", @@ -80890,8 +80890,8 @@ "b_filter_id": 680, "calendar": null, "list_index": "134", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=51917", + "operator": "[ TUS4F4C ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=49185", "roomcode": "4213.EG.306", @@ -81265,19 +81265,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=59078", - "alt_name": "0273, Transformatoren", - "arch_name": "0273@5302", + "address_link": "ris.einzelraum?raumkey=75408", + "alt_name": "00.701.A, Flur", + "arch_name": "00.701.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "134", - "op_link": "webnav.navigate_to?corg=25925", - "operator": "[ TUZV142 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59078", - "roomcode": "5302.EG.063", - "usage": 160 + "room_link": "wbRaum.editRaum?pRaumNr=75408", + "roomcode": "5302.EG.701A", + "usage": 222 }, { "address": "Boltzmannstr. 19, EG", @@ -82438,8 +82438,8 @@ "b_filter_id": 680, "calendar": null, "list_index": "135", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=51917", + "operator": "[ TUS4F4C ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=49197", "roomcode": "4213.EG.307", @@ -82767,19 +82767,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=59079", - "alt_name": "0274, Transformatoren", - "arch_name": "0274@5302", + "address_link": "ris.einzelraum?raumkey=75409", + "alt_name": "00.702.A, Flur", + "arch_name": "00.702.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "135", - "op_link": "webnav.navigate_to?corg=25925", - "operator": "[ TUZV142 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59079", - "roomcode": "5302.EG.064", - "usage": 160 + "room_link": "wbRaum.editRaum?pRaumNr=75409", + "roomcode": "5302.EG.702A", + "usage": 222 }, { "address": "Boltzmannstr. 19, EG", @@ -83925,8 +83925,8 @@ "b_filter_id": 680, "calendar": null, "list_index": "136", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=51917", + "operator": "[ TUS4F4C ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=49333", "roomcode": "4213.EG.308", @@ -84284,19 +84284,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=59080", - "alt_name": "0275, Transformatoren", - "arch_name": "0275@5302", + "address_link": "ris.einzelraum?raumkey=75402", + "alt_name": "00.703.B, Flur", + "arch_name": "00.703.B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "136", - "op_link": "webnav.navigate_to?corg=25925", - "operator": "[ TUZV142 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59080", - "roomcode": "5302.EG.065", - "usage": 160 + "room_link": "wbRaum.editRaum?pRaumNr=75402", + "roomcode": "5302.EG.703B", + "usage": 222 }, { "address": "Boltzmannstr. 19, EG", @@ -85752,20 +85752,20 @@ "usage": 223 }, { - "address": "Lichtenbergstr. 2, 1.ZG", - "address_link": "ris.einzelraum?raumkey=59714", - "alt_name": "2.217A, B\u00fcro", - "arch_name": "2.217A@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75390", + "alt_name": "00.704.B, Flur", + "arch_name": "00.704.B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "137", - "op_link": "webnav.navigate_to?corg=15309", - "operator": "[ TULRLRT ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59714", - "roomcode": "5302.Z1.217Z", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=75390", + "roomcode": "5302.EG.704B", + "usage": 222 }, { "address": "Boltzmannstr. 19, EG", @@ -87220,20 +87220,20 @@ "usage": 223 }, { - "address": "Lichtenbergstr. 2, 1.ZG", - "address_link": "ris.einzelraum?raumkey=59715", - "alt_name": "2.218, Besprechungsraum", - "arch_name": "2.218@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75395", + "alt_name": "00.705.B, Flur", + "arch_name": "00.705.B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "138", - "op_link": "webnav.navigate_to?corg=15309", - "operator": "[ TULRLRT ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59715", - "roomcode": "5302.Z1.218Z", - "usage": 196 + "room_link": "wbRaum.editRaum?pRaumNr=75395", + "roomcode": "5302.EG.705B", + "usage": 222 }, { "address": "Boltzmannstr. 19, EG", @@ -88641,20 +88641,20 @@ "usage": 120 }, { - "address": "Lichtenbergstr. 2, 1.ZG", - "address_link": "ris.einzelraum?raumkey=59716", - "alt_name": "2.219Z, Besprechungsraum", - "arch_name": "2.219Z@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75385", + "alt_name": "00.706.C, Flur", + "arch_name": "00.706.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "139", - "op_link": "webnav.navigate_to?corg=15309", - "operator": "[ TULRLRT ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59716", - "roomcode": "5302.Z1.219Z", - "usage": 196 + "room_link": "wbRaum.editRaum?pRaumNr=75385", + "roomcode": "5302.EG.706C", + "usage": 222 }, { "address": "Boltzmannstr. 19, EG", @@ -94296,20 +94296,20 @@ "usage": 120 }, { - "address": "Lichtenbergstr. 2, 1.ZG", - "address_link": "ris.einzelraum?raumkey=59717", - "alt_name": "2.220, Technik", - "arch_name": "2.220@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75372", + "alt_name": "00.707.C, Flur", + "arch_name": "00.707.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "140", - "op_link": "webnav.navigate_to?corg=25925", - "operator": "[ TUZV142 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59717", - "roomcode": "5302.Z1.220", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=75372", + "roomcode": "5302.EG.707C", + "usage": 222 }, { "address": "Boltzmannstr. 19, EG", @@ -95453,8 +95453,8 @@ "b_filter_id": 680, "calendar": null, "list_index": "141", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=51917", + "operator": "[ TUS4F4C ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=49365", "roomcode": "4213.EG.313", @@ -95732,20 +95732,20 @@ "usage": 120 }, { - "address": "Lichtenbergstr. 2, 1.ZG", - "address_link": "ris.einzelraum?raumkey=59718", - "alt_name": "2.221Z, Treppenhaus", - "arch_name": "2.221Z@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75378", + "alt_name": "00.708.C, Flur", + "arch_name": "00.708.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "141", - "op_link": "webnav.navigate_to?corg=15309", - "operator": "[ TULRLRT ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59718", - "roomcode": "5302.Z1.221Z", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75378", + "roomcode": "5302.EG.708C", + "usage": 222 }, { "address": "Boltzmannstr. 19, EG", @@ -96889,8 +96889,8 @@ "b_filter_id": 680, "calendar": null, "list_index": "142", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=51917", + "operator": "[ TUS4F4C ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=49495", "roomcode": "4213.EG.314", @@ -97137,10 +97137,10 @@ "usage": 120 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=44602", - "alt_name": "1201, Foyer", - "arch_name": "1201@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75392", + "alt_name": "00.709.D, Flur", + "arch_name": "00.709.D@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -97148,8 +97148,8 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44602", - "roomcode": "5302.01.101", + "room_link": "wbRaum.editRaum?pRaumNr=75392", + "roomcode": "5302.EG.709D", "usage": 222 }, { @@ -98512,10 +98512,10 @@ "usage": 120 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=44750", - "alt_name": "1224, Cafe-Kiosk", - "arch_name": "1224@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75365", + "alt_name": "00.710.D, Flur", + "arch_name": "00.710.D@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -98523,9 +98523,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44750", - "roomcode": "5302.01.101A", - "usage": 186 + "room_link": "wbRaum.editRaum?pRaumNr=75365", + "roomcode": "5302.EG.710D", + "usage": 222 }, { "address": "Boltzmannstr. 19, EG", @@ -99900,20 +99900,20 @@ "usage": 120 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=44765", - "alt_name": "1202, Gesch\u00e4ft 1", - "arch_name": "1202@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75420", + "alt_name": "00.711.F, Flur", + "arch_name": "00.711.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "144", - "op_link": "webnav.navigate_to?corg=25918", - "operator": "[ TUZV141 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44765", - "roomcode": "5302.01.102", - "usage": 164 + "room_link": "wbRaum.editRaum?pRaumNr=75420", + "roomcode": "5302.EG.711F", + "usage": 222 }, { "address": "Boltzmannstr. 19, EG", @@ -101305,20 +101305,20 @@ "usage": 120 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=59084", - "alt_name": "1202A, Gesch\u00e4ft 2", - "arch_name": "1202A@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75410", + "alt_name": "00.712.F, Flur", + "arch_name": "00.712.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "145", - "op_link": "webnav.navigate_to?corg=25918", - "operator": "[ TUZV141 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59084", - "roomcode": "5302.01.102A", - "usage": 164 + "room_link": "wbRaum.editRaum?pRaumNr=75410", + "roomcode": "5302.EG.712F", + "usage": 222 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -102617,20 +102617,20 @@ "usage": 4 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=59085", - "alt_name": "1202B, Gesch\u00e4ft 3", - "arch_name": "1202B@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75369", + "alt_name": "00.713.F, Flur", + "arch_name": "00.713.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "146", - "op_link": "webnav.navigate_to?corg=25918", - "operator": "[ TUZV141 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59085", - "roomcode": "5302.01.102B", - "usage": 164 + "room_link": "wbRaum.editRaum?pRaumNr=75369", + "roomcode": "5302.EG.713F", + "usage": 222 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -103960,10 +103960,10 @@ "usage": 223 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=44776", - "alt_name": "1203, Cafeteria", - "arch_name": "1203@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75445", + "alt_name": "00.714.E, Flur", + "arch_name": "00.714.E@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -103971,9 +103971,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44776", - "roomcode": "5302.01.103", - "usage": 45 + "room_link": "wbRaum.editRaum?pRaumNr=75445", + "roomcode": "5302.EG.714E", + "usage": 222 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -105240,10 +105240,10 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=44922", - "alt_name": "1218, B\u00fcro", - "arch_name": "1218@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75430", + "alt_name": "00.750.E, Treppenhaus 1", + "arch_name": "00.750.E@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -105251,9 +105251,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44922", - "roomcode": "5302.01.105", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=75430", + "roomcode": "5302.EG.750E", + "usage": 223 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -106565,10 +106565,10 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=44933", - "alt_name": "1217, B\u00fcro", - "arch_name": "1217@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75387", + "alt_name": "00.751.C, Treppenhaus 2", + "arch_name": "00.751.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -106576,9 +106576,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44933", - "roomcode": "5302.01.106", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=75387", + "roomcode": "5302.EG.751C", + "usage": 223 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -111735,8 +111735,8 @@ "b_filter_id": 680, "calendar": null, "list_index": "150", - "op_link": "webnav.navigate_to?corg=53557", - "operator": "[ TUS4F9L ]", + "op_link": "webnav.navigate_to?corg=51258", + "operator": "[ TUS4000 ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=51900", "roomcode": "4213.EG.321", @@ -111951,10 +111951,10 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=44943", - "alt_name": "1216, Ausgabe", - "arch_name": "1216@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75375", + "alt_name": "00.752.D, Treppenhaus 3", + "arch_name": "00.752.D@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -111962,9 +111962,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44943", - "roomcode": "5302.01.107", - "usage": 186 + "room_link": "wbRaum.editRaum?pRaumNr=75375", + "roomcode": "5302.EG.752D", + "usage": 223 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -113030,8 +113030,8 @@ "b_filter_id": 680, "calendar": null, "list_index": "151", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=53557", + "operator": "[ TUS4F9L ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=51911", "roomcode": "4213.EG.322", @@ -113246,20 +113246,20 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=44954", - "alt_name": "1215, Mensak\u00fcche", - "arch_name": "1215@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75358", + "alt_name": "00.753.F, Treppenhaus 4", + "arch_name": "00.753.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "151", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44954", - "roomcode": "5302.01.108", - "usage": 28 + "room_link": "wbRaum.editRaum?pRaumNr=75358", + "roomcode": "5302.EG.753F", + "usage": 223 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -114525,10 +114525,10 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=44962", - "alt_name": "1211, Sp\u00fclk\u00fcche", - "arch_name": "1211@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75412", + "alt_name": "00.754.F, Treppenhaus 5", + "arch_name": "00.754.F@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -114536,9 +114536,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44962", - "roomcode": "5302.01.109", - "usage": 28 + "room_link": "wbRaum.editRaum?pRaumNr=75412", + "roomcode": "5302.EG.754F", + "usage": 223 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -115834,10 +115834,10 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45111", - "alt_name": "1214, K\u00fchlraum", - "arch_name": "1214@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75427", + "alt_name": "00.800.B, Aufzugstechnik", + "arch_name": "00.800.B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -115845,9 +115845,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45111", - "roomcode": "5302.01.110", - "usage": 199 + "room_link": "wbRaum.editRaum?pRaumNr=75427", + "roomcode": "5302.EG.800B", + "usage": 5 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -117098,10 +117098,10 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45128", - "alt_name": "1210, Lager", - "arch_name": "1210@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75426", + "alt_name": "00.801.B, Aufzugsschacht", + "arch_name": "00.801.B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -117109,9 +117109,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45128", - "roomcode": "5302.01.111", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=75426", + "roomcode": "5302.EG.801B", + "usage": 195 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -117866,7 +117866,7 @@ { "address": "Arcisstr. 21, EG", "address_link": "ris.einzelraum?raumkey=8239", - "alt_name": "0777, B\u00fcro", + "alt_name": "0777, Besprechungsraum", "arch_name": "0777@0507", "b_area_id": 23, "b_filter_id": 583, @@ -117877,7 +117877,7 @@ "plz_place": "80333 M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=8239", "roomcode": "0507.EG.777", - "usage": 12 + "usage": 196 }, { "address": "Arcisstr. 21, 3.OG", @@ -118392,10 +118392,10 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45133", - "alt_name": "1212, Install.Schacht", - "arch_name": "1212@5302", + "address": "Lichtenbergstr. 2, EG", + "address_link": "ris.einzelraum?raumkey=75399", + "alt_name": "00.809.E, Aufzug", + "arch_name": "00.809.E@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -118403,9 +118403,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45133", - "roomcode": "5302.01.112", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=75399", + "roomcode": "5302.EG.809E", + "usage": 4 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -119701,20 +119701,20 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45283", - "alt_name": "1207, WC-Damen", - "arch_name": "1207@5302", + "address": "Lichtenbergstr. 2, 1.ZG", + "address_link": "ris.einzelraum?raumkey=59714", + "alt_name": "2.217A, B\u00fcro", + "arch_name": "2.217A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "156", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=15309", + "operator": "[ TULRLRT ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45283", - "roomcode": "5302.01.113", - "usage": 116 + "room_link": "wbRaum.editRaum?pRaumNr=59714", + "roomcode": "5302.Z1.217Z", + "usage": 12 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -120914,7 +120914,7 @@ "area_m2": 49.54, "building": "4317 Tierwissenschaften", "floor_number": "3.Obergescho\u00df", - "floor_type": "Keine Angabe", + "floor_type": "Linoleum", "purpose": "Seminarraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", "room_number": "305", "seats": 0, @@ -120995,20 +120995,20 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45297", - "alt_name": "1221, Install.Schacht", - "arch_name": "1221@5302", + "address": "Lichtenbergstr. 2, 1.ZG", + "address_link": "ris.einzelraum?raumkey=59715", + "alt_name": "2.218, Besprechungsraum", + "arch_name": "2.218@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "157", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=15309", + "operator": "[ TULRLRT ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45297", - "roomcode": "5302.01.114", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=59715", + "roomcode": "5302.Z1.218Z", + "usage": 196 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -122319,20 +122319,20 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45308", - "alt_name": "1206, WC-Herren", - "arch_name": "1206@5302", + "address": "Lichtenbergstr. 2, 1.ZG", + "address_link": "ris.einzelraum?raumkey=59716", + "alt_name": "2.219Z, Besprechungsraum", + "arch_name": "2.219Z@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "158", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=15309", + "operator": "[ TULRLRT ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45308", - "roomcode": "5302.01.115", - "usage": 115 + "room_link": "wbRaum.editRaum?pRaumNr=59716", + "roomcode": "5302.Z1.219Z", + "usage": 196 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -123567,20 +123567,20 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45318", - "alt_name": "1204, Beh.-WC / Wickeltisch", - "arch_name": "1204@5302", + "address": "Lichtenbergstr. 2, 1.ZG", + "address_link": "ris.einzelraum?raumkey=59717", + "alt_name": "2.220, Technik", + "arch_name": "2.220@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "159", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=25925", + "operator": "[ TUZV142 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45318", - "roomcode": "5302.01.115A", - "usage": 117 + "room_link": "wbRaum.editRaum?pRaumNr=59717", + "roomcode": "5302.Z1.220", + "usage": 120 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -126478,8 +126478,8 @@ { "address": "Staatsgut Thalhausen, EG", "address_link": "ris.einzelraum?raumkey=47242", - "alt_name": "9, B\u00fcro", - "arch_name": "9@4602", + "alt_name": "ZE 01, B\u00fcro", + "arch_name": "ZE 01@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -128857,20 +128857,20 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45466", - "alt_name": "1208, Putzraum", - "arch_name": "1208@5302", + "address": "Lichtenbergstr. 2, 1.ZG", + "address_link": "ris.einzelraum?raumkey=59718", + "alt_name": "2.221Z, Treppenhaus", + "arch_name": "2.221Z@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "160", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=15309", + "operator": "[ TULRLRT ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45466", - "roomcode": "5302.01.116", - "usage": 205 + "room_link": "wbRaum.editRaum?pRaumNr=59718", + "roomcode": "5302.Z1.221Z", + "usage": 223 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -129904,8 +129904,8 @@ "b_filter_id": 680, "calendar": null, "list_index": "161", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=53557", + "operator": "[ TUS4F9L ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=50409", "roomcode": "4213.EG.332", @@ -130105,9 +130105,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45480", - "alt_name": "1209, Installation", - "arch_name": "1209@5302", + "address_link": "ris.einzelraum?raumkey=75488", + "alt_name": "01.001.G, B\u00fcro", + "arch_name": "01.001.G@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -130115,9 +130115,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45480", - "roomcode": "5302.01.117", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=75488", + "roomcode": "5302.01.001", + "usage": 12 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -131352,9 +131352,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45491", - "alt_name": "1213, M\u00fcll", - "arch_name": "1213@5302", + "address_link": "ris.einzelraum?raumkey=75490", + "alt_name": "01.002.G, Beh.-WC", + "arch_name": "01.002.G@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -131362,9 +131362,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45491", - "roomcode": "5302.01.118", - "usage": 214 + "room_link": "wbRaum.editRaum?pRaumNr=75490", + "roomcode": "5302.01.002", + "usage": 117 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -132300,8 +132300,8 @@ "b_filter_id": 1485, "calendar": null, "list_index": "163", - "op_link": "webnav.navigate_to?corg=43860", - "operator": "[ TUEDS18 ]", + "op_link": "webnav.navigate_to?corg=54323", + "operator": "[ TUS7LEA ]", "plz_place": "80335 M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=64000", "roomcode": "2907.02.272", @@ -132629,9 +132629,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45500", - "alt_name": "1219, Windfang", - "arch_name": "1219@5302", + "address_link": "ris.einzelraum?raumkey=75489", + "alt_name": "01.003.G, WC", + "arch_name": "01.003.G@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -132639,9 +132639,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45500", - "roomcode": "5302.01.119A", - "usage": 52 + "room_link": "wbRaum.editRaum?pRaumNr=75489", + "roomcode": "5302.01.003", + "usage": 114 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -132902,7 +132902,7 @@ { "address": "Boltzmannstr. 3, 3.OG", "address_link": "ris.einzelraum?raumkey=11770", - "alt_name": "03.05.041, Computerlabor", + "alt_name": "03.05.041, B\u00fcro", "arch_name": "03.05.041@5605", "b_area_id": 33, "b_filter_id": 835, @@ -132913,7 +132913,7 @@ "plz_place": "85748 Garching b. M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=11770", "roomcode": "5605.03.041", - "usage": 103 + "usage": 12 }, { "address": "Boltzmannstr. 3, 3.OG", @@ -133562,8 +133562,8 @@ "b_filter_id": 1485, "calendar": null, "list_index": "164", - "op_link": "webnav.navigate_to?corg=43860", - "operator": "[ TUEDS18 ]", + "op_link": "webnav.navigate_to?corg=54323", + "operator": "[ TUS7LEA ]", "plz_place": "80335 M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=64001", "roomcode": "2907.02.273", @@ -133891,9 +133891,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45653", - "alt_name": "1220, Windfang", - "arch_name": "1220@5302", + "address_link": "ris.einzelraum?raumkey=75462", + "alt_name": "01.004.G, B\u00fcro", + "arch_name": "01.004.G@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -133901,9 +133901,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45653", - "roomcode": "5302.01.119B", - "usage": 52 + "room_link": "wbRaum.editRaum?pRaumNr=75462", + "roomcode": "5302.01.004", + "usage": 12 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -134854,8 +134854,8 @@ "b_filter_id": 1485, "calendar": null, "list_index": "165", - "op_link": "webnav.navigate_to?corg=43860", - "operator": "[ TUEDS18 ]", + "op_link": "webnav.navigate_to?corg=53777", + "operator": "[ TUS7HTL ]", "plz_place": "80335 M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=64004", "roomcode": "2907.02.274", @@ -135183,9 +135183,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45681", - "alt_name": "1258, Aufzugschacht", - "arch_name": "1258@5302", + "address_link": "ris.einzelraum?raumkey=75484", + "alt_name": "01.005.H, B\u00fcro", + "arch_name": "01.005.H@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -135193,9 +135193,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45681", - "roomcode": "5302.01.121", - "usage": 195 + "room_link": "wbRaum.editRaum?pRaumNr=75484", + "roomcode": "5302.01.005", + "usage": 12 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -136100,8 +136100,8 @@ "b_filter_id": 1485, "calendar": null, "list_index": "166", - "op_link": "webnav.navigate_to?corg=43860", - "operator": "[ TUEDS18 ]", + "op_link": "webnav.navigate_to?corg=49297", + "operator": "[ TUEDS28 ]", "plz_place": "80335 M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=64005", "roomcode": "2907.02.275", @@ -136226,10 +136226,10 @@ "arch_name": "E37@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": "tvKalender.wSicht?cOrg=51258&cRes=18532&cReadonly=J", + "calendar": "tvKalender.wSicht?cOrg=51917&cRes=18532&cReadonly=J", "list_index": "166", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=51917", + "operator": "[ TUS4F4C ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=51706", "roomcode": "4213.EG.337", @@ -136429,9 +136429,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45690", - "alt_name": "1222, Aufzugschacht", - "arch_name": "1222@5302", + "address_link": "ris.einzelraum?raumkey=75483", + "alt_name": "01.006.H, B\u00fcro", + "arch_name": "01.006.H@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -136439,9 +136439,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45690", - "roomcode": "5302.01.122", - "usage": 195 + "room_link": "wbRaum.editRaum?pRaumNr=75483", + "roomcode": "5302.01.006", + "usage": 12 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -137330,8 +137330,8 @@ "b_filter_id": 1485, "calendar": null, "list_index": "167", - "op_link": "webnav.navigate_to?corg=43860", - "operator": "[ TUEDS18 ]", + "op_link": "webnav.navigate_to?corg=51901", + "operator": "[ TUS7000 ]", "plz_place": "80335 M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=64006", "roomcode": "2907.02.276", @@ -137674,9 +137674,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45841", - "alt_name": "1225, Leseraum", - "arch_name": "1225@5302", + "address_link": "ris.einzelraum?raumkey=75482", + "alt_name": "01.007.H, B\u00fcro", + "arch_name": "01.007.H@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -137684,9 +137684,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45841", - "roomcode": "5302.01.123", - "usage": 150 + "room_link": "wbRaum.editRaum?pRaumNr=75482", + "roomcode": "5302.01.007", + "usage": 12 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -138904,9 +138904,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45846", - "alt_name": "1259, Install.Schacht", - "arch_name": "1259@5302", + "address_link": "ris.einzelraum?raumkey=75480", + "alt_name": "01.008.H, Sekretariat", + "arch_name": "01.008.H@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -138914,9 +138914,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45846", - "roomcode": "5302.01.124", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=75480", + "roomcode": "5302.01.008", + "usage": 40 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -139606,20 +139606,20 @@ "usage": 12 }, { - "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=41406", - "alt_name": "0799, B\u00fchnen u.Studio (Reinigen)", - "arch_name": "0799@0507", + "address": "Arcisstr. 21, 1.OG", + "address_link": "ris.einzelraum?raumkey=41464", + "alt_name": "1700, Treppenhaus", + "arch_name": "1700@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "169", - "op_link": "webnav.navigate_to?corg=51267", - "operator": "[ TUS2000 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41406", - "roomcode": "0507.EG.799", - "usage": 218 + "room_link": "wbRaum.editRaum?pRaumNr=41464", + "roomcode": "0507.01.700", + "usage": 223 }, { "address": "Arcisstr. 21, 4.OG", @@ -140087,9 +140087,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45859", - "alt_name": "1260, Install.Schacht", - "arch_name": "1260@5302", + "address_link": "ris.einzelraum?raumkey=75481", + "alt_name": "01.009.H, Prof.-B\u00fcro", + "arch_name": "01.009.H@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -140097,9 +140097,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45859", - "roomcode": "5302.01.125", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=75481", + "roomcode": "5302.01.009", + "usage": 12 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -142995,8 +142995,8 @@ { "address": "Staatsgut Thalhausen, EG", "address_link": "ris.einzelraum?raumkey=47255", - "alt_name": "8, Arbeitsraum ohne Besprechungsgruppe", - "arch_name": "8@4602", + "alt_name": "ZE 02, B\u00fcro", + "arch_name": "ZE 02@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -144768,9 +144768,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41464", - "alt_name": "1700, Treppenhaus", - "arch_name": "1700@0507", + "address_link": "ris.einzelraum?raumkey=41467", + "alt_name": "1700A, Flur", + "arch_name": "1700A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -144778,9 +144778,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41464", - "roomcode": "0507.01.700", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=41467", + "roomcode": "0507.01.700A", + "usage": 222 }, { "address": "Arcisstr. 21, 4.OG", @@ -145248,9 +145248,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=45869", - "alt_name": "1257, Treppe", - "arch_name": "1257@5302", + "address_link": "ris.einzelraum?raumkey=75454", + "alt_name": "01.010.H, Prof.-B\u00fcro", + "arch_name": "01.010.H@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -145258,9 +145258,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45869", - "roomcode": "5302.01.126", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75454", + "roomcode": "5302.01.010", + "usage": 12 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -145935,9 +145935,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41467", - "alt_name": "1700A, Flur", - "arch_name": "1700A@0507", + "address_link": "ris.einzelraum?raumkey=63045", + "alt_name": "1700B, Treppe", + "arch_name": "1700B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -145945,9 +145945,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41467", - "roomcode": "0507.01.700A", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=63045", + "roomcode": "0507.01.700B", + "usage": 223 }, { "address": "Arcisstr. 21, 5.OG", @@ -146260,7 +146260,7 @@ "arch_name": "2.OG 13@4226", "b_area_id": 42, "b_filter_id": 1160, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=39688&cRes=33492&cReadonly=J", "list_index": "171", "op_link": "webnav.navigate_to?corg=53957", "operator": "[ TUS4C6A ]", @@ -146399,9 +146399,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=46016", - "alt_name": "1224A, Lesepl\u00e4tze", - "arch_name": "1224A@5302", + "address_link": "ris.einzelraum?raumkey=75453", + "alt_name": "01.011.H, Sekretariat", + "arch_name": "01.011.H@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -146409,9 +146409,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46016", - "roomcode": "5302.01.127", - "usage": 150 + "room_link": "wbRaum.editRaum?pRaumNr=75453", + "roomcode": "5302.01.011", + "usage": 40 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -147071,19 +147071,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=63045", - "alt_name": "1700B, Treppe", - "arch_name": "1700B@0507", + "address_link": "ris.einzelraum?raumkey=19588", + "alt_name": "1701, Gro\u00dfraumb\u00fcro", + "arch_name": "1701@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "172", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=51537", + "operator": "[ TUS2OTS ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63045", - "roomcode": "0507.01.700B", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=19588", + "roomcode": "0507.01.701", + "usage": 12 }, { "address": "Arcisstr. 21, 5.OG", @@ -147535,9 +147535,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=46021", - "alt_name": "1224B, Lesepl\u00e4tze", - "arch_name": "1224B@5302", + "address_link": "ris.einzelraum?raumkey=75479", + "alt_name": "01.012.H, Prof.-B\u00fcro", + "arch_name": "01.012.H@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -147545,9 +147545,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46021", - "roomcode": "5302.01.128", - "usage": 150 + "room_link": "wbRaum.editRaum?pRaumNr=75479", + "roomcode": "5302.01.012", + "usage": 12 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -148237,19 +148237,34 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=19588", - "alt_name": "1701, Gro\u00dfraumb\u00fcro", - "arch_name": "1701@0507", + "address_link": "ris.einzelraum?raumkey=8277", + "alt_name": "1713, Unterricht", + "arch_name": "1713@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=51267&cRes=15091&cReadonly=J", + "extended": { + "additional_description": "1713, Unterricht", + "address": "Arcisstr. 21(0507), 1.Obergescho\u00df", + "architect_room_nr": "1713@0507", + "area_m2": 91.34, + "building": "0507 (Z7) Bestelmeyer Nord", + "floor_number": "1.Obergescho\u00df", + "floor_type": "Spannteppich", + "purpose": "Unterrichtsraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", + "room_number": "713", + "seats": 35, + "standing_places": 0, + "wheelchair_spaces": 0, + "zip_code_location": "80333 M\u00fcnchen" + }, "list_index": "173", - "op_link": "webnav.navigate_to?corg=51537", - "operator": "[ TUS2OTS ]", + "op_link": "webnav.navigate_to?corg=51267", + "operator": "[ TUS2000 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=19588", - "roomcode": "0507.01.701", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=8277", + "roomcode": "0507.01.713", + "usage": 130 }, { "address": "Arcisstr. 21, 5.OG", @@ -148562,7 +148577,7 @@ "arch_name": "2.OG 15@4226", "b_area_id": 42, "b_filter_id": 1160, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=39688&cRes=33493&cReadonly=J", "list_index": "173", "op_link": "webnav.navigate_to?corg=53957", "operator": "[ TUS4C6A ]", @@ -148701,9 +148716,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=46214", - "alt_name": "1250, Terrasse", - "arch_name": "1250@5302", + "address_link": "ris.einzelraum?raumkey=75508", + "alt_name": "01.018.H, B\u00fcro", + "arch_name": "01.018.H@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -148711,9 +148726,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46214", - "roomcode": "5302.01.134", - "usage": 218 + "room_link": "wbRaum.editRaum?pRaumNr=75508", + "roomcode": "5302.01.018", + "usage": 12 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -149387,34 +149402,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8277", - "alt_name": "1713, Unterricht", - "arch_name": "1713@0507", + "address_link": "ris.einzelraum?raumkey=41613", + "alt_name": "1713G, Galerie", + "arch_name": "1713G@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=51267&cRes=15091&cReadonly=J", - "extended": { - "additional_description": "1713, Unterricht", - "address": "Arcisstr. 21(0507), 1.Obergescho\u00df", - "architect_room_nr": "1713@0507", - "area_m2": 92.51, - "building": "0507 (Z7) Bestelmeyer Nord", - "floor_number": "1.Obergescho\u00df", - "floor_type": "Spannteppich", - "purpose": "Unterrichtsraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", - "room_number": "713", - "seats": 35, - "standing_places": 0, - "wheelchair_spaces": 0, - "zip_code_location": "80333 M\u00fcnchen" - }, + "calendar": null, "list_index": "174", "op_link": "webnav.navigate_to?corg=51267", "operator": "[ TUS2000 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8277", - "roomcode": "0507.01.713", - "usage": 130 + "room_link": "wbRaum.editRaum?pRaumNr=41613", + "roomcode": "0507.01.713G", + "usage": 206 }, { "address": "Arcisstr. 21, 5.OG", @@ -149850,9 +149850,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=59786", - "alt_name": "1261, Treppe", - "arch_name": "1261@5302", + "address_link": "ris.einzelraum?raumkey=75459", + "alt_name": "01.019.H, B\u00fcro", + "arch_name": "01.019.H@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -149860,9 +149860,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59786", - "roomcode": "5302.01.160", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75459", + "roomcode": "5302.01.019", + "usage": 12 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -150521,19 +150521,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41613", - "alt_name": "1713G, Galerie", - "arch_name": "1713G@0507", + "address_link": "ris.einzelraum?raumkey=8284", + "alt_name": "1715, B\u00fcro", + "arch_name": "1715@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "175", - "op_link": "webnav.navigate_to?corg=51267", - "operator": "[ TUS2000 ]", + "op_link": "webnav.navigate_to?corg=51537", + "operator": "[ TUS2OTS ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41613", - "roomcode": "0507.01.713G", - "usage": 206 + "room_link": "wbRaum.editRaum?pRaumNr=8284", + "roomcode": "0507.01.715", + "usage": 12 }, { "address": "Arcisstr. 21, 5.OG", @@ -150969,9 +150969,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=59787", - "alt_name": "1262, Treppe", - "arch_name": "1262@5302", + "address_link": "ris.einzelraum?raumkey=75458", + "alt_name": "01.020.H, B\u00fcro", + "arch_name": "01.020.H@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -150979,9 +150979,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59787", - "roomcode": "5302.01.162", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75458", + "roomcode": "5302.01.020", + "usage": 12 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -151608,18 +151608,18 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8284", - "alt_name": "1715, B\u00fcro", - "arch_name": "1715@0507", + "address_link": "ris.einzelraum?raumkey=8287", + "alt_name": "1717, B\u00fcro EU Projekt WE-ACT", + "arch_name": "1717@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "176", - "op_link": "webnav.navigate_to?corg=51537", - "operator": "[ TUS2OTS ]", + "op_link": "webnav.navigate_to?corg=15047", + "operator": "[ TUBVHFM ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8284", - "roomcode": "0507.01.715", + "room_link": "wbRaum.editRaum?pRaumNr=8287", + "roomcode": "0507.01.717", "usage": 12 }, { @@ -151881,7 +151881,7 @@ { "address": "Maximus-von-Imhof-Forum 2, EG", "address_link": "ris.einzelraum?raumkey=52054", - "alt_name": "E47, Labor", + "alt_name": "E47, Labor (gem. Nutz. 1110000000)", "arch_name": "E47@4213", "b_area_id": 42, "b_filter_id": 680, @@ -152071,19 +152071,34 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=59788", - "alt_name": "1263, Treppe", - "arch_name": "1263@5302", + "address_link": "ris.einzelraum?raumkey=75456", + "alt_name": "01.022.I, Seminarraum 2", + "arch_name": "01.022.I@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, + "extended": { + "additional_description": "01.022.I, Seminarraum 2", + "address": "Lichtenbergstr. 2(5302), 1.Obergescho\u00df", + "architect_room_nr": "01.022.I@5302", + "area_m2": 60.5, + "building": "5302 Mensa", + "floor_number": "1.Obergescho\u00df", + "floor_type": "PVC", + "purpose": "Seminarraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", + "room_number": "022", + "seats": 0, + "standing_places": 0, + "wheelchair_spaces": 0, + "zip_code_location": "85748 Garching b. M\u00fcnchen" + }, "list_index": "176", "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59788", - "roomcode": "5302.01.163", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75456", + "roomcode": "5302.01.022", + "usage": 41 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -152710,19 +152725,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8287", - "alt_name": "1717, B\u00fcro EU Projekt WE-ACT", - "arch_name": "1717@0507", + "address_link": "ris.einzelraum?raumkey=41630", + "alt_name": "1721, WC-Damen", + "arch_name": "1721@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "177", - "op_link": "webnav.navigate_to?corg=15047", - "operator": "[ TUBVHFM ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8287", - "roomcode": "0507.01.717", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=41630", + "roomcode": "0507.01.721", + "usage": 116 }, { "address": "Arcisstr. 21, 5.OG", @@ -153158,19 +153173,34 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=59789", - "alt_name": "1264, Treppe", - "arch_name": "1264@5302", + "address_link": "ris.einzelraum?raumkey=75457", + "alt_name": "01.023.I, Seminarraum 1", + "arch_name": "01.023.I@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, + "extended": { + "additional_description": "01.023.I, Seminarraum 1", + "address": "Lichtenbergstr. 2(5302), 1.Obergescho\u00df", + "architect_room_nr": "01.023.I@5302", + "area_m2": 110.0, + "building": "5302 Mensa", + "floor_number": "1.Obergescho\u00df", + "floor_type": "PVC", + "purpose": "Seminarraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", + "room_number": "023", + "seats": 0, + "standing_places": 0, + "wheelchair_spaces": 0, + "zip_code_location": "85748 Garching b. M\u00fcnchen" + }, "list_index": "177", "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59789", - "roomcode": "5302.01.164", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75457", + "roomcode": "5302.01.023", + "usage": 41 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -153797,9 +153827,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41630", - "alt_name": "1721, WC-Damen", - "arch_name": "1721@0507", + "address_link": "ris.einzelraum?raumkey=69180", + "alt_name": "1721A, Vorraum WC-D", + "arch_name": "1721A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -153807,9 +153837,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41630", - "roomcode": "0507.01.721", - "usage": 116 + "room_link": "wbRaum.editRaum?pRaumNr=69180", + "roomcode": "0507.01.721A", + "usage": 118 }, { "address": "Arcisstr. 21, 5.OG", @@ -154245,9 +154275,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=59790", - "alt_name": "1265, Treppe", - "arch_name": "1265@5302", + "address_link": "ris.einzelraum?raumkey=75504", + "alt_name": "01.024.I, B\u00fcro", + "arch_name": "01.024.I@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -154255,9 +154285,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59790", - "roomcode": "5302.01.165", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75504", + "roomcode": "5302.01.024", + "usage": 12 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -154869,9 +154899,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=69180", - "alt_name": "1721A, WC-Vorraum", - "arch_name": "1721A@0507", + "address_link": "ris.einzelraum?raumkey=41699", + "alt_name": "1723, WC-Herren", + "arch_name": "1723@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -154879,9 +154909,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=69180", - "roomcode": "0507.01.721A", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=41699", + "roomcode": "0507.01.723", + "usage": 115 }, { "address": "Arcisstr. 21, 5.OG", @@ -155301,9 +155331,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=59791", - "alt_name": "1266, Treppe", - "arch_name": "1266@5302", + "address_link": "ris.einzelraum?raumkey=75503", + "alt_name": "01.025.I, B\u00fcro", + "arch_name": "01.025.I@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -155311,9 +155341,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59791", - "roomcode": "5302.01.166", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75503", + "roomcode": "5302.01.025", + "usage": 12 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -158115,8 +158145,8 @@ { "address": "Staatsgut Thalhausen, EG", "address_link": "ris.einzelraum?raumkey=47261", - "alt_name": "5, Sekretariat", - "arch_name": "5@4602", + "alt_name": "ZE 03, B\u00fcro", + "arch_name": "ZE 03@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -159902,9 +159932,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41699", - "alt_name": "1723, WC-Herren", - "arch_name": "1723@0507", + "address_link": "ris.einzelraum?raumkey=69181", + "alt_name": "1723A, Vorraum WC-H", + "arch_name": "1723A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -159912,9 +159942,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41699", - "roomcode": "0507.01.723", - "usage": 115 + "room_link": "wbRaum.editRaum?pRaumNr=69181", + "roomcode": "0507.01.723A", + "usage": 118 }, { "address": "Arcisstr. 21, 5.OG", @@ -160334,9 +160364,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=59792", - "alt_name": "1267, Treppe", - "arch_name": "1267@5302", + "address_link": "ris.einzelraum?raumkey=75506", + "alt_name": "01.027.I, WC-Herren", + "arch_name": "01.027.I@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -160344,9 +160374,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59792", - "roomcode": "5302.01.167", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75506", + "roomcode": "5302.01.027", + "usage": 118 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -160958,9 +160988,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=69181", - "alt_name": "1723A, WC-Vorraum", - "arch_name": "1723A@0507", + "address_link": "ris.einzelraum?raumkey=41704", + "alt_name": "1724, Flur", + "arch_name": "1724@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -160968,9 +160998,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=69181", - "roomcode": "0507.01.723A", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=41704", + "roomcode": "0507.01.724", + "usage": 222 }, { "address": "Arcisstr. 21, 5.OG", @@ -161283,10 +161313,10 @@ "arch_name": "1.2.EG1@4277", "b_area_id": 42, "b_filter_id": 668, - "calendar": "tvKalender.wSicht?cOrg=51258&cRes=18473&cReadonly=J", + "calendar": "tvKalender.wSicht?cOrg=53958&cRes=18473&cReadonly=J", "list_index": "181", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=53958", + "operator": "[ TUS4B1E ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=53367", "roomcode": "4277.EG.040", @@ -161390,9 +161420,9 @@ }, { "address": "Lichtenbergstr. 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=59793", - "alt_name": "1268, Treppe", - "arch_name": "1268@5302", + "address_link": "ris.einzelraum?raumkey=75455", + "alt_name": "01.028.I, K\u00fcche/Pausenraum", + "arch_name": "01.028.I@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -161400,9 +161430,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59793", - "roomcode": "5302.01.168", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75455", + "roomcode": "5302.01.028", + "usage": 28 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -161997,19 +162027,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41704", - "alt_name": "1724, Flur", - "arch_name": "1724@0507", + "address_link": "ris.einzelraum?raumkey=41709", + "alt_name": "1731, Besprechung", + "arch_name": "1731@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "182", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15094", + "operator": "[ TUBVSVP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41704", - "roomcode": "0507.01.724", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=41709", + "roomcode": "0507.01.731", + "usage": 196 }, { "address": "Arcisstr. 21, 6.OG", @@ -162428,10 +162458,10 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=46224", - "alt_name": "2201, Raumlufttechnik", - "arch_name": "2201@5302", + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75463", + "alt_name": "01.029.I, Putzraum", + "arch_name": "01.029.I@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -162439,9 +162469,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46224", - "roomcode": "5302.02.201", - "usage": 32 + "room_link": "wbRaum.editRaum?pRaumNr=75463", + "roomcode": "5302.01.029", + "usage": 205 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -163036,9 +163066,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41709", - "alt_name": "1731, Besprechung", - "arch_name": "1731@0507", + "address_link": "ris.einzelraum?raumkey=8300", + "alt_name": "1733, B\u00fcro-Prof.", + "arch_name": "1733@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -163046,9 +163076,9 @@ "op_link": "webnav.navigate_to?corg=15094", "operator": "[ TUBVSVP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41709", - "roomcode": "0507.01.731", - "usage": 196 + "room_link": "wbRaum.editRaum?pRaumNr=8300", + "roomcode": "0507.01.733", + "usage": 12 }, { "address": "Arcisstr. 21, 6.OG", @@ -163467,10 +163497,10 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=46235", - "alt_name": "2202, Ventilationskammer", - "arch_name": "2202@5302", + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75477", + "alt_name": "01.030.I, Kopierer", + "arch_name": "01.030.I@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -163478,9 +163508,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46235", - "roomcode": "5302.02.202", - "usage": 32 + "room_link": "wbRaum.editRaum?pRaumNr=75477", + "roomcode": "5302.01.030", + "usage": 110 }, { "address": "Boltzmannstr. 19, 1.OG", @@ -164044,9 +164074,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8300", - "alt_name": "1733, B\u00fcro-Prof.", - "arch_name": "1733@0507", + "address_link": "ris.einzelraum?raumkey=41785", + "alt_name": "1734, Besprechung", + "arch_name": "1734@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -164054,9 +164084,9 @@ "op_link": "webnav.navigate_to?corg=15094", "operator": "[ TUBVSVP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8300", - "roomcode": "0507.01.733", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=41785", + "roomcode": "0507.01.734", + "usage": 196 }, { "address": "Arcisstr. 21, 6.OG", @@ -164490,10 +164520,10 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=59087", - "alt_name": "2203, Ventilationskammer", - "arch_name": "2203@5302", + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75460", + "alt_name": "01.032.J, Bacheloranden- / Masteranden", + "arch_name": "01.032.J@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -164501,9 +164531,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59087", - "roomcode": "5302.02.203", - "usage": 32 + "room_link": "wbRaum.editRaum?pRaumNr=75460", + "roomcode": "5302.01.032", + "usage": 12 }, { "address": "Boltzmannstr. 19, 2.OG", @@ -165066,9 +165096,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41785", - "alt_name": "1734, Besprechung", - "arch_name": "1734@0507", + "address_link": "ris.einzelraum?raumkey=41789", + "alt_name": "1734A, Flur/Empfang", + "arch_name": "1734A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -165076,9 +165106,9 @@ "op_link": "webnav.navigate_to?corg=15094", "operator": "[ TUBVSVP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41785", - "roomcode": "0507.01.734", - "usage": 196 + "room_link": "wbRaum.editRaum?pRaumNr=41789", + "roomcode": "0507.01.734A", + "usage": 222 }, { "address": "Arcisstr. 21, 6.OG", @@ -165390,7 +165420,7 @@ "arch_name": "2.OG 25B@4226", "b_area_id": 42, "b_filter_id": 1160, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=39688&cRes=33494&cReadonly=J", "list_index": "185", "op_link": "webnav.navigate_to?corg=53957", "operator": "[ TUS4C6A ]", @@ -165512,10 +165542,10 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=59088", - "alt_name": "2204, Fortluft\u00f6ffnung", - "arch_name": "2204@5302", + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75461", + "alt_name": "01.036.J, Besprechungsraum", + "arch_name": "01.036.J@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -165523,9 +165553,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59088", - "roomcode": "5302.02.204", - "usage": 32 + "room_link": "wbRaum.editRaum?pRaumNr=75461", + "roomcode": "5302.01.036", + "usage": 196 }, { "address": "Boltzmannstr. 19, 2.OG", @@ -166088,9 +166118,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41789", - "alt_name": "1734A, Flur/Empfang", - "arch_name": "1734A@0507", + "address_link": "ris.einzelraum?raumkey=8306", + "alt_name": "1735, B\u00fcro", + "arch_name": "1735@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -166098,9 +166128,9 @@ "op_link": "webnav.navigate_to?corg=15094", "operator": "[ TUBVSVP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41789", - "roomcode": "0507.01.734A", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=8306", + "roomcode": "0507.01.735", + "usage": 12 }, { "address": "Arcisstr. 21, 1.ZG", @@ -166503,10 +166533,10 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=59086", - "alt_name": "2257, Treppenraum", - "arch_name": "2257@5302", + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75478", + "alt_name": "01.037.J, Archiv/Lager", + "arch_name": "01.037.J@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -166514,9 +166544,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59086", - "roomcode": "5302.02.205", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=75478", + "roomcode": "5302.01.037", + "usage": 2 }, { "address": "Boltzmannstr. 19, 2.OG", @@ -167079,9 +167109,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8306", - "alt_name": "1735, B\u00fcro", - "arch_name": "1735@0507", + "address_link": "ris.einzelraum?raumkey=41866", + "alt_name": "1736, Teek\u00fcche", + "arch_name": "1736@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -167089,9 +167119,9 @@ "op_link": "webnav.navigate_to?corg=15094", "operator": "[ TUBVSVP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8306", - "roomcode": "0507.01.735", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=41866", + "roomcode": "0507.01.736", + "usage": 198 }, { "address": "Arcisstr. 21, 1.ZG", @@ -167478,10 +167508,10 @@ "usage": 100 }, { - "address": "Lichtenbergstr. 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=59795", - "alt_name": "2205, Raumlufttechnik/nicht begehbar", - "arch_name": "2205@5302", + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75510", + "alt_name": "01.037.J, Bibliothek", + "arch_name": "01.037.J@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -167489,9 +167519,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=59795", - "roomcode": "5302.02.206", - "usage": 32 + "room_link": "wbRaum.editRaum?pRaumNr=75510", + "roomcode": "5302.01.038", + "usage": 10 }, { "address": "Boltzmannstr. 19, 2.OG", @@ -168038,9 +168068,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41866", - "alt_name": "1736, Teek\u00fcche", - "arch_name": "1736@0507", + "address_link": "ris.einzelraum?raumkey=8310", + "alt_name": "1737, B\u00fcro", + "arch_name": "1737@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -168048,9 +168078,9 @@ "op_link": "webnav.navigate_to?corg=15094", "operator": "[ TUBVSVP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41866", - "roomcode": "0507.01.736", - "usage": 198 + "room_link": "wbRaum.editRaum?pRaumNr=8310", + "roomcode": "0507.01.737", + "usage": 12 }, { "address": "Arcisstr. 21, 1.ZG", @@ -168436,6 +168466,22 @@ "roomcode": "5142.02.007E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75502", + "alt_name": "01.039.K, Raum optional", + "arch_name": "01.039.K@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "188", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75502", + "roomcode": "5302.01.039", + "usage": 44 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67427", @@ -168934,19 +168980,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41870", - "alt_name": "1736B, Lager", - "arch_name": "1736B@0507", + "address_link": "ris.einzelraum?raumkey=8314", + "alt_name": "1739, B\u00fcro", + "arch_name": "1739@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "189", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=15094", + "operator": "[ TUBVSVP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41870", - "roomcode": "0507.01.736B", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=8314", + "roomcode": "0507.01.739", + "usage": 12 }, { "address": "Arcisstr. 21, 1.ZG", @@ -169347,6 +169393,22 @@ "roomcode": "5142.02.008E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75500", + "alt_name": "01.040.K, B\u00fcro", + "arch_name": "01.040.K@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "189", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75500", + "roomcode": "5302.01.040", + "usage": 12 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67428", @@ -172047,8 +172109,8 @@ { "address": "Staatsgut Thalhausen, EG", "address_link": "ris.einzelraum?raumkey=47337", - "alt_name": "6, Versuchsleiter", - "arch_name": "6@4602", + "alt_name": "ZE 04, B\u00fcro", + "arch_name": "ZE 04@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -173815,19 +173877,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8310", - "alt_name": "1737, B\u00fcro", - "arch_name": "1737@0507", + "address_link": "ris.einzelraum?raumkey=40750", + "alt_name": "1740, Flur", + "arch_name": "1740@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "190", - "op_link": "webnav.navigate_to?corg=15094", - "operator": "[ TUBVSVP ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8310", - "roomcode": "0507.01.737", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=40750", + "roomcode": "0507.01.740", + "usage": 222 }, { "address": "Arcisstr. 21, 1.ZG", @@ -174152,7 +174214,7 @@ { "address": "Liesel-Beckmann-Str. 2, 3.OG", "address_link": "ris.einzelraum?raumkey=64810", - "alt_name": "3-28, Garderobe", + "alt_name": "3-28, Lager", "arch_name": "3-28@4318", "b_area_id": 41, "b_filter_id": 1161, @@ -174163,7 +174225,7 @@ "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=64810", "roomcode": "4318.03.028", - "usage": 121 + "usage": 30 }, { "address": "James-Franck-Str. 1, 1.UG", @@ -174213,6 +174275,22 @@ "roomcode": "5142.02.009E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75499", + "alt_name": "01.041.K, B\u00fcro", + "arch_name": "01.041.K@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "190", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75499", + "roomcode": "5302.01.041", + "usage": 12 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67453", @@ -174726,9 +174804,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8314", - "alt_name": "1739, B\u00fcro", - "arch_name": "1739@0507", + "address_link": "ris.einzelraum?raumkey=8250", + "alt_name": "1741, B\u00fcro", + "arch_name": "1741@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -174736,8 +174814,8 @@ "op_link": "webnav.navigate_to?corg=15094", "operator": "[ TUBVSVP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8314", - "roomcode": "0507.01.739", + "room_link": "wbRaum.editRaum?pRaumNr=8250", + "roomcode": "0507.01.741", "usage": 12 }, { @@ -175124,6 +175202,22 @@ "roomcode": "5142.02.010E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75498", + "alt_name": "01.042.K, B\u00fcro", + "arch_name": "01.042.K@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "191", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75498", + "roomcode": "5302.01.042", + "usage": 12 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67454", @@ -175637,9 +175731,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=40750", - "alt_name": "1740, Flur", - "arch_name": "1740@0507", + "address_link": "ris.einzelraum?raumkey=40761", + "alt_name": "1742, Flur", + "arch_name": "1742@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -175647,8 +175741,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40750", - "roomcode": "0507.01.740", + "room_link": "wbRaum.editRaum?pRaumNr=40761", + "roomcode": "0507.01.742", "usage": 222 }, { @@ -176065,6 +176159,22 @@ "roomcode": "5142.02.011E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75496", + "alt_name": "01.044.L, B\u00fcro", + "arch_name": "01.044.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "192", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75496", + "roomcode": "5302.01.044", + "usage": 12 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67449", @@ -176578,18 +176688,18 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8250", - "alt_name": "1741, B\u00fcro", - "arch_name": "1741@0507", + "address_link": "ris.einzelraum?raumkey=8255", + "alt_name": "1743, B\u00fcro", + "arch_name": "1743@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=39688&cRes=15089&cReadonly=J", "list_index": "193", "op_link": "webnav.navigate_to?corg=15094", "operator": "[ TUBVSVP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8250", - "roomcode": "0507.01.741", + "room_link": "wbRaum.editRaum?pRaumNr=8255", + "roomcode": "0507.01.743", "usage": 12 }, { @@ -176976,6 +177086,22 @@ "roomcode": "5142.02.012E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75470", + "alt_name": "01.045.L, B\u00fcro", + "arch_name": "01.045.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "193", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75470", + "roomcode": "5302.01.045", + "usage": 12 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67452", @@ -177489,19 +177615,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=40761", - "alt_name": "1742, Flur", - "arch_name": "1742@0507", + "address_link": "ris.einzelraum?raumkey=40842", + "alt_name": "1745, Besprechung", + "arch_name": "1745@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "194", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15094", + "operator": "[ TUBVSVP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40761", - "roomcode": "0507.01.742", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=40842", + "roomcode": "0507.01.745", + "usage": 196 }, { "address": "Arcisstr. 21, 1.ZG", @@ -177887,6 +178013,22 @@ "roomcode": "5142.02.013E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75495", + "alt_name": "01.046.L, B\u00fcro", + "arch_name": "01.046.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "194", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75495", + "roomcode": "5302.01.046", + "usage": 12 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=69561", @@ -178400,19 +178542,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8255", - "alt_name": "1743, B\u00fcro", - "arch_name": "1743@0507", + "address_link": "ris.einzelraum?raumkey=40846", + "alt_name": "1749, Putzraum", + "arch_name": "1749@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=39688&cRes=15089&cReadonly=J", + "calendar": null, "list_index": "195", - "op_link": "webnav.navigate_to?corg=15094", - "operator": "[ TUBVSVP ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8255", - "roomcode": "0507.01.743", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=40846", + "roomcode": "0507.01.749", + "usage": 205 }, { "address": "Arcisstr. 21, 1.ZG", @@ -178798,6 +178940,22 @@ "roomcode": "5142.02.014E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75469", + "alt_name": "01.047.L, B\u00fcro", + "arch_name": "01.047.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "195", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75469", + "roomcode": "5302.01.047", + "usage": 12 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67472", @@ -179296,19 +179454,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=40842", - "alt_name": "1745, Besprechung", - "arch_name": "1745@0507", + "address_link": "ris.einzelraum?raumkey=40851", + "alt_name": "1750, Treppenhaus", + "arch_name": "1750@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "196", - "op_link": "webnav.navigate_to?corg=15094", - "operator": "[ TUBVSVP ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40842", - "roomcode": "0507.01.745", - "usage": 196 + "room_link": "wbRaum.editRaum?pRaumNr=40851", + "roomcode": "0507.01.750", + "usage": 223 }, { "address": "Arcisstr. 21, 1.ZG", @@ -179709,6 +179867,22 @@ "roomcode": "5142.02.015E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75494", + "alt_name": "01.048.L, B\u00fcro", + "arch_name": "01.048.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "196", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75494", + "roomcode": "5302.01.048", + "usage": 12 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67471", @@ -180222,9 +180396,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=40846", - "alt_name": "1749, Putzraum", - "arch_name": "1749@0507", + "address_link": "ris.einzelraum?raumkey=63046", + "alt_name": "1750A, Treppe", + "arch_name": "1750A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -180232,9 +180406,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40846", - "roomcode": "0507.01.749", - "usage": 205 + "room_link": "wbRaum.editRaum?pRaumNr=63046", + "roomcode": "0507.01.750A", + "usage": 223 }, { "address": "Arcisstr. 21, 1.ZG", @@ -180635,6 +180809,22 @@ "roomcode": "5142.02.016E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75493", + "alt_name": "01.049.L, B\u00fcro", + "arch_name": "01.049.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "197", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75493", + "roomcode": "5302.01.049", + "usage": 12 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=69577", @@ -181148,9 +181338,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=40851", - "alt_name": "1750, Treppenhaus", - "arch_name": "1750@0507", + "address_link": "ris.einzelraum?raumkey=40894", + "alt_name": "1751, WC-Vorraum", + "arch_name": "1751@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -181158,9 +181348,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40851", - "roomcode": "0507.01.750", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=40894", + "roomcode": "0507.01.751", + "usage": 118 }, { "address": "Arcisstr. 21, 1.ZG", @@ -181425,7 +181615,7 @@ "arch_name": "2.OG 36@4226", "b_area_id": 42, "b_filter_id": 1160, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=39688&cRes=33497&cReadonly=J", "list_index": "198", "op_link": "webnav.navigate_to?corg=53957", "operator": "[ TUS4C6A ]", @@ -181561,6 +181751,22 @@ "roomcode": "5142.02.017E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75492", + "alt_name": "01.050.L, B\u00fcro", + "arch_name": "01.050.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "198", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75492", + "roomcode": "5302.01.050", + "usage": 12 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67470", @@ -182043,9 +182249,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=63046", - "alt_name": "1750A, Treppe", - "arch_name": "1750A@0507", + "address_link": "ris.einzelraum?raumkey=69182", + "alt_name": "1751A, WC-Vorraum Damen", + "arch_name": "1751A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -182053,9 +182259,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63046", - "roomcode": "0507.01.750A", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=69182", + "roomcode": "0507.01.751A", + "usage": 118 }, { "address": "Arcisstr. 21, 1.ZG", @@ -182320,7 +182526,7 @@ "arch_name": "2.OG 37@4226", "b_area_id": 42, "b_filter_id": 1160, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=39688&cRes=33498&cReadonly=J", "list_index": "199", "op_link": "webnav.navigate_to?corg=53957", "operator": "[ TUS4C6A ]", @@ -182441,6 +182647,22 @@ "roomcode": "5142.02.018E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75491", + "alt_name": "01.051.L, B\u00fcro", + "arch_name": "01.051.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "199", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75491", + "roomcode": "5302.01.051", + "usage": 12 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67458", @@ -186660,8 +186882,8 @@ { "address": "Staatsgut Thalhausen, 1.UG", "address_link": "ris.einzelraum?raumkey=48368", - "alt_name": "1405, Vorraum", - "arch_name": "1405@4602", + "alt_name": "ZO 02, Labor BIO 1 S 1", + "arch_name": "ZO 02@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -186671,7 +186893,7 @@ "plz_place": "85402 Kranzberg", "room_link": "wbRaum.editRaum?pRaumNr=48368", "roomcode": "4602.U1.002", - "usage": 50 + "usage": 102 }, { "address": "Staatsgut Thalhausen, EG", @@ -188194,23 +188416,23 @@ }, { "address": "Boltzmannstr. 15, EG", - "address_link": "ris.einzelraum?raumkey=75173", - "alt_name": "0.001A, H\u00f6rsaal 1A", - "arch_name": "0.001A@5539", + "address_link": "ris.einzelraum?raumkey=75174", + "alt_name": "0.001B, H\u00f6rsaal 1B", + "arch_name": "0.001B@5539", "b_area_id": 34, "b_filter_id": 3149, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=19691&cRes=33533&cReadonly=J", "extended": { - "additional_description": "0.001A, H\u00f6rsaal 1A", + "additional_description": "0.001B, H\u00f6rsaal 1B", "address": "Boltzmannstr. 15(5539), Erdgescho\u00df", - "architect_room_nr": "0.001A@5539", - "area_m2": 1.0, + "architect_room_nr": "0.001B@5539", + "area_m2": 400.0, "building": "5539 Interims-Tentomax MW", "floor_number": "Erdgescho\u00df", - "floor_type": "Spannteppich", + "floor_type": "PVC", "purpose": "H\u00f6rsaal (NF5.1 - Unterrichtsr\u00e4ume mit festem Gest\u00fchl)", - "room_number": "001A", - "seats": 400, + "room_number": "001B", + "seats": 320, "standing_places": 0, "wheelchair_spaces": 0, "zip_code_location": "85748 Garching b. M\u00fcnchen" @@ -188219,8 +188441,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=75173", - "roomcode": "5539.EG.001A", + "room_link": "wbRaum.editRaum?pRaumNr=75174", + "roomcode": "5539.EG.001B", "usage": 20 }, { @@ -191165,8 +191387,8 @@ { "address": "Staatsgut Thalhausen, EG", "address_link": "ris.einzelraum?raumkey=47354", - "alt_name": "4, Gutsverwaltung", - "arch_name": "4@4602", + "alt_name": "ZE 05, B\u00fcro", + "arch_name": "ZE 05@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -192873,9 +193095,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=40894", - "alt_name": "1751, WC-Vorraum", - "arch_name": "1751@0507", + "address_link": "ris.einzelraum?raumkey=72829", + "alt_name": "1751B, WC-Damen", + "arch_name": "1751B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -192883,9 +193105,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40894", - "roomcode": "0507.01.751", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=72829", + "roomcode": "0507.01.751B", + "usage": 116 }, { "address": "Arcisstr. 21, 1.ZG", @@ -193134,7 +193356,7 @@ "arch_name": "2.OG 38@4226", "b_area_id": 42, "b_filter_id": 1160, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=39688&cRes=33499&cReadonly=J", "list_index": "200", "op_link": "webnav.navigate_to?corg=53957", "operator": "[ TUS4C6A ]", @@ -193255,6 +193477,22 @@ "roomcode": "5142.02.019E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75464", + "alt_name": "01.052.L, B\u00fcro", + "arch_name": "01.052.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "200", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75464", + "roomcode": "5302.01.052", + "usage": 12 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67459", @@ -193737,9 +193975,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=69182", - "alt_name": "1751A, WC-Vorraum Damen", - "arch_name": "1751A@0507", + "address_link": "ris.einzelraum?raumkey=72827", + "alt_name": "1751C, WC-Herren", + "arch_name": "1751C@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -193747,9 +193985,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=69182", - "roomcode": "0507.01.751A", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=72827", + "roomcode": "0507.01.751C", + "usage": 115 }, { "address": "Arcisstr. 21, 1.ZG", @@ -193998,7 +194236,7 @@ "arch_name": "2.OG 40@4226", "b_area_id": 42, "b_filter_id": 1160, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=39688&cRes=33500&cReadonly=J", "list_index": "201", "op_link": "webnav.navigate_to?corg=53957", "operator": "[ TUS4C6A ]", @@ -194119,6 +194357,22 @@ "roomcode": "5142.02.020E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75465", + "alt_name": "01.053.L, B\u00fcrobedarfslager", + "arch_name": "01.053.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "201", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75465", + "roomcode": "5302.01.053", + "usage": 30 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67467", @@ -194601,19 +194855,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=72829", - "alt_name": "1751B, WC-Damen", - "arch_name": "1751B@0507", + "address_link": "ris.einzelraum?raumkey=8383", + "alt_name": "1753, B\u00fcro", + "arch_name": "1753@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "202", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15092", + "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=72829", - "roomcode": "0507.01.751B", - "usage": 116 + "room_link": "wbRaum.editRaum?pRaumNr=8383", + "roomcode": "0507.01.753", + "usage": 12 }, { "address": "Arcisstr. 21, 1.ZG", @@ -194862,7 +195116,7 @@ "arch_name": "2.OG 41@4226", "b_area_id": 42, "b_filter_id": 1160, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=39688&cRes=33501&cReadonly=J", "list_index": "202", "op_link": "webnav.navigate_to?corg=53957", "operator": "[ TUS4C6A ]", @@ -194983,6 +195237,22 @@ "roomcode": "5142.02.021E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75466", + "alt_name": "01.054.L, Kopierer", + "arch_name": "01.054.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "202", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75466", + "roomcode": "5302.01.054", + "usage": 110 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67466", @@ -195480,19 +195750,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=72827", - "alt_name": "1751C, WC-Herren", - "arch_name": "1751C@0507", + "address_link": "ris.einzelraum?raumkey=8387", + "alt_name": "1755, B\u00fcro", + "arch_name": "1755@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "203", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15092", + "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=72827", - "roomcode": "0507.01.751C", - "usage": 115 + "room_link": "wbRaum.editRaum?pRaumNr=8387", + "roomcode": "0507.01.755", + "usage": 12 }, { "address": "Arcisstr. 21, 1.ZG", @@ -195862,6 +196132,22 @@ "roomcode": "5142.02.022E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75468", + "alt_name": "01.055.L, Dateninstall.", + "arch_name": "01.055.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "203", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75468", + "roomcode": "5302.01.055", + "usage": 207 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67469", @@ -196344,18 +196630,18 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8383", - "alt_name": "1753, B\u00fcro", - "arch_name": "1753@0507", + "address_link": "ris.einzelraum?raumkey=8389", + "alt_name": "1757, B\u00fcro", + "arch_name": "1757@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "204", - "op_link": "webnav.navigate_to?corg=15092", - "operator": "[ TUBVVTK ]", + "op_link": "webnav.navigate_to?corg=47797", + "operator": "[ TUBVVVS ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8383", - "roomcode": "0507.01.753", + "room_link": "wbRaum.editRaum?pRaumNr=8389", + "roomcode": "0507.01.757", "usage": 12 }, { @@ -196726,6 +197012,22 @@ "roomcode": "5142.02.023E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75497", + "alt_name": "01.057.L, Lager", + "arch_name": "01.057.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "204", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75497", + "roomcode": "5302.01.057", + "usage": 30 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=69576", @@ -197223,19 +197525,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8387", - "alt_name": "1755, B\u00fcro", - "arch_name": "1755@0507", + "address_link": "ris.einzelraum?raumkey=40967", + "alt_name": "1760, Flur", + "arch_name": "1760@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "205", - "op_link": "webnav.navigate_to?corg=15092", - "operator": "[ TUBVVTK ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8387", - "roomcode": "0507.01.755", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=40967", + "roomcode": "0507.01.760", + "usage": 222 }, { "address": "Arcisstr. 21, 1.ZG", @@ -197468,7 +197770,7 @@ "arch_name": "2.OG 44@4226", "b_area_id": 42, "b_filter_id": 1160, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=39688&cRes=33495&cReadonly=J", "list_index": "205", "op_link": "webnav.navigate_to?corg=53957", "operator": "[ TUS4C6A ]", @@ -197589,6 +197891,22 @@ "roomcode": "5142.02.024E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75472", + "alt_name": "01.058.L, Serverraum", + "arch_name": "01.058.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "205", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75472", + "roomcode": "5302.01.058", + "usage": 207 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=69586", @@ -198086,18 +198404,18 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8389", - "alt_name": "1757, B\u00fcro", - "arch_name": "1757@0507", + "address_link": "ris.einzelraum?raumkey=72825", + "alt_name": "1761A, B\u00fcro", + "arch_name": "1761A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "206", - "op_link": "webnav.navigate_to?corg=47797", - "operator": "[ TUBVVVS ]", + "op_link": "webnav.navigate_to?corg=15091", + "operator": "[ TUBVLVW ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8389", - "roomcode": "0507.01.757", + "room_link": "wbRaum.editRaum?pRaumNr=72825", + "roomcode": "0507.01.761A", "usage": 12 }, { @@ -198331,7 +198649,7 @@ "arch_name": "2.OG 45@4226", "b_area_id": 42, "b_filter_id": 1160, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=39688&cRes=33496&cReadonly=J", "list_index": "206", "op_link": "webnav.navigate_to?corg=53957", "operator": "[ TUS4C6A ]", @@ -198452,6 +198770,22 @@ "roomcode": "5142.02.025E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=44602", + "alt_name": "1201, Foyer", + "arch_name": "1201@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "206", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=44602", + "roomcode": "5302.01.101", + "usage": 222 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67426", @@ -198918,19 +199252,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=40967", - "alt_name": "1760, Flur", - "arch_name": "1760@0507", + "address_link": "ris.einzelraum?raumkey=72826", + "alt_name": "1761B, B\u00fcro", + "arch_name": "1761B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "207", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15091", + "operator": "[ TUBVLVW ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40967", - "roomcode": "0507.01.760", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=72826", + "roomcode": "0507.01.761B", + "usage": 12 }, { "address": "Arcisstr. 21, 1.ZG", @@ -199117,8 +199451,8 @@ "b_filter_id": 680, "calendar": "tvKalender.wSicht?cOrg=51258&cRes=18179&cReadonly=J", "list_index": "207", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=46717", + "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=17241", "roomcode": "4213.01.315", @@ -199284,6 +199618,22 @@ "roomcode": "5142.02.026E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=44750", + "alt_name": "1224, Cafe-Kiosk", + "arch_name": "1224@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "207", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=44750", + "roomcode": "5302.01.101A", + "usage": 186 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67429", @@ -199750,9 +200100,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=72825", - "alt_name": "1761A, B\u00fcro", - "arch_name": "1761A@0507", + "address_link": "ris.einzelraum?raumkey=8317", + "alt_name": "1762A, B\u00fcro", + "arch_name": "1762A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -199760,8 +200110,8 @@ "op_link": "webnav.navigate_to?corg=15091", "operator": "[ TUBVLVW ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=72825", - "roomcode": "0507.01.761A", + "room_link": "wbRaum.editRaum?pRaumNr=8317", + "roomcode": "0507.01.762A", "usage": 12 }, { @@ -199964,8 +200314,8 @@ "b_filter_id": 680, "calendar": "tvKalender.wSicht?cOrg=51258&cRes=18154&cReadonly=J", "list_index": "208", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=46717", + "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=28577", "roomcode": "4213.01.316", @@ -200131,6 +200481,22 @@ "roomcode": "5142.02.027E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=44765", + "alt_name": "1202, Gesch\u00e4ft 1", + "arch_name": "1202@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "208", + "op_link": "webnav.navigate_to?corg=25918", + "operator": "[ TUZV141 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=44765", + "roomcode": "5302.01.102", + "usage": 164 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67425", @@ -200597,9 +200963,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=72826", - "alt_name": "1761B, B\u00fcro", - "arch_name": "1761B@0507", + "address_link": "ris.einzelraum?raumkey=41036", + "alt_name": "1762B, B\u00fcro", + "arch_name": "1762B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -200607,8 +200973,8 @@ "op_link": "webnav.navigate_to?corg=15091", "operator": "[ TUBVLVW ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=72826", - "roomcode": "0507.01.761B", + "room_link": "wbRaum.editRaum?pRaumNr=41036", + "roomcode": "0507.01.762B", "usage": 12 }, { @@ -200963,6 +201329,22 @@ "roomcode": "5142.02.028E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=59084", + "alt_name": "1202A, Gesch\u00e4ft 2", + "arch_name": "1202A@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "209", + "op_link": "webnav.navigate_to?corg=25918", + "operator": "[ TUZV141 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=59084", + "roomcode": "5302.01.102A", + "usage": 164 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67440", @@ -202597,18 +202979,18 @@ { "address": "Weihenstephaner Steig 22, EG", "address_link": "ris.einzelraum?raumkey=68856", - "alt_name": "EG05, Reinigungsmittelraum", + "alt_name": "EG05, B\u00fcro", "arch_name": "EG05@4109", "b_area_id": 43, "b_filter_id": 723, "calendar": null, "list_index": "21", - "op_link": "webnav.navigate_to?corg=26175", - "operator": "[ TUZVR84 ]", + "op_link": "webnav.navigate_to?corg=51258", + "operator": "[ TUS4000 ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=68856", "roomcode": "4109.EG.051", - "usage": 205 + "usage": 12 }, { "address": "Weihenstephaner Steig 20, 1.OG", @@ -203460,8 +203842,8 @@ { "address": "Staatsgut Thalhausen, EG", "address_link": "ris.einzelraum?raumkey=47366", - "alt_name": "10, Teek\u00fcche / Sozialraum", - "arch_name": "10@4602", + "alt_name": "ZE 06, Teek\u00fcche / Sozialraum", + "arch_name": "ZE 06@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -205152,9 +205534,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8317", - "alt_name": "1762A, B\u00fcro", - "arch_name": "1762A@0507", + "address_link": "ris.einzelraum?raumkey=8323", + "alt_name": "1763, B\u00fcro", + "arch_name": "1763@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -205162,8 +205544,8 @@ "op_link": "webnav.navigate_to?corg=15091", "operator": "[ TUBVLVW ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8317", - "roomcode": "0507.01.762A", + "room_link": "wbRaum.editRaum?pRaumNr=8323", + "roomcode": "0507.01.763", "usage": 12 }, { @@ -205518,6 +205900,22 @@ "roomcode": "5142.02.029E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=59085", + "alt_name": "1202B, Gesch\u00e4ft 3", + "arch_name": "1202B@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "210", + "op_link": "webnav.navigate_to?corg=25918", + "operator": "[ TUZV141 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=59085", + "roomcode": "5302.01.102B", + "usage": 164 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67441", @@ -205984,9 +206382,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41036", - "alt_name": "1762B, B\u00fcro", - "arch_name": "1762B@0507", + "address_link": "ris.einzelraum?raumkey=8325", + "alt_name": "1765, B\u00fcro", + "arch_name": "1765@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -205994,8 +206392,8 @@ "op_link": "webnav.navigate_to?corg=15091", "operator": "[ TUBVLVW ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41036", - "roomcode": "0507.01.762B", + "room_link": "wbRaum.editRaum?pRaumNr=8325", + "roomcode": "0507.01.765", "usage": 12 }, { @@ -206176,19 +206574,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=49809", - "alt_name": "O19, WC-Herren", - "arch_name": "O19@4213", + "address_link": "ris.einzelraum?raumkey=75322", + "alt_name": "O18.1, Startup GR", + "arch_name": "O18.1@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "211", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=51917", + "operator": "[ TUS4F4C ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=49809", - "roomcode": "4213.01.319", - "usage": 115 + "room_link": "wbRaum.editRaum?pRaumNr=75322", + "roomcode": "4213.01.318A", + "usage": 12 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -206350,6 +206748,22 @@ "roomcode": "5142.02.030E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=44776", + "alt_name": "1203, Cafeteria", + "arch_name": "1203@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "211", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=44776", + "roomcode": "5302.01.103", + "usage": 45 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67438", @@ -206816,9 +207230,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8323", - "alt_name": "1763, B\u00fcro", - "arch_name": "1763@0507", + "address_link": "ris.einzelraum?raumkey=41111", + "alt_name": "1766, B\u00fcro", + "arch_name": "1766@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -206826,8 +207240,8 @@ "op_link": "webnav.navigate_to?corg=15091", "operator": "[ TUBVLVW ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8323", - "roomcode": "0507.01.763", + "room_link": "wbRaum.editRaum?pRaumNr=41111", + "roomcode": "0507.01.766", "usage": 12 }, { @@ -207008,19 +207422,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=49945", - "alt_name": "O20, Installation", - "arch_name": "O20@4213", + "address_link": "ris.einzelraum?raumkey=75323", + "alt_name": "O18.2, Startup GR", + "arch_name": "O18.2@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "212", - "op_link": "webnav.navigate_to?corg=26175", - "operator": "[ TUZVR84 ]", + "op_link": "webnav.navigate_to?corg=51917", + "operator": "[ TUS4F4C ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=49945", - "roomcode": "4213.01.320", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=75323", + "roomcode": "4213.01.318B", + "usage": 12 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -207182,6 +207596,22 @@ "roomcode": "5142.02.031E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=44922", + "alt_name": "1218, B\u00fcro", + "arch_name": "1218@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "212", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=44922", + "roomcode": "5302.01.105", + "usage": 12 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67439", @@ -207708,18 +208138,18 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8325", - "alt_name": "1765, B\u00fcro", - "arch_name": "1765@0507", + "address_link": "ris.einzelraum?raumkey=41116", + "alt_name": "1767, B\u00fcro", + "arch_name": "1767@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "213", - "op_link": "webnav.navigate_to?corg=15091", - "operator": "[ TUBVLVW ]", + "op_link": "webnav.navigate_to?corg=15103", + "operator": "[ TULRLFK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8325", - "roomcode": "0507.01.765", + "room_link": "wbRaum.editRaum?pRaumNr=41116", + "roomcode": "0507.01.767", "usage": 12 }, { @@ -207900,19 +208330,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=28696", - "alt_name": "O21, L\u00f6sungsmittel- und Chemikalienlager", - "arch_name": "O21@4213", + "address_link": "ris.einzelraum?raumkey=75324", + "alt_name": "O18.3, Meeting Raum", + "arch_name": "O18.3@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": "tvKalender.wSicht?cOrg=46717&cRes=18149&cReadonly=J", + "calendar": null, "list_index": "213", - "op_link": "webnav.navigate_to?corg=46717", - "operator": "[ TUWZB1T ]", + "op_link": "webnav.navigate_to?corg=51917", + "operator": "[ TUS4F4C ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=28696", - "roomcode": "4213.01.321", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=75324", + "roomcode": "4213.01.318C", + "usage": 196 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -208104,6 +208534,22 @@ "roomcode": "5142.02.032E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=44933", + "alt_name": "1217, B\u00fcro", + "arch_name": "1217@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "213", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=44933", + "roomcode": "5302.01.106", + "usage": 12 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67446", @@ -208585,9 +209031,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41111", - "alt_name": "1766, B\u00fcro", - "arch_name": "1766@0507", + "address_link": "ris.einzelraum?raumkey=8347", + "alt_name": "1768, B\u00fcro", + "arch_name": "1768@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -208595,8 +209041,8 @@ "op_link": "webnav.navigate_to?corg=15091", "operator": "[ TUBVLVW ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41111", - "roomcode": "0507.01.766", + "room_link": "wbRaum.editRaum?pRaumNr=8347", + "roomcode": "0507.01.768", "usage": 12 }, { @@ -208777,19 +209223,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=27549", - "alt_name": "O22, Lager", - "arch_name": "O22@4213", + "address_link": "ris.einzelraum?raumkey=75312", + "alt_name": "O18.4, Meeting Raum", + "arch_name": "O18.4@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "214", - "op_link": "webnav.navigate_to?corg=46717", - "operator": "[ TUWZB1T ]", + "op_link": "webnav.navigate_to?corg=51917", + "operator": "[ TUS4F4C ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=27549", - "roomcode": "4213.01.322", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=75312", + "roomcode": "4213.01.318D", + "usage": 196 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -208966,6 +209412,22 @@ "roomcode": "5142.02.033E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=44943", + "alt_name": "1216, Ausgabe", + "arch_name": "1216@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "214", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=44943", + "roomcode": "5302.01.107", + "usage": 186 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67450", @@ -209432,9 +209894,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41116", - "alt_name": "1767, B\u00fcro", - "arch_name": "1767@0507", + "address_link": "ris.einzelraum?raumkey=8349", + "alt_name": "1769, B\u00fcro", + "arch_name": "1769@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -209442,8 +209904,8 @@ "op_link": "webnav.navigate_to?corg=15103", "operator": "[ TULRLFK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41116", - "roomcode": "0507.01.767", + "room_link": "wbRaum.editRaum?pRaumNr=8349", + "roomcode": "0507.01.769", "usage": 12 }, { @@ -209624,19 +210086,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=27560", - "alt_name": "O23, Lager (gem. Nutzung 1124302010;1110064600)", - "arch_name": "O23@4213", + "address_link": "ris.einzelraum?raumkey=49809", + "alt_name": "O19, WC-Herren", + "arch_name": "O19@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "215", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=27560", - "roomcode": "4213.01.323", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=49809", + "roomcode": "4213.01.319", + "usage": 115 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -209798,6 +210260,22 @@ "roomcode": "5142.02.034E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=44954", + "alt_name": "1215, Mensak\u00fcche", + "arch_name": "1215@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "215", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=44954", + "roomcode": "5302.01.108", + "usage": 28 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67451", @@ -210279,19 +210757,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8347", - "alt_name": "1768, B\u00fcro", - "arch_name": "1768@0507", + "address_link": "ris.einzelraum?raumkey=41130", + "alt_name": "1770, Aufenthalt", + "arch_name": "1770@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "216", - "op_link": "webnav.navigate_to?corg=15091", - "operator": "[ TUBVLVW ]", + "op_link": "webnav.navigate_to?corg=15105", + "operator": "[ TULRFPF ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8347", - "roomcode": "0507.01.768", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=41130", + "roomcode": "0507.01.770", + "usage": 44 }, { "address": "Arcisstr. 21, 1.ZG", @@ -210455,19 +210933,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=27568", - "alt_name": "O24, Druckerraum (gem. Nutzung 1124302010;11100646", - "arch_name": "O24@4213", + "address_link": "ris.einzelraum?raumkey=49945", + "alt_name": "O20, Installation", + "arch_name": "O20@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "216", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=26175", + "operator": "[ TUZVR84 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=27568", - "roomcode": "4213.01.324", - "usage": 110 + "room_link": "wbRaum.editRaum?pRaumNr=49945", + "roomcode": "4213.01.320", + "usage": 120 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -210597,6 +211075,22 @@ "roomcode": "5142.02.035E", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=44962", + "alt_name": "1211, Sp\u00fclk\u00fcche", + "arch_name": "1211@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "216", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=44962", + "roomcode": "5302.01.109", + "usage": 28 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67445", @@ -211063,9 +211557,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8349", - "alt_name": "1769, B\u00fcro", - "arch_name": "1769@0507", + "address_link": "ris.einzelraum?raumkey=8352", + "alt_name": "1771, B\u00fcro", + "arch_name": "1771@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -211073,8 +211567,8 @@ "op_link": "webnav.navigate_to?corg=15103", "operator": "[ TULRLFK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8349", - "roomcode": "0507.01.769", + "room_link": "wbRaum.editRaum?pRaumNr=8352", + "roomcode": "0507.01.771", "usage": 12 }, { @@ -211239,19 +211733,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=31848", - "alt_name": "O25, W\u00e4geraum (gem. Nutzung 1124302010)", - "arch_name": "O25@4213", + "address_link": "ris.einzelraum?raumkey=28696", + "alt_name": "O21, L\u00f6sungsmittel- und Chemikalienlager", + "arch_name": "O21@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=46717&cRes=18149&cReadonly=J", "list_index": "217", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=46717", + "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=31848", - "roomcode": "4213.01.325", - "usage": 103 + "room_link": "wbRaum.editRaum?pRaumNr=28696", + "roomcode": "4213.01.321", + "usage": 30 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -211381,6 +211875,22 @@ "roomcode": "5142.02.051E", "usage": 223 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45111", + "alt_name": "1214, K\u00fchlraum", + "arch_name": "1214@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "217", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45111", + "roomcode": "5302.01.110", + "usage": 199 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67448", @@ -211847,9 +212357,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41130", - "alt_name": "1770, Aufenthalt", - "arch_name": "1770@0507", + "address_link": "ris.einzelraum?raumkey=8353", + "alt_name": "1772, B\u00fcro", + "arch_name": "1772@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -211857,9 +212367,9 @@ "op_link": "webnav.navigate_to?corg=15105", "operator": "[ TULRFPF ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41130", - "roomcode": "0507.01.770", - "usage": 44 + "room_link": "wbRaum.editRaum?pRaumNr=8353", + "roomcode": "0507.01.772", + "usage": 12 }, { "address": "Arcisstr. 21, 1.ZG", @@ -212023,19 +212533,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=50904", - "alt_name": "O26, Installation", - "arch_name": "O26@4213", + "address_link": "ris.einzelraum?raumkey=27549", + "alt_name": "O22, Lager", + "arch_name": "O22@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "218", - "op_link": "webnav.navigate_to?corg=26175", - "operator": "[ TUZVR84 ]", + "op_link": "webnav.navigate_to?corg=46717", + "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=50904", - "roomcode": "4213.01.326", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=27549", + "roomcode": "4213.01.322", + "usage": 30 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -212165,6 +212675,22 @@ "roomcode": "5142.02.052E", "usage": 223 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45128", + "alt_name": "1210, Lager", + "arch_name": "1210@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "218", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45128", + "roomcode": "5302.01.111", + "usage": 30 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67447", @@ -212646,9 +213172,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8352", - "alt_name": "1771, B\u00fcro", - "arch_name": "1771@0507", + "address_link": "ris.einzelraum?raumkey=8357", + "alt_name": "1773, B\u00fcro", + "arch_name": "1773@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -212656,8 +213182,8 @@ "op_link": "webnav.navigate_to?corg=15103", "operator": "[ TULRLFK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8352", - "roomcode": "0507.01.771", + "room_link": "wbRaum.editRaum?pRaumNr=8357", + "roomcode": "0507.01.773", "usage": 12 }, { @@ -212822,19 +213348,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=50923", - "alt_name": "O27, WC-Herren", - "arch_name": "O27@4213", + "address_link": "ris.einzelraum?raumkey=27560", + "alt_name": "O23, Lager (gem. Nutzung 1124302010;1110064600)", + "arch_name": "O23@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "219", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=46717", + "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=50923", - "roomcode": "4213.01.327", - "usage": 115 + "room_link": "wbRaum.editRaum?pRaumNr=27560", + "roomcode": "4213.01.323", + "usage": 30 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -212964,6 +213490,22 @@ "roomcode": "5142.02.060E", "usage": 204 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45133", + "alt_name": "1212, Install.Schacht", + "arch_name": "1212@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "219", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45133", + "roomcode": "5302.01.112", + "usage": 120 + }, { "address": "Boltzmannstr. 19, 2.OG", "address_link": "ris.einzelraum?raumkey=67444", @@ -215491,8 +216033,8 @@ { "address": "Staatsgut Thalhausen, EG", "address_link": "ris.einzelraum?raumkey=47449", - "alt_name": "3, Besprechungsraum", - "arch_name": "3@4602", + "alt_name": "ZE 07, Besprechungs- Seminarraum", + "arch_name": "ZE 07@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -217166,9 +217708,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8353", - "alt_name": "1772, B\u00fcro", - "arch_name": "1772@0507", + "address_link": "ris.einzelraum?raumkey=8363", + "alt_name": "1774, B\u00fcro", + "arch_name": "1774@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -217176,8 +217718,8 @@ "op_link": "webnav.navigate_to?corg=15105", "operator": "[ TULRFPF ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8353", - "roomcode": "0507.01.772", + "room_link": "wbRaum.editRaum?pRaumNr=8363", + "roomcode": "0507.01.774", "usage": 12 }, { @@ -217342,19 +217884,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=50938", - "alt_name": "O28, Installation", - "arch_name": "O28@4213", + "address_link": "ris.einzelraum?raumkey=27568", + "alt_name": "O24, Druckerraum (gem. Nutzung 1124302010;11100646", + "arch_name": "O24@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "220", - "op_link": "webnav.navigate_to?corg=26175", - "operator": "[ TUZVR84 ]", + "op_link": "webnav.navigate_to?corg=46717", + "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=50938", - "roomcode": "4213.01.328", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=27568", + "roomcode": "4213.01.324", + "usage": 110 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -217484,6 +218026,22 @@ "roomcode": "5142.02.085E", "usage": 195 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45283", + "alt_name": "1207, WC-Damen", + "arch_name": "1207@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "220", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45283", + "roomcode": "5302.01.113", + "usage": 116 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=52997", @@ -217964,9 +218522,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8357", - "alt_name": "1773, B\u00fcro", - "arch_name": "1773@0507", + "address_link": "ris.einzelraum?raumkey=8365", + "alt_name": "1775, B\u00fcro", + "arch_name": "1775@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -217974,8 +218532,8 @@ "op_link": "webnav.navigate_to?corg=15103", "operator": "[ TULRLFK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8357", - "roomcode": "0507.01.773", + "room_link": "wbRaum.editRaum?pRaumNr=8365", + "roomcode": "0507.01.775", "usage": 12 }, { @@ -218140,9 +218698,9 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=16593", - "alt_name": "O29, Lager", - "arch_name": "O29@4213", + "address_link": "ris.einzelraum?raumkey=31848", + "alt_name": "O25, W\u00e4geraum (gem. Nutzung 1124302010)", + "arch_name": "O25@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, @@ -218150,9 +218708,9 @@ "op_link": "webnav.navigate_to?corg=51258", "operator": "[ TUS4000 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=16593", - "roomcode": "4213.01.329", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=31848", + "roomcode": "4213.01.325", + "usage": 103 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -218282,6 +218840,22 @@ "roomcode": "5142.Z3.001F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45297", + "alt_name": "1221, Install.Schacht", + "arch_name": "1221@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "221", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45297", + "roomcode": "5302.01.114", + "usage": 120 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=53015", @@ -218746,9 +219320,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8363", - "alt_name": "1774, B\u00fcro", - "arch_name": "1774@0507", + "address_link": "ris.einzelraum?raumkey=8366", + "alt_name": "1776, B\u00fcro", + "arch_name": "1776@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -218756,8 +219330,8 @@ "op_link": "webnav.navigate_to?corg=15105", "operator": "[ TULRFPF ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8363", - "roomcode": "0507.01.774", + "room_link": "wbRaum.editRaum?pRaumNr=8366", + "roomcode": "0507.01.776", "usage": 12 }, { @@ -218922,9 +219496,9 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=51088", - "alt_name": "O30, Installation", - "arch_name": "O30@4213", + "address_link": "ris.einzelraum?raumkey=50904", + "alt_name": "O26, Installation", + "arch_name": "O26@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, @@ -218932,8 +219506,8 @@ "op_link": "webnav.navigate_to?corg=26175", "operator": "[ TUZVR84 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=51088", - "roomcode": "4213.01.330", + "room_link": "wbRaum.editRaum?pRaumNr=50904", + "roomcode": "4213.01.326", "usage": 120 }, { @@ -219064,6 +219638,22 @@ "roomcode": "5142.Z3.002F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45308", + "alt_name": "1206, WC-Herren", + "arch_name": "1206@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "222", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45308", + "roomcode": "5302.01.115", + "usage": 115 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=53024", @@ -219513,9 +220103,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8365", - "alt_name": "1775, B\u00fcro", - "arch_name": "1775@0507", + "address_link": "ris.einzelraum?raumkey=8369", + "alt_name": "1777, B\u00fcro", + "arch_name": "1777@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -219523,8 +220113,8 @@ "op_link": "webnav.navigate_to?corg=15103", "operator": "[ TULRLFK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8365", - "roomcode": "0507.01.775", + "room_link": "wbRaum.editRaum?pRaumNr=8369", + "roomcode": "0507.01.777", "usage": 12 }, { @@ -219689,9 +220279,9 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=51103", - "alt_name": "O31, WC-Damen", - "arch_name": "O31@4213", + "address_link": "ris.einzelraum?raumkey=50923", + "alt_name": "O27, WC-Herren", + "arch_name": "O27@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, @@ -219699,9 +220289,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=51103", - "roomcode": "4213.01.331", - "usage": 116 + "room_link": "wbRaum.editRaum?pRaumNr=50923", + "roomcode": "4213.01.327", + "usage": 115 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -219831,6 +220421,22 @@ "roomcode": "5142.Z3.003F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45318", + "alt_name": "1204, Beh.-WC / Wickeltisch", + "arch_name": "1204@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "223", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45318", + "roomcode": "5302.01.115A", + "usage": 117 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=17701", @@ -220265,19 +220871,34 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8366", - "alt_name": "1776, B\u00fcro", - "arch_name": "1776@0507", + "address_link": "ris.einzelraum?raumkey=41331", + "alt_name": "1778, \u00dcbung", + "arch_name": "1778@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=15104&cRes=18628&cReadonly=J", + "extended": { + "additional_description": "1778, \u00dcbung", + "address": "Arcisstr. 21(0507), 1.Obergescho\u00df", + "architect_room_nr": "1778@0507", + "area_m2": 60.77, + "building": "0507 (Z7) Bestelmeyer Nord", + "floor_number": "1.Obergescho\u00df", + "floor_type": "Linoleum", + "purpose": "\u00dcbungsraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", + "room_number": "778", + "seats": 6, + "standing_places": 0, + "wheelchair_spaces": 0, + "zip_code_location": "80333 M\u00fcnchen" + }, "list_index": "224", - "op_link": "webnav.navigate_to?corg=15105", - "operator": "[ TULRFPF ]", + "op_link": "webnav.navigate_to?corg=15104", + "operator": "[ TULRLMF ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8366", - "roomcode": "0507.01.776", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=41331", + "roomcode": "0507.01.778", + "usage": 131 }, { "address": "Arcisstr. 21, 1.ZG", @@ -220425,9 +221046,9 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=48621", - "alt_name": "O32, Reinigungsmittelraum", - "arch_name": "O32@4213", + "address_link": "ris.einzelraum?raumkey=50938", + "alt_name": "O28, Technik 2", + "arch_name": "O28@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, @@ -220435,9 +221056,9 @@ "op_link": "webnav.navigate_to?corg=26175", "operator": "[ TUZVR84 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=48621", - "roomcode": "4213.01.332", - "usage": 205 + "room_link": "wbRaum.editRaum?pRaumNr=50938", + "roomcode": "4213.01.328", + "usage": 120 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -220567,6 +221188,22 @@ "roomcode": "5142.Z3.004F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45466", + "alt_name": "1208, Putzraum", + "arch_name": "1208@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "224", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45466", + "roomcode": "5302.01.116", + "usage": 205 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=53180", @@ -221000,9 +221637,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8369", - "alt_name": "1777, B\u00fcro", - "arch_name": "1777@0507", + "address_link": "ris.einzelraum?raumkey=8377", + "alt_name": "1779, B\u00fcro", + "arch_name": "1779@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -221010,8 +221647,8 @@ "op_link": "webnav.navigate_to?corg=15103", "operator": "[ TULRLFK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8369", - "roomcode": "0507.01.777", + "room_link": "wbRaum.editRaum?pRaumNr=8377", + "roomcode": "0507.01.779", "usage": 12 }, { @@ -221175,19 +221812,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=27880", - "alt_name": "O33, W\u00e4gerraum", - "arch_name": "O33@4213", + "address_link": "ris.einzelraum?raumkey=16593", + "alt_name": "O29, K\u00fchlkammer f. Schanktechnik", + "arch_name": "O29@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": "tvKalender.wSicht?cOrg=46717&cRes=18158&cReadonly=J", + "calendar": null, "list_index": "225", - "op_link": "webnav.navigate_to?corg=46717", - "operator": "[ TUWZB1T ]", + "op_link": "webnav.navigate_to?corg=51917", + "operator": "[ TUS4F4C ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=27880", - "roomcode": "4213.01.333", - "usage": 103 + "room_link": "wbRaum.editRaum?pRaumNr=16593", + "roomcode": "4213.01.329", + "usage": 199 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -221317,6 +221954,22 @@ "roomcode": "5142.Z3.005F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45480", + "alt_name": "1209, Installation", + "arch_name": "1209@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "225", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45480", + "roomcode": "5302.01.117", + "usage": 120 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=53189", @@ -221735,34 +222388,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41331", - "alt_name": "1778, \u00dcbung", - "arch_name": "1778@0507", + "address_link": "ris.einzelraum?raumkey=41341", + "alt_name": "1779G, Galerie", + "arch_name": "1779G@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=15104&cRes=18628&cReadonly=J", - "extended": { - "additional_description": "1778, \u00dcbung", - "address": "Arcisstr. 21(0507), 1.Obergescho\u00df", - "architect_room_nr": "1778@0507", - "area_m2": 63.03, - "building": "0507 (Z7) Bestelmeyer Nord", - "floor_number": "1.Obergescho\u00df", - "floor_type": "Linoleum", - "purpose": "\u00dcbungsraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", - "room_number": "778", - "seats": 6, - "standing_places": 0, - "wheelchair_spaces": 0, - "zip_code_location": "80333 M\u00fcnchen" - }, + "calendar": null, "list_index": "226", - "op_link": "webnav.navigate_to?corg=15104", - "operator": "[ TULRLMF ]", + "op_link": "webnav.navigate_to?corg=15103", + "operator": "[ TULRLFK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41331", - "roomcode": "0507.01.778", - "usage": 131 + "room_link": "wbRaum.editRaum?pRaumNr=41341", + "roomcode": "0507.01.779G", + "usage": 206 }, { "address": "Arcisstr. 21, 1.ZG", @@ -221837,8 +222475,8 @@ "b_filter_id": 1485, "calendar": null, "list_index": "226", - "op_link": "webnav.navigate_to?corg=15383", - "operator": "[ TUEDS15 ]", + "op_link": "webnav.navigate_to?corg=49437", + "operator": "[ TUEDS30 ]", "plz_place": "80335 M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=64052", "roomcode": "2907.04.429", @@ -221910,9 +222548,9 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=48653", - "alt_name": "O34, Installation", - "arch_name": "O34@4213", + "address_link": "ris.einzelraum?raumkey=51088", + "alt_name": "O30, Installation", + "arch_name": "O30@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, @@ -221920,8 +222558,8 @@ "op_link": "webnav.navigate_to?corg=26175", "operator": "[ TUZVR84 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=48653", - "roomcode": "4213.01.334", + "room_link": "wbRaum.editRaum?pRaumNr=51088", + "roomcode": "4213.01.330", "usage": 120 }, { @@ -222036,6 +222674,22 @@ "roomcode": "5142.Z3.006F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45491", + "alt_name": "1213, M\u00fcll", + "arch_name": "1213@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "226", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45491", + "roomcode": "5302.01.118", + "usage": 214 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=53342", @@ -222454,18 +223108,18 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8377", - "alt_name": "1779, B\u00fcro", - "arch_name": "1779@0507", + "address_link": "ris.einzelraum?raumkey=8379", + "alt_name": "1780, B\u00fcro", + "arch_name": "1780@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "227", - "op_link": "webnav.navigate_to?corg=15103", - "operator": "[ TULRLFK ]", + "op_link": "webnav.navigate_to?corg=15104", + "operator": "[ TULRLMF ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8377", - "roomcode": "0507.01.779", + "room_link": "wbRaum.editRaum?pRaumNr=8379", + "roomcode": "0507.01.780", "usage": 12 }, { @@ -222541,8 +223195,8 @@ "b_filter_id": 1485, "calendar": null, "list_index": "227", - "op_link": "webnav.navigate_to?corg=15383", - "operator": "[ TUEDS15 ]", + "op_link": "webnav.navigate_to?corg=49437", + "operator": "[ TUEDS30 ]", "plz_place": "80335 M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=64053", "roomcode": "2907.04.430", @@ -222614,9 +223268,9 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=48789", - "alt_name": "O35, WC-Damen", - "arch_name": "O35@4213", + "address_link": "ris.einzelraum?raumkey=51103", + "alt_name": "O31, WC-Damen", + "arch_name": "O31@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, @@ -222624,8 +223278,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=48789", - "roomcode": "4213.01.335", + "room_link": "wbRaum.editRaum?pRaumNr=51103", + "roomcode": "4213.01.331", "usage": 116 }, { @@ -222740,6 +223394,22 @@ "roomcode": "5142.Z3.007F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45500", + "alt_name": "1219, Windfang", + "arch_name": "1219@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "227", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45500", + "roomcode": "5302.01.119A", + "usage": 52 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=53351", @@ -223188,19 +223858,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41341", - "alt_name": "1779G, Galerie", - "arch_name": "1779G@0507", + "address_link": "ris.einzelraum?raumkey=8380", + "alt_name": "1781, B\u00fcro", + "arch_name": "1781@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "228", - "op_link": "webnav.navigate_to?corg=15103", - "operator": "[ TULRLFK ]", + "op_link": "webnav.navigate_to?corg=15105", + "operator": "[ TULRFPF ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41341", - "roomcode": "0507.01.779G", - "usage": 206 + "room_link": "wbRaum.editRaum?pRaumNr=8380", + "roomcode": "0507.01.781", + "usage": 12 }, { "address": "Arcisstr. 21, 1.ZG", @@ -223348,19 +224018,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=48803", - "alt_name": "O36, Dokumentenarchiv / Aktenlagerraum", - "arch_name": "O36@4213", + "address_link": "ris.einzelraum?raumkey=48621", + "alt_name": "O32, Reinigungsmittelraum", + "arch_name": "O32@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "228", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=26175", + "operator": "[ TUZVR84 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=48803", - "roomcode": "4213.01.336", - "usage": 2 + "room_link": "wbRaum.editRaum?pRaumNr=48621", + "roomcode": "4213.01.332", + "usage": 205 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -223474,6 +224144,22 @@ "roomcode": "5142.Z3.008F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45653", + "alt_name": "1220, Windfang", + "arch_name": "1220@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "228", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45653", + "roomcode": "5302.01.119B", + "usage": 52 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=10238", @@ -223891,9 +224577,9 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8379", - "alt_name": "1780, B\u00fcro", - "arch_name": "1780@0507", + "address_link": "ris.einzelraum?raumkey=41414", + "alt_name": "1782, B\u00fcro", + "arch_name": "1782@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -223901,8 +224587,8 @@ "op_link": "webnav.navigate_to?corg=15104", "operator": "[ TULRLMF ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8379", - "roomcode": "0507.01.780", + "room_link": "wbRaum.editRaum?pRaumNr=41414", + "roomcode": "0507.01.782", "usage": 12 }, { @@ -223978,8 +224664,8 @@ "b_filter_id": 1485, "calendar": null, "list_index": "229", - "op_link": "webnav.navigate_to?corg=15383", - "operator": "[ TUEDS15 ]", + "op_link": "webnav.navigate_to?corg=49437", + "operator": "[ TUEDS30 ]", "plz_place": "80335 M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=64055", "roomcode": "2907.04.432", @@ -224051,19 +224737,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=48817", - "alt_name": "O37, Ruheraum", - "arch_name": "O37@4213", + "address_link": "ris.einzelraum?raumkey=27880", + "alt_name": "O33, W\u00e4gerraum", + "arch_name": "O33@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=46717&cRes=18158&cReadonly=J", "list_index": "229", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=46717", + "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=48817", - "roomcode": "4213.01.337", - "usage": 178 + "room_link": "wbRaum.editRaum?pRaumNr=27880", + "roomcode": "4213.01.333", + "usage": 103 }, { "address": "Emil-Ramann-Str. 2, 2.OG", @@ -224177,6 +224863,22 @@ "roomcode": "5142.Z3.009F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45681", + "alt_name": "1258, Aufzugschacht", + "arch_name": "1258@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "229", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45681", + "roomcode": "5302.01.121", + "usage": 195 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=10246", @@ -226732,8 +227434,8 @@ { "address": "Staatsgut Thalhausen, EG", "address_link": "ris.einzelraum?raumkey=47466", - "alt_name": "11, Reinigungsmittelraum", - "arch_name": "11@4602", + "alt_name": "ZE 08, Reinigungsmittelraum", + "arch_name": "ZE 08@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -228328,19 +229030,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8380", - "alt_name": "1781, B\u00fcro", - "arch_name": "1781@0507", + "address_link": "ris.einzelraum?raumkey=41418", + "alt_name": "1782A, Lager", + "arch_name": "1782A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "230", - "op_link": "webnav.navigate_to?corg=15105", - "operator": "[ TULRFPF ]", + "op_link": "webnav.navigate_to?corg=15104", + "operator": "[ TULRLMF ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8380", - "roomcode": "0507.01.781", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=41418", + "roomcode": "0507.01.782A", + "usage": 30 }, { "address": "Arcisstr. 21, 1.OG", @@ -228488,9 +229190,9 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=48957", - "alt_name": "O38, Installation", - "arch_name": "O38@4213", + "address_link": "ris.einzelraum?raumkey=48653", + "alt_name": "O34, Installation", + "arch_name": "O34@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, @@ -228498,8 +229200,8 @@ "op_link": "webnav.navigate_to?corg=26175", "operator": "[ TUZVR84 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=48957", - "roomcode": "4213.01.338", + "room_link": "wbRaum.editRaum?pRaumNr=48653", + "roomcode": "4213.01.334", "usage": 120 }, { @@ -228614,6 +229316,22 @@ "roomcode": "5142.Z3.010F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45690", + "alt_name": "1222, Aufzugschacht", + "arch_name": "1222@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "230", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45690", + "roomcode": "5302.01.122", + "usage": 195 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=22854", @@ -229016,18 +229734,18 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41414", - "alt_name": "1782, B\u00fcro", - "arch_name": "1782@0507", + "address_link": "ris.einzelraum?raumkey=8382", + "alt_name": "1783, B\u00fcro", + "arch_name": "1783@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=15105&cRes=12599&cReadonly=J", "list_index": "231", - "op_link": "webnav.navigate_to?corg=15104", - "operator": "[ TULRLMF ]", + "op_link": "webnav.navigate_to?corg=15105", + "operator": "[ TULRFPF ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41414", - "roomcode": "0507.01.782", + "room_link": "wbRaum.editRaum?pRaumNr=8382", + "roomcode": "0507.01.783", "usage": 12 }, { @@ -229176,19 +229894,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=17115", - "alt_name": "O39, Labor", - "arch_name": "O39@4213", + "address_link": "ris.einzelraum?raumkey=48789", + "alt_name": "O35, WC-Damen", + "arch_name": "O35@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": "tvKalender.wSicht?cOrg=46717&cRes=18165&cReadonly=J", + "calendar": null, "list_index": "231", - "op_link": "webnav.navigate_to?corg=46717", - "operator": "[ TUWZB1T ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=17115", - "roomcode": "4213.01.339", - "usage": 102 + "room_link": "wbRaum.editRaum?pRaumNr=48789", + "roomcode": "4213.01.335", + "usage": 116 }, { "address": "Emil-Ramann-Str. 2, 3.OG", @@ -229302,6 +230020,22 @@ "roomcode": "5142.Z3.011F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45841", + "alt_name": "1225, Leseraum", + "arch_name": "1225@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "231", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45841", + "roomcode": "5302.01.123", + "usage": 150 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=10306", @@ -229704,19 +230438,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41418", - "alt_name": "1782A, Lager", - "arch_name": "1782A@0507", + "address_link": "ris.einzelraum?raumkey=41423", + "alt_name": "1784, LRZ-Verteilerknoten", + "arch_name": "1784@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "232", - "op_link": "webnav.navigate_to?corg=15104", - "operator": "[ TULRLMF ]", + "op_link": "webnav.navigate_to?corg=39906", + "operator": "[ TUPELRZ ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41418", - "roomcode": "0507.01.782A", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=41423", + "roomcode": "0507.01.784", + "usage": 120 }, { "address": "Arcisstr. 21, 1.OG", @@ -229848,19 +230582,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=15685", - "alt_name": "O40, Labor", - "arch_name": "O40@4213", + "address_link": "ris.einzelraum?raumkey=48803", + "alt_name": "O36, Dokumentenarchiv / Aktenlagerraum", + "arch_name": "O36@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": "tvKalender.wSicht?cOrg=46717&cRes=18162&cReadonly=J", + "calendar": null, "list_index": "232", - "op_link": "webnav.navigate_to?corg=46717", - "operator": "[ TUWZB1T ]", + "op_link": "webnav.navigate_to?corg=51258", + "operator": "[ TUS4000 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=15685", - "roomcode": "4213.01.340", - "usage": 102 + "room_link": "wbRaum.editRaum?pRaumNr=48803", + "roomcode": "4213.01.336", + "usage": 2 }, { "address": "Emil-Ramann-Str. 2, 3.OG", @@ -229974,6 +230708,22 @@ "roomcode": "5142.Z3.012F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45846", + "alt_name": "1259, Install.Schacht", + "arch_name": "1259@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "232", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45846", + "roomcode": "5302.01.124", + "usage": 120 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=10310", @@ -230376,19 +231126,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=63047", - "alt_name": "1782G, Lager", - "arch_name": "1782G@0507", + "address_link": "ris.einzelraum?raumkey=72828", + "alt_name": "1784A, Installationsraum", + "arch_name": "1784A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "233", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63047", - "roomcode": "0507.01.782G", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=72828", + "roomcode": "0507.01.784A", + "usage": 120 }, { "address": "Arcisstr. 21, 1.OG", @@ -230520,19 +231270,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=28298", - "alt_name": "O41, Labor (gem. Nutzung 1124302010; 1110064600)", - "arch_name": "O41@4213", + "address_link": "ris.einzelraum?raumkey=48817", + "alt_name": "O37, Ruheraum", + "arch_name": "O37@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": "tvKalender.wSicht?cOrg=51258&cRes=18164&cReadonly=J", + "calendar": null, "list_index": "233", "op_link": "webnav.navigate_to?corg=51258", "operator": "[ TUS4000 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=28298", - "roomcode": "4213.01.341", - "usage": 102 + "room_link": "wbRaum.editRaum?pRaumNr=48817", + "roomcode": "4213.01.337", + "usage": 178 }, { "address": "Emil-Ramann-Str. 2, 3.OG", @@ -230646,6 +231396,22 @@ "roomcode": "5142.Z3.013F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45859", + "alt_name": "1260, Install.Schacht", + "arch_name": "1260@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "233", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45859", + "roomcode": "5302.01.125", + "usage": 120 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=53548", @@ -231048,19 +231814,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8382", - "alt_name": "1783, B\u00fcro", - "arch_name": "1783@0507", + "address_link": "ris.einzelraum?raumkey=41427", + "alt_name": "1787, Bibliothek", + "arch_name": "1787@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=15105&cRes=12599&cReadonly=J", + "calendar": "tvKalender.wSicht?cOrg=15105&cRes=18942&cReadonly=J", "list_index": "234", "op_link": "webnav.navigate_to?corg=15105", "operator": "[ TULRFPF ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8382", - "roomcode": "0507.01.783", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=41427", + "roomcode": "0507.01.787", + "usage": 10 }, { "address": "Arcisstr. 21, 1.OG", @@ -231192,19 +231958,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=28303", - "alt_name": "O42, Labor (gem. Nutzung 1124302010;1110064600)", - "arch_name": "O42@4213", + "address_link": "ris.einzelraum?raumkey=48957", + "alt_name": "O38, Installation", + "arch_name": "O38@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": "tvKalender.wSicht?cOrg=51258&cRes=18153&cReadonly=J", + "calendar": null, "list_index": "234", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=26175", + "operator": "[ TUZVR84 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=28303", - "roomcode": "4213.01.342", - "usage": 102 + "room_link": "wbRaum.editRaum?pRaumNr=48957", + "roomcode": "4213.01.338", + "usage": 120 }, { "address": "Emil-Ramann-Str. 2, 3.OG", @@ -231318,6 +232084,22 @@ "roomcode": "5142.Z3.014F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=45869", + "alt_name": "1257, Treppe", + "arch_name": "1257@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "234", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=45869", + "roomcode": "5302.01.126", + "usage": 223 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=10317", @@ -231735,19 +232517,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41423", - "alt_name": "1784, LRZ-Verteilerknoten", - "arch_name": "1784@0507", + "address_link": "ris.einzelraum?raumkey=8327", + "alt_name": "1789, B\u00fcro", + "arch_name": "1789@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "235", - "op_link": "webnav.navigate_to?corg=39906", - "operator": "[ TUPELRZ ]", + "op_link": "webnav.navigate_to?corg=47297", + "operator": "[ TULRSIG ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41423", - "roomcode": "0507.01.784", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=8327", + "roomcode": "0507.01.789", + "usage": 12 }, { "address": "Arcisstr. 21, 1.OG", @@ -231879,19 +232661,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=28385", - "alt_name": "O43, B\u00fcro (CTA; gem. Nutzung 1110064600;1124302010", - "arch_name": "O43@4213", + "address_link": "ris.einzelraum?raumkey=17115", + "alt_name": "O39, Labor", + "arch_name": "O39@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=46717&cRes=18165&cReadonly=J", "list_index": "235", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=46717", + "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=28385", - "roomcode": "4213.01.343", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=17115", + "roomcode": "4213.01.339", + "usage": 102 }, { "address": "Emil-Ramann-Str. 2, 3.OG", @@ -232005,6 +232787,22 @@ "roomcode": "5142.Z3.015F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=46016", + "alt_name": "1224A, Lesepl\u00e4tze", + "arch_name": "1224A@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "235", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=46016", + "roomcode": "5302.01.127", + "usage": 150 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=53691", @@ -232422,19 +233220,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=72828", - "alt_name": "1784A, Installationsraum", - "arch_name": "1784A@0507", + "address_link": "ris.einzelraum?raumkey=41433", + "alt_name": "1795, Flur", + "arch_name": "1795@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "236", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=72828", - "roomcode": "0507.01.784A", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=41433", + "roomcode": "0507.01.795", + "usage": 222 }, { "address": "Arcisstr. 21, 1.OG", @@ -232566,19 +233364,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=12903", - "alt_name": "O44, B\u00fcro", - "arch_name": "O44@4213", + "address_link": "ris.einzelraum?raumkey=15685", + "alt_name": "O40, Labor", + "arch_name": "O40@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=46717&cRes=18162&cReadonly=J", "list_index": "236", "op_link": "webnav.navigate_to?corg=46717", "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=12903", - "roomcode": "4213.01.344", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=15685", + "roomcode": "4213.01.340", + "usage": 102 }, { "address": "Emil-Ramann-Str. 2, 3.OG", @@ -232692,6 +233490,22 @@ "roomcode": "5142.Z3.016F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=46021", + "alt_name": "1224B, Lesepl\u00e4tze", + "arch_name": "1224B@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "236", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=46021", + "roomcode": "5302.01.128", + "usage": 150 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=53702", @@ -233094,19 +233908,19 @@ }, { "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41427", - "alt_name": "1787, Bibliothek", - "arch_name": "1787@0507", + "address_link": "ris.einzelraum?raumkey=41482", + "alt_name": "1795A, Fluchtbalkon", + "arch_name": "1795A@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=15105&cRes=18942&cReadonly=J", + "calendar": null, "list_index": "237", - "op_link": "webnav.navigate_to?corg=15105", - "operator": "[ TULRFPF ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41427", - "roomcode": "0507.01.787", - "usage": 10 + "room_link": "wbRaum.editRaum?pRaumNr=41482", + "roomcode": "0507.01.795A", + "usage": 219 }, { "address": "Arcisstr. 21, 1.OG", @@ -233238,19 +234052,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=12908", - "alt_name": "O45, B\u00fcro", - "arch_name": "O45@4213", + "address_link": "ris.einzelraum?raumkey=28298", + "alt_name": "O41, Labor (gem. Nutzung 1124302010; 1110064600)", + "arch_name": "O41@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=51258&cRes=18164&cReadonly=J", "list_index": "237", "op_link": "webnav.navigate_to?corg=46717", "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=12908", - "roomcode": "4213.01.345", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=28298", + "roomcode": "4213.01.341", + "usage": 102 }, { "address": "Gregor-Mendel-Str. 2, 1.OG", @@ -233348,6 +234162,22 @@ "roomcode": "5142.Z3.017F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=46214", + "alt_name": "1250, Terrasse", + "arch_name": "1250@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "237", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=46214", + "roomcode": "5302.01.134", + "usage": 218 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=53717", @@ -233749,20 +234579,20 @@ "usage": 12 }, { - "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=8327", - "alt_name": "1789, B\u00fcro", - "arch_name": "1789@0507", + "address": "Arcisstr. 21, 2.OG", + "address_link": "ris.einzelraum?raumkey=41487", + "alt_name": "2700, Treppenhaus", + "arch_name": "2700@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "238", - "op_link": "webnav.navigate_to?corg=47297", - "operator": "[ TULRSIG ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8327", - "roomcode": "0507.01.789", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=41487", + "roomcode": "0507.02.700", + "usage": 223 }, { "address": "Arcisstr. 21, 1.OG", @@ -233894,19 +234724,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=28407", - "alt_name": "O46, B\u00fcro (Studentenraum; gem. Nutzung 1110064600;", - "arch_name": "O46@4213", + "address_link": "ris.einzelraum?raumkey=28303", + "alt_name": "O42, Labor (gem. Nutzung 1124302010;1110064600)", + "arch_name": "O42@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": "tvKalender.wSicht?cOrg=46717&cRes=18176&cReadonly=J", + "calendar": "tvKalender.wSicht?cOrg=51258&cRes=18153&cReadonly=J", "list_index": "238", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=46717", + "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=28407", - "roomcode": "4213.01.346", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=28303", + "roomcode": "4213.01.342", + "usage": 102 }, { "address": "Gregor-Mendel-Str. 2, 1.OG", @@ -234004,6 +234834,22 @@ "roomcode": "5142.Z3.018F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=59786", + "alt_name": "1261, Treppe", + "arch_name": "1261@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "238", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=59786", + "roomcode": "5302.01.160", + "usage": 223 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=73768", @@ -234405,10 +235251,10 @@ "usage": 12 }, { - "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41433", - "alt_name": "1795, Flur", - "arch_name": "1795@0507", + "address": "Arcisstr. 21, 2.OG", + "address_link": "ris.einzelraum?raumkey=63048", + "alt_name": "2701A, Treppe", + "arch_name": "2701A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -234416,9 +235262,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41433", - "roomcode": "0507.01.795", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=63048", + "roomcode": "0507.02.700A", + "usage": 223 }, { "address": "Arcisstr. 21, 1.OG", @@ -234550,18 +235396,18 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=12963", - "alt_name": "O47, B\u00fcro", - "arch_name": "O47@4213", + "address_link": "ris.einzelraum?raumkey=28385", + "alt_name": "O43, B\u00fcro (CTA; gem. Nutzung 1110064600;1124302010", + "arch_name": "O43@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "239", - "op_link": "webnav.navigate_to?corg=53557", - "operator": "[ TUS4F9L ]", + "op_link": "webnav.navigate_to?corg=46717", + "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=12963", - "roomcode": "4213.01.347", + "room_link": "wbRaum.editRaum?pRaumNr=28385", + "roomcode": "4213.01.343", "usage": 12 }, { @@ -234660,6 +235506,22 @@ "roomcode": "5142.Z3.019F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=59787", + "alt_name": "1262, Treppe", + "arch_name": "1262@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "239", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=59787", + "roomcode": "5302.01.162", + "usage": 223 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=73767", @@ -237170,8 +238032,8 @@ { "address": "Staatsgut Thalhausen, EG", "address_link": "ris.einzelraum?raumkey=47477", - "alt_name": "2, Besprechungsraum", - "arch_name": "2@4602", + "alt_name": "ZE 09, Besprechungs- Seminarraum", + "arch_name": "ZE 09@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -238750,20 +239612,35 @@ "usage": 12 }, { - "address": "Arcisstr. 21, 1.OG", - "address_link": "ris.einzelraum?raumkey=41482", - "alt_name": "1795A, Fluchtbalkon", - "arch_name": "1795A@0507", + "address": "Arcisstr. 21, 2.OG", + "address_link": "ris.einzelraum?raumkey=8332", + "alt_name": "2710, Zeichensaal", + "arch_name": "2710@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=51267&cRes=15094&cReadonly=J", + "extended": { + "additional_description": "2710, Zeichensaal", + "address": "Arcisstr. 21(0507), 2.Obergescho\u00df", + "architect_room_nr": "2710@0507", + "area_m2": 206.76, + "building": "0507 (Z7) Bestelmeyer Nord", + "floor_number": "2.Obergescho\u00df", + "floor_type": "Linoleum", + "purpose": "Zeichensaal (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", + "room_number": "710", + "seats": 92, + "standing_places": 0, + "wheelchair_spaces": 0, + "zip_code_location": "80333 M\u00fcnchen" + }, "list_index": "240", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=51267", + "operator": "[ TUS2000 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41482", - "roomcode": "0507.01.795A", - "usage": 219 + "room_link": "wbRaum.editRaum?pRaumNr=8332", + "roomcode": "0507.02.710", + "usage": 55 }, { "address": "Arcisstr. 21, 1.OG", @@ -238895,18 +239772,18 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=12969", - "alt_name": "O48, B\u00fcro", - "arch_name": "O48@4213", + "address_link": "ris.einzelraum?raumkey=12903", + "alt_name": "O44, B\u00fcro", + "arch_name": "O44@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "240", - "op_link": "webnav.navigate_to?corg=53557", - "operator": "[ TUS4F9L ]", + "op_link": "webnav.navigate_to?corg=46717", + "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=12969", - "roomcode": "4213.01.348", + "room_link": "wbRaum.editRaum?pRaumNr=12903", + "roomcode": "4213.01.344", "usage": 12 }, { @@ -239005,6 +239882,22 @@ "roomcode": "5142.Z3.020F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=59788", + "alt_name": "1263, Treppe", + "arch_name": "1263@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "240", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=59788", + "roomcode": "5302.01.163", + "usage": 223 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=53852", @@ -239407,9 +240300,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=41487", - "alt_name": "2700, Treppenhaus", - "arch_name": "2700@0507", + "address_link": "ris.einzelraum?raumkey=41500", + "alt_name": "2712, Flur", + "arch_name": "2712@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -239417,9 +240310,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41487", - "roomcode": "0507.02.700", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=41500", + "roomcode": "0507.02.712", + "usage": 222 }, { "address": "Arcisstr. 21, 1.OG", @@ -239551,18 +240444,18 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=12974", - "alt_name": "O49, B\u00fcro", - "arch_name": "O49@4213", + "address_link": "ris.einzelraum?raumkey=12908", + "alt_name": "O45, B\u00fcro", + "arch_name": "O45@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "241", - "op_link": "webnav.navigate_to?corg=53557", - "operator": "[ TUS4F9L ]", + "op_link": "webnav.navigate_to?corg=46717", + "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=12974", - "roomcode": "4213.01.349", + "room_link": "wbRaum.editRaum?pRaumNr=12908", + "roomcode": "4213.01.345", "usage": 12 }, { @@ -239661,6 +240554,22 @@ "roomcode": "5142.Z3.021F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=59789", + "alt_name": "1264, Treppe", + "arch_name": "1264@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "241", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=59789", + "roomcode": "5302.01.164", + "usage": 223 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=10398", @@ -240063,19 +240972,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=63048", - "alt_name": "2701A, Treppe", - "arch_name": "2701A@0507", + "address_link": "ris.einzelraum?raumkey=41555", + "alt_name": "2715, B\u00fcro", + "arch_name": "2715@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "242", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=51537", + "operator": "[ TUS2OTS ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63048", - "roomcode": "0507.02.700A", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=41555", + "roomcode": "0507.02.715", + "usage": 12 }, { "address": "Arcisstr. 21, 1.OG", @@ -240207,19 +241116,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=49999", - "alt_name": "O50, Installation", - "arch_name": "O50@4213", + "address_link": "ris.einzelraum?raumkey=28407", + "alt_name": "O46, B\u00fcro (Studentenraum; gem. Nutzung 1110064600;", + "arch_name": "O46@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=46717&cRes=18176&cReadonly=J", "list_index": "242", - "op_link": "webnav.navigate_to?corg=26175", - "operator": "[ TUZVR84 ]", + "op_link": "webnav.navigate_to?corg=46717", + "operator": "[ TUWZB1T ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=49999", - "roomcode": "4213.01.350", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=28407", + "roomcode": "4213.01.346", + "usage": 12 }, { "address": "Gregor-Mendel-Str. 2, 1.OG", @@ -240317,6 +241226,22 @@ "roomcode": "5142.Z3.022F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=59790", + "alt_name": "1265, Treppe", + "arch_name": "1265@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "242", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=59790", + "roomcode": "5302.01.165", + "usage": 223 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=10402", @@ -240734,34 +241659,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=8332", - "alt_name": "2710, Zeichensaal", - "arch_name": "2710@0507", + "address_link": "ris.einzelraum?raumkey=8336", + "alt_name": "2717, B\u00fcro", + "arch_name": "2717@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=51267&cRes=15094&cReadonly=J", - "extended": { - "additional_description": "2710, Zeichensaal", - "address": "Arcisstr. 21(0507), 2.Obergescho\u00df", - "architect_room_nr": "2710@0507", - "area_m2": 206.76, - "building": "0507 (Z7) Bestelmeyer Nord", - "floor_number": "2.Obergescho\u00df", - "floor_type": "Linoleum", - "purpose": "Zeichensaal (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", - "room_number": "710", - "seats": 92, - "standing_places": 0, - "wheelchair_spaces": 0, - "zip_code_location": "80333 M\u00fcnchen" - }, + "calendar": null, "list_index": "243", - "op_link": "webnav.navigate_to?corg=51267", - "operator": "[ TUS2000 ]", + "op_link": "webnav.navigate_to?corg=51537", + "operator": "[ TUS2OTS ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8332", - "roomcode": "0507.02.710", - "usage": 55 + "room_link": "wbRaum.editRaum?pRaumNr=8336", + "roomcode": "0507.02.717", + "usage": 12 }, { "address": "Arcisstr. 21, 1.OG", @@ -240893,9 +241803,9 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=13033", - "alt_name": "O51, Sekretariat / Vorzimmer", - "arch_name": "O51@4213", + "address_link": "ris.einzelraum?raumkey=12963", + "alt_name": "O47, B\u00fcro", + "arch_name": "O47@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, @@ -240903,8 +241813,8 @@ "op_link": "webnav.navigate_to?corg=53557", "operator": "[ TUS4F9L ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=13033", - "roomcode": "4213.01.351", + "room_link": "wbRaum.editRaum?pRaumNr=12963", + "roomcode": "4213.01.347", "usage": 12 }, { @@ -241003,6 +241913,22 @@ "roomcode": "5142.Z3.023F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=59791", + "alt_name": "1266, Treppe", + "arch_name": "1266@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "243", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=59791", + "roomcode": "5302.01.166", + "usage": 223 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=10407", @@ -241389,9 +242315,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=41500", - "alt_name": "2712, Flur", - "arch_name": "2712@0507", + "address_link": "ris.einzelraum?raumkey=41563", + "alt_name": "2719, Flur", + "arch_name": "2719@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -241399,8 +242325,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41500", - "roomcode": "0507.02.712", + "room_link": "wbRaum.editRaum?pRaumNr=41563", + "roomcode": "0507.02.719", "usage": 222 }, { @@ -241533,9 +242459,9 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=13038", - "alt_name": "O52, B\u00fcro", - "arch_name": "O52@4213", + "address_link": "ris.einzelraum?raumkey=12969", + "alt_name": "O48, B\u00fcro", + "arch_name": "O48@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, @@ -241543,8 +242469,8 @@ "op_link": "webnav.navigate_to?corg=53557", "operator": "[ TUS4F9L ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=13038", - "roomcode": "4213.01.352", + "room_link": "wbRaum.editRaum?pRaumNr=12969", + "roomcode": "4213.01.348", "usage": 12 }, { @@ -241643,6 +242569,22 @@ "roomcode": "5142.Z3.024F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=59792", + "alt_name": "1267, Treppe", + "arch_name": "1267@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "244", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=59792", + "roomcode": "5302.01.167", + "usage": 223 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=53892", @@ -242029,19 +242971,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=41555", - "alt_name": "2715, B\u00fcro", - "arch_name": "2715@0507", + "address_link": "ris.einzelraum?raumkey=63049", + "alt_name": "2721, WC-D", + "arch_name": "2721@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "245", - "op_link": "webnav.navigate_to?corg=51537", - "operator": "[ TUS2OTS ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41555", - "roomcode": "0507.02.715", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=63049", + "roomcode": "0507.02.721", + "usage": 116 }, { "address": "Arcisstr. 21, 1.OG", @@ -242173,19 +243115,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=31832", - "alt_name": "O53, K\u00fcche (gem. Nutzung 1110064600;1124302010)", - "arch_name": "O53@4213", + "address_link": "ris.einzelraum?raumkey=12974", + "alt_name": "O49, B\u00fcro", + "arch_name": "O49@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "245", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=53557", + "operator": "[ TUS4F9L ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=31832", - "roomcode": "4213.01.353", - "usage": 44 + "room_link": "wbRaum.editRaum?pRaumNr=12974", + "roomcode": "4213.01.349", + "usage": 12 }, { "address": "Gregor-Mendel-Str. 2, 1.OG", @@ -242283,6 +243225,22 @@ "roomcode": "5142.Z3.025F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=59793", + "alt_name": "1268, Treppe", + "arch_name": "1268@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "245", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=59793", + "roomcode": "5302.01.168", + "usage": 223 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=10414", @@ -242699,19 +243657,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=8336", - "alt_name": "2717, B\u00fcro", - "arch_name": "2717@0507", + "address_link": "ris.einzelraum?raumkey=69183", + "alt_name": "2721A, Vorraum WC-D", + "arch_name": "2721A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "246", - "op_link": "webnav.navigate_to?corg=51537", - "operator": "[ TUS2OTS ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8336", - "roomcode": "0507.02.717", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=69183", + "roomcode": "0507.02.721A", + "usage": 118 }, { "address": "Arcisstr. 21, 1.OG", @@ -242843,19 +243801,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 1.OG", - "address_link": "ris.einzelraum?raumkey=28714", - "alt_name": "O54, Aufenthaltsraum (gem. Nutzung 1110064600;1124", - "arch_name": "O54@4213", + "address_link": "ris.einzelraum?raumkey=49999", + "alt_name": "O50, Installation", + "arch_name": "O50@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "246", - "op_link": "webnav.navigate_to?corg=51258", - "operator": "[ TUS4000 ]", + "op_link": "webnav.navigate_to?corg=26175", + "operator": "[ TUZVR84 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=28714", - "roomcode": "4213.01.354", - "usage": 44 + "room_link": "wbRaum.editRaum?pRaumNr=49999", + "roomcode": "4213.01.350", + "usage": 120 }, { "address": "Gregor-Mendel-Str. 2, 1.OG", @@ -242953,6 +243911,22 @@ "roomcode": "5142.Z3.026F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75486", + "alt_name": "01.700.G, Empfang S\u00fcd", + "arch_name": "01.700.G@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "246", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75486", + "roomcode": "5302.01.700", + "usage": 52 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=51297", @@ -243339,9 +244313,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=41563", - "alt_name": "2719, Flur", - "arch_name": "2719@0507", + "address_link": "ris.einzelraum?raumkey=41633", + "alt_name": "2723, WC-Herren", + "arch_name": "2723@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -243349,9 +244323,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41563", - "roomcode": "0507.02.719", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=41633", + "roomcode": "0507.02.723", + "usage": 115 }, { "address": "Arcisstr. 21, 1.OG", @@ -243482,20 +244456,20 @@ "usage": 223 }, { - "address": "Maximus-von-Imhof-Forum 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=63763", - "alt_name": "D1, Zu- Abluftzentrale", - "arch_name": "D1@4213", + "address": "Maximus-von-Imhof-Forum 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=13033", + "alt_name": "O51, Sekretariat / Vorzimmer", + "arch_name": "O51@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "247", - "op_link": "webnav.navigate_to?corg=26175", - "operator": "[ TUZVR84 ]", + "op_link": "webnav.navigate_to?corg=53557", + "operator": "[ TUS4F9L ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=63763", - "roomcode": "4213.02.001", - "usage": 32 + "room_link": "wbRaum.editRaum?pRaumNr=13033", + "roomcode": "4213.01.351", + "usage": 12 }, { "address": "Gregor-Mendel-Str. 2, 1.OG", @@ -243593,6 +244567,22 @@ "roomcode": "5142.Z3.027F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75487", + "alt_name": "01.701.G, Flur", + "arch_name": "01.701.G@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "247", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75487", + "roomcode": "5302.01.701", + "usage": 222 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=10452", @@ -244009,9 +244999,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=63049", - "alt_name": "2721, WC-Herren", - "arch_name": "2721@0507", + "address_link": "ris.einzelraum?raumkey=69184", + "alt_name": "2723A, Vorraum WC-H", + "arch_name": "2723A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -244019,9 +245009,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63049", - "roomcode": "0507.02.721", - "usage": 115 + "room_link": "wbRaum.editRaum?pRaumNr=69184", + "roomcode": "0507.02.723A", + "usage": 118 }, { "address": "Arcisstr. 21, 1.OG", @@ -244152,20 +245142,20 @@ "usage": 12 }, { - "address": "Maximus-von-Imhof-Forum 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=63764", - "alt_name": "D2, Technik", - "arch_name": "D2@4213", + "address": "Maximus-von-Imhof-Forum 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=13038", + "alt_name": "O52, B\u00fcro", + "arch_name": "O52@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "248", - "op_link": "webnav.navigate_to?corg=26175", - "operator": "[ TUZVR84 ]", + "op_link": "webnav.navigate_to?corg=53557", + "operator": "[ TUS4F9L ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=63764", - "roomcode": "4213.02.002", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=13038", + "roomcode": "4213.01.352", + "usage": 12 }, { "address": "Gregor-Mendel-Str. 2, 1.OG", @@ -244263,6 +245253,22 @@ "roomcode": "5142.Z3.028F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75485", + "alt_name": "01.702.H, Flur", + "arch_name": "01.702.H@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "248", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75485", + "roomcode": "5302.01.702", + "usage": 222 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=51319", @@ -244649,19 +245655,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=69183", - "alt_name": "2721A, WC-Vorraum", - "arch_name": "2721A@0507", + "address_link": "ris.einzelraum?raumkey=8888", + "alt_name": "2730, B\u00fcro", + "arch_name": "2730@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "249", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15092", + "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=69183", - "roomcode": "0507.02.721A", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=8888", + "roomcode": "0507.02.730", + "usage": 12 }, { "address": "Arcisstr. 21, 1.OG", @@ -244792,20 +245798,20 @@ "usage": 12 }, { - "address": "Maximus-von-Imhof-Forum 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=63765", - "alt_name": "D3, Installation", - "arch_name": "D3@4213", + "address": "Maximus-von-Imhof-Forum 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=31832", + "alt_name": "O53, K\u00fcche (gem. Nutzung 1110064600;1124302010)", + "arch_name": "O53@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "249", - "op_link": "webnav.navigate_to?corg=26175", - "operator": "[ TUZVR84 ]", + "op_link": "webnav.navigate_to?corg=51258", + "operator": "[ TUS4000 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=63765", - "roomcode": "4213.02.003", - "usage": 32 + "room_link": "wbRaum.editRaum?pRaumNr=31832", + "roomcode": "4213.01.353", + "usage": 44 }, { "address": "Gregor-Mendel-Str. 2, 1.OG", @@ -244887,6 +245893,22 @@ "roomcode": "5142.Z3.029F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75505", + "alt_name": "01.704.I, Flur", + "arch_name": "01.704.I@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "249", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75505", + "roomcode": "5302.01.704", + "usage": 222 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=10455", @@ -246517,7 +247539,7 @@ { "address": "Weihenstephaner Steig 22, EG", "address_link": "ris.einzelraum?raumkey=68860", - "alt_name": "EG09, Lager", + "alt_name": "EG09, B\u00fcro", "arch_name": "EG09@4109", "b_area_id": 43, "b_filter_id": 723, @@ -246528,7 +247550,7 @@ "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=68860", "roomcode": "4109.EG.055", - "usage": 30 + "usage": 12 }, { "address": "Weihenstephaner Steig 20, 1.OG", @@ -248898,19 +249920,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=41633", - "alt_name": "2723, WC-Herren", - "arch_name": "2723@0507", + "address_link": "ris.einzelraum?raumkey=41643", + "alt_name": "2731, Besprechung", + "arch_name": "2731@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=15092&cRes=18845&cReadonly=J", "list_index": "250", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15092", + "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41633", - "roomcode": "0507.02.723", - "usage": 115 + "room_link": "wbRaum.editRaum?pRaumNr=41643", + "roomcode": "0507.02.731", + "usage": 196 }, { "address": "Arcisstr. 21, 1.OG", @@ -249041,20 +250063,20 @@ "usage": 12 }, { - "address": "Maximus-von-Imhof-Forum 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=63766", - "alt_name": "D4, Dampferzeugung", - "arch_name": "D4@4213", + "address": "Maximus-von-Imhof-Forum 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=28714", + "alt_name": "O54, Aufenthaltsraum (gem. Nutzung 1110064600;1124", + "arch_name": "O54@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "250", - "op_link": "webnav.navigate_to?corg=26175", - "operator": "[ TUZVR84 ]", + "op_link": "webnav.navigate_to?corg=51258", + "operator": "[ TUS4000 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=63766", - "roomcode": "4213.02.004", - "usage": 32 + "room_link": "wbRaum.editRaum?pRaumNr=28714", + "roomcode": "4213.01.354", + "usage": 44 }, { "address": "Gregor-Mendel-Str. 2, 1.OG", @@ -249136,6 +250158,22 @@ "roomcode": "5142.Z3.030F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75476", + "alt_name": "01.705.I, Flur", + "arch_name": "01.705.I@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "250", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75476", + "roomcode": "5302.01.705", + "usage": 222 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=51471", @@ -249522,19 +250560,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=69184", - "alt_name": "2723A, WC-Vorraum", - "arch_name": "2723A@0507", + "address_link": "ris.einzelraum?raumkey=8891", + "alt_name": "2733, B\u00fcro", + "arch_name": "2733@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "251", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15092", + "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=69184", - "roomcode": "0507.02.723A", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=8891", + "roomcode": "0507.02.733", + "usage": 12 }, { "address": "Arcisstr. 21, 1.OG", @@ -249666,19 +250704,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=63830", - "alt_name": "D5, Treppenhaus", - "arch_name": "D5@4213", + "address_link": "ris.einzelraum?raumkey=63763", + "alt_name": "D1, Zu- Abluftzentrale", + "arch_name": "D1@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "251", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=26175", + "operator": "[ TUZVR84 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=63830", - "roomcode": "4213.02.005", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=63763", + "roomcode": "4213.02.001", + "usage": 32 }, { "address": "Gregor-Mendel-Str. 2, 1.OG", @@ -249760,6 +250798,22 @@ "roomcode": "5142.Z3.031F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75501", + "alt_name": "01.706.K, Flur", + "arch_name": "01.706.K@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "251", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75501", + "roomcode": "5302.01.706", + "usage": 222 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=51486", @@ -250146,9 +251200,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=8888", - "alt_name": "2730, B\u00fcro", - "arch_name": "2730@0507", + "address_link": "ris.einzelraum?raumkey=8892", + "alt_name": "2734, B\u00fcro", + "arch_name": "2734@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -250156,8 +251210,8 @@ "op_link": "webnav.navigate_to?corg=15092", "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8888", - "roomcode": "0507.02.730", + "room_link": "wbRaum.editRaum?pRaumNr=8892", + "roomcode": "0507.02.734", "usage": 12 }, { @@ -250290,9 +251344,9 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=63767", - "alt_name": "Zu- Abluftzentrale", - "arch_name": "@4213", + "address_link": "ris.einzelraum?raumkey=63764", + "alt_name": "D2, Technik", + "arch_name": "D2@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, @@ -250300,9 +251354,9 @@ "op_link": "webnav.navigate_to?corg=26175", "operator": "[ TUZVR84 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=63767", - "roomcode": "4213.02.006", - "usage": 32 + "room_link": "wbRaum.editRaum?pRaumNr=63764", + "roomcode": "4213.02.002", + "usage": 120 }, { "address": "Gregor-Mendel-Str. 2, 1.OG", @@ -250384,6 +251438,22 @@ "roomcode": "5142.Z3.032F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75473", + "alt_name": "01.707.A, Empfang Ost 1", + "arch_name": "01.707.A@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "252", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75473", + "roomcode": "5302.01.707", + "usage": 52 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=51497", @@ -250770,19 +251840,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=41643", - "alt_name": "2731, Besprechung", - "arch_name": "2731@0507", + "address_link": "ris.einzelraum?raumkey=19575", + "alt_name": "2735, B\u00fcro", + "arch_name": "2735@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=15092&cRes=18845&cReadonly=J", + "calendar": null, "list_index": "253", "op_link": "webnav.navigate_to?corg=15092", "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41643", - "roomcode": "0507.02.731", - "usage": 196 + "room_link": "wbRaum.editRaum?pRaumNr=19575", + "roomcode": "0507.02.735", + "usage": 12 }, { "address": "Arcisstr. 21, 1.OG", @@ -250914,9 +251984,9 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=63768", - "alt_name": "Technik", - "arch_name": "@4213", + "address_link": "ris.einzelraum?raumkey=63765", + "alt_name": "D3, Installation", + "arch_name": "D3@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, @@ -250924,8 +251994,8 @@ "op_link": "webnav.navigate_to?corg=26175", "operator": "[ TUZVR84 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=63768", - "roomcode": "4213.02.007", + "room_link": "wbRaum.editRaum?pRaumNr=63765", + "roomcode": "4213.02.003", "usage": 32 }, { @@ -251008,6 +252078,22 @@ "roomcode": "5142.Z3.033F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75474", + "alt_name": "01.708.A, Empfang Ost 2", + "arch_name": "01.708.A@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "253", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75474", + "roomcode": "5302.01.708", + "usage": 52 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=51654", @@ -251393,19 +252479,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=8891", - "alt_name": "2733, B\u00fcro", - "arch_name": "2733@0507", + "address_link": "ris.einzelraum?raumkey=63050", + "alt_name": "2735A, Kopierer", + "arch_name": "2735A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "254", - "op_link": "webnav.navigate_to?corg=15092", - "operator": "[ TUBVVTK ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8891", - "roomcode": "0507.02.733", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=63050", + "roomcode": "0507.02.735A", + "usage": 110 }, { "address": "Arcisstr. 21, 1.OG", @@ -251537,19 +252623,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=63771", - "alt_name": "D6, Flur", - "arch_name": "D6@4213", + "address_link": "ris.einzelraum?raumkey=63766", + "alt_name": "D4, Dampferzeugung", + "arch_name": "D4@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "254", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=26175", + "operator": "[ TUZVR84 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=63771", - "roomcode": "4213.02.008", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=63766", + "roomcode": "4213.02.004", + "usage": 32 }, { "address": "Gregor-Mendel-Str. 2, 1.OG", @@ -251646,6 +252732,22 @@ "roomcode": "5142.Z3.034F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75467", + "alt_name": "01.709.L, Flur", + "arch_name": "01.709.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "254", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75467", + "roomcode": "5302.01.709", + "usage": 222 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=51665", @@ -252016,9 +253118,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=8892", - "alt_name": "2734, B\u00fcro", - "arch_name": "2734@0507", + "address_link": "ris.einzelraum?raumkey=8907", + "alt_name": "2736, B\u00fcro", + "arch_name": "2736@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -252026,8 +253128,8 @@ "op_link": "webnav.navigate_to?corg=15092", "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8892", - "roomcode": "0507.02.734", + "room_link": "wbRaum.editRaum?pRaumNr=8907", + "roomcode": "0507.02.736", "usage": 12 }, { @@ -252160,9 +253262,9 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=63829", - "alt_name": "D4, Treppenhaus", - "arch_name": "D4@4213", + "address_link": "ris.einzelraum?raumkey=63830", + "alt_name": "D5, Treppenhaus", + "arch_name": "D5@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, @@ -252170,8 +253272,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=63829", - "roomcode": "4213.02.009", + "room_link": "wbRaum.editRaum?pRaumNr=63830", + "roomcode": "4213.02.005", "usage": 223 }, { @@ -252269,6 +253371,22 @@ "roomcode": "5142.Z3.035F", "usage": 100 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75471", + "alt_name": "01.710.L, Flur", + "arch_name": "01.710.L@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "255", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75471", + "roomcode": "5302.01.710", + "usage": 222 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=17010", @@ -252639,9 +253757,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=19575", - "alt_name": "2735, B\u00fcro", - "arch_name": "2735@0507", + "address_link": "ris.einzelraum?raumkey=8980", + "alt_name": "2737, B\u00fcro", + "arch_name": "2737@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -252649,8 +253767,8 @@ "op_link": "webnav.navigate_to?corg=15092", "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=19575", - "roomcode": "0507.02.735", + "room_link": "wbRaum.editRaum?pRaumNr=8980", + "roomcode": "0507.02.737", "usage": 12 }, { @@ -252783,8 +253901,8 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=63769", - "alt_name": "Technik", + "address_link": "ris.einzelraum?raumkey=63767", + "alt_name": "Zu- Abluftzentrale", "arch_name": "@4213", "b_area_id": 42, "b_filter_id": 680, @@ -252793,8 +253911,8 @@ "op_link": "webnav.navigate_to?corg=26175", "operator": "[ TUZVR84 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=63769", - "roomcode": "4213.02.010", + "room_link": "wbRaum.editRaum?pRaumNr=63767", + "roomcode": "4213.02.006", "usage": 32 }, { @@ -252877,6 +253995,22 @@ "roomcode": "5142.Z3.051F", "usage": 223 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75507", + "alt_name": "01.752.H, Treppenhaus 3", + "arch_name": "01.752.H@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "256", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75507", + "roomcode": "5302.01.752", + "usage": 223 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=51684", @@ -253247,19 +254381,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=63050", - "alt_name": "2735A, Kopierer", - "arch_name": "2735A@0507", + "address_link": "ris.einzelraum?raumkey=8981", + "alt_name": "2738, B\u00fcro", + "arch_name": "2738@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "257", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15092", + "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63050", - "roomcode": "0507.02.735A", - "usage": 110 + "room_link": "wbRaum.editRaum?pRaumNr=8981", + "roomcode": "0507.02.738", + "usage": 12 }, { "address": "Arcisstr. 21, 1.OG", @@ -253391,19 +254525,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=63772", - "alt_name": "Flur", + "address_link": "ris.einzelraum?raumkey=63768", + "alt_name": "Technik", "arch_name": "@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "257", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=26175", + "operator": "[ TUZVR84 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=63772", - "roomcode": "4213.02.011", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=63768", + "roomcode": "4213.02.007", + "usage": 32 }, { "address": "Gregor-Mendel-Str. 2, 2.OG", @@ -253485,6 +254619,22 @@ "roomcode": "5142.Z3.052F", "usage": 223 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75475", + "alt_name": "01.753.J, Treppenhaus 4", + "arch_name": "01.753.J@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "257", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75475", + "roomcode": "5302.01.753", + "usage": 223 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=51829", @@ -253855,9 +255005,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=8907", - "alt_name": "2736, B\u00fcro", - "arch_name": "2736@0507", + "address_link": "ris.einzelraum?raumkey=9009", + "alt_name": "2739, B\u00fcro", + "arch_name": "2739@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -253865,8 +255015,8 @@ "op_link": "webnav.navigate_to?corg=15092", "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8907", - "roomcode": "0507.02.736", + "room_link": "wbRaum.editRaum?pRaumNr=9009", + "roomcode": "0507.02.739", "usage": 12 }, { @@ -253999,19 +255149,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=63770", - "alt_name": "Installation", - "arch_name": "@4213", + "address_link": "ris.einzelraum?raumkey=63771", + "alt_name": "D6, Flur", + "arch_name": "D6@4213", "b_area_id": 42, "b_filter_id": 680, "calendar": null, "list_index": "258", - "op_link": "webnav.navigate_to?corg=26175", - "operator": "[ TUZVR84 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=63770", - "roomcode": "4213.02.012", - "usage": 32 + "room_link": "wbRaum.editRaum?pRaumNr=63771", + "roomcode": "4213.02.008", + "usage": 222 }, { "address": "Gregor-Mendel-Str. 2, 2.OG", @@ -254093,6 +255243,22 @@ "roomcode": "5142.Z3.060F", "usage": 204 }, + { + "address": "Lichtenbergstr. 2, 1.OG", + "address_link": "ris.einzelraum?raumkey=75509", + "alt_name": "01.754.J, Treppenhaus 5", + "arch_name": "01.754.J@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "258", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=75509", + "roomcode": "5302.01.754", + "usage": 223 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=51841", @@ -254463,9 +255629,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=8980", - "alt_name": "2737, B\u00fcro", - "arch_name": "2737@0507", + "address_link": "ris.einzelraum?raumkey=9012", + "alt_name": "2740, B\u00fcro", + "arch_name": "2740@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -254473,8 +255639,8 @@ "op_link": "webnav.navigate_to?corg=15092", "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8980", - "roomcode": "0507.02.737", + "room_link": "wbRaum.editRaum?pRaumNr=9012", + "roomcode": "0507.02.740", "usage": 12 }, { @@ -254607,19 +255773,19 @@ }, { "address": "Maximus-von-Imhof-Forum 2, 2.OG", - "address_link": "ris.einzelraum?raumkey=13104", - "alt_name": "D18, BayWa Creative Space", - "arch_name": "D18@4213", + "address_link": "ris.einzelraum?raumkey=63829", + "alt_name": "D4, Treppenhaus", + "arch_name": "D4@4213", "b_area_id": 42, "b_filter_id": 680, - "calendar": "tvKalender.wSicht?cOrg=14190&cRes=18146&cReadonly=J", + "calendar": null, "list_index": "259", - "op_link": "webnav.navigate_to?corg=51917", - "operator": "[ TUS4F4C ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "85354 Freising", - "room_link": "wbRaum.editRaum?pRaumNr=13104", - "roomcode": "4213.02.318", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=63829", + "roomcode": "4213.02.009", + "usage": 223 }, { "address": "Gregor-Mendel-Str. 2, 2.OG", @@ -254701,6 +255867,22 @@ "roomcode": "5142.Z3.061F", "usage": 204 }, + { + "address": "Lichtenbergstr. 2, 2.OG", + "address_link": "ris.einzelraum?raumkey=46224", + "alt_name": "2201, Raumlufttechnik", + "arch_name": "2201@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "259", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=46224", + "roomcode": "5302.02.201", + "usage": 32 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=51853", @@ -258521,9 +259703,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=8981", - "alt_name": "2738, B\u00fcro", - "arch_name": "2738@0507", + "address_link": "ris.einzelraum?raumkey=8915", + "alt_name": "2741, B\u00fcro", + "arch_name": "2741@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -258531,8 +259713,8 @@ "op_link": "webnav.navigate_to?corg=15092", "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8981", - "roomcode": "0507.02.738", + "room_link": "wbRaum.editRaum?pRaumNr=8915", + "roomcode": "0507.02.741", "usage": 12 }, { @@ -258647,6 +259829,22 @@ "roomcode": "4124.02.314", "usage": 103 }, + { + "address": "Maximus-von-Imhof-Forum 2, 2.OG", + "address_link": "ris.einzelraum?raumkey=63769", + "alt_name": "Technik", + "arch_name": "@4213", + "b_area_id": 42, + "b_filter_id": 680, + "calendar": null, + "list_index": "260", + "op_link": "webnav.navigate_to?corg=26175", + "operator": "[ TUZVR84 ]", + "plz_place": "85354 Freising", + "room_link": "wbRaum.editRaum?pRaumNr=63769", + "roomcode": "4213.02.010", + "usage": 32 + }, { "address": "Gregor-Mendel-Str. 2, 2.OG", "address_link": "ris.einzelraum?raumkey=53102", @@ -258727,6 +259925,22 @@ "roomcode": "5142.Z3.080F", "usage": 120 }, + { + "address": "Lichtenbergstr. 2, 2.OG", + "address_link": "ris.einzelraum?raumkey=46235", + "alt_name": "2202, Ventilationskammer", + "arch_name": "2202@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "260", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=46235", + "roomcode": "5302.02.202", + "usage": 32 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=51863", @@ -259097,9 +260311,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=9009", - "alt_name": "2739, B\u00fcro", - "arch_name": "2739@0507", + "address_link": "ris.einzelraum?raumkey=8917", + "alt_name": "2742, B\u00fcro", + "arch_name": "2742@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -259107,8 +260321,8 @@ "op_link": "webnav.navigate_to?corg=15092", "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=9009", - "roomcode": "0507.02.739", + "room_link": "wbRaum.editRaum?pRaumNr=8917", + "roomcode": "0507.02.742", "usage": 12 }, { @@ -259223,6 +260437,22 @@ "roomcode": "4124.02.315", "usage": 102 }, + { + "address": "Maximus-von-Imhof-Forum 2, 2.OG", + "address_link": "ris.einzelraum?raumkey=63772", + "alt_name": "Flur", + "arch_name": "@4213", + "b_area_id": 42, + "b_filter_id": 680, + "calendar": null, + "list_index": "261", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", + "plz_place": "85354 Freising", + "room_link": "wbRaum.editRaum?pRaumNr=63772", + "roomcode": "4213.02.011", + "usage": 222 + }, { "address": "Gregor-Mendel-Str. 2, 2.OG", "address_link": "ris.einzelraum?raumkey=53116", @@ -259287,6 +260517,22 @@ "roomcode": "5109.03.022", "usage": 103 }, + { + "address": "Lichtenbergstr. 2, 2.OG", + "address_link": "ris.einzelraum?raumkey=59087", + "alt_name": "2203, Ventilationskammer", + "arch_name": "2203@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "261", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=59087", + "roomcode": "5302.02.203", + "usage": 32 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=52004", @@ -259657,9 +260903,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=9012", - "alt_name": "2740, B\u00fcro", - "arch_name": "2740@0507", + "address_link": "ris.einzelraum?raumkey=8920", + "alt_name": "2743, B\u00fcro", + "arch_name": "2743@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -259667,8 +260913,8 @@ "op_link": "webnav.navigate_to?corg=15092", "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=9012", - "roomcode": "0507.02.740", + "room_link": "wbRaum.editRaum?pRaumNr=8920", + "roomcode": "0507.02.743", "usage": 12 }, { @@ -259783,6 +261029,22 @@ "roomcode": "4124.02.316", "usage": 104 }, + { + "address": "Maximus-von-Imhof-Forum 2, 2.OG", + "address_link": "ris.einzelraum?raumkey=63770", + "alt_name": "Installation", + "arch_name": "@4213", + "b_area_id": 42, + "b_filter_id": 680, + "calendar": null, + "list_index": "262", + "op_link": "webnav.navigate_to?corg=26175", + "operator": "[ TUZVR84 ]", + "plz_place": "85354 Freising", + "room_link": "wbRaum.editRaum?pRaumNr=63770", + "roomcode": "4213.02.012", + "usage": 32 + }, { "address": "Gregor-Mendel-Str. 2, 2.OG", "address_link": "ris.einzelraum?raumkey=53260", @@ -259847,6 +261109,22 @@ "roomcode": "5109.03.023", "usage": 12 }, + { + "address": "Lichtenbergstr. 2, 2.OG", + "address_link": "ris.einzelraum?raumkey=59088", + "alt_name": "2204, Fortluft\u00f6ffnung", + "arch_name": "2204@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "262", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=59088", + "roomcode": "5302.02.204", + "usage": 32 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=52017", @@ -260217,19 +261495,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=8915", - "alt_name": "2741, B\u00fcro", - "arch_name": "2741@0507", + "address_link": "ris.einzelraum?raumkey=41799", + "alt_name": "2748, Flur", + "arch_name": "2748@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "263", - "op_link": "webnav.navigate_to?corg=15092", - "operator": "[ TUBVVTK ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8915", - "roomcode": "0507.02.741", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=41799", + "roomcode": "0507.02.748", + "usage": 222 }, { "address": "Arcisstr. 21, 1.OG", @@ -260342,6 +261620,22 @@ "roomcode": "4124.02.317", "usage": 194 }, + { + "address": "Maximus-von-Imhof-Forum 2, 2.OG", + "address_link": "ris.einzelraum?raumkey=13104", + "alt_name": "D18, Pitch Point/Lounge", + "arch_name": "D18@4213", + "b_area_id": 42, + "b_filter_id": 680, + "calendar": "tvKalender.wSicht?cOrg=14190&cRes=18146&cReadonly=J", + "list_index": "263", + "op_link": "webnav.navigate_to?corg=51917", + "operator": "[ TUS4F4C ]", + "plz_place": "85354 Freising", + "room_link": "wbRaum.editRaum?pRaumNr=13104", + "roomcode": "4213.02.318", + "usage": 12 + }, { "address": "Gregor-Mendel-Str. 2, 2.OG", "address_link": "ris.einzelraum?raumkey=53273", @@ -260406,6 +261700,22 @@ "roomcode": "5109.03.024", "usage": 12 }, + { + "address": "Lichtenbergstr. 2, 2.OG", + "address_link": "ris.einzelraum?raumkey=59086", + "alt_name": "2257, Treppenraum", + "arch_name": "2257@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "263", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=59086", + "roomcode": "5302.02.205", + "usage": 223 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=28230", @@ -260776,9 +262086,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=8917", - "alt_name": "2742, B\u00fcro", - "arch_name": "2742@0507", + "address_link": "ris.einzelraum?raumkey=41801", + "alt_name": "2748A, Abstellraum", + "arch_name": "2748A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -260786,9 +262096,9 @@ "op_link": "webnav.navigate_to?corg=15092", "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8917", - "roomcode": "0507.02.742", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=41801", + "roomcode": "0507.02.748A", + "usage": 159 }, { "address": "Arcisstr. 21, 1.OG", @@ -260950,6 +262260,22 @@ "roomcode": "5109.03.025", "usage": 12 }, + { + "address": "Lichtenbergstr. 2, 2.OG", + "address_link": "ris.einzelraum?raumkey=59795", + "alt_name": "2205, Raumlufttechnik/nicht begehbar", + "arch_name": "2205@5302", + "b_area_id": 30, + "b_filter_id": 816, + "calendar": null, + "list_index": "264", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", + "plz_place": "85748 Garching b. M\u00fcnchen", + "room_link": "wbRaum.editRaum?pRaumNr=59795", + "roomcode": "5302.02.206", + "usage": 32 + }, { "address": "Lichtenbergstr. 4, 3.OG", "address_link": "ris.einzelraum?raumkey=28233", @@ -261335,19 +262661,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=8920", - "alt_name": "2743, B\u00fcro", - "arch_name": "2743@0507", + "address_link": "ris.einzelraum?raumkey=63051", + "alt_name": "2748B, Treppe", + "arch_name": "2748B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "265", - "op_link": "webnav.navigate_to?corg=15092", - "operator": "[ TUBVVTK ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8920", - "roomcode": "0507.02.743", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=63051", + "roomcode": "0507.02.748B", + "usage": 223 }, { "address": "Arcisstr. 21, 1.OG", @@ -261879,9 +263205,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=41799", - "alt_name": "2748, Flur", - "arch_name": "2748@0507", + "address_link": "ris.einzelraum?raumkey=41806", + "alt_name": "2749, Flur", + "arch_name": "2749@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -261889,8 +263215,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41799", - "roomcode": "0507.02.748", + "room_link": "wbRaum.editRaum?pRaumNr=41806", + "roomcode": "0507.02.749", "usage": 222 }, { @@ -262422,19 +263748,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=41801", - "alt_name": "2748A, Abstellraum", - "arch_name": "2748A@0507", + "address_link": "ris.einzelraum?raumkey=41886", + "alt_name": "2751, WC-Vorraum", + "arch_name": "2751@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "267", - "op_link": "webnav.navigate_to?corg=15092", - "operator": "[ TUBVVTK ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41801", - "roomcode": "0507.02.748A", - "usage": 159 + "room_link": "wbRaum.editRaum?pRaumNr=41886", + "roomcode": "0507.02.751", + "usage": 118 }, { "address": "Arcisstr. 21, 1.OG", @@ -262965,9 +264291,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=63051", - "alt_name": "2748B, Treppe", - "arch_name": "2748B@0507", + "address_link": "ris.einzelraum?raumkey=69185", + "alt_name": "2751A, WC-Damen", + "arch_name": "2751A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -262975,9 +264301,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63051", - "roomcode": "0507.02.748B", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=69185", + "roomcode": "0507.02.751A", + "usage": 116 }, { "address": "Arcisstr. 21, 1.OG", @@ -263493,9 +264819,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=41806", - "alt_name": "2749, Flur", - "arch_name": "2749@0507", + "address_link": "ris.einzelraum?raumkey=72819", + "alt_name": "2751B, WC-Herren", + "arch_name": "2751B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -263503,9 +264829,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41806", - "roomcode": "0507.02.749", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=72819", + "roomcode": "0507.02.751B", + "usage": 115 }, { "address": "Arcisstr. 21, 1.OG", @@ -267130,8 +268456,8 @@ "b_filter_id": 2590, "calendar": null, "list_index": "27", - "op_link": "webnav.navigate_to?corg=51267", - "operator": "[ TUS2000 ]", + "op_link": "webnav.navigate_to?corg=15298", + "operator": "[ TUMWFZG ]", "plz_place": "85748 Garching b. M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=70632", "roomcode": "8123.05.001", @@ -267315,9 +268641,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=41886", - "alt_name": "2751, WC-Vorraum", - "arch_name": "2751@0507", + "address_link": "ris.einzelraum?raumkey=41891", + "alt_name": "2752, Treppenhaus", + "arch_name": "2752@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -267325,9 +268651,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41886", - "roomcode": "0507.02.751", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=41891", + "roomcode": "0507.02.752", + "usage": 223 }, { "address": "Arcisstr. 21, 1.OG", @@ -267858,9 +269184,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=69185", - "alt_name": "2751A, WC-Damen", - "arch_name": "2751A@0507", + "address_link": "ris.einzelraum?raumkey=63052", + "alt_name": "2752B, Treppe", + "arch_name": "2752B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -267868,9 +269194,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=69185", - "roomcode": "0507.02.751A", - "usage": 116 + "room_link": "wbRaum.editRaum?pRaumNr=63052", + "roomcode": "0507.02.752B", + "usage": 223 }, { "address": "Arcisstr. 21, 1.OG", @@ -268386,9 +269712,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=72819", - "alt_name": "2751B, WC-Herren", - "arch_name": "2751B@0507", + "address_link": "ris.einzelraum?raumkey=63053", + "alt_name": "2752C, Treppe", + "arch_name": "2752C@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -268396,9 +269722,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=72819", - "roomcode": "0507.02.751B", - "usage": 115 + "room_link": "wbRaum.editRaum?pRaumNr=63053", + "roomcode": "0507.02.752C", + "usage": 223 }, { "address": "Arcisstr. 21, 1.OG", @@ -268914,19 +270240,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=41891", - "alt_name": "2752, Treppenhaus", - "arch_name": "2752@0507", + "address_link": "ris.einzelraum?raumkey=8971", + "alt_name": "2753, B\u00fcro", + "arch_name": "2753@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "273", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15092", + "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41891", - "roomcode": "0507.02.752", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=8971", + "roomcode": "0507.02.753", + "usage": 12 }, { "address": "Arcisstr. 21, 1.OG", @@ -269472,19 +270798,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=63052", - "alt_name": "2752B, Treppe", - "arch_name": "2752B@0507", + "address_link": "ris.einzelraum?raumkey=18941", + "alt_name": "2755, Lager", + "arch_name": "2755@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "274", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63052", - "roomcode": "0507.02.752B", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=18941", + "roomcode": "0507.02.755", + "usage": 30 }, { "address": "Arcisstr. 21, 1.OG", @@ -270015,9 +271341,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=63053", - "alt_name": "2752C, Treppe", - "arch_name": "2752C@0507", + "address_link": "ris.einzelraum?raumkey=40857", + "alt_name": "2755a, Abstellraum", + "arch_name": "2755a@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -270025,9 +271351,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63053", - "roomcode": "0507.02.752C", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=40857", + "roomcode": "0507.02.755A", + "usage": 159 }, { "address": "Arcisstr. 21, 1.OG", @@ -270572,19 +271898,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=8971", - "alt_name": "2753, B\u00fcro", - "arch_name": "2753@0507", + "address_link": "ris.einzelraum?raumkey=63054", + "alt_name": "2755B, Installation", + "arch_name": "2755B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "276", - "op_link": "webnav.navigate_to?corg=15092", - "operator": "[ TUBVVTK ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=8971", - "roomcode": "0507.02.753", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=63054", + "roomcode": "0507.02.755B", + "usage": 120 }, { "address": "Arcisstr. 21, 1.OG", @@ -271144,19 +272470,34 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=18941", - "alt_name": "2755, Lager", - "arch_name": "2755@0507", + "address_link": "ris.einzelraum?raumkey=9046", + "alt_name": "2760, H\u00f6rsaal", + "arch_name": "2760@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=19691&cRes=12572&cReadonly=J", + "extended": { + "additional_description": "2760, H\u00f6rsaal", + "address": "Arcisstr. 21(0507), 2.Obergescho\u00df", + "architect_room_nr": "2760@0507", + "area_m2": 103.17, + "building": "0507 (Z7) Bestelmeyer Nord", + "floor_number": "2.Obergescho\u00df", + "floor_type": "Linoleum", + "purpose": "H\u00f6rsaal (NF5.1 - Unterrichtsr\u00e4ume mit festem Gest\u00fchl)", + "room_number": "760", + "seats": 108, + "standing_places": 0, + "wheelchair_spaces": 0, + "zip_code_location": "80333 M\u00fcnchen" + }, "list_index": "277", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=18941", - "roomcode": "0507.02.755", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=9046", + "roomcode": "0507.02.760", + "usage": 20 }, { "address": "Arcisstr. 21, 1.OG", @@ -271656,9 +272997,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=40857", - "alt_name": "2755a, Flur", - "arch_name": "2755a@0507", + "address_link": "ris.einzelraum?raumkey=40996", + "alt_name": "2762, Flur", + "arch_name": "2762@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -271666,8 +273007,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40857", - "roomcode": "0507.02.755A", + "room_link": "wbRaum.editRaum?pRaumNr=40996", + "roomcode": "0507.02.762", "usage": 222 }, { @@ -272168,9 +273509,9 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=63054", - "alt_name": "2755B, Installation", - "arch_name": "2755B@0507", + "address_link": "ris.einzelraum?raumkey=41210", + "alt_name": "2763, Flur", + "arch_name": "2763@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -272178,9 +273519,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63054", - "roomcode": "0507.02.755B", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=41210", + "roomcode": "0507.02.763", + "usage": 222 }, { "address": "Arcisstr. 21, 1.OG", @@ -275709,8 +277050,8 @@ "b_filter_id": 2590, "calendar": null, "list_index": "28", - "op_link": "webnav.navigate_to?corg=51267", - "operator": "[ TUS2000 ]", + "op_link": "webnav.navigate_to?corg=25925", + "operator": "[ TUZV142 ]", "plz_place": "85748 Garching b. M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=70633", "roomcode": "8123.05.002", @@ -275894,34 +277235,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=9046", - "alt_name": "2760, H\u00f6rsaal", - "arch_name": "2760@0507", + "address_link": "ris.einzelraum?raumkey=40863", + "alt_name": "2768, Putzraum", + "arch_name": "2768@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=19691&cRes=12572&cReadonly=J", - "extended": { - "additional_description": "2760, H\u00f6rsaal", - "address": "Arcisstr. 21(0507), 2.Obergescho\u00df", - "architect_room_nr": "2760@0507", - "area_m2": 103.17, - "building": "0507 (Z7) Bestelmeyer Nord", - "floor_number": "2.Obergescho\u00df", - "floor_type": "Linoleum", - "purpose": "H\u00f6rsaal (NF5.1 - Unterrichtsr\u00e4ume mit festem Gest\u00fchl)", - "room_number": "760", - "seats": 108, - "standing_places": 0, - "wheelchair_spaces": 0, - "zip_code_location": "80333 M\u00fcnchen" - }, + "calendar": null, "list_index": "280", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=9046", - "roomcode": "0507.02.760", - "usage": 20 + "room_link": "wbRaum.editRaum?pRaumNr=40863", + "roomcode": "0507.02.768", + "usage": 205 }, { "address": "Arcisstr. 21, 1.OG", @@ -276405,19 +277731,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=40996", - "alt_name": "2762, Flur", - "arch_name": "2762@0507", + "address_link": "ris.einzelraum?raumkey=40864", + "alt_name": "2769, Gebetsraum", + "arch_name": "2769@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "281", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=47957", + "operator": "[ TUZVSCH ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40996", - "roomcode": "0507.02.762", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=40864", + "roomcode": "0507.02.769", + "usage": 129 }, { "address": "Arcisstr. 21, 1.OG", @@ -276901,19 +278227,34 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=41210", - "alt_name": "2763, Flur", - "arch_name": "2763@0507", + "address_link": "ris.einzelraum?raumkey=9033", + "alt_name": "2770, H\u00f6rsaal", + "arch_name": "2770@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=19691&cRes=12509&cReadonly=J", + "extended": { + "additional_description": "2770, H\u00f6rsaal", + "address": "Arcisstr. 21(0507), 2.Obergescho\u00df", + "architect_room_nr": "2770@0507", + "area_m2": 159.81, + "building": "0507 (Z7) Bestelmeyer Nord", + "floor_number": "2.Obergescho\u00df", + "floor_type": "Linoleum", + "purpose": "H\u00f6rsaal (NF5.1 - Unterrichtsr\u00e4ume mit festem Gest\u00fchl)", + "room_number": "770", + "seats": 188, + "standing_places": 0, + "wheelchair_spaces": 1, + "zip_code_location": "80333 M\u00fcnchen" + }, "list_index": "282", "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41210", - "roomcode": "0507.02.763", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=9033", + "roomcode": "0507.02.770", + "usage": 20 }, { "address": "Arcisstr. 21, 1.OG", @@ -277412,19 +278753,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=40863", - "alt_name": "2768, Putzraum", - "arch_name": "2768@0507", + "address_link": "ris.einzelraum?raumkey=40866", + "alt_name": "2773, Flur", + "arch_name": "2773@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "283", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40863", - "roomcode": "0507.02.768", - "usage": 205 + "room_link": "wbRaum.editRaum?pRaumNr=40866", + "roomcode": "0507.02.773", + "usage": 222 }, { "address": "Arcisstr. 21, 1.OG", @@ -277908,19 +279249,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=40864", - "alt_name": "2769, Gebetsraum", - "arch_name": "2769@0507", + "address_link": "ris.einzelraum?raumkey=9036", + "alt_name": "2791, B\u00fcro", + "arch_name": "2791@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "284", - "op_link": "webnav.navigate_to?corg=47957", - "operator": "[ TUZVSCH ]", + "op_link": "webnav.navigate_to?corg=19671", + "operator": "[ TUZEBIB ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40864", - "roomcode": "0507.02.769", - "usage": 129 + "room_link": "wbRaum.editRaum?pRaumNr=9036", + "roomcode": "0507.02.791", + "usage": 12 }, { "address": "Arcisstr. 21, 2.OG", @@ -278404,34 +279745,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=9033", - "alt_name": "2770, H\u00f6rsaal", - "arch_name": "2770@0507", + "address_link": "ris.einzelraum?raumkey=9038", + "alt_name": "2792, B\u00fcro", + "arch_name": "2792@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=19691&cRes=12509&cReadonly=J", - "extended": { - "additional_description": "2770, H\u00f6rsaal", - "address": "Arcisstr. 21(0507), 2.Obergescho\u00df", - "architect_room_nr": "2770@0507", - "area_m2": 159.81, - "building": "0507 (Z7) Bestelmeyer Nord", - "floor_number": "2.Obergescho\u00df", - "floor_type": "Linoleum", - "purpose": "H\u00f6rsaal (NF5.1 - Unterrichtsr\u00e4ume mit festem Gest\u00fchl)", - "room_number": "770", - "seats": 188, - "standing_places": 0, - "wheelchair_spaces": 1, - "zip_code_location": "80333 M\u00fcnchen" - }, + "calendar": null, "list_index": "285", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=37623", + "operator": "[ TUZV44H ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=9033", - "roomcode": "0507.02.770", - "usage": 20 + "room_link": "wbRaum.editRaum?pRaumNr=9038", + "roomcode": "0507.02.792", + "usage": 12 }, { "address": "Arcisstr. 21, 2.OG", @@ -278945,19 +280271,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=40866", - "alt_name": "2773, Flur", - "arch_name": "2773@0507", + "address_link": "ris.einzelraum?raumkey=40915", + "alt_name": "2792A, B\u00fcro", + "arch_name": "2792A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "286", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=37623", + "operator": "[ TUZV44H ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40866", - "roomcode": "0507.02.773", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=40915", + "roomcode": "0507.02.792A", + "usage": 12 }, { "address": "Arcisstr. 21, 2.OG", @@ -279456,19 +280782,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=9036", - "alt_name": "2791, B\u00fcro", - "arch_name": "2791@0507", + "address_link": "ris.einzelraum?raumkey=40921", + "alt_name": "2793, Vermittlung", + "arch_name": "2793@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "287", - "op_link": "webnav.navigate_to?corg=19671", - "operator": "[ TUZEBIB ]", + "op_link": "webnav.navigate_to?corg=37801", + "operator": "[ TUZV44L ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=9036", - "roomcode": "0507.02.791", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=40921", + "roomcode": "0507.02.793", + "usage": 202 }, { "address": "Arcisstr. 21, 2.OG", @@ -279982,19 +281308,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=9038", - "alt_name": "2792, B\u00fcro", - "arch_name": "2792@0507", + "address_link": "ris.einzelraum?raumkey=40924", + "alt_name": "2794, Flur", + "arch_name": "2794@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "288", - "op_link": "webnav.navigate_to?corg=37623", - "operator": "[ TUZV44H ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=9038", - "roomcode": "0507.02.792", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=40924", + "roomcode": "0507.02.794", + "usage": 222 }, { "address": "Arcisstr. 21, 2.OG", @@ -280508,18 +281834,18 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=40915", - "alt_name": "2792A, B\u00fcro", - "arch_name": "2792A@0507", + "address_link": "ris.einzelraum?raumkey=9087", + "alt_name": "2795, B\u00fcro", + "arch_name": "2795@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "289", - "op_link": "webnav.navigate_to?corg=37623", - "operator": "[ TUZV44H ]", + "op_link": "webnav.navigate_to?corg=19671", + "operator": "[ TUZEBIB ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40915", - "roomcode": "0507.02.792A", + "room_link": "wbRaum.editRaum?pRaumNr=9087", + "roomcode": "0507.02.795", "usage": 12 }, { @@ -284017,8 +285343,8 @@ "b_filter_id": 2590, "calendar": null, "list_index": "29", - "op_link": "webnav.navigate_to?corg=51267", - "operator": "[ TUS2000 ]", + "op_link": "webnav.navigate_to?corg=15298", + "operator": "[ TUMWFZG ]", "plz_place": "85748 Garching b. M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=70587", "roomcode": "8123.05.003", @@ -284217,19 +285543,19 @@ }, { "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=40921", - "alt_name": "2793, Vermittlung", - "arch_name": "2793@0507", + "address_link": "ris.einzelraum?raumkey=9092", + "alt_name": "2795A, B\u00fcro", + "arch_name": "2795A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "290", - "op_link": "webnav.navigate_to?corg=37801", - "operator": "[ TUZV44L ]", + "op_link": "webnav.navigate_to?corg=19671", + "operator": "[ TUZEBIB ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40921", - "roomcode": "0507.02.793", - "usage": 202 + "room_link": "wbRaum.editRaum?pRaumNr=9092", + "roomcode": "0507.02.795A", + "usage": 12 }, { "address": "Arcisstr. 21, 2.OG", @@ -284757,10 +286083,10 @@ "usage": 4 }, { - "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=40924", - "alt_name": "2794, Flur", - "arch_name": "2794@0507", + "address": "Arcisstr. 21, 3.OG", + "address_link": "ris.einzelraum?raumkey=40998", + "alt_name": "3700A, Flur", + "arch_name": "3700A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -284768,8 +286094,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40924", - "roomcode": "0507.02.794", + "room_link": "wbRaum.editRaum?pRaumNr=40998", + "roomcode": "0507.03.700A", "usage": 222 }, { @@ -285268,20 +286594,20 @@ "usage": 223 }, { - "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=9087", - "alt_name": "2795, B\u00fcro", - "arch_name": "2795@0507", + "address": "Arcisstr. 21, 3.OG", + "address_link": "ris.einzelraum?raumkey=41056", + "alt_name": "3700B, Flur", + "arch_name": "3700B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "292", - "op_link": "webnav.navigate_to?corg=19671", - "operator": "[ TUZEBIB ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=9087", - "roomcode": "0507.02.795", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=41056", + "roomcode": "0507.03.700B", + "usage": 222 }, { "address": "Arcisstr. 21, 2.OG", @@ -285763,20 +287089,35 @@ "usage": 223 }, { - "address": "Arcisstr. 21, 2.OG", - "address_link": "ris.einzelraum?raumkey=9092", - "alt_name": "2795A, B\u00fcro", - "arch_name": "2795A@0507", + "address": "Arcisstr. 21, 3.OG", + "address_link": "ris.einzelraum?raumkey=9131", + "alt_name": "3701, Zeichnen", + "arch_name": "3701@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=51267&cRes=15109&cReadonly=J", + "extended": { + "additional_description": "3701, Zeichnen", + "address": "Arcisstr. 21(0507), 3.Obergescho\u00df", + "architect_room_nr": "3701@0507", + "area_m2": 230.27, + "building": "0507 (Z7) Bestelmeyer Nord", + "floor_number": "3.Obergescho\u00df", + "floor_type": "Linoleum", + "purpose": "Zeichensaal (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", + "room_number": "701", + "seats": 96, + "standing_places": 0, + "wheelchair_spaces": 0, + "zip_code_location": "80333 M\u00fcnchen" + }, "list_index": "293", - "op_link": "webnav.navigate_to?corg=19671", - "operator": "[ TUZEBIB ]", + "op_link": "webnav.navigate_to?corg=51267", + "operator": "[ TUS2000 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=9092", - "roomcode": "0507.02.795A", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=9131", + "roomcode": "0507.03.701", + "usage": 55 }, { "address": "Arcisstr. 21, 2.OG", @@ -286259,9 +287600,9 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=40998", - "alt_name": "3700A, Flur", - "arch_name": "3700A@0507", + "address_link": "ris.einzelraum?raumkey=40861", + "alt_name": "3701A, Treppe", + "arch_name": "3701A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -286269,9 +287610,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40998", - "roomcode": "0507.03.700A", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=40861", + "roomcode": "0507.03.701A", + "usage": 223 }, { "address": "Arcisstr. 21, 2.OG", @@ -286739,19 +288080,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41056", - "alt_name": "3700B, Flur", - "arch_name": "3700B@0507", + "address_link": "ris.einzelraum?raumkey=21263", + "alt_name": "3703, Server", + "arch_name": "3703@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "295", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=39906", + "operator": "[ TUPELRZ ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41056", - "roomcode": "0507.03.700B", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=21263", + "roomcode": "0507.03.703", + "usage": 207 }, { "address": "Arcisstr. 21, 2.OG", @@ -287219,34 +288560,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=9131", - "alt_name": "3701, Zeichnen", - "arch_name": "3701@0507", + "address_link": "ris.einzelraum?raumkey=58454", + "alt_name": "3704, B\u00fcro/Umbau", + "arch_name": "3704@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=51267&cRes=15109&cReadonly=J", - "extended": { - "additional_description": "3701, Zeichnen", - "address": "Arcisstr. 21(0507), 3.Obergescho\u00df", - "architect_room_nr": "3701@0507", - "area_m2": 230.27, - "building": "0507 (Z7) Bestelmeyer Nord", - "floor_number": "3.Obergescho\u00df", - "floor_type": "Linoleum", - "purpose": "Zeichensaal (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", - "room_number": "701", - "seats": 96, - "standing_places": 0, - "wheelchair_spaces": 0, - "zip_code_location": "80333 M\u00fcnchen" - }, + "calendar": null, "list_index": "296", - "op_link": "webnav.navigate_to?corg=51267", - "operator": "[ TUS2000 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=9131", - "roomcode": "0507.03.701", - "usage": 55 + "room_link": "wbRaum.editRaum?pRaumNr=58454", + "roomcode": "0507.03.704", + "usage": 12 }, { "address": "Arcisstr. 21, 2.OG", @@ -287729,19 +289055,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=40861", - "alt_name": "3701A, Treppe", - "arch_name": "3701A@0507", + "address_link": "ris.einzelraum?raumkey=41218", + "alt_name": "3705, RLT / Umbau", + "arch_name": "3705@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "297", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40861", - "roomcode": "0507.03.701A", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=41218", + "roomcode": "0507.03.705", + "usage": 32 }, { "address": "Arcisstr. 21, 2.OG", @@ -288209,19 +289535,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=21263", - "alt_name": "3703, Server", - "arch_name": "3703@0507", + "address_link": "ris.einzelraum?raumkey=41270", + "alt_name": "3706, RLT", + "arch_name": "3706@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "298", - "op_link": "webnav.navigate_to?corg=39906", - "operator": "[ TUPELRZ ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=21263", - "roomcode": "0507.03.703", - "usage": 207 + "room_link": "wbRaum.editRaum?pRaumNr=41270", + "roomcode": "0507.03.706", + "usage": 32 }, { "address": "Arcisstr. 21, 2.OG", @@ -288719,19 +290045,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=58454", - "alt_name": "3704, B\u00fcro/Umbau", - "arch_name": "3704@0507", + "address_link": "ris.einzelraum?raumkey=41276", + "alt_name": "3738, Bibliothek", + "arch_name": "3738@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "299", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=15092", + "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=58454", - "roomcode": "0507.03.704", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=41276", + "roomcode": "0507.03.738", + "usage": 10 }, { "address": "Arcisstr. 21, 2.OG", @@ -294231,23 +295557,23 @@ }, { "address": "Boltzmannstr. 15, EG", - "address_link": "ris.einzelraum?raumkey=75174", - "alt_name": "0.001B, H\u00f6rsaal 1B", - "arch_name": "0.001B@5539", + "address_link": "ris.einzelraum?raumkey=75171", + "alt_name": "0.002, H\u00f6rsaal 2", + "arch_name": "0.002@5539", "b_area_id": 34, "b_filter_id": 3149, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=19691&cRes=33534&cReadonly=J", "extended": { - "additional_description": "0.001B, H\u00f6rsaal 1B", + "additional_description": "0.002, H\u00f6rsaal 2", "address": "Boltzmannstr. 15(5539), Erdgescho\u00df", - "architect_room_nr": "0.001B@5539", - "area_m2": 1.0, + "architect_room_nr": "0.002@5539", + "area_m2": 450.0, "building": "5539 Interims-Tentomax MW", "floor_number": "Erdgescho\u00df", - "floor_type": "Spannteppich", + "floor_type": "PVC", "purpose": "H\u00f6rsaal (NF5.1 - Unterrichtsr\u00e4ume mit festem Gest\u00fchl)", - "room_number": "001B", - "seats": 320, + "room_number": "002", + "seats": 340, "standing_places": 0, "wheelchair_spaces": 0, "zip_code_location": "85748 Garching b. M\u00fcnchen" @@ -294256,8 +295582,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=75174", - "roomcode": "5539.EG.001B", + "room_link": "wbRaum.editRaum?pRaumNr=75171", + "roomcode": "5539.EG.002", "usage": 20 }, { @@ -297993,8 +299319,8 @@ "b_filter_id": 2590, "calendar": null, "list_index": "30", - "op_link": "webnav.navigate_to?corg=51267", - "operator": "[ TUS2000 ]", + "op_link": "webnav.navigate_to?corg=15298", + "operator": "[ TUMWFZG ]", "plz_place": "85748 Garching b. M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=70634", "roomcode": "8123.05.004", @@ -298193,19 +299519,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41218", - "alt_name": "3705, RLT / Umbau", - "arch_name": "3705@0507", + "address_link": "ris.einzelraum?raumkey=18944", + "alt_name": "3740, Abstellraum", + "arch_name": "3740@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "300", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41218", - "roomcode": "0507.03.705", - "usage": 32 + "room_link": "wbRaum.editRaum?pRaumNr=18944", + "roomcode": "0507.03.740", + "usage": 159 }, { "address": "Arcisstr. 21, 2.OG", @@ -298673,18 +299999,18 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41270", - "alt_name": "3706, Lager / Umbau", - "arch_name": "3706@0507", + "address_link": "ris.einzelraum?raumkey=41901", + "alt_name": "3741, Lager", + "arch_name": "3741@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "301", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=15092", + "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41270", - "roomcode": "0507.03.706", + "room_link": "wbRaum.editRaum?pRaumNr=41901", + "roomcode": "0507.03.741", "usage": 30 }, { @@ -299168,9 +300494,9 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41276", - "alt_name": "3738, Abstellraum", - "arch_name": "3738@0507", + "address_link": "ris.einzelraum?raumkey=63055", + "alt_name": "3742, Lager", + "arch_name": "3742@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -299178,9 +300504,9 @@ "op_link": "webnav.navigate_to?corg=15092", "operator": "[ TUBVVTK ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41276", - "roomcode": "0507.03.738", - "usage": 159 + "room_link": "wbRaum.editRaum?pRaumNr=63055", + "roomcode": "0507.03.742", + "usage": 30 }, { "address": "Arcisstr. 21, 2.OG", @@ -299648,19 +300974,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=18944", - "alt_name": "3740, Bibliothek", - "arch_name": "3740@0507", + "address_link": "ris.einzelraum?raumkey=41903", + "alt_name": "3744, RLT", + "arch_name": "3744@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "303", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=18944", - "roomcode": "0507.03.740", - "usage": 10 + "room_link": "wbRaum.editRaum?pRaumNr=41903", + "roomcode": "0507.03.744", + "usage": 32 }, { "address": "Arcisstr. 21, 2.OG", @@ -300143,19 +301469,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41901", - "alt_name": "3741, Abstellraum", - "arch_name": "3741@0507", + "address_link": "ris.einzelraum?raumkey=40768", + "alt_name": "3749, Flur", + "arch_name": "3749@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "304", - "op_link": "webnav.navigate_to?corg=15092", - "operator": "[ TUBVVTK ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41901", - "roomcode": "0507.03.741", - "usage": 159 + "room_link": "wbRaum.editRaum?pRaumNr=40768", + "roomcode": "0507.03.749", + "usage": 222 }, { "address": "Arcisstr. 21, 2.OG", @@ -300623,19 +301949,34 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=63055", - "alt_name": "3742, Lager", - "arch_name": "3742@0507", + "address_link": "ris.einzelraum?raumkey=40771", + "alt_name": "2750, Karl Max von Bauernfeind H\u00f6rsaal", + "arch_name": "2750@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=19691&cRes=12512&cReadonly=J", + "extended": { + "additional_description": "2750, Karl Max von Bauernfeind H\u00f6rsaal", + "address": "Arcisstr. 21(0507), 3.Obergescho\u00df", + "architect_room_nr": "2750@0507", + "area_m2": 270.88, + "building": "0507 (Z7) Bestelmeyer Nord", + "floor_number": "3.Obergescho\u00df", + "floor_type": "Linoleum", + "purpose": "H\u00f6rsaal (NF5.1 - Unterrichtsr\u00e4ume mit festem Gest\u00fchl)", + "room_number": "750", + "seats": 319, + "standing_places": 0, + "wheelchair_spaces": 0, + "zip_code_location": "80333 M\u00fcnchen" + }, "list_index": "305", - "op_link": "webnav.navigate_to?corg=15092", - "operator": "[ TUBVVTK ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63055", - "roomcode": "0507.03.742", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=40771", + "roomcode": "0507.03.750", + "usage": 20 }, { "address": "Arcisstr. 21, 2.OG", @@ -301103,9 +302444,9 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41903", - "alt_name": "3744, RLT", - "arch_name": "3744@0507", + "address_link": "ris.einzelraum?raumkey=40774", + "alt_name": "3751, RLT", + "arch_name": "3751@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -301113,8 +302454,8 @@ "op_link": "webnav.navigate_to?corg=26064", "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41903", - "roomcode": "0507.03.744", + "room_link": "wbRaum.editRaum?pRaumNr=40774", + "roomcode": "0507.03.751", "usage": 32 }, { @@ -301583,19 +302924,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=40768", - "alt_name": "3749, Flur", - "arch_name": "3749@0507", + "address_link": "ris.einzelraum?raumkey=40777", + "alt_name": "3752, Speicherarchiv", + "arch_name": "3752@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "307", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=25963", + "operator": "[ TUZVR2X ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40768", - "roomcode": "0507.03.749", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=40777", + "roomcode": "0507.03.752", + "usage": 2 }, { "address": "Arcisstr. 21, 2.OG", @@ -302047,34 +303388,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=40771", - "alt_name": "2750, Karl Max von Bauernfeind H\u00f6rsaal", - "arch_name": "2750@0507", + "address_link": "ris.einzelraum?raumkey=40779", + "alt_name": "3752A, RLT", + "arch_name": "3752A@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=19691&cRes=12512&cReadonly=J", - "extended": { - "additional_description": "2750, Karl Max von Bauernfeind H\u00f6rsaal", - "address": "Arcisstr. 21(0507), 3.Obergescho\u00df", - "architect_room_nr": "2750@0507", - "area_m2": 270.88, - "building": "0507 (Z7) Bestelmeyer Nord", - "floor_number": "3.Obergescho\u00df", - "floor_type": "Linoleum", - "purpose": "H\u00f6rsaal (NF5.1 - Unterrichtsr\u00e4ume mit festem Gest\u00fchl)", - "room_number": "750", - "seats": 319, - "standing_places": 0, - "wheelchair_spaces": 0, - "zip_code_location": "80333 M\u00fcnchen" - }, + "calendar": null, "list_index": "308", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40771", - "roomcode": "0507.03.750", - "usage": 20 + "room_link": "wbRaum.editRaum?pRaumNr=40779", + "roomcode": "0507.03.752A", + "usage": 32 }, { "address": "Arcisstr. 21, 2.OG", @@ -302526,19 +303852,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=40774", - "alt_name": "3751, RLT", - "arch_name": "3751@0507", + "address_link": "ris.einzelraum?raumkey=40785", + "alt_name": "3752B, Flur", + "arch_name": "3752B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "309", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40774", - "roomcode": "0507.03.751", - "usage": 32 + "room_link": "wbRaum.editRaum?pRaumNr=40785", + "roomcode": "0507.03.752B", + "usage": 222 }, { "address": "Arcisstr. 21, 2.OG", @@ -305938,8 +307264,8 @@ "b_filter_id": 2590, "calendar": null, "list_index": "31", - "op_link": "webnav.navigate_to?corg=51267", - "operator": "[ TUS2000 ]", + "op_link": "webnav.navigate_to?corg=47617", + "operator": "[ TUMWVIB ]", "plz_place": "85748 Garching b. M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=70588", "roomcode": "8123.05.005", @@ -306123,18 +307449,18 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=40777", - "alt_name": "3752, Speicherarchiv", - "arch_name": "3752@0507", + "address_link": "ris.einzelraum?raumkey=40788", + "alt_name": "3762, Archiv", + "arch_name": "3762@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "310", - "op_link": "webnav.navigate_to?corg=25963", - "operator": "[ TUZVR2X ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40777", - "roomcode": "0507.03.752", + "room_link": "wbRaum.editRaum?pRaumNr=40788", + "roomcode": "0507.03.762", "usage": 2 }, { @@ -306601,19 +307927,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=40779", - "alt_name": "3752A, RLT", - "arch_name": "3752A@0507", + "address_link": "ris.einzelraum?raumkey=40791", + "alt_name": "3762A, Flur", + "arch_name": "3762A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "311", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40779", - "roomcode": "0507.03.752A", - "usage": 32 + "room_link": "wbRaum.editRaum?pRaumNr=40791", + "roomcode": "0507.03.762A", + "usage": 222 }, { "address": "Arcisstr. 21, 2.OG", @@ -307049,9 +308375,9 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=40785", - "alt_name": "3752B, Flur", - "arch_name": "3752B@0507", + "address_link": "ris.einzelraum?raumkey=40795", + "alt_name": "3763, Flur", + "arch_name": "3763@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -307059,8 +308385,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40785", - "roomcode": "0507.03.752B", + "room_link": "wbRaum.editRaum?pRaumNr=40795", + "roomcode": "0507.03.763", "usage": 222 }, { @@ -307497,19 +308823,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=40788", - "alt_name": "3762, Archiv", - "arch_name": "3762@0507", + "address_link": "ris.einzelraum?raumkey=40797", + "alt_name": "3763A, Flur", + "arch_name": "3763A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "313", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40788", - "roomcode": "0507.03.762", - "usage": 2 + "room_link": "wbRaum.editRaum?pRaumNr=40797", + "roomcode": "0507.03.763A", + "usage": 222 }, { "address": "Arcisstr. 21, 2.OG", @@ -307945,9 +309271,9 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=40791", - "alt_name": "3762A, Flur", - "arch_name": "3762A@0507", + "address_link": "ris.einzelraum?raumkey=40858", + "alt_name": "3765, Projektionsraum", + "arch_name": "3765@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -307955,9 +309281,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40791", - "roomcode": "0507.03.762A", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=40858", + "roomcode": "0507.03.765", + "usage": 23 }, { "address": "Arcisstr. 21, 2.OG", @@ -308393,19 +309719,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=40795", - "alt_name": "3763, Flur", - "arch_name": "3763@0507", + "address_link": "ris.einzelraum?raumkey=40860", + "alt_name": "3767, RLT", + "arch_name": "3767@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "315", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40795", - "roomcode": "0507.03.763", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=40860", + "roomcode": "0507.03.767", + "usage": 32 }, { "address": "Arcisstr. 21, 2.OG", @@ -308840,19 +310166,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=40797", - "alt_name": "3763A, Flur", - "arch_name": "3763A@0507", + "address_link": "ris.einzelraum?raumkey=41396", + "alt_name": "3781, Serverraum", + "arch_name": "3781@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "316", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=14990", + "operator": "[ TUBVBPM ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40797", - "roomcode": "0507.03.763A", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=41396", + "roomcode": "0507.03.781", + "usage": 207 }, { "address": "Arcisstr. 21, 2.OG", @@ -309272,19 +310598,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=40858", - "alt_name": "3765, Projektionsraum", - "arch_name": "3765@0507", + "address_link": "ris.einzelraum?raumkey=41401", + "alt_name": "3782, Serverraum", + "arch_name": "3782@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "317", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=14990", + "operator": "[ TUBVBPM ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40858", - "roomcode": "0507.03.765", - "usage": 23 + "room_link": "wbRaum.editRaum?pRaumNr=41401", + "roomcode": "0507.03.782", + "usage": 207 }, { "address": "Arcisstr. 21, 2.OG", @@ -309704,19 +311030,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=40860", - "alt_name": "3767, RLT", - "arch_name": "3767@0507", + "address_link": "ris.einzelraum?raumkey=41407", + "alt_name": "3783, Teilk\u00fcche", + "arch_name": "3783@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "318", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=37801", + "operator": "[ TUZV44L ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=40860", - "roomcode": "0507.03.767", - "usage": 32 + "room_link": "wbRaum.editRaum?pRaumNr=41407", + "roomcode": "0507.03.783", + "usage": 28 }, { "address": "Arcisstr. 21, 2.OG", @@ -310136,19 +311462,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41396", - "alt_name": "3781, Serverraum", - "arch_name": "3781@0507", + "address_link": "ris.einzelraum?raumkey=41468", + "alt_name": "3784, Lager", + "arch_name": "3784@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "319", - "op_link": "webnav.navigate_to?corg=14990", - "operator": "[ TUBVBPM ]", + "op_link": "webnav.navigate_to?corg=37801", + "operator": "[ TUZV44L ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41396", - "roomcode": "0507.03.781", - "usage": 207 + "room_link": "wbRaum.editRaum?pRaumNr=41468", + "roomcode": "0507.03.784", + "usage": 30 }, { "address": "Arcisstr. 21, 2.OG", @@ -313530,8 +314856,8 @@ "b_filter_id": 2590, "calendar": null, "list_index": "32", - "op_link": "webnav.navigate_to?corg=51267", - "operator": "[ TUS2000 ]", + "op_link": "webnav.navigate_to?corg=15298", + "operator": "[ TUMWFZG ]", "plz_place": "85748 Garching b. M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=70589", "roomcode": "8123.05.006", @@ -313715,19 +315041,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41401", - "alt_name": "3782, Serverraum", - "arch_name": "3782@0507", + "address_link": "ris.einzelraum?raumkey=41469", + "alt_name": "3785, Wasserversorg.", + "arch_name": "3785@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "320", - "op_link": "webnav.navigate_to?corg=14990", - "operator": "[ TUBVBPM ]", + "op_link": "webnav.navigate_to?corg=14937", + "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41401", - "roomcode": "0507.03.782", - "usage": 207 + "room_link": "wbRaum.editRaum?pRaumNr=41469", + "roomcode": "0507.03.785", + "usage": 183 }, { "address": "Arcisstr. 21, 2.OG", @@ -314146,9 +315472,9 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41407", - "alt_name": "3783, Teilk\u00fcche", - "arch_name": "3783@0507", + "address_link": "ris.einzelraum?raumkey=41472", + "alt_name": "3786, Duschen", + "arch_name": "3786@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -314156,9 +315482,9 @@ "op_link": "webnav.navigate_to?corg=37801", "operator": "[ TUZV44L ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41407", - "roomcode": "0507.03.783", - "usage": 28 + "room_link": "wbRaum.editRaum?pRaumNr=41472", + "roomcode": "0507.03.786", + "usage": 113 }, { "address": "Arcisstr. 21, 2.OG", @@ -314562,9 +315888,9 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41468", - "alt_name": "3784, Lager", - "arch_name": "3784@0507", + "address_link": "ris.einzelraum?raumkey=41478", + "alt_name": "3787, Werkstatt", + "arch_name": "3787@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -314572,9 +315898,9 @@ "op_link": "webnav.navigate_to?corg=37801", "operator": "[ TUZV44L ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41468", - "roomcode": "0507.03.784", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=41478", + "roomcode": "0507.03.787", + "usage": 51 }, { "address": "Arcisstr. 21, 2.OG", @@ -314992,19 +316318,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41469", - "alt_name": "3785, Wasserversorg.", - "arch_name": "3785@0507", + "address_link": "ris.einzelraum?raumkey=63056", + "alt_name": "3787A, Aufenthalt Fernmeldew.", + "arch_name": "3787A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "323", - "op_link": "webnav.navigate_to?corg=14937", - "operator": "[ TUBVHYD ]", + "op_link": "webnav.navigate_to?corg=37801", + "operator": "[ TUZV44L ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41469", - "roomcode": "0507.03.785", - "usage": 183 + "room_link": "wbRaum.editRaum?pRaumNr=63056", + "roomcode": "0507.03.787A", + "usage": 44 }, { "address": "Arcisstr. 21, 2.OG", @@ -315392,9 +316718,9 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41472", - "alt_name": "3786, Duschen", - "arch_name": "3786@0507", + "address_link": "ris.einzelraum?raumkey=41530", + "alt_name": "3788, Lager", + "arch_name": "3788@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -315402,9 +316728,9 @@ "op_link": "webnav.navigate_to?corg=37801", "operator": "[ TUZV44L ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41472", - "roomcode": "0507.03.786", - "usage": 113 + "room_link": "wbRaum.editRaum?pRaumNr=41530", + "roomcode": "0507.03.788", + "usage": 30 }, { "address": "Arcisstr. 21, 2.OG", @@ -315807,9 +317133,9 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41478", - "alt_name": "3787, Werkstatt", - "arch_name": "3787@0507", + "address_link": "ris.einzelraum?raumkey=41537", + "alt_name": "3789, Lager", + "arch_name": "3789@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -315817,9 +317143,9 @@ "op_link": "webnav.navigate_to?corg=37801", "operator": "[ TUZV44L ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41478", - "roomcode": "0507.03.787", - "usage": 51 + "room_link": "wbRaum.editRaum?pRaumNr=41537", + "roomcode": "0507.03.789", + "usage": 30 }, { "address": "Arcisstr. 21, 2.OG", @@ -316222,19 +317548,19 @@ }, { "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=63056", - "alt_name": "3787A, Aufenthalt Fernmeldew.", - "arch_name": "3787A@0507", + "address_link": "ris.einzelraum?raumkey=41544", + "alt_name": "3790, Flur", + "arch_name": "3790@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "326", - "op_link": "webnav.navigate_to?corg=37801", - "operator": "[ TUZV44L ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63056", - "roomcode": "0507.03.787A", - "usage": 44 + "room_link": "wbRaum.editRaum?pRaumNr=41544", + "roomcode": "0507.03.790", + "usage": 222 }, { "address": "Arcisstr. 21, 2.OG", @@ -316650,22 +317976,6 @@ "roomcode": "0505.03.545", "usage": 12 }, - { - "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41530", - "alt_name": "3788, Lager", - "arch_name": "3788@0507", - "b_area_id": 23, - "b_filter_id": 583, - "calendar": null, - "list_index": "327", - "op_link": "webnav.navigate_to?corg=37801", - "operator": "[ TUZV44L ]", - "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41530", - "roomcode": "0507.03.788", - "usage": 30 - }, { "address": "Arcisstr. 21, 2.OG", "address_link": "ris.einzelraum?raumkey=68171", @@ -317065,22 +318375,6 @@ "roomcode": "0505.03.546", "usage": 12 }, - { - "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41537", - "alt_name": "3789, Lager", - "arch_name": "3789@0507", - "b_area_id": 23, - "b_filter_id": 583, - "calendar": null, - "list_index": "328", - "op_link": "webnav.navigate_to?corg=37801", - "operator": "[ TUZV44L ]", - "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41537", - "roomcode": "0507.03.789", - "usage": 30 - }, { "address": "Arcisstr. 21, 2.OG", "address_link": "ris.einzelraum?raumkey=7624", @@ -317465,22 +318759,6 @@ "roomcode": "0505.03.547", "usage": 12 }, - { - "address": "Arcisstr. 21, 3.OG", - "address_link": "ris.einzelraum?raumkey=41544", - "alt_name": "3790, Flur", - "arch_name": "3790@0507", - "b_area_id": 23, - "b_filter_id": 583, - "calendar": null, - "list_index": "329", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", - "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=41544", - "roomcode": "0507.03.790", - "usage": 222 - }, { "address": "Arcisstr. 21, 2.OG", "address_link": "ris.einzelraum?raumkey=38713", @@ -320799,8 +322077,8 @@ "b_filter_id": 2590, "calendar": null, "list_index": "33", - "op_link": "webnav.navigate_to?corg=51267", - "operator": "[ TUS2000 ]", + "op_link": "webnav.navigate_to?corg=15298", + "operator": "[ TUMWFZG ]", "plz_place": "85748 Garching b. M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=70590", "roomcode": "8123.05.007", @@ -321039,8 +322317,8 @@ "b_filter_id": 785, "calendar": null, "list_index": "330", - "op_link": "webnav.navigate_to?corg=14212", - "operator": "[ TUPHZ51 ]", + "op_link": "webnav.navigate_to?corg=21548", + "operator": "[ TUPHETN ]", "plz_place": "85748 Garching b. M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=51837", "roomcode": "5101.EG.278", @@ -327806,8 +329084,8 @@ "b_filter_id": 2590, "calendar": null, "list_index": "34", - "op_link": "webnav.navigate_to?corg=51267", - "operator": "[ TUS2000 ]", + "op_link": "webnav.navigate_to?corg=47617", + "operator": "[ TUMWVIB ]", "plz_place": "85748 Garching b. M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=70591", "roomcode": "8123.05.008", @@ -334304,18 +335582,18 @@ { "address": "Walther-von-Dyck-Str. 4, 5.OG", "address_link": "ris.einzelraum?raumkey=70635", - "alt_name": "5.8123.009, Besprechungsraum 3", + "alt_name": "5.8123.009, B\u00fcro", "arch_name": "5.8123.009@8123", "b_area_id": 202, "b_filter_id": 2590, "calendar": null, "list_index": "35", - "op_link": "webnav.navigate_to?corg=51267", - "operator": "[ TUS2000 ]", + "op_link": "webnav.navigate_to?corg=47617", + "operator": "[ TUMWVIB ]", "plz_place": "85748 Garching b. M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=70635", "roomcode": "8123.05.009", - "usage": 196 + "usage": 12 }, { "address": "Raitenhaslach 11, 1.OG", @@ -337995,7 +339273,7 @@ { "address": "Arcisstr. 21, 1.UG", "address_link": "ris.einzelraum?raumkey=39132", - "alt_name": "-1714, LRZ-Verteilerknoten", + "alt_name": "-1714, Server", "arch_name": "-1714@0507", "b_area_id": 23, "b_filter_id": 583, @@ -338006,7 +339284,7 @@ "plz_place": "80333 M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=39132", "roomcode": "0507.U1.714", - "usage": 120 + "usage": 207 }, { "address": "Arcisstr. 21, 1.UG", @@ -344289,7 +345567,7 @@ { "address": "Arcisstr. 21, 1.UG", "address_link": "ris.einzelraum?raumkey=39137", - "alt_name": "-1715, Lager", + "alt_name": "-1715, Server", "arch_name": "-1715@0507", "b_area_id": 23, "b_filter_id": 583, @@ -344300,7 +345578,7 @@ "plz_place": "80333 M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=39137", "roomcode": "0507.U1.715", - "usage": 30 + "usage": 207 }, { "address": "Arcisstr. 21, 1.UG", @@ -364519,8 +365797,8 @@ { "address": "Staatsgut Thalhausen, 1.UG", "address_link": "ris.einzelraum?raumkey=48395", - "alt_name": "14011, Archiv", - "arch_name": "14011@4602", + "alt_name": "ZO 04, Archiv / Server", + "arch_name": "ZO 04@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -365910,34 +367188,19 @@ }, { "address": "Boltzmannstr. 15, EG", - "address_link": "ris.einzelraum?raumkey=75171", - "alt_name": "0.002, H\u00f6rsaal 2", - "arch_name": "0.002@5539", + "address_link": "ris.einzelraum?raumkey=75172", + "alt_name": "0.003, Technikraum Tentomax", + "arch_name": "0.003@5539", "b_area_id": 34, "b_filter_id": 3149, "calendar": null, - "extended": { - "additional_description": "0.002, H\u00f6rsaal 2", - "address": "Boltzmannstr. 15(5539), Erdgescho\u00df", - "architect_room_nr": "0.002@5539", - "area_m2": 675.0, - "building": "5539 Interims-Tentomax MW", - "floor_number": "Erdgescho\u00df", - "floor_type": "Spannteppich", - "purpose": "H\u00f6rsaal (NF5.1 - Unterrichtsr\u00e4ume mit festem Gest\u00fchl)", - "room_number": "002", - "seats": 486, - "standing_places": 0, - "wheelchair_spaces": 0, - "zip_code_location": "85748 Garching b. M\u00fcnchen" - }, "list_index": "4", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=25925", + "operator": "[ TUZV142 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=75171", - "roomcode": "5539.EG.002", - "usage": 20 + "room_link": "wbRaum.editRaum?pRaumNr=75172", + "roomcode": "5539.EG.003", + "usage": 120 }, { "address": "Boltzmannstr. 3, 1.UG", @@ -372406,19 +373669,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39212", - "alt_name": "-1731, Messraum", - "arch_name": "-1731@0507", + "address_link": "ris.einzelraum?raumkey=75326", + "alt_name": "-1730A, Treppenhaus", + "arch_name": "-1730A@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=15135&cRes=18806&cReadonly=J", + "calendar": null, "list_index": "41", - "op_link": "webnav.navigate_to?corg=15135", - "operator": "[ TUARZ03 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39212", - "roomcode": "0507.U1.731", - "usage": 103 + "room_link": "wbRaum.editRaum?pRaumNr=75326", + "roomcode": "0507.U1.730A", + "usage": 223 }, { "address": "Arcisstr. 21, 1.UG", @@ -377821,19 +379084,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39247", - "alt_name": "-1734, Werkstatt", - "arch_name": "-1734@0507", + "address_link": "ris.einzelraum?raumkey=39212", + "alt_name": "-1731, Messraum", + "arch_name": "-1731@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=15135&cRes=18806&cReadonly=J", "list_index": "42", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=15135", + "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39247", - "roomcode": "0507.U1.734", - "usage": 51 + "room_link": "wbRaum.editRaum?pRaumNr=39212", + "roomcode": "0507.U1.731", + "usage": 103 }, { "address": "Arcisstr. 21, 1.UG", @@ -382807,19 +384070,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39249", - "alt_name": "-1735, Treppenhaus", - "arch_name": "-1735@0507", + "address_link": "ris.einzelraum?raumkey=39247", + "alt_name": "-1734, Maschinenraum", + "arch_name": "-1734@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "43", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39249", - "roomcode": "0507.U1.735", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=39247", + "roomcode": "0507.U1.734", + "usage": 5 }, { "address": "Arcisstr. 21, 1.UG", @@ -387618,19 +388881,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39251", - "alt_name": "-1736, Personenaufzug", - "arch_name": "-1736@0507", + "address_link": "ris.einzelraum?raumkey=39249", + "alt_name": "-1735, Treppenhaus", + "arch_name": "-1735@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "44", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39251", - "roomcode": "0507.U1.736", - "usage": 4 + "room_link": "wbRaum.editRaum?pRaumNr=39249", + "roomcode": "0507.U1.735", + "usage": 223 }, { "address": "Arcisstr. 21, 1.UG", @@ -392236,19 +393499,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39255", - "alt_name": "-1740, Werkstatt", - "arch_name": "-1740@0507", + "address_link": "ris.einzelraum?raumkey=39251", + "alt_name": "-1736, Hebeb\u00fchne", + "arch_name": "-1736@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "45", - "op_link": "webnav.navigate_to?corg=15135", - "operator": "[ TUARZ03 ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39255", - "roomcode": "0507.U1.740", - "usage": 107 + "room_link": "wbRaum.editRaum?pRaumNr=39251", + "roomcode": "0507.U1.736", + "usage": 4 }, { "address": "Arcisstr. 21, 1.UG", @@ -396597,9 +397860,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39258", - "alt_name": "-1740A, Werkstatt", - "arch_name": "-1740A@0507", + "address_link": "ris.einzelraum?raumkey=39255", + "alt_name": "-1740, Werkstatt", + "arch_name": "-1740@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -396607,8 +397870,8 @@ "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39258", - "roomcode": "0507.U1.740A", + "room_link": "wbRaum.editRaum?pRaumNr=39255", + "roomcode": "0507.U1.740", "usage": 107 }, { @@ -400611,9 +401874,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39260", - "alt_name": "-1740B, Werkstatt", - "arch_name": "-1740B@0507", + "address_link": "ris.einzelraum?raumkey=39258", + "alt_name": "-1740A, Werkstatt", + "arch_name": "-1740A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -400621,8 +401884,8 @@ "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39260", - "roomcode": "0507.U1.740B", + "room_link": "wbRaum.editRaum?pRaumNr=39258", + "roomcode": "0507.U1.740A", "usage": 107 }, { @@ -404448,9 +405711,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=72821", - "alt_name": "-1740C, Drucktechnikwerkstatt", - "arch_name": "-1740C@0507", + "address_link": "ris.einzelraum?raumkey=39260", + "alt_name": "-1740B, Werkstatt", + "arch_name": "-1740B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -404458,9 +405721,9 @@ "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=72821", - "roomcode": "0507.U1.740C", - "usage": 51 + "room_link": "wbRaum.editRaum?pRaumNr=39260", + "roomcode": "0507.U1.740B", + "usage": 107 }, { "address": "Arcisstr. 21, 1.UG", @@ -408059,18 +409322,18 @@ { "address": "Richard-Wagner-Str. 18, 1.OG", "address_link": "ris.einzelraum?raumkey=37741", - "alt_name": "1104, B\u00fcro", + "alt_name": "1104, Besprechungsraum", "arch_name": "1104@0401", "b_area_id": 24, "b_filter_id": 575, "calendar": null, "list_index": "49", - "op_link": "webnav.navigate_to?corg=37622", - "operator": "[ TUZV44G ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=37741", "roomcode": "0401.01.104", - "usage": 12 + "usage": 196 }, { "address": "Arcisstr. 21, 1.UG", @@ -408185,9 +409448,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39263", - "alt_name": "-1741A, B\u00fcro", - "arch_name": "-1741A@0507", + "address_link": "ris.einzelraum?raumkey=72821", + "alt_name": "-1740C, Drucktechnikwerkstatt", + "arch_name": "-1740C@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -408195,9 +409458,9 @@ "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39263", - "roomcode": "0507.U1.741A", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=72821", + "roomcode": "0507.U1.740C", + "usage": 51 }, { "address": "Arcisstr. 21, 1.UG", @@ -412281,7 +413544,7 @@ "arch_name": "SPW 2@2312", "b_area_id": 18, "b_filter_id": 610, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=14195&cRes=33472&cReadonly=J", "list_index": "5", "op_link": "webnav.navigate_to?corg=14195", "operator": "[ TUSPFSP ]", @@ -414382,7 +415645,7 @@ "area_m2": 177.8, "building": "4317 Tierwissenschaften", "floor_number": "Erdgescho\u00df", - "floor_type": "Keine Angabe", + "floor_type": "Linoleum", "purpose": "H\u00f6rsaal (NF5.1 - Unterrichtsr\u00e4ume mit festem Gest\u00fchl)", "room_number": "003", "seats": 130, @@ -414705,8 +415968,8 @@ { "address": "Staatsgut Thalhausen, 1.UG", "address_link": "ris.einzelraum?raumkey=48431", - "alt_name": "1401, Arbeitsraum 2 Z005", - "arch_name": "1401@4602", + "alt_name": "ZO 05, Labor BIO 1 S 1", + "arch_name": "ZO 05@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -416014,22 +417277,6 @@ "roomcode": "5532.U1.005", "usage": 30 }, - { - "address": "Boltzmannstr. 15, EG", - "address_link": "ris.einzelraum?raumkey=75172", - "alt_name": "0.003, Technikraum Tentomax", - "arch_name": "0.003@5539", - "b_area_id": 34, - "b_filter_id": 3149, - "calendar": null, - "list_index": "5", - "op_link": "webnav.navigate_to?corg=25925", - "operator": "[ TUZV142 ]", - "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=75172", - "roomcode": "5539.EG.003", - "usage": 120 - }, { "address": "Boltzmannstr. 3, 1.UG", "address_link": "ris.einzelraum?raumkey=59826", @@ -417036,9 +418283,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39266", - "alt_name": "-1741B, B\u00fcro", - "arch_name": "-1741B@0507", + "address_link": "ris.einzelraum?raumkey=39263", + "alt_name": "-1741A, B\u00fcro", + "arch_name": "-1741A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -417046,8 +418293,8 @@ "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39266", - "roomcode": "0507.U1.741B", + "room_link": "wbRaum.editRaum?pRaumNr=39263", + "roomcode": "0507.U1.741A", "usage": 12 }, { @@ -418271,8 +419518,8 @@ "b_filter_id": 1161, "calendar": null, "list_index": "50", - "op_link": "webnav.navigate_to?corg=51338", - "operator": "[ TUWZD1A ]", + "op_link": "webnav.navigate_to?corg=39675", + "operator": "[ TUZEHEZ ]", "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=64904", "roomcode": "4318.01.008", @@ -420421,9 +421668,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39231", - "alt_name": "-1742, Werkstatt", - "arch_name": "-1742@0507", + "address_link": "ris.einzelraum?raumkey=39266", + "alt_name": "-1741B, B\u00fcro", + "arch_name": "-1741B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -420431,9 +421678,9 @@ "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39231", - "roomcode": "0507.U1.742", - "usage": 107 + "room_link": "wbRaum.editRaum?pRaumNr=39266", + "roomcode": "0507.U1.741B", + "usage": 12 }, { "address": "Arcisstr. 21, 1.UG", @@ -423775,9 +425022,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39236", - "alt_name": "-1744A, Werkstatt", - "arch_name": "-1744A@0507", + "address_link": "ris.einzelraum?raumkey=39231", + "alt_name": "-1742, Werkstatt", + "arch_name": "-1742@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -423785,8 +425032,8 @@ "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39236", - "roomcode": "0507.U1.744A", + "room_link": "wbRaum.editRaum?pRaumNr=39231", + "roomcode": "0507.U1.742", "usage": 107 }, { @@ -427113,9 +428360,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39239", - "alt_name": "-1744B, Werkstatt", - "arch_name": "-1744B@0507", + "address_link": "ris.einzelraum?raumkey=39236", + "alt_name": "-1744A, Werkstatt", + "arch_name": "-1744A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -427123,8 +428370,8 @@ "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39239", - "roomcode": "0507.U1.744B", + "room_link": "wbRaum.editRaum?pRaumNr=39236", + "roomcode": "0507.U1.744A", "usage": 107 }, { @@ -430465,9 +431712,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39365", - "alt_name": "-1744C, Werkstatt", - "arch_name": "-1744C@0507", + "address_link": "ris.einzelraum?raumkey=39239", + "alt_name": "-1744B, Werkstatt", + "arch_name": "-1744B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -430475,8 +431722,8 @@ "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39365", - "roomcode": "0507.U1.744C", + "room_link": "wbRaum.editRaum?pRaumNr=39239", + "roomcode": "0507.U1.744B", "usage": 107 }, { @@ -433581,9 +434828,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39366", - "alt_name": "-1745, Lackierraum", - "arch_name": "-1745@0507", + "address_link": "ris.einzelraum?raumkey=39365", + "alt_name": "-1744C, Werkstatt", + "arch_name": "-1744C@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -433591,9 +434838,9 @@ "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39366", - "roomcode": "0507.U1.745", - "usage": 51 + "room_link": "wbRaum.editRaum?pRaumNr=39365", + "roomcode": "0507.U1.744C", + "usage": 107 }, { "address": "Arcisstr. 21, 1.UG", @@ -436757,18 +438004,18 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39394", - "alt_name": "-1746, Werkstatt", - "arch_name": "-1746@0507", + "address_link": "ris.einzelraum?raumkey=39366", + "alt_name": "-1745, Lackierraum", + "arch_name": "-1745@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "56", - "op_link": "webnav.navigate_to?corg=15187", - "operator": "[ TUARL05 ]", + "op_link": "webnav.navigate_to?corg=15135", + "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39394", - "roomcode": "0507.U1.746", + "room_link": "wbRaum.editRaum?pRaumNr=39366", + "roomcode": "0507.U1.745", "usage": 51 }, { @@ -438259,19 +439506,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=46868", - "alt_name": "0201, Speisesaal", - "arch_name": "0201@5302", + "address_link": "ris.einzelraum?raumkey=44375", + "alt_name": "00.003.A, Aufbereitung Siebraum", + "arch_name": "00.003.A@5302", "b_area_id": 30, "b_filter_id": 816, - "calendar": "tvKalender.wSicht?cOrg=39688&cRes=23689&cReadonly=J", + "calendar": null, "list_index": "56", "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=46868", - "roomcode": "5302.EG.001", - "usage": 147 + "room_link": "wbRaum.editRaum?pRaumNr=44375", + "roomcode": "5302.EG.003A", + "usage": 51 }, { "address": "Boltzmannstr. 19, EG", @@ -439586,9 +440833,9 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38400", - "alt_name": "N0422, Fotolabor, Lichtpausraum", - "arch_name": "N0422@0104", + "address_link": "ris.einzelraum?raumkey=38403", + "alt_name": "N0423, Lager/Kopierer", + "arch_name": "N0423@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -439596,9 +440843,9 @@ "op_link": "webnav.navigate_to?corg=53497", "operator": "[ TUEILSY ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38400", - "roomcode": "0104.EG.422", - "usage": 110 + "room_link": "wbRaum.editRaum?pRaumNr=38403", + "roomcode": "0104.EG.423", + "usage": 30 }, { "address": "Theresienstr. 90, 1.OG", @@ -439858,19 +441105,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=72846", - "alt_name": "-1746A, Flur", - "arch_name": "-1746A@0507", + "address_link": "ris.einzelraum?raumkey=39394", + "alt_name": "-1746, Werkstatt", + "arch_name": "-1746@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "57", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15187", + "operator": "[ TUARL05 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=72846", - "roomcode": "0507.U1.746A", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=39394", + "roomcode": "0507.U1.746", + "usage": 51 }, { "address": "Arcisstr. 21, EG", @@ -441359,9 +442606,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=47024", - "alt_name": "0224, Speisesaal", - "arch_name": "0224@5302", + "address_link": "ris.einzelraum?raumkey=44534", + "alt_name": "00.005.A, Sozialraum", + "arch_name": "00.005.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -441369,9 +442616,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=47024", - "roomcode": "5302.EG.001B", - "usage": 147 + "room_link": "wbRaum.editRaum?pRaumNr=44534", + "roomcode": "5302.EG.005A", + "usage": 44 }, { "address": "Boltzmannstr. 19, EG", @@ -442700,9 +443947,9 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38403", - "alt_name": "N0423, Lager", - "arch_name": "N0423@0104", + "address_link": "ris.einzelraum?raumkey=38424", + "alt_name": "N0424, Lichtschleuse/Dunkelraum", + "arch_name": "N0424@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -442710,9 +443957,9 @@ "op_link": "webnav.navigate_to?corg=53497", "operator": "[ TUEILSY ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38403", - "roomcode": "0104.EG.423", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=38424", + "roomcode": "0104.EG.424", + "usage": 104 }, { "address": "Theresienstr. 90, 1.OG", @@ -442972,19 +444219,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=72848", - "alt_name": "-1746B, Fernmeldetechnik", - "arch_name": "-1746B@0507", + "address_link": "ris.einzelraum?raumkey=72846", + "alt_name": "-1746A, Flur", + "arch_name": "-1746A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "58", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=72848", - "roomcode": "0507.U1.746B", - "usage": 202 + "room_link": "wbRaum.editRaum?pRaumNr=72846", + "roomcode": "0507.U1.746A", + "usage": 222 }, { "address": "Arcisstr. 21, EG", @@ -444442,19 +445689,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=47032", - "alt_name": "0202, Cafeteria", - "arch_name": "0202@5302", + "address_link": "ris.einzelraum?raumkey=75405", + "alt_name": "00.006.A, Sanit\u00e4tsraum", + "arch_name": "00.006.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "58", - "op_link": "webnav.navigate_to?corg=25918", - "operator": "[ TUZV141 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=47032", - "roomcode": "5302.EG.002", - "usage": 139 + "room_link": "wbRaum.editRaum?pRaumNr=75405", + "roomcode": "5302.EG.006A", + "usage": 178 }, { "address": "Boltzmannstr. 19, EG", @@ -445796,9 +447043,9 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38424", - "alt_name": "N0424, Lichtschleuse/Dunkelraum", - "arch_name": "N0424@0104", + "address_link": "ris.einzelraum?raumkey=38441", + "alt_name": "N0425, Fotolabor,Lichtpausraum", + "arch_name": "N0425@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -445806,9 +447053,9 @@ "op_link": "webnav.navigate_to?corg=53497", "operator": "[ TUEILSY ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38424", - "roomcode": "0104.EG.424", - "usage": 104 + "room_link": "wbRaum.editRaum?pRaumNr=38441", + "roomcode": "0104.EG.425", + "usage": 110 }, { "address": "Theresienstr. 90, 1.OG", @@ -446083,19 +447330,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39396", - "alt_name": "-1749A, Flur", - "arch_name": "-1749A@0507", + "address_link": "ris.einzelraum?raumkey=72848", + "alt_name": "-1746B, Fernmeldetechnik", + "arch_name": "-1746B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "59", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39396", - "roomcode": "0507.U1.749A", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=72848", + "roomcode": "0507.U1.746B", + "usage": 202 }, { "address": "Arcisstr. 21, EG", @@ -447613,19 +448860,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=47037", - "alt_name": "0202A, WC-Damen / Cafeteria", - "arch_name": "0202A@5302", + "address_link": "ris.einzelraum?raumkey=44706", + "alt_name": "00.007.A, Umkleide Herren", + "arch_name": "00.007.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "59", - "op_link": "webnav.navigate_to?corg=25918", - "operator": "[ TUZV141 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=47037", - "roomcode": "5302.EG.002A", - "usage": 116 + "room_link": "wbRaum.editRaum?pRaumNr=44706", + "roomcode": "5302.EG.007A", + "usage": 121 }, { "address": "Boltzmannstr. 19, EG", @@ -449661,7 +450908,7 @@ "arch_name": "SPW 3@2312", "b_area_id": 18, "b_filter_id": 610, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=14195&cRes=33473&cReadonly=J", "list_index": "6", "op_link": "webnav.navigate_to?corg=14195", "operator": "[ TUSPFSP ]", @@ -451897,8 +453144,8 @@ { "address": "Staatsgut Thalhausen, 1.UG", "address_link": "ris.einzelraum?raumkey=48438", - "alt_name": "1402, Arbeitsraum 1 Z008", - "arch_name": "1402@4602", + "alt_name": "ZO 06, Arbeitsraum 1 Z008", + "arch_name": "ZO 06@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -453892,19 +455139,19 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38441", - "alt_name": "N0425, Fotolabor,Lichtpausraum", - "arch_name": "N0425@0104", + "address_link": "ris.einzelraum?raumkey=38445", + "alt_name": "N0426, Physiklabor mit elektromagnetischer Abschir", + "arch_name": "N0426@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "60", - "op_link": "webnav.navigate_to?corg=53497", - "operator": "[ TUEILSY ]", + "op_link": "webnav.navigate_to?corg=15376", + "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38441", - "roomcode": "0104.EG.425", - "usage": 110 + "room_link": "wbRaum.editRaum?pRaumNr=38445", + "roomcode": "0104.EG.426", + "usage": 103 }, { "address": "Theresienstr. 90, 1.OG", @@ -454164,9 +455411,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39401", - "alt_name": "-1749B, Flur", - "arch_name": "-1749B@0507", + "address_link": "ris.einzelraum?raumkey=39396", + "alt_name": "-1749A, Flur", + "arch_name": "-1749A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -454174,8 +455421,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39401", - "roomcode": "0507.U1.749B", + "room_link": "wbRaum.editRaum?pRaumNr=39396", + "roomcode": "0507.U1.749A", "usage": 222 }, { @@ -455649,18 +456896,18 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=47050", - "alt_name": "0202B, WC-Herren / Cafeteria", - "arch_name": "0202B@5302", + "address_link": "ris.einzelraum?raumkey=75403", + "alt_name": "00.008.A, WC-Herren mit Dusche", + "arch_name": "00.008.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "60", - "op_link": "webnav.navigate_to?corg=25918", - "operator": "[ TUZV141 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=47050", - "roomcode": "5302.EG.002B", + "room_link": "wbRaum.editRaum?pRaumNr=75403", + "roomcode": "5302.EG.008A", "usage": 115 }, { @@ -456783,19 +458030,19 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38445", - "alt_name": "N0426, Physiklabor mit elektromagnetischer Abschir", - "arch_name": "N0426@0104", + "address_link": "ris.einzelraum?raumkey=38447", + "alt_name": "N0427, WC-Herren", + "arch_name": "N0427@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "61", - "op_link": "webnav.navigate_to?corg=15376", - "operator": "[ TUEITEP ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38445", - "roomcode": "0104.EG.426", - "usage": 103 + "room_link": "wbRaum.editRaum?pRaumNr=38447", + "roomcode": "0104.EG.427", + "usage": 115 }, { "address": "Theresienstr. 90, 1.OG", @@ -457055,9 +458302,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=63032", - "alt_name": "-1749C, Flur", - "arch_name": "-1749C@0507", + "address_link": "ris.einzelraum?raumkey=39401", + "alt_name": "-1749B, Flur", + "arch_name": "-1749B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -457065,8 +458312,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63032", - "roomcode": "0507.U1.749C", + "room_link": "wbRaum.editRaum?pRaumNr=39401", + "roomcode": "0507.U1.749B", "usage": 222 }, { @@ -458525,19 +459772,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=47056", - "alt_name": "0202C, Flur / Cafeteria", - "arch_name": "0202C@5302", + "address_link": "ris.einzelraum?raumkey=75404", + "alt_name": "00.009.A, WC-Herren mit Dusche", + "arch_name": "00.009.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "61", - "op_link": "webnav.navigate_to?corg=25918", - "operator": "[ TUZV141 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=47056", - "roomcode": "5302.EG.002C", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=75404", + "roomcode": "5302.EG.009A", + "usage": 115 }, { "address": "Boltzmannstr. 19, EG", @@ -459659,9 +460906,9 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38447", - "alt_name": "N0427, WC-Herren", - "arch_name": "N0427@0104", + "address_link": "ris.einzelraum?raumkey=38454", + "alt_name": "N0427A, Dusche", + "arch_name": "N0427A@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -459669,9 +460916,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38447", - "roomcode": "0104.EG.427", - "usage": 115 + "room_link": "wbRaum.editRaum?pRaumNr=38454", + "roomcode": "0104.EG.427A", + "usage": 113 }, { "address": "Theresienstr. 90, 1.OG", @@ -459961,19 +461208,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39404", - "alt_name": "-1751, Werkstatt", - "arch_name": "-1751@0507", + "address_link": "ris.einzelraum?raumkey=63032", + "alt_name": "-1749C, Flur", + "arch_name": "-1749C@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "62", - "op_link": "webnav.navigate_to?corg=15187", - "operator": "[ TUARL05 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39404", - "roomcode": "0507.U1.751", - "usage": 51 + "room_link": "wbRaum.editRaum?pRaumNr=63032", + "roomcode": "0507.U1.749C", + "usage": 222 }, { "address": "Arcisstr. 21, EG", @@ -461400,19 +462647,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44341", - "alt_name": "0202D, Cafeteria-K\u00fcche", - "arch_name": "0202D@5302", + "address_link": "ris.einzelraum?raumkey=75406", + "alt_name": "00.010.A, Umkleide Damen", + "arch_name": "00.010.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "62", - "op_link": "webnav.navigate_to?corg=25918", - "operator": "[ TUZV141 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44341", - "roomcode": "5302.EG.002D", - "usage": 28 + "room_link": "wbRaum.editRaum?pRaumNr=75406", + "roomcode": "5302.EG.010A", + "usage": 121 }, { "address": "Boltzmannstr. 19, EG", @@ -462285,8 +463532,8 @@ "b_filter_id": 785, "calendar": null, "list_index": "623", - "op_link": "webnav.navigate_to?corg=49797", - "operator": "[ TUPHTFE ]", + "op_link": "webnav.navigate_to?corg=54439", + "operator": "[ TUS3004 ]", "plz_place": "85748 Garching b. M\u00fcnchen", "room_link": "wbRaum.editRaum?pRaumNr=12879", "roomcode": "5101.01.337", @@ -462549,9 +463796,9 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38454", - "alt_name": "N0427A, Dusche", - "arch_name": "N0427A@0104", + "address_link": "ris.einzelraum?raumkey=64206", + "alt_name": "N0427B, WC-Vorraum Herren", + "arch_name": "N0427B@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -462559,9 +463806,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38454", - "roomcode": "0104.EG.427A", - "usage": 113 + "room_link": "wbRaum.editRaum?pRaumNr=64206", + "roomcode": "0104.EG.427B", + "usage": 118 }, { "address": "Theresienstr. 90, 1.OG", @@ -462821,18 +464068,18 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39411", - "alt_name": "-1756, Werkstatt", - "arch_name": "-1756@0507", + "address_link": "ris.einzelraum?raumkey=39404", + "alt_name": "-1751, Werkstatt", + "arch_name": "-1751@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "63", - "op_link": "webnav.navigate_to?corg=15135", - "operator": "[ TUARZ03 ]", + "op_link": "webnav.navigate_to?corg=15187", + "operator": "[ TUARL05 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39411", - "roomcode": "0507.U1.756", + "room_link": "wbRaum.editRaum?pRaumNr=39404", + "roomcode": "0507.U1.751", "usage": 51 }, { @@ -464243,19 +465490,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44354", - "alt_name": "0202E, Lager / Cafeteria", - "arch_name": "0202E@5302", + "address_link": "ris.einzelraum?raumkey=75407", + "alt_name": "00.011.A, WC-Damen mit Dusche", + "arch_name": "00.011.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "63", - "op_link": "webnav.navigate_to?corg=25918", - "operator": "[ TUZV141 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44354", - "roomcode": "5302.EG.002E", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=75407", + "roomcode": "5302.EG.011A", + "usage": 116 }, { "address": "Boltzmannstr. 19, EG", @@ -465392,19 +466639,19 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=64206", - "alt_name": "N0427B, WC-Vorraum Herren", - "arch_name": "N0427B@0104", + "address_link": "ris.einzelraum?raumkey=38461", + "alt_name": "N0428, Aufzug", + "arch_name": "N0428@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "64", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=64206", - "roomcode": "0104.EG.427B", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=38461", + "roomcode": "0104.EG.428", + "usage": 4 }, { "address": "Theresienstr. 90, 1.OG", @@ -465663,9 +466910,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=7861", - "alt_name": "-1758, B\u00fcro", - "arch_name": "-1758@0507", + "address_link": "ris.einzelraum?raumkey=39411", + "alt_name": "-1756, Werkstatt", + "arch_name": "-1756@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -465673,9 +466920,9 @@ "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=7861", - "roomcode": "0507.U1.758", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=39411", + "roomcode": "0507.U1.756", + "usage": 51 }, { "address": "Arcisstr. 21, EG", @@ -467085,19 +468332,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44365", - "alt_name": "0202F, Biergarten / Cafeteria", - "arch_name": "0202F@5302", + "address_link": "ris.einzelraum?raumkey=75353", + "alt_name": "00.012.A, Klimaraum Konstantklima 3", + "arch_name": "00.012.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "64", - "op_link": "webnav.navigate_to?corg=25918", - "operator": "[ TUZV141 ]", + "op_link": "webnav.navigate_to?corg=39688", + "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44365", - "roomcode": "5302.EG.002F", - "usage": 218 + "room_link": "wbRaum.editRaum?pRaumNr=75353", + "roomcode": "5302.EG.012A", + "usage": 30 }, { "address": "Boltzmannstr. 19, EG", @@ -468093,9 +469340,9 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38461", - "alt_name": "N0428, Aufzug", - "arch_name": "N0428@0104", + "address_link": "ris.einzelraum?raumkey=38466", + "alt_name": "N0429, Installation", + "arch_name": "N0429@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -468103,9 +469350,9 @@ "op_link": "webnav.navigate_to?corg=26064", "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38461", - "roomcode": "0104.EG.428", - "usage": 4 + "room_link": "wbRaum.editRaum?pRaumNr=38466", + "roomcode": "0104.EG.429", + "usage": 120 }, { "address": "Theresienstr. 90, 1.OG", @@ -468348,19 +469595,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=19655", - "alt_name": "-1760, Labor", - "arch_name": "-1760@0507", + "address_link": "ris.einzelraum?raumkey=7861", + "alt_name": "-1758, B\u00fcro", + "arch_name": "-1758@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=14937&cRes=18484&cReadonly=J", + "calendar": null, "list_index": "65", - "op_link": "webnav.navigate_to?corg=14937", - "operator": "[ TUBVHYD ]", + "op_link": "webnav.navigate_to?corg=15135", + "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=19655", - "roomcode": "0507.U1.760", - "usage": 194 + "room_link": "wbRaum.editRaum?pRaumNr=7861", + "roomcode": "0507.U1.758", + "usage": 12 }, { "address": "Arcisstr. 21, EG", @@ -469739,9 +470986,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44375", - "alt_name": "0225, Sanit\u00e4tsraum", - "arch_name": "0225@5302", + "address_link": "ris.einzelraum?raumkey=75354", + "alt_name": "00.013.A, Klimaraum Konstantklima 4", + "arch_name": "00.013.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -469749,9 +470996,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44375", - "roomcode": "5302.EG.003A", - "usage": 178 + "room_link": "wbRaum.editRaum?pRaumNr=75354", + "roomcode": "5302.EG.013A", + "usage": 30 }, { "address": "Boltzmannstr. 19, EG", @@ -470713,19 +471960,19 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38466", - "alt_name": "N0429, Installation", - "arch_name": "N0429@0104", + "address_link": "ris.einzelraum?raumkey=38471", + "alt_name": "N0430, WC-Damen", + "arch_name": "N0430@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "66", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38466", - "roomcode": "0104.EG.429", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=38471", + "roomcode": "0104.EG.430", + "usage": 116 }, { "address": "Theresienstr. 90, 1.OG", @@ -470953,18 +472200,18 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=63033", - "alt_name": "-1760A, Labor", - "arch_name": "-1760A@0507", + "address_link": "ris.einzelraum?raumkey=19655", + "alt_name": "-1760, Labor", + "arch_name": "-1760@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=14937&cRes=18484&cReadonly=J", "list_index": "66", "op_link": "webnav.navigate_to?corg=14937", "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63033", - "roomcode": "0507.U1.760A", + "room_link": "wbRaum.editRaum?pRaumNr=19655", + "roomcode": "0507.U1.760", "usage": 194 }, { @@ -472374,9 +473621,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44521", - "alt_name": "0216, Umkleide", - "arch_name": "0216@5302", + "address_link": "ris.einzelraum?raumkey=45063", + "alt_name": "00.015.A, Klimaraum Konstantklima 1", + "arch_name": "00.015.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -472384,9 +473631,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44521", - "roomcode": "5302.EG.004", - "usage": 121 + "room_link": "wbRaum.editRaum?pRaumNr=45063", + "roomcode": "5302.EG.015A", + "usage": 30 }, { "address": "Boltzmannstr. 19, EG", @@ -473333,9 +474580,9 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38471", - "alt_name": "N0430, WC-Damen", - "arch_name": "N0430@0104", + "address_link": "ris.einzelraum?raumkey=64207", + "alt_name": "N0430A, WC-Vorraum Damen", + "arch_name": "N0430A@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -473343,9 +474590,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38471", - "roomcode": "0104.EG.430", - "usage": 116 + "room_link": "wbRaum.editRaum?pRaumNr=64207", + "roomcode": "0104.EG.430A", + "usage": 118 }, { "address": "Theresienstr. 90, 1.OG", @@ -473603,9 +474850,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=63034", - "alt_name": "-1760B, Labor", - "arch_name": "-1760B@0507", + "address_link": "ris.einzelraum?raumkey=63033", + "alt_name": "-1760A, Labor", + "arch_name": "-1760A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -473613,8 +474860,8 @@ "op_link": "webnav.navigate_to?corg=14937", "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63034", - "roomcode": "0507.U1.760B", + "room_link": "wbRaum.editRaum?pRaumNr=63033", + "roomcode": "0507.U1.760A", "usage": 194 }, { @@ -474947,9 +476194,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44534", - "alt_name": "0217, Umkleide", - "arch_name": "0217@5302", + "address_link": "ris.einzelraum?raumkey=45081", + "alt_name": "00.016.A, Pr\u00fcfhalle Staubzone", + "arch_name": "00.016.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -474957,9 +476204,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44534", - "roomcode": "5302.EG.005A", - "usage": 121 + "room_link": "wbRaum.editRaum?pRaumNr=45081", + "roomcode": "5302.EG.016A", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -475966,9 +477213,9 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=64207", - "alt_name": "N0430A, WC-Vorraum Damen", - "arch_name": "N0430A@0104", + "address_link": "ris.einzelraum?raumkey=38482", + "alt_name": "N0431, WC-Herren", + "arch_name": "N0431@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -475976,9 +477223,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=64207", - "roomcode": "0104.EG.430A", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=38482", + "roomcode": "0104.EG.431", + "usage": 115 }, { "address": "Theresienstr. 90, 1.OG", @@ -476236,19 +477483,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39427", - "alt_name": "-1761, WC-H", - "arch_name": "-1761@0507", + "address_link": "ris.einzelraum?raumkey=63034", + "alt_name": "-1760B, Labor", + "arch_name": "-1760B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "68", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=14937", + "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39427", - "roomcode": "0507.U1.761", - "usage": 115 + "room_link": "wbRaum.editRaum?pRaumNr=63034", + "roomcode": "0507.U1.760B", + "usage": 194 }, { "address": "Arcisstr. 21, EG", @@ -477563,9 +478810,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44545", - "alt_name": "0218, Umkleide", - "arch_name": "0218@5302", + "address_link": "ris.einzelraum?raumkey=75443", + "alt_name": "00.017.A, Termografiepr\u00fcfraum", + "arch_name": "00.017.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -477573,9 +478820,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44545", - "roomcode": "5302.EG.005B", - "usage": 121 + "room_link": "wbRaum.editRaum?pRaumNr=75443", + "roomcode": "5302.EG.017A", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -478535,9 +479782,9 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38482", - "alt_name": "N0431, WC-Herren", - "arch_name": "N0431@0104", + "address_link": "ris.einzelraum?raumkey=64208", + "alt_name": "N0431A, WC-Vorraum Herren", + "arch_name": "N0431A@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -478545,9 +479792,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38482", - "roomcode": "0104.EG.431", - "usage": 115 + "room_link": "wbRaum.editRaum?pRaumNr=64208", + "roomcode": "0104.EG.431A", + "usage": 118 }, { "address": "Theresienstr. 90, 1.OG", @@ -478775,19 +480022,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39436", - "alt_name": "-1762, Lager/Technol. Labor", - "arch_name": "-1762@0507", + "address_link": "ris.einzelraum?raumkey=39427", + "alt_name": "-1761, Werkstatt", + "arch_name": "-1761@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "69", - "op_link": "webnav.navigate_to?corg=14937", - "operator": "[ TUBVHYD ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39436", - "roomcode": "0507.U1.762", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=39427", + "roomcode": "0507.U1.761", + "usage": 51 }, { "address": "Arcisstr. 21, EG", @@ -480087,9 +481334,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44556", - "alt_name": "0219, Umkleide", - "arch_name": "0219@5302", + "address_link": "ris.einzelraum?raumkey=45265", + "alt_name": "00.018.A, Pr\u00fcfhalle HFP", + "arch_name": "00.018.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -480097,9 +481344,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44556", - "roomcode": "5302.EG.005C", - "usage": 121 + "room_link": "wbRaum.editRaum?pRaumNr=45265", + "roomcode": "5302.EG.018A", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -481831,7 +483078,7 @@ "arch_name": "9101@2309", "b_area_id": 18, "b_filter_id": 607, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=14195&cRes=33474&cReadonly=J", "list_index": "7", "op_link": "webnav.navigate_to?corg=14195", "operator": "[ TUSPFSP ]", @@ -484111,8 +485358,8 @@ { "address": "Staatsgut Thalhausen, 1.UG", "address_link": "ris.einzelraum?raumkey=48448", - "alt_name": "14013, Messzentrale", - "arch_name": "14013@4602", + "alt_name": "ZO 07, Arbeitsraum", + "arch_name": "ZO 07@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -486013,19 +487260,19 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=64208", - "alt_name": "N0431A, WC-Vorraum Herren", - "arch_name": "N0431A@0104", + "address_link": "ris.einzelraum?raumkey=38494", + "alt_name": "N0450, Flur/Archiv/Dokumentation", + "arch_name": "N0450@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "70", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15376", + "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=64208", - "roomcode": "0104.EG.431A", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=38494", + "roomcode": "0104.EG.450", + "usage": 222 }, { "address": "Theresienstr. 90, 1.OG", @@ -486268,9 +487515,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39439", - "alt_name": "-1763, Archiv", - "arch_name": "-1763@0507", + "address_link": "ris.einzelraum?raumkey=39436", + "alt_name": "-1762, Labor", + "arch_name": "-1762@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -486278,9 +487525,9 @@ "op_link": "webnav.navigate_to?corg=14937", "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39439", - "roomcode": "0507.U1.763", - "usage": 2 + "room_link": "wbRaum.editRaum?pRaumNr=39436", + "roomcode": "0507.U1.762", + "usage": 194 }, { "address": "Arcisstr. 21, EG", @@ -487547,19 +488794,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44561", - "alt_name": "0220, Waschraum", - "arch_name": "0220@5302", + "address_link": "ris.einzelraum?raumkey=75413", + "alt_name": "00.019.A, Hydraulikaggregate", + "arch_name": "00.019.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "70", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44561", - "roomcode": "5302.EG.006", - "usage": 210 + "room_link": "wbRaum.editRaum?pRaumNr=75413", + "roomcode": "5302.EG.019A", + "usage": 120 }, { "address": "Boltzmannstr. 19, EG", @@ -488437,19 +489684,19 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38494", - "alt_name": "N0450, Flur/Archiv/Dokumentation", - "arch_name": "N0450@0104", + "address_link": "ris.einzelraum?raumkey=38364", + "alt_name": "N0451, Treppenraum", + "arch_name": "N0451@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "71", - "op_link": "webnav.navigate_to?corg=15376", - "operator": "[ TUEITEP ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38494", - "roomcode": "0104.EG.450", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=38364", + "roomcode": "0104.EG.451", + "usage": 223 }, { "address": "Theresienstr. 90, 1.OG", @@ -488677,34 +489924,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39441", - "alt_name": "-1764, Seminarraum", - "arch_name": "-1764@0507", + "address_link": "ris.einzelraum?raumkey=75325", + "alt_name": "-1762B, Werkstatt", + "arch_name": "-1762B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, - "extended": { - "additional_description": "-1764, Seminarraum", - "address": "Arcisstr. 21(0507), 1.Untergescho\u00df", - "architect_room_nr": "-1764@0507", - "area_m2": 35.31, - "building": "0507 (Z7) Bestelmeyer Nord", - "floor_number": "1.Untergescho\u00df", - "floor_type": "Linoleum", - "purpose": "Seminarraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", - "room_number": "764", - "seats": 10, - "standing_places": 0, - "wheelchair_spaces": 0, - "zip_code_location": "80333 M\u00fcnchen" - }, "list_index": "71", "op_link": "webnav.navigate_to?corg=14937", "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39441", - "roomcode": "0507.U1.764", - "usage": 41 + "room_link": "wbRaum.editRaum?pRaumNr=75325", + "roomcode": "0507.U1.762B", + "usage": 51 }, { "address": "Arcisstr. 21, EG", @@ -489970,19 +491202,19 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44706", - "alt_name": "0221, Waschraum", - "arch_name": "0221@5302", + "address_link": "ris.einzelraum?raumkey=75414", + "alt_name": "00.020.A, Probenlager Stahl", + "arch_name": "00.020.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, "list_index": "71", - "op_link": "webnav.navigate_to?corg=39688", - "operator": "[ TUPEWR0 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44706", - "roomcode": "5302.EG.007A", - "usage": 210 + "room_link": "wbRaum.editRaum?pRaumNr=75414", + "roomcode": "5302.EG.020A", + "usage": 30 }, { "address": "Boltzmannstr. 19, EG", @@ -490737,19 +491969,19 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38364", - "alt_name": "N0451, Treppenraum", - "arch_name": "N0451@0104", + "address_link": "ris.einzelraum?raumkey=38593", + "alt_name": "N0452, Flur S\u00fcd/Archiv/Dokumentation", + "arch_name": "N0452@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "72", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15376", + "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38364", - "roomcode": "0104.EG.451", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=38593", + "roomcode": "0104.EG.452", + "usage": 222 }, { "address": "Theresienstr. 90, 1.OG", @@ -490992,19 +492224,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39445", - "alt_name": "-1764A, Treppe", - "arch_name": "-1764A@0507", + "address_link": "ris.einzelraum?raumkey=39439", + "alt_name": "-1763, Archiv", + "arch_name": "-1763@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "72", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=14937", + "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39445", - "roomcode": "0507.U1.764A", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=39439", + "roomcode": "0507.U1.763", + "usage": 2 }, { "address": "Arcisstr. 21, EG", @@ -492255,9 +493487,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44714", - "alt_name": "0222, Waschraum", - "arch_name": "0222@5302", + "address_link": "ris.einzelraum?raumkey=75401", + "alt_name": "00.022.A, Schleuse 3", + "arch_name": "00.022.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -492265,9 +493497,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44714", - "roomcode": "5302.EG.007B", - "usage": 210 + "room_link": "wbRaum.editRaum?pRaumNr=75401", + "roomcode": "5302.EG.022A", + "usage": 105 }, { "address": "Boltzmannstr. 19, EG", @@ -493007,9 +494239,9 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38593", - "alt_name": "N0452, Flur S\u00fcd/Archiv/Dokumentation", - "arch_name": "N0452@0104", + "address_link": "ris.einzelraum?raumkey=38601", + "alt_name": "N0453, Flur Ost/Archiv/Dokumentation", + "arch_name": "N0453@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -493017,8 +494249,8 @@ "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38593", - "roomcode": "0104.EG.452", + "room_link": "wbRaum.editRaum?pRaumNr=38601", + "roomcode": "0104.EG.453", "usage": 222 }, { @@ -493231,19 +494463,34 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39452", - "alt_name": "-1765A, Lager", - "arch_name": "-1765A@0507", + "address_link": "ris.einzelraum?raumkey=39441", + "alt_name": "-1764, Seminarraum", + "arch_name": "-1764@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, + "extended": { + "additional_description": "-1764, Seminarraum", + "address": "Arcisstr. 21(0507), 1.Untergescho\u00df", + "architect_room_nr": "-1764@0507", + "area_m2": 35.31, + "building": "0507 (Z7) Bestelmeyer Nord", + "floor_number": "1.Untergescho\u00df", + "floor_type": "Linoleum", + "purpose": "Seminarraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", + "room_number": "764", + "seats": 10, + "standing_places": 0, + "wheelchair_spaces": 0, + "zip_code_location": "80333 M\u00fcnchen" + }, "list_index": "73", "op_link": "webnav.navigate_to?corg=14937", "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39452", - "roomcode": "0507.U1.765A", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=39441", + "roomcode": "0507.U1.764", + "usage": 41 }, { "address": "Arcisstr. 21, EG", @@ -494463,9 +495710,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44725", - "alt_name": "0223, Waschraum", - "arch_name": "0223@5302", + "address_link": "ris.einzelraum?raumkey=75400", + "alt_name": "00.023.A, Schleuse 2", + "arch_name": "00.023.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -494473,9 +495720,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44725", - "roomcode": "5302.EG.007C", - "usage": 210 + "room_link": "wbRaum.editRaum?pRaumNr=75400", + "roomcode": "5302.EG.023A", + "usage": 105 }, { "address": "Boltzmannstr. 19, EG", @@ -495230,9 +496477,9 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38601", - "alt_name": "N0453, Flur Ost/Archiv/Dokumentation", - "arch_name": "N0453@0104", + "address_link": "ris.einzelraum?raumkey=38615", + "alt_name": "N0454, Flur Nord/Archiv/Dokumentation", + "arch_name": "N0454@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -495240,8 +496487,8 @@ "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38601", - "roomcode": "0104.EG.453", + "room_link": "wbRaum.editRaum?pRaumNr=38615", + "roomcode": "0104.EG.454", "usage": 222 }, { @@ -495438,19 +496685,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=72842", - "alt_name": "-1765, Technol.Lab.einf.o.Absaugung", - "arch_name": "-1765@0507", + "address_link": "ris.einzelraum?raumkey=39445", + "alt_name": "-1764A, Treppe", + "arch_name": "-1764A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "74", - "op_link": "webnav.navigate_to?corg=14937", - "operator": "[ TUBVHYD ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=72842", - "roomcode": "0507.U1.765B", - "usage": 194 + "room_link": "wbRaum.editRaum?pRaumNr=39445", + "roomcode": "0507.U1.764A", + "usage": 223 }, { "address": "Arcisstr. 21, EG", @@ -496700,9 +497947,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44736", - "alt_name": "0226, M\u00fcll", - "arch_name": "0226@5302", + "address_link": "ris.einzelraum?raumkey=75432", + "alt_name": "00.024.A, Nebelkammer", + "arch_name": "00.024.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -496710,9 +497957,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44736", - "roomcode": "5302.EG.009", - "usage": 214 + "room_link": "wbRaum.editRaum?pRaumNr=75432", + "roomcode": "5302.EG.024A", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -497482,18 +498729,18 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38615", - "alt_name": "N0454, Flur Nord/Archiv/Dokumentation", - "arch_name": "N0454@0104", + "address_link": "ris.einzelraum?raumkey=38625", + "alt_name": "N0454A, Flur Nord", + "arch_name": "N0454A@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "75", - "op_link": "webnav.navigate_to?corg=15376", - "operator": "[ TUEITEP ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38615", - "roomcode": "0104.EG.454", + "room_link": "wbRaum.editRaum?pRaumNr=38625", + "roomcode": "0104.EG.454A", "usage": 222 }, { @@ -497705,9 +498952,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39455", - "alt_name": "-1767, Flur", - "arch_name": "-1767@0507", + "address_link": "ris.einzelraum?raumkey=39452", + "alt_name": "-1765A, Lager", + "arch_name": "-1765A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -497715,9 +498962,9 @@ "op_link": "webnav.navigate_to?corg=14937", "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39455", - "roomcode": "0507.U1.767", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=39452", + "roomcode": "0507.U1.765A", + "usage": 30 }, { "address": "Arcisstr. 21, EG", @@ -498966,9 +500213,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44875", - "alt_name": "0227, Lager", - "arch_name": "0227@5302", + "address_link": "ris.einzelraum?raumkey=45639", + "alt_name": "00.025.A, Lager", + "arch_name": "00.025.A@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -498976,8 +500223,8 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44875", - "roomcode": "5302.EG.010", + "room_link": "wbRaum.editRaum?pRaumNr=45639", + "roomcode": "5302.EG.025A", "usage": 30 }, { @@ -499748,9 +500995,9 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=38625", - "alt_name": "N0454A, Flur Nord", - "arch_name": "N0454A@0104", + "address_link": "ris.einzelraum?raumkey=64210", + "alt_name": "N0490, Treppe", + "arch_name": "N0490@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -499758,9 +501005,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38625", - "roomcode": "0104.EG.454A", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=64210", + "roomcode": "0104.EG.490", + "usage": 223 }, { "address": "Theresienstr. 90, 1.OG", @@ -499956,9 +501203,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39459", - "alt_name": "-1768, Werkstatt", - "arch_name": "-1768@0507", + "address_link": "ris.einzelraum?raumkey=72842", + "alt_name": "-1765, Technol.Lab.einf.o.Absaugung", + "arch_name": "-1765@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -499966,9 +501213,9 @@ "op_link": "webnav.navigate_to?corg=14937", "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39459", - "roomcode": "0507.U1.768", - "usage": 51 + "room_link": "wbRaum.editRaum?pRaumNr=72842", + "roomcode": "0507.U1.765B", + "usage": 194 }, { "address": "Arcisstr. 21, EG", @@ -501217,9 +502464,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44882", - "alt_name": "0228, B\u00fcro", - "arch_name": "0228@5302", + "address_link": "ris.einzelraum?raumkey=75397", + "alt_name": "00.026.B, Ger\u00e4telager", + "arch_name": "00.026.B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -501227,9 +502474,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44882", - "roomcode": "5302.EG.011", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=75397", + "roomcode": "5302.EG.026B", + "usage": 30 }, { "address": "Boltzmannstr. 19, EG", @@ -501999,19 +503246,19 @@ }, { "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=64210", - "alt_name": "N0490, Treppe", - "arch_name": "N0490@0104", + "address_link": "ris.einzelraum?raumkey=64211", + "alt_name": "N491, M\u00fclltonnen", + "arch_name": "N491@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "77", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=64210", - "roomcode": "0104.EG.490", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=64211", + "roomcode": "0104.EG.491", + "usage": 31 }, { "address": "Theresienstr. 90, 1.OG", @@ -502207,9 +503454,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39466", - "alt_name": "-1769, Werkstatt", - "arch_name": "-1769@0507", + "address_link": "ris.einzelraum?raumkey=39455", + "alt_name": "-1767, Flur", + "arch_name": "-1767@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -502217,9 +503464,9 @@ "op_link": "webnav.navigate_to?corg=14937", "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39466", - "roomcode": "0507.U1.769", - "usage": 51 + "room_link": "wbRaum.editRaum?pRaumNr=39455", + "roomcode": "0507.U1.767", + "usage": 222 }, { "address": "Arcisstr. 21, EG", @@ -503452,9 +504699,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44888", - "alt_name": "0230, Annahme", - "arch_name": "0230@5302", + "address_link": "ris.einzelraum?raumkey=75431", + "alt_name": "00.027.B, Nebelkammer", + "arch_name": "00.027.B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -503462,9 +504709,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44888", - "roomcode": "5302.EG.012", - "usage": 186 + "room_link": "wbRaum.editRaum?pRaumNr=75431", + "roomcode": "5302.EG.027B", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -504202,20 +505449,20 @@ "usage": 223 }, { - "address": "Theresienstr. 90, EG", - "address_link": "ris.einzelraum?raumkey=64211", - "alt_name": "N491, M\u00fclltonnen", - "arch_name": "N491@0104", + "address": "Theresienstr. 90, 1.OG", + "address_link": "ris.einzelraum?raumkey=38632", + "alt_name": "N1401, B\u00fcro", + "arch_name": "N1401@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "78", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=15376", + "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=64211", - "roomcode": "0104.EG.491", - "usage": 31 + "room_link": "wbRaum.editRaum?pRaumNr=38632", + "roomcode": "0104.01.401", + "usage": 12 }, { "address": "Theresienstr. 90, 1.OG", @@ -504411,9 +505658,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39483", - "alt_name": "-1770, Werkstatt", - "arch_name": "-1770@0507", + "address_link": "ris.einzelraum?raumkey=39459", + "alt_name": "-1768, Werkstatt", + "arch_name": "-1768@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -504421,9 +505668,9 @@ "op_link": "webnav.navigate_to?corg=14937", "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39483", - "roomcode": "0507.U1.770", - "usage": 107 + "room_link": "wbRaum.editRaum?pRaumNr=39459", + "roomcode": "0507.U1.768", + "usage": 51 }, { "address": "Arcisstr. 21, EG", @@ -505625,9 +506872,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=44911", - "alt_name": "0203, Ausgabe", - "arch_name": "0203@5302", + "address_link": "ris.einzelraum?raumkey=75428", + "alt_name": "00.028.B, Lager", + "arch_name": "00.028.B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -505635,9 +506882,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=44911", - "roomcode": "5302.EG.014", - "usage": 186 + "room_link": "wbRaum.editRaum?pRaumNr=75428", + "roomcode": "5302.EG.028B", + "usage": 30 }, { "address": "Boltzmannstr. 19, EG", @@ -506361,9 +507608,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38632", - "alt_name": "N1401, B\u00fcro", - "arch_name": "N1401@0104", + "address_link": "ris.einzelraum?raumkey=38639", + "alt_name": "N1402, Sekretariat", + "arch_name": "N1402@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -506371,9 +507618,9 @@ "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38632", - "roomcode": "0104.01.401", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=38639", + "roomcode": "0104.01.402", + "usage": 40 }, { "address": "Theresienstr. 90, 1.OG", @@ -506584,9 +507831,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39349", - "alt_name": "-1770A, Lager", - "arch_name": "-1770A@0507", + "address_link": "ris.einzelraum?raumkey=39466", + "alt_name": "-1769, Werkstatt", + "arch_name": "-1769@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -506594,9 +507841,9 @@ "op_link": "webnav.navigate_to?corg=14937", "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39349", - "roomcode": "0507.U1.770A", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=39466", + "roomcode": "0507.U1.769", + "usage": 51 }, { "address": "Arcisstr. 21, EG", @@ -507735,9 +508982,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45063", - "alt_name": "0208, K\u00fchlraum", - "arch_name": "0208@5302", + "address_link": "ris.einzelraum?raumkey=45982", + "alt_name": "00.029.B, Pr\u00fcfraum Living Lab", + "arch_name": "00.029.B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -507745,9 +508992,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45063", - "roomcode": "5302.EG.015A", - "usage": 199 + "room_link": "wbRaum.editRaum?pRaumNr=45982", + "roomcode": "5302.EG.029B", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -511459,8 +512706,8 @@ { "address": "Staatsgut Thalhausen, 1.UG", "address_link": "ris.einzelraum?raumkey=48459", - "alt_name": "Labor", - "arch_name": "@4602", + "alt_name": "ZO 08, Labor BIO 1 S 1", + "arch_name": "ZO 08@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -513359,9 +514606,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38639", - "alt_name": "N1402, Sekretariat", - "arch_name": "N1402@0104", + "address_link": "ris.einzelraum?raumkey=38643", + "alt_name": "N1403, Prof.-B\u00fcro", + "arch_name": "N1403@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -513369,9 +514616,9 @@ "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38639", - "roomcode": "0104.01.402", - "usage": 40 + "room_link": "wbRaum.editRaum?pRaumNr=38643", + "roomcode": "0104.01.403", + "usage": 12 }, { "address": "Theresienstr. 90, 1.OG", @@ -513567,19 +514814,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39566", - "alt_name": "-1771, Flur", - "arch_name": "-1771@0507", + "address_link": "ris.einzelraum?raumkey=39483", + "alt_name": "-1770, Werkstatt", + "arch_name": "-1770@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "80", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=14937", + "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39566", - "roomcode": "0507.U1.771", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=39483", + "roomcode": "0507.U1.770", + "usage": 107 }, { "address": "Arcisstr. 21, EG", @@ -514731,9 +515978,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45071", - "alt_name": "0207, K\u00fchlraum", - "arch_name": "0207@5302", + "address_link": "ris.einzelraum?raumkey=75391", + "alt_name": "00.030B, Betonpr\u00fcfraum", + "arch_name": "00.030B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -514741,9 +515988,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45071", - "roomcode": "5302.EG.015B", - "usage": 199 + "room_link": "wbRaum.editRaum?pRaumNr=75391", + "roomcode": "5302.EG.030B", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -515482,9 +516729,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38643", - "alt_name": "N1403, Prof.-B\u00fcro", - "arch_name": "N1403@0104", + "address_link": "ris.einzelraum?raumkey=38651", + "alt_name": "N1404, B\u00fcro", + "arch_name": "N1404@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -515492,8 +516739,8 @@ "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38643", - "roomcode": "0104.01.403", + "room_link": "wbRaum.editRaum?pRaumNr=38651", + "roomcode": "0104.01.404", "usage": 12 }, { @@ -515705,9 +516952,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39573", - "alt_name": "-1772, Lager", - "arch_name": "-1772@0507", + "address_link": "ris.einzelraum?raumkey=39349", + "alt_name": "-1770A, Lager", + "arch_name": "-1770A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -515715,8 +516962,8 @@ "op_link": "webnav.navigate_to?corg=14937", "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39573", - "roomcode": "0507.U1.772", + "room_link": "wbRaum.editRaum?pRaumNr=39349", + "roomcode": "0507.U1.770A", "usage": 30 }, { @@ -516408,7 +517655,7 @@ { "address": "Emil-Ramann-Str. 4, 1.OG", "address_link": "ris.einzelraum?raumkey=50828", - "alt_name": "126, Arbeitsraum/Archiv (gem. Nutzung)", + "alt_name": "126, Gen-Arbeitsbeireich L1/S1", "arch_name": "126@4218", "b_area_id": 42, "b_filter_id": 685, @@ -516419,7 +517666,7 @@ "plz_place": "85354 Freising", "room_link": "wbRaum.editRaum?pRaumNr=50828", "roomcode": "4218.01.126", - "usage": 12 + "usage": 102 }, { "address": "Emil-Ramann-Str. 6, EG", @@ -516838,9 +518085,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45081", - "alt_name": "0205, K\u00fchlraum", - "arch_name": "0205@5302", + "address_link": "ris.einzelraum?raumkey=75396", + "alt_name": "00.031.B, Feinm\u00f6rtelpr\u00fcfraum", + "arch_name": "00.031.B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -516848,9 +518095,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45081", - "roomcode": "5302.EG.016A", - "usage": 199 + "room_link": "wbRaum.editRaum?pRaumNr=75396", + "roomcode": "5302.EG.031B", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -517589,9 +518836,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38651", - "alt_name": "N1404, B\u00fcro", - "arch_name": "N1404@0104", + "address_link": "ris.einzelraum?raumkey=7487", + "alt_name": "N1405, B\u00fcro", + "arch_name": "N1405@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -517599,8 +518846,8 @@ "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38651", - "roomcode": "0104.01.404", + "room_link": "wbRaum.editRaum?pRaumNr=7487", + "roomcode": "0104.01.405", "usage": 12 }, { @@ -517797,19 +519044,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39588", - "alt_name": "-1773, Werkstatt", - "arch_name": "-1773@0507", + "address_link": "ris.einzelraum?raumkey=39566", + "alt_name": "-1771, Flur", + "arch_name": "-1771@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "82", - "op_link": "webnav.navigate_to?corg=14937", - "operator": "[ TUBVHYD ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39588", - "roomcode": "0507.U1.773", - "usage": 107 + "room_link": "wbRaum.editRaum?pRaumNr=39566", + "roomcode": "0507.U1.771", + "usage": 222 }, { "address": "Arcisstr. 21, EG", @@ -518869,9 +520116,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45091", - "alt_name": "0206, K\u00fchlraum", - "arch_name": "0206@5302", + "address_link": "ris.einzelraum?raumkey=75393", + "alt_name": "00.032.B, Thermografieauswertung", + "arch_name": "00.032.B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -518879,9 +520126,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45091", - "roomcode": "5302.EG.016B", - "usage": 199 + "room_link": "wbRaum.editRaum?pRaumNr=75393", + "roomcode": "5302.EG.032B", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -519605,9 +520852,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=7487", - "alt_name": "N1405, B\u00fcro", - "arch_name": "N1405@0104", + "address_link": "ris.einzelraum?raumkey=38663", + "alt_name": "N1406, Studentenarb. m. DV", + "arch_name": "N1406@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -519615,9 +520862,9 @@ "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=7487", - "roomcode": "0104.01.405", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=38663", + "roomcode": "0104.01.406", + "usage": 208 }, { "address": "Theresienstr. 90, 1.OG", @@ -519813,9 +521060,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39592", - "alt_name": "-1774, Aufenthalt", - "arch_name": "-1774@0507", + "address_link": "ris.einzelraum?raumkey=39573", + "alt_name": "-1772, Lager", + "arch_name": "-1772@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -519823,9 +521070,9 @@ "op_link": "webnav.navigate_to?corg=14937", "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39592", - "roomcode": "0507.U1.774", - "usage": 44 + "room_link": "wbRaum.editRaum?pRaumNr=39573", + "roomcode": "0507.U1.772", + "usage": 30 }, { "address": "Arcisstr. 21, EG", @@ -520900,9 +522147,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45097", - "alt_name": "0210, Lager", - "arch_name": "0210@5302", + "address_link": "ris.einzelraum?raumkey=75429", + "alt_name": "00.033.B, Termografiepr\u00fcfraum", + "arch_name": "00.033.B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -520910,9 +522157,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45097", - "roomcode": "5302.EG.017", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=75429", + "roomcode": "5302.EG.033B", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -521620,9 +522867,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38663", - "alt_name": "N1406, Studentenarb. m. DV", - "arch_name": "N1406@0104", + "address_link": "ris.einzelraum?raumkey=7494", + "alt_name": "N1407, B\u00fcro", + "arch_name": "N1407@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -521630,9 +522877,9 @@ "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38663", - "roomcode": "0104.01.406", - "usage": 208 + "room_link": "wbRaum.editRaum?pRaumNr=7494", + "roomcode": "0104.01.407", + "usage": 12 }, { "address": "Theresienstr. 90, 1.OG", @@ -521843,9 +523090,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39596", - "alt_name": "-1775, Waschraum", - "arch_name": "-1775@0507", + "address_link": "ris.einzelraum?raumkey=39588", + "alt_name": "-1773, Werkstatt", + "arch_name": "-1773@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -521853,9 +523100,9 @@ "op_link": "webnav.navigate_to?corg=14937", "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39596", - "roomcode": "0507.U1.775", - "usage": 210 + "room_link": "wbRaum.editRaum?pRaumNr=39588", + "roomcode": "0507.U1.773", + "usage": 107 }, { "address": "Arcisstr. 21, EG", @@ -522898,9 +524145,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45246", - "alt_name": "0211, Lager", - "arch_name": "0211@5302", + "address_link": "ris.einzelraum?raumkey=75394", + "alt_name": "00.034.B, Lager", + "arch_name": "00.034.B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -522908,8 +524155,8 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45246", - "roomcode": "5302.EG.018", + "room_link": "wbRaum.editRaum?pRaumNr=75394", + "roomcode": "5302.EG.034B", "usage": 30 }, { @@ -523617,9 +524864,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=7494", - "alt_name": "N1407, B\u00fcro", - "arch_name": "N1407@0104", + "address_link": "ris.einzelraum?raumkey=38671", + "alt_name": "N1408, B\u00fcro", + "arch_name": "N1408@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -523627,8 +524874,8 @@ "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=7494", - "roomcode": "0104.01.407", + "room_link": "wbRaum.editRaum?pRaumNr=38671", + "roomcode": "0104.01.408", "usage": 12 }, { @@ -523825,9 +525072,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=72843", - "alt_name": "-1776, Lager", - "arch_name": "-1776@0507", + "address_link": "ris.einzelraum?raumkey=39592", + "alt_name": "-1774, Aufenthalt", + "arch_name": "-1774@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -523835,9 +525082,9 @@ "op_link": "webnav.navigate_to?corg=14937", "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=72843", - "roomcode": "0507.U1.776", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=39592", + "roomcode": "0507.U1.774", + "usage": 44 }, { "address": "Arcisstr. 21, EG", @@ -524865,9 +526112,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45265", - "alt_name": "0212, Install.Schacht", - "arch_name": "0212@5302", + "address_link": "ris.einzelraum?raumkey=75389", + "alt_name": "00.038.B, Ger\u00e4telager", + "arch_name": "00.038.B@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -524875,9 +526122,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45265", - "roomcode": "5302.EG.018A", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=75389", + "roomcode": "5302.EG.038B", + "usage": 18 }, { "address": "Boltzmannstr. 19, EG", @@ -525569,9 +526816,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38671", - "alt_name": "N1408, B\u00fcro", - "arch_name": "N1408@0104", + "address_link": "ris.einzelraum?raumkey=38676", + "alt_name": "N1409, Opt. Messtechnik", + "arch_name": "N1409@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -525579,9 +526826,9 @@ "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38671", - "roomcode": "0104.01.408", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=38676", + "roomcode": "0104.01.409", + "usage": 103 }, { "address": "Theresienstr. 90, 1.OG", @@ -525792,19 +527039,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39602", - "alt_name": "-1780, Niederspann.", - "arch_name": "-1780@0507", + "address_link": "ris.einzelraum?raumkey=39596", + "alt_name": "-1775, Waschraum", + "arch_name": "-1775@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "86", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=14937", + "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39602", - "roomcode": "0507.U1.780", - "usage": 160 + "room_link": "wbRaum.editRaum?pRaumNr=39596", + "roomcode": "0507.U1.775", + "usage": 210 }, { "address": "Arcisstr. 21, EG", @@ -526862,9 +528109,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45280", - "alt_name": "0214, Flur", - "arch_name": "0214@5302", + "address_link": "ris.einzelraum?raumkey=75386", + "alt_name": "00.041.C, B\u00fcro", + "arch_name": "00.041.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -526872,9 +528119,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45280", - "roomcode": "5302.EG.018B", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=75386", + "roomcode": "5302.EG.041C", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -527550,9 +528797,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38676", - "alt_name": "N1409, Opt. Messtechnik", - "arch_name": "N1409@0104", + "address_link": "ris.einzelraum?raumkey=38682", + "alt_name": "N1410, B\u00fcro", + "arch_name": "N1410@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -527560,9 +528807,9 @@ "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38676", - "roomcode": "0104.01.409", - "usage": 103 + "room_link": "wbRaum.editRaum?pRaumNr=38682", + "roomcode": "0104.01.410", + "usage": 12 }, { "address": "Theresienstr. 90, 1.OG", @@ -527758,19 +529005,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=63036", - "alt_name": "-1780A, Mittelspann.", - "arch_name": "-1780A@0507", + "address_link": "ris.einzelraum?raumkey=72843", + "alt_name": "-1776, Lager", + "arch_name": "-1776@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "87", - "op_link": "webnav.navigate_to?corg=26064", - "operator": "[ TUZVR44 ]", + "op_link": "webnav.navigate_to?corg=14937", + "operator": "[ TUBVHYD ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63036", - "roomcode": "0507.U1.780A", - "usage": 160 + "room_link": "wbRaum.editRaum?pRaumNr=72843", + "roomcode": "0507.U1.776", + "usage": 30 }, { "address": "Arcisstr. 21, EG", @@ -528797,9 +530044,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45429", - "alt_name": "0215, Flur", - "arch_name": "0215@5302", + "address_link": "ris.einzelraum?raumkey=75384", + "alt_name": "00.042.C, B\u00fcro", + "arch_name": "00.042.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -528807,9 +530054,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45429", - "roomcode": "5302.EG.018C", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=75384", + "roomcode": "5302.EG.042C", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -529469,9 +530716,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38682", - "alt_name": "N1410, B\u00fcro", - "arch_name": "N1410@0104", + "address_link": "ris.einzelraum?raumkey=38686", + "alt_name": "N1411, Computerlabor", + "arch_name": "N1411@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -529479,9 +530726,9 @@ "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38682", - "roomcode": "0104.01.410", - "usage": 12 + "room_link": "wbRaum.editRaum?pRaumNr=38686", + "roomcode": "0104.01.411", + "usage": 103 }, { "address": "Theresienstr. 90, 1.OG", @@ -529677,19 +530924,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39606", - "alt_name": "-1781, Lager", - "arch_name": "-1781@0507", + "address_link": "ris.einzelraum?raumkey=39602", + "alt_name": "-1780, Niederspann.", + "arch_name": "-1780@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "88", - "op_link": "webnav.navigate_to?corg=15135", - "operator": "[ TUARZ03 ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39606", - "roomcode": "0507.U1.781", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=39602", + "roomcode": "0507.U1.780", + "usage": 160 }, { "address": "Arcisstr. 21, EG", @@ -530716,9 +531963,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45438", - "alt_name": "0209, Werkstatt", - "arch_name": "0209@5302", + "address_link": "ris.einzelraum?raumkey=75383", + "alt_name": "00.043.C, B\u00fcro", + "arch_name": "00.043.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -530726,9 +531973,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45438", - "roomcode": "5302.EG.019", - "usage": 51 + "room_link": "wbRaum.editRaum?pRaumNr=75383", + "roomcode": "5302.EG.043C", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -531433,9 +532680,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38686", - "alt_name": "N1411, Computerlabor", - "arch_name": "N1411@0104", + "address_link": "ris.einzelraum?raumkey=14734", + "alt_name": "N1412, Elektronische Werkstatt", + "arch_name": "N1412@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -531443,9 +532690,9 @@ "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38686", - "roomcode": "0104.01.411", - "usage": 103 + "room_link": "wbRaum.editRaum?pRaumNr=14734", + "roomcode": "0104.01.412", + "usage": 51 }, { "address": "Theresienstr. 90, 1.OG", @@ -531641,19 +532888,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39612", - "alt_name": "-1781A, Lager", - "arch_name": "-1781A@0507", + "address_link": "ris.einzelraum?raumkey=63036", + "alt_name": "-1780A, Mittelspann.", + "arch_name": "-1780A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "89", - "op_link": "webnav.navigate_to?corg=15135", - "operator": "[ TUARZ03 ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39612", - "roomcode": "0507.U1.781A", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=63036", + "roomcode": "0507.U1.780A", + "usage": 160 }, { "address": "Arcisstr. 21, EG", @@ -532680,9 +533927,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45442", - "alt_name": "0233, K\u00fchlraum", - "arch_name": "0233@5302", + "address_link": "ris.einzelraum?raumkey=75382", + "alt_name": "00.044.C, B\u00fcro", + "arch_name": "00.044.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -532690,9 +533937,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45442", - "roomcode": "5302.EG.020", - "usage": 199 + "room_link": "wbRaum.editRaum?pRaumNr=75382", + "roomcode": "5302.EG.044C", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -533672,7 +534919,7 @@ { "address": "Arcisstr. 21, 2.UG", "address_link": "ris.einzelraum?raumkey=72818", - "alt_name": "-2710, Treppenhaus", + "alt_name": "-2710, Treppe", "arch_name": "-2710@0507", "b_area_id": 23, "b_filter_id": 583, @@ -536275,8 +537522,8 @@ { "address": "Staatsgut Thalhausen, 1.UG", "address_link": "ris.einzelraum?raumkey=48539", - "alt_name": "14014, K\u00fchlraum", - "arch_name": "14014@4602", + "alt_name": "ZO 09, K\u00fchlraum", + "arch_name": "ZO 09@4602", "b_area_id": 54, "b_filter_id": 738, "calendar": null, @@ -538143,19 +539390,19 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=14734", - "alt_name": "N1412, Elektronische Werkstatt", - "arch_name": "N1412@0104", + "address_link": "ris.einzelraum?raumkey=38514", + "alt_name": "N1413, Sitzungs-, Konferenzraum", + "arch_name": "N1413@0104", "b_area_id": 27, "b_filter_id": 564, - "calendar": null, + "calendar": "tvKalender.wSicht?cOrg=15376&cRes=28072&cReadonly=J", "list_index": "90", "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=14734", - "roomcode": "0104.01.412", - "usage": 51 + "room_link": "wbRaum.editRaum?pRaumNr=38514", + "roomcode": "0104.01.413", + "usage": 196 }, { "address": "Theresienstr. 90, 2.OG", @@ -538351,9 +539598,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=63037", - "alt_name": "-1781B, Lager", - "arch_name": "-1781B@0507", + "address_link": "ris.einzelraum?raumkey=39606", + "alt_name": "-1781, Lager", + "arch_name": "-1781@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -538361,8 +539608,8 @@ "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=63037", - "roomcode": "0507.U1.781B", + "room_link": "wbRaum.editRaum?pRaumNr=39606", + "roomcode": "0507.U1.781", "usage": 30 }, { @@ -539389,9 +540636,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45457", - "alt_name": "0234, K\u00fchlraum", - "arch_name": "0234@5302", + "address_link": "ris.einzelraum?raumkey=75381", + "alt_name": "00.045.C, B\u00fcro", + "arch_name": "00.045.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -539399,9 +540646,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45457", - "roomcode": "5302.EG.021", - "usage": 199 + "room_link": "wbRaum.editRaum?pRaumNr=75381", + "roomcode": "5302.EG.045C", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -540091,19 +541338,34 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38514", - "alt_name": "N1413, Sitzungs-, Konferenzraum", - "arch_name": "N1413@0104", + "address_link": "ris.einzelraum?raumkey=7520", + "alt_name": "N1414, Seminarraum", + "arch_name": "N1414@0104", "b_area_id": 27, "b_filter_id": 564, - "calendar": "tvKalender.wSicht?cOrg=15376&cRes=28072&cReadonly=J", + "calendar": "tvKalender.wSicht?cOrg=15376&cRes=15035&cReadonly=J", + "extended": { + "additional_description": "N1414, Seminarraum", + "address": "Theresienstr. 90(0104), 1.Obergescho\u00df", + "architect_room_nr": "N1414@0104", + "area_m2": 94.81, + "building": "0104 (N4) Elektro Physik", + "floor_number": "1.Obergescho\u00df", + "floor_type": "Linoleum", + "purpose": "Seminarraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", + "room_number": "414", + "seats": 48, + "standing_places": 0, + "wheelchair_spaces": 0, + "zip_code_location": "80333 M\u00fcnchen" + }, "list_index": "91", "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38514", - "roomcode": "0104.01.413", - "usage": 196 + "room_link": "wbRaum.editRaum?pRaumNr=7520", + "roomcode": "0104.01.414", + "usage": 41 }, { "address": "Theresienstr. 90, 2.OG", @@ -540299,9 +541561,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39621", - "alt_name": "-1782, Transformatoren", - "arch_name": "-1782@0507", + "address_link": "ris.einzelraum?raumkey=39612", + "alt_name": "-1781A, Lager", + "arch_name": "-1781A@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -540309,9 +541571,9 @@ "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39621", - "roomcode": "0507.U1.782", - "usage": 160 + "room_link": "wbRaum.editRaum?pRaumNr=39612", + "roomcode": "0507.U1.781A", + "usage": 30 }, { "address": "Arcisstr. 21, 1.OG", @@ -541307,9 +542569,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45609", - "alt_name": "0238, Lager", - "arch_name": "0238@5302", + "address_link": "ris.einzelraum?raumkey=75425", + "alt_name": "00.046.C, B\u00fcro", + "arch_name": "00.046.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -541317,9 +542579,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45609", - "roomcode": "5302.EG.022", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=75425", + "roomcode": "5302.EG.046C", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -541994,34 +543256,19 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=7520", - "alt_name": "N1414, Seminarraum", - "arch_name": "N1414@0104", + "address_link": "ris.einzelraum?raumkey=7523", + "alt_name": "N1415, Audiovisueller Unterricht", + "arch_name": "N1415@0104", "b_area_id": 27, "b_filter_id": 564, - "calendar": "tvKalender.wSicht?cOrg=15376&cRes=15035&cReadonly=J", - "extended": { - "additional_description": "N1414, Seminarraum", - "address": "Theresienstr. 90(0104), 1.Obergescho\u00df", - "architect_room_nr": "N1414@0104", - "area_m2": 94.81, - "building": "0104 (N4) Elektro Physik", - "floor_number": "1.Obergescho\u00df", - "floor_type": "Linoleum", - "purpose": "Seminarraum (NF5.2 - Allgemeine Unterrichts- und \u00dcbungsr\u00e4ume ohne festes Gest\u00fchl)", - "room_number": "414", - "seats": 48, - "standing_places": 0, - "wheelchair_spaces": 0, - "zip_code_location": "80333 M\u00fcnchen" - }, + "calendar": "tvKalender.wSicht?cOrg=15376&cRes=15036&cReadonly=J", "list_index": "92", "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=7520", - "roomcode": "0104.01.414", - "usage": 41 + "room_link": "wbRaum.editRaum?pRaumNr=7523", + "roomcode": "0104.01.415", + "usage": 135 }, { "address": "Theresienstr. 90, 2.OG", @@ -542217,9 +543464,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39626", - "alt_name": "-1783, Stromversorg.", - "arch_name": "-1783@0507", + "address_link": "ris.einzelraum?raumkey=63037", + "alt_name": "-1781B, Lager", + "arch_name": "-1781B@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -542227,9 +543474,9 @@ "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39626", - "roomcode": "0507.U1.783", - "usage": 160 + "room_link": "wbRaum.editRaum?pRaumNr=63037", + "roomcode": "0507.U1.781B", + "usage": 30 }, { "address": "Arcisstr. 21, 1.OG", @@ -543240,9 +544487,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45611", - "alt_name": "0243, Flur", - "arch_name": "0243@5302", + "address_link": "ris.einzelraum?raumkey=75379", + "alt_name": "00.047.C, B\u00fcro", + "arch_name": "00.047.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -543250,9 +544497,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45611", - "roomcode": "5302.EG.023", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=75379", + "roomcode": "5302.EG.047C", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -543910,19 +545157,19 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=7523", - "alt_name": "N1415, Audiovisueller Unterricht", - "arch_name": "N1415@0104", + "address_link": "ris.einzelraum?raumkey=38548", + "alt_name": "N1416, Kopierer", + "arch_name": "N1416@0104", "b_area_id": 27, "b_filter_id": 564, - "calendar": "tvKalender.wSicht?cOrg=15376&cRes=15036&cReadonly=J", + "calendar": null, "list_index": "93", "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=7523", - "roomcode": "0104.01.415", - "usage": 135 + "room_link": "wbRaum.editRaum?pRaumNr=38548", + "roomcode": "0104.01.416", + "usage": 110 }, { "address": "Theresienstr. 90, 2.OG", @@ -544118,19 +545365,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=39630", - "alt_name": "-1784, Flur", - "arch_name": "-1784@0507", + "address_link": "ris.einzelraum?raumkey=39621", + "alt_name": "-1782, Transformatoren", + "arch_name": "-1782@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "93", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15135", + "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39630", - "roomcode": "0507.U1.784", - "usage": 222 + "room_link": "wbRaum.editRaum?pRaumNr=39621", + "roomcode": "0507.U1.782", + "usage": 160 }, { "address": "Arcisstr. 21, 1.OG", @@ -545155,9 +546402,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45628", - "alt_name": "0236, K\u00fchlraum", - "arch_name": "0236@5302", + "address_link": "ris.einzelraum?raumkey=75380", + "alt_name": "00.048.C, B\u00fcro", + "arch_name": "00.048.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -545165,9 +546412,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45628", - "roomcode": "5302.EG.024", - "usage": 199 + "room_link": "wbRaum.editRaum?pRaumNr=75380", + "roomcode": "5302.EG.048C", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", @@ -545810,9 +547057,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38548", - "alt_name": "N1416, Kopierer", - "arch_name": "N1416@0104", + "address_link": "ris.einzelraum?raumkey=38557", + "alt_name": "N1420, Lager", + "arch_name": "N1420@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -545820,9 +547067,9 @@ "op_link": "webnav.navigate_to?corg=15376", "operator": "[ TUEITEP ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38548", - "roomcode": "0104.01.416", - "usage": 110 + "room_link": "wbRaum.editRaum?pRaumNr=38557", + "roomcode": "0104.01.420", + "usage": 30 }, { "address": "Theresienstr. 90, 2.OG", @@ -546018,19 +547265,19 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=69175", - "alt_name": "-1790, Rampe/Treppe im Freien", - "arch_name": "-1790@0507", + "address_link": "ris.einzelraum?raumkey=39626", + "alt_name": "-1783, Stromversorg.", + "arch_name": "-1783@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, "list_index": "94", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=15135", + "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=69175", - "roomcode": "0507.U1.790", - "usage": 7 + "room_link": "wbRaum.editRaum?pRaumNr=39626", + "roomcode": "0507.U1.783", + "usage": 160 }, { "address": "Arcisstr. 21, 1.OG", @@ -546994,9 +548241,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45639", - "alt_name": "0231, WC-Damen / Wickeltisch", - "arch_name": "0231@5302", + "address_link": "ris.einzelraum?raumkey=75424", + "alt_name": "00.049.C, Teek\u00fcche", + "arch_name": "00.049.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -547004,9 +548251,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45639", - "roomcode": "5302.EG.025A", - "usage": 116 + "room_link": "wbRaum.editRaum?pRaumNr=75424", + "roomcode": "5302.EG.049C", + "usage": 198 }, { "address": "Boltzmannstr. 19, EG", @@ -547664,19 +548911,19 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38557", - "alt_name": "N1420, Lager", - "arch_name": "N1420@0104", + "address_link": "ris.einzelraum?raumkey=38566", + "alt_name": "N1425, Putzraum", + "arch_name": "N1425@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "95", - "op_link": "webnav.navigate_to?corg=15376", - "operator": "[ TUEITEP ]", + "op_link": "webnav.navigate_to?corg=37989", + "operator": "[ TUZV44R ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38557", - "roomcode": "0104.01.420", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=38566", + "roomcode": "0104.01.425", + "usage": 205 }, { "address": "Theresienstr. 90, 2.OG", @@ -547872,9 +549119,9 @@ }, { "address": "Arcisstr. 21, 1.UG", - "address_link": "ris.einzelraum?raumkey=72820", - "alt_name": "R1002, Treppenhaus", - "arch_name": "R1002@0507", + "address_link": "ris.einzelraum?raumkey=39630", + "alt_name": "-1784, Flur", + "arch_name": "-1784@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -547882,9 +549129,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=72820", - "roomcode": "0507.U1.998", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=39630", + "roomcode": "0507.U1.784", + "usage": 222 }, { "address": "Arcisstr. 21, 1.OG", @@ -548832,9 +550079,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45790", - "alt_name": "0232, WC-Herren", - "arch_name": "0232@5302", + "address_link": "ris.einzelraum?raumkey=75423", + "alt_name": "00.050.C, WC-Herren", + "arch_name": "00.050.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -548842,9 +550089,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45790", - "roomcode": "5302.EG.025B", - "usage": 115 + "room_link": "wbRaum.editRaum?pRaumNr=75423", + "roomcode": "5302.EG.050C", + "usage": 116 }, { "address": "Boltzmannstr. 19, EG", @@ -549472,19 +550719,19 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38566", - "alt_name": "N1425, Putzraum", - "arch_name": "N1425@0104", + "address_link": "ris.einzelraum?raumkey=38571", + "alt_name": "N1426, Lager", + "arch_name": "N1426@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "96", - "op_link": "webnav.navigate_to?corg=37989", - "operator": "[ TUZV44R ]", + "op_link": "webnav.navigate_to?corg=15364", + "operator": "[ TUEILNT ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38566", - "roomcode": "0104.01.425", - "usage": 205 + "room_link": "wbRaum.editRaum?pRaumNr=38571", + "roomcode": "0104.01.426", + "usage": 30 }, { "address": "Theresienstr. 90, 2.OG", @@ -549679,10 +550926,10 @@ "usage": 12 }, { - "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=39634", - "alt_name": "0700, Treppenhaus", - "arch_name": "0700@0507", + "address": "Arcisstr. 21, 1.UG", + "address_link": "ris.einzelraum?raumkey=69175", + "alt_name": "-1790, Rampe/Treppe im Freien", + "arch_name": "-1790@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -549690,9 +550937,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39634", - "roomcode": "0507.EG.700", - "usage": 223 + "room_link": "wbRaum.editRaum?pRaumNr=69175", + "roomcode": "0507.U1.790", + "usage": 7 }, { "address": "Arcisstr. 21, 1.OG", @@ -550624,9 +551871,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45806", - "alt_name": "0213, Hausanschluss", - "arch_name": "0213@5302", + "address_link": "ris.einzelraum?raumkey=75377", + "alt_name": "00.051.C, WC-Damen", + "arch_name": "00.051.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -550634,9 +551881,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45806", - "roomcode": "5302.EG.026", - "usage": 120 + "room_link": "wbRaum.editRaum?pRaumNr=75377", + "roomcode": "5302.EG.051C", + "usage": 116 }, { "address": "Boltzmannstr. 19, EG", @@ -551294,19 +552541,19 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38571", - "alt_name": "N1426, Lager", - "arch_name": "N1426@0104", + "address_link": "ris.einzelraum?raumkey=64230", + "alt_name": "N10426A, WC-Vorraum Damen", + "arch_name": "N10426A@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "97", - "op_link": "webnav.navigate_to?corg=15364", - "operator": "[ TUEILNT ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38571", - "roomcode": "0104.01.426", - "usage": 30 + "room_link": "wbRaum.editRaum?pRaumNr=64230", + "roomcode": "0104.01.426A", + "usage": 118 }, { "address": "Theresienstr. 90, 2.OG", @@ -551502,9 +552749,9 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=39491", - "alt_name": "0701, Treppenhaus", - "arch_name": "0701@0507", + "address_link": "ris.einzelraum?raumkey=39634", + "alt_name": "0700, Treppenhaus", + "arch_name": "0700@0507", "b_area_id": 23, "b_filter_id": 583, "calendar": null, @@ -551512,8 +552759,8 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=39491", - "roomcode": "0507.EG.701", + "room_link": "wbRaum.editRaum?pRaumNr=39634", + "roomcode": "0507.EG.700", "usage": 223 }, { @@ -552461,9 +553708,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45820", - "alt_name": "0237, K\u00fcchenvorb.", - "arch_name": "0237@5302", + "address_link": "ris.einzelraum?raumkey=75388", + "alt_name": "00.053.C, Physiklabor XRD", + "arch_name": "00.053.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -552471,9 +553718,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45820", - "roomcode": "5302.EG.028", - "usage": 28 + "room_link": "wbRaum.editRaum?pRaumNr=75388", + "roomcode": "5302.EG.053C", + "usage": 103 }, { "address": "Boltzmannstr. 19, EG", @@ -553100,9 +554347,9 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=64230", - "alt_name": "N10426A, WC-Vorraum Damen", - "arch_name": "N10426A@0104", + "address_link": "ris.einzelraum?raumkey=38576", + "alt_name": "N1427, WC-Damen", + "arch_name": "N1427@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, @@ -553110,9 +554357,9 @@ "op_link": "webnav.navigate_to?corg=19691", "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=64230", - "roomcode": "0104.01.426A", - "usage": 118 + "room_link": "wbRaum.editRaum?pRaumNr=38576", + "roomcode": "0104.01.427", + "usage": 116 }, { "address": "Theresienstr. 90, 2.OG", @@ -553308,19 +554555,19 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=19440", - "alt_name": "0710, Versuchshalle", - "arch_name": "0710@0507", + "address_link": "ris.einzelraum?raumkey=39491", + "alt_name": "0701, Treppenhaus", + "arch_name": "0701@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=15135&cRes=15233&cReadonly=J", + "calendar": null, "list_index": "98", - "op_link": "webnav.navigate_to?corg=15135", - "operator": "[ TUARZ03 ]", + "op_link": "webnav.navigate_to?corg=19691", + "operator": "[ TUZVZA4 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=19440", - "roomcode": "0507.EG.710", - "usage": 49 + "room_link": "wbRaum.editRaum?pRaumNr=39491", + "roomcode": "0507.EG.701", + "usage": 223 }, { "address": "Arcisstr. 21, 1.OG", @@ -554235,9 +555482,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45826", - "alt_name": "0240, K\u00fcchenvorb.", - "arch_name": "0240@5302", + "address_link": "ris.einzelraum?raumkey=75376", + "alt_name": "00.054.C, B\u00fcro", + "arch_name": "00.054.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -554245,9 +555492,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45826", - "roomcode": "5302.EG.029", - "usage": 28 + "room_link": "wbRaum.editRaum?pRaumNr=75376", + "roomcode": "5302.EG.054C", + "usage": 110 }, { "address": "Boltzmannstr. 19, EG", @@ -554904,19 +556151,19 @@ }, { "address": "Theresienstr. 90, 1.OG", - "address_link": "ris.einzelraum?raumkey=38576", - "alt_name": "N1427, WC-Damen", - "arch_name": "N1427@0104", + "address_link": "ris.einzelraum?raumkey=38753", + "alt_name": "N1428, Aufzug", + "arch_name": "N1428@0104", "b_area_id": 27, "b_filter_id": 564, "calendar": null, "list_index": "99", - "op_link": "webnav.navigate_to?corg=19691", - "operator": "[ TUZVZA4 ]", + "op_link": "webnav.navigate_to?corg=26064", + "operator": "[ TUZVR44 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=38576", - "roomcode": "0104.01.427", - "usage": 116 + "room_link": "wbRaum.editRaum?pRaumNr=38753", + "roomcode": "0104.01.428", + "usage": 4 }, { "address": "Theresienstr. 90, 2.OG", @@ -555112,19 +556359,19 @@ }, { "address": "Arcisstr. 21, EG", - "address_link": "ris.einzelraum?raumkey=14384", - "alt_name": "0710A, Werkstatt", - "arch_name": "0710A@0507", + "address_link": "ris.einzelraum?raumkey=19440", + "alt_name": "0710, Versuchshalle", + "arch_name": "0710@0507", "b_area_id": 23, "b_filter_id": 583, - "calendar": "tvKalender.wSicht?cOrg=15135&cRes=18771&cReadonly=J", + "calendar": "tvKalender.wSicht?cOrg=15135&cRes=15233&cReadonly=J", "list_index": "99", "op_link": "webnav.navigate_to?corg=15135", "operator": "[ TUARZ03 ]", "plz_place": "80333 M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=14384", - "roomcode": "0507.EG.710A", - "usage": 51 + "room_link": "wbRaum.editRaum?pRaumNr=19440", + "roomcode": "0507.EG.710", + "usage": 49 }, { "address": "Arcisstr. 21, 1.OG", @@ -556023,9 +557270,9 @@ }, { "address": "Lichtenbergstr. 2, EG", - "address_link": "ris.einzelraum?raumkey=45972", - "alt_name": "0239, K\u00fcchenvorb.", - "arch_name": "0239@5302", + "address_link": "ris.einzelraum?raumkey=75374", + "alt_name": "00.055.C, B\u00fcro", + "arch_name": "00.055.C@5302", "b_area_id": 30, "b_filter_id": 816, "calendar": null, @@ -556033,9 +557280,9 @@ "op_link": "webnav.navigate_to?corg=39688", "operator": "[ TUPEWR0 ]", "plz_place": "85748 Garching b. M\u00fcnchen", - "room_link": "wbRaum.editRaum?pRaumNr=45972", - "roomcode": "5302.EG.029A", - "usage": 28 + "room_link": "wbRaum.editRaum?pRaumNr=75374", + "roomcode": "5302.EG.055C", + "usage": 12 }, { "address": "Boltzmannstr. 19, EG", diff --git a/data/external/scrapers/roomfinder.py b/data/external/scrapers/roomfinder.py index 6008b094a..0083ebb31 100644 --- a/data/external/scrapers/roomfinder.py +++ b/data/external/scrapers/roomfinder.py @@ -103,7 +103,7 @@ def scrape_rooms(): for _map in extended_data["maps"]: _map[1] = f"rf{_map[1]}" extended_data["default_map"] = proxy.getDefaultMap(room) - if default_map := extended_data["default_map"][1]: + if default_map := extended_data["default_map"]: default_map[1] = f"rf{default_map[1]}" rooms.append(extended_data) maybe_sleep(0.05) diff --git a/data/external/scrapers/tumonline.py b/data/external/scrapers/tumonline.py index 871b8268b..43e0becd6 100644 --- a/data/external/scrapers/tumonline.py +++ b/data/external/scrapers/tumonline.py @@ -187,9 +187,8 @@ def scrape_usages() -> list[Usage]: continue usage_name = parts[0].strip() usage_din_277 = parts[1].strip("()") - usages.append(Usage(id=usage_type, name=usage_name, din_277=usage_din_277)) - return sorted(usages, key=lambda usage: usage.id) + return sorted(usages, key=lambda usage: usage["id"]) @cached_json("orgs-{lang}_tumonline.json") @@ -252,6 +251,14 @@ class ParsedRoomsList(typing.NamedTuple): num_pages: int = 1 current_page: int = 0 + def merge(self, other: "ParsedRoomsList") -> "ParsedRoomsList": + """Merge two ParsedRoomsList objects""" + return ParsedRoomsList( + rooms=self.rooms + other.rooms, + num_pages=max(self.num_pages, other.num_pages), + current_page=max(self.current_page, other.current_page), + ) + @cached_json("tumonline/{f_value}.{area_id}.json") def _retrieve_roomlist(f_type: str, f_name: str, f_value: int, area_id: int = 0) -> list[ParsedRoom]: @@ -272,7 +279,7 @@ def _retrieve_roomlist(f_type: str, f_name: str, f_value: int, area_id: int = 0) } req = requests.post(f"{TUMONLINE_URL}/wbSuche.raumSuche", data=search_params, timeout=30) rooms_list = _parse_rooms_list(BeautifulSoup(req.text, "lxml")) - scraped_rooms.rooms.extend(rooms_list.rooms) + scraped_rooms = scraped_rooms.merge(rooms_list) if prog.total != rooms_list.num_pages: prog.reset(rooms_list.num_pages) @@ -334,9 +341,10 @@ def _sanitise_roominfo(roominfo: dict[str, str]) -> dict[str, str | int | float] # new name to convince mypy that this is typed correctly room: dict[str, str | int | float] = {english_labels[key]: value for key, value in roominfo.items()} + # make the values typed correctly for key in ["wheelchair_spaces", "standing_places", "seats"]: - room[key] = int(roominfo.get(key, 0)) - room["area_m2"] = float(roominfo["area_m2"].replace(",", ".")) + room[key] = int(room.get(key, 0)) + room["area_m2"] = float(room["area_m2"].replace(",", ".")) return room diff --git a/data/processors/areatree/config.areatree b/data/processors/areatree/config.areatree index 943a07b37..061a92312 100644 --- a/data/processors/areatree/config.areatree +++ b/data/processors/areatree/config.areatree @@ -114,7 +114,7 @@ 1717:Ismaninger Str. 33, Hörzentrum (Bau 717): -1718:Bau 718: -1719:Bau 719: - 1720:Grillparzerstraße 16-18, Institut für Medizinische Statistik und Epidemiologie (IMSE):mri-imse[building] + 1720:Grillparzerstraße 16-18, Institut für Medizinische Statistik und Epidemiologie (IMSE):1720,mri-imse[building] 1724:Prinzregentenstr. 68 (Bau 724): -1725:Institut für Allgemein-Medizin (Orleanstr. 47): 1740:TUM ForTe (Neherstr. 1): @@ -571,8 +571,9 @@ 8123:Galileo Büro, Walther-von-Dyck-Strasse 4: 8124:Galileo Büro, Walther-von-Dyck-Strasse 14: :Interimshörsäle:garching-interims - 5620:Interimshörsäle I|Interims I: - 5416:Interimshörsäle II, Jürgen Manchot-Hörsaalgebäude|Interims II: + 5416:Interimshörsäle II, Jürgen Manchot-Hörsaalgebäude|Interims II:5416,interims-ii + 5539:Interims-Tentomax MW|Interims III:5539,interims-iii + 5620:Interimshörsäle I|Interims I:5620,interims-i 6:Garching Forschungszentrum (süd-west):garching-sued-west[site] 61:Gebäudemanagement / Technischer Betrieb:garching-gebaeudemanagement 6101:Heizkraftwerk: diff --git a/data/processors/export.py b/data/processors/export.py index 43342ebc9..95cc00745 100644 --- a/data/processors/export.py +++ b/data/processors/export.py @@ -1,10 +1,25 @@ import json +import re from pathlib import Path from typing import Any, Union from external.models.common import PydanticConfiguration +from utils import TranslatableStr OUTPUT_DIR = Path(__file__).parent.parent / "output" +SLUGIFY_REGEX = re.compile(r"[^a-zA-Z0-9-äöüß.]+") + + +def maybe_slugify(value: str | None | TranslatableStr) -> str | None: + """Slugify a value if it exists""" + if value is None: + return None + if isinstance(value, TranslatableStr): + value = unlocalise(value) + + if not isinstance(value, str): + raise ValueError(f"Expected str, got {type(value)}") + return SLUGIFY_REGEX.sub("-", value.lower()).strip("-") def unlocalise(value: Union[str, list[Any], dict[str, Any]]) -> Any: @@ -47,6 +62,10 @@ def export_for_search(data: dict, path: str) -> None: campus_name = campus.get("short_name", campus["name"]) # intentionally no break, because sites might be below a campus + geo = {} + if coords := entry.get("coords"): + geo["_geo"] = {"lat": coords["lat"], "lng": coords["lon"]} + parent_building_names = extract_parent_building_names(data, entry["parents"], building_parents_index) export.append( { # MeiliSearch requires an id without "." @@ -65,31 +84,33 @@ def export_for_search(data: dict, path: str) -> None: "building": "building", "room": "room", "virtual_room": "room", - }.get(entry["type"], None), - # Parents always exclude root - # "parent_names": _data["parents"][1:], [data[p]["name"] for p in _data["parents"][1:]], - # For rooms, the (joined_)building parents are extra to put more emphasis on them. - # Also, their name is included - "parent_building_names": [ - data[p]["short_name"] for p in entry["parents"][building_parents_index:] if "short_name" in data[p] - ] - + [data[p]["name"] for p in entry["parents"][building_parents_index:]], + }.get(entry["type"]), + "parent_building_names": parent_building_names, # For all other parents, only the ids and their keywords (TODO) are searchable - "parent_keywords": entry["parents"][1:], - "campus": campus_name, + "parent_keywords": [maybe_slugify(value) for value in parent_building_names + entry["parents"][1:]], + "campus": maybe_slugify(campus_name), "address": entry.get("tumonline_data", {}).get("address", None), - "usage": entry.get("usage", {}).get("name", None), + "usage": maybe_slugify(entry.get("usage", {}).get("name", None)), "rank": int(entry["ranking_factors"]["rank_combined"]), + **geo, }, ) - # the data contains translations, currently we dont allow these in the search api + # the data contains translations, currently we don't allow these in the search api export = unlocalise(export) with open(path, "w", encoding="utf-8") as file: json.dump(export, file) +def extract_parent_building_names(data: dict, parents: list[str], building_parents_index: int) -> list[str]: + """Extract the parents building names from the data""" + # For rooms, the (joined_)building parents are extra to put more emphasis on them. + short_names = [data[p]["short_name"] for p in parents[building_parents_index:] if "short_name" in data[p]] + long_names = [data[p]["name"] for p in parents[building_parents_index:]] + return short_names + long_names + + def extract_arch_name(entry: dict) -> str | None: """Extract the arch name from the entry""" if entry["type"] == "building": @@ -99,8 +120,7 @@ def extract_arch_name(entry: dict) -> str | None: def export_for_api(data: dict, path: str) -> None: """Add some more information about parents to the data and export for the /get/:id api""" - - export_data = {} + export_data = [] for _id, entry in data.items(): if entry["type"] != "root": entry.setdefault("maps", {})["default"] = "interactive" @@ -109,28 +129,32 @@ def export_for_api(data: dict, path: str) -> None: if arch_name := extract_arch_name(entry): entry["aliases"].append(arch_name) - export_data[_id] = { - "parent_names": [data[p]["name"] for p in entry["parents"]], - **entry, - } - if "children" in export_data[_id]: - del export_data[_id]["children"] - del export_data[_id]["children_flat"] - - for key in ["tumonline_data", "roomfinder_data", "nat_data"]: - if key in export_data[_id]: - del export_data[_id][key] - - if "props" in export_data[_id]: - prop_keys_to_keep = {"computed", "links", "comment", "calendar_url", "tumonline_room_nr", "operator"} - to_delete = [e for e in export_data[_id]["props"].keys() if e not in prop_keys_to_keep] - for k in to_delete: - del export_data[_id]["props"][k] + export_data.append(extract_exported_item(data, entry)) with open(path, "w", encoding="utf-8") as file: json.dump(export_data, file, cls=EnhancedJSONEncoder) +def extract_exported_item(data, entry): + """Extract the item that will be finally exported to the api""" + result = { + "parent_names": [data[p]["name"] for p in entry["parents"]], + **entry, + } + if "children" in result: + del result["children"] + del result["children_flat"] + for key in ["tumonline_data", "roomfinder_data", "nat_data"]: + if key in result: + del result[key] + if "props" in result: + prop_keys_to_keep = {"computed", "links", "comment", "calendar_url", "tumonline_room_nr", "operator"} + to_delete = [e for e in result["props"].keys() if e not in prop_keys_to_keep] + for k in to_delete: + del result["props"][k] + return result + + class EnhancedJSONEncoder(json.JSONEncoder): def default(self, o: Any) -> Any: """Enhanced JSONEncoder that can handle dataclasses""" diff --git a/data/processors/poi.py b/data/processors/poi.py index f5355bffb..d7e600d17 100644 --- a/data/processors/poi.py +++ b/data/processors/poi.py @@ -16,6 +16,7 @@ def merge_poi(data: dict[str, dict[str, Any]]) -> None: raise ValueError(f"Parent '{poi['parent']}' of POI '{_id}' not found") poi["type"] = "poi" + poi["id"] = _id # make sure that name and usage is internationalized poi["usage"]["name"] = _(poi["usage"]["name"]) @@ -30,4 +31,4 @@ def merge_poi(data: dict[str, dict[str, Any]]) -> None: poi.setdefault("sources", {"base": [{"name": "NavigaTUM"}]}) - return merge.recursively_merge(data, poi_data) + merge.recursively_merge(data, poi_data) diff --git a/data/processors/sitemap.py b/data/processors/sitemap.py index bfe44b15e..ac41fe1c3 100644 --- a/data/processors/sitemap.py +++ b/data/processors/sitemap.py @@ -43,7 +43,7 @@ def generate_sitemap() -> None: # export all fields. This way we're also guaranteed to have the same types # (and not e.g. numpy floats). with open(OUTPUT_DIR / "api_data.json", encoding="utf-8") as file: - new_data: dict = json.load(file) + new_data: list = json.load(file) # Look whether there are currently online sitemaps for the provided # sitemaps name. In case there aren't, we assume this sitemap is new, @@ -59,16 +59,19 @@ def generate_sitemap() -> None: _write_sitemapindex_xml(OUTPUT_DIR / "sitemap.xml", sitemaps) -def _download_old_data() -> dict: +def _download_old_data() -> list: """Download the currently online data from the server""" try: - return requests.get(OLD_DATA_URL, headers={"Accept-Encoding": "gzip"}, timeout=120).json() + old_data = requests.get(OLD_DATA_URL, headers={"Accept-Encoding": "gzip"}, timeout=120).json() + if isinstance(old_data, dict): + old_data = list(old_data.values()) + return old_data except requests.exceptions.RequestException as error: logging.warning(f"Could not download online data because of {error}. Assuming all entries are new.") - return {} + return [] -def _extract_sitemap_data(new_data: dict, old_data: dict, old_sitemaps: SimplifiedSitemaps) -> Sitemaps: +def _extract_sitemap_data(new_data: list, old_data: list, old_sitemaps: SimplifiedSitemaps) -> Sitemaps: """ Extract sitemap data. Lastmod is set to the current time if the entry is modified (indicated via comparing newdata vs olddata), @@ -86,9 +89,10 @@ def _extract_sitemap_data(new_data: dict, old_data: dict, old_sitemaps: Simplifi "room": [], "other": [], } - + old_data_dict = {entry["id"]: entry for entry in old_data} + new_data_dict = {entry["id"]: entry for entry in new_data} changed_count = 0 - for _id, entry in new_data.items(): + for _id, entry in new_data_dict.items(): if entry["type"] == "root": continue @@ -108,7 +112,7 @@ def _extract_sitemap_data(new_data: dict, old_data: dict, old_sitemaps: Simplifi "poi": "poi", }[entry["type"]] url = f"https://nav.tum.de/{url_type_name}/{_id}" - if _id not in old_data or entry != old_data[_id]: + if _id not in old_data_dict or entry != old_data_dict[_id]: lastmod = datetime.now(timezone.utc) changed_count += 1 elif old_lastmod := old_sitemaps[sitemap_name].get(url): diff --git a/data/requirements.txt b/data/requirements.txt index fd409eb45..d4770bd5d 100644 --- a/data/requirements.txt +++ b/data/requirements.txt @@ -3,7 +3,7 @@ defusedxml~=0.7.1 lxml~=4.9.2 numba~=0.57.1 Pillow~=10.0.0 -pydantic~=2.2.1 +pydantic~=2.3.0 pyyaml~=6.0 requests~=2.31.0 ruamel.yaml~=0.17.24 diff --git a/data/search_synonyms.json b/data/search_synonyms.json deleted file mode 100644 index dec9f78a5..000000000 --- a/data/search_synonyms.json +++ /dev/null @@ -1,130 +0,0 @@ -{ - "Weihenstephan": ["wzw"], - "Innenstadt": ["Stammgelände"], - - "ph": ["Physik"], - "ch": ["Chemie"], - "Maschinenwesen": ["mw"], - - "Immathalle": ["Immatrikulationshalle"], - "Bib": ["Bibliothek", "Teilbibliothek"], - "TB": ["Teilbibliothek"], - - "HS": ["Hörsaal", "Vorlesungssaal"], - "Hörsaal": ["HS", "Vorlesungssaal"], - "Seminarraum": ["Übungsraum"], - "Lernraum": ["Lernplatz", "Seminarraum", "Studentenarbeitsraum", "Übungsraum"], - "Übungsraum": ["Seminarraum", "Studentenarbeitsraum", "Übungsraum"], - "Arbeitsraum": ["Seminarraum", "Studentenarbeitsraum", "Übungsraum"], - - "Rechnerraum-Studenten": ["Rechnerarbeitsraum", "Rechnerraum", "Rechner-Raum", "Computerarbeitsraum", "Computerraum", "Computerpool", "Computer Studenten", "CIP-Raum", "CIP-Pool", "Computerpool", "CAD-Pool", "EDV-Pool"], - "Rechnerarbeitsraum": ["Rechnerraum-Studenten", "Rechnerraum", "Rechner-Raum", "Computerarbeitsraum", "Computerraum", "Computerpool", "Computer Studenten", "CIP-Raum", "CIP-Pool", "Computerpool", "CAD-Pool", "EDV-Pool"], - "Rechnerraum": ["Rechnerraum-Studenten", "Rechnerarbeitsraum", "Rechner-Raum", "Computerarbeitsraum", "Computerraum", "Computerpool", "Computer Studenten", "CIP-Raum", "CIP-Pool", "Computerpool", "CAD-Pool", "EDV-Pool"], - "Rechner-Raum": ["Rechnerraum-Studenten", "Rechnerarbeitsraum", "Rechnerraum", "Computerarbeitsraum", "Computerraum", "Computerpool", "Computer Studenten", "CIP-Raum", "CIP-Pool", "Computerpool", "CAD-Pool", "EDV-Pool"], - "Rechnerhalle": ["Rechnerraum-Studenten", "Rechnerarbeitsraum", "Rechnerraum", "Computerarbeitsraum", "Computerraum", "Computerpool", "Computer Studenten", "CIP-Raum", "CIP-Pool", "Computerpool", "CAD-Pool", "EDV-Pool", "Rechner-Raum"], - "Computerarbeitsraum": ["Rechnerraum-Studenten", "Rechnerarbeitsraum", "Rechnerraum", "Rechner-Raum", "Computerraum", "Computerpool", "Computer Studenten", "CIP-Raum", "CIP-Pool", "Computerpool", "CAD-Pool", "EDV-Pool"], - "Computerraum": ["Rechnerraum-Studenten", "Rechnerarbeitsraum", "Rechnerraum", "Rechner-Raum", "Computerarbeitsraum", "Computerpool", "Computer Studenten", "CIP-Raum", "CIP-Pool", "Computerpool", "CAD-Pool", "EDV-Pool"], - "Computerpool": ["Rechnerraum-Studenten", "Rechnerarbeitsraum", "Rechnerraum", "Rechner-Raum", "Computerarbeitsraum", "Computerraum", "Computer Studenten", "CIP-Raum", "CIP-Pool", "CAD-Pool", "EDV-Pool"], - "Computer Studenten": ["Rechnerraum-Studenten", "Rechnerarbeitsraum", "Rechnerraum", "Rechner-Raum", "Computerarbeitsraum", "Computerraum", "Computerpool", "CIP-Raum", "CIP-Pool", "Computerpool", "CAD-Pool", "EDV-Pool"], - "CIP-Raum": ["Rechnerraum-Studenten", "Rechnerarbeitsraum", "Rechnerraum", "Rechner-Raum", "Computerarbeitsraum", "Computerraum", "Computerpool", "Computer Studenten", "CIP-Pool", "Computerpool", "CAD-Pool", "EDV-Pool"], - "CIP-Pool": ["Rechnerraum-Studenten", "Rechnerarbeitsraum", "Rechnerraum", "Rechner-Raum", "Computerarbeitsraum", "Computerraum", "Computerpool", "Computer Studenten", "CIP-Raum", "Computerpool", "CAD-Pool", "EDV-Pool"], - "CAD-Pool": ["Rechnerraum-Studenten", "Rechnerarbeitsraum", "Rechnerraum", "Rechner-Raum", "Computerarbeitsraum", "Computerraum", "Computerpool", "Computer Studenten", "CIP-Raum", "CIP-Pool", "Computerpool", "EDV-Pool"], - "EDV-Pool": ["Rechnerraum-Studenten", "Rechnerarbeitsraum", "Rechnerraum", "Rechner-Raum", "Computerarbeitsraum", "Computerraum", "Computerpool", "Computer Studenten", "CIP-Raum", "CIP-Pool", "Computerpool", "CAD-Pool"], - - "Besprechung": ["Besprechungsraum", "Konferenz", "Konferenzraum", "Konferenzsaal", "Sitzungssaal", "Sitzungsraum", "Sitzungszimmer"], - "Besprechungsraum": ["Besprechung", "Konferenz", "Konferenzraum", "Konferenzsaal", "Sitzungssaal", "Sitzungsraum", "Sitzungszimmer"], - "Konferenz": ["Besprechung", "Besprechungsraum", "Konferenzraum", "Konferenzsaal", "Sitzungssaal", "Sitzungsraum", "Sitzungszimmer"], - "Konferenzraum": ["Besprechung", "Besprechungsraum", "Konferenz", "Konferenzsaal", "Sitzungssaal", "Sitzungsraum", "Sitzungszimmer"], - "Konferenzsaal": ["Besprechung", "Besprechungsraum", "Konferenz", "Konferenzraum", "Sitzungssaal", "Sitzungsraum", "Sitzungszimmer"], - "Sitzungssaal": ["Besprechung", "Besprechungsraum", "Konferenz", "Konferenzraum", "Konferenzsaal", "Sitzungsraum", "Sitzungszimmer"], - "Sitzungsraum": ["Besprechung", "Besprechungsraum", "Konferenz", "Konferenzraum", "Konferenzsaal", "Sitzungssaal", "Sitzungszimmer"], - "Sitzungszimmer": ["Besprechung", "Besprechungsraum", "Konferenz", "Konferenzraum", "Konferenzsaal", "Sitzungssaal", "Sitzungsraum"], - - "Abstellraum": ["Abstellkammer", "Lager", "Lagerraum", "Ablage"], - "Abstellkammer": ["Abstellraum", "Lager", "Lagerraum", "Ablage"], - "Lager": ["Abstellraum", "Abstellkammer", "Lagerraum", "Ablage"], - "Lagerraum": ["Abstellraum", "Abstellkammer", "Lager", "Ablage"], - "Ablage": ["Abstellraum", "Abstellkammer", "Lager", "Lagerraum"], - - "Kopierer": ["Kopie", "Kopierraum", "Drucker", "Druckerraum", "Druckgeräterraum", "Printcenter", "Scannerraum"], - "Kopie": ["Kopierer", "Kopierraum", "Drucker", "Druckerraum", "Druckgeräterraum", "Printcenter", "Scannerraum"], - "Kopierraum": ["Kopierer", "Kopie", "Drucker", "Druckerraum", "Druckgeräterraum", "Printcenter", "Scannerraum"], - "Drucker": ["Kopierer", "Kopie", "Kopierraum", "Druckerraum", "Druckgeräterraum", "Printcenter", "Scannerraum"], - "Druckerraum": ["Kopierer", "Kopie", "Kopierraum", "Drucker", "Druckgeräterraum", "Printcenter", "Scannerraum"], - "Druckgeräterraum": ["Kopierer", "Kopie", "Kopierraum", "Drucker", "Druckerraum", "Printcenter", "Scannerraum"], - "Printcenter": ["Kopierer", "Kopie", "Kopierraum", "Drucker", "Druckerraum", "Druckgeräterraum", "Scannerraum"], - "Scannerraum": ["Kopierer", "Kopie", "Kopierraum", "Drucker", "Druckerraum", "Druckgeräterraum", "Printcenter"], - - "Teilküche": ["Küche", "Anrichte", "Arbeitsraum für Verpflegung"], - "Küche": ["Teilküche", "Anrichte", "Arbeitsraum für Verpflegung"], - "Anrichte": ["Teilküche", "Küche", "Arbeitsraum für Verpflegung"], - "Arbeitsraum für Verpflegung": ["Teilküche", "Küche", "Anrichte"], - - "Kühlzelle": ["Kühlzellen", "Kühlraum", "Kühlkammer", "Kühlung", "Gefrierschrank", "Kühlschrank", "Kühllagerraum"], - "Kühlzellen": ["Kühlzelle", "Kühlraum", "Kühlkammer", "Kühlung", "Gefrierschrank", "Kühlschrank", "Kühllagerraum"], - "Kühlraum": ["Kühlzelle", "Kühlzellen", "Kühlkammer", "Kühlung", "Gefrierschrank", "Kühlschrank", "Kühllagerraum"], - "Kühlkammer": ["Kühlzelle", "Kühlzellen", "Kühlraum", "Kühlung", "Gefrierschrank", "Kühlschrank", "Kühllagerraum"], - "Kühlung": ["Kühlzelle", "Kühlzellen", "Kühlraum", "Kühlkammer", "Gefrierschrank", "Kühlschrank", "Kühllagerraum"], - "Gefrierschrank": ["Kühlzelle", "Kühlzellen", "Kühlraum", "Kühlkammer", "Kühlung", "Kühlschrank", "Kühllagerraum"], - "Kühlschrank": ["Kühlzelle", "Kühlzellen", "Kühlraum", "Kühlkammer", "Kühlung", "Gefrierschrank", "Kühllagerraum"], - "Kühllagerraum": ["Kühlzelle", "Kühlzellen", "Kühlraum", "Kühlkammer", "Kühlung", "Gefrierschrank", "Kühlschrank"], - - "Müllager": ["Müll", "Müllraum", "Abfall", "Abfallsammelstelle", "Abfälle", "Entsorgungsraum", "Müllzwischenlager", "Müllsammelstelle"], - "Müll": ["Müllager", "Müllraum", "Abfall", "Abfallsammelstelle", "Abfälle", "Entsorgungsraum", "Müllzwischenlager", "Müllsammelstelle"], - "Müllraum": ["Müllager", "Müll", "Abfall", "Abfallsammelstelle", "Abfälle", "Entsorgungsraum", "Müllzwischenlager", "Müllsammelstelle"], - "Abfall": ["Müllager", "Müll", "Müllraum", "Abfallsammelstelle", "Abfälle", "Entsorgungsraum", "Müllzwischenlager", "Müllsammelstelle"], - "Abfallsammelstelle": ["Müllager", "Müll", "Müllraum", "Abfall", "Abfälle", "Entsorgungsraum", "Müllzwischenlager", "Müllsammelstelle"], - "Abfälle": ["Müllager", "Müll", "Müllraum", "Abfall", "Abfallsammelstelle", "Entsorgungsraum", "Müllzwischenlager", "Müllsammelstelle"], - "Entsorgungsraum": ["Müllager", "Müll", "Müllraum", "Abfall", "Abfallsammelstelle", "Abfälle", "Müllzwischenlager", "Müllsammelstelle"], - "Müllzwischenlager": ["Müllager", "Müll", "Müllraum", "Abfall", "Abfallsammelstelle", "Abfälle", "Entsorgungsraum", "Müllsammelstelle"], - "Müllsammelstelle": ["Müllager", "Müll", "Müllraum", "Abfall", "Abfallsammelstelle", "Abfälle", "Entsorgungsraum", "Müllzwischenlager"], - - "Gefahrstoffraum": ["Gefahrstofflager", "Gefahrgutraum", "Gefahrgutlager", "Giftlager"], - "Gefahrstofflager": ["Gefahrstoffraum", "Gefahrgutraum", "Gefahrgutlager", "Giftlager"], - "Gefahrgutraum": ["Gefahrstoffraum", "Gefahrstofflager", "Gefahrgutlager", "Giftlager"], - "Gefahrgutlager": ["Gefahrstoffraum", "Gefahrstofflager", "Gefahrgutraum", "Giftlager"], - "Giftlager": ["Gefahrstoffraum", "Gefahrstofflager", "Gefahrgutraum", "Gefahrgutlager"], - - "Chemikalienraum": ["Chemikalienlager", "Chemikalien"], - "Chemikalienlager": ["Chemikalienraum", "Chemikalien"], - "Chemikalien": ["Chemikalienraum", "Chemikalienlager"], - - "Sondermüllzwischenlager": ["Sondermülllager", "Sonderabfall"], - "Sondermülllager": ["Sondermüllzwischenlager", "Sonderabfall"], - "Sonderabfall": ["Sondermüllzwischenlager", "Sondermülllager"], - - "Dusche": ["Duschraum"], - "Duschraum": ["Dusche"], - - "Laborraum": ["Labor"], - "Labor raum": ["Labor"], - - "straße": ["str"], - "str": ["straße"], - - "raum": ["room"], - - "ii": ["2"], - "2": ["ii"], - "iii": ["3"], - "3": ["iii"], - "iv": ["4"], - "4": ["iv"], - - "Interims": ["Interimshörsäle", "Interims-Audimax"], - - "Fachschaft": ["FS", "Fachschaftsbüro", "Fachschaftsraum"], - "FS": ["Fachschaft", "Fachschaftsbüro", "Fachschaftsraum"], - "Fachschaftsbüro": ["Fachschaft", "FS", "Fachschaftsraum"], - "Fachschaftsraum": ["Fachschaft", "FS", "Fachschaftsbüro"], - - "Fachschaft MPI": ["Fachschaft MPIC", "MPI", "MPIC", "FSMPI", "FSMPIC"], - "Fachschaft MPIC": ["Fachschaft MPI", "MPI", "MPIC", "FSMPI", "FSMPIC"], - "MPI": ["Fachschaft MPI", "Fachschaft MPIC", "MPIC", "FSMPI", "FSMPIC"], - "MPIC": ["Fachschaft MPI", "Fachschaft MPIC", "MPI", "FSMPI", "FSMPIC"], - "FSMPI": ["Fachschaft MPI", "Fachschaft MPIC", "MPI", "MPIC", "FSMPIC"], - "FSMPIC": ["Fachschaft MPI", "Fachschaft MPIC", "MPI", "MPIC", "FSMPI"], - "AStA": ["SV", "StuVe", "Studentische Vertretung"], - "Studentische Vertretung": ["SV", "StuVe", "AStA"], - "StuVe": ["SV", "Studentische Vertretung", "AStA"] -} diff --git a/data/sources/01_areas-extended.yaml b/data/sources/01_areas-extended.yaml index 05fd781f9..bdbc6766d 100644 --- a/data/sources/01_areas-extended.yaml +++ b/data/sources/01_areas-extended.yaml @@ -41,9 +41,7 @@ root: children: - { name: "MRI Klinikum rechts der Isar", id: "mri" } - { name: "Campus im Olympiapark", id: "olympiapark" } - - name: "Campus Straubing" - id: "cs" - coords: { lat: 48.884541355672695, lon: 12.58400509316536 } + - { name: "Campus Straubing", id: "cs" } - { name: "Garching Hochbrück", id: "garching-hochbrueck" } - { name: "Taufkirchen / Ottobrunn", id: "taufkirchen-ottobrunn" } @@ -295,7 +293,7 @@ mri-psychosomatik: coords: { lat: 48.13697, lon: 11.60185 } osm: ["way/75376256"] -mri-imse: +1720: coords: { lat: 48.13490, lon: 11.61119 } osm: ["node/1383888738"] # addr:housenumber external_data: @@ -548,6 +546,7 @@ heilbronn: # ========= Straubing ========= cs: + coords: { lat: 48.884541355672695, lon: 12.58400509316536 } props: links: - text: @@ -1031,10 +1030,13 @@ galileo: # --- Interims --- #garching-interims: # no specific coordinates -5620: # Interims-Audimax I - osm: ["way/104255082"] 5416: # Interimshörsäle II, Jürgen Manchot-Hörsaalgebäude osm: ["way/618517674"] +5539: # Interimshörsäle III, Interims-Tentomax MW + osm: ["way/618517675"] + coords: { lat: 48.2665826474772, lon: 11.671473663339693 } +5620: # Interims-Audimax I + osm: ["way/1191888066"] # --- External buildings in Garching (South-West) --- garching-sued-west: diff --git a/data/sources/12_nat_excluded_buildings.yaml b/data/sources/12_nat_excluded_buildings.yaml index 88e028c52..1b4196ee2 100644 --- a/data/sources/12_nat_excluded_buildings.yaml +++ b/data/sources/12_nat_excluded_buildings.yaml @@ -85,7 +85,7 @@ - "0598" - "4298" - "5538" -- "5539" # Interims-Tentomax MW => buildings no longer exist +#- "5539" # Interims-Tentomax MW => buildings exist temporary again ^^ - "5998" # "Interims-Tentomax => buildings no longer exist - "5516" - "5600" # phantom buildings, which don't exist diff --git a/deployment/k3s/templates/deployments/maps/maps-deployment.yaml b/deployment/k3s/templates/deployments/maps/maps-deployment.yaml index 455ac1ccd..d990beaf5 100644 --- a/deployment/k3s/templates/deployments/maps/maps-deployment.yaml +++ b/deployment/k3s/templates/deployments/maps/maps-deployment.yaml @@ -50,13 +50,10 @@ spec: - name: tileserver-init-sprites image: "busybox:latest" command: - - wget - - -P - - /sprites - - https://raw.githubusercontent.com/maputnik/osm-liberty/gh-pages/sprites/osm-liberty.json - - https://raw.githubusercontent.com/maputnik/osm-liberty/gh-pages/sprites/osm-liberty@2x.json - - https://raw.githubusercontent.com/maputnik/osm-liberty/gh-pages/sprites/osm-liberty.png - - https://raw.githubusercontent.com/maputnik/osm-liberty/gh-pages/sprites/osm-liberty@2x.png + - sh + - -c + {{- $spritesURL := "https://raw.githubusercontent.com/maputnik/osm-liberty/gh-pages/sprites" }} + - "rm -f /sprites/* && wget -P /sprites {{ $spritesURL }}/osm-liberty.json {{ $spritesURL }}/osm-liberty@2x.json {{ $spritesURL }}/osm-liberty.png {{ $spritesURL }}/osm-liberty@2x.png" volumeMounts: - mountPath: /sprites name: sprites-tileserver diff --git a/deployment/k3s/templates/deployments/server-deployment.yaml b/deployment/k3s/templates/deployments/server-deployment.yaml index 5d2b8c028..0cfe99663 100644 --- a/deployment/k3s/templates/deployments/server-deployment.yaml +++ b/deployment/k3s/templates/deployments/server-deployment.yaml @@ -31,29 +31,11 @@ spec: {{- end }} spec: priorityClassName: {{ $.Values.url }} - volumes: - - name: tmp-server - emptyDir: {} - - name: tmp-mieli-search - emptyDir: {} - initContainers: - - name: building-db-init - image: "ghcr.io/tum-dev/navigatum-building-db-init:{{ $.Values.tag }}" - imagePullPolicy: Always - volumeMounts: - - mountPath: /tmp - name: tmp-server - - name: meili-init - image: "ghcr.io/tum-dev/navigatum-mieli-search-init:{{ $.Values.tag }}" - imagePullPolicy: Always - volumeMounts: - - mountPath: /meili_data - name: tmp-mieli-search containers: - name: server image: "ghcr.io/tum-dev/navigatum-server:{{ $.Values.tag }}" imagePullPolicy: Always - command: ["/bin/navigatum-main-api"] + command: ["sh", "-c", "pwd && ls -lah && /bin/navigatum-main-api"] {{ if $.Values.server.MEILI_MASTER_KEY }} envFrom: - secretRef: @@ -61,22 +43,18 @@ spec: {{ end }} env: - name: DB_LOCATION - value: /tmp/server.db + value: api_data.db ports: - containerPort: 8080 name: api - volumeMounts: - - mountPath: /tmp - name: tmp-server securityContext: allowPrivilegeEscalation: false - readOnlyRootFilesystem: true resources: requests: cpu: {{ if eq "nav.tum.de" $.Values.url }}500m{{ else }}5m{{ end }} - memory: 60Mi + memory: 1000Mi limits: - memory: 200Mi + memory: 2000Mi livenessProbe: httpGet: path: /api/status @@ -103,9 +81,6 @@ spec: ports: - containerPort: 7700 name: http - volumeMounts: - - mountPath: /meili_data - name: tmp-mieli-search resources: requests: cpu: {{ if eq "nav.tum.de" $.Values.url }}200m{{ else }}50m{{ end }} diff --git a/deployment/k3s/values.yaml b/deployment/k3s/values.yaml index 4c3d7d129..69caf70e2 100644 --- a/deployment/k3s/values.yaml +++ b/deployment/k3s/values.yaml @@ -8,12 +8,9 @@ server: mielisearch: image: repository: 'getmeili/meilisearch' - tag: v1.3.1 + tag: v1.3.4 calendar: scrape_tasks: - - name: refresh-calendar-fast # takes ~4m to complete - schedule: "20-50/10 * * * *" # at :20, :30, :40, :50 every hour - scraped_time_window_months: 2 - name: refresh-calendar-slow # takes ~6m to complete schedule: "5 * * * *" # at :05 every hour scraped_time_window_months: 120 # 120 months = 10 years diff --git a/renovate.json b/renovate.json index b20b0ec09..6e67f2a3a 100644 --- a/renovate.json +++ b/renovate.json @@ -2,17 +2,24 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:base", + "group:recommended", "group:allNonMajor" ], - "lockFileMaintenance": { - "enabled": true, - "automerge": true + "vulnerabilityAlerts": { + "enabled": true }, "packageRules": [ { "matchDepTypes": ["devDependencies"], - "matchPackagePatterns": ["eslint", "prettier", "pylint", "sourcery", "pretty_assertions"], - "automerge": true + "prPriority": -1 + }, + { + "matchPackagePatterns": ["eslint", "prettier", "pylint", "sourcery", "pretty_assertions", "pre-commit", "mypy", "sourcery"], + "groupName": "linting" + }, + { + "matchPackagePatterns": ["@types/.*", "types-.*"], + "groupName": "types" } ] } diff --git a/requirements-dev.txt b/requirements-dev.txt index 4e6d5a738..7c1e8b1b3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,7 @@ mypy~=1.5.0 -pre-commit~=3.3.2 +pre-commit~=3.4.0 pylint~=2.17.4 -sourcery~=1.8.0 +sourcery~=1.9.0 types-Pillow~=10.0.0.2 types-PyYAML~=6.0.12.10 types-requests~=2.31.0.1 diff --git a/server/.dockerignore b/server/.dockerignore index eb5a316cb..b51e6332f 100644 --- a/server/.dockerignore +++ b/server/.dockerignore @@ -1 +1,2 @@ target +api_data.db diff --git a/server/.gitignore b/server/.gitignore index a971c5a46..b51e6332f 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -1,2 +1,2 @@ target -main-api/data +api_data.db diff --git a/server/.sqlx/query-1883c95212e7119034b648e74c6a5f5c40a99660e0413e0a26853ecb5c21462e.json b/server/.sqlx/query-1883c95212e7119034b648e74c6a5f5c40a99660e0413e0a26853ecb5c21462e.json new file mode 100644 index 000000000..20d57b825 --- /dev/null +++ b/server/.sqlx/query-1883c95212e7119034b648e74c6a5f5c40a99660e0413e0a26853ecb5c21462e.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM aliases", + "describe": { + "columns": [], + "parameters": { + "Right": 0 + }, + "nullable": [] + }, + "hash": "1883c95212e7119034b648e74c6a5f5c40a99660e0413e0a26853ecb5c21462e" +} diff --git a/server/.sqlx/query-3de656b156e0d049f115ec5260f84af18f85a63d62f7d7497359d8e5fc2d4078.json b/server/.sqlx/query-3de656b156e0d049f115ec5260f84af18f85a63d62f7d7497359d8e5fc2d4078.json new file mode 100644 index 000000000..7ad42436c --- /dev/null +++ b/server/.sqlx/query-3de656b156e0d049f115ec5260f84af18f85a63d62f7d7497359d8e5fc2d4078.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO de(key,data,name,tumonline_room_nr,type,type_common_name,lat,lon)\n VALUES (?,?,?,?,?,?,?,?)", + "describe": { + "columns": [], + "parameters": { + "Right": 8 + }, + "nullable": [] + }, + "hash": "3de656b156e0d049f115ec5260f84af18f85a63d62f7d7497359d8e5fc2d4078" +} diff --git a/server/.sqlx/query-644bce09e28dd856187ca56660f7eea452d645c26f2d3c44460e669a835ca815.json b/server/.sqlx/query-644bce09e28dd856187ca56660f7eea452d645c26f2d3c44460e669a835ca815.json new file mode 100644 index 000000000..75672349f --- /dev/null +++ b/server/.sqlx/query-644bce09e28dd856187ca56660f7eea452d645c26f2d3c44460e669a835ca815.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT OR REPLACE INTO aliases (alias, key, type, visible_id)\n VALUES (?, ?, ?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 4 + }, + "nullable": [] + }, + "hash": "644bce09e28dd856187ca56660f7eea452d645c26f2d3c44460e669a835ca815" +} diff --git a/server/.sqlx/query-b59dbe8a5c3b6f7fdb9543508ae7b1473d24ffea9d69a8a96ca7bedf6aa2c6e4.json b/server/.sqlx/query-b59dbe8a5c3b6f7fdb9543508ae7b1473d24ffea9d69a8a96ca7bedf6aa2c6e4.json new file mode 100644 index 000000000..094bfa433 --- /dev/null +++ b/server/.sqlx/query-b59dbe8a5c3b6f7fdb9543508ae7b1473d24ffea9d69a8a96ca7bedf6aa2c6e4.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM en", + "describe": { + "columns": [], + "parameters": { + "Right": 0 + }, + "nullable": [] + }, + "hash": "b59dbe8a5c3b6f7fdb9543508ae7b1473d24ffea9d69a8a96ca7bedf6aa2c6e4" +} diff --git a/server/.sqlx/query-b689ec21c7bcb38c8853d5146852d5a84a0774d47e1957da8eac576bedcfebcc.json b/server/.sqlx/query-b689ec21c7bcb38c8853d5146852d5a84a0774d47e1957da8eac576bedcfebcc.json new file mode 100644 index 000000000..bd64941cb --- /dev/null +++ b/server/.sqlx/query-b689ec21c7bcb38c8853d5146852d5a84a0774d47e1957da8eac576bedcfebcc.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO en(key,data,name,tumonline_room_nr,type,type_common_name,lat,lon)\n VALUES (?,?,?,?,?,?,?,?)", + "describe": { + "columns": [], + "parameters": { + "Right": 8 + }, + "nullable": [] + }, + "hash": "b689ec21c7bcb38c8853d5146852d5a84a0774d47e1957da8eac576bedcfebcc" +} diff --git a/server/.sqlx/query-b85ef040a74d51bf6b539703028583c9a0917f5203ccdc4ed01e4272fb68d1d8.json b/server/.sqlx/query-b85ef040a74d51bf6b539703028583c9a0917f5203ccdc4ed01e4272fb68d1d8.json new file mode 100644 index 000000000..96281fc03 --- /dev/null +++ b/server/.sqlx/query-b85ef040a74d51bf6b539703028583c9a0917f5203ccdc4ed01e4272fb68d1d8.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM de", + "describe": { + "columns": [], + "parameters": { + "Right": 0 + }, + "nullable": [] + }, + "hash": "b85ef040a74d51bf6b539703028583c9a0917f5203ccdc4ed01e4272fb68d1d8" +} diff --git a/server/Cargo.lock b/server/Cargo.lock index 4ea62628b..5979ed69d 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -55,17 +55,17 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.3.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2079246596c18b4a33e274ae10c0e50613f4d32a4198e09c7b93771013fed74" +checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", - "ahash 0.8.3", - "base64 0.21.2", - "bitflags 1.3.2", + "ahash", + "base64 0.21.4", + "bitflags 2.4.0", "brotli", "bytes", "bytestring", @@ -99,7 +99,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -117,9 +117,9 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e" +checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d" dependencies = [ "futures-core", "tokio", @@ -127,9 +127,9 @@ dependencies = [ [[package]] name = "actix-server" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e8613a75dd50cc45f473cee3c34d59ed677c0f7b44480ce3b8247d7dc519327" +checksum = "3eb13e7eef0423ea6eab0e59f6c72e7cb46d33691ad56a726b3cd07ddec2c2d4" dependencies = [ "actix-rt", "actix-service", @@ -137,8 +137,7 @@ dependencies = [ "futures-core", "futures-util", "mio", - "num_cpus", - "socket2 0.4.9", + "socket2 0.5.3", "tokio", "tracing", ] @@ -166,9 +165,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.3.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96" +checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9" dependencies = [ "actix-codec", "actix-http", @@ -179,7 +178,7 @@ dependencies = [ "actix-service", "actix-utils", "actix-web-codegen", - "ahash 0.7.6", + "ahash", "bytes", "bytestring", "cfg-if", @@ -188,7 +187,6 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "http", "itoa", "language-tags", "log", @@ -200,43 +198,41 @@ dependencies = [ "serde_json", "serde_urlencoded", "smallvec", - "socket2 0.4.9", + "socket2 0.5.3", "time", "url", ] [[package]] name = "actix-web-codegen" -version = "4.2.0" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9" +checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5" dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] -name = "actix-web-prometheus" -version = "0.1.2" +name = "actix-web-prom" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5228fd1a6b5d0f60d636776c2a70acc9fc667034bb4ac02ec4259f0eeeab6c" +checksum = "f23f332a652836b8f3a6876103c70c9ed436d0e69fa779ab5d7f57b1d5c8d488" dependencies = [ - "actix-service", "actix-web", - "futures-lite", - "pin-project", + "futures-core", + "pin-project-lite", "prometheus", - "quanta 0.10.1", - "thiserror", + "regex", ] [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -247,17 +243,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.10", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.3" @@ -272,9 +257,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -294,6 +279,12 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -335,6 +326,19 @@ dependencies = [ "futures-core", ] +[[package]] +name = "async-compression" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d495b6dc0184693324491a5ac05f559acc97bf937ab31d7a1c33dd0016be6d2b" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + [[package]] name = "async-trait" version = "0.1.73" @@ -343,7 +347,16 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", ] [[package]] @@ -354,9 +367,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -375,9 +388,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" + +[[package]] +name = "base64ct" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "beef" @@ -402,6 +421,9 @@ name = "bitflags" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +dependencies = [ + "serde", +] [[package]] name = "block-buffer" @@ -441,9 +463,9 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" @@ -453,9 +475,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bytestring" @@ -468,9 +490,9 @@ dependencies = [ [[package]] name = "cached" -version = "0.44.0" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b195e4fbc4b6862bbd065b991a34750399c119797efff72492f28a5864de8700" +checksum = "90eb5776f28a149524d1d8623035760b4454ec881e8cf3838fa8d7e1b11254b3" dependencies = [ "async-trait", "cached_proc_macro", @@ -485,11 +507,10 @@ dependencies = [ [[package]] name = "cached_proc_macro" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b48814962d2fd604c50d2b9433c2a41a0ab567779ee2c02f7fba6eca1221f082" +checksum = "7da8245dd5f576a41c3b76247b54c15b0e43139ceeb4f732033e15be7c005176" dependencies = [ - "cached_proc_macro_types", "darling", "proc-macro2", "quote", @@ -526,15 +547,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "winapi", + "windows-targets", ] [[package]] @@ -552,6 +573,12 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "const-oid" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" + [[package]] name = "conv" version = "0.3.3" @@ -612,6 +639,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + [[package]] name = "crc32fast" version = "1.3.2" @@ -655,6 +697,16 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.16" @@ -754,9 +806,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", "hashbrown 0.14.0", @@ -765,6 +817,17 @@ dependencies = [ "parking_lot_core", ] +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + [[package]] name = "deranged" version = "0.3.8" @@ -789,9 +852,9 @@ dependencies = [ [[package]] name = "diesel" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7a532c1f99a0f596f6960a60d1e119e91582b24b39e2d83a190e61262c3ef0c" +checksum = "d98235fdc2f355d330a8244184ab6b4b33c28679c0b4158f63138e51d6cf7e88" dependencies = [ "bitflags 2.4.0", "byteorder", @@ -805,14 +868,14 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74398b79d81e52e130d991afeed9c86034bb1b7735f46d2f5bf7deb261d80303" +checksum = "e054665eaf6d97d1e7125512bb2d35d07c73ac86cc6920174cb42d1ab697a554" dependencies = [ "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -832,7 +895,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" dependencies = [ - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -848,7 +911,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", + "subtle", ] [[package]] @@ -857,6 +922,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + [[package]] name = "either" version = "1.9.0" @@ -868,37 +939,33 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - [[package]] name = "equivalent" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "erased-serde" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +dependencies = [ + "serde", +] + [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -915,6 +982,17 @@ dependencies = [ "libc", ] +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -1056,6 +1134,17 @@ dependencies = [ "futures-util", ] +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + [[package]] name = "futures-io" version = "0.3.28" @@ -1085,7 +1174,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -1170,9 +1259,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glob" @@ -1193,16 +1282,16 @@ dependencies = [ "no-std-compat", "nonzero_ext", "parking_lot", - "quanta 0.9.3", + "quanta", "rand 0.8.5", "smallvec", ] [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1243,12 +1332,28 @@ name = "hashbrown" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.0", +] [[package]] name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "hermit-abi" @@ -1256,6 +1361,39 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + [[package]] name = "http" version = "0.2.9" @@ -1296,12 +1434,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyper" version = "0.14.27" @@ -1479,17 +1611,6 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", -] - [[package]] name = "isahc" version = "1.7.2" @@ -1574,7 +1695,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "pem", "ring", "serde", @@ -1593,6 +1714,9 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] [[package]] name = "lebe" @@ -1606,6 +1730,12 @@ version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +[[package]] +name = "libm" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + [[package]] name = "libnghttp2-sys" version = "0.1.8+1.55.1" @@ -1629,9 +1759,9 @@ dependencies = [ [[package]] name = "libwebp-sys" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5df1e76f0acef0058aa2164ccf74e610e716e7f9eeb3ee2283de7d43659d823" +checksum = "3e0df0a0f9444d52aee6335cd724d21a2ee3285f646291799a72be518ec8ee3c" dependencies = [ "cc", "glob", @@ -1688,6 +1818,10 @@ name = "log" version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +dependencies = [ + "serde", + "value-bag", +] [[package]] name = "logos" @@ -1709,7 +1843,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax 0.6.29", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -1740,11 +1874,20 @@ dependencies = [ "rawpointer", ] +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest", +] + [[package]] name = "meilisearch-index-setting-macro" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923bb7380030676cfd6563bc09cf88f7150fab55fc881c44e86f4a10c9b7ae2a" +checksum = "b6e019768c1720f9820e94e8ec527e492be150eb0a5deeec28d85af7a5bbbe6a" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -1754,9 +1897,9 @@ dependencies = [ [[package]] name = "meilisearch-sdk" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff38036cb0ce16609896d1fd90fbce9432a173c744abd3a0d8daf2e4cdbb0d65" +checksum = "639a940bc77db5398000cb184c543106a823677f474f2f195251d2bdd373b6de" dependencies = [ "async-trait", "either", @@ -1781,9 +1924,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" @@ -1906,11 +2049,10 @@ version = "1.0.0" dependencies = [ "actix-cors", "actix-web", - "actix-web-prometheus", + "actix-web-prom", "chrono", "diesel", "diesel_migrations", - "env_logger", "futures", "lazy_static", "log", @@ -1923,6 +2065,7 @@ dependencies = [ "rustls", "serde", "serde_json", + "structured-logger", "tokio", ] @@ -1933,10 +2076,9 @@ dependencies = [ "actix-cors", "actix-governor", "actix-web", - "actix-web-prometheus", - "base64 0.21.2", + "actix-web-prom", + "base64 0.21.4", "chrono", - "env_logger", "image", "imageproc", "jsonwebtoken", @@ -1948,6 +2090,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", + "structured-logger", "tempfile", "tokio", ] @@ -1958,10 +2101,9 @@ version = "1.0.0" dependencies = [ "actix-cors", "actix-web", - "actix-web-prometheus", + "actix-web-prom", "cached", "diesel", - "env_logger", "futures", "image", "imageproc", @@ -1971,11 +2113,15 @@ dependencies = [ "logos", "meilisearch-sdk", "pretty_assertions", + "regex", "reqwest", "rustls", "rusttype", "serde", "serde_json", + "serde_yaml", + "sqlx", + "structured-logger", "tokio", "unicode-truncate", ] @@ -2018,15 +2164,32 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", "num-traits", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + [[package]] name = "num-complex" version = "0.4.4" @@ -2076,6 +2239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -2090,22 +2254,22 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] [[package]] name = "octocrab" -version = "0.29.3" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170c527fe1bf1d045e1f69a10dfd9b192327d53728b2c3481cf95b9dc2b42998" +checksum = "bbed1b1298bc70dd4ae89fd44dd7c13f0a1c80a506d731eb1b939f14f5e367de" dependencies = [ "arc-swap", "async-trait", - "base64 0.21.2", + "base64 0.21.4", "bytes", "cfg-if", "chrono", @@ -2142,11 +2306,11 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.56" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cfg-if", "foreign-types", "libc", @@ -2163,7 +2327,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -2174,9 +2338,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.91" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -2237,6 +2401,15 @@ dependencies = [ "base64 0.13.1", ] +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.0" @@ -2260,14 +2433,14 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2275,6 +2448,27 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.27" @@ -2392,22 +2586,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "quanta" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e31331286705f455e56cca62e0e717158474ff02b7936c1fa596d983f4ae27" -dependencies = [ - "crossbeam-utils", - "libc", - "mach", - "once_cell", - "raw-cpuid", - "wasi 0.10.2+wasi-snapshot-preview1", - "web-sys", - "winapi", -] - [[package]] name = "quote" version = "1.0.33" @@ -2545,25 +2723,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] @@ -2574,17 +2752,18 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.19" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.2", + "async-compression", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -2593,6 +2772,7 @@ dependencies = [ "http", "http-body", "hyper", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -2603,16 +2783,20 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", + "tokio-rustls", + "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots", "winreg", ] @@ -2631,6 +2815,28 @@ dependencies = [ "winapi", ] +[[package]] +name = "rsa" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +dependencies = [ + "byteorder", + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature", + "spki", + "subtle", + "zeroize", +] + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -2648,9 +2854,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" dependencies = [ "bitflags 2.4.0", "errno", @@ -2661,9 +2867,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", @@ -2689,7 +2895,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", ] [[package]] @@ -2809,22 +3015,31 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", +] + +[[package]] +name = "serde_fmt" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4" +dependencies = [ + "serde", ] [[package]] @@ -2893,6 +3108,17 @@ dependencies = [ "digest", ] +[[package]] +name = "sha2" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -2902,6 +3128,16 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +dependencies = [ + "digest", + "rand_core 0.6.4", +] + [[package]] name = "simba" version = "0.7.3" @@ -2935,9 +3171,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -3028,18 +3264,330 @@ dependencies = [ "lock_api", ] +[[package]] +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sqlformat" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" +dependencies = [ + "itertools", + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +dependencies = [ + "ahash", + "atoi", + "byteorder", + "bytes", + "crc", + "crossbeam-queue", + "dotenvy", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap 2.0.0", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +dependencies = [ + "dotenvy", + "either", + "heck", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +dependencies = [ + "atoi", + "base64 0.21.4", + "bitflags 2.4.0", + "byteorder", + "bytes", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand 0.8.5", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +dependencies = [ + "atoi", + "base64 0.21.4", + "bitflags 2.4.0", + "byteorder", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand 0.8.5", + "serde", + "serde_json", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +dependencies = [ + "atoi", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", +] + [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "stringprep" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "structured-logger" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16524b1ef57fd2e253216ab20ec44f0dc32b29155a4b3e6bef0a857d8c9f5f08" +dependencies = [ + "log", + "parking_lot", + "serde", + "serde_json", + "tokio", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "sval" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b031320a434d3e9477ccf9b5756d57d4272937b8d22cb88af80b7633a1b78b1" + +[[package]] +name = "sval_buffer" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf7e9412af26b342f3f2cc5cc4122b0105e9d16eb76046cd14ed10106cf6028" +dependencies = [ + "sval", + "sval_ref", +] + +[[package]] +name = "sval_dynamic" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0ef628e8a77a46ed3338db8d1b08af77495123cc229453084e47cd716d403cf" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_fmt" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dc09e9364c2045ab5fa38f7b04d077b3359d30c4c2b3ec4bae67a358bd64326" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_json" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ada6f627e38cbb8860283649509d87bc4a5771141daa41c78fd31f2b9485888d" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_ref" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703ca1942a984bd0d9b5a4c0a65ab8b4b794038d080af4eb303c71bc6bf22d7c" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_serde" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830926cd0581f7c3e5d51efae4d35c6b6fc4db583842652891ba2f1bed8db046" +dependencies = [ + "serde", + "sval", + "sval_buffer", + "sval_fmt", +] + [[package]] name = "syn" version = "1.0.109" @@ -3053,9 +3601,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", @@ -3075,33 +3623,24 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -3117,9 +3656,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "itoa", @@ -3136,9 +3675,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -3195,7 +3734,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -3218,6 +3757,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.8" @@ -3234,9 +3784,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "de0a3ab2091e52d7299a39d098e200114a972df0a7724add02a273aa9aada592" dependencies = [ "serde", "serde_spanned", @@ -3255,9 +3805,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.0.0", "serde", @@ -3285,9 +3835,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "bitflags 2.4.0", "bytes", @@ -3335,7 +3885,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -3417,6 +3967,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + [[package]] name = "unsafe-libyaml" version = "0.2.9" @@ -3431,9 +3987,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -3450,6 +4006,42 @@ dependencies = [ "getrandom 0.2.10", ] +[[package]] +name = "value-bag" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" +dependencies = [ + "value-bag-serde1", + "value-bag-sval2", +] + +[[package]] +name = "value-bag-serde1" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b9f3feef403a50d4d67e9741a6d8fc688bcbb4e4f31bd4aab72cc690284394" +dependencies = [ + "erased-serde", + "serde", + "serde_fmt", +] + +[[package]] +name = "value-bag-sval2" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b24f4146b6f3361e91cbf527d1fb35e9376c3c0cef72ca5ec5af6d640fad7d" +dependencies = [ + "sval", + "sval_buffer", + "sval_dynamic", + "sval_fmt", + "sval_json", + "sval_ref", + "sval_serde", +] + [[package]] name = "vcpkg" version = "0.2.15" @@ -3516,7 +4108,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", "wasm-bindgen-shared", ] @@ -3550,7 +4142,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3580,12 +4172,24 @@ dependencies = [ "libwebp-sys", ] +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + [[package]] name = "weezl" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +[[package]] +name = "whoami" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" + [[package]] name = "wide" version = "0.7.11" @@ -3612,15 +4216,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -3704,9 +4299,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.14" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] diff --git a/server/Cargo.toml b/server/Cargo.toml index d08647dfa..ce1055927 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,19 +1,20 @@ [workspace] members = ["feedback", "calendar", "main-api"] +resolver = "2" [profile.release] strip = true -lto = true +lto = "thin" [workspace.dependencies] # logging/obeservability log = "0.4.20" -env_logger = "0.10.0" -actix-web-prometheus = "0.1.2" +structured-logger = "1.0.3" +actix-web-prom = { version = "0.7.0", default-features = false, features = [] } # runtime + webserver tokio = { version = "1.32", features = ["full"] } -actix-web = "4.3.1" +actix-web = "4.4.0" actix-cors = "0.6.4" #serialisation diff --git a/server/Dockerfile b/server/Dockerfile index a8766f1f0..d7f02c992 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,9 +1,12 @@ -# Compile -FROM rust:1.71-alpine AS compiler +FROM rust:1.72-alpine AS compiler # to ache the build this line inludes all the dependencys all servers need # this is not an issue since we copy the generated binary to a more minimal envornment -RUN apk add -q --update-cache --no-cache build-base openssl-dev libpq-dev libwebp-dev +# Descriptions: +# - musl-dev is needed fpr musl to compile the binary +# - libpq-dev is needed for diesel (sigh) +# - libwebp-dev is until the `image` has finsihed the refactoring effort +RUN apk add -q --update-cache --no-cache musl-dev libpq-dev libwebp-dev WORKDIR /compiler ENV USER=root @@ -14,7 +17,8 @@ COPY ./Cargo.* ./ COPY main-api/Cargo.* ./main-api/ COPY feedback/Cargo.* ./feedback/ COPY calendar/Cargo.* ./calendar/ -RUN mkdir ./main-api/src/ ./feedback/src/ ./calendar/src/ \ +RUN mkdir ./main-api/src/ ./main-api/src/setup/ ./feedback/src/ ./calendar/src/ \ + && echo "fn main() { println!(\"Hello, world!\");}" > ./main-api/src/setup/mod.rs \ && echo "fn main() { println!(\"Hello, world!\");}" > ./main-api/src/main.rs\ && echo "fn main() { println!(\"Hello, world!\");}" > ./feedback/src/main.rs\ && echo "fn main() { println!(\"Hello, world!\");}" > ./calendar/src/main.rs\ @@ -27,27 +31,33 @@ RUN cargo build --release --workspace \ COPY main-api/diesel.toml ./main-api/diesel.toml COPY calendar/diesel.toml ./calendar/diesel.toml COPY calendar/migrations calendar/migrations +COPY .sqlx .sqlx COPY feedback/src ./feedback/src COPY calendar/src ./calendar/src COPY main-api/src ./main-api/src +COPY main-api/migrations ./main-api/migrations RUN cargo build --release --workspace # RUN FROM alpine:3.18 +ARG GIT_COMMIT_SHA +ENV GIT_COMMIT_SHA=${GIT_COMMIT_SHA} + RUN apk update --quiet \ - && apk add -q --no-cache libgcc libpq-dev libwebp tini curl \ - && mkdir -p ./src/maps/font + && apk add -q --no-cache libgcc libpq-dev libwebp tini curl -COPY main-api/src/maps ./src/maps # add `navigatum-*` to the `/bin` so we can run it from anywhere and it's easy to find. COPY --from=compiler /compiler/target/release/navigatum-* /bin/ -ARG GIT_COMMIT_SHA -ENV GIT_COMMIT_SHA=${GIT_COMMIT_SHA} - +# after this point, we don't need the root user anymore +RUN adduser -D navigatum \ + && mkdir -p /home/navigatum \ + && chown -R navigatum:navigatum /home/navigatum +WORKDIR /home/navigatum +USER navigatum ENTRYPOINT ["tini", "--"] diff --git a/server/calendar/Cargo.toml b/server/calendar/Cargo.toml index fe4c8c368..55d542e6b 100644 --- a/server/calendar/Cargo.toml +++ b/server/calendar/Cargo.toml @@ -20,18 +20,18 @@ path = "src/scraper.rs" [dependencies] # shared log.workspace = true -env_logger.workspace = true +structured-logger.workspace = true tokio.workspace = true actix-web.workspace = true actix-cors.workspace = true -actix-web-prometheus.workspace = true +actix-web-prom.workspace = true serde.workspace = true serde_json.workspace = true -chrono = { version = "0.4.26", default-features = false, features = ["serde"] } +chrono = { version = "0.4.31", default-features = false, features = ["serde"] } # database -diesel = { version = "2.1.0", features = ["default", "chrono", "postgres"] } +diesel = { version = "2.1.1", features = ["default", "chrono", "postgres"] } diesel_migrations = "2.1.0" # metrics @@ -41,10 +41,10 @@ prometheus = { version = "0.13.3", features = ["default", "push"] } # scraper rand = "0.8.5" futures = "0.3.28" -rustls = "0.21.6" -reqwest = { version = "0.11.19", features = ["rustls", "json"] } +rustls = "0.21.7" +reqwest = { version = "0.11.20", default-features = false, features = ["rustls", "json"] } minidom = "0.15.2" -regex = "1.9.3" +regex = "1.9.5" [dev-dependencies] pretty_assertions.workspace = true diff --git a/server/calendar/src/main.rs b/server/calendar/src/main.rs index a69b4c46a..d9c23fa0d 100644 --- a/server/calendar/src/main.rs +++ b/server/calendar/src/main.rs @@ -5,7 +5,7 @@ mod utils; use actix_cors::Cors; use actix_web::{get, middleware, web, App, HttpResponse, HttpServer}; -use actix_web_prometheus::PrometheusMetricsBuilder; +use actix_web_prom::PrometheusMetricsBuilder; use std::collections::HashMap; const MAX_JSON_PAYLOAD: usize = 1024 * 1024; // 1 MB @@ -22,6 +22,9 @@ async fn health_status_handler() -> HttpResponse { } use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness}; +use structured_logger::async_json::new_writer; +use structured_logger::Builder; + pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations"); fn apply_db_migrations() { @@ -32,7 +35,9 @@ fn apply_db_migrations() { #[actix_web::main] async fn main() -> std::io::Result<()> { - env_logger::init_from_env(env_logger::Env::default().default_filter_or("info")); + Builder::with_level("info") + .with_target_writer("*", new_writer(tokio::io::stdout())) + .init(); apply_db_migrations(); // metrics diff --git a/server/calendar/src/scrape_task/main_api_connector.rs b/server/calendar/src/scrape_task/main_api_connector.rs index 99825ca8d..c6d6ac16e 100644 --- a/server/calendar/src/scrape_task/main_api_connector.rs +++ b/server/calendar/src/scrape_task/main_api_connector.rs @@ -3,7 +3,6 @@ use diesel::PgConnection; use log::{error, info}; use regex::Regex; use serde::Deserialize; -use std::collections::HashMap; fn api_url_from_env() -> Option { let main_api_addr = std::env::var("CDN_SVC_SERVICE_HOST").ok()?; @@ -16,6 +15,7 @@ fn api_url_from_env() -> Option { #[derive(Deserialize, Debug)] pub struct ReducedRoom { + id: String, props: ReducedRoomProps, } @@ -34,12 +34,12 @@ pub struct Room { } impl Room { - fn from((key, room): (String, ReducedRoom)) -> Option { + fn from(room: ReducedRoom) -> Option { let url = room.props.calendar_url?; let regex = Regex::new(r".*cOrg=(?P\d+)&cRes=(?P\d+)\D.*").unwrap(); let captures = regex.captures(&url)?; Some(Room { - sap_id: key, + sap_id: room.id, tumonline_org_id: captures.name("org")?.as_str().parse().ok()?, tumonline_calendar_id: captures.name("cal")?.as_str().parse().ok()?, tumonline_room_id: room.props.tumonline_room_nr?, @@ -52,7 +52,7 @@ pub async fn get_all_ids() -> Vec { api_url_from_env().unwrap_or_else(|| "https://nav.tum.de/cdn/api_data.json".to_string()); let res = reqwest::get(&url).await; let rooms = match res { - Ok(res) => res.json::>().await, + Ok(res) => res.json::>().await, Err(e) => { error!("Failed to contact main-api at {url}: {e:#?}"); return vec![]; diff --git a/server/calendar/src/scraper.rs b/server/calendar/src/scraper.rs index b9eadbcc9..c82d83d14 100644 --- a/server/calendar/src/scraper.rs +++ b/server/calendar/src/scraper.rs @@ -1,9 +1,10 @@ use crate::scrape_task::ScrapeTask; use log::{error, info}; +use structured_logger::{async_json::new_writer, Builder}; + use std::fmt; use prometheus::labels; - mod models; mod schema; mod scrape_task; @@ -40,7 +41,9 @@ impl fmt::Debug for TimeWindow { #[tokio::main] async fn main() { - env_logger::init_from_env(env_logger::Env::default().default_filter_or("info")); + Builder::with_level("info") + .with_target_writer("*", new_writer(tokio::io::stdout())) + .init(); let time_window = TimeWindow::init_from_env(); info!("Scraping time window: {time_window:?}"); diff --git a/server/feedback/Cargo.toml b/server/feedback/Cargo.toml index 59647af57..e48ac6e62 100644 --- a/server/feedback/Cargo.toml +++ b/server/feedback/Cargo.toml @@ -16,28 +16,28 @@ path = "src/main.rs" [dependencies] # shared log.workspace = true -env_logger.workspace = true +structured-logger.workspace = true tokio.workspace = true actix-web.workspace = true actix-cors.workspace = true -actix-web-prometheus.workspace = true +actix-web-prom.workspace = true serde.workspace = true serde_json.workspace = true rand = "0.8.5" -regex = "1.9.3" -octocrab = "0.29.3" +regex = "1.9.5" +octocrab = "0.30.1" # web jsonwebtoken = "8.3.0" -chrono= { version = "0.4.26", default-features = false } +chrono= { version = "0.4.31", default-features = false } actix-governor = { version = "0.4.1", features = ["log"] } # proposing feedback tempfile = "3.8.0" image = { version = "0.24.7", features = ["default", "webp-encoder"] } imageproc = "0.23.0" -base64 = "0.21.2" +base64 = "0.21.4" serde_yaml = "0.9" [dev-dependencies] diff --git a/server/feedback/src/main.rs b/server/feedback/src/main.rs index 1c2834ebc..6ae4e8026 100644 --- a/server/feedback/src/main.rs +++ b/server/feedback/src/main.rs @@ -4,7 +4,10 @@ use std::collections::HashMap; use crate::tokens::RecordedTokens; use actix_web::{get, middleware, web, App, HttpResponse, HttpServer}; -use actix_web_prometheus::PrometheusMetricsBuilder; +use actix_web_prom::PrometheusMetricsBuilder; +use structured_logger::async_json::new_writer; +use structured_logger::Builder; + mod github; mod post_feedback; mod proposed_edits; @@ -26,7 +29,9 @@ async fn health_status_handler() -> HttpResponse { const SECONDS_PER_DAY: u64 = 60 * 60 * 24; #[tokio::main] async fn main() -> std::io::Result<()> { - env_logger::init_from_env(env_logger::Env::default().default_filter_or("info")); + Builder::with_level("info") + .with_target_writer("*", new_writer(tokio::io::stdout())) + .init(); let feedback_ratelimit = GovernorConfigBuilder::default() .key_extractor(GlobalKeyExtractor) diff --git a/server/feedback/src/proposed_edits/tmp_repo.rs b/server/feedback/src/proposed_edits/tmp_repo.rs index 5b24a0973..8d149fb95 100644 --- a/server/feedback/src/proposed_edits/tmp_repo.rs +++ b/server/feedback/src/proposed_edits/tmp_repo.rs @@ -112,10 +112,10 @@ impl TempRepo { mod tests { use super::*; use std::fs; + const GIT_URL: &str = "https://github.com/CommanderStorm/dotfiles.git"; #[tokio::test] async fn test_new() { - let _ = env_logger::builder().is_test(true).try_init(); let temp_repo = TempRepo::clone_and_checkout(GIT_URL, "branch_does_not_exist") .await .unwrap(); @@ -126,7 +126,6 @@ mod tests { #[tokio::test] async fn test_checkout_and_commit() { - let _ = env_logger::builder().is_test(true).try_init(); let temp_repo = TempRepo::clone_and_checkout(GIT_URL, "branch_does_not_exist") .await .unwrap(); diff --git a/server/main-api/Cargo.toml b/server/main-api/Cargo.toml index f49773d78..41f8f473a 100644 --- a/server/main-api/Cargo.toml +++ b/server/main-api/Cargo.toml @@ -17,29 +17,34 @@ path = "src/main.rs" [dependencies] # shared log.workspace = true -env_logger.workspace = true +structured-logger.workspace = true tokio.workspace = true actix-web.workspace = true actix-cors.workspace = true -actix-web-prometheus.workspace = true +actix-web-prom.workspace = true serde.workspace = true serde_json.workspace = true -cached = "0.44.0" +cached = { version = "0.45.1", features = ["default", "async", "tokio"] } futures = "0.3.28" unicode-truncate = "0.2.0" +# setup +serde_yaml = "0.9" + # database -diesel = { version = "2.1.0", features = ["default", "sqlite"] } +diesel = { version = "2.1.1", features = ["default", "sqlite"] } libsqlite3-sys = { version = "*", features = ["bundled"] } +sqlx = { version = "0.7.1", features = ["sqlite", "runtime-tokio", "migrate", "macros"] } # search -meilisearch-sdk = "0.24.1" +meilisearch-sdk = "0.24.2" logos="0.13.0" +regex = "1.9.5" # maps -rustls = "0.21.6" -reqwest = { version= "0.11.19", features = ["rustls"] } +rustls = "0.21.7" +reqwest = { version= "0.11.20", default-features = false, features = ["rustls-tls", "json", "gzip"] } image = "0.24.7" imageproc = "0.23.0" rusttype = "0.9.3" diff --git a/server/main-api/Dockerfile.dbinit b/server/main-api/Dockerfile.dbinit deleted file mode 100644 index 2a5a086d1..000000000 --- a/server/main-api/Dockerfile.dbinit +++ /dev/null @@ -1,14 +0,0 @@ -# Build the details database -FROM python:3.11-bullseye as build-stage -COPY load_api_data_to_db.py load_api_data_to_db.py - -# For local testing if navigatum is not available: -# - follow the data-docs to get api_data.json -# - copy it to the directory server/main-api/data -# - comment out the wget statement -# - and enable the next line -# COPY data/api_data.json data/api_data.json - -CMD wget https://nav.tum.de/cdn/api_data.json --directory-prefix data --quiet \ - && python3 load_api_data_to_db.py \ - && mv /data/api_data.db /tmp/server.db diff --git a/server/main-api/Dockerfile.msinit b/server/main-api/Dockerfile.msinit deleted file mode 100644 index d51e0f8e6..000000000 --- a/server/main-api/Dockerfile.msinit +++ /dev/null @@ -1,15 +0,0 @@ -FROM getmeili/meilisearch:v1.3.1 as build-stage - -RUN apk add --no-cache jq bash sed - -COPY configure_MeileSearch.sh /configure_MeileSearch.sh - -# Workaround to make sure this file also works on windows -RUN sed -i 's/\r$//' /configure_MeileSearch.sh - -# removing the files before and after is nessesary in case the container is restarted -CMD rm -f *.json \ - && wget https://nav.tum.de/cdn/search_data.json --quiet \ - && wget https://nav.tum.de/cdn/search_synonyms.json --quiet \ - && bash /configure_MeileSearch.sh \ - && rm -f *.json diff --git a/server/main-api/README.md b/server/main-api/README.md index ab9281d1e..138305d5d 100644 --- a/server/main-api/README.md +++ b/server/main-api/README.md @@ -9,97 +9,62 @@ This folder contains the main backend server for NavigaTUM. For getting started, there are some system dependencys which you will need. Please follow the [system dependencys docs](/resources/documentation/Dependencys.md) before trying to run this part of our project. -### Starting the server - -Run `cargo run` to start the server. -The server should now be available on `localhost:8080`. - -Note that `cargo run --release` is used to start the server for an optimised production build (use this if you want to profile the `search` or `preview` functions, it makes quite a difference). - -### Additional dependency's for some API endpoints +### Additional dependency We have a few API endpoints which require additional dependencies. -As a general rule of thumb, if you probably want to **skip the tileserver**, but want to **do the SQLite Database** and **MeiliSearch** setup. +As a general rule of thumb, if you probably want to **skip the tileserver**, but need to **do the SQLite Database** and **MeiliSearch** setup. The reason for this is, that the `preview` endpoint is the only endpoint, which requires the tileserver and said endpoint is a non-essential part of the project. -#### How to Set up the Sqlite Database (needed for the `get` and `preview` endpoints) - -##### Getting the data +#### How to Set up the Databases -To populate the database, you will need to get said data. -There are multiple ways to do this, but the easiest way is to download the data from our [website](https://nav.tum.de/). +At the beginning of the main api we set up both meilisearch and the database. +This will ensure that the sqlite database and meilisearch index is created. -(Assuming you are in the `server` directory) +This requires meilisearch to be online. +To set up [MeiliSearch](https://github.com/meilisearch/MeiliSearch), either follow their installation instructions or use ```bash -mkdir -p data -wget -P data https://nav.tum.de/cdn/api_data.json +docker run -it --rm -p 7700:7700 getmeili/meilisearch:latest ``` -##### Setting up the database +MeiliSearch provides an interactive interface at . -To set up the database, you will need to run the `load_api_data_to_db.py` script: - -```bash -python3 load_api_data_to_db.py -``` - -#### How to Set up the tileserver (needed for the `preview` endpoint) +### Starting the server -To set up your tileserver, head over to the [`map`](https://github.com/TUM-Dev/NavigaTUM/tree/main/map) folder and follow the instructions there. +Run `cargo run` to start the server. +The server should now be available on `localhost:8080`. -#### How to Set up MeiliSearch (needed for the `search` endpoint) +> [!NOTE] +> `cargo run --release` is used to start the server for an optimised production build (use this if you want to profile the `search` or `preview` functions, it makes quite a difference). -The server uses [MeiliSearch](https://github.com/meilisearch/MeiliSearch) as a backend for search. -For a local test environment you can skip this step if you don't want to test or work on search. +### Adding Migrations -There are a lot of different ways to run MeiliSearch (see on their repo). Here we compile it -from sources: +For the database-connector we use sqlx. +Migrations can be run with the `sqlx-cli` tool. Said tool can be installed with: ```bash -# Clone MeiliSearch -cd .. -git clone https://github.com/meilisearch/MeiliSearch.git -b v1.3.1 -cd MeiliSearch - -# Build and run -cargo run --release +cargo install sqlx-cli ``` -Next, we need to add our index and configure search: +Migrations can be added using ```bash -# Create index -curl -i -X POST 'http://localhost:7700/indexes' --header 'content-type: application/json' --data '{ "uid": "entries", "primaryKey": "ms_id" }' - -# Set filterable attributes -curl -X PUT 'http://localhost:7700/indexes/entries/settings/filterable-attributes' --data '["facet", "parent_keywords", "parent_building_names", "campus", "type", "usage"]' - -# Upload entries data -curl -i -X PUT 'http://localhost:7700/indexes/entries/documents' --header 'content-type: application/json' --data-binary @data/search_data.json - -# Configure index -curl -X PUT 'http://localhost:7700/indexes/entries/settings/ranking-rules' --data '["words","typo","rank:desc","exactness","proximity","attribute"]' - -curl -X PUT 'http://localhost:7700/indexes/entries/settings/synonyms' --data @../data/search_synonyms.json - -curl -X PUT 'http://localhost:7700/indexes/entries/settings/searchable-attributes' --data '[ "ms_id", "name", "arch_name", "type", "type_common_name", "parent_building", "parent_keywords", "address", "usage" ]' +sqlx migrate add -r ``` -If you want to update the data in the index, run: - -```bash -curl -i -X PUT 'http://localhost:7700/indexes/entries/documents' --header 'content-type: application/json' --data-binary @data/search_data.json -``` +### Adding/editing database queries -And if you want to delete the index, run: +To get compiletime guarantees for our queries, we use sqlx. +To add/edit a query, you will need to run the following command: ```bash -curl -X DELETE 'http://localhost:7700/indexes/entries' +cargo sqlx prepare --database-url sqlite://main-api/api_data.db --workspace ``` -MeiliSearch provides an interactive interface at [http://localhost:7700](http://localhost:7700). +### How to Set up the tileserver (needed for the `preview` endpoint) + +To set up your tileserver, head over to the [`map`](https://github.com/TUM-Dev/NavigaTUM/tree/main/map) folder and follow the instructions there. ### API-Changes @@ -126,7 +91,7 @@ st run --workers=auto --base-url=http://localhost:8080 --checks=all ../openapi.y ``` Some fuzzing-goals may not be available for you locally, as they require prefix-routing (f.ex.`/cdn` to the CDN) and some fuzzing-goals are automatically tested in our CI. -You can exchange `--base-url=http://localhost:8080` to `--base-url=https://nav.tum.sexy` for the full public API, or restrict your scope using a option like `--endpoint=/api/search`. +You can exchange `--base-url=http://localhost:8080` to `--base-url=https://nav.tum.sexy` for the full public API, or restrict your scope using an option like `--endpoint=/api/search`. ## License diff --git a/server/main-api/configure_MeileSearch.sh b/server/main-api/configure_MeileSearch.sh deleted file mode 100755 index 3aa90b424..000000000 --- a/server/main-api/configure_MeileSearch.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -set -e # fail on first error -meilisearch & -MEILIPID=$(pgrep meilisearch) - -curl_with_args() { - curl \ - --connect-timeout 5 --max-time 10 --retry 30 --retry-delay 1 --retry-max-time 60 --retry-connrefused --retry-all-errors \ - --silent --show-error \ - --header 'content-type: application/json' -i \ - "$@" -} - -echo "----" -echo "configure MeiliSearch" -echo "----" - -echo -echo "> Set primary-key" -echo -curl_with_args --request POST 'http://localhost:7700/indexes' --data '{ "uid": "entries", "primaryKey": "ms_id" }' -echo -echo -echo "> Set filterable attributes" -echo -curl_with_args --request PUT 'http://localhost:7700/indexes/entries/settings/filterable-attributes' --data '["facet", "parent_keywords", "parent_building_names", "campus", "type", "usage"]' - -echo -echo "> Upload entries data:" -echo -ls -lah "./search_data.json" -curl_with_args --request PUT 'http://localhost:7700/indexes/entries/documents' --data-binary "@./search_data.json" - -echo "synonyms:" -ls -lah "./search_synonyms.json" -curl_with_args --request PUT 'http://localhost:7700/indexes/entries/settings/synonyms' --data "@./search_synonyms.json" -curl_with_args --request PUT 'http://localhost:7700/indexes/entries/settings/searchable-attributes' --data '["ms_id", "name", "arch_name", "type", "type_common_name", "parent_building_names", "parent_keywords", "address", "usage"]' - -echo -echo -echo "> Configure index:" -echo -curl_with_args --request PUT 'http://localhost:7700/indexes/entries/settings/ranking-rules' --data '["words", "typo", "rank:desc", "exactness", "proximity", "attribute"]' - -echo -echo -echo "> Waiting for indexing to complete..." -echo -while [[ "$(curl_with_args 'http://localhost:7700/indexes/entries/stats')" == *'"isIndexing":true'* ]]; do - curl_with_args 'http://localhost:7700/indexes/entries/stats' -silent - sleep 5 -done - -# kill meilisearch by sending the `Ctrl + C` interrupt signal -kill -INT "$MEILIPID" diff --git a/server/main-api/load_api_data_to_db.py b/server/main-api/load_api_data_to_db.py deleted file mode 100644 index 0a871df4a..000000000 --- a/server/main-api/load_api_data_to_db.py +++ /dev/null @@ -1,147 +0,0 @@ -import dataclasses -import json -import sqlite3 -from pathlib import Path -from typing import Any, TypeAlias, Union - -TranslatedList: TypeAlias = list[tuple[str, str, Any]] -BASE_DIR = Path(__file__).parent - - -def save_entries_to_database(de_data: TranslatedList, en_data: TranslatedList) -> None: - """add data consisting of 2x(key, data_json, data) to the sqlite database""" - con: sqlite3.Connection = sqlite3.connect("data/api_data.db") - for lang in ["de", "en"]: - con.execute(f"DROP TABLE IF EXISTS {lang}") - con.execute( - f""" - CREATE TABLE {lang} ( - key TEXT UNIQUE PRIMARY KEY NOT NULL, - name TEXT NOT NULL, - tumonline_room_nr INTEGER NULLABLE, -- used for calendars - type TEXT NOT NULL, - type_common_name TEXT NOT NULL, - lat FLOAT NOT NULL, - lon FLOAT NOT NULL, - data TEXT NOT NULL - );""", - ) - # we are using this file in docker, so we don't want to use an acid compliant database ;) - con.execute("""PRAGMA journal_mode = OFF;""") - con.execute("""PRAGMA synchronous = OFF;""") - - def map_data(key, data_json, data): - return ( - key, - data_json, - data["name"], - data["props"].get("tumonline_room_nr", None), - data["type"], - data["type_common_name"], - data.get("coords", {}).get("lat", 48.14903), - data.get("coords", {}).get("lon", 11.56735), - ) - - de_data = [map_data(key, data_json, data) for (key, data_json, data) in de_data] - en_data = [map_data(key, data_json, data) for (key, data_json, data) in en_data] - - with con: - con.executemany( - "INSERT INTO de(key,data,name,tumonline_room_nr,type,type_common_name,lat,lon) VALUES (?,?,?,?,?,?,?,?)", - de_data, - ) - con.executemany( - "INSERT INTO en(key,data,name,tumonline_room_nr,type,type_common_name,lat,lon) VALUES (?,?,?,?,?,?,?,?)", - en_data, - ) - - -def localise(value: Union[str, list[Any], dict[str, Any]], language: str) -> Any: - """Recursively localise a dictionary""" - if isinstance(value, (bool, float, int, str)) or value is None: - return value - if isinstance(value, list): - return [localise(v, language) for v in value] - if isinstance(value, dict): - # We consider each dict that has only the keys "de" and/or "en" as translated string - if set(value.keys()) | {"de", "en"} == {"de", "en"}: - # Since we only localise strings, the default to the empty string is safe - return value.get(language, "") - - return {k: localise(v, language) for k, v in value.items()} - raise ValueError(f"Unhandled type {type(value)}") - - -def get_localised_data() -> tuple[TranslatedList, TranslatedList]: - """get all data from the json dump and convert it to a list of tuples""" - with open(BASE_DIR / "data" / "api_data.json", encoding="utf-8") as file: - data = json.load(file) - split_data: list[tuple[str, Any, Any]] = [ - (key, localise(value, "de"), localise(value, "en")) for key, value in data.items() - ] - - de_data = [] - en_data = [] - for key, de_dict, en_dict in split_data: - de_data.append((key, json.dumps(de_dict), de_dict)) - en_data.append((key, json.dumps(en_dict), en_dict)) - return de_data, en_data - - -@dataclasses.dataclass -class Alias: - alias: str - # the key is the id of the entry - key: str - # what we display in the url - visible_id: str - type: str - - def __hash__(self): - return hash((self.alias, self.key)) - - -def extract_aliases() -> set[Alias]: - """Extracts all aliases from the api_data.json file and returns them as a dict""" - with open(BASE_DIR / "data" / "api_data.json", encoding="utf-8") as file: - data = json.load(file) - aliases = set() - for key, value in data.items(): - visible_id = value.get("visible_id", key) - if items_aliases := value["aliases"]: - for alias in items_aliases: - aliases.add(Alias(alias, key, visible_id, value["type"])) - # making sure that ids are also an aliases. Otherwise, a join would be necessary - aliases.add(Alias(visible_id, key, visible_id, value["type"])) - aliases.add(Alias(key, key, visible_id, value["type"])) - return aliases - - -def save_aliases_to_database(aliase: set[Alias]) -> None: - """add all aliases to the sqlite database""" - con: sqlite3.Connection = sqlite3.connect("data/api_data.db") - con.execute("DROP TABLE IF EXISTS aliases") - con.execute( - """ - CREATE TABLE aliases ( - id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, - alias TEXT NOT NULL, - key TEXT NOT NULL, - visible_id TEXT NOT NULL, - type TEXT NOT NULL - );""", - ) - with con: - con.executemany( - "INSERT INTO aliases(alias,key,visible_id,type) VALUES (?,?,?,?)", - [(item.alias, item.key, item.visible_id, item.type) for item in aliase], - ) - - -if __name__ == "__main__": - de, en = get_localised_data() - save_entries_to_database(de, en) - print("Initialized KV store") - extracted_aliases = extract_aliases() - save_aliases_to_database(extracted_aliases) - print("Initialized alias store") diff --git a/server/main-api/migrations/20230902115254_base-schema.down.sql b/server/main-api/migrations/20230902115254_base-schema.down.sql new file mode 100644 index 000000000..08a1b1808 --- /dev/null +++ b/server/main-api/migrations/20230902115254_base-schema.down.sql @@ -0,0 +1,3 @@ +-- Add down migration script here +DROP TABLE de; +DROP TABLE en; diff --git a/server/main-api/migrations/20230902115254_base-schema.up.sql b/server/main-api/migrations/20230902115254_base-schema.up.sql new file mode 100644 index 000000000..9cf9685c7 --- /dev/null +++ b/server/main-api/migrations/20230902115254_base-schema.up.sql @@ -0,0 +1,24 @@ +-- Add up migration script here +CREATE TABLE de +( + key TEXT UNIQUE PRIMARY KEY NOT NULL, + name TEXT NOT NULL, + tumonline_room_nr INTEGER NULLABLE, -- used for calendars + type TEXT NOT NULL, + type_common_name TEXT NOT NULL, + lat FLOAT NOT NULL, + lon FLOAT NOT NULL, + data TEXT NOT NULL +); +CREATE TABLE en +( + key TEXT UNIQUE PRIMARY KEY NOT NULL, + name TEXT NOT NULL, + tumonline_room_nr INTEGER NULLABLE, -- used for calendars + type TEXT NOT NULL, + type_common_name TEXT NOT NULL, + lat FLOAT NOT NULL, + lon FLOAT NOT NULL, + data TEXT NOT NULL, + FOREIGN KEY(key) REFERENCES de(key) +); diff --git a/server/main-api/migrations/20230902115306_aliases.down.sql b/server/main-api/migrations/20230902115306_aliases.down.sql new file mode 100644 index 000000000..2cd64234c --- /dev/null +++ b/server/main-api/migrations/20230902115306_aliases.down.sql @@ -0,0 +1,2 @@ +-- Add down migration script here +DROP TABLE IF EXISTS aliases; diff --git a/server/main-api/migrations/20230902115306_aliases.up.sql b/server/main-api/migrations/20230902115306_aliases.up.sql new file mode 100644 index 000000000..d2e67795b --- /dev/null +++ b/server/main-api/migrations/20230902115306_aliases.up.sql @@ -0,0 +1,13 @@ +-- Add up migration script here +CREATE TABLE aliases +( + id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, + alias TEXT NOT NULL, + key TEXT NOT NULL, + visible_id TEXT NOT NULL, + type TEXT NOT NULL, + FOREIGN KEY(key) REFERENCES de(key) +); + +-- prevent duplicate aliases +CREATE UNIQUE INDEX alias_key ON aliases (alias, key); diff --git a/server/main-api/src/build.rs b/server/main-api/src/build.rs new file mode 100644 index 000000000..3a8149ef0 --- /dev/null +++ b/server/main-api/src/build.rs @@ -0,0 +1,3 @@ +fn main() { + println!("cargo:rerun-if-changed=migrations"); +} diff --git a/server/main-api/src/main.rs b/server/main-api/src/main.rs index 48578ecc2..6944abb44 100644 --- a/server/main-api/src/main.rs +++ b/server/main-api/src/main.rs @@ -1,12 +1,18 @@ use actix_cors::Cors; use actix_web::{get, middleware, web, App, HttpResponse, HttpServer}; -use actix_web_prometheus::PrometheusMetricsBuilder; +use actix_web_prom::PrometheusMetricsBuilder; +use futures::try_join; +use log::info; use std::collections::HashMap; +use structured_logger::async_json::new_writer; +use structured_logger::Builder; + mod entries; mod maps; mod models; mod schema; mod search; +mod setup; mod utils; const MAX_JSON_PAYLOAD: usize = 1024 * 1024; // 1 MB @@ -22,9 +28,18 @@ async fn health_status_handler() -> HttpResponse { .body(format!("healthy\nsource_code: {github_link}")) } -#[actix_web::main] -async fn main() -> std::io::Result<()> { - env_logger::init_from_env(env_logger::Env::default().default_filter_or("info")); +#[tokio::main] +async fn main() -> Result<(), Box> { + Builder::with_level("info") + .with_target_writer("*", new_writer(tokio::io::stdout())) + .init(); + info!("setting up dependency's"); + try_join!( + setup::meilisearch::setup_meilisearch(), + setup::database::setup_database(), + )?; + + info!("running the server"); // metrics let labels = HashMap::from([( "revision".to_string(), @@ -56,5 +71,6 @@ async fn main() -> std::io::Result<()> { }) .bind(std::env::var("BIND_ADDRESS").unwrap_or_else(|_| "0.0.0.0:8080".to_string()))? .run() - .await + .await?; + Ok(()) } diff --git a/server/main-api/src/maps/mod.rs b/server/main-api/src/maps/mod.rs index d58b724b1..2ad8ec425 100644 --- a/server/main-api/src/maps/mod.rs +++ b/server/main-api/src/maps/mod.rs @@ -91,7 +91,7 @@ fn draw_bottom(data: &DBRoomEntry, img: &mut image::RgbaImage) { } } // add our logo so the bottom - let logo = image::open("src/maps/static/logo.png").unwrap(); + let logo = image::load_from_memory(include_bytes!("static/logo.png")).unwrap(); image::imageops::overlay( img, &logo, @@ -113,7 +113,7 @@ fn draw_bottom(data: &DBRoomEntry, img: &mut image::RgbaImage) { fn load_default_image() -> Vec { warn!("Loading default preview image, as map rendering failed. Check the connection to the tileserver"); - let img = image::open("src/maps/static/logo-card.png").unwrap(); + let img = image::load_from_memory(include_bytes!("static/logo-card.png")).unwrap(); // encode the image as PNG let mut w = Cursor::new(Vec::new()); img.write_to(&mut w, image::ImageOutputFormat::Png).unwrap(); diff --git a/server/main-api/src/maps/overlay_map.rs b/server/main-api/src/maps/overlay_map.rs index 9a5d3dbca..84f49e3b1 100644 --- a/server/main-api/src/maps/overlay_map.rs +++ b/server/main-api/src/maps/overlay_map.rs @@ -66,7 +66,7 @@ impl OverlayMapTask { } // add the location pin image to the center - let pin = image::open("src/maps/static/pin.webp").unwrap(); + let pin = image::load_from_memory(include_bytes!("static/pin.webp")).unwrap(); image::imageops::overlay( img, &pin, diff --git a/server/main-api/src/search/search_executor/lexer.rs b/server/main-api/src/search/search_executor/lexer.rs index 56dbb4edc..25cb0014f 100644 --- a/server/main-api/src/search/search_executor/lexer.rs +++ b/server/main-api/src/search/search_executor/lexer.rs @@ -1,4 +1,5 @@ use logos::{Lexer, Logos}; +use regex::Regex; /// An irregular split is defined as at least a letter and 1-4 numbers /// Treating words like MW1801 differently has improvements in relevancy for room-level searches @@ -22,13 +23,23 @@ fn remove_prefix(lex: &mut Lexer, prefix: &'static str) -> String { lex.slice()[prefix.len()..].trim().to_string() } +/// Removes non-ascii characters from the token (replacing them with at most one whitespace) +fn slugify>(input: S) -> String { + let slugify_regex = Regex::new(r"[^a-zA-Z0-9-äöüß.]+").unwrap(); + let slug = slugify_regex + .replace_all(&input.into(), "-") + .to_lowercase() + .replace("--", "-"); + slug.trim_matches('-').to_string() +} + /// Parses the query string into a list of tokens /// priority between tokens is set as follows -/// 1. Filters (`ParentFilter`,`UsageFilter`,`TypeFilter`) / quoted `Text` +/// 1. Filters (`ParentFilter`,`UsageFilter`,`TypeFilter`) / quoted `Text` / `LocationSort` /// 2. `SplittableText` /// 3. `Text` /// 4. skip -#[derive(Logos, Debug, PartialEq, Eq, Clone)] +#[derive(Logos, Debug, PartialEq, Clone)] #[logos(skip r"[ \t\n\f]+")] pub enum Token { #[regex("\"[^\"]+\"", | lex | lex.slice()[1..lex.slice().len() - 1].to_string(), priority = 3)] @@ -38,16 +49,19 @@ pub enum Token { #[regex("[a-zA-Z]+[0-9]{1,4}", irregular_split, priority = 2)] SplittableText((String, String)), - #[regex("in: ?[a-zA-Z0-9-.]+", | lex | remove_prefix(lex, "in:"), priority = 3)] - #[regex("@ ?[a-zA-Z0-9-.]+", | lex | remove_prefix(lex, "@"), priority = 3)] + #[regex("in: ?[a-zA-Z0-9-äöüß.]+", | lex | slugify(remove_prefix(lex, "in:")), priority = 3)] + #[regex("@ ?[a-zA-Z0-9-äöüß.]+", | lex | slugify(remove_prefix(lex, "@")), priority = 3)] ParentFilter(String), - #[regex("usage: ?[a-zA-Z]+", | lex | remove_prefix(lex, "usage:"), priority = 3)] - #[regex("nutzung: ?[a-zA-Z]+", | lex | remove_prefix(lex, "nutzung:"), priority = 3)] - #[regex("= ?[a-zA-Z]+", | lex | remove_prefix(lex, "="), priority = 3)] + #[regex("near: ?-?[0-9]+[.][0-9.]+,-?[0-9]+[.][0-9.]+", | lex | remove_prefix(lex, "near:"), priority = 3)] + LocationSort(String), // e.g. near:lat,lon + + #[regex("usage: ?[a-zA-Z0-9-äöüß.]+", | lex | slugify(remove_prefix(lex, "usage:")), priority = 3)] + #[regex("nutzung: ?[a-zA-Z0-9-äöüß.]+", | lex | slugify(remove_prefix(lex, "nutzung:")), priority = 3)] + #[regex("= ?[a-zA-Z0-9-äöüß.]+", | lex | slugify(remove_prefix(lex, "=")), priority = 3)] UsageFilter(String), - #[regex("type: ?[a-zA-Z]+", | lex | remove_prefix(lex, "type:"), priority = 3)] + #[regex("type: ?[a-zA-Z0-9-äöüß.]+", | lex | slugify(remove_prefix(lex, "type:")), priority = 3)] TypeFilter(String), } @@ -63,6 +77,27 @@ mod tokenizer_tests { assert_eq!(Token::lexer(" ").next(), None); } + #[test] + fn test_slugify_identical() { + // identical + assert_eq!(&slugify(""), ""); + assert_eq!(&slugify("a"), "a"); + assert_eq!(&slugify("1234567890"), "1234567890"); + assert_eq!(&slugify("äöüßa."), "äöüßa."); + } + + #[test] + fn test_slugify() { + // to-lower + assert_eq!(&slugify("B"), "b"); + assert_eq!(&slugify("aA"), "aa"); + // leading/tailing "-" get stripped + assert_eq!(&slugify("-B-"), "b"); + // no double dashes + assert_eq!(&slugify("a--21"), "a-21"); + assert_eq!(&slugify("a**21"), "a-21"); + } + #[test] fn quoting() { let mut lexer = Token::lexer("\""); @@ -200,4 +235,17 @@ mod tokenizer_tests { } } } + + #[test] + fn sortings() { + for sep in ["", " "] { + let quoted_text = format!("near:{sep}12.345,6.789"); + let mut lexer = Token::lexer("ed_text); + assert_eq!( + lexer.next(), + Some(Ok(Token::LocationSort("12.345,6.789".to_string()))) + ); + assert_eq!(lexer.next(), None); + } + } } diff --git a/server/main-api/src/search/search_executor/mod.rs b/server/main-api/src/search/search_executor/mod.rs index 7385f52ac..060ba45e9 100644 --- a/server/main-api/src/search/search_executor/mod.rs +++ b/server/main-api/src/search/search_executor/mod.rs @@ -45,7 +45,7 @@ pub async fn do_geoentry_search( ) -> Vec { let parsed_input = ParsedQuery::from(q.as_str()); - match query::GeoEntryQuery::from(&parsed_input, &args, &highlighting) + match query::GeoEntryQuery::from(parsed_input.clone(), &args, &highlighting) .execute() .await { diff --git a/server/main-api/src/search/search_executor/parser.rs b/server/main-api/src/search/search_executor/parser.rs index 7cb2e4398..b4f2cf82f 100644 --- a/server/main-api/src/search/search_executor/parser.rs +++ b/server/main-api/src/search/search_executor/parser.rs @@ -9,7 +9,6 @@ pub struct Filter { types: HashSet, usages: HashSet, } - impl Filter { pub(crate) fn as_meilisearch_filters(&self) -> String { let mut filters = vec![]; @@ -31,6 +30,20 @@ impl Filter { } } +#[derive(Debug, Clone, Default, PartialEq, Eq)] +pub struct Sorting { + location: HashSet, +} + +impl Sorting { + pub(crate) fn as_meilisearch_sorting(&self) -> Vec { + self.location + .iter() + .map(|s| format!("_geoPoint({s}):asc")) + .collect() + } +} + #[derive(Debug, Clone, PartialEq, Eq)] pub enum TextToken { Text(String), @@ -41,6 +54,7 @@ pub enum TextToken { pub struct ParsedQuery { pub tokens: Vec, pub filters: Filter, + pub sorting: Sorting, } impl ParsedQuery { @@ -78,6 +92,9 @@ impl From<&str> for ParsedQuery { Ok(Token::TypeFilter(filter)) => { result.filters.types.insert(filter); } + Ok(Token::LocationSort(location)) => { + result.sorting.location.insert(location); + } Err(e) => { warn!("Error in query parsing: {e:?}"); } @@ -134,6 +151,28 @@ mod parser_tests { } } + #[test] + fn location_sort() { + for sep in ["", " "] { + assert_eq!( + ParsedQuery::from(format!("near:{sep}45.32,59.3").as_str()).sorting, + Sorting { + location: HashSet::from(["45.32,59.3".to_string()]), + ..Default::default() + } + ); + } + for sep in ["", " "] { + assert_eq!( + ParsedQuery::from(format!("near:{sep}45.3,59.00000003").as_str()).sorting, + Sorting { + location: HashSet::from(["45.3,59.00000003".to_string()]), + ..Default::default() + } + ); + } + } + #[test] fn text_token() { assert_eq!( @@ -159,7 +198,7 @@ mod parser_tests { #[test] fn text_filter_mixed() { assert_eq!( - ParsedQuery::from("foo in:abc bar @abc foo").tokens, + ParsedQuery::from("foo in:abc bar @abc foo near:45.32,59.3").tokens, vec![ TextToken::Text("foo".to_string()), TextToken::Text("bar".to_string()), @@ -167,7 +206,10 @@ mod parser_tests { ] ); assert_eq!( - ParsedQuery::from("foo in:abc bar @abc =def usage:dd nutzung:gh type:fdh foo").tokens, + ParsedQuery::from( + "foo in:abc bar @abc =def usage:dd nutzung:gh type:fdh foo near:45.32,59.3" + ) + .tokens, vec![ TextToken::Text("foo".to_string()), TextToken::Text("bar".to_string()), diff --git a/server/main-api/src/search/search_executor/query.rs b/server/main-api/src/search/search_executor/query.rs index 356281c46..8014da58c 100644 --- a/server/main-api/src/search/search_executor/query.rs +++ b/server/main-api/src/search/search_executor/query.rs @@ -45,11 +45,12 @@ pub(super) struct GeoEntryQuery { args: SanitisedSearchQueryArgs, highlighting: (String, String), filters: GeoEntryFilters, + sorting: Vec, } impl GeoEntryQuery { pub fn from( - parsed_input: &ParsedQuery, + parsed_input: ParsedQuery, args: &SanitisedSearchQueryArgs, highlighting: &(String, String), ) -> Self { @@ -58,6 +59,7 @@ impl GeoEntryQuery { args: *args, highlighting: highlighting.clone(), filters: GeoEntryFilters::from(&parsed_input.filters), + sorting: parsed_input.sorting.as_meilisearch_sorting(), } } pub async fn execute(self) -> Result, Error> { @@ -67,6 +69,14 @@ impl GeoEntryQuery { let client = Client::new(ms_url, std::env::var("MEILI_MASTER_KEY").ok()); let entries = client.index("entries"); + // due to lifetime shenanigans this is added here (I can't make it move down to the other statements) + // If you can make it, please propose a PR, I know that this is really hacky ^^ + let sorting = self + .sorting + .iter() + .map(|s| s.as_str()) + .collect::>(); + // Currently ranking is designed to put buildings at the top if they equally // match the term compared to a room. For this reason there is only a search // for all entries and only rooms, search matching (and relevant) buildings can be @@ -74,9 +84,21 @@ impl GeoEntryQuery { // buildings will be hidden (e.g. building parts), so the extra room search .... client .multi_search() - .with_search_query(self.merged_query(&entries, &q_default)) - .with_search_query(self.buildings_query(&entries, &q_default)) - .with_search_query(self.rooms_query(&entries, &self.prompt_for_querying_room())) + .with_search_query( + self.merged_query(&entries, &q_default) + .with_sort(&sorting) + .build(), + ) + .with_search_query( + self.buildings_query(&entries, &q_default) + .with_sort(&sorting) + .build(), + ) + .with_search_query( + self.rooms_query(&entries, &self.prompt_for_querying_room()) + .with_sort(&sorting) + .build(), + ) .execute::() .await } diff --git a/server/main-api/src/setup/database/alias.rs b/server/main-api/src/setup/database/alias.rs new file mode 100644 index 000000000..e9270d876 --- /dev/null +++ b/server/main-api/src/setup/database/alias.rs @@ -0,0 +1,121 @@ +use log::info; +use serde::Deserialize; +use sqlx::SqlitePool; +use std::time::Instant; + +#[derive(Debug)] +struct Alias { + alias: String, + key: String, // the key is the id of the entry + r#type: String, // what we display in the url + visible_id: String, +} + +#[derive(Debug, Deserialize)] +struct AliasData { + id: String, + visible_id: Option, + aliases: Vec, + r#type: String, // what we display in the url +} +struct AliasIterator { + data: AliasData, + state: AliasIteratorState, +} +#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] +enum AliasIteratorState { + #[default] + Key, + VisibleId, + Alias(usize), + Done, +} +impl AliasIteratorState { + fn next_state(&mut self) -> Self { + match self { + Self::Key => Self::VisibleId, + Self::VisibleId => Self::Alias(0), + Self::Alias(i) => Self::Alias(*i + 1), + Self::Done => Self::Done, + } + } +} + +impl From for AliasIterator { + fn from(alias_data: AliasData) -> Self { + Self { + data: alias_data, + state: Default::default(), + } + } +} +impl Iterator for AliasIterator { + type Item = Alias; + fn next(&mut self) -> Option { + use AliasIteratorState as State; + let visible_id = self.data.visible_id.clone().unwrap_or(self.data.id.clone()); + let alias_len = self.data.aliases.len(); + let state = self.state; + self.state = self.state.next_state(); + match state { + State::Key => Some(Alias { + alias: self.data.id.clone(), + key: self.data.id.clone(), + r#type: self.data.r#type.clone(), + visible_id, + }), + State::VisibleId => Some(Alias { + alias: visible_id.clone(), + key: self.data.id.clone(), + r#type: self.data.r#type.clone(), + visible_id, + }), + State::Alias(index) if index < alias_len => Some(Alias { + alias: self.data.aliases[index].clone(), + key: self.data.id.clone(), + r#type: self.data.r#type.clone(), + visible_id, + }), + State::Alias(_) | State::Done => None, + } + } +} + +impl Alias { + async fn store( + self, + tx: &mut sqlx::Transaction<'_, sqlx::Sqlite>, + ) -> Result { + sqlx::query!( + r#"INSERT OR REPLACE INTO aliases (alias, key, type, visible_id) + VALUES (?, ?, ?, ?)"#, + self.alias, + self.key, + self.r#type, + self.visible_id + ) + .execute(&mut **tx) + .await + } +} + +pub(crate) async fn load_all_to_db(pool: &SqlitePool) -> Result<(), Box> { + let cdn_url = std::env::var("CDN_URL").unwrap_or_else(|_| "https://nav.tum.de/cdn".to_string()); + let raw_aliase = reqwest::get(format!("{cdn_url}/api_data.json")) + .await? + .json::>() + .await?; + let start = Instant::now(); + let set_aliase = raw_aliase + .into_iter() + .map(AliasIterator::from) + .flat_map(|alias| alias.into_iter()); + let mut tx = pool.begin().await?; + for task in set_aliase { + task.store(&mut tx).await?; + } + tx.commit().await?; + info!("loaded aliases in {elapsed:?}", elapsed = start.elapsed()); + + Ok(()) +} diff --git a/server/main-api/src/setup/database/data.rs b/server/main-api/src/setup/database/data.rs new file mode 100644 index 000000000..9562b5c16 --- /dev/null +++ b/server/main-api/src/setup/database/data.rs @@ -0,0 +1,167 @@ +use log::info; +use serde_json::Value; +use sqlx::SqlitePool; +use std::collections::HashMap; +use std::time::Instant; + +struct ExtractedFields { + name: String, + tumonline_room_nr: Option, + r#type: String, + type_common_name: String, + lat: f32, + lon: f32, +} +impl From> for ExtractedFields { + fn from(obj: HashMap) -> Self { + let props = obj.get("props").unwrap().as_object().unwrap(); + let tumonline_room_nr = props + .get("tumonline_room_nr") + .map(|v| v.as_i64().unwrap() as i32); + let coords = obj.get("props").unwrap().as_object().unwrap(); + let lat = match coords.get("lat") { + Some(v) => v.as_f64(), + None => None, + }; + let lon = match coords.get("lon") { + Some(v) => v.as_f64(), + None => None, + }; + ExtractedFields { + name: obj.get("name").unwrap().as_str().unwrap().to_string(), + tumonline_room_nr, + r#type: obj.get("type").unwrap().as_str().unwrap().to_string(), + type_common_name: obj + .get("type_common_name") + .unwrap() + .as_str() + .unwrap() + .to_string(), + lat: lat.unwrap_or(48.14903) as f32, + lon: lon.unwrap_or(11.56735) as f32, + } + } +} + +struct StorableValue; + +impl StorableValue { + fn from(value: HashMap) -> (String, ExtractedFields) { + let data = serde_json::to_string(&value).unwrap(); + (data, ExtractedFields::from(value)) + } +} + +fn delocalise(value: Value, language: &'static str) -> Value { + match value { + Value::Array(arr) => Value::Array( + arr.into_iter() + .map(|value| delocalise(value, language)) + .collect(), + ), + Value::Object(obj) => { + if obj.contains_key("de") || obj.contains_key("en") { + obj.get(language) + .cloned() + .unwrap_or(Value::String("".to_string())) + } else { + Value::Object( + obj.into_iter() + .map(|(key, value)| (key, delocalise(value, language))) + .filter(|(key, _)| key != "de" && key != "en") + .collect(), + ) + } + } + a => a, + } +} + +struct DelocalisedValues { + key: String, + de: HashMap, + en: HashMap, +} + +impl From> for DelocalisedValues { + fn from(value: HashMap) -> Self { + Self { + de: value + .clone() + .into_iter() + .map(|(k, v)| (k, delocalise(v.clone(), "de"))) + .collect(), + en: value + .clone() + .into_iter() + .map(|(k, v)| (k, delocalise(v.clone(), "en"))) + .collect(), + key: value + .clone() + .get("id") + .unwrap() + .as_str() + .unwrap() + .to_string(), + } + } +} + +impl DelocalisedValues { + async fn store(self, tx: &mut sqlx::Transaction<'_, sqlx::Sqlite>) -> Result<(), sqlx::Error> { + let key = self.key.clone(); // has to be here due to livetimes somehow + let (data, fields) = StorableValue::from(self.de); + sqlx::query!( + r#"INSERT INTO de(key,data,name,tumonline_room_nr,type,type_common_name,lat,lon) + VALUES (?,?,?,?,?,?,?,?)"#, + key, + data, + fields.name, + fields.tumonline_room_nr, + fields.r#type, + fields.type_common_name, + fields.lat, + fields.lon, + ) + .execute(&mut **tx) + .await?; + + let (data, fields) = StorableValue::from(self.en); + sqlx::query!( + r#"INSERT INTO en(key,data,name,tumonline_room_nr,type,type_common_name,lat,lon) + VALUES (?,?,?,?,?,?,?,?)"#, + self.key, + data, + fields.name, + fields.tumonline_room_nr, + fields.r#type, + fields.type_common_name, + fields.lat, + fields.lon, + ) + .execute(&mut **tx) + .await?; + + Ok(()) + } +} +pub(crate) async fn load_all_to_db(pool: &SqlitePool) -> Result<(), Box> { + let start = Instant::now(); + let cdn_url = std::env::var("CDN_URL").unwrap_or_else(|_| "https://nav.tum.de/cdn".to_string()); + let tasks = reqwest::get(format!("{cdn_url}/api_data.json")) + .await? + .json::>>() + .await? + .into_iter() + .map(DelocalisedValues::from); + info!("downloaded data in {elapsed:?}", elapsed = start.elapsed()); + let start = Instant::now(); + let mut tx = pool.begin().await?; + for task in tasks { + task.store(&mut tx).await?; + } + tx.commit().await?; + info!("loaded data in {elapsed:?}", elapsed = start.elapsed()); + + Ok(()) +} diff --git a/server/main-api/src/setup/database/mod.rs b/server/main-api/src/setup/database/mod.rs new file mode 100644 index 000000000..cb601c090 --- /dev/null +++ b/server/main-api/src/setup/database/mod.rs @@ -0,0 +1,25 @@ +mod alias; +mod data; + +use sqlx::sqlite::SqlitePoolOptions; +use sqlx::Executor; + +pub(crate) async fn setup_database() -> Result<(), Box> { + let uri = std::env::var("DB_LOCATION").unwrap_or_else(|_| "api_data.db".to_string()); + let uri = format!("{uri}?mode=rwc"); + let pool = SqlitePoolOptions::new().connect(&uri).await?; + sqlx::migrate!("./migrations").run(&pool).await?; + // this is to setup the database faster + // we don't want to use an acid compliant database for this step ;) + pool.execute("PRAGMA journal_mode = OFF;"); + pool.execute("PRAGMA synchronous = OFF;"); + + // delete all old data + sqlx::query!("DELETE FROM aliases").execute(&pool).await?; + sqlx::query!("DELETE FROM en").execute(&pool).await?; + sqlx::query!("DELETE FROM de").execute(&pool).await?; + + data::load_all_to_db(&pool).await?; + alias::load_all_to_db(&pool).await?; + Ok(()) +} diff --git a/server/main-api/src/setup/meilisearch.rs b/server/main-api/src/setup/meilisearch.rs new file mode 100644 index 000000000..93ef1d189 --- /dev/null +++ b/server/main-api/src/setup/meilisearch.rs @@ -0,0 +1,120 @@ +use log::{error, info}; +use meilisearch_sdk::settings::Settings; +use meilisearch_sdk::tasks::Task; +use meilisearch_sdk::Client; +use serde_json::Value; +use std::collections::HashMap; +use std::time::Duration; + +const TIMEOUT: Option = Some(Duration::from_secs(20)); +const POLLING_RATE: Option = Some(Duration::from_millis(50)); + +#[derive(serde::Deserialize)] +struct Synonyms(HashMap>); + +impl Synonyms { + fn try_load() -> Result { + serde_yaml::from_str(include_str!("search_synonyms.yaml")) + } +} + +async fn wait_for_healthy(client: &Client) { + let mut counter = 0; + loop { + match client.health().await { + Ok(status) => { + if status.status == "available" { + return; + } else if counter > 10 { + error!( + "Meilisearch responding, but {status}. Please make sure that it is running", + status = status.status + ) + } + } + Err(e) => { + if counter > 10 { + error!("Meilisearch unhealthy. Please make sure that it is running err={e:?}") + } + } + } + counter += 1; + tokio::time::sleep(Duration::from_secs(1)).await; + } +} + +pub(crate) async fn setup_meilisearch() -> Result<(), Box> { + let start = std::time::Instant::now(); + let ms_url = std::env::var("MIELI_URL").unwrap_or_else(|_| "http://localhost:7700".to_string()); + let client = Client::new(ms_url, std::env::var("MEILI_MASTER_KEY").ok()); + wait_for_healthy(&client).await; + + client + .create_index("entries", Some("ms_id")) + .await? + .wait_for_completion(&client, POLLING_RATE, TIMEOUT) + .await?; + let entries = client.index("entries"); + + let settings = Settings::new() + .with_filterable_attributes([ + "facet", + "parent_keywords", + "parent_building_names", + "campus", + "type", + "usage", + ]) + .with_ranking_rules([ + "words", + "typo", + "rank:desc", + "proximity", + "attribute", + "sort", + "exactness", + ]) + .with_sortable_attributes(["_geo"]) + .with_searchable_attributes([ + "ms_id", + "name", + "arch_name", + "type", + "type_common_name", + "parent_building_names", + "parent_keywords", + "address", + "usage", + ]) + .with_synonyms(Synonyms::try_load()?.0); + + let res = entries + .set_settings(&settings) + .await? + .wait_for_completion(&client, POLLING_RATE, TIMEOUT) + .await?; + if let Task::Failed { content } = res { + panic!("Failed to add documents to Meilisearch: {content:#?}"); + } + + let cdn_url = std::env::var("CDN_URL").unwrap_or_else(|_| "https://nav.tum.de/cdn".to_string()); + let documents = reqwest::get(format!("{cdn_url}/search_data.json")) + .await? + .json::>() + .await?; + let res = entries + .add_documents(&documents, Some("ms_id")) + .await? + .wait_for_completion(&client, POLLING_RATE, TIMEOUT) + .await?; + if let Task::Failed { content } = res { + panic!("Failed to add documents to Meilisearch: {content:#?}"); + } + + info!( + "{cnt} documents added in {elapsed:?}", + elapsed = start.elapsed(), + cnt = documents.len() + ); + Ok(()) +} diff --git a/server/main-api/src/setup/mod.rs b/server/main-api/src/setup/mod.rs new file mode 100644 index 000000000..d3468b530 --- /dev/null +++ b/server/main-api/src/setup/mod.rs @@ -0,0 +1,2 @@ +pub(crate) mod database; +pub(crate) mod meilisearch; diff --git a/server/main-api/src/setup/search_synonyms.yaml b/server/main-api/src/setup/search_synonyms.yaml new file mode 100644 index 000000000..d1f72daab --- /dev/null +++ b/server/main-api/src/setup/search_synonyms.yaml @@ -0,0 +1,134 @@ +Weihenstephan: [wzw] +Innenstadt: [Stammgelände] + +ph: [Physik] +ch: [Chemie] +Maschinenwesen: [mw] + +Immathalle: [Immatrikulationshalle] +Bib: [Bibliothek, Teilbibliothek] +TB: [Teilbibliothek] + +HS: [Hörsaal, Vorlesungssaal] +Hörsaal: [HS, Vorlesungssaal] +Seminarraum: [Übungsraum] +Lernraum: [Lernplatz, Seminarraum, Studentenarbeitsraum, Übungsraum] +Übungsraum: [Seminarraum, Studentenarbeitsraum, Übungsraum] +Arbeitsraum: [Seminarraum, Studentenarbeitsraum, Übungsraum] + +Rechnerraum-Studenten: [Rechnerarbeitsraum, Rechnerraum, Rechner-Raum, Computerarbeitsraum, Computerraum, Computerpool, Computer Studenten, CIP-Raum, CIP-Pool, Computerpool, CAD-Pool, EDV-Pool] +Rechnerarbeitsraum: [Rechnerraum-Studenten, Rechnerraum, Rechner-Raum, Computerarbeitsraum, Computerraum, Computerpool, Computer Studenten, CIP-Raum, CIP-Pool, Computerpool, CAD-Pool, EDV-Pool] +Rechnerraum: [Rechnerraum-Studenten, Rechnerarbeitsraum, Rechner-Raum, Computerarbeitsraum, Computerraum, Computerpool, Computer Studenten, CIP-Raum, CIP-Pool, Computerpool, CAD-Pool, EDV-Pool] +Rechner-Raum: [Rechnerraum-Studenten, Rechnerarbeitsraum, Rechnerraum, Computerarbeitsraum, Computerraum, Computerpool, Computer Studenten, CIP-Raum, CIP-Pool, Computerpool, CAD-Pool, EDV-Pool] +Rechnerhalle: [Rechnerraum-Studenten, Rechnerarbeitsraum, Rechnerraum, Computerarbeitsraum, Computerraum, Computerpool, Computer Studenten, CIP-Raum, CIP-Pool, Computerpool, CAD-Pool, EDV-Pool, Rechner-Raum] +Computerarbeitsraum: [Rechnerraum-Studenten, Rechnerarbeitsraum, Rechnerraum, Rechner-Raum, Computerraum, Computerpool, Computer Studenten, CIP-Raum, CIP-Pool, Computerpool, CAD-Pool, EDV-Pool] +Computerraum: [Rechnerraum-Studenten, Rechnerarbeitsraum, Rechnerraum, Rechner-Raum, Computerarbeitsraum, Computerpool, Computer Studenten, CIP-Raum, CIP-Pool, Computerpool, CAD-Pool, EDV-Pool] +Computerpool: [Rechnerraum-Studenten, Rechnerarbeitsraum, Rechnerraum, Rechner-Raum, Computerarbeitsraum, Computerraum, Computer Studenten, CIP-Raum, CIP-Pool, CAD-Pool, EDV-Pool] +Computer Studenten: [Rechnerraum-Studenten, Rechnerarbeitsraum, Rechnerraum, Rechner-Raum, Computerarbeitsraum, Computerraum, Computerpool, CIP-Raum, CIP-Pool, Computerpool, CAD-Pool, EDV-Pool] +CIP-Raum: [Rechnerraum-Studenten, Rechnerarbeitsraum, Rechnerraum, Rechner-Raum, Computerarbeitsraum, Computerraum, Computerpool, Computer Studenten, CIP-Pool, Computerpool, CAD-Pool, EDV-Pool] +CIP-Pool: [Rechnerraum-Studenten, Rechnerarbeitsraum, Rechnerraum, Rechner-Raum, Computerarbeitsraum, Computerraum, Computerpool, Computer Studenten, CIP-Raum, Computerpool, CAD-Pool, EDV-Pool] +CAD-Pool: [Rechnerraum-Studenten, Rechnerarbeitsraum, Rechnerraum, Rechner-Raum, Computerarbeitsraum, Computerraum, Computerpool, Computer Studenten, CIP-Raum, CIP-Pool, Computerpool, EDV-Pool] +EDV-Pool: [Rechnerraum-Studenten, Rechnerarbeitsraum, Rechnerraum, Rechner-Raum, Computerarbeitsraum, Computerraum, Computerpool, Computer Studenten, CIP-Raum, CIP-Pool, Computerpool, CAD-Pool] + +Besprechung: [Besprechungsraum, Konferenz, Konferenzraum, Konferenzsaal, Sitzungssaal, Sitzungsraum, Sitzungszimmer] +Besprechungsraum: [Besprechung, Konferenz, Konferenzraum, Konferenzsaal, Sitzungssaal, Sitzungsraum, Sitzungszimmer] +Konferenz: [Besprechung, Besprechungsraum, Konferenzraum, Konferenzsaal, Sitzungssaal, Sitzungsraum, Sitzungszimmer] +Konferenzraum: [Besprechung, Besprechungsraum, Konferenz, Konferenzsaal, Sitzungssaal, Sitzungsraum, Sitzungszimmer] +Konferenzsaal: [Besprechung, Besprechungsraum, Konferenz, Konferenzraum, Sitzungssaal, Sitzungsraum, Sitzungszimmer] +Sitzungssaal: [Besprechung, Besprechungsraum, Konferenz, Konferenzraum, Konferenzsaal, Sitzungsraum, Sitzungszimmer] +Sitzungsraum: [Besprechung, Besprechungsraum, Konferenz, Konferenzraum, Konferenzsaal, Sitzungssaal, Sitzungszimmer] +Sitzungszimmer: [Besprechung, Besprechungsraum, Konferenz, Konferenzraum, Konferenzsaal, Sitzungssaal, Sitzungsraum] + +Abstellraum: [Abstellkammer, Lager, Lagerraum, Ablage] +Abstellkammer: [Abstellraum, Lager, Lagerraum, Ablage] +Lager: [Abstellraum, Abstellkammer, Lagerraum, Ablage] +Lagerraum: [Abstellraum, Abstellkammer, Lager, Ablage] +Ablage: [Abstellraum, Abstellkammer, Lager, Lagerraum] + +Kopierer: [Kopie, Kopierraum, Drucker, Druckerraum, Druckgeräterraum, Printcenter, Scannerraum] +Kopie: [Kopierer, Kopierraum, Drucker, Druckerraum, Druckgeräterraum, Printcenter, Scannerraum] +Kopierraum: [Kopierer, Kopie, Drucker, Druckerraum, Druckgeräterraum, Printcenter, Scannerraum] +Drucker: [Kopierer, Kopie, Kopierraum, Druckerraum, Druckgeräterraum, Printcenter, Scannerraum] +Druckerraum: [Kopierer, Kopie, Kopierraum, Drucker, Druckgeräterraum, Printcenter, Scannerraum] +Druckgeräterraum: [Kopierer, Kopie, Kopierraum, Drucker, Druckerraum, Printcenter, Scannerraum] +Printcenter: [Kopierer, Kopie, Kopierraum, Drucker, Druckerraum, Druckgeräterraum, Scannerraum] +Scannerraum: [Kopierer, Kopie, Kopierraum, Drucker, Druckerraum, Druckgeräterraum, Printcenter] + +Teilküche: [Küche, Anrichte, Arbeitsraum für Verpflegung] +Küche: [Teilküche, Anrichte, Arbeitsraum für Verpflegung] +Anrichte: [Teilküche, Küche, Arbeitsraum für Verpflegung] +Arbeitsraum für Verpflegung: [Teilküche, Küche, Anrichte] + +Kühlzelle: [Kühlzellen, Kühlraum, Kühlkammer, Kühlung, Gefrierschrank, Kühlschrank, Kühllagerraum] +Kühlzellen: [Kühlzelle, Kühlraum, Kühlkammer, Kühlung, Gefrierschrank, Kühlschrank, Kühllagerraum] +Kühlraum: [Kühlzelle, Kühlzellen, Kühlkammer, Kühlung, Gefrierschrank, Kühlschrank, Kühllagerraum] +Kühlkammer: [Kühlzelle, Kühlzellen, Kühlraum, Kühlung, Gefrierschrank, Kühlschrank, Kühllagerraum] +Kühlung: [Kühlzelle, Kühlzellen, Kühlraum, Kühlkammer, Gefrierschrank, Kühlschrank, Kühllagerraum] +Gefrierschrank: [Kühlzelle, Kühlzellen, Kühlraum, Kühlkammer, Kühlung, Kühlschrank, Kühllagerraum] +Kühlschrank: [Kühlzelle, Kühlzellen, Kühlraum, Kühlkammer, Kühlung, Gefrierschrank, Kühllagerraum] +Kühllagerraum: [Kühlzelle, Kühlzellen, Kühlraum, Kühlkammer, Kühlung, Gefrierschrank, Kühlschrank] + +Müllager: [Müll, Müllraum, Abfall, Abfallsammelstelle, Abfälle, Entsorgungsraum, Müllzwischenlager, Müllsammelstelle] +Müll: [Müllager, Müllraum, Abfall, Abfallsammelstelle, Abfälle, Entsorgungsraum, Müllzwischenlager, Müllsammelstelle] +Müllraum: [Müllager, Müll, Abfall, Abfallsammelstelle, Abfälle, Entsorgungsraum, Müllzwischenlager, Müllsammelstelle] +Abfall: [Müllager, Müll, Müllraum, Abfallsammelstelle, Abfälle, Entsorgungsraum, Müllzwischenlager, Müllsammelstelle] +Abfallsammelstelle: [Müllager, Müll, Müllraum, Abfall, Abfälle, Entsorgungsraum, Müllzwischenlager, Müllsammelstelle] +Abfälle: [Müllager, Müll, Müllraum, Abfall, Abfallsammelstelle, Entsorgungsraum, Müllzwischenlager, Müllsammelstelle] +Entsorgungsraum: [Müllager, Müll, Müllraum, Abfall, Abfallsammelstelle, Abfälle, Müllzwischenlager, Müllsammelstelle] +Müllzwischenlager: [Müllager, Müll, Müllraum, Abfall, Abfallsammelstelle, Abfälle, Entsorgungsraum, Müllsammelstelle] +Müllsammelstelle: [Müllager, Müll, Müllraum, Abfall, Abfallsammelstelle, Abfälle, Entsorgungsraum, Müllzwischenlager] + +Gefahrstoffraum: [Gefahrstofflager, Gefahrgutraum, Gefahrgutlager, Giftlager] +Gefahrstofflager: [Gefahrstoffraum, Gefahrgutraum, Gefahrgutlager, Giftlager] +Gefahrgutraum: [Gefahrstoffraum, Gefahrstofflager, Gefahrgutlager, Giftlager] +Gefahrgutlager: [Gefahrstoffraum, Gefahrstofflager, Gefahrgutraum, Giftlager] +Giftlager: [Gefahrstoffraum, Gefahrstofflager, Gefahrgutraum, Gefahrgutlager] + +Chemikalienraum: [Chemikalienlager, Chemikalien] +Chemikalienlager: [Chemikalienraum, Chemikalien] +Chemikalien: [Chemikalienraum, Chemikalienlager] + +Sondermüllzwischenlager: [Sondermülllager, Sonderabfall] +Sondermülllager: [Sondermüllzwischenlager, Sonderabfall] +Sonderabfall: [Sondermüllzwischenlager, Sondermülllager] + +Dusche: [Duschraum] +Duschraum: [Dusche] + +Laborraum: [Labor] +Labor raum: [Labor] + +straße: [str] +str: [straße] + +raum: [room] + +ii: ["2"] +"2": [ii] +iii: ["3"] +"3": [iii] +iv: ["4"] +"4": [iv] + +Interims: [Interimshörsäle, Interims-Audimax] +Permanentomax: ["Interims-Tentomax MW", "Interims III"] +Blechomax: ["Interims-Tentomax MW", "Interims III"] +"Interims-Tentomax MW": ["Interims III"] +Interims-III: ["Interims-Tentomax MW", "Interims III"] +"Interims III": ["Interims-Tentomax MW"] +"Interims 3": ["Interims-Tentomax MW", "Interims III"] + +Fachschaft: [FS, Fachschaftsbüro, Fachschaftsraum] +FS: [Fachschaft, Fachschaftsbüro, Fachschaftsraum] +Fachschaftsbüro: [Fachschaft, FS, Fachschaftsraum] +Fachschaftsraum: [Fachschaft, FS, Fachschaftsbüro] + +Fachschaft MPI: [Fachschaft MPIC, MPI, MPIC, FSMPI, FSMPIC] +Fachschaft MPIC: [Fachschaft MPI, MPI, MPIC, FSMPI, FSMPIC] +MPI: [Fachschaft MPI, Fachschaft MPIC, MPIC, FSMPI, FSMPIC] +MPIC: [Fachschaft MPI, Fachschaft MPIC, MPI, FSMPI, FSMPIC] +FSMPI: [Fachschaft MPI, Fachschaft MPIC, MPI, MPIC, FSMPIC] +FSMPIC: [Fachschaft MPI, Fachschaft MPIC, MPI, MPIC, FSMPI] +AStA: [SV, StuVe, Studentische Vertretung] +Studentische Vertretung: [SV, StuVe, AStA] +StuVe: [SV, Studentische Vertretung, AStA] diff --git a/server/main-api/src/utils.rs b/server/main-api/src/utils.rs index dee3cdeb5..fabada3e7 100644 --- a/server/main-api/src/utils.rs +++ b/server/main-api/src/utils.rs @@ -13,7 +13,6 @@ impl LangQueryArgs { } pub fn establish_connection() -> SqliteConnection { - let database_loc = - std::env::var("DB_LOCATION").unwrap_or_else(|_| "data/api_data.db".to_string()); + let database_loc = std::env::var("DB_LOCATION").unwrap_or_else(|_| "api_data.db".to_string()); SqliteConnection::establish(&database_loc).expect("Cannot open database") } diff --git a/webclient/package-lock.json b/webclient/package-lock.json index 825f29fd3..e2764fff1 100644 --- a/webclient/package-lock.json +++ b/webclient/package-lock.json @@ -8,41 +8,41 @@ "name": "navigatum", "version": "0.1.0", "dependencies": { - "@sentry/tracing": "7.64.0", - "@sentry/vue": "7.64.0", - "@vueuse/core": "10.3.0", - "maplibre-gl": "3.3.0", + "@sentry/tracing": "7.69.0", + "@sentry/vue": "7.69.0", + "@vueuse/core": "10.4.1", + "maplibre-gl": "3.3.1", "pinia": "2.1.6", "spectre.css": "github:Valexr/spectre#dfe3bc2c59d23cd4bfd43c690aae3655576ff708", - "swagger-ui-dist": "5.4.2", + "swagger-ui-dist": "5.7.2", "swaggerdark": "github:octycs/SwaggerDark#f02d394c8ff698cdd93e09c2188b058d2d686ca3", "vue": "3.3.4", "vue-router": "4.2.4" }, "devDependencies": { - "@intlify/unplugin-vue-i18n": "0.12.3", - "@rushstack/eslint-patch": "1.3.3", - "@sentry/vite-plugin": "2.7.0", + "@intlify/unplugin-vue-i18n": "1.2.0", + "@rushstack/eslint-patch": "1.4.0", + "@sentry/vite-plugin": "2.7.1", "@types/swagger-ui-dist": "3.30.1", - "@vitejs/plugin-vue": "4.3.3", + "@vitejs/plugin-vue": "4.3.4", "@vue/eslint-config-prettier": "8.0.0", - "@vue/eslint-config-typescript": "11.0.3", + "@vue/eslint-config-typescript": "12.0.0", "@vue/tsconfig": "0.4.0", "@yankeeinlondon/link-builder": "1.2.1", - "cypress": "12.17.4", - "eslint": "8.47.0", + "cypress": "13.2.0", + "eslint": "8.49.0", "eslint-plugin-vue": "9.17.0", "isomorphic-fetch": "3.0.0", "npm-run-all": "4.1.5", - "prettier": "3.0.2", - "sass": "1.66.1", - "stylelint-scss": "5.1.0", - "typescript": "5.1.6", + "prettier": "3.0.3", + "sass": "1.67.0", + "stylelint-scss": "5.2.1", + "typescript": "5.2.2", "vite": "4.4.9", "vite-plugin-md": "0.21.5", "vite-plugin-rewrite-all": "1.0.1", - "vue-i18n": "9.3.0-beta.14-77e850b", - "vue-tsc": "1.8.8" + "vue-i18n": "9.4.1", + "vue-tsc": "1.8.11" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -55,13 +55,13 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz", - "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dev": true, "peer": true, "dependencies": { - "@babel/highlight": "^7.22.10", + "@babel/highlight": "^7.22.13", "chalk": "^2.4.2" }, "engines": { @@ -147,9 +147,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz", + "integrity": "sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ==", "dev": true, "peer": true, "engines": { @@ -157,9 +157,9 @@ } }, "node_modules/@babel/highlight": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz", - "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz", + "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==", "dev": true, "peer": true, "dependencies": { @@ -250,9 +250,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz", - "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.15.tgz", + "integrity": "sha512-RWmQ/sklUN9BvGGpCDgSubhHWfAx24XDTDObup4ffvxaYsptOg2P3KG0j+1eWKLxpkX0j0uHxmpq2Z1SP/VhxA==", "bin": { "parser": "bin/babel-parser.js" }, @@ -361,9 +361,9 @@ } }, "node_modules/@cypress/request": { - "version": "2.88.12", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", - "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz", + "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -776,9 +776,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz", - "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz", + "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" @@ -808,18 +808,18 @@ } }, "node_modules/@eslint/js": { - "version": "8.47.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz", - "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==", + "version": "8.49.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz", + "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", - "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==", + "version": "0.11.11", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz", + "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==", "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^1.2.1", @@ -850,21 +850,21 @@ "dev": true }, "node_modules/@intlify/bundle-utils": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@intlify/bundle-utils/-/bundle-utils-7.0.2.tgz", - "integrity": "sha512-8wbx9xhbawBFTE5LPTECiK26RRqrNS31jyWSur72ZXZZ4it5jiZTcG6eUJlNirr4+jXYio2DGY299JsGVT4cpw==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@intlify/bundle-utils/-/bundle-utils-7.3.0.tgz", + "integrity": "sha512-lcnfsLA5Dyd3TbvfoLS0ejLr1vAJYyT6VRYtE4LGNexy1ZD/GEcbXrC33fI9oQp7t2hDlHbCn2o4BBVgXaJFqg==", "dev": true, "dependencies": { - "@intlify/message-compiler": "9.3.0-beta.24", - "@intlify/shared": "9.3.0-beta.24", + "@intlify/message-compiler": "^9.4.0", + "@intlify/shared": "^9.4.0", "acorn": "^8.8.2", "escodegen": "^2.0.0", "estree-walker": "^2.0.2", - "jsonc-eslint-parser": "^1.0.1", + "jsonc-eslint-parser": "^2.3.0", "magic-string": "^0.30.0", "mlly": "^1.2.0", "source-map-js": "^1.0.1", - "yaml-eslint-parser": "^0.3.2" + "yaml-eslint-parser": "^1.2.2" }, "engines": { "node": ">= 14.16" @@ -879,85 +879,28 @@ } }, "node_modules/@intlify/core-base": { - "version": "9.3.0-beta.14-77e850b", - "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.3.0-beta.14-77e850b.tgz", - "integrity": "sha512-Eb8CeN+s/Och1whMLzW8ds1dkYgEuu5Vf26IYz+GVYstx1rPICnh5HNvgTyQvQMUsvVei5ujz2gx/LcPxxRymQ==", - "dev": true, - "dependencies": { - "@intlify/devtools-if": "9.3.0-beta.14-77e850b", - "@intlify/message-compiler": "9.3.0-beta.14-77e850b", - "@intlify/shared": "9.3.0-beta.14-77e850b", - "@intlify/vue-devtools": "9.3.0-beta.14-77e850b" - }, - "engines": { - "node": ">= 14" - }, - "funding": { - "url": "https://github.com/sponsors/kazupon" - } - }, - "node_modules/@intlify/core-base/node_modules/@intlify/message-compiler": { - "version": "9.3.0-beta.14-77e850b", - "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.3.0-beta.14-77e850b.tgz", - "integrity": "sha512-MF7EdnBoKo21Unf8rDy37KEhRzcbPlel+FTD7VR+EzzMgk4R/sMtICnMgDxS3Kl5FS9tLdHlNF0Qbuxc6+NNmg==", - "dev": true, - "dependencies": { - "@intlify/shared": "9.3.0-beta.14-77e850b", - "source-map": "0.6.1" - }, - "engines": { - "node": ">= 14" - }, - "funding": { - "url": "https://github.com/sponsors/kazupon" - } - }, - "node_modules/@intlify/core-base/node_modules/@intlify/shared": { - "version": "9.3.0-beta.14-77e850b", - "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.3.0-beta.14-77e850b.tgz", - "integrity": "sha512-aHZYRM0sJN+YSUnoC5Dv4L1TFYtP23kdTkrK5cHSEqUbI5UXc8FbnXPal0lJliMhO0ED7Ic7aEOeQX84BM3xCQ==", - "dev": true, - "engines": { - "node": ">= 14" - }, - "funding": { - "url": "https://github.com/sponsors/kazupon" - } - }, - "node_modules/@intlify/devtools-if": { - "version": "9.3.0-beta.14-77e850b", - "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.3.0-beta.14-77e850b.tgz", - "integrity": "sha512-Misf4UDGi9vyUONXIAhcSAIb8n6bBYNfuezLQxwgnVDrJk0GacKQG38GW231QE9OgLvmUmC+WGbq7LTZo/pCpA==", + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.4.1.tgz", + "integrity": "sha512-WIwx+elsZbxSMxRG5+LC+utRohFvmZMoDevfKOfnYMLbpCjCSavqTfHJAtfsY6ruowzqXeKkeLhRHbYbjoJx5g==", "dev": true, "dependencies": { - "@intlify/shared": "9.3.0-beta.14-77e850b" - }, - "engines": { - "node": ">= 14" + "@intlify/message-compiler": "9.4.1", + "@intlify/shared": "9.4.1" }, - "funding": { - "url": "https://github.com/sponsors/kazupon" - } - }, - "node_modules/@intlify/devtools-if/node_modules/@intlify/shared": { - "version": "9.3.0-beta.14-77e850b", - "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.3.0-beta.14-77e850b.tgz", - "integrity": "sha512-aHZYRM0sJN+YSUnoC5Dv4L1TFYtP23kdTkrK5cHSEqUbI5UXc8FbnXPal0lJliMhO0ED7Ic7aEOeQX84BM3xCQ==", - "dev": true, "engines": { - "node": ">= 14" + "node": ">= 16" }, "funding": { "url": "https://github.com/sponsors/kazupon" } }, "node_modules/@intlify/message-compiler": { - "version": "9.3.0-beta.24", - "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.3.0-beta.24.tgz", - "integrity": "sha512-prhHATkgp0mpPqoVgiAtLmUc1JMvs8fMH6w53AVEBn+VF87dLhzanfmWY5FoZWORG51ag54gBDBOoM/VFv3m3A==", + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.4.1.tgz", + "integrity": "sha512-aN2N+dUx320108QhH51Ycd2LEpZ+NKbzyQ2kjjhqMcxhHdxtOnkgdx+MDBhOy/CObwBmhC3Nygzc6hNlfKvPNw==", "dev": true, "dependencies": { - "@intlify/shared": "9.3.0-beta.24", + "@intlify/shared": "9.4.1", "source-map-js": "^1.0.2" }, "engines": { @@ -968,9 +911,9 @@ } }, "node_modules/@intlify/shared": { - "version": "9.3.0-beta.24", - "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.3.0-beta.24.tgz", - "integrity": "sha512-AKxJ8s7eKIQWkNaf4wyyoLRwf4puCuQgjSChlDJm5JBEt6T8HGgnYTJLRXu6LD/JACn3Qwu6hM/XRX1c9yvjmQ==", + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.4.1.tgz", + "integrity": "sha512-A51elBmZWf1FS80inf/32diO9DeXoqg9GR9aUDHFcfHoNDuT46Q+fpPOdj8jiJnSHSBh8E1E+6qWRhAZXdK3Ng==", "dev": true, "engines": { "node": ">= 16" @@ -980,13 +923,13 @@ } }, "node_modules/@intlify/unplugin-vue-i18n": { - "version": "0.12.3", - "resolved": "https://registry.npmjs.org/@intlify/unplugin-vue-i18n/-/unplugin-vue-i18n-0.12.3.tgz", - "integrity": "sha512-0riPtSfTM58JmGNMmJho/aHD2z3K24BESYAmkLvKlo61/LbaPvnjYU1DbSbJEm6bSjE2oEjUj+di3QaYxXei/w==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@intlify/unplugin-vue-i18n/-/unplugin-vue-i18n-1.2.0.tgz", + "integrity": "sha512-AzjlMZKj9DG10ICDR2VWjfJudHJ1XK2GNSHxw+VmOUYpUm4S0L/a7OAdvgnuY7S4plk1VnPdT4YilpZk+uQcqg==", "dev": true, "dependencies": { - "@intlify/bundle-utils": "^7.0.2", - "@intlify/shared": "9.3.0-beta.24", + "@intlify/bundle-utils": "^7.3.0", + "@intlify/shared": "^9.4.0", "@rollup/pluginutils": "^5.0.2", "@vue/compiler-sfc": "^3.2.47", "debug": "^4.3.3", @@ -1018,34 +961,6 @@ } } }, - "node_modules/@intlify/vue-devtools": { - "version": "9.3.0-beta.14-77e850b", - "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.3.0-beta.14-77e850b.tgz", - "integrity": "sha512-QRznXFfu9UldQmE4kWj5VbfSFzT4y2Zh5xD9L2AJ8J/bhlLzbncMHDb3BOL6Xzczv5K6LhYDLdoVvW1n+z4tpA==", - "dev": true, - "dependencies": { - "@intlify/core-base": "9.3.0-beta.14-77e850b", - "@intlify/shared": "9.3.0-beta.14-77e850b" - }, - "engines": { - "node": ">= 14" - }, - "funding": { - "url": "https://github.com/sponsors/kazupon" - } - }, - "node_modules/@intlify/vue-devtools/node_modules/@intlify/shared": { - "version": "9.3.0-beta.14-77e850b", - "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.3.0-beta.14-77e850b.tgz", - "integrity": "sha512-aHZYRM0sJN+YSUnoC5Dv4L1TFYtP23kdTkrK5cHSEqUbI5UXc8FbnXPal0lJliMhO0ED7Ic7aEOeQX84BM3xCQ==", - "dev": true, - "engines": { - "node": ">= 14" - }, - "funding": { - "url": "https://github.com/sponsors/kazupon" - } - }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.15", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", @@ -1202,9 +1117,9 @@ } }, "node_modules/@rollup/pluginutils": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.3.tgz", - "integrity": "sha512-hfllNN4a80rwNQ9QCxhxuHCGHMAvabXqxNdaChUSSadMre7t4iEUI6fFAhBOn/eIYTgYVhBv7vCLsAJ4u3lf3g==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.4.tgz", + "integrity": "sha512-0KJnIoRI8A+a1dqOYLxH8vBf8bphDmty5QvIm2hqm7oFCFYKCAZWWd2hXgMibaPsNDhI0AtpYfQZJG47pt/k4g==", "dev": true, "dependencies": { "@types/estree": "^1.0.0", @@ -1224,19 +1139,20 @@ } }, "node_modules/@rushstack/eslint-patch": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.3.3.tgz", - "integrity": "sha512-0xd7qez0AQ+MbHatZTlI1gu5vkG8r7MYRUJAHPAHJBmGLs16zpkrpAVLvjQKQOqaXPDUBwOiJzNc00znHSCVBw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.4.0.tgz", + "integrity": "sha512-cEjvTPU32OM9lUFegJagO0mRnIn+rbqrG89vV8/xLnLFX0DoR0r1oy5IlTga71Q7uT3Qus7qm7wgeiMT/+Irlg==", "dev": true }, "node_modules/@sentry-internal/tracing": { - "version": "7.64.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.64.0.tgz", - "integrity": "sha512-1XE8W6ki7hHyBvX9hfirnGkKDBKNq3bDJyXS86E0bYVDl94nvbRM9BD9DHsCFetqYkVm1yDGEK+6aUVs4CztoQ==", + "version": "7.66.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.66.0.tgz", + "integrity": "sha512-3vCgC2hC3T45pn53yTDVcRpHoJTBxelDPPZVsipAbZnoOVPkj7n6dNfDhj3I3kwWCBPahPkXmE+R4xViR8VqJg==", + "dev": true, "dependencies": { - "@sentry/core": "7.64.0", - "@sentry/types": "7.64.0", - "@sentry/utils": "7.64.0", + "@sentry/core": "7.66.0", + "@sentry/types": "7.66.0", + "@sentry/utils": "7.66.0", "tslib": "^2.4.1 || ^1.9.3" }, "engines": { @@ -1244,15 +1160,62 @@ } }, "node_modules/@sentry/browser": { - "version": "7.64.0", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.64.0.tgz", - "integrity": "sha512-lB2IWUkZavEDclxfLBp554dY10ZNIEvlDZUWWathW+Ws2wRb6PNLtuPUNu12R7Q7z0xpkOLrM1kRNN0OdldgKA==", - "dependencies": { - "@sentry-internal/tracing": "7.64.0", - "@sentry/core": "7.64.0", - "@sentry/replay": "7.64.0", - "@sentry/types": "7.64.0", - "@sentry/utils": "7.64.0", + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.69.0.tgz", + "integrity": "sha512-5ls+zu2PrMhHCIIhclKQsWX5u6WH0Ez5/GgrCMZTtZ1d70ukGSRUvpZG9qGf5Cw1ezS1LY+1HCc3whf8x8lyPw==", + "dependencies": { + "@sentry-internal/tracing": "7.69.0", + "@sentry/core": "7.69.0", + "@sentry/replay": "7.69.0", + "@sentry/types": "7.69.0", + "@sentry/utils": "7.69.0", + "tslib": "^2.4.1 || ^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/browser/node_modules/@sentry-internal/tracing": { + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.69.0.tgz", + "integrity": "sha512-4BgeWZUj9MO6IgfO93C9ocP3+AdngqujF/+zB2rFdUe+y9S6koDyUC7jr9Knds/0Ta72N/0D6PwhgSCpHK8s0Q==", + "dependencies": { + "@sentry/core": "7.69.0", + "@sentry/types": "7.69.0", + "@sentry/utils": "7.69.0", + "tslib": "^2.4.1 || ^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/browser/node_modules/@sentry/core": { + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.69.0.tgz", + "integrity": "sha512-V6jvK2lS8bhqZDMFUtvwe2XvNstFQf5A+2LMKCNBOV/NN6eSAAd6THwEpginabjet9dHsNRmMk7WNKvrUfQhZw==", + "dependencies": { + "@sentry/types": "7.69.0", + "@sentry/utils": "7.69.0", + "tslib": "^2.4.1 || ^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/browser/node_modules/@sentry/types": { + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.69.0.tgz", + "integrity": "sha512-zPyCox0mzitzU6SIa1KIbNoJAInYDdUpdiA+PoUmMn2hFMH1llGU/cS7f4w/mAsssTlbtlBi72RMnWUCy578bw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/browser/node_modules/@sentry/utils": { + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.69.0.tgz", + "integrity": "sha512-4eBixe5Y+0EGVU95R4NxH3jkkjtkE4/CmSZD4In8SCkWGSauogePtq6hyiLsZuP1QHdpPb9Kt0+zYiBb2LouBA==", + "dependencies": { + "@sentry/types": "7.69.0", "tslib": "^2.4.1 || ^1.9.3" }, "engines": { @@ -1260,9 +1223,9 @@ } }, "node_modules/@sentry/bundler-plugin-core": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.7.0.tgz", - "integrity": "sha512-ZxJG/DsRXJ9BMaKv+butL3TaiHsuuUy1bNkl56/FCbCt1rYuzltEPT2cBuuveieg66ZWtzerSF17QX3v6svtJQ==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.7.1.tgz", + "integrity": "sha512-ZC/B/7FzzgGpux2t54B2ioXudlq60MHMVPaUeuFzWwxmxiArrV4uBXcp18RMW5ns4biik5WBAD72vbsoloBfIQ==", "dev": true, "dependencies": { "@sentry/cli": "^2.20.1", @@ -1303,9 +1266,9 @@ } }, "node_modules/@sentry/cli": { - "version": "2.20.5", - "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.20.5.tgz", - "integrity": "sha512-ZvWb86eF0QXH9C5Mbi87aUmr8SH848yEpXJmlM2AoBowpE9kKDnewCAKvyXUihojUFwCSEEjoJhrRMMgmCZqXA==", + "version": "2.20.6", + "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.20.6.tgz", + "integrity": "sha512-j4OFbDCIo/dB/uXDmXnRqCbku0KquekSFSG0Wb6RKwkGqpKwFMRauKXZJrgL4as3qIfDX8HrjNRv257QYMwdQA==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -1323,12 +1286,13 @@ } }, "node_modules/@sentry/core": { - "version": "7.64.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.64.0.tgz", - "integrity": "sha512-IzmEyl5sNG7NyEFiyFHEHC+sizsZp9MEw1+RJRLX6U5RITvcsEgcajSkHQFafaBPzRrcxZMdm47Cwhl212LXcw==", + "version": "7.66.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.66.0.tgz", + "integrity": "sha512-WMAEPN86NeCJ1IT48Lqiz4MS5gdDjBwP4M63XP4msZn9aujSf2Qb6My5uT87AJr9zBtgk8MyJsuHr35F0P3q1w==", + "dev": true, "dependencies": { - "@sentry/types": "7.64.0", - "@sentry/utils": "7.64.0", + "@sentry/types": "7.66.0", + "@sentry/utils": "7.66.0", "tslib": "^2.4.1 || ^1.9.3" }, "engines": { @@ -1336,15 +1300,15 @@ } }, "node_modules/@sentry/node": { - "version": "7.64.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.64.0.tgz", - "integrity": "sha512-wRi0uTnp1WSa83X2yLD49tV9QPzGh5e42IKdIDBiQ7lV9JhLILlyb34BZY1pq6p4dp35yDasDrP3C7ubn7wo6A==", + "version": "7.66.0", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.66.0.tgz", + "integrity": "sha512-PxqIqLr4Sh5xcDfECiBQ4PuZ7v8yTgLhaRkruWrZPYxQrcJFPkwbFkw/IskzVnhT2VwXUmeWEIlRMQKBJ0t83A==", "dev": true, "dependencies": { - "@sentry-internal/tracing": "7.64.0", - "@sentry/core": "7.64.0", - "@sentry/types": "7.64.0", - "@sentry/utils": "7.64.0", + "@sentry-internal/tracing": "7.66.0", + "@sentry/core": "7.66.0", + "@sentry/types": "7.66.0", + "@sentry/utils": "7.66.0", "cookie": "^0.4.1", "https-proxy-agent": "^5.0.0", "lru_map": "^0.3.3", @@ -1355,43 +1319,125 @@ } }, "node_modules/@sentry/replay": { - "version": "7.64.0", - "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.64.0.tgz", - "integrity": "sha512-alaMCZDZhaAVmEyiUnszZnvfdbiZx5MmtMTGrlDd7tYq3K5OA9prdLqqlmfIJYBfYtXF3lD0iZFphOZQD+4CIw==", + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.69.0.tgz", + "integrity": "sha512-oUqWyBPFUgShdVvgJtV65EQH9pVDmoYVQMOu59JI6FHVeL3ald7R5Mvz6GaNLXsirvvhp0yAkcAd2hc5Xi6hDw==", "dependencies": { - "@sentry/core": "7.64.0", - "@sentry/types": "7.64.0", - "@sentry/utils": "7.64.0" + "@sentry/core": "7.69.0", + "@sentry/types": "7.69.0", + "@sentry/utils": "7.69.0" }, "engines": { "node": ">=12" } }, + "node_modules/@sentry/replay/node_modules/@sentry/core": { + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.69.0.tgz", + "integrity": "sha512-V6jvK2lS8bhqZDMFUtvwe2XvNstFQf5A+2LMKCNBOV/NN6eSAAd6THwEpginabjet9dHsNRmMk7WNKvrUfQhZw==", + "dependencies": { + "@sentry/types": "7.69.0", + "@sentry/utils": "7.69.0", + "tslib": "^2.4.1 || ^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/replay/node_modules/@sentry/types": { + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.69.0.tgz", + "integrity": "sha512-zPyCox0mzitzU6SIa1KIbNoJAInYDdUpdiA+PoUmMn2hFMH1llGU/cS7f4w/mAsssTlbtlBi72RMnWUCy578bw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/replay/node_modules/@sentry/utils": { + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.69.0.tgz", + "integrity": "sha512-4eBixe5Y+0EGVU95R4NxH3jkkjtkE4/CmSZD4In8SCkWGSauogePtq6hyiLsZuP1QHdpPb9Kt0+zYiBb2LouBA==", + "dependencies": { + "@sentry/types": "7.69.0", + "tslib": "^2.4.1 || ^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/@sentry/tracing": { - "version": "7.64.0", - "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.64.0.tgz", - "integrity": "sha512-Php0XnnJolfxkFdgLlgwgRz3bgHmu/7gDRQaGQHJeDgCCjrmNHI+sHi8zmkWCWSO0Z1mi111n2ZUr9B9YLPBTg==", + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.69.0.tgz", + "integrity": "sha512-nhwJXyLU2KT6ci3YRUCkpFQH7RL9lpEuVDHqaJ9xLql766FJ7A7jKtRGSaefgRzJvvdKHUVboIjZnSvqIu8gWw==", "dependencies": { - "@sentry-internal/tracing": "7.64.0" + "@sentry-internal/tracing": "7.69.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/tracing/node_modules/@sentry-internal/tracing": { + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.69.0.tgz", + "integrity": "sha512-4BgeWZUj9MO6IgfO93C9ocP3+AdngqujF/+zB2rFdUe+y9S6koDyUC7jr9Knds/0Ta72N/0D6PwhgSCpHK8s0Q==", + "dependencies": { + "@sentry/core": "7.69.0", + "@sentry/types": "7.69.0", + "@sentry/utils": "7.69.0", + "tslib": "^2.4.1 || ^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/tracing/node_modules/@sentry/core": { + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.69.0.tgz", + "integrity": "sha512-V6jvK2lS8bhqZDMFUtvwe2XvNstFQf5A+2LMKCNBOV/NN6eSAAd6THwEpginabjet9dHsNRmMk7WNKvrUfQhZw==", + "dependencies": { + "@sentry/types": "7.69.0", + "@sentry/utils": "7.69.0", + "tslib": "^2.4.1 || ^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/tracing/node_modules/@sentry/types": { + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.69.0.tgz", + "integrity": "sha512-zPyCox0mzitzU6SIa1KIbNoJAInYDdUpdiA+PoUmMn2hFMH1llGU/cS7f4w/mAsssTlbtlBi72RMnWUCy578bw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/tracing/node_modules/@sentry/utils": { + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.69.0.tgz", + "integrity": "sha512-4eBixe5Y+0EGVU95R4NxH3jkkjtkE4/CmSZD4In8SCkWGSauogePtq6hyiLsZuP1QHdpPb9Kt0+zYiBb2LouBA==", + "dependencies": { + "@sentry/types": "7.69.0", + "tslib": "^2.4.1 || ^1.9.3" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/types": { - "version": "7.64.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.64.0.tgz", - "integrity": "sha512-LqjQprWXjUFRmzIlUjyA+KL+38elgIYmAeoDrdyNVh8MK5IC1W2Lh1Q87b4yOiZeMiIhIVNBd7Ecoh2rodGrGA==", + "version": "7.66.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.66.0.tgz", + "integrity": "sha512-uUMSoSiar6JhuD8p7ON/Ddp4JYvrVd2RpwXJRPH1A4H4Bd4DVt1mKJy1OLG6HdeQv39XyhB1lPZckKJg4tATPw==", + "dev": true, "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { - "version": "7.64.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.64.0.tgz", - "integrity": "sha512-HRlM1INzK66Gt+F4vCItiwGKAng4gqzCR4C5marsL3qv6SrKH98dQnCGYgXluSWaaa56h97FRQu7TxCk6jkSvQ==", + "version": "7.66.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.66.0.tgz", + "integrity": "sha512-9GYUVgXjK66uXXcLXVMXVzlptqMtq1eJENCuDeezQiEFrNA71KkLDg00wESp+LL+bl3wpVTBApArpbF6UEG5hQ==", + "dev": true, "dependencies": { - "@sentry/types": "7.64.0", + "@sentry/types": "7.66.0", "tslib": "^2.4.1 || ^1.9.3" }, "engines": { @@ -1399,12 +1445,12 @@ } }, "node_modules/@sentry/vite-plugin": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/@sentry/vite-plugin/-/vite-plugin-2.7.0.tgz", - "integrity": "sha512-VDkKneqIV5ESg41iz0ODsTl4BXsd4C/PhLgkjES9TFzDcG9VcnbECCxosXZd7nDZB9EQZDIsKSEc29PzLl1JUQ==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/@sentry/vite-plugin/-/vite-plugin-2.7.1.tgz", + "integrity": "sha512-bZrM06Z+QP/TvPyTYFxpQVugT5rzaFW1jzTnHzUHICz5tgyarY8bhhmYXnI37f6mngkVwDZNAftczbVF2IuFWQ==", "dev": true, "dependencies": { - "@sentry/bundler-plugin-core": "2.7.0", + "@sentry/bundler-plugin-core": "2.7.1", "unplugin": "1.0.1" }, "engines": { @@ -1424,14 +1470,14 @@ } }, "node_modules/@sentry/vue": { - "version": "7.64.0", - "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-7.64.0.tgz", - "integrity": "sha512-GBWdWEK+pTbq3qhF3FYJ1gDK1m2mqIVPT3kMtWNV2qmkhn+iqQ+ud3cT43shWvaHBE/TLZsrD6V20EEqBdnP2w==", - "dependencies": { - "@sentry/browser": "7.64.0", - "@sentry/core": "7.64.0", - "@sentry/types": "7.64.0", - "@sentry/utils": "7.64.0", + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-7.69.0.tgz", + "integrity": "sha512-6AlvC1OkRPCT7m7TdVzqk5NG32vn8mC9rI+ukVJNBwiBe5qLyM5I8uDJUOtPYVHqs1eTZYu91JHKfEhE2OrJOg==", + "dependencies": { + "@sentry/browser": "7.69.0", + "@sentry/core": "7.69.0", + "@sentry/types": "7.69.0", + "@sentry/utils": "7.69.0", "tslib": "^2.4.1 || ^1.9.3" }, "engines": { @@ -1441,6 +1487,39 @@ "vue": "2.x || 3.x" } }, + "node_modules/@sentry/vue/node_modules/@sentry/core": { + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.69.0.tgz", + "integrity": "sha512-V6jvK2lS8bhqZDMFUtvwe2XvNstFQf5A+2LMKCNBOV/NN6eSAAd6THwEpginabjet9dHsNRmMk7WNKvrUfQhZw==", + "dependencies": { + "@sentry/types": "7.69.0", + "@sentry/utils": "7.69.0", + "tslib": "^2.4.1 || ^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/vue/node_modules/@sentry/types": { + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.69.0.tgz", + "integrity": "sha512-zPyCox0mzitzU6SIa1KIbNoJAInYDdUpdiA+PoUmMn2hFMH1llGU/cS7f4w/mAsssTlbtlBi72RMnWUCy578bw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/vue/node_modules/@sentry/utils": { + "version": "7.69.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.69.0.tgz", + "integrity": "sha512-4eBixe5Y+0EGVU95R4NxH3jkkjtkE4/CmSZD4In8SCkWGSauogePtq6hyiLsZuP1QHdpPb9Kt0+zYiBb2LouBA==", + "dependencies": { + "@sentry/types": "7.69.0", + "tslib": "^2.4.1 || ^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/@types/chai": { "version": "4.3.5", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.5.tgz", @@ -1474,9 +1553,9 @@ "dev": true }, "node_modules/@types/linkify-it": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz", - "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.3.tgz", + "integrity": "sha512-pTjcqY9E4nOI55Wgpz7eiI8+LzdYnw3qxXCfHyBDdPbYvbyLgWLJGh8EdPvqawwMK1Uo1794AUkkR38Fr0g+2g==", "dev": true }, "node_modules/@types/mapbox__point-geometry": { @@ -1518,9 +1597,9 @@ "peer": true }, "node_modules/@types/node": { - "version": "16.18.41", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.41.tgz", - "integrity": "sha512-YZJjn+Aaw0xihnpdImxI22jqGbp0DCgTFKRycygjGx/Y27NnWFJa5FJ7P+MRT3u07dogEeMVh70pWpbIQollTA==", + "version": "18.17.16", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.16.tgz", + "integrity": "sha512-e0zgs7qe1XH/X3KEPnldfkD07LH9O1B9T31U8qoO7lqGSjj3/IrBuvqMeJ1aYejXRK3KOphIUDw6pLIplEW17A==", "dev": true }, "node_modules/@types/normalize-package-data": { @@ -1536,9 +1615,9 @@ "integrity": "sha512-EDrLIPaPXOZqDjrkzxxbX7UlJSeQVgah3i0aA4pOSzmK9zq3BIh7/MZIQxED7slJByvKM4Gc6Hypyu2lJzh3SQ==" }, "node_modules/@types/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.1.tgz", + "integrity": "sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==", "dev": true }, "node_modules/@types/sinonjs__fake-timers": { @@ -1582,198 +1661,10 @@ "@types/node": "*" } }, - "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", - "dev": true, - "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/type-utils": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/parser": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", - "dev": true, - "dependencies": { - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "debug": "^4.3.4" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", - "dev": true, - "dependencies": { - "@typescript-eslint/typescript-estree": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "*" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, "node_modules/@vitejs/plugin-vue": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.3.3.tgz", - "integrity": "sha512-ssxyhIAZqB0TrpUg6R0cBpCuMk9jTIlO1GNSKKQD6S8VjnXi6JXKfUXjSsxey9IwQiaRGsO1WnW9Rkl1L6AJVw==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.3.4.tgz", + "integrity": "sha512-ciXNIHKPriERBisHFBvnTbfKa6r9SAesOYXeGDzgegcvy9Q4xdScSHAmKbNT0M3O0S9LKhIf5/G+UYG4NnnzYw==", "dev": true, "engines": { "node": "^14.18.0 || >=16.0.0" @@ -1847,51 +1738,198 @@ "source-map-js": "^1.0.2" } }, - "node_modules/@vue/compiler-ssr": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz", - "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==", + "node_modules/@vue/compiler-ssr": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz", + "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==", + "dependencies": { + "@vue/compiler-dom": "3.3.4", + "@vue/shared": "3.3.4" + } + }, + "node_modules/@vue/devtools-api": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz", + "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==" + }, + "node_modules/@vue/eslint-config-prettier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-8.0.0.tgz", + "integrity": "sha512-55dPqtC4PM/yBjhAr+yEw6+7KzzdkBuLmnhBrDfp4I48+wy+Giqqj9yUr5T2uD/BkBROjjmqnLZmXRdOx/VtQg==", + "dev": true, + "dependencies": { + "eslint-config-prettier": "^8.8.0", + "eslint-plugin-prettier": "^5.0.0" + }, + "peerDependencies": { + "eslint": ">= 8.0.0", + "prettier": ">= 3.0.0" + } + }, + "node_modules/@vue/eslint-config-typescript": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-12.0.0.tgz", + "integrity": "sha512-StxLFet2Qe97T8+7L8pGlhYBBr8Eg05LPuTDVopQV6il+SK6qqom59BA/rcFipUef2jD8P2X44Vd8tMFytfvlg==", + "dev": true, + "dependencies": { + "@typescript-eslint/eslint-plugin": "^6.7.0", + "@typescript-eslint/parser": "^6.7.0", + "vue-eslint-parser": "^9.3.1" + }, + "engines": { + "node": "^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0", + "eslint-plugin-vue": "^9.0.0", + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/eslint-plugin": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.0.tgz", + "integrity": "sha512-gUqtknHm0TDs1LhY12K2NA3Rmlmp88jK9Tx8vGZMfHeNMLE3GH2e9TRub+y+SOjuYgtOmok+wt1AyDPZqxbNag==", + "dev": true, + "dependencies": { + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/type-utils": "6.7.0", + "@typescript-eslint/utils": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", + "debug": "^4.3.4", + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/parser": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.0.tgz", + "integrity": "sha512-jZKYwqNpNm5kzPVP5z1JXAuxjtl2uG+5NpaMocFPTNC2EdYIgbXIPImObOkhbONxtFTTdoZstLZefbaK+wXZng==", + "dev": true, "dependencies": { - "@vue/compiler-dom": "3.3.4", - "@vue/shared": "3.3.4" + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/typescript-estree": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/@vue/devtools-api": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz", - "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==" + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/scope-manager": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz", + "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } }, - "node_modules/@vue/eslint-config-prettier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-8.0.0.tgz", - "integrity": "sha512-55dPqtC4PM/yBjhAr+yEw6+7KzzdkBuLmnhBrDfp4I48+wy+Giqqj9yUr5T2uD/BkBROjjmqnLZmXRdOx/VtQg==", + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/type-utils": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.0.tgz", + "integrity": "sha512-f/QabJgDAlpSz3qduCyQT0Fw7hHpmhOzY/Rv6zO3yO+HVIdPfIWhrQoAyG+uZVtWAIS85zAyzgAFfyEr+MgBpg==", "dev": true, "dependencies": { - "eslint-config-prettier": "^8.8.0", - "eslint-plugin-prettier": "^5.0.0" + "@typescript-eslint/typescript-estree": "6.7.0", + "@typescript-eslint/utils": "6.7.0", + "debug": "^4.3.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": ">= 8.0.0", - "prettier": ">= 3.0.0" + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/@vue/eslint-config-typescript": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.3.tgz", - "integrity": "sha512-dkt6W0PX6H/4Xuxg/BlFj5xHvksjpSlVjtkQCpaYJBIEuKj2hOVU7r+TIe+ysCwRYFz/lGqvklntRkCAibsbPw==", + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/types": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz", + "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==", + "dev": true, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/typescript-estree": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz", + "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==", "dev": true, "dependencies": { - "@typescript-eslint/eslint-plugin": "^5.59.1", - "@typescript-eslint/parser": "^5.59.1", - "vue-eslint-parser": "^9.1.1" + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, - "peerDependencies": { - "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0", - "eslint-plugin-vue": "^9.0.0", - "typescript": "*" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" }, "peerDependenciesMeta": { "typescript": { @@ -1899,10 +1937,52 @@ } } }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/utils": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz", + "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/typescript-estree": "6.7.0", + "semver": "^7.5.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/visitor-keys": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz", + "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.7.0", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, "node_modules/@vue/language-core": { - "version": "1.8.8", - "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-1.8.8.tgz", - "integrity": "sha512-i4KMTuPazf48yMdYoebTkgSOJdFraE4pQf0B+FTOFkbB+6hAfjrSou/UmYWRsWyZV6r4Rc6DDZdI39CJwL0rWw==", + "version": "1.8.11", + "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-1.8.11.tgz", + "integrity": "sha512-+MZOBGqGwfld6hpo0DB47x8eNM0dNqk15ZdfOhj19CpvuYuOWCeVdOEGZunKDyo3QLkTn3kLOSysJzg7FDOQBA==", "dev": true, "dependencies": { "@volar/language-core": "~1.10.0", @@ -2010,23 +2090,23 @@ "dev": true }, "node_modules/@vue/typescript": { - "version": "1.8.8", - "resolved": "https://registry.npmjs.org/@vue/typescript/-/typescript-1.8.8.tgz", - "integrity": "sha512-jUnmMB6egu5wl342eaUH236v8tdcEPXXkPgj+eI/F6JwW/lb+yAU6U07ZbQ3MVabZRlupIlPESB7ajgAGixhow==", + "version": "1.8.11", + "resolved": "https://registry.npmjs.org/@vue/typescript/-/typescript-1.8.11.tgz", + "integrity": "sha512-skUmMDiPUUtu1flPmf2YybF+PX8IzBtMioQOaNn6Ck/RhdrPJGj1AX/7s3Buf9G6ln+/KHR1XQuti/FFxw5XVA==", "dev": true, "dependencies": { "@volar/typescript": "~1.10.0", - "@vue/language-core": "1.8.8" + "@vue/language-core": "1.8.11" } }, "node_modules/@vueuse/core": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.3.0.tgz", - "integrity": "sha512-BEM5yxcFKb5btFjTSAFjTu5jmwoW66fyV9uJIP4wUXXU8aR5Hl44gndaaXp7dC5HSObmgbnR2RN+Un1p68Mf5Q==", + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.4.1.tgz", + "integrity": "sha512-DkHIfMIoSIBjMgRRvdIvxsyboRZQmImofLyOHADqiVbQVilP8VVHDhBX2ZqoItOgu7dWa8oXiNnScOdPLhdEXg==", "dependencies": { "@types/web-bluetooth": "^0.0.17", - "@vueuse/metadata": "10.3.0", - "@vueuse/shared": "10.3.0", + "@vueuse/metadata": "10.4.1", + "@vueuse/shared": "10.4.1", "vue-demi": ">=0.14.5" }, "funding": { @@ -2034,9 +2114,9 @@ } }, "node_modules/@vueuse/core/node_modules/vue-demi": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.5.tgz", - "integrity": "sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==", + "version": "0.14.6", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz", + "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==", "hasInstallScript": true, "bin": { "vue-demi-fix": "bin/vue-demi-fix.js", @@ -2059,17 +2139,17 @@ } }, "node_modules/@vueuse/metadata": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.3.0.tgz", - "integrity": "sha512-Ema3YhNOa4swDsV0V7CEY5JXvK19JI/o1szFO1iWxdFg3vhdFtCtSTP26PCvbUpnUtNHBY2wx5y3WDXND5Pvnw==", + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.4.1.tgz", + "integrity": "sha512-2Sc8X+iVzeuMGHr6O2j4gv/zxvQGGOYETYXEc41h0iZXIRnRbJZGmY/QP8dvzqUelf8vg0p/yEA5VpCEu+WpZg==", "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/@vueuse/shared": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.3.0.tgz", - "integrity": "sha512-kGqCTEuFPMK4+fNWy6dUOiYmxGcUbtznMwBZLC1PubidF4VZY05B+Oht7Jh7/6x4VOWGpvu3R37WHi81cKpiqg==", + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.4.1.tgz", + "integrity": "sha512-vz5hbAM4qA0lDKmcr2y3pPdU+2EVw/yzfRsBdu+6+USGa4PxqSQRYIUC9/NcT06y+ZgaTsyURw2I9qOFaaXHAg==", "dependencies": { "vue-demi": ">=0.14.5" }, @@ -2078,9 +2158,9 @@ } }, "node_modules/@vueuse/shared/node_modules/vue-demi": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.5.tgz", - "integrity": "sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==", + "version": "0.14.6", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz", + "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==", "hasInstallScript": true, "bin": { "vue-demi-fix": "bin/vue-demi-fix.js", @@ -2802,9 +2882,9 @@ "dev": true }, "node_modules/chai": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz", - "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==", + "version": "4.3.8", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.8.tgz", + "integrity": "sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ==", "dev": true, "dependencies": { "assertion-error": "^1.1.0", @@ -3063,15 +3143,15 @@ "dev": true }, "node_modules/cosmiconfig": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz", - "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==", + "version": "8.3.3", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.3.tgz", + "integrity": "sha512-/VY+0IvFoE47hwgKHu8feeBFIb1Z1mcJFiLrNwaJpLoLa9qwLVquMGMr2OUwQmhpJDtsSQSasg/TMv1imec9xA==", "dev": true, "peer": true, "dependencies": { - "import-fresh": "^3.2.1", + "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", - "parse-json": "^5.0.0", + "parse-json": "^5.2.0", "path-type": "^4.0.0" }, "engines": { @@ -3079,6 +3159,14 @@ }, "funding": { "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, "node_modules/cosmiconfig/node_modules/parse-json": { @@ -3162,15 +3250,15 @@ "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" }, "node_modules/cypress": { - "version": "12.17.4", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz", - "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz", + "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "2.88.12", + "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", - "@types/node": "^16.18.39", + "@types/node": "^18.17.5", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", @@ -3216,7 +3304,7 @@ "cypress": "bin/cypress" }, "engines": { - "node": "^14.0.0 || ^16.0.0 || >=18.0.0" + "node": "^16.0.0 || ^18.0.0 || >=20.0.0" } }, "node_modules/cypress/node_modules/proxy-from-env": { @@ -3782,16 +3870,16 @@ } }, "node_modules/eslint": { - "version": "8.47.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz", - "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==", + "version": "8.49.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz", + "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "^8.47.0", - "@humanwhocodes/config-array": "^0.11.10", + "@eslint/js": "8.49.0", + "@humanwhocodes/config-array": "^0.11.11", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "ajv": "^6.12.4", @@ -3897,52 +3985,6 @@ "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/eslint-scope/node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/eslint-visitor-keys": { "version": "3.4.3", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", @@ -4280,16 +4322,17 @@ } }, "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz", + "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==", "dev": true, "dependencies": { - "flatted": "^3.1.0", + "flatted": "^3.2.7", + "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=12.0.0" } }, "node_modules/flatted": { @@ -4358,9 +4401,9 @@ "dev": true }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, "optional": true, @@ -4378,15 +4421,15 @@ "dev": true }, "node_modules/function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" }, "engines": { "node": ">= 0.4" @@ -4898,9 +4941,9 @@ } }, "node_modules/immutable": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.2.tgz", - "integrity": "sha512-oGXzbEDem9OOpDWZu88jGiYCvIsLHMvGw+8OXlpsvTFvIQplQbjg1B1cvKg8f7Hoch6+NGjpPsH1Fr+Mc2D1aA==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz", + "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==", "dev": true }, "node_modules/import-fresh": { @@ -5460,6 +5503,12 @@ "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==", "dev": true }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "node_modules/json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -5515,63 +5564,21 @@ } }, "node_modules/jsonc-eslint-parser": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsonc-eslint-parser/-/jsonc-eslint-parser-1.4.1.tgz", - "integrity": "sha512-hXBrvsR1rdjmB2kQmUjf1rEIa+TqHBGMge8pwi++C+Si1ad7EjZrJcpgwym+QGK/pqTx+K7keFAtLlVNdLRJOg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/jsonc-eslint-parser/-/jsonc-eslint-parser-2.3.0.tgz", + "integrity": "sha512-9xZPKVYp9DxnM3sd1yAsh/d59iIaswDkai8oTxbursfKYbg/ibjX0IzFt35+VZ8iEW453TVTXztnRvYUQlAfUQ==", "dev": true, "dependencies": { - "acorn": "^7.4.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^1.3.0", - "espree": "^6.0.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/jsonc-eslint-parser/node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true, - "bin": { - "acorn": "bin/acorn" + "acorn": "^8.5.0", + "eslint-visitor-keys": "^3.0.0", + "espree": "^9.0.0", + "semver": "^7.3.5" }, "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/jsonc-eslint-parser/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/jsonc-eslint-parser/node_modules/espree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", - "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", - "dev": true, - "dependencies": { - "acorn": "^7.1.1", - "acorn-jsx": "^5.2.0", - "eslint-visitor-keys": "^1.1.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/jsonc-eslint-parser/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + "funding": { + "url": "https://github.com/sponsors/ota-meshi" } }, "node_modules/jsonc-parser": { @@ -5612,6 +5619,15 @@ "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz", "integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==" }, + "node_modules/keyv": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz", + "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -5633,8 +5649,7 @@ "version": "0.28.0", "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.28.0.tgz", "integrity": "sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/lazy-ass": { "version": "1.6.0", @@ -5867,9 +5882,9 @@ } }, "node_modules/magic-string": { - "version": "0.30.2", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.2.tgz", - "integrity": "sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==", + "version": "0.30.3", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.3.tgz", + "integrity": "sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==", "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" }, @@ -5891,9 +5906,9 @@ } }, "node_modules/maplibre-gl": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-3.3.0.tgz", - "integrity": "sha512-LDia3b8u2S8qtl50n8TYJM0IPLzfc01KDc71LNuydvDiEXAGBI5togty+juVtUipRZZjs4dAW6xhgrabc6lIgw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-3.3.1.tgz", + "integrity": "sha512-SfRq9bT68GytDzCOG0IoTGg2rASbgdYunW/6xhnp55QuLmwG1M/YOlXxqHaphwia7kZbMvBOocvY0fp5yfTjZA==", "dependencies": { "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", @@ -6173,15 +6188,15 @@ } }, "node_modules/mlly": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.0.tgz", - "integrity": "sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.1.tgz", + "integrity": "sha512-SCDs78Q2o09jiZiE2WziwVBEqXQ02XkGdUy45cbJf+BpYRIjArXRJ1Wbowxkb+NaM9DWvS3UC9GiO/6eqvQ/pg==", "dev": true, "dependencies": { - "acorn": "^8.9.0", + "acorn": "^8.10.0", "pathe": "^1.1.1", "pkg-types": "^1.0.3", - "ufo": "^1.1.2" + "ufo": "^1.3.0" } }, "node_modules/ms": { @@ -6234,12 +6249,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node_modules/natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, "node_modules/nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -6247,9 +6256,9 @@ "dev": true }, "node_modules/node-fetch": { - "version": "2.6.13", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.13.tgz", - "integrity": "sha512-StxNAxh15zr77QvvkmveSQ8uCQ4+v5FkvNTj0OESmiHu+VRi/gXArXtkWMElOsOUNLtUEvI4yS+rdtOHZTwlQA==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dev": true, "dependencies": { "whatwg-url": "^5.0.0" @@ -6833,9 +6842,9 @@ } }, "node_modules/pinia/node_modules/vue-demi": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.5.tgz", - "integrity": "sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==", + "version": "0.14.6", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz", + "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==", "hasInstallScript": true, "bin": { "vue-demi-fix": "bin/vue-demi-fix.js", @@ -6869,9 +6878,9 @@ } }, "node_modules/postcss": { - "version": "8.4.28", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz", - "integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==", + "version": "8.4.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz", + "integrity": "sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==", "funding": [ { "type": "opencollective", @@ -6958,9 +6967,9 @@ } }, "node_modules/prettier": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.2.tgz", - "integrity": "sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -7460,9 +7469,9 @@ } }, "node_modules/rollup": { - "version": "3.28.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.28.0.tgz", - "integrity": "sha512-d7zhvo1OUY2SXSM6pfNjgD5+d0Nz87CUp4mt8l/GgVP3oBsPwzNvSzyu1me6BSG9JIgWNTVcafIXBIyM8yQ3yw==", + "version": "3.28.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.28.1.tgz", + "integrity": "sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -7630,9 +7639,9 @@ "dev": true }, "node_modules/sass": { - "version": "1.66.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.1.tgz", - "integrity": "sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.67.0.tgz", + "integrity": "sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -8178,11 +8187,12 @@ } }, "node_modules/stylelint-scss": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-5.1.0.tgz", - "integrity": "sha512-E+KlQFXv1Euha43qw3q+wKBSli557wxbbo6/39DWhRNXlUa9Cz+FYrcgz+PT6ag0l6UisCYjAGCNhoSl4FcwlA==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-5.2.1.tgz", + "integrity": "sha512-ZoTJUM85/qqpQHfEppjW/St//8s6p9Qsg8deWlYlr56F9iUgC9vXeIDQvH4odkRRJLTLFQzYMALSOFCQ3MDkgw==", "dev": true, "dependencies": { + "known-css-properties": "^0.28.0", "postcss-media-query-parser": "^0.2.3", "postcss-resolve-nested-selector": "^0.1.1", "postcss-selector-parser": "^6.0.13", @@ -8279,9 +8289,9 @@ "peer": true }, "node_modules/swagger-ui-dist": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.4.2.tgz", - "integrity": "sha512-vT5QxP/NOr9m4gLZl+SpavWI3M9Fdh30+Sdw9rEtZbkqNmNNEPhjXas2xTD9rsJYYdLzAiMfwXvtooWH3xbLJA==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.7.2.tgz", + "integrity": "sha512-mVZc9QVQ6pTCV5crli3+Ng+DoMPwdtMHK8QLk2oX8Mtamp4D/hV+uYdC3lV0JZrDgpNEcjs0RrWTqMwwosuLPQ==" }, "node_modules/swaggerdark": { "version": "1.0.0", @@ -8490,31 +8500,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" - }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "node_modules/ts-api-utils": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz", + "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==", "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, "engines": { - "node": ">= 6" + "node": ">=16.13.0" }, "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + "typescript": ">=4.2.0" } }, - "node_modules/tsutils/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/tunnel-agent": { "version": "0.6.0", @@ -8633,9 +8634,9 @@ } }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "devOptional": true, "bin": { "tsc": "bin/tsc", @@ -8665,9 +8666,9 @@ "dev": true }, "node_modules/ufo": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.2.0.tgz", - "integrity": "sha512-RsPyTbqORDNDxqAdQPQBpgqhWle1VcTSou/FraClYlHf6TZnQcGslpLcAphNR+sQW4q5lLWLbOsRlh9j24baQg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.0.tgz", + "integrity": "sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==", "dev": true }, "node_modules/unbox-primitive": { @@ -8994,18 +8995,17 @@ } }, "node_modules/vue-i18n": { - "version": "9.3.0-beta.14-77e850b", - "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.3.0-beta.14-77e850b.tgz", - "integrity": "sha512-Zjkzm7ZYhLfssuwSgJI9jq1agex7kPl7gEI18pw23+eWUisqy3q20lPP2xDFLmzhUYb3AoaDifj5z4U6+cvhHA==", + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.4.1.tgz", + "integrity": "sha512-vnQyYE9LBuNOqPpETIcCaGnAyLEqfeIvDcyZ9T+WBCWFTqWw1J8FuF1jfeDwpHBi5JKgAwgXyq1mt8jp/x/GPA==", "dev": true, "dependencies": { - "@intlify/core-base": "9.3.0-beta.14-77e850b", - "@intlify/shared": "9.3.0-beta.14-77e850b", - "@intlify/vue-devtools": "9.3.0-beta.14-77e850b", - "@vue/devtools-api": "^6.2.1" + "@intlify/core-base": "9.4.1", + "@intlify/shared": "9.4.1", + "@vue/devtools-api": "^6.5.0" }, "engines": { - "node": ">= 14" + "node": ">= 16" }, "funding": { "url": "https://github.com/sponsors/kazupon" @@ -9014,18 +9014,6 @@ "vue": "^3.0.0" } }, - "node_modules/vue-i18n/node_modules/@intlify/shared": { - "version": "9.3.0-beta.14-77e850b", - "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.3.0-beta.14-77e850b.tgz", - "integrity": "sha512-aHZYRM0sJN+YSUnoC5Dv4L1TFYtP23kdTkrK5cHSEqUbI5UXc8FbnXPal0lJliMhO0ED7Ic7aEOeQX84BM3xCQ==", - "dev": true, - "engines": { - "node": ">= 14" - }, - "funding": { - "url": "https://github.com/sponsors/kazupon" - } - }, "node_modules/vue-router": { "version": "4.2.4", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.4.tgz", @@ -9051,13 +9039,13 @@ } }, "node_modules/vue-tsc": { - "version": "1.8.8", - "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.8.8.tgz", - "integrity": "sha512-bSydNFQsF7AMvwWsRXD7cBIXaNs/KSjvzWLymq/UtKE36697sboX4EccSHFVxvgdBlI1frYPc/VMKJNB7DFeDQ==", + "version": "1.8.11", + "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.8.11.tgz", + "integrity": "sha512-BzfiMdPqDHBlysx4g26NkfVHSQwGD/lTRausmxN9sFyjXz34OWfsbkh0YsVkX84Hu65In1fFlxHiG39Tr4Vojg==", "dev": true, "dependencies": { - "@vue/language-core": "1.8.8", - "@vue/typescript": "1.8.8", + "@vue/language-core": "1.8.11", + "@vue/typescript": "1.8.11", "semver": "^7.3.8" }, "bin": { @@ -9104,9 +9092,9 @@ } }, "node_modules/whatwg-fetch": { - "version": "3.6.17", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.17.tgz", - "integrity": "sha512-c4ghIvG6th0eudYwKZY5keb81wtFz9/WeAHAoy8+r18kcWlitUIrmGFQ2rWEl4UCKUilD3zCLHOIPheHx5ypRQ==", + "version": "3.6.18", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.18.tgz", + "integrity": "sha512-ltN7j66EneWn5TFDO4L9inYC1D+Czsxlrw2SalgjMmEMkLfA5SIZxEFdE6QtHFiiM6Q7WL32c7AkI3w6yxM84Q==", "dev": true }, "node_modules/whatwg-mimetype": { @@ -9250,32 +9238,29 @@ "dev": true }, "node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz", + "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==", "dev": true, "engines": { - "node": ">= 6" + "node": ">= 14" } }, "node_modules/yaml-eslint-parser": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/yaml-eslint-parser/-/yaml-eslint-parser-0.3.2.tgz", - "integrity": "sha512-32kYO6kJUuZzqte82t4M/gB6/+11WAuHiEnK7FreMo20xsCKPeFH5tDBU7iWxR7zeJpNnMXfJyXwne48D0hGrg==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/yaml-eslint-parser/-/yaml-eslint-parser-1.2.2.tgz", + "integrity": "sha512-pEwzfsKbTrB8G3xc/sN7aw1v6A6c/pKxLAkjclnAyo5g5qOh6eL9WGu0o3cSDQZKrTNk4KL4lQSwZW+nBkANEg==", "dev": true, "dependencies": { - "eslint-visitor-keys": "^1.3.0", - "lodash": "^4.17.20", - "yaml": "^1.10.0" - } - }, - "node_modules/yaml-eslint-parser/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, + "eslint-visitor-keys": "^3.0.0", + "lodash": "^4.17.21", + "yaml": "^2.0.0" + }, "engines": { - "node": ">=4" + "node": "^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ota-meshi" } }, "node_modules/yargs-parser": { diff --git a/webclient/package.json b/webclient/package.json index dfce2d168..19c13d8e7 100644 --- a/webclient/package.json +++ b/webclient/package.json @@ -15,41 +15,41 @@ "format": "prettier --write ." }, "dependencies": { - "@sentry/tracing": "7.64.0", - "@sentry/vue": "7.64.0", - "@vueuse/core": "10.3.0", - "maplibre-gl": "3.3.0", + "@sentry/tracing": "7.69.0", + "@sentry/vue": "7.69.0", + "@vueuse/core": "10.4.1", + "maplibre-gl": "3.3.1", "pinia": "2.1.6", "spectre.css": "github:Valexr/spectre#dfe3bc2c59d23cd4bfd43c690aae3655576ff708", - "swagger-ui-dist": "5.4.2", + "swagger-ui-dist": "5.7.2", "swaggerdark": "github:octycs/SwaggerDark#f02d394c8ff698cdd93e09c2188b058d2d686ca3", "vue": "3.3.4", "vue-router": "4.2.4" }, "devDependencies": { - "@intlify/unplugin-vue-i18n": "0.12.3", - "@rushstack/eslint-patch": "1.3.3", - "@sentry/vite-plugin": "2.7.0", + "@intlify/unplugin-vue-i18n": "1.2.0", + "@rushstack/eslint-patch": "1.4.0", + "@sentry/vite-plugin": "2.7.1", "@types/swagger-ui-dist": "3.30.1", - "@vitejs/plugin-vue": "4.3.3", + "@vitejs/plugin-vue": "4.3.4", "@vue/eslint-config-prettier": "8.0.0", - "@vue/eslint-config-typescript": "11.0.3", + "@vue/eslint-config-typescript": "12.0.0", "@vue/tsconfig": "0.4.0", "@yankeeinlondon/link-builder": "1.2.1", - "cypress": "12.17.4", - "eslint": "8.47.0", + "cypress": "13.2.0", + "eslint": "8.49.0", "eslint-plugin-vue": "9.17.0", "isomorphic-fetch": "3.0.0", "npm-run-all": "4.1.5", - "prettier": "3.0.2", - "sass": "1.66.1", - "stylelint-scss": "5.1.0", - "typescript": "5.1.6", + "prettier": "3.0.3", + "sass": "1.67.0", + "stylelint-scss": "5.2.1", + "typescript": "5.2.2", "vite": "4.4.9", "vite-plugin-md": "0.21.5", "vite-plugin-rewrite-all": "1.0.1", - "vue-i18n": "9.3.0-beta.14-77e850b", - "vue-tsc": "1.8.8" + "vue-i18n": "9.4.1", + "vue-tsc": "1.8.11" }, "type": "module" } diff --git a/webclient/src/components/I18nT.ts b/webclient/src/components/I18nT.ts deleted file mode 100644 index 114a0f267..000000000 --- a/webclient/src/components/I18nT.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { defineComponent } from "vue"; -import { Translation } from "vue-i18n"; - -export default defineComponent(Translation); diff --git a/webclient/src/components/feedback/TokenBasedModal.vue b/webclient/src/components/feedback/TokenBasedModal.vue index ae944adfe..68cd51652 100644 --- a/webclient/src/components/feedback/TokenBasedModal.vue +++ b/webclient/src/components/feedback/TokenBasedModal.vue @@ -2,7 +2,6 @@ import { useGlobalStore } from "@/stores/global"; import { ref } from "vue"; import { useI18n } from "vue-i18n"; -import I18nT from "@/components/I18nT"; import { useFeedbackToken } from "@/composables/feedbackToken"; const { t } = useI18n({ inheritLocale: true, useScope: "global" }); diff --git a/webclient/src/i18n.d.ts b/webclient/src/i18n.d.ts deleted file mode 100644 index 8bddead6b..000000000 --- a/webclient/src/i18n.d.ts +++ /dev/null @@ -1,44 +0,0 @@ -import type { Path } from "@intlify/core-base"; -import type { TranslateOptions, DateTimeOptions, IsNever, IsEmptyObject, PickupPaths } from "@intlify/core-base"; -import type { DefineLocaleMessage, RemovedIndexResources } from "vue-i18n-core/src/composer"; - -declare module "vue" { - export interface ComponentCustomProperties { - /** - * Datetime formatting - * - * @param value - A value, timestamp number or `Date` instance - * @param options - An options, see the {@link DateTimeOptions} - * - * @returns formatted value - */ - $d(value: number | Date, options?: DateTimeOptions): string; - - /** - * Locale message translation - * - * @param key - A target locale message key - * @param plural - Which plural string to get. 1 returns the first one. - * @param options - An options, see the {@link TranslateOptions} - * - * @returns translation message - */ - $t< - Key extends string, - DefinedLocaleMessage extends - RemovedIndexResources = RemovedIndexResources, - Keys = IsEmptyObject extends false - ? PickupPaths<{ - [K in keyof DefinedLocaleMessage]: DefinedLocaleMessage[K]; - }> - : never, - ResourceKeys extends Keys = IsNever extends false ? Keys : never, - >( - key: Key | ResourceKeys | Path, - plural?: number, - options?: TranslateOptions, - ): string; - } -} - -export {};