feat: update to node 22

refactor: remove deprecated @ionic-native/core (replaced by
@awesome-cordova-plugins/core)

.gitlab-ci.yml

@@ -30,13 +30,11 @@ variables:
     description: Bypass turbo cache
 
 default:
-  image: registry.gitlab.com/openstapps/openstapps/node-builder
+  image: registry.gitlab.com/openstapps/openstapps/node-builder:node-22
   tags:
     - saas-linux-xlarge-amd64
   interruptible: true
   before_script:
-    - corepack enable
-    - corepack prepare pnpm@latest-8 --activate
     - echo TURBO_API=$TURBO_API >> .env.local
     - echo TURBO_TOKEN=$TURBO_TOKEN >> .env.local
     - echo TURBO_TEAM=$TURBO_TEAM >> .env.local
@@ -101,7 +99,7 @@ stop review:
   rules: *deploy-rules
 
 unit:
-  image: registry.gitlab.com/openstapps/openstapps/app-builder
+  image: registry.gitlab.com/openstapps/openstapps/app-builder:node-22
   stage: test
   needs: ['build']
   script:

.syncpackrc.cjs

@@ -2,7 +2,13 @@
 
 /** @type {import('syncpack').RcFile} */
 const config = {
-  semverGroups: [{range: ''}],
+  semverGroups: [
+    {
+      range: '',
+      dependencies: ['**'],
+      packages: ['**'],
+    }
+  ],
   source: ['package.json', '**/package.json'],
   indent: '  ',
   sortFirst: [
@@ -21,6 +27,7 @@ const config = {
     'bin',
     'files',
     'engines',
+    'packageManager',
     'scripts',
     'dependencies',
     'devDependencies',

.tool-versions

@@ -1,3 +1,3 @@
-nodejs 18.19.1
-pnpm 8.15.4
-python 3.11.5
+nodejs 22.2.0
+pnpm 8.15.5
+python 3.11.5

backend/backend/.gitlab-ci.yml

@@ -1,5 +1,5 @@
 integration:
-  image: registry.gitlab.com/openstapps/openstapps/node-builder
+  image: registry.gitlab.com/openstapps/openstapps/node-builder:node-22
   stage: test
   needs: ['build']
   variables:

backend/backend/config/f-u/version-history/2.5.0.de.md

@@ -0,0 +1,15 @@
+# Goethe-Uni App 2.5
+
+Die Goethe-Uni App ist noch besser geworden!
+
+## Komplett neue Kartenansicht
+
+Wir haben die Karte überarbeitet, um eine klarere und schnellere Übersicht zu bieten.
+
+## Deutschlandticket mit an Bord
+
+Wenn du das Upgrade des Semesterticket zum Deutschlandticket gemacht hast und eingeloggt bist, findet es sich jetzt auch in der App.
+
+## Bibliotheksdienste sind wieder voll funktionsfähig
+
+Aufgrund einiger Adhoc-Änderungen im Bibliothekssystem haben wir die App so angepasst, dass sie damit umgehen kann.

backend/backend/config/f-u/version-history/2.5.0.en.md

@@ -0,0 +1,15 @@
+# Goethe-Uni App 2.5
+
+The Goethe-Uni App got even better!
+
+## Completelty new map view
+
+We overhauled the map to offer you a clearer and faster and overview.
+
+## Deutschlandticket included
+
+If you upgraded your Semesterticket to a Deutschlandticket it will now reside in the App if you are logged in.
+
+## Library services are fully functional again
+
+Due to some adhoc changes in the library system we adjusted the app to handle them properly.

backend/backend/src/storage/database.ts

@@ -13,15 +13,34 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import {SCConfigFile, SCSearchQuery, SCSearchResponse, SCThings, SCUuid} from '@openstapps/core';
+import {
+  SCConfigFile,
+  SCPlace,
+  SCPlaceWithoutReferences,
+  SCSearchQuery,
+  SCSearchResponse,
+  SCThingWithCategoriesWithoutReferences,
+  SCThings,
+  SCUuid,
+} from '@openstapps/core';
 import {MailQueue} from '../notification/mail-queue.js';
 import {Bulk} from './bulk-storage.js';
+import {FeatureCollection, Point, Polygon} from 'geojson';
 
 /**
  * Creates an instance of a database
  */
 export type DatabaseConstructor = new (config: SCConfigFile, mailQueue?: MailQueue) => Database;
 
+export type SupplementaryGeoJSON = FeatureCollection<Point | Polygon, SupplementaryGeoJSONThing>;
+export type SupplementaryGeoJSONThing = Pick<
+  Extract<SCThings, SCPlace>,
+  Exclude<
+    keyof SCPlaceWithoutReferences | keyof SCThingWithCategoriesWithoutReferences<never, never>,
+    'geo' | 'origin' | 'translations'
+  >
+>;
+
 /**
  * Defines what one database class needs to have defined
  */
@@ -82,4 +101,9 @@ export interface Database {
    * @param params Parameters which form a search query to search the backend data
    */
   search(parameters: SCSearchQuery): Promise<SCSearchResponse>;
+
+  /**
+   * Get geo info for display on a map
+   */
+  geo(): Promise<SupplementaryGeoJSON>;
 }

backend/backend/src/storage/elasticsearch/elasticsearch.ts

@@ -26,7 +26,7 @@ import {Logger} from '@openstapps/logger';
 import moment from 'moment';
 import {MailQueue} from '../../notification/mail-queue.js';
 import {Bulk} from '../bulk-storage.js';
-import {Database} from '../database.js';
+import {Database, SupplementaryGeoJSON, SupplementaryGeoJSONThing} from '../database.js';
 import {parseAggregations} from './aggregations.js';
 import * as Monitoring from './monitoring.js';
 import {buildQuery} from './query/query.js';
@@ -46,6 +46,7 @@ import {
 } from './util/index.js';
 import {noUndefined} from './util/no-undefined.js';
 import {retryCatch, RetryOptions} from './util/retry.js';
+import {Feature, Point, Polygon} from 'geojson';
 
 /**
  * A database interface for elasticsearch
@@ -405,4 +406,49 @@ export class Elasticsearch implements Database {
       },
     };
   }
+
+  async geo(): Promise<SupplementaryGeoJSON> {
+    const searchResponse = await this.client.search<Extract<SCThings, {geo: unknown}>>({
+      body: {
+        query: {
+          exists: {
+            field: 'geo',
+          },
+        },
+      },
+      from: 0,
+      allow_no_indices: true,
+      index: ACTIVE_INDICES_ALIAS,
+      size: 1,
+    });
+
+    return {
+      type: 'FeatureCollection',
+      features: searchResponse.hits.hits
+        .map(thing => {
+          return thing._source?.geo
+            ? ({
+                id: Number(thing._source.identifiers?.['OSM']) || undefined,
+                type: 'Feature',
+                geometry: thing._source.geo.polygon ?? thing._source.geo.point,
+                properties: {
+                  name: thing._source.name,
+                  sameAs: thing._source.sameAs,
+                  image: thing._source.image,
+                  alternateNames: thing._source.alternateNames,
+                  description: thing._source.description,
+                  identifiers: thing._source.identifiers,
+                  categories: thing._source.categories,
+                  categorySpecificValues: thing._source.categorySpecificValues,
+                  openingHours: thing._source.openingHours,
+                  address: thing._source.address,
+                  uid: thing._source.uid,
+                  type: thing._source.type,
+                },
+              } satisfies Feature<Polygon | Point, SupplementaryGeoJSONThing>)
+            : undefined;
+        })
+        .filter(noUndefined),
+    };
+  }
 }

backend/backend/src/storage/elasticsearch/query/filters/geo.ts

@@ -19,14 +19,29 @@ import {QueryDslSpecificQueryContainer} from '../../types/util.js';
  * Converts a geo filter to elasticsearch syntax
  * @param filter A search filter for the retrieval of the data
  */
-export function buildGeoFilter(filter: SCGeoFilter): QueryDslSpecificQueryContainer<'geo_shape'> {
+export function buildGeoFilter(filter: SCGeoFilter): QueryDslSpecificQueryContainer<'bool'> {
   return {
-    geo_shape: {
-      ignore_unmapped: true,
-      [`${filter.arguments.field}.polygon`]: {
-        shape: filter.arguments.shape,
-        relation: filter.arguments.spatialRelation,
-      },
+    bool: {
+      should: [
+        {
+          geo_shape: {
+            ignore_unmapped: true,
+            [`${filter.arguments.field}.polygon`]: {
+              shape: filter.arguments.shape,
+              relation: filter.arguments.spatialRelation,
+            },
+          },
+        } satisfies QueryDslSpecificQueryContainer<'geo_shape'>,
+        {
+          geo_shape: {
+            ignore_unmapped: true,
+            [`${filter.arguments.field}.point`]: {
+              shape: filter.arguments.shape,
+              relation: filter.arguments.spatialRelation,
+            },
+          },
+        } satisfies QueryDslSpecificQueryContainer<'geo_shape'>,
+      ],
     },
   };
 }

backend/backend/test/common.ts

@@ -22,7 +22,7 @@ import http from 'http';
 import {MailQueue} from '../src/notification/mail-queue.js';
 import {Bulk, BulkStorage} from '../src/storage/bulk-storage.js';
 import getPort from 'get-port';
-import {Database} from '../src/storage/database.js';
+import {Database, SupplementaryGeoJSON} from '../src/storage/database.js';
 import {v4} from 'uuid';
 import {backendConfig} from '../src/config.js';
 import {getIndexUID} from '../src/storage/elasticsearch/util/index.js';
@@ -58,7 +58,6 @@ export async function startApp(): Promise<Express> {
  * An elasticsearch mock
  */
 export class ElasticsearchMock implements Database {
-  // @ts-expect-error never read
   private bulk: Bulk | undefined;
 
   private storageMock = new Map<string, SCThings>();
@@ -67,6 +66,10 @@ export class ElasticsearchMock implements Database {
     // Nothing to do here
   }
 
+  geo(): Promise<SupplementaryGeoJSON> {
+    throw new Error('Method not implemented.');
+  }
+
   bulkCreated(bulk: Bulk): Promise<void> {
     this.bulk = bulk;
     return Promise.resolve(undefined);

backend/backend/test/routes/search-route.spec.ts

@@ -44,7 +44,6 @@ describe('Search route', async function () {
   });
 
   it('should reject GET, PUT with a valid search query', async function () {
-    // const expectedParams = JSON.parse(JSON.stringify(defaultParams));
     const {status} = await testApp.get('/search').set('Accept', 'application/json').send({
       query: 'Some search terms',
     });

backend/backend/test/storage/elasticsearch/query.spec.ts

@@ -479,18 +479,39 @@ describe('Query', function () {
     it('should build geo filter for shapes and points', function () {
       const filter = buildFilter(searchFilters.geoPoint);
       const expectedFilter = {
-        geo_shape: {
-          'geo.polygon': {
-            relation: undefined,
-            shape: {
-              type: 'envelope',
-              coordinates: [
-                [50.123, 8.123],
-                [50.123, 8.123],
-              ],
+        bool: {
+          should: [
+            {
+              geo_shape: {
+                'geo.polygon': {
+                  relation: undefined,
+                  shape: {
+                    coordinates: [
+                      [50.123, 8.123],
+                      [50.123, 8.123],
+                    ],
+                    type: 'envelope',
+                  },
+                },
+                'ignore_unmapped': true,
+              },
             },
-          },
-          'ignore_unmapped': true,
+            {
+              geo_shape: {
+                'geo.point': {
+                  relation: undefined,
+                  shape: {
+                    coordinates: [
+                      [50.123, 8.123],
+                      [50.123, 8.123],
+                    ],
+                    type: 'envelope',
+                  },
+                },
+                'ignore_unmapped': true,
+              },
+            },
+          ],
         },
       };
 
@@ -500,18 +521,39 @@ describe('Query', function () {
     it('should build geo filter for shapes only', function () {
       const filter = buildFilter(searchFilters.geoShape);
       const expectedFilter = {
-        geo_shape: {
-          'geo.polygon': {
-            relation: 'contains',
-            shape: {
-              type: 'envelope',
-              coordinates: [
-                [50.123, 8.123],
-                [50.123, 8.123],
-              ],
+        bool: {
+          should: [
+            {
+              geo_shape: {
+                'geo.polygon': {
+                  relation: 'contains',
+                  shape: {
+                    coordinates: [
+                      [50.123, 8.123],
+                      [50.123, 8.123],
+                    ],
+                    type: 'envelope',
+                  },
+                },
+                'ignore_unmapped': true,
+              },
             },
-          },
-          'ignore_unmapped': true,
+            {
+              geo_shape: {
+                'geo.point': {
+                  relation: 'contains',
+                  shape: {
+                    coordinates: [
+                      [50.123, 8.123],
+                      [50.123, 8.123],
+                    ],
+                    type: 'envelope',
+                  },
+                },
+                'ignore_unmapped': true,
+              },
+            },
+          ],
         },
       };
 

configuration/tsconfig/tsconfig.json

@@ -19,15 +19,21 @@
     "allowSyntheticDefaultImports": true,
     "noImplicitAny": true,
     "noImplicitReturns": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
     "outDir": "../../../lib/",
-    "lib": ["ES2022", "DOM"],
+    "lib": [
+      "ES2022",
+      "DOM"
+    ],
     "strict": true,
     "target": "ES2022"
   },
   "ts-node": {
     "transpileOnly": true
   },
-  "exclude": ["../../../app.js", "../../../lib/"]
+  "exclude": [
+    "../../../app.js",
+    "../../../lib/"
+  ]
 }

coverage.mjs

@@ -9,7 +9,7 @@ const args = files.map(it => `${it.split('/', 2)[1]}='${it}'`);
 
 console.log(
   'Collecting coverage...',
-  await promisify(exec)(`cobertura-merge -o ./coverage.xml ${args.join(' ')}`),
+  await promisify(exec)(`merge-cobertura -o ./coverage.xml ${args.join(' ')}`),
 );
 
 const reportFiles = await glob('./*/*/coverage/report-junit.xml');

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701626906,
-        "narHash": "sha256-ugr1QyzzwNk505ICE4VMQzonHQ9QS5W33xF2FXzFQ00=",
+        "lastModified": 1717112898,
+        "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0c6d8c783336a59f4c59d4a6daed6ab269c4b361",
+        "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0",
         "type": "github"
       },
       "original": {

flake.nix

@@ -4,72 +4,86 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
   };
-  outputs = {
-    self,
-    nixpkgs,
-    flake-utils,
-  }: let
-    aapt2buildToolsVersion = "33.0.2";
-  in
-    flake-utils.lib.eachDefaultSystem (system: let
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [
-          (final: prev: rec {
-            fontMin = prev.python311.withPackages (ps: with ps; [brotli fonttools] ++ (with fonttools.optional-dependencies; [woff]));
-            android = prev.androidenv.composeAndroidPackages {
-              buildToolsVersions = ["30.0.3" aapt2buildToolsVersion];
-              platformVersions = ["33"];
-            };
-            cypress = prev.cypress.overrideAttrs (cyPrev: rec {
-              version = "13.2.0";
-              src = prev.fetchzip {
-                url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-                hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+    }:
+    let
+      aapt2buildToolsVersion = "34.0.0";
+    in
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [
+            (final: prev: {
+              fontMin = prev.python311.withPackages (
+                ps:
+                with ps;
+                [
+                  brotli
+                  fonttools
+                ]
+                ++ (with fonttools.optional-dependencies; [ woff ])
+              );
+              android = prev.androidenv.composeAndroidPackages {
+                buildToolsVersions = prev.lib.lists.unique [
+                  "34.0.0"
+                  aapt2buildToolsVersion
+                ];
+                platformVersions = [ "34" ];
               };
-            });
-          })
-        ];
-        config = {
-          allowUnfree = true;
-          android_sdk.accept_license = true;
+              cypress = prev.cypress.overrideAttrs (cyPrev: rec {
+                version = "13.10.0";
+                src = prev.fetchzip {
+                  url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
+                  hash = "sha256-wKNXo2lWndsQaouOiul0rsOWah+RRQ6fljzdeC8/KW4=";
+                };
+              });
+              nodejs = prev.nodejs_22;
+            })
+          ];
+          config = {
+            allowUnfree = true;
+            android_sdk.accept_license = true;
+          };
         };
-      };
-      androidFhs = pkgs.buildFHSUserEnv {
-        name = "android-env";
-        targetPkgs = pkgs: with pkgs; [];
-        runScript = "bash";
-        profile = ''
-          export ALLOW_NINJA_ENV=true
-          export USE_CCACHE=1
-          export LD_LIBRARY_PATH=/usr/lib:/usr/lib32
-        '';
-      };
-    in {
-      devShell = pkgs.mkShell rec {
-        nativeBuildInputs = [androidFhs];
-        buildInputs = with pkgs; [
-          nodejs-18_x
-          nodePackages.pnpm
-          # tools
-          curl
-          jq
-          fontMin
-          # browsers
-          firefox
-          google-chrome
-          epiphany # Safari-ish browser
-          cypress
-          # android
-          jdk17
-          android.androidsdk
-          musl
-        ];
-        ANDROID_JAVA_HOME = "${pkgs.jdk.home}";
-        ANDROID_SDK_ROOT = "${pkgs.android.androidsdk}/libexec/android-sdk";
-        GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${aapt2buildToolsVersion}/aapt2";
-        CYPRESS_INSTALL_BINARY = "0";
-        CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
-      };
-    });
+        androidFhs = pkgs.buildFHSUserEnv {
+          name = "android-env";
+          runScript = "bash";
+          profile = ''
+            export ALLOW_NINJA_ENV=true
+            export USE_CCACHE=1
+            export LD_LIBRARY_PATH=/usr/lib:/usr/lib32
+          '';
+        };
+      in
+      {
+        devShell = pkgs.mkShell rec {
+          nativeBuildInputs = [ androidFhs ];
+          buildInputs = with pkgs; [
+            nodejs
+            nodePackages.pnpm
+            # tools
+            curl
+            jq
+            fontMin
+            cypress
+            # android
+            jdk17
+            android.androidsdk
+          ];
+          ANDROID_JAVA_HOME = "${pkgs.jdk.home}";
+          ANDROID_SDK_ROOT = "${pkgs.android.androidsdk}/libexec/android-sdk";
+          GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${aapt2buildToolsVersion}/aapt2";
+          CYPRESS_INSTALL_BINARY = "0";
+          CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
+          # https://github.com/nodejs/node/issues/48444#issuecomment-1591882694
+          UV_USE_IO_URING = "0";
+        };
+      }
+    );
 }

frontend/app/.gitlab-ci.yml

@@ -1,5 +1,5 @@
 e2e:
-  image: registry.gitlab.com/openstapps/openstapps/app-cypress:node-18
+  image: registry.gitlab.com/openstapps/openstapps/app-cypress:node-22
   stage: test
   script:
     - pnpm --filter=@openstapps/app install

frontend/app/ICONS.md

@@ -50,11 +50,11 @@ the config file.
 Icon font minification is done automatically, but requires you to
 follow a few simple rules:
 
-1. Use the tagged template literal for referencing icon names in
+1. Use the type-safe proxy for referencing icon names in
    TypeScript files and code
 
 ```ts
-SCIcon`icon_name`;
+SCIcon.icon_name;
 ```
 
 2. When using `ion-icon` in HTML, reference either icons that went through

frontend/app/android/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     namespace "de.anyschool.app"
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdk rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "de.anyschool.app"
         minSdkVersion rootProject.ext.minSdkVersion

frontend/app/android/build.gradle

@@ -7,8 +7,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
-        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.google.gms:google-services:4.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

frontend/app/android/capacitor.settings.gradle

@@ -1,51 +1,51 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
-project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/android/capacitor')
+project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/android/capacitor')
 
 include ':capacitor-app'
-project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/app/android')
+project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/app/android')
 
 include ':capacitor-browser'
-project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@5.1.0_@capacitor+core@5.5.0/node_modules/@capacitor/browser/android')
+project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/browser/android')
 
 include ':capacitor-clipboard'
-project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/clipboard/android')
+project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/clipboard/android')
 
 include ':capacitor-device'
-project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/device/android')
+project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/device/android')
 
 include ':capacitor-dialog'
-project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/dialog/android')
+project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/dialog/android')
 
 include ':capacitor-filesystem'
-project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.0/node_modules/@capacitor/filesystem/android')
+project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/filesystem/android')
 
 include ':capacitor-geolocation'
-project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/geolocation/android')
+project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/geolocation/android')
 
 include ':capacitor-haptics'
-project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/haptics/android')
+project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/haptics/android')
 
 include ':capacitor-keyboard'
-project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/keyboard/android')
+project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/keyboard/android')
 
 include ':capacitor-local-notifications'
-project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/local-notifications/android')
+project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/local-notifications/android')
 
 include ':capacitor-network'
-project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/network/android')
+project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/network/android')
 
 include ':capacitor-preferences'
-project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/preferences/android')
+project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/preferences/android')
 
 include ':capacitor-share'
-project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/share/android')
+project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/share/android')
 
 include ':capacitor-splash-screen'
-project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/splash-screen/android')
+project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/splash-screen/android')
 
 include ':transistorsoft-capacitor-background-fetch'
-project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.1.1_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch/android')
+project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@6.0.0_@capacitor+core@6.0.0/node_modules/@transistorsoft/capacitor-background-fetch/android')
 
 include ':capacitor-secure-storage-plugin'
-project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@5.5.0/node_modules/capacitor-secure-storage-plugin/android')
+project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.10.0_@capacitor+core@6.0.0/node_modules/capacitor-secure-storage-plugin/android')

frontend/app/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

frontend/app/android/variables.gradle

@@ -1,14 +1,14 @@
 ext {
     minSdkVersion = 22
-    compileSdkVersion = 33
-    targetSdkVersion = 33
-    androidxActivityVersion = '1.7.0'
+    compileSdkVersion = 34
+    targetSdkVersion = 34
+    androidxActivityVersion = '1.8.0'
     androidxAppCompatVersion = '1.6.1'
     androidxCoordinatorLayoutVersion = '1.2.0'
-    androidxCoreVersion = '1.10.0'
-    androidxFragmentVersion = '1.5.6'
-    coreSplashScreenVersion = '1.0.0'
-    androidxWebkitVersion = '1.6.1'
+    androidxCoreVersion = '1.12.0'
+    androidxFragmentVersion = '1.6.2'
+    coreSplashScreenVersion = '1.0.1'
+    androidxWebkitVersion = '1.9.0'
     junitVersion = '4.13.2'
     androidxJunitVersion = '1.1.5'
     androidxEspressoCoreVersion = '3.5.1'

frontend/app/angular.json

@@ -21,10 +21,13 @@
             "allowedCommonJsDependencies": [
               "moment",
               "opening_hours",
-              "leaflet",
-              "leaflet.markercluster",
-              "localforge",
-              "guid-typescript"
+              "localforage",
+              "i18next",
+              "semver",
+              "suncalc",
+              "guid-typescript",
+              "fast-deep-equal",
+              "maplibre-gl"
             ],
             "aot": true,
             "assets": [
@@ -32,24 +35,13 @@
                 "glob": "**/*",
                 "input": "src/assets",
                 "output": "assets"
-              },
-              {
-                "glob": "**/*",
-                "input": "./node_modules/leaflet/dist/images",
-                "output": "assets/"
               }
             ],
             "styles": [
-              {
-                "input": "src/theme/variables.scss",
-                "inject": true
-              },
               {
                 "input": "src/global.scss",
                 "inject": true
-              },
-              "./node_modules/leaflet/dist/leaflet.css",
-              "./node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css"
+              }
             ]
           },
           "configurations": {
@@ -132,11 +124,6 @@
                 "glob": "**/*",
                 "input": "src/assets",
                 "output": "/assets"
-              },
-              {
-                "glob": "**/*",
-                "input": "./node_modules/leaflet/dist/images",
-                "output": "assets/"
               }
             ]
           }

frontend/app/icons.config.mjs

@@ -12,9 +12,9 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import type {IconConfig} from './scripts/icon-config';
 
-const config: IconConfig = {
+/** @type {import('./scripts/icon-config').IconConfig} */
+const config = {
   inputPath: 'node_modules/material-symbols/material-symbols-rounded.woff2',
   outputPath: 'src/assets/icons.min.woff2',
   htmlGlob: 'src/**/*.html',
@@ -38,10 +38,6 @@ const config: IconConfig = {
       'work',
     ],
   },
-  codePoints: {
-    ios_share: 'e6b8',
-    fact_check: 'f0c5',
-  },
 };
 
 export default config;

frontend/app/integration-test.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-rm coverage/integration-report-junit-*.xml
+rm coverage/integration-report-junit-*.xml || true
 
 ng e2e --watch=false --headless=true --browser="$BROWSER"
 exit_code=$?
 
-jrm coverage/integration-report-junit.xml coverage/integration-report-junit-*.xml
-rm coverage/integration-report-junit-*.xml
+jrm coverage/integration-report-junit.xml coverage/integration-report-junit-*.xml || true
+rm coverage/integration-report-junit-*.xml || true
 
 exit $exit_code

frontend/app/ios/App/Podfile

@@ -1,4 +1,4 @@
-require_relative '../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios/scripts/pods_helpers'
+require_relative '../../../../node_modules/.pnpm/@capacitor+ios@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/ios/scripts/pods_helpers'
 
 platform :ios, '13.0'
 use_frameworks!
@@ -9,24 +9,24 @@ use_frameworks!
 install! 'cocoapods', :disable_input_output_paths => true
 
 def capacitor_pods
-  pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios'
-  pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios'
-  pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/app'
-  pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@5.1.0_@capacitor+core@5.5.0/node_modules/@capacitor/browser'
-  pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/clipboard'
-  pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/device'
-  pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/dialog'
-  pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.0/node_modules/@capacitor/filesystem'
-  pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/geolocation'
-  pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/haptics'
-  pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/keyboard'
-  pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/local-notifications'
-  pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/network'
-  pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/preferences'
-  pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/share'
-  pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/splash-screen'
-  pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.1.1_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch'
-  pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@5.5.0/node_modules/capacitor-secure-storage-plugin'
+  pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/ios'
+  pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/ios'
+  pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/app'
+  pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/browser'
+  pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/clipboard'
+  pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/device'
+  pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/dialog'
+  pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/filesystem'
+  pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/geolocation'
+  pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/haptics'
+  pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/keyboard'
+  pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/local-notifications'
+  pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/network'
+  pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/preferences'
+  pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/share'
+  pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/splash-screen'
+  pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.0.0/node_modules/@transistorsoft/capacitor-background-fetch'
+  pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.0.0/node_modules/capacitor-secure-storage-plugin'
   pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
 end
 

frontend/app/package.json

@@ -14,14 +14,12 @@
     "Thea Schöbl <dev@theaninova.de>"
   ],
   "scripts": {
-    "analyze": "webpack-bundle-analyzer www/stats.json",
-    "build": "pnpm check-icons && ng build --configuration=production --stats-json && webpack-bundle-analyzer www/stats.json --mode static --report www/bundle-info.html --no-open",
-    "build:analyze": "npm run build:stats && npm run analyze",
+    "build": "pnpm check-icons && ng build --configuration=production --stats-json",
     "build:android": "ionic capacitor build android --no-open && cd android && ./gradlew clean assemble && cd ..",
     "build:prod": "ng build --configuration=production",
     "build:stats": "ng build --configuration=production --stats-json",
     "changelog": "conventional-changelog -p angular -i src/assets/about/CHANGELOG.md -s -r 0",
-    "check-icons": "ts-node scripts/check-icon-correctness.ts",
+    "check-icons": "node scripts/check-icon-correctness.mjs",
     "chromium:no-cors": "chromium --disable-web-security --user-data-dir=\".browser-data/chromium\"",
     "chromium:virtual-host": "chromium --host-resolver-rules=\"MAP mobile.app.uni-frankfurt.de:* localhost:8100\" --ignore-certificate-errors",
     "cypress:open": "cypress open",
@@ -35,11 +33,10 @@
     "e2e": "ng e2e",
     "format": "prettier . -c",
     "format:fix": "prettier --write .",
-    "licenses": "license-checker --json > src/assets/about/licenses.json && ts-node ./scripts/accumulate-licenses.ts && git add src/assets/about/licenses.json",
+    "licenses": "license-checker --json > src/assets/about/licenses.json && node ./scripts/accumulate-licenses.mjs && git add src/assets/about/licenses.json",
     "lint": "ng lint && stylelint \"**/*.scss\"",
     "lint:fix": "eslint --fix -c .eslintrc.json --ignore-path .eslintignore --ext .ts,.html src/ && stylelint --fix \"**/*.scss\"",
-    "minify-icons": "ts-node-esm scripts/minify-icon-font.ts",
-    "postinstall": "jetify && echo \"skipping jetify in production mode\"",
+    "minify-icons": "node scripts/minify-icon-font.mjs",
     "preview": "http-server www --p 8101 -o",
     "push": "git push && git push origin \"v$npm_package_version\"",
     "resources:ios": "capacitor-assets generate --ios --iconBackgroundColor $(grep -oE \"^@include ion-color\\(primary, #[a-fA-F0-9]{3,6}\" src/theme/colors.scss | grep -oE \"#[a-fA-F0-9]{3,6}\") --splashBackgroundColor $(grep -oE \"^@include ion-color\\(primary, #[a-fA-F0-9]{3,6}\" src/theme/colors.scss | grep -oE \"#[a-fA-F0-9]{3,6}\")",
@@ -52,44 +49,42 @@
     "test:integration": "sh integration-test.sh"
   },
   "dependencies": {
-    "@angular/animations": "17.3.0",
-    "@angular/cdk": "17.3.0",
-    "@angular/common": "17.3.0",
-    "@angular/core": "17.3.0",
-    "@angular/forms": "17.3.0",
-    "@angular/platform-browser": "17.3.0",
-    "@angular/router": "17.3.0",
-    "@asymmetrik/ngx-leaflet": "17.0.0",
-    "@asymmetrik/ngx-leaflet-markercluster": "17.0.0",
+    "@angular/animations": "18.0.1",
+    "@angular/cdk": "18.0.1",
+    "@angular/common": "18.0.1",
+    "@angular/core": "18.0.1",
+    "@angular/forms": "18.0.1",
+    "@angular/platform-browser": "18.0.1",
+    "@angular/router": "18.0.1",
     "@awesome-cordova-plugins/calendar": "6.6.0",
     "@awesome-cordova-plugins/core": "6.6.0",
-    "@capacitor/app": "5.0.7",
-    "@capacitor/browser": "5.2.0",
-    "@capacitor/clipboard": "5.0.7",
-    "@capacitor/core": "5.7.3",
-    "@capacitor/device": "5.0.7",
-    "@capacitor/dialog": "5.0.7",
-    "@capacitor/filesystem": "5.2.1",
-    "@capacitor/geolocation": "5.0.7",
-    "@capacitor/haptics": "5.0.7",
-    "@capacitor/keyboard": "5.0.8",
-    "@capacitor/local-notifications": "5.0.7",
-    "@capacitor/network": "5.0.7",
-    "@capacitor/preferences": "5.0.7",
-    "@capacitor/share": "5.0.7",
-    "@capacitor/splash-screen": "5.0.7",
-    "@ionic-native/core": "5.36.0",
-    "@ionic/angular": "7.8.0",
+    "@capacitor/app": "6.0.0",
+    "@capacitor/browser": "6.0.0",
+    "@capacitor/clipboard": "6.0.0",
+    "@capacitor/core": "6.0.0",
+    "@capacitor/device": "6.0.0",
+    "@capacitor/dialog": "6.0.0",
+    "@capacitor/filesystem": "6.0.0",
+    "@capacitor/geolocation": "6.0.0",
+    "@capacitor/haptics": "6.0.0",
+    "@capacitor/keyboard": "6.0.0",
+    "@capacitor/local-notifications": "6.0.0",
+    "@capacitor/network": "6.0.0",
+    "@capacitor/preferences": "6.0.0",
+    "@capacitor/share": "6.0.0",
+    "@capacitor/splash-screen": "6.0.0",
+    "@ionic/angular": "8.2.0",
     "@ionic/storage-angular": "4.0.0",
+    "@maplibre/ngx-maplibre-gl": "17.4.1",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
     "@openid/appauth": "1.3.1",
     "@openstapps/api": "workspace:*",
     "@openstapps/collection-utils": "workspace:*",
     "@openstapps/core": "workspace:*",
-    "@transistorsoft/capacitor-background-fetch": "5.2.0",
+    "@transistorsoft/capacitor-background-fetch": "6.0.0",
     "@types/dom-view-transitions": "1.0.4",
-    "capacitor-secure-storage-plugin": "0.9.0",
+    "capacitor-secure-storage-plugin": "0.10.0",
     "cordova-plugin-calendar": "5.1.6",
     "date-fns": "3.6.0",
     "deepmerge": "4.3.1",
@@ -97,15 +92,16 @@
     "geojson": "0.5.0",
     "ionic-appauth": "0.9.0",
     "jsonpath-plus": "6.0.1",
-    "leaflet": "1.9.4",
-    "leaflet.markercluster": "1.5.3",
-    "material-symbols": "0.17.0",
+    "maplibre-gl": "4.0.2",
+    "material-symbols": "0.17.1",
     "moment": "2.30.1",
     "ngx-date-fns": "11.0.0",
     "ngx-logger": "5.0.12",
-    "ngx-markdown": "17.1.1",
+    "ngx-markdown": "18.0.0",
     "ngx-moment": "6.0.2",
     "opening_hours": "3.8.0",
+    "pmtiles": "3.0.3",
+    "prettier": "3.1.1",
     "rxjs": "7.8.1",
     "semver": "7.6.0",
     "swiper": "8.4.5",
@@ -113,25 +109,25 @@
     "zone.js": "0.14.4"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "0.1703.0",
-    "@angular-devkit/build-angular": "17.3.0",
-    "@angular-devkit/core": "17.3.0",
-    "@angular-devkit/schematics": "17.3.0",
-    "@angular-eslint/builder": "17.3.0",
-    "@angular-eslint/eslint-plugin": "17.3.0",
-    "@angular-eslint/eslint-plugin-template": "17.3.0",
-    "@angular-eslint/schematics": "17.3.0",
-    "@angular-eslint/template-parser": "17.3.0",
-    "@angular/cli": "17.3.0",
-    "@angular/compiler": "17.3.0",
-    "@angular/compiler-cli": "17.3.0",
+    "@angular-devkit/architect": "0.1800.2",
+    "@angular-devkit/build-angular": "18.0.2",
+    "@angular-devkit/core": "18.0.2",
+    "@angular-devkit/schematics": "18.0.2",
+    "@angular-eslint/builder": "18.0.1",
+    "@angular-eslint/eslint-plugin": "18.0.1",
+    "@angular-eslint/eslint-plugin-template": "18.0.1",
+    "@angular-eslint/schematics": "18.0.1",
+    "@angular-eslint/template-parser": "18.0.1",
+    "@angular/cli": "18.0.2",
+    "@angular/compiler": "18.0.1",
+    "@angular/compiler-cli": "18.0.1",
     "@angular/language-server": "17.3.0",
-    "@angular/language-service": "17.3.0",
-    "@angular/platform-browser-dynamic": "17.3.0",
-    "@capacitor/android": "5.7.3",
+    "@angular/language-service": "18.0.1",
+    "@angular/platform-browser-dynamic": "18.0.1",
+    "@capacitor/android": "6.0.0",
     "@capacitor/assets": "3.0.4",
-    "@capacitor/cli": "5.7.3",
-    "@capacitor/ios": "5.7.3",
+    "@capacitor/cli": "6.0.0",
+    "@capacitor/ios": "6.0.0",
     "@compodoc/compodoc": "1.1.23",
     "@cypress/schematic": "2.5.1",
     "@ionic/angular-toolkit": "11.0.1",
@@ -147,14 +143,12 @@
     "@types/karma": "6.3.8",
     "@types/karma-coverage": "2.0.3",
     "@types/karma-jasmine": "4.0.5",
-    "@types/leaflet": "1.9.8",
-    "@types/leaflet.markercluster": "1.5.4",
     "@types/node": "18.15.3",
     "@types/semver": "7.5.8",
     "@typescript-eslint/eslint-plugin": "7.2.0",
     "@typescript-eslint/parser": "7.2.0",
     "cordova-res": "0.15.4",
-    "cypress": "13.7.0",
+    "cypress": "13.10.0",
     "eslint": "8.57.0",
     "eslint-plugin-jsdoc": "48.2.1",
     "eslint-plugin-prettier": "5.1.3",
@@ -166,7 +160,6 @@
     "is-docker": "2.2.1",
     "jasmine-core": "5.1.2",
     "jasmine-spec-reporter": "7.0.0",
-    "jetifier": "2.0.0",
     "junit-report-merger": "6.0.3",
     "karma": "6.4.3",
     "karma-chrome-launcher": "3.2.0",
@@ -175,15 +168,14 @@
     "karma-junit-reporter": "2.0.1",
     "karma-mocha-reporter": "2.2.5",
     "license-checker": "25.0.1",
-    "stylelint": "16.2.1",
+    "stylelint": "16.3.1",
     "stylelint-config-clean-order": "5.4.1",
     "stylelint-config-prettier-scss": "1.0.0",
     "stylelint-config-recommended-scss": "14.0.0",
     "stylelint-config-standard-scss": "13.0.0",
     "surge": "0.23.1",
     "ts-node": "10.9.2",
-    "typescript": "5.4.2",
-    "webpack-bundle-analyzer": "4.10.1"
+    "typescript": "5.4.2"
   },
   "cordova": {
     "plugins": {},

frontend/app/scripts/accumulate-licenses.mjs

@@ -12,33 +12,34 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import fs from 'fs';
-import {omit} from '../src/app/_helpers/collections/omit';
-import {pickBy} from '../src/app/_helpers/collections/pick';
+import {readFileSync, writeFileSync} from 'fs';
+import {omit, pickBy} from '@openstapps/collection-utils';
 
 /**
  * accumulate and transform licenses based on two license files
+ * @param {string} path
+ * @param {string} additionalLicensesPath
  */
-function accumulateFile(path: string, additionalLicensesPath: string) {
-  const packageJson = JSON.parse(fs.readFileSync('./package.json').toString());
+function accumulateFile(path, additionalLicensesPath) {
+  const packageJson = JSON.parse(readFileSync('./package.json').toString());
   const dependencies = packageJson.dependencies;
 
   console.log(`Accumulating licenses from ${path}`);
 
-  fs.writeFileSync(
+  writeFileSync(
     path,
     JSON.stringify(
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      Object.entries<any>({
-        ...pickBy(JSON.parse(fs.readFileSync(path).toString()), (_, key: string) => {
-          const parts = key.split('@');
+      Object.entries({
+        ...pickBy(JSON.parse(readFileSync(path).toString()), (_, key) => {
+          const parts = /** @type {string} */ (key).split('@');
 
           return dependencies[parts.slice(0, -1).join('@')] === parts[parts.length - 1];
         }),
-        ...JSON.parse(fs.readFileSync(additionalLicensesPath).toString()),
+        ...JSON.parse(readFileSync(additionalLicensesPath).toString()),
       })
         .map(([key, value]) => ({
-          licenseText: value.licenseFile && fs.readFileSync(value.licenseFile, 'utf8'),
+          licenseText: value.licenseFile && readFileSync(value.licenseFile, 'utf8'),
           name: key,
           ...omit(value, 'licenseFile', 'path'),
         }))

frontend/app/scripts/check-icon-correctness.mjs

@@ -12,18 +12,20 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import fontkit, {Font} from 'fontkit';
-import config from '../icons.config';
+import {openSync} from 'fontkit';
+import config from '../icons.config.mjs';
 import {existsSync} from 'fs';
-import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons';
+import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons.mjs';
+import {fetchCodePointMap} from './get-code-points.mjs';
 
 const commandName = '"npm run minify-icons"';
-const originalFont = fontkit.openSync(config.inputPath);
 if (!existsSync(config.outputPath)) {
   console.error(`Minified font not found. Run ${commandName} first.`);
   process.exit(-1);
 }
-const modifiedFont = fontkit.openSync(config.outputPath);
+
+/** @type {import('fontkit').Font} */
+const modifiedFont = openSync(config.outputPath);
 
 let success = true;
 
@@ -48,25 +50,16 @@ async function checkAll() {
 }
 
 /**
- *
+ * @param {Record<string, string[]>} icons
  */
-function check(icons: Record<string, string[]>) {
-  for (const [purpose, iconSet] of Object.entries(icons)) {
-    for (const icon of iconSet) {
-      if (!hasIcon(originalFont, icon)) {
-        success = false;
-        console.error(`${purpose}: ${icon} does not exist. Typo?`);
-      } else if (!hasIcon(modifiedFont, icon)) {
-        success = false;
-        console.error(`${purpose}: ${icon} not found in minified font. Run ${commandName} to regenerate it.`);
-      }
+async function check(icons) {
+  const codePoints = await fetchCodePointMap();
+
+  for (const icon of Object.values(icons).flat()) {
+    const codePoint = codePoints.get(icon);
+    if (!codePoint) throw new Error(`"${icon}" is not a valid icon`);
+    if (!modifiedFont.getGlyph(Number.parseInt(codePoint, 16))) {
+      throw new Error(`"${icon}" (code point ${codePoint}) is missing`);
     }
   }
 }
-
-/**
- *
- */
-function hasIcon(font: Font, icon: string) {
-  return font.layout(icon).glyphs.some(it => it.isLigature);
-}

frontend/app/scripts/gather-used-icons.mjs

@@ -14,34 +14,39 @@
  */
 import {glob} from 'glob';
 import {readFileSync} from 'fs';
-import {matchPropertyContent, matchTagProperties} from '../src/app/util/ion-icon/icon-match';
+import {
+  matchPropertyAccess,
+  matchPropertyContent,
+  matchTagProperties,
+} from '../src/app/util/ion-icon/icon-match.mjs';
 
 /**
- *
+ * @returns {Promise<Record<string, string[]>>}
  */
-export async function getUsedIconsHtml(pattern = 'src/**/*.html'): Promise<Record<string, string[]>> {
+export async function getUsedIconsHtml(pattern = 'src/**/*.html') {
   return Object.fromEntries(
     (await glob(pattern))
       .map(file => [
         file,
-        (readFileSync(file, 'utf8')
+        readFileSync(file, 'utf8')
           .match(matchTagProperties('ion-icon'))
           ?.flatMap(match => {
             return match.match(matchPropertyContent(['name', 'md', 'ios']));
           })
-          .filter(it => !!it) as string[]) || [],
+          .filter(it => !!it) || [],
       ])
-      .filter(([, values]) => values.length > 0),
+      .filter(([, values]) => values && values.length > 0),
   );
 }
 
 /**
- *
+ * @returns {Promise<Record<string, string[]>>}
  */
-export async function getUsedIconsTS(pattern = 'src/**/*.ts'): Promise<Record<string, string[]>> {
+export async function getUsedIconsTS(pattern = 'src/**/*.ts') {
+  const regex = matchPropertyAccess('SCIcon');
   return Object.fromEntries(
     (await glob(pattern))
-      .map(file => [file, readFileSync(file, 'utf8').match(/(?<=Icon`)[\w-]+(?=`)/g) || []])
-      .filter(([, values]) => values.length > 0),
+      .map(file => [file, readFileSync(file, 'utf8').match(regex) || []])
+      .filter(([, values]) => values && values.length > 0),
   );
 }

frontend/app/scripts/get-code-points.mjs

@@ -0,0 +1,23 @@
+const url =
+  'https://raw.githubusercontent.com/google/material-design-icons/master/' +
+  'variablefont/MaterialSymbolsRounded%5BFILL%2CGRAD%2Copsz%2Cwght%5D.codepoints';
+
+export async function fetchCodePointMap() {
+  const icons = await fetch(url)
+    .then(it => it.text())
+    .then(it => new Map(it.split('\n').map(it => /** @type {[string, string]} */ (it.split(' ')))));
+  if (icons.size < 100) throw new Error(`Code point map is very small, is the URL incorrect? ${url}`);
+  return icons;
+}
+
+/**
+ * @param {string[]} icons
+ */
+export async function getCodePoints(icons) {
+  const codePoints = await fetchCodePointMap();
+  return icons.map(icon => {
+    const code = codePoints.get(icon);
+    if (!code) throw new Error(`Code point for icon ${icon} not found`);
+    return code;
+  });
+}

frontend/app/scripts/icon-config.d.mts

@@ -19,5 +19,4 @@ export interface IconConfig {
   inputPath: string;
   outputPath: string;
   additionalIcons?: {[purpose: string]: string[]};
-  codePoints?: {[name: string]: string};
 }

frontend/app/scripts/minify-icon-font.mjs

@@ -14,16 +14,17 @@
  */
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import fontkit from 'fontkit';
 import {exec} from 'child_process';
-import config from '../icons.config';
+import config from '../icons.config.mjs';
 import {statSync} from 'fs';
-import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons';
+import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons.mjs';
+import {getCodePoints} from './get-code-points.mjs';
 
 /**
- *
+ * @param {string[] | string} command
+ * @returns {Promise<string>}
  */
-async function run(command: string[] | string): Promise<string> {
+async function run(command) {
   const fullCommand = Array.isArray(command) ? command.join(' ') : command;
   console.log(`>> ${fullCommand}`);
 
@@ -44,7 +45,8 @@ async function run(command: string[] | string): Promise<string> {
  *
  */
 async function minifyIconFont() {
-  const icons = new Set<string>();
+  /** @type {Set<string>} */
+  const icons = new Set();
 
   for (const iconSet of [
     ...Object.values(config.additionalIcons || []),
@@ -56,35 +58,7 @@ async function minifyIconFont() {
     }
   }
 
-  console.log('Icons used:', [...icons.values()].sort());
-  const font = fontkit.openSync(config.inputPath);
-
-  const glyphs: string[] = ['5f-7a', '30-39'];
-  for (const icon of icons) {
-    const iconGlyphs = font.layout(icon).glyphs;
-    if (iconGlyphs.length === 0) {
-      console.error(`${icon} not found in font. Typo?`);
-      process.exit(-1);
-    }
-
-    const codePoints = iconGlyphs
-      .flatMap(it => font.stringsForGlyph(it.id))
-      .flatMap(it => [...it])
-      .map(it => it.codePointAt(0)!.toString(16));
-
-    if (codePoints.length === 0) {
-      if (config.codePoints?.[icon]) {
-        glyphs.push(config.codePoints[icon]);
-      } else {
-        console.log();
-        console.error(`${icon} code point could not be determined. Add it to config.codePoints.`);
-        process.exit(-1);
-      }
-    }
-
-    glyphs.push(...codePoints);
-  }
-  glyphs.sort();
+  const glyphs = ['5f-7a', '30-39', ...(await getCodePoints([...icons]))].sort();
 
   console.log(
     await run([
@@ -114,8 +88,10 @@ minifyIconFont();
 
 /**
  * Bytes to respective units
+ * @param {number} value
+ * @returns {string}
  */
-function toByteUnit(value: number): string {
+function toByteUnit(value) {
   if (value < 1024) {
     return `${value}B`;
   } else if (value < 1024 * 1024) {

frontend/app/src/app/app.component.spec.ts

@@ -21,7 +21,7 @@ import {ModalController, Platform} from '@ionic/angular';
 
 import {TranslateService} from '@ngx-translate/core';
 import {ThingTranslateService} from './translation/thing-translate.service';
-import {HttpClientTestingModule} from '@angular/common/http/testing';
+import {provideHttpClientTesting} from '@angular/common/http/testing';
 import {AppComponent} from './app.component';
 import {AuthModule} from './modules/auth/auth.module';
 import {ConfigProvider} from './modules/config/config.provider';
@@ -32,6 +32,7 @@ import {ScheduleSyncService} from './modules/background/schedule/schedule-sync.s
 import {sampleAuthConfiguration} from './_helpers/data/sample-configuration';
 import {StorageProvider} from './modules/storage/storage.provider';
 import {SimpleBrowser} from './util/browser.factory';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 
 describe('AppComponent', () => {
   let platformReadySpy: any;
@@ -75,8 +76,9 @@ describe('AppComponent', () => {
     modalController = jasmine.createSpyObj('ModalController', ['create', 'dismiss', 'getTop']);
 
     TestBed.configureTestingModule({
-      imports: [RouterTestingModule.withRoutes([]), HttpClientTestingModule, AuthModule],
       declarations: [AppComponent],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+      imports: [RouterTestingModule.withRoutes([]), AuthModule],
       providers: [
         {provide: Platform, useValue: platformSpy},
         {provide: TranslateService, useValue: translateServiceSpy},
@@ -88,8 +90,9 @@ describe('AppComponent', () => {
         {provide: StorageProvider, useValue: storageProvider},
         {provide: SimpleBrowser, useValue: simpleBrowser},
         {provide: ModalController, useValue: modalController},
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   });
 

frontend/app/src/app/app.module.ts

@@ -13,7 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 import {CommonModule, LocationStrategy, PathLocationStrategy, registerLocaleData} from '@angular/common';
-import {HTTP_INTERCEPTORS, HttpClient, HttpClientModule} from '@angular/common/http';
+import {HTTP_INTERCEPTORS, HttpClient, provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import localeDe from '@angular/common/locales/de';
 import {APP_INITIALIZER, NgModule} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
@@ -30,7 +30,6 @@ import {environment} from '../environments/environment';
 import {AppRoutingModule} from './app-routing.module';
 import {AppComponent} from './app.component';
 import {CatalogModule} from './modules/catalog/catalog.module';
-import {ConfigModule} from './modules/config/config.module';
 import {ConfigProvider} from './modules/config/config.provider';
 import {DashboardModule} from './modules/dashboard/dashboard.module';
 import {DataModule} from './modules/data/data.module';
@@ -70,6 +69,8 @@ import {setDefaultOptions} from 'date-fns';
 import {DateFnsConfigurationService} from 'ngx-date-fns';
 import {Capacitor} from '@capacitor/core';
 import {SplashScreen} from '@capacitor/splash-screen';
+import maplibregl from 'maplibre-gl';
+import {Protocol} from 'pmtiles';
 
 registerLocaleData(localeDe);
 
@@ -91,6 +92,7 @@ export function initializerFactory(
 ) {
   return async () => {
     try {
+      maplibregl.addProtocol('pmtiles', new Protocol().tile);
       initLogger(logger);
       await storageProvider.init();
       await configProvider.init();
@@ -151,7 +153,6 @@ export function createTranslateLoader(http: HttpClient) {
     BrowserAnimationsModule,
     CatalogModule,
     CommonModule,
-    ConfigModule,
     DashboardModule,
     DataModule,
     HebisModule,
@@ -160,7 +161,6 @@ export function createTranslateLoader(http: HttpClient) {
     JobModule,
     FavoritesModule,
     LibraryModule,
-    HttpClientModule,
     ProfilePageModule,
     FeedbackModule,
     MapModule,
@@ -220,6 +220,7 @@ export function createTranslateLoader(http: HttpClient) {
       useClass: ServiceHandlerInterceptor,
       multi: true,
     },
+    provideHttpClient(withInterceptorsFromDi()),
   ],
 })
 export class AppModule {

frontend/app/src/app/modules/about/about-page/about-page-content.html

@@ -49,7 +49,7 @@
 @if (content.type === 'router link') {
   <ion-item [routerLink]="content.link">
     @if (content.icon) {
-      <ion-icon [name]="content.icon" slot="start"></ion-icon>
+      <ion-icon [name]="$any(content.icon)" slot="start"></ion-icon>
     }
     <ion-label>{{ 'title' | translateSimple: content }}</ion-label>
   </ion-item>

frontend/app/src/app/modules/about/about.module.ts

@@ -19,7 +19,6 @@ import {FormsModule} from '@angular/forms';
 import {IonicModule} from '@ionic/angular';
 import {TranslateModule} from '@ngx-translate/core';
 import {ThingTranslateModule} from '../../translation/thing-translate.module';
-import {ConfigProvider} from '../config/config.provider';
 import {AboutPageComponent} from './about-page/about-page.component';
 import {MarkdownModule} from 'ngx-markdown';
 import {AboutPageContentComponent} from './about-page/about-page-content.component';
@@ -64,6 +63,5 @@ const settingsRoutes: Routes = [
     ScrollingModule,
     UtilModule,
   ],
-  providers: [ConfigProvider],
 })
 export class AboutModule {}

frontend/app/src/app/modules/auth/auth-helper.service.spec.ts

@@ -22,7 +22,7 @@ import {Requestor, StorageBackend} from '@openid/appauth';
 import {TranslateService} from '@ngx-translate/core';
 import {PAIAAuthService} from './paia/paia-auth.service';
 import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
-import {HttpClientModule} from '@angular/common/http';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import {SimpleBrowser} from '../../util/browser.factory';
 import {LoggerTestingModule} from 'ngx-logger/testing';
 
@@ -54,7 +54,7 @@ describe('AuthHelperService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientModule, LoggerTestingModule],
+      imports: [LoggerTestingModule],
       providers: [
         StAppsWebHttpClient,
         {
@@ -88,6 +88,7 @@ describe('AuthHelperService', () => {
           provide: SimpleBrowser,
           useValue: simpleBrowserMock,
         },
+        provideHttpClient(withInterceptorsFromDi()),
       ],
     });
     authHelperService = TestBed.inject(AuthHelperService);

frontend/app/src/app/modules/auth/default-auth.service.spec.ts

@@ -20,7 +20,7 @@ import {Browser} from 'ionic-appauth';
 import {nowInSeconds, Requestor, StorageBackend} from '@openid/appauth';
 import {TranslateService} from '@ngx-translate/core';
 import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
-import {HttpClientModule} from '@angular/common/http';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import {IonicStorage} from 'ionic-appauth/lib';
 import {RouterModule} from '@angular/router';
 import {LoggerTestingModule} from 'ngx-logger/testing';
@@ -35,7 +35,7 @@ describe('AuthService', () => {
     storageBackendSpy = jasmine.createSpyObj('StorageBackend', ['getItem']);
 
     TestBed.configureTestingModule({
-      imports: [HttpClientModule, LoggerTestingModule, RouterModule.forRoot([])],
+      imports: [LoggerTestingModule, RouterModule.forRoot([])],
       providers: [
         StAppsWebHttpClient,
         {
@@ -54,6 +54,7 @@ describe('AuthService', () => {
           useValue: storageBackendSpy,
         },
         Requestor,
+        provideHttpClient(withInterceptorsFromDi()),
       ],
     });
     defaultAuthService = TestBed.inject(DefaultAuthService);

frontend/app/src/app/modules/catalog/catalog.component.scss

@@ -15,7 +15,6 @@
 
 ion-segment-button {
   max-width: 100%;
-  text-transform: none;
 }
 
 .margin-top {

frontend/app/src/app/modules/config/config.module.ts

@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2019 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-import {NgModule} from '@angular/core';
-import {DataModule} from '../data/data.module';
-import {StorageModule} from '../storage/storage.module';
-import {ConfigProvider} from './config.provider';
-
-/**
- * TODO
- */
-@NgModule({
-  imports: [StorageModule, DataModule],
-  providers: [ConfigProvider],
-})
-export class ConfigModule {}

frontend/app/src/app/modules/config/config.provider.spec.ts

@@ -104,9 +104,9 @@ describe('ConfigProvider', () => {
 
   it('should throw error on wrong config version in storage', async () => {
     storageProviderSpy.has.and.returnValue(Promise.resolve(true));
-    const wrongConfig = JSON.parse(JSON.stringify(sampleIndexResponse));
+    const wrongConfig = structuredClone(sampleIndexResponse);
     wrongConfig.backend.SCVersion = '0.1.0';
-    storageProviderSpy.get.and.returnValue(wrongConfig);
+    storageProviderSpy.get.and.returnValue(Promise.resolve(wrongConfig));
     spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
     await configProvider.init();
 

frontend/app/src/app/modules/config/config.provider.ts

@@ -73,6 +73,7 @@ export class ConfigProvider {
     swHttpClient: StAppsWebHttpClient,
     private readonly logger: NGXLogger,
   ) {
+    console.log('config init');
     this.client = new Client(swHttpClient, environment.backend_url, environment.backend_version);
   }
 

frontend/app/src/app/modules/dashboard/sections/jobs-section/job-section.component.html

@@ -37,8 +37,5 @@
         {{ 'dashboard.jobs.noJobs' | translate }}
       </ion-label>
     </ion-item>
-    <ion-button slot="button-end" fill="clear" color="medium" [routerLink]="['/jobs']">
-      <ion-icon slot="icon-only" name="search" [size]="24"></ion-icon>
-    </ion-button>
   }
 </stapps-section>

frontend/app/src/app/modules/data/chips/data/add-event-action-chip.component.ts

@@ -26,6 +26,7 @@ import {AddEventStates, AddEventStatesMap} from './add-event-action-chip.config'
 import {EditEventSelectionComponent} from '../edit-event-selection.component';
 import {AddEventReviewModalComponent} from '../../../calendar/add-event-review-modal.component';
 import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
+import {MaterialSymbol} from 'material-symbols';
 
 /**
  * Shows a horizontal list of action chips
@@ -55,7 +56,7 @@ export class AddEventActionChipComponent {
   /**
    * Icon
    */
-  icon: string;
+  icon: MaterialSymbol;
 
   /**
    * Current state of icon fill

frontend/app/src/app/modules/data/chips/data/add-event-action-chip.config.ts

@@ -24,28 +24,28 @@ export enum AddEventStates {
 
 export const AddEventStatesMap = {
   [AddEventStates.ADDED_ALL]: {
-    icon: SCIcon`event_available`,
+    icon: SCIcon.event_available,
     fill: true,
     label: 'data.chips.add_events.ADDED_ALL',
     disabled: false,
     color: 'success',
   },
   [AddEventStates.ADDED_SOME]: {
-    icon: SCIcon`event`,
+    icon: SCIcon.event,
     fill: true,
     label: 'data.chips.add_events.ADDED_SOME',
     disabled: false,
     color: 'success',
   },
   [AddEventStates.REMOVED_ALL]: {
-    icon: SCIcon`calendar_today`,
+    icon: SCIcon.calendar_today,
     fill: false,
     label: 'data.chips.add_events.REMOVED_ALL',
     disabled: false,
     color: 'primary',
   },
   [AddEventStates.UNAVAILABLE]: {
-    icon: SCIcon`event_busy`,
+    icon: SCIcon.event_busy,
     fill: false,
     label: 'data.chips.add_events.UNAVAILABLE',
     disabled: true,

frontend/app/src/app/modules/data/data-icon.config.ts

@@ -14,37 +14,38 @@
  */
 import {SCThingType} from '@openstapps/core';
 import {SCIcon} from '../../util/ion-icon/icon';
+import {MaterialSymbol} from 'material-symbols';
 
-export const DataIcons: Record<SCThingType, string> = {
-  'academic event': SCIcon`school`,
-  'assessment': SCIcon`fact_check`,
-  'article': SCIcon`article`,
-  'book': SCIcon`book`,
-  'building': SCIcon`location_city`,
-  'certification': SCIcon`contract`,
-  'catalog': SCIcon`inventory_2`,
-  'contact point': SCIcon`contact_page`,
-  'course of study': SCIcon`school`,
-  'date series': SCIcon`event`,
-  'dish': SCIcon`lunch_dining`,
-  'favorite': SCIcon`favorite`,
-  'floor': SCIcon`foundation`,
-  'id card': SCIcon`badge`,
-  'message': SCIcon`newspaper`,
-  'organization': SCIcon`business_center`,
-  'periodical': SCIcon`feed`,
-  'person': SCIcon`person`,
-  'point of interest': SCIcon`pin_drop`,
-  'publication event': SCIcon`campaign`,
-  'room': SCIcon`meeting_room`,
-  'semester': SCIcon`date_range`,
-  'setting': SCIcon`settings`,
-  'sport course': SCIcon`sports_soccer`,
-  'study module': SCIcon`view_module`,
-  'ticket': SCIcon`confirmation_number`,
-  'todo': SCIcon`task`,
-  'tour': SCIcon`tour`,
-  'video': SCIcon`movie`,
-  'diff': SCIcon`difference`,
-  'job posting': SCIcon`work`,
-};
+export const DataIcons = {
+  'academic event': SCIcon.school,
+  'assessment': SCIcon.fact_check,
+  'article': SCIcon.article,
+  'book': SCIcon.book,
+  'building': SCIcon.location_city,
+  'certification': SCIcon.contract,
+  'catalog': SCIcon.inventory_2,
+  'contact point': SCIcon.contact_page,
+  'course of study': SCIcon.school,
+  'date series': SCIcon.event,
+  'dish': SCIcon.lunch_dining,
+  'favorite': SCIcon.favorite,
+  'floor': SCIcon.foundation,
+  'id card': SCIcon.badge,
+  'message': SCIcon.newspaper,
+  'organization': SCIcon.business_center,
+  'periodical': SCIcon.feed,
+  'person': SCIcon.person,
+  'point of interest': SCIcon.pin_drop,
+  'publication event': SCIcon.campaign,
+  'room': SCIcon.meeting_room,
+  'semester': SCIcon.date_range,
+  'setting': SCIcon.settings,
+  'sport course': SCIcon.sports_soccer,
+  'study module': SCIcon.view_module,
+  'ticket': SCIcon.confirmation_number,
+  'todo': SCIcon.task,
+  'tour': SCIcon.tour,
+  'video': SCIcon.movie,
+  'diff': SCIcon.difference,
+  'job posting': SCIcon.work,
+} satisfies Record<SCThingType, MaterialSymbol>;

frontend/app/src/app/modules/data/data-icon.pipe.ts

@@ -31,7 +31,7 @@ export class DataIconPipe implements PipeTransform {
   /**
    * Provide the icon name from the data type
    */
-  transform(type: SCThingType): string {
+  transform(type: SCThingType) {
     return this.typeIconMap[type];
   }
 }

frontend/app/src/app/modules/data/data.module.ts

@@ -14,10 +14,9 @@
  */
 import {ScrollingModule} from '@angular/cdk/scrolling';
 import {CommonModule} from '@angular/common';
-import {HttpClientModule} from '@angular/common/http';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import {NgModule} from '@angular/core';
 import {FormsModule} from '@angular/forms';
-import {LeafletModule} from '@asymmetrik/ngx-leaflet';
 import {IonicModule, Platform} from '@ionic/angular';
 import {TranslateModule} from '@ngx-translate/core';
 import {MarkdownModule} from 'ngx-markdown';
@@ -30,7 +29,7 @@ import {UtilModule} from '../../util/util.module';
 import {CalendarService} from '../calendar/calendar.service';
 import {ScheduleProvider} from '../calendar/schedule.provider';
 import {GeoNavigationDirective} from '../map/geo-navigation.directive';
-import {MapWidgetComponent} from '../map/widget/map-widget.component';
+import {MapWidgetComponent} from '../map/map-widget.component';
 import {MenuModule} from '../menu/menu.module';
 import {SettingsProvider} from '../settings/settings.provider';
 import {StorageModule} from '../storage/storage.module';
@@ -142,7 +141,6 @@ import {ShareButtonComponent} from './elements/share-button.component';
     FoodDataListComponent,
     LocateActionChipComponent,
     LongInlineTextComponent,
-    MapWidgetComponent,
     MessageDetailContentComponent,
     MessageListItemComponent,
     JobPostingDetailContentComponent,
@@ -183,13 +181,34 @@ import {ShareButtonComponent} from './elements/share-button.component';
     PeriodicalDetailContentComponent,
     ShareButtonComponent,
   ],
+  exports: [
+    DataDetailComponent,
+    DataDetailContentComponent,
+    DataIconPipe,
+    DataListComponent,
+    DataListItemComponent,
+    DateSeriesListItemComponent,
+    PlaceListItemComponent,
+    SimpleCardComponent,
+    SkeletonListItemComponent,
+    SkeletonSimpleCardComponent,
+    SearchPageComponent,
+    SimpleDataListComponent,
+    OriginDetailComponent,
+    FavoriteButtonComponent,
+    TreeListComponent,
+    ExternalLinkComponent,
+    ArticleDetailContentComponent,
+    BookDetailContentComponent,
+    PeriodicalDetailContentComponent,
+    TitleCardComponent,
+  ],
   imports: [
     CommonModule,
     DataRoutingModule,
     FormsModule,
-    HttpClientModule,
+    MapWidgetComponent,
     IonicModule.forRoot(),
-    LeafletModule,
     MarkdownModule.forRoot(),
     MenuModule,
     IonIconModule,
@@ -220,28 +239,7 @@ import {ShareButtonComponent} from './elements/share-button.component';
       useFactory: browserFactory,
       deps: [Platform],
     },
-  ],
-  exports: [
-    DataDetailComponent,
-    DataDetailContentComponent,
-    DataIconPipe,
-    DataListComponent,
-    DataListItemComponent,
-    DateSeriesListItemComponent,
-    PlaceListItemComponent,
-    SimpleCardComponent,
-    SkeletonListItemComponent,
-    SkeletonSimpleCardComponent,
-    SearchPageComponent,
-    SimpleDataListComponent,
-    OriginDetailComponent,
-    FavoriteButtonComponent,
-    TreeListComponent,
-    ExternalLinkComponent,
-    ArticleDetailContentComponent,
-    BookDetailContentComponent,
-    PeriodicalDetailContentComponent,
-    TitleCardComponent,
+    provideHttpClient(withInterceptorsFromDi()),
   ],
 })
 export class DataModule {}

frontend/app/src/app/modules/data/detail/data-detail-content.scss

@@ -14,6 +14,10 @@
  */
 @import '../../../../theme/util/mixins';
 
+:host {
+  display: contents;
+}
+
 stapps-origin-detail {
   // css hack to make the element stick to the bottom of the scroll container even
   // when the content is not filling it
@@ -49,13 +53,10 @@ stapps-origin-detail {
       background: var(--ion-color-primary);
     }
 
-    // Firefox doesn't support this yet...
-    @supports selector(:has(*)) {
-      & > .expand-when-space,
-      &:has(> .expand-when-space) {
-        flex: 1;
-        height: unset;
-      }
+    & > .expand-when-space,
+    &:has(> .expand-when-space) {
+      flex: 1;
+      height: unset;
     }
   }
 }

frontend/app/src/app/modules/data/detail/data-detail.scss

@@ -17,7 +17,6 @@ ion-content > div {
   display: flex;
   flex: 1;
   flex-direction: column;
-  min-height: 100%;
 }
 
 ion-title {

frontend/app/src/app/modules/data/elements/favorite-button.component.html

@@ -13,10 +13,11 @@
   ~ this program. If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<ion-button (click)="toggle($event)" color="medium" size="small" fill="clear">
+<ion-button (click)="toggle($event)" fill="clear" shape="round">
   <ion-icon
     slot="icon-only"
-    [fill]="(isFavorite$ | async) ?? false"
+    [size]="24"
+    [fill]="(isFavorite$ | async) || false"
     [class.selected]="isFavorite$ | async"
     name="grade"
   ></ion-icon>

frontend/app/src/app/modules/data/elements/favorite-button.component.scss

@@ -13,22 +13,25 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-:host {
-  ion-button {
-    --border-radius: 50%;
+ion-button {
+  --background-activated: currentcolor;
+  --background-hover: currentcolor;
+  --background-focused: currentcolor;
 
-    width: 50px;
-    height: 50px;
-  }
+  aspect-ratio: 1;
+  color: inherit;
+}
 
-  .selected {
-    // TODO
-    color: #fbc02d;
-  }
+.selected {
+  color: #fbc02d;
+}
 
-  @media (hover: hover) {
-    ion-button:hover ::ng-deep stapps-icon {
-      --fill: 1;
-    }
+@media (hover: hover) {
+  ion-button:hover ::ng-deep stapps-icon {
+    --fill: 1 !important;
   }
 }
+
+::ng-deep ion-item stapps-favorite-button ion-button {
+  color: var(--ion-color-medium) !important;
+}

frontend/app/src/app/modules/data/elements/favorite-button.component.ts

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import {Component, Input} from '@angular/core';
+import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
 import {SCIndexableThings} from '@openstapps/core';
 import {FavoritesService} from '../../favorites/favorites.service';
 import {Observable} from 'rxjs';
@@ -25,6 +25,7 @@ import {map, take} from 'rxjs/operators';
   selector: 'stapps-favorite-button',
   templateUrl: './favorite-button.component.html',
   styleUrls: ['./favorite-button.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class FavoriteButtonComponent {
   /**

frontend/app/src/app/modules/data/elements/origin-detail.component.ts

@@ -21,6 +21,7 @@ import {SCThingUserOrigin, SCThingRemoteOrigin} from '@openstapps/core';
 @Component({
   selector: 'stapps-origin-detail',
   templateUrl: 'origin-detail.html',
+  styleUrl: 'origin-detail.scss',
 })
 export class OriginDetailComponent {
   /**

frontend/app/src/app/modules/data/elements/origin-detail.html

@@ -14,71 +14,61 @@
 -->
 
 @if (origin.type === 'user') {
-  <ion-card>
-    <ion-card-header
-      >{{ 'data.types.origin.TITLE' | translate | titlecase }}:
-      {{ 'data.types.origin.USER' | translate | titlecase }}</ion-card-header
-    >
-    <ion-card-content>
-      <p>
-        {{ 'data.types.origin.detail.CREATED' | translate | titlecase }}:
-        {{ origin.created | amDateFormat: 'll' }}
-      </p>
-      @if (origin.updated) {
-        <p>
-          {{ 'data.types.origin.detail.UPDATED' | translate | titlecase }}:
-          {{ origin.updated | amDateFormat: 'll' }}
-        </p>
-      }
-      @if (origin.modified) {
-        <p>
-          {{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}:
-          {{ origin.modified | amDateFormat: 'll' }}
-        </p>
-      }
-      @if (origin.maintainer) {
-        <p>
-          {{ 'data.types.origin.detail.MAINTAINER' | translate }}:
-          <a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
-        </p>
-      }
-    </ion-card-content>
-  </ion-card>
+  <h3>
+    {{ 'data.types.origin.TITLE' | translate | sentencecase }}:
+    {{ 'data.types.origin.USER' | translate | sentencecase }}
+  </h3>
+  <p>
+    {{ 'data.types.origin.detail.CREATED' | translate | sentencecase }}:
+    {{ origin.created | amDateFormat: 'll' }}
+  </p>
+  @if (origin.updated) {
+    <p>
+      {{ 'data.types.origin.detail.UPDATED' | translate | sentencecase }}:
+      {{ origin.updated | amDateFormat: 'll' }}
+    </p>
+  }
+  @if (origin.modified) {
+    <p>
+      {{ 'data.types.origin.detail.MODIFIED' | translate | sentencecase }}:
+      {{ origin.modified | amDateFormat: 'll' }}
+    </p>
+  }
+  @if (origin.maintainer) {
+    <p>
+      {{ 'data.types.origin.detail.MAINTAINER' | translate | sentencecase }}:
+      <a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
+    </p>
+  }
 }
 @if (origin.type === 'remote') {
-  <ion-card>
-    <ion-card-header
-      >{{ 'data.types.origin.TITLE' | translate | titlecase }}:
-      {{ 'data.types.origin.REMOTE' | translate | titlecase }}</ion-card-header
-    >
-    <ion-card-content>
-      <p>
-        {{ 'data.types.origin.detail.INDEXED' | translate | titlecase }}:
-        {{ origin.indexed | amDateFormat: 'll' }}
-      </p>
-      @if (origin.modified) {
-        <p>
-          {{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}:
-          {{ origin.modified | amDateFormat: 'll' }}
-        </p>
-      }
-      @if (origin.name) {
-        <p>{{ 'data.types.origin.detail.MAINTAINER' | translate }}: {{ origin.name }}</p>
-      }
-      @if (origin.maintainer) {
-        <p>
-          {{ 'data.types.origin.detail.MAINTAINER' | translate | titlecase }}:
-          <a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
-        </p>
-      }
-      @if (origin.responsibleEntity) {
-        <p>
-          {{ 'data.types.origin.detail.RESPONSIBLE' | translate | titlecase }}:
-          <a [routerLink]="['/data-detail', origin.responsibleEntity.uid]">{{
-            origin.responsibleEntity.name
-          }}</a>
-        </p>
-      }
-    </ion-card-content>
-  </ion-card>
+  <h3>
+    {{ 'data.types.origin.TITLE' | translate | sentencecase }}:
+    {{ 'data.types.origin.REMOTE' | translate | sentencecase }}
+  </h3>
+  <p>
+    {{ 'data.types.origin.detail.INDEXED' | translate | sentencecase }}:
+    {{ origin.indexed | amDateFormat: 'll' }}
+  </p>
+  @if (origin.modified) {
+    <p>
+      {{ 'data.types.origin.detail.MODIFIED' | translate | sentencecase }}:
+      {{ origin.modified | amDateFormat: 'll' }}
+    </p>
+  }
+  @if (origin.name) {
+    <p>{{ 'data.types.origin.detail.MAINTAINER' | translate | sentencecase }}: {{ origin.name }}</p>
+  }
+  @if (origin.maintainer) {
+    <p>
+      {{ 'data.types.origin.detail.MAINTAINER' | translate | sentencecase }}:
+      <a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
+    </p>
+  }
+  @if (origin.responsibleEntity) {
+    <p>
+      {{ 'data.types.origin.detail.RESPONSIBLE' | translate | sentencecase }}:
+      <a [routerLink]="['/data-detail', origin.responsibleEntity.uid]">{{ origin.responsibleEntity.name }}</a>
+    </p>
+  }
 }

frontend/app/src/app/modules/data/elements/origin-detail.scss

@@ -0,0 +1,15 @@
+:host {
+  padding: var(--spacing-lg);
+  padding-top: 0;
+}
+
+h3 {
+  font-weight: bold;
+}
+
+h3,
+p {
+  margin: 0;
+  font-size: 0.8em;
+  opacity: 0.8;
+}

frontend/app/src/app/modules/data/elements/title-card.component.ts

@@ -18,8 +18,8 @@ import {SCThings} from '@openstapps/core';
 import {SCIcon} from '../../../util/ion-icon/icon';
 
 const AccordionButtonState = {
-  collapsed: SCIcon`expand_more`,
-  expanded: SCIcon`expand_less`,
+  collapsed: SCIcon.expand_more,
+  expanded: SCIcon.expand_less,
 };
 
 @Component({
@@ -35,7 +35,8 @@ export class TitleCardComponent implements OnInit, OnChanges {
 
   @ViewChild('accordionTextArea') accordionTextArea: ElementRef;
 
-  buttonState = AccordionButtonState.collapsed;
+  buttonState: (typeof AccordionButtonState)[keyof typeof AccordionButtonState] =
+    AccordionButtonState.collapsed;
 
   buttonShown = true;
 

frontend/app/src/app/modules/data/list/search-page.scss

@@ -38,7 +38,6 @@ ion-toolbar:first-of-type {
     ion-button {
       width: 50%;
       margin: 0;
-      text-transform: none;
     }
   }
 }

frontend/app/src/app/modules/data/types/date-series/date-series-detail-content.html

@@ -68,5 +68,5 @@
   </ion-card>
 }
 @if (item.inPlace && item.inPlace.geo) {
-  <stapps-map-widget [place]="item.inPlace"></stapps-map-widget>
+  <stapps-map-widget [place]="$any(item.inPlace)"></stapps-map-widget>
 }

frontend/app/src/app/modules/data/types/place/place-list-item.component.ts

@@ -17,7 +17,6 @@ import {PositionService} from '../../../map/position.service';
 import {filter, Observable} from 'rxjs';
 import {hasValidLocation, isSCFloor, PlaceTypes, PlaceTypesWithDistance} from './place-types';
 import {map} from 'rxjs/operators';
-import {LatLng, geoJSON} from 'leaflet';
 import {trigger, transition, style, animate} from '@angular/animations';
 
 /**
@@ -39,13 +38,14 @@ export class PlaceListItemComponent {
   @Input() set item(item: PlaceTypes) {
     this._item = item;
     if (!isSCFloor(item) && hasValidLocation(item)) {
-      this.distance = this.positionService.watchCurrentLocation().pipe(
-        map(position =>
-          new LatLng(position.latitude, position.longitude).distanceTo(
-            geoJSON(item.geo.point).getBounds().getCenter(),
-          ),
+      this.distance = this.positionService.geoLocation.pipe(
+        map(
+          position =>
+            Math.hypot(
+              position.coords.latitude - item.geo.point.coordinates[1],
+              position.coords.longitude - item.geo.point.coordinates[0],
+            ) * 111_139,
         ),
-
         filter(it => it !== undefined),
       );
     }

frontend/app/src/app/modules/data/types/place/special/mensa/place-mensa-detail.component.ts

@@ -12,7 +12,6 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import moment, {Moment} from 'moment';
 import {AfterViewInit, Component, DestroyRef, inject, Input} from '@angular/core';
 import {SCDish, SCISO8601Date, SCPlace} from '@openstapps/core';
 import {PlaceMensaService} from './place-mensa-service';
@@ -53,11 +52,6 @@ export class PlaceMensaDetailComponent implements AfterViewInit {
    */
   selectedDay: string;
 
-  /**
-   * First day to display menu items for
-   */
-  startingDay: Moment;
-
   destroy$ = inject(DestroyRef);
 
   constructor(
@@ -65,9 +59,7 @@ export class PlaceMensaDetailComponent implements AfterViewInit {
     protected router: Router,
     readonly routerOutlet: IonRouterOutlet,
     private readonly dataRoutingService: DataRoutingService,
-  ) {
-    this.startingDay = moment().startOf('day');
-  }
+  ) {}
 
   ngAfterViewInit() {
     if (!this.openAsModal) {

frontend/app/src/app/modules/data/types/place/special/mensa/place-mensa.scss

@@ -13,10 +13,6 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-ion-segment-button {
-  text-transform: none;
-}
-
 ion-segment {
   overflow: auto;
   justify-content: space-between;

frontend/app/src/app/modules/hebis/daia-data.provider.spec.ts

@@ -21,7 +21,7 @@ import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
 import {StorageProvider} from '../storage/storage.provider';
 import {LoggerTestingModule} from 'ngx-logger/testing';
 import {MapModule} from '../map/map.module';
-import {HttpClientModule} from '@angular/common/http';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import {StorageModule} from '../storage/storage.module';
 import {DaiaHolding, DaiaService} from './protocol/response';
 import {Observable, of} from 'rxjs';
@@ -47,7 +47,6 @@ describe('DaiaDataProvider', () => {
       imports: [
         HebisModule,
         MapModule,
-        HttpClientModule,
         StorageModule,
         LoggerTestingModule,
         TranslateModule.forRoot({
@@ -62,6 +61,7 @@ describe('DaiaDataProvider', () => {
         StAppsWebHttpClient,
         StorageProvider,
         DaiaDataProvider,
+        provideHttpClient(withInterceptorsFromDi()),
       ],
     });
     daiaDataProvider = TestBed.inject(DaiaDataProvider);

frontend/app/src/app/modules/hebis/hebis.module.ts

@@ -14,7 +14,7 @@
  */
 import {ScrollingModule} from '@angular/cdk/scrolling';
 import {CommonModule} from '@angular/common';
-import {HttpClientModule} from '@angular/common/http';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import {NgModule} from '@angular/core';
 import {FormsModule} from '@angular/forms';
 import {IonicModule} from '@ionic/angular';
@@ -54,7 +54,6 @@ import {DaiaHoldingComponent} from './daia-availability/daia-holding.component';
     FormsModule,
     HebisRoutingModule,
     IonIconModule,
-    HttpClientModule,
     IonicModule.forRoot(),
     MarkdownModule.forRoot(),
     MenuModule,
@@ -69,6 +68,11 @@ import {DaiaHoldingComponent} from './daia-availability/daia-holding.component';
     ThingTranslateModule.forChild(),
     UtilModule,
   ],
-  providers: [HebisDataProvider, DaiaDataProvider, StAppsWebHttpClient],
+  providers: [
+    HebisDataProvider,
+    DaiaDataProvider,
+    StAppsWebHttpClient,
+    provideHttpClient(withInterceptorsFromDi()),
+  ],
 })
 export class HebisModule {}

frontend/app/src/app/modules/jobs/jobs.module.ts

@@ -6,7 +6,6 @@ import {MomentModule} from 'ngx-moment';
 import {DataModule} from '../data/data.module';
 import {UtilModule} from '../../util/util.module';
 import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
-import {ConfigProvider} from '../config/config.provider';
 import {ThingTranslateModule} from '../../translation/thing-translate.module';
 import {RouterModule, Routes} from '@angular/router';
 import {JobsPageComponent} from './page/jobs-page.component';
@@ -26,6 +25,5 @@ const jobsRoutes: Routes = [{path: 'jobs', component: JobsPageComponent}];
     DataModule,
     UtilModule,
   ],
-  providers: [ConfigProvider],
 })
 export class JobModule {}

frontend/app/src/app/modules/map/cluster-leaves.pipe.ts

@@ -0,0 +1,51 @@
+import {Pipe, PipeTransform} from '@angular/core';
+import {MapService} from '@maplibre/ngx-maplibre-gl';
+import {Feature, Point} from 'geojson';
+import {MapGeoJSONFeature, type GeoJSONSource} from 'maplibre-gl';
+import {combineLatest, distinctUntilChanged, map, mergeMap, from, Observable, ReplaySubject} from 'rxjs';
+import {SCFeatureProperties} from './feature-collection.pipe';
+
+@Pipe({
+  name: 'mglClusterLeaves',
+  standalone: true,
+  pure: true,
+})
+export class MglClusterLeavesPipe implements PipeTransform {
+  source = new ReplaySubject<string>(1);
+
+  feature = new ReplaySubject<MapGeoJSONFeature>(1);
+
+  limit = new ReplaySubject<number>(1);
+
+  offset = new ReplaySubject<number>(1);
+
+  leaves: Observable<Feature<Point, SCFeatureProperties>[]> = combineLatest([
+    this.source.pipe(
+      distinctUntilChanged(),
+      map(source => this.mapService.getSource(source) as GeoJSONSource),
+    ),
+    this.feature.pipe(distinctUntilChanged(it => it.properties.cluster_id)),
+    this.limit.pipe(distinctUntilChanged()),
+    this.offset.pipe(distinctUntilChanged()),
+  ]).pipe(
+    mergeMap(([source, feature, limit, offset]) =>
+      from(source.getClusterLeaves(feature.properties.cluster_id, limit, offset)),
+    ),
+  );
+
+  constructor(private mapService: MapService) {}
+
+  transform(
+    source: string,
+    feature: MapGeoJSONFeature,
+    limit = 0,
+    offset = 0,
+  ): Observable<Feature<Point, SCFeatureProperties>[]> {
+    // MapLibre triggers change detection when the map moves, so this is to prevent flicker
+    this.source.next(source);
+    this.feature.next(feature);
+    this.limit.next(limit);
+    this.offset.next(offset);
+    return this.leaves;
+  }
+}

frontend/app/src/app/modules/map/controls/attribution.component.ts

@@ -0,0 +1,38 @@
+import {animate, style, transition, trigger} from '@angular/animations';
+import {AsyncPipe} from '@angular/common';
+import {ChangeDetectionStrategy, Component, Input, inject} from '@angular/core';
+import {IonicModule} from '@ionic/angular';
+import {MapService} from '@maplibre/ngx-maplibre-gl';
+import {map, delay, Subject, race, mergeWith} from 'rxjs';
+import {IonIconModule} from 'src/app/util/ion-icon/ion-icon.module';
+
+@Component({
+  selector: 'stapps-map-attribution',
+  templateUrl: './attribution.html',
+  styleUrl: './attribution.scss',
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [IonicModule, IonIconModule, AsyncPipe],
+  animations: [
+    trigger('fade', [
+      transition(':enter', [
+        style({opacity: 0, scale: '0.8 1'}),
+        animate('0.2s ease', style({opacity: 1, scale: 1})),
+      ]),
+      transition(':leave', [
+        style({opacity: 1, scale: 1}),
+        animate('0.2s ease', style({opacity: 0, scale: '0.8 1'})),
+      ]),
+    ]),
+  ],
+})
+export class AttributionComponent {
+  @Input() direction: 'left' | 'right' = 'right';
+
+  manualVisible = new Subject<void>();
+
+  hideAttribution = race(
+    this.manualVisible,
+    inject(MapService).mapCreated$.pipe(delay(5000), mergeWith(this.manualVisible)),
+  ).pipe(map((_, i) => i % 2 === 0));
+}

frontend/app/src/app/modules/map/controls/attribution.html

@@ -0,0 +1,8 @@
+@if ((hideAttribution | async) === null) {
+  <ion-button [attr.direction]="direction" @fade class="attribution" color="light"
+    >© OpenStreetMap</ion-button
+  >
+}
+<ion-button class="info" shape="round" color="light" (click)="this.manualVisible.next()">
+  <ion-icon slot="icon-only" name="info"></ion-icon>
+</ion-button>

frontend/app/src/app/modules/map/controls/attribution.scss

@@ -0,0 +1,36 @@
+:host {
+  position: relative;
+}
+
+ion-button {
+  height: 28px;
+  min-height: 28px;
+  margin: 0;
+  font-size: 10px;
+}
+
+ion-button.info {
+  --padding-start: 4px;
+  --padding-end: 4px;
+}
+
+ion-button.attribution {
+  position: absolute;
+  top: -3px;
+
+  &[direction='right'] {
+    --border-radius: 0 14px 14px 0;
+    --padding-start: 14px;
+
+    left: 16px;
+    transform-origin: 0 0;
+  }
+
+  &[direction='left'] {
+    --border-radius: 14px 0 0 14px;
+    --padding-end: 14px;
+
+    right: 16px;
+    transform-origin: 100% 0;
+  }
+}

frontend/app/src/app/modules/map/controls/compass-control.component.ts

@@ -0,0 +1,40 @@
+import {AsyncPipe} from '@angular/common';
+import {ChangeDetectionStrategy, Component} from '@angular/core';
+import {IonicModule} from '@ionic/angular';
+import {MapService} from '@maplibre/ngx-maplibre-gl';
+import {MapEventType} from 'maplibre-gl';
+import {map, mergeMap, fromEventPattern, merge} from 'rxjs';
+import {IonIconModule} from 'src/app/util/ion-icon/ion-icon.module';
+
+@Component({
+  selector: 'stapps-compass-control',
+  templateUrl: './compass-control.html',
+  styleUrl: './compass-control.scss',
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [AsyncPipe, IonicModule, IonIconModule],
+})
+export class CompassControlComponent {
+  transform = this.mapService.mapCreated$.pipe(
+    mergeMap(() =>
+      merge(
+        fromEventPattern<MapEventType['rotate']>(
+          handler => this.mapService.mapInstance.on('rotate', handler),
+          handler => this.mapService.mapInstance.off('rotate', handler),
+        ),
+        fromEventPattern<MapEventType['pitch']>(
+          handler => this.mapService.mapInstance.on('pitch', handler),
+          handler => this.mapService.mapInstance.off('pitch', handler),
+        ),
+      ),
+    ),
+    map(event => {
+      const pitch = event.target.transform.pitch;
+      const angle = event.target.transform.angle;
+
+      return `rotateX(${pitch}deg) rotateZ(${angle}rad)`;
+    }),
+  );
+
+  constructor(readonly mapService: MapService) {}
+}

frontend/app/src/app/modules/map/controls/compass-control.html

@@ -0,0 +1,7 @@
+<ion-fab-button (click)="mapService.mapInstance.resetNorthPitch()" size="small" color="light">
+  <svg [style.transform]="transform | async" width="24" height="24" viewBox="0 0 32 32">
+    >
+    <path d="m8.5 15 6.56-13.13a1.05 1.05 180 0 1 1.88 0L23.5 15 16 12.5Z" />
+    <path d="m8.5 15 6.56-13.13a1.05 1.05 180 0 1 1.88 0L23.5 15 16 12.5Z" transform="rotate(180 16 16)" />
+  </svg>
+</ion-fab-button>

frontend/app/src/app/modules/map/controls/compass-control.scss

@@ -0,0 +1,11 @@
+path {
+  stroke: none;
+
+  &:first-child {
+    fill: var(--ion-color-primary);
+  }
+
+  &:last-child {
+    fill: var(--ion-color-medium);
+  }
+}

frontend/app/src/app/modules/map/controls/geolocate-control.component.ts

@@ -0,0 +1,91 @@
+import {AsyncPipe} from '@angular/common';
+import {
+  AfterContentInit,
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  Input,
+  OnDestroy,
+  ViewChild,
+} from '@angular/core';
+import {IonicModule} from '@ionic/angular';
+import {MapService} from '@maplibre/ngx-maplibre-gl';
+import {FitBoundsOptions, GeolocateControl, GeolocateControlOptions} from 'maplibre-gl';
+import {Map as MapLibre} from 'maplibre-gl';
+import {BehaviorSubject} from 'rxjs';
+import {IonIconModule} from 'src/app/util/ion-icon/ion-icon.module';
+
+type WatchState = InstanceType<typeof GeolocateControl>['_watchState'];
+
+class CustomGeolocateControl extends GeolocateControl {
+  constructor(
+    public _container: HTMLElement,
+    watchState: BehaviorSubject<WatchState>,
+    options: GeolocateControlOptions,
+  ) {
+    super(options);
+    Object.defineProperty(this, '_watchState', {
+      get() {
+        return watchState.value;
+      },
+      set(value: WatchState) {
+        watchState.next(value);
+      },
+    });
+  }
+
+  override onAdd(map: MapLibre): HTMLElement {
+    const container = this._container;
+    this._container = document.createElement('div');
+    this._map = map;
+    this._setupUI(true);
+    this._container = container;
+    return this._container;
+  }
+
+  override onRemove() {}
+}
+
+@Component({
+  selector: 'stapps-geolocate-control',
+  templateUrl: './geolocate-control.html',
+  styleUrl: './geolocate-control.scss',
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [AsyncPipe, IonicModule, IonIconModule],
+})
+export class GeolocateControlComponent implements AfterContentInit, OnDestroy {
+  @Input() position?: 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
+
+  @Input() positionOptions?: PositionOptions;
+
+  @Input() fitBoundsOptions?: FitBoundsOptions;
+
+  @Input() trackUserLocation?: boolean;
+
+  @Input() showUserLocation?: boolean;
+
+  @ViewChild('content', {static: true}) content: ElementRef;
+
+  watchState = new BehaviorSubject<WatchState>('OFF');
+
+  control: CustomGeolocateControl;
+
+  constructor(private mapService: MapService) {}
+
+  ngAfterContentInit() {
+    this.control = new CustomGeolocateControl(this.content.nativeElement, this.watchState, {
+      positionOptions: this.positionOptions,
+      fitBoundsOptions: this.fitBoundsOptions,
+      trackUserLocation: this.trackUserLocation,
+      showUserLocation: this.showUserLocation,
+    });
+    this.mapService.mapCreated$.subscribe(() => {
+      this.mapService.addControl(this.control, this.position);
+    });
+  }
+
+  ngOnDestroy(): void {
+    this.mapService.removeControl(this.control);
+  }
+}

frontend/app/src/app/modules/map/controls/geolocate-control.html

@@ -0,0 +1,18 @@
+<div #content class="maplibregl-ctrl">
+  <ion-fab-button color="light" (click)="control.trigger()">
+    @switch (watchState | async) {
+      @case ('ACTIVE_LOCK') {
+        <ion-icon name="my_location" color="primary"></ion-icon>
+      }
+      @case ('BACKGROUND') {
+        <ion-icon name="location_searching"></ion-icon>
+      }
+      @case ('WAITING_ACTIVE') {
+        <ion-icon name="location_searching"></ion-icon>
+      }
+      @default {
+        <ion-icon name="location_disabled"></ion-icon>
+      }
+    }
+  </ion-fab-button>
+</div>

frontend/app/src/app/modules/map/elements/building-markers.component.ts

@@ -0,0 +1,86 @@
+import {ChangeDetectionStrategy, Component, Input, Optional} from '@angular/core';
+import {GeoJSONSourceComponent, LayerComponent, MapService} from '@maplibre/ngx-maplibre-gl';
+import {FeatureCollection, Polygon} from 'geojson';
+import {SCFeatureProperties} from '../feature-collection.pipe';
+import {
+  FillLayerSpecification,
+  LineLayerSpecification,
+  MapLayerMouseEvent,
+  SymbolLayerSpecification,
+} from 'maplibre-gl';
+import {DataRoutingService} from '../../data/data-routing.service';
+import {MapDataProvider} from '../map-data.provider';
+import {fromEvent, map, startWith, Observable} from 'rxjs';
+import {AsyncPipe} from '@angular/common';
+
+/**
+ * Get a CCS variable value
+ */
+function getCssVariable(color: string) {
+  return getComputedStyle(document.documentElement).getPropertyValue(color);
+}
+
+@Component({
+  selector: 'stapps-building-markers',
+  templateUrl: './building-markers.html',
+  styleUrl: './building-markers.scss',
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [GeoJSONSourceComponent, LayerComponent, AsyncPipe],
+})
+export class BuildingMarkersComponent {
+  accentColor = getCssVariable('--ion-color-primary');
+
+  haloColor = fromEvent<MediaQueryListEvent>(
+    window.matchMedia('(prefers-color-scheme: dark)'),
+    'change',
+  ).pipe(
+    map(() => getCssVariable('--ion-background-color')),
+    startWith(getCssVariable('--ion-background-color')),
+  );
+
+  buildingPaint: LineLayerSpecification['paint'] = {
+    'line-color': this.accentColor,
+    'line-width': 2,
+  };
+
+  buildingFillPaint: FillLayerSpecification['paint'] = {
+    'fill-color': `${this.accentColor}22`,
+  };
+
+  buildingLabelLayout: SymbolLayerSpecification['layout'] = {
+    'text-field': '{name}',
+    'text-font': ['barlow-700-normal'],
+    'text-max-width': 8,
+    'text-size': 13,
+  };
+
+  buildingLabelPaint: Observable<SymbolLayerSpecification['paint']> = this.haloColor.pipe(
+    map(haloColor => ({
+      'text-color': this.accentColor,
+      'text-halo-color': haloColor,
+      'text-halo-width': 1,
+    })),
+  );
+
+  @Input({required: true}) data: FeatureCollection<Polygon, SCFeatureProperties>;
+
+  constructor(
+    @Optional() readonly dataProvider: MapDataProvider | null,
+    readonly dataRoutingService: DataRoutingService,
+    readonly mapService: MapService,
+  ) {}
+
+  async featureClick(event: MapLayerMouseEvent) {
+    if (this.dataProvider === null) return;
+
+    if (event.originalEvent.target !== event.target._canvas) return;
+    const feature = event.features?.[0];
+    if (!feature) return;
+
+    const item = this.dataProvider.current.value?.data.find(it => it.uid === feature.properties.uid);
+    if (item === undefined) return;
+
+    this.dataRoutingService.emitChildEvent(item);
+  }
+}

frontend/app/src/app/modules/map/elements/building-markers.html

@@ -0,0 +1,26 @@
+<mgl-geojson-source id="polygons" [data]="data"></mgl-geojson-source>
+<mgl-layer
+  id="stapps-building-fill"
+  type="fill"
+  source="polygons"
+  before="poi_label"
+  [paint]="buildingFillPaint"
+  (layerClick)="featureClick($event)"
+  (layerMouseEnter)="dataProvider !== null && mapService.changeCanvasCursor('pointer')"
+  (layerMouseLeave)="dataProvider !== null && mapService.changeCanvasCursor('grab')"
+></mgl-layer>
+<mgl-layer
+  id="stapps-building-outline"
+  type="line"
+  source="polygons"
+  before="poi_label"
+  [paint]="buildingPaint"
+></mgl-layer>
+<mgl-layer
+  id="stapps-building-label"
+  type="symbol"
+  source="polygons"
+  after="poi_label"
+  [paint]="(buildingLabelPaint | async) || {}"
+  [layout]="buildingLabelLayout"
+></mgl-layer>

frontend/app/src/app/modules/map/elements/poi-marker.component.ts

@@ -0,0 +1,43 @@
+import {ChangeDetectionStrategy, Component, HostBinding, Input, OnInit, Optional} from '@angular/core';
+import {IonicModule} from '@ionic/angular';
+import {IonIconModule} from 'src/app/util/ion-icon/ion-icon.module';
+import {MapIconDirective} from '../map-icon.directive';
+import {Feature, Point} from 'geojson';
+import {SCFeatureProperties} from '../feature-collection.pipe';
+import {MapDataProvider} from '../map-data.provider';
+import {DataRoutingService} from '../../data/data-routing.service';
+import {AddWordBreakOpportunitiesPipe} from '../../../util/word-break-opportunities.pipe';
+
+@Component({
+  selector: 'stapps-poi-marker',
+  templateUrl: './poi-marker.html',
+  styleUrl: './poi-marker.scss',
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [IonicModule, IonIconModule, MapIconDirective, AddWordBreakOpportunitiesPipe],
+})
+export class PoiMarkerComponent implements OnInit {
+  @Input({required: true}) feature: Feature<Point, SCFeatureProperties>;
+
+  @HostBinding('disabled') disabled = this.dataProvider === null;
+
+  fontSize = 0;
+
+  constructor(
+    @Optional() readonly dataProvider: MapDataProvider | null,
+    readonly dataRoutingService: DataRoutingService,
+  ) {}
+
+  async featureClick() {
+    if (this.dataProvider === null) return;
+
+    const item = this.dataProvider.current.value?.data.find(it => it.uid === this.feature.properties.uid);
+    if (item === undefined) return;
+
+    this.dataRoutingService.emitChildEvent(item);
+  }
+
+  ngOnInit() {
+    this.fontSize = Math.max(10, 12 - Math.max(0, this.feature.properties.name.length - 16));
+  }
+}

frontend/app/src/app/modules/map/elements/poi-marker.html

@@ -0,0 +1,9 @@
+<ion-button shape="round" (click)="featureClick()">
+  <ion-icon
+    slot="start"
+    [size]="16"
+    [fill]="true"
+    [name]="feature.properties.category | stappsMapIcon"
+  ></ion-icon>
+  <ion-label>{{ feature.properties.name | addWordBreakOpportunities }}</ion-label>
+</ion-button>

frontend/app/src/app/modules/map/elements/poi-marker.scss

@@ -0,0 +1,38 @@
+ion-button {
+  --padding-top: 0;
+  --padding-bottom: 0;
+  --padding-start: var(--spacing-md);
+  --padding-end: var(--spacing-sm);
+
+  max-width: 120px;
+  min-height: 0;
+  margin: 0;
+  margin-block-end: 4px;
+
+  font: inherit;
+  font-size: 0.9em;
+  font-weight: bold;
+
+  &::part(native) {
+    height: 32px;
+    line-height: 1.2;
+  }
+}
+
+ion-icon {
+  flex-shrink: 0;
+}
+
+ion-label {
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+
+  padding: 4px 0;
+
+  text-align: left;
+  overflow-wrap: normal;
+  white-space: wrap;
+
+  -webkit-line-clamp: 2;
+}

frontend/app/src/app/modules/map/elements/poi-markers.component.ts

@@ -0,0 +1,43 @@
+import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
+import {MapIconDirective} from '../map-icon.directive';
+import {FeatureCollection, Point} from 'geojson';
+import {SCFeatureProperties} from '../feature-collection.pipe';
+import {animate, style, transition, trigger} from '@angular/animations';
+import {MglClusterLeavesPipe} from '../cluster-leaves.pipe';
+import {
+  ClusterPointDirective,
+  GeoJSONSourceComponent,
+  MarkersForClustersComponent,
+  PointDirective,
+} from '@maplibre/ngx-maplibre-gl';
+import {AsyncPipe} from '@angular/common';
+import {PoiMarkerComponent} from './poi-marker.component';
+
+@Component({
+  selector: 'stapps-poi-markers',
+  templateUrl: './poi-markers.html',
+  styleUrl: './poi-markers.scss',
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [
+    MapIconDirective,
+    MglClusterLeavesPipe,
+    GeoJSONSourceComponent,
+    MarkersForClustersComponent,
+    AsyncPipe,
+    ClusterPointDirective,
+    PointDirective,
+    PoiMarkerComponent,
+  ],
+  animations: [
+    trigger('fade', [
+      transition(':enter', [style({opacity: 0}), animate('200ms', style({opacity: 1}))]),
+      transition(':leave', [style({opacity: 1}), animate('200ms', style({opacity: 0}))]),
+    ]),
+  ],
+})
+export class PoiMarkersComponent {
+  @Input({required: true}) data: FeatureCollection<Point, SCFeatureProperties>;
+
+  @Input() clusterPreviewCount = 3;
+}

frontend/app/src/app/modules/map/elements/poi-markers.html

@@ -0,0 +1,33 @@
+<mgl-geojson-source
+  id="pois"
+  [cluster]="true"
+  [clusterMaxZoom]="20"
+  [clusterRadius]="100"
+  [data]="data"
+></mgl-geojson-source>
+<mgl-markers-for-clusters source="pois">
+  <ng-template mglPoint let-feature>
+    <div class="marker">
+      <stapps-poi-marker @fade [feature]="feature"></stapps-poi-marker>
+    </div>
+  </ng-template>
+  <ng-template mglClusterPoint let-feature>
+    <div class="marker">
+      @if (
+        'pois'
+          | mglClusterLeaves
+            : feature
+            : clusterPreviewCount - (feature.properties.point_count > clusterPreviewCount ? 1 : 0)
+          | async;
+        as leaves
+      ) {
+        @for (feature of leaves; track feature.id) {
+          <stapps-poi-marker @fade [feature]="feature"></stapps-poi-marker>
+        }
+        @if (feature.properties.point_count > leaves.length) {
+          <div @fade class="ellipsis">+{{ feature.properties.point_count - leaves.length }}</div>
+        }
+      }
+    </div>
+  </ng-template>
+</mgl-markers-for-clusters>

frontend/app/src/app/modules/map/elements/poi-markers.scss

@@ -0,0 +1,24 @@
+.ellipsis {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+
+  width: fit-content;
+  padding-inline: var(--spacing-md);
+
+  font-size: 0.8em;
+  color: var(--ion-color-primary-contrast);
+
+  opacity: 0.8;
+  background: var(--ion-color-primary);
+  border-radius: 15px;
+}
+
+button:not(:only-child) {
+  margin-bottom: 2px;
+}
+
+.marker {
+  display: flex;
+  flex-direction: column;
+}

frontend/app/src/app/modules/map/feature-collection.pipe.ts

@@ -0,0 +1,81 @@
+import {Pipe, PipeTransform} from '@angular/core';
+import {SCThing, SCThings} from '@openstapps/core';
+import {Feature, FeatureCollection, Point, Polygon} from 'geojson';
+
+/**
+ * Very simple hash function
+ *
+ * MapLibre cannot use strings as feature ids because of
+ * vector tile spec limitations
+ */
+function simpleHash(value: string): number {
+  let hash = 0;
+  for (let i = 0; i < value.length; i++) {
+    hash = Math.trunc((hash << 5) - hash + value.codePointAt(i)!);
+  }
+  return hash >>> 0;
+}
+
+/**
+ * Finds the best name for a thing to display on the map
+ */
+function findBestName(thing: SCThing, targetLength = 14): string {
+  if (!thing.alternateNames || thing.name.length <= targetLength) return thing.name;
+  return thing.alternateNames.reduce(
+    (accumulator, current) =>
+      accumulator.length <= targetLength || accumulator.length <= current.length ? accumulator : current,
+    thing.name,
+  );
+}
+
+export interface SCFeatureProperties {
+  name: string;
+  category?: string;
+  uid: string;
+}
+
+@Pipe({
+  name: 'thingPoiFeatureCollection',
+  standalone: true,
+  pure: true,
+})
+export class ThingPoiFeatureCollectionPipe implements PipeTransform {
+  transform(things: SCThings[]): FeatureCollection<Point, SCFeatureProperties> {
+    return {
+      type: 'FeatureCollection',
+      features: things
+        .filter(thing => 'geo' in thing && thing.geo.polygon === undefined)
+        .map<Feature<Point, SCFeatureProperties>>(thing => ({
+          type: 'Feature',
+          properties: {
+            name: findBestName(thing),
+            category: 'categories' in thing ? thing.categories[0] : undefined,
+            uid: thing.uid,
+          },
+          geometry: (thing as Extract<SCThings, {geo: object}>).geo.point,
+          id: simpleHash(thing.uid),
+        })),
+    };
+  }
+}
+
+@Pipe({
+  name: 'thingPolygonFeatureCollection',
+  standalone: true,
+  pure: true,
+})
+export class ThingPolygonFeatureCollectionPipe implements PipeTransform {
+  transform(things: SCThings[]): FeatureCollection<Polygon, SCFeatureProperties> {
+    return {
+      type: 'FeatureCollection',
+      features: things
+        .filter(thing => 'geo' in thing && thing.geo.polygon !== undefined)
+        .map<Feature<Polygon, SCFeatureProperties>>(thing => ({
+          type: 'Feature',
+          geometry: (thing as Extract<SCThings, {geo: object}>).geo.polygon!,
+          properties: {uid: thing.uid, name: findBestName(thing)},
+          id: simpleHash(thing.uid),
+        })),
+    };
+  }
+}

frontend/app/src/app/modules/map/map-auto-3d.directive.ts

@@ -0,0 +1,36 @@
+import {Directive, HostListener} from '@angular/core';
+import {Map, MapMouseEvent, MapStyleDataEvent} from 'maplibre-gl';
+
+@Directive({
+  selector: 'mgl-map[auto-3d]',
+  standalone: true,
+})
+export class MapAuto3dDirective {
+  @HostListener('styleData', ['$event'])
+  styleData(event: MapStyleDataEvent) {
+    this.updatePitch(event.target);
+  }
+
+  @HostListener('pitchEvt', ['$event'])
+  pitch(event: MapMouseEvent) {
+    this.updatePitch(event.target);
+  }
+
+  updatePitch(map: Map) {
+    if (map.getPitch() === 0) {
+      const layer = map.getLayer('building-3d');
+      if (layer && layer?.visibility !== 'none') {
+        layer.visibility = 'none';
+        map.setPaintProperty('building', 'fill-opacity', 1);
+        map.setLayerZoomRange('building', 13, 24);
+      }
+    } else {
+      const layer = map.getLayer('building-3d');
+      if (layer && layer?.visibility !== 'visible') {
+        layer.visibility = 'visible';
+        map.setPaintProperty('building', 'fill-opacity', ['interpolate', ['linear'], ['zoom'], 15, 1, 16, 0]);
+        map.setLayerZoomRange('building', 13, 16);
+      }
+    }
+  }
+}

frontend/app/src/app/modules/map/map-data.provider.ts

@@ -0,0 +1,59 @@
+import {Injectable} from '@angular/core';
+import {DataProvider} from '../data/data.provider';
+import {SCGeoFilter, SCSearchRequest, SCSearchResponse} from '@openstapps/core';
+import {BehaviorSubject} from 'rxjs';
+
+@Injectable()
+export class MapDataProvider extends DataProvider {
+  readonly current = new BehaviorSubject<SCSearchResponse | undefined>(undefined);
+
+  readonly currentBounds = new BehaviorSubject<
+    [[minLon: number, maxLat: number], [maxLon: number, minLat: number]] | undefined
+  >(undefined);
+
+  override async search(query: SCSearchRequest): Promise<SCSearchResponse> {
+    if (query.query && this.currentBounds.value !== undefined) {
+      const boundsFilter: SCGeoFilter = {
+        type: 'geo',
+        arguments: {
+          field: 'geo',
+          shape: {
+            type: 'envelope',
+            coordinates: this.currentBounds.value,
+          },
+        },
+      };
+      query.filter = query.filter
+        ? {
+            type: 'boolean',
+            arguments: {
+              operation: 'and',
+              filters: [query.filter, boundsFilter],
+            },
+          }
+        : boundsFilter;
+    }
+
+    if (query.from === 0 || this.current.value === undefined) {
+      this.current.next(
+        await super.search({
+          ...query,
+          size: undefined,
+        }),
+      );
+    }
+    if (query.from === undefined || query.size === undefined) {
+      return this.current.value!;
+    }
+
+    return {
+      ...this.current.value!,
+      data: this.current.value!.data.slice(query.from, query.from + query.size),
+      pagination: {
+        ...this.current.value!.pagination,
+        offset: query.from,
+        count: Math.min(query.size, this.current.value!.data.length - query.from),
+      },
+    };
+  }
+}

frontend/app/src/app/modules/map/map-icon.directive.ts

@@ -0,0 +1,37 @@
+import {SCThings, SCPlace} from '@openstapps/core';
+import {SCIcon} from '../../util/ion-icon/icon';
+import {Pipe, PipeTransform} from '@angular/core';
+import {MaterialSymbol} from 'material-symbols';
+
+const mapIcons: Record<Extract<SCThings, SCPlace>['categories'][number], MaterialSymbol> = {
+  'cafe': SCIcon.local_cafe,
+  'learn': SCIcon.school,
+  'canteen': SCIcon.restaurant,
+  'computer': SCIcon.computer,
+  'education': SCIcon.school,
+  'laboratory': SCIcon.science,
+  'library': SCIcon.local_library,
+  'lounge': SCIcon.weekend,
+  'office': SCIcon.meeting_room,
+  'restaurant': SCIcon.restaurant,
+  'restroom': SCIcon.wc,
+  'student canteen': SCIcon.restaurant,
+  'student union': SCIcon.groups,
+  'validator': SCIcon.badge,
+  'card charger': SCIcon.credit_card,
+  'printer': SCIcon.print,
+  'disabled access': SCIcon.accessible,
+};
+
+const defaultIcon = SCIcon.not_listed_location;
+
+@Pipe({
+  name: 'stappsMapIcon',
+  standalone: true,
+  pure: true,
+})
+export class MapIconDirective implements PipeTransform {
+  transform(value: keyof typeof mapIcons | string | undefined): MaterialSymbol {
+    return mapIcons[value as keyof typeof mapIcons] ?? defaultIcon;
+  }
+}

frontend/app/src/app/modules/map/map-maximize-animation.ts

@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2024 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+import type {AnimationBuilder} from '@ionic/angular';
+import {AnimationController} from '@ionic/angular';
+import type {AnimationOptions} from '@ionic/angular/common/providers/nav-controller';
+import {iosDuration, iosEasing, mdDuration, mdEasing} from 'src/app/animation/easings';
+
+/**
+ * Get the center of an element
+ */
+function center(element: HTMLElement): {x: number; y: number} {
+  const bounds = element.getBoundingClientRect();
+  return {
+    x: bounds.left + bounds.width / 2,
+    y: bounds.top + bounds.height / 2,
+  };
+}
+
+/**
+ * Get the flip transform for an element
+ */
+function flipTransform(from: HTMLElement, to: HTMLElement): string {
+  const fromCenter = center(from);
+  const toCenter = center(to);
+  const dx = fromCenter.x - toCenter.x;
+  const dy = fromCenter.y - toCenter.y;
+  return `translate(${dx}px, ${dy}px)`;
+}
+
+/**
+ * Get the flip clip path for an element
+ */
+function flipClipPath(from: HTMLElement, to: HTMLElement): string {
+  const fromBounds = from.getBoundingClientRect();
+  const toBounds = to.getBoundingClientRect();
+  const y = Math.max(0, (toBounds.height - fromBounds.height) / 2);
+  const x = Math.max(0, (toBounds.width - fromBounds.width) / 2);
+  return `inset(${y}px ${x}px)`;
+}
+
+/**
+ * Animation of the map maximize
+ */
+export function mapMaximizeAnimation(animationController: AnimationController): AnimationBuilder {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return (_baseElement: HTMLElement, options: AnimationOptions | any) => {
+    const rootTransition = animationController
+      .create()
+      .duration(options.duration ?? (options.mode === 'ios' ? iosDuration * 1.5 : mdDuration * 2.5))
+      .easing(options.mode === 'ios' ? iosEasing : mdEasing);
+
+    const enteringMap = options.enteringEl.querySelector('mgl-map') as HTMLElement;
+    const leavingMap = options.leavingEl.querySelector('mgl-map') as HTMLElement;
+
+    if (!enteringMap.classList.contains('ready')) {
+      rootTransition.delay(2000);
+      enteringMap.addEventListener(
+        'ready',
+        event => {
+          event.preventDefault();
+          setTimeout(() => {
+            if (rootTransition.isRunning()) {
+              rootTransition.stop();
+              rootTransition.delay(0);
+              rootTransition.play();
+            }
+          });
+        },
+        {once: true},
+      );
+    }
+
+    const mapEnterTransition = animationController
+      .create()
+      .fromTo('transform', flipTransform(leavingMap, enteringMap), 'translate(0, 0)')
+      .fromTo('clipPath', flipClipPath(leavingMap, enteringMap), 'inset(0px 0px)')
+      .addElement(enteringMap);
+    const mapExitTransition = animationController
+      .create()
+      .fromTo('transform', 'translate(0, 0)', flipTransform(enteringMap, leavingMap))
+      .fromTo('clipPath', 'inset(0px 0px)', flipClipPath(enteringMap, leavingMap))
+      .addElement(leavingMap);
+
+    const enterTransition = animationController
+      .create()
+      .fromTo('opacity', options.direction === 'back' ? '1' : '0', '1')
+
+      .addElement(options.enteringEl);
+    const exitTransition = animationController
+      .create()
+      .fromTo('opacity', '1', options.direction === 'back' ? '0' : '1')
+      .addElement(options.leavingEl);
+
+    rootTransition.addAnimation([enterTransition, exitTransition, mapEnterTransition, mapExitTransition]);
+    return rootTransition;
+  };
+}

frontend/app/src/app/modules/map/map-page.component.ts

@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+import {ChangeDetectionStrategy, Component} from '@angular/core';
+import {IonicModule} from '@ionic/angular';
+import {LngLatBoundsLike, MapLibreEvent} from 'maplibre-gl';
+import {
+  ControlComponent,
+  GeolocateControlDirective,
+  MapComponent,
+  ScaleControlDirective,
+} from '@maplibre/ngx-maplibre-gl';
+import {TranslateModule} from '@ngx-translate/core';
+import {ActivatedRoute, RouterLink} from '@angular/router';
+import {MapAuto3dDirective} from './map-auto-3d.directive';
+import {MediaQueryPipe} from '../../util/media-query.pipe';
+import {MapStyleDirective} from './map-style.directive';
+import {DataProvider} from '../data/data.provider';
+import {SCSearchFilter, SCThingType} from '@openstapps/core';
+import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
+import {DataModule} from '../data/data.module';
+import {AsyncPipe} from '@angular/common';
+import {GeolocateControlComponent} from './controls/geolocate-control.component';
+import {CompassControlComponent} from './controls/compass-control.component';
+import {MapSizeFixDirective} from './map-size-fix.directive';
+import {MapDataProvider} from './map-data.provider';
+import {ThingPoiFeatureCollectionPipe, ThingPolygonFeatureCollectionPipe} from './feature-collection.pipe';
+import {BuildingMarkersComponent} from './elements/building-markers.component';
+import {PoiMarkersComponent} from './elements/poi-markers.component';
+import {AttributionComponent} from './controls/attribution.component';
+import {filter, map} from 'rxjs';
+
+/**
+ * The main page of the map
+ */
+@Component({
+  styleUrls: ['./map-page.scss'],
+  templateUrl: './map-page.html',
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  providers: [
+    MapDataProvider,
+    {
+      provide: DataProvider,
+      useExisting: MapDataProvider,
+    },
+  ],
+  imports: [
+    AsyncPipe,
+    AttributionComponent,
+    BuildingMarkersComponent,
+    CompassControlComponent,
+    ControlComponent,
+    DataModule,
+    GeolocateControlComponent,
+    GeolocateControlDirective,
+    IonIconModule,
+    IonicModule,
+    MapAuto3dDirective,
+    MapComponent,
+    MapSizeFixDirective,
+    MapStyleDirective,
+    MediaQueryPipe,
+    PoiMarkersComponent,
+    RouterLink,
+    ScaleControlDirective,
+    ThingPoiFeatureCollectionPipe,
+    ThingPolygonFeatureCollectionPipe,
+    TranslateModule,
+  ],
+})
+export class MapPageComponent {
+  forcedFilter: SCSearchFilter = {
+    type: 'boolean',
+    arguments: {
+      operation: 'or',
+      filters: [
+        {
+          type: 'value',
+          arguments: {
+            field: 'type',
+            value: [SCThingType.Building],
+          },
+        },
+        {
+          type: 'boolean',
+          arguments: {
+            operation: 'and',
+            filters: [
+              {
+                type: 'value',
+                arguments: {
+                  field: 'categories',
+                  value: ['restaurant', 'library', 'canteen', 'cafe'],
+                },
+              },
+              {
+                type: 'value',
+                arguments: {
+                  field: 'type',
+                  value: [SCThingType.Building, SCThingType.Room, SCThingType.PointOfInterest],
+                },
+              },
+            ],
+          },
+        },
+      ],
+    },
+  };
+
+  bounds = this.activatedRoute.queryParams.pipe(
+    map(
+      parameters =>
+        (parameters?.bounds as [string, string])?.map(it =>
+          it.split(',').map(Number.parseFloat),
+        ) as LngLatBoundsLike,
+    ),
+    filter(uid => uid !== undefined),
+  );
+
+  constructor(
+    readonly dataProvider: MapDataProvider,
+    readonly activatedRoute: ActivatedRoute,
+  ) {}
+
+  mapMove(event: MapLibreEvent) {
+    const bounds = event.target.getBounds();
+    this.dataProvider.currentBounds.next([
+      [bounds.getWest(), bounds.getNorth()],
+      [bounds.getEast(), bounds.getSouth()],
+    ]);
+  }
+}

frontend/app/src/app/modules/map/map-page.html

@@ -0,0 +1,50 @@
+<!--
+  ~ Copyright (C) 2023 StApps
+  ~ This program is free software: you can redistribute it and/or modify it
+  ~ under the terms of the GNU General Public License as published by the Free
+  ~ Software Foundation, version 3.
+  ~
+  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along with
+  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+  -->
+<stapps-search-page
+  [showDefaultData]="true"
+  [title]="'map.page.TITLE' | translate"
+  [placeholder]="'map.page.search_bar.placeholder' | translate"
+  [forcedFilter]="forcedFilter"
+  [navigation]="[]"
+></stapps-search-page>
+
+<ion-content id="map">
+  <mgl-map
+    [styleName]="('(prefers-color-scheme: dark)' | mediaQuery | async) ? 'dark' : 'light'"
+    [antialias]="true"
+    [attributionControl]="false"
+    [fitBounds]="(bounds | async) ?? undefined"
+    [fitBoundsOptions]="{maxZoom: 15, padding: {top: 100, bottom: 50, left: 50, right: 50}, animate: false}"
+    (move)="mapMove($event)"
+    auto-3d
+  >
+    @if (dataProvider.current | async; as result) {
+      <stapps-building-markers [data]="result.data | thingPolygonFeatureCollection"></stapps-building-markers>
+      <stapps-poi-markers [data]="result.data | thingPoiFeatureCollection"></stapps-poi-markers>
+    }
+    <mgl-control position="bottom-left" mglScale></mgl-control>
+    <mgl-control position="top-left">
+      <stapps-map-attribution></stapps-map-attribution>
+    </mgl-control>
+    <mgl-control position="top-right">
+      <stapps-compass-control></stapps-compass-control>
+    </mgl-control>
+    <stapps-geolocate-control
+      position="bottom-right"
+      [trackUserLocation]="true"
+      [showUserLocation]="true"
+    ></stapps-geolocate-control>
+  </mgl-map>
+</ion-content>

frontend/app/src/app/modules/map/map-page.scss

@@ -0,0 +1,101 @@
+/*!
+ * Copyright (C) 2023 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+ion-content {
+  position: fixed;
+  transition: opacity 0.2s ease;
+}
+
+stapps-search-page {
+  ::ng-deep ion-content {
+    transform: translateY(48px);
+    transition: transform 0.2s ease;
+  }
+
+  ::ng-deep ion-back-button {
+    transform: translateX(24px);
+    display: block;
+    opacity: 0;
+    transition:
+      opacity 0.2s ease,
+      transform 0.2s ease;
+  }
+}
+
+stapps-search-page:has(::ng-deep .searchbar-has-focus),
+stapps-search-page:has(::ng-deep ion-content:focus-within) {
+  + ion-content {
+    pointer-events: none;
+    opacity: 0;
+  }
+
+  ::ng-deep ion-content {
+    transform: translateY(0);
+  }
+
+  ::ng-deep ion-back-button {
+    pointer-events: none;
+    transform: translateX(0);
+    opacity: 1;
+  }
+}
+
+:host.can-go-back stapps-search-page ::ng-deep ion-back-button {
+  transform: translateX(0);
+  opacity: 1;
+}
+
+mgl-map {
+  width: 100%;
+  height: 100%;
+}
+
+ion-toolbar:first-of-type {
+  padding: 0 var(--spacing-md) var(--spacing-xs);
+}
+
+.filter-options {
+  overflow: hidden;
+  display: flex;
+  flex-direction: row;
+  border-radius: var(--border-radius-default);
+
+  label {
+    cursor: pointer;
+    user-select: none;
+
+    padding: var(--spacing-xs) var(--spacing-md);
+
+    font-family: inherit;
+    color: var(--ion-item-color);
+
+    background-color: var(--ion-item-background);
+
+    transition: all 0.2s ease;
+
+    input[type='radio'] {
+      display: none;
+    }
+
+    &:has(:checked) {
+      color: var(--ion-color-primary-contrast);
+      background-color: var(--ion-color-primary);
+    }
+  }
+}
+
+:host ::ng-deep .maplibregl-ctrl-top-left,
+:host ::ng-deep .maplibregl-ctrl-top-right {
+  top: 92px;
+}

frontend/app/src/app/modules/map/map-size-fix.directive.ts

@@ -0,0 +1,39 @@
+import {AfterViewInit, Directive, Host, HostBinding, HostListener, ViewContainerRef} from '@angular/core';
+import {MapComponent} from '@maplibre/ngx-maplibre-gl';
+
+/**
+ * Fixes an issue related to page transitions where
+ * the map would only appear with a size of 300x400px
+ */
+@Directive({
+  selector: 'mgl-map',
+  standalone: true,
+})
+export class MapSizeFixDirective implements AfterViewInit {
+  private animation: Animation;
+
+  @HostBinding('class.ready') ready = false;
+
+  constructor(
+    @Host() private map: MapComponent,
+    private viewContainerRef: ViewContainerRef,
+  ) {}
+
+  @HostListener('mapLoad')
+  mapLoad() {
+    this.map.mapInstance.resize();
+    this.ready = true;
+    const element = this.viewContainerRef.element.nativeElement as HTMLElement;
+    if (element.dispatchEvent(new CustomEvent('ready', {cancelable: true}))) {
+      this.animation.play();
+    } else {
+      this.animation.cancel();
+    }
+  }
+
+  ngAfterViewInit() {
+    const element: HTMLDivElement = this.viewContainerRef.element.nativeElement;
+    this.animation = element.animate([{opacity: 0}, {opacity: 1}], {duration: 200, fill: 'backwards'});
+    this.animation.pause();
+  }
+}

frontend/app/src/app/modules/map/map-style.directive.ts

@@ -0,0 +1,20 @@
+import {Directive, Input, Host} from '@angular/core';
+import {MapComponent} from '@maplibre/ngx-maplibre-gl';
+
+@Directive({
+  selector: 'mgl-map[styleName]',
+  standalone: true,
+})
+export class MapStyleDirective {
+  constructor(@Host() readonly map: MapComponent) {}
+
+  @Input()
+  set styleName(name: string) {
+    const style = `https://maps.server.uni-frankfurt.de/static/styles/${name}/style.json`;
+    if (this.map.style) {
+      this.map.mapInstance.setStyle(style);
+    } else {
+      this.map.style = style;
+    }
+  }
+}

frontend/app/src/app/modules/map/map-widget.component.ts

@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+import {ChangeDetectionStrategy, Component, HostBinding, Input, inject} from '@angular/core';
+import {RouterLink} from '@angular/router';
+import {ControlComponent, MapComponent, MarkerComponent} from '@maplibre/ngx-maplibre-gl';
+import {AnimationController, IonicModule} from '@ionic/angular';
+import {GeoNavigationDirective} from './geo-navigation.directive';
+import {TranslateModule} from '@ngx-translate/core';
+import {CommonModule} from '@angular/common';
+import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
+import {MapAuto3dDirective} from './map-auto-3d.directive';
+import {MediaQueryPipe} from 'src/app/util/media-query.pipe';
+import {MapStyleDirective} from './map-style.directive';
+import {MapSizeFixDirective} from './map-size-fix.directive';
+import {SCThings} from '@openstapps/core';
+import {ThingPolygonFeatureCollectionPipe, ThingPoiFeatureCollectionPipe} from './feature-collection.pipe';
+import {PoiMarkersComponent} from './elements/poi-markers.component';
+import {BuildingMarkersComponent} from './elements/building-markers.component';
+import {ThingBoundsPipe} from './thing-bounds.pipe';
+import {AttributionComponent} from './controls/attribution.component';
+import {mapMaximizeAnimation} from './map-maximize-animation';
+
+/**
+ * The map widget (needs a container with explicit size)
+ */
+@Component({
+  selector: 'stapps-map-widget',
+  styleUrls: ['./map-widget.scss'],
+  templateUrl: './map-widget.html',
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [
+    AttributionComponent,
+    BuildingMarkersComponent,
+    CommonModule,
+    ControlComponent,
+    GeoNavigationDirective,
+    IonIconModule,
+    IonicModule,
+    MapAuto3dDirective,
+    MapComponent,
+    MapSizeFixDirective,
+    MapStyleDirective,
+    MarkerComponent,
+    MediaQueryPipe,
+    PoiMarkersComponent,
+    RouterLink,
+    ThingBoundsPipe,
+    ThingPoiFeatureCollectionPipe,
+    ThingPolygonFeatureCollectionPipe,
+    TranslateModule,
+  ],
+})
+export class MapWidgetComponent {
+  @HostBinding('class.expand-when-space') expandWhenSpace = true;
+
+  /**
+   * A place to show on the map
+   */
+  @Input({required: true}) place: Extract<SCThings, {geo: object}>;
+
+  maximizeAnimation = mapMaximizeAnimation(inject(AnimationController));
+}

frontend/app/src/app/modules/map/map-widget.html

@@ -0,0 +1,51 @@
+<!--
+  ~ Copyright (C) 2022 StApps
+  ~ This program is free software: you can redistribute it and/or modify it
+  ~ under the terms of the GNU General Public License as published by the Free
+  ~ Software Foundation, version 3.
+  ~
+  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along with
+  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+  -->
+<mgl-map
+  auto-3d
+  [styleName]="('(prefers-color-scheme: dark)' | mediaQuery | async) ? 'dark' : 'light'"
+  [interactive]="false"
+  [attributionControl]="false"
+  [center]="$any(place.geo.point.coordinates)"
+  [zoom]="[16]"
+  [fitBounds]="place.geo | thingBounds"
+  [fitBoundsOptions]="{maxZoom: 15, padding: {top: 100, bottom: 50, left: 50, right: 50}}"
+>
+  @if (place.geo.polygon) {
+    <stapps-building-markers [data]="[place] | thingPolygonFeatureCollection"></stapps-building-markers>
+  } @else if (place.geo.point) {
+    <stapps-poi-markers [data]="[place] | thingPoiFeatureCollection"></stapps-poi-markers>
+  }
+  <mgl-control position="top-left">
+    <ion-button color="primary" shape="round" size="small" [geoNavigation]="place">
+      <ion-icon name="directions" slot="start"></ion-icon>
+      {{ 'map.directions.TITLE' | translate }}
+    </ion-button>
+  </mgl-control>
+  <mgl-control>
+    <ion-button
+      color="primary"
+      shape="round"
+      size="small"
+      [routerLink]="['/map']"
+      [queryParams]="{bounds: place.geo | thingBounds}"
+      [routerAnimation]="maximizeAnimation"
+    >
+      <ion-icon name="zoom_out_map"></ion-icon>
+    </ion-button>
+  </mgl-control>
+  <mgl-control position="bottom-right">
+    <stapps-map-attribution direction="left"></stapps-map-attribution>
+  </mgl-control>
+</mgl-map>

frontend/app/src/app/modules/map/map-widget.scss

@@ -19,16 +19,11 @@
   min-height: 300px;
 }
 
-div.map-container {
-  pointer-events: none;
-  display: block;
+mgl-map {
   width: 100%;
   height: 100%;
 }
 
-div.map-buttons {
-  position: absolute;
-  z-index: 10000;
-  top: 10px;
-  right: 10px;
+.marker {
+  filter: drop-shadow(0 0 2px rgba(0 0 0 / 50%));
 }

frontend/app/src/app/modules/map/map.module.ts

@@ -12,67 +12,14 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import {CommonModule} from '@angular/common';
-import {FormsModule} from '@angular/forms';
-import {RouterModule, Routes} from '@angular/router';
-import {LeafletModule} from '@asymmetrik/ngx-leaflet';
-import {LeafletMarkerClusterModule} from '@asymmetrik/ngx-leaflet-markercluster';
-import {IonicModule} from '@ionic/angular';
-import {TranslateModule} from '@ngx-translate/core';
-import {Polygon} from 'geojson';
-import {ThingTranslateModule} from '../../translation/thing-translate.module';
-import {ConfigProvider} from '../config/config.provider';
-import {DataFacetsProvider} from '../data/data-facets.provider';
-import {DataModule} from '../data/data.module';
-import {DataProvider} from '../data/data.provider';
-import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
-import {MenuModule} from '../menu/menu.module';
-import {MapProvider} from './map.provider';
-import {MapPageComponent} from './page/map-page.component';
-import {MapListModalComponent} from './page/map-list-modal.component';
+import {RouterModule} from '@angular/router';
+import {MapPageComponent} from './map-page.component';
 import {NgModule} from '@angular/core';
-import {UtilModule} from '../../util/util.module';
-import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
-import {GeoNavigationDirective} from './geo-navigation.directive';
-
-/**
- * Initializes the default area to show in advance (before components are initialized)
- * @param configProvider An instance of the ConfigProvider to read the campus polygon from
- * @param mapProvider An instance of the MapProvider to set the default polygon (area to show on the map)
- */
-export function initMapConfigFactory(configProvider: ConfigProvider, mapProvider: MapProvider) {
-  return async () => {
-    mapProvider.defaultPolygon = (await configProvider.getValue('campusPolygon')) as Polygon;
-  };
-}
-
-const mapRoutes: Routes = [
-  {path: 'map', component: MapPageComponent},
-  {path: 'map/:uid', component: MapPageComponent},
-];
 
 /**
  * Module containing map related stuff
  */
 @NgModule({
-  declarations: [MapPageComponent, MapListModalComponent],
-  exports: [],
-  imports: [
-    CommonModule,
-    IonicModule.forRoot(),
-    LeafletModule,
-    IonIconModule,
-    LeafletMarkerClusterModule,
-    RouterModule.forChild(mapRoutes),
-    TranslateModule.forChild(),
-    MenuModule,
-    DataModule,
-    FormsModule,
-    ThingTranslateModule,
-    UtilModule,
-    GeoNavigationDirective,
-    GeoNavigationDirective,
-  ],
-  providers: [Geolocation, MapProvider, DataProvider, DataFacetsProvider, StAppsWebHttpClient],
+  imports: [RouterModule.forChild([{path: 'map', component: MapPageComponent}])],
 })
 export class MapModule {}