Feature 1718: Layer Refactoring - API-Anbindung

.github/workflows/code-quality.yml

@@ -92,7 +92,7 @@ jobs:
         with:
           path: ./ui/node_modules
           key: "${{ runner.os }}-node_modules-${{ env.NODE_VERSION }}-${{ hashFiles('./ui/package-lock.json') }}"
-      - name: Run build
+      - name: Run check
         run: cd ui && npm run check
 
 

api/Dockerfile

@@ -23,13 +23,14 @@ ENV APP_VERSION=${APP_VERSION}
 ENV COLORMAP_DIR_PATH="/app/colormaps"
 ENV LAYERS_FILE=/configs/layers/layers.json5
 
-RUN apk add --no-cache util-linux
+RUN apk add --no-cache util-linux curl
 
 WORKDIR /app
 
 COPY --from=build /app/target/x86_64-unknown-linux-musl/release/api ./
 COPY ./titiler/colormaps /app/colormaps
 
 EXPOSE 3000
+HEALTHCHECK --interval=30s --timeout=5s --retries=3 CMD curl -f http://localhost:3000/api/health_check || exit 1
 
 CMD ["/app/api"]

api/DockerfileDev

@@ -21,5 +21,8 @@ COPY ./titiler/colormaps /app/colormaps
 
 RUN chmod +x start.sh
 
+EXPOSE 3000
+HEALTHCHECK --interval=30s --timeout=5s --retries=3 CMD curl -f http://localhost:3000/api/health_check || exit 1
+
 # Make sure the start.sh script has LF line endings!
 CMD ["./start.sh"]

ui/DockerfileDev

@@ -5,7 +5,6 @@ ENV NODE_ENV=development
 ARG GITHUB_TOKEN
 ENV GITHUB_TOKEN=${GITHUB_TOKEN}
 
-
 RUN apk add --no-cache git bash \
   && npm update -g npm
 

ui/docs/layers.md

@@ -0,0 +1,22 @@
+# Layers
+
+_Layers_ are visual data sources that are rendered on the Viewer's map.
+They represent the application's core data and are subject to most of its functions.
+
+## Configuration
+
+Layers are configured in [layers/layers.json5](../../layers/layers.json5) and exposed via the API.
+
+## Types of Layers
+
+A layer's type defines how it is defined, fetched, displayed, as well as what can be done with it.
+Layers are divided into the following types:
+
+- `Swisstopo` layers are [WMS](https://www.geo.admin.ch/de/wms-verfuegbare-dienste-und-daten/) or
+  [WMTS](https://www.geo.admin.ch/de/wmts-verfuegbare-dienste-und-daten/) layers fetched from their respective `geo.admin.ch` API.
+  They are flat map overlays.
+- `Tiff` layers are [GeoTIFF](https://www.earthdata.nasa.gov/about/esdis/esco/standards-practices/geotiff) files.
+  They are flat map overlays that support multiple datasets on a single layer.
+- `Tiles3d` layers are [3D Tiles](https://cesium.com/why-cesium/3d-tiles/).
+  These support displaying of 3d shapes of varying numbers, types, shapes and sizes.
+- `Voxel` layers are collections of 3d voxel tiles.

ui/locales/app/app.de.json

@@ -1,11 +1,7 @@
 {
-  "menu_layers": "Angezeigte Daten",
-  "menu_tools": "Werkzeuge",
-  "menu_share": "Teilen",
-  "menu_projects": "Projekte",
-  "menu_settings": "Einstellungen",
   "accept": "Akzeptieren",
-  "app_cancel_btn_label": "Abbrechen",
+  "cancel": "Abbrechen",
+
   "app_close_btn_label": "Schliessen",
   "by": "von",
   "cam_configuration_header": "Kamera-Einstellungen",
@@ -21,7 +17,6 @@
   "camera_position_height_label": "Höhe",
   "camera_position_height_unit": "(m. ü. OKT)",
   "camera_position_pitch_label": "Neigungswinkel",
-  "cancel": "Abbrechen",
   "contact_mailto_text": "Kontakt",
   "created_on": "Erstellt am",
   "dashboard_add_view": "Ansicht hinzufügen",
@@ -62,54 +57,34 @@
   "dtd_add_ion_asset_btn": "Hinzufügen",
   "dtd_add_ion_token": "Inhalte von Cesium ion hinzufügen",
   "dtd_ion_token_info": "Fügen sie 3D-Geodaten über die Cesium ion Plattform hinzu. Cesium ion bietet Zugriff auf Inhalte wie Bing Maps-Satellitenbilder oder Cesium OSM Buildings. Diese Daten lassen sich mit eigenen 3D-Geodaten kombinieren.",
-  "dtd_kml_upload_button_title": "KML Daten hochladen",
-  "dtd_kml_upload_button_subtitle": "Klicken um eine Datei auszuwählen, oder ziehen Sie eine Datei per Drag & Drop hierher",
-  "dtd_upload_modal_title": "Upload",
-  "dtd_kml_add_button_label": "Hinzufügen",
   "dtd_aerial_map_label": "Luftbild",
   "dtd_all_label": "Alle",
   "dtd_asset_exists_info": "Datensatz bereits hinzugefügt",
   "dtd_asset_added": "Daten hinzugefügt",
-  "dtd_cant_upload_kml_error": "Fehler beim Hochladen von KML",
-  "dtd_clamp_to_ground": "Auf Terrain legen",
   "dtd_displayed_data_label": "Angezeigte Daten",
   "dtd_download_hint": "Herunterladen / Legende",
-  "dtd_exaggeration_map": "Vertikale Überhöhung",
-  "dtd_file_not_kml": "Dateiformat wird nicht unterstützt. Nur KML erlaubt.",
   "dtd_grey_map_label": "Karte Grau",
   "dtd_hide": "Hintergrundkarte verbergen",
-  "dtd_hide_exaggeration": "Vertikale Überhöhung verbergen",
   "dtd_ion_token_label": "Cesium Ion Token",
   "dtd_lakes_rivers_map_label": "Seen & Flüsse",
   "dtd_legend": "Legende",
   "dtd_documentation": "Dokumentation",
   "dtd_load_ion_assets_btn": "Datensätze laden",
-  "dtd_max_size_exceeded_warn": "Maximale Dateigröße beträgt ",
-  "dtd_no_file_to_upload_warn": "Keine Datei vorhanden",
   "dtd_object_on_coordinates_not_found_warning": "Objekt wurde nicht gefunden oder Kamera wurde von initialer Position wegbewegt",
   "dtd_opacity": "Deckkraft",
   "dtd_remove": "Entfernen",
   "dtd_remove_assets_confirmation": "Token hat geändert, aktuelle Datensätze werden entfernt",
   "dtd_show": "Hintergrundkarte anzeigen",
-  "dtd_show_exaggeration": "Vertikale Überhöhung anzeigen",
   "dtd_time_journey": "Zeitreise",
   "dtd_voxel_filter": "Filter öffnen",
   "dtd_zoom_to": "Heranzoomen",
-  "dtd_tab_labels": {
-    "catalog": "Datenkatalog",
-    "upload": "Upload",
-    "options": "Einstellungen"
-  },
   "dtd_background_label": "Hintergrund",
   "duplicate_to_project": "Zu Projekt duplizieren",
   "edit_project": "Projekt bearbeiten",
   "header_search_placeholder": "Suche nach...",
   "search_placeholder": "Suche...",
   "lsb_cesium_toolbar_label": "Cesium-Toolbar",
   "lsb_debug_tools": "Debugtools",
-  "lsb_settings": "Einstellungen",
-  "lsb_share": "Teilen",
-  "lsb_tools": "Werkzeuge",
   "lyr_3d_model_berne_label": "3D-Modell Stadt Bern",
   "lyr_base_cenozoic_label": "Basis Känozoikum",
   "lyr_base_mesozoic_label": "Basis Mesozoikum",

ui/locales/app/app.en.json

@@ -1,11 +1,7 @@
 {
-  "menu_layers": "Data displayed",
-  "menu_tools": "Tools",
-  "menu_share": "Share",
-  "menu_projects": "Projects",
-  "menu_settings": "Settings",
   "accept": "Accept",
-  "app_cancel_btn_label": "Cancel",
+  "cancel": "Cancel",
+
   "app_close_btn_label": "Close",
   "by": "by",
   "cam_configuration_header": "Camera configuration",
@@ -21,7 +17,6 @@
   "camera_position_height_label": "Height",
   "camera_position_height_unit": "(m AGL)",
   "camera_position_pitch_label": "Pitch",
-  "cancel": "Cancel",
   "contact_mailto_text": "Contact",
   "created_on": "Created on",
   "dashboard_add_view": "Add view",
@@ -60,56 +55,35 @@
   "disclaimer_href": "https://www.swissgeol.ch/en/impressum",
   "disclaimer_text": "Copyright & data protection",
   "dtd_add_ion_asset_btn": "Add",
-  "dtd_add_ion_token": "Add content from Cesium ion",
   "dtd_ion_token_info": "Add 3D geodata via the Cesium ion platform. Cesium ion offers access to content such as Bing Maps satellite images or Cesium OSM Buildings. This data can be combined with your own 3D geodata.",
-  "dtd_kml_upload_button_title": "Upload KML data",
-  "dtd_kml_upload_button_subtitle": "Click to browse, or drag & drop a file here",
-  "dtd_upload_modal_title": "Upload",
-  "dtd_kml_add_button_label": "Add",
   "dtd_aerial_map_label": "Aerial map",
   "dtd_all_label": "All",
   "dtd_asset_exists_info": "Dataset already added",
   "dtd_asset_added": "Data added",
-  "dtd_cant_upload_kml_error": "Error while uploading KML",
-  "dtd_clamp_to_ground": "Clamp to terrain",
   "dtd_displayed_data_label": "Data displayed",
   "dtd_download_hint": "Download / Legend",
-  "dtd_exaggeration_map": "Vertical exaggeration",
-  "dtd_file_not_kml": "File format not supported. Only KML can be uploaded.",
   "dtd_grey_map_label": "Grey map",
   "dtd_hide": "Hide",
-  "dtd_hide_exaggeration": "Hide exaggeration",
   "dtd_ion_token_label": "Cesium Ion Token",
   "dtd_lakes_rivers_map_label": "Lakes & rivers",
   "dtd_legend": "Legend",
   "dtd_documentation": "Documentation",
   "dtd_load_ion_assets_btn": "Load the list of dataset",
-  "dtd_max_size_exceeded_warn": "Maximum file size is ",
-  "dtd_no_file_to_upload_warn": "No file to upload",
   "dtd_object_on_coordinates_not_found_warning": "Object not found or you moved camera away from initial position",
   "dtd_opacity": "Opacity",
   "dtd_remove": "Remove",
   "dtd_remove_assets_confirmation": "Token changed, current datasets will be removed.",
   "dtd_show": "Show",
-  "dtd_show_exaggeration": "Show exaggeration",
   "dtd_time_journey": "Journey through time",
   "dtd_voxel_filter": "Open Filter",
   "dtd_zoom_to": "Zoom to",
-  "dtd_tab_labels": {
-    "catalog": "Data Catalog",
-    "upload": "Upload",
-    "options": "Options"
-  },
   "dtd_background_label": "Background",
   "duplicate_to_project": "Duplicate to my projects",
   "edit_project": "Edit project",
   "header_search_placeholder": "Search by...",
   "search_placeholder": "Search...",
   "lsb_cesium_toolbar_label": "Cesium Toolbar",
   "lsb_debug_tools": "Debug tools",
-  "lsb_settings": "Settings",
-  "lsb_share": "Share",
-  "lsb_tools": "Tools",
   "lyr_3d_model_berne_label": "City of Bern",
   "lyr_3d_local_models_label": "Local 3D models",
   "lyr_base_cenozoic_label": "Base Cenozoic",

ui/locales/app/app.fr.json

@@ -1,11 +1,7 @@
 {
-  "menu_layers": "Données Affichées",
-  "menu_tools": "Outils",
-  "menu_share": "Partager",
-  "menu_projects": "Projets",
-  "menu_settings": "Paramètres",
   "accept": "Accepter",
-  "app_cancel_btn_label": "Annuler",
+  "cancel": "Annuler",
+
   "app_close_btn_label": "Fermer",
   "by": "de",
   "cam_configuration_header": "Configuration de la caméra",
@@ -21,7 +17,6 @@
   "camera_position_height_label": "Altitude",
   "camera_position_height_unit": "(m AGL)",
   "camera_position_pitch_label": "Inclinaison",
-  "cancel": "Annuler",
   "contact_mailto_text": "Contact",
   "created_on": "Créé le",
   "dashboard_add_view": "Ajouter une vue",
@@ -60,56 +55,35 @@
   "disclaimer_href": "https://www.swissgeol.ch/fr/impressum",
   "disclaimer_text": "Conditions d'utilisation",
   "dtd_add_ion_asset_btn": "Ajouter",
-  "dtd_add_ion_token": "Ajouter du contenu à propos de l'ion césium",
   "dtd_ion_token_info": "Cesium ion donne accès à des contenus tels que les images satellites Bing Maps ou Cesium OSM Buildings. Ces données peuvent être combinées avec vos propres géodonnées 3D.",
-  "dtd_kml_upload_button_title": "Télécharger des données KML",
-  "dtd_kml_upload_button_subtitle": "Cliquez pour naviguer, ou glissez-déposez un fichier ici",
-  "dtd_upload_modal_title": "Upload",
-  "dtd_kml_add_button_label": "Ajouter",
   "dtd_aerial_map_label": "Carte aérienne",
   "dtd_all_label": "Tous",
   "dtd_asset_exists_info": "Ensemble de données déjà ajouté",
   "dtd_asset_added": "Données ajoutées",
-  "dtd_cant_upload_kml_error": "Erreur lors du téléchargement de KML",
-  "dtd_clamp_to_ground": "Fixation au terrain",
   "dtd_displayed_data_label": "Données affichées",
   "dtd_download_hint": "Télécharger / Légende",
-  "dtd_exaggeration_map": "Exagération verticale",
-  "dtd_file_not_kml": "Format pas pris en charge. Seulement en format KML.",
   "dtd_grey_map_label": "Carte en niveaux de gris",
   "dtd_hide": "Cacher",
-  "dtd_hide_exaggeration": "Cacher l'exagération",
   "dtd_ion_token_label": "Cesium Ion Token",
   "dtd_lakes_rivers_map_label": "Lacs et rivières",
   "dtd_legend": "Légende",
   "dtd_documentation": "Documentation",
   "dtd_load_ion_assets_btn": "Charger la liste des jeux de données",
-  "dtd_max_size_exceeded_warn": "La taille maximale du fichier est de ",
-  "dtd_no_file_to_upload_warn": "Aucun fichier à télécharger",
   "dtd_object_on_coordinates_not_found_warning": "Objet non trouvé ou caméra éloignée de sa position initiale",
   "dtd_opacity": "Opacité",
   "dtd_remove": "Enlever",
   "dtd_remove_assets_confirmation": "Token a changé, les données actuelles seront supprimées",
   "dtd_show": "Afficher",
-  "dtd_show_exaggeration": "Montrer l'exagération",
   "dtd_time_journey": "Voyage dans le temps",
   "dtd_voxel_filter": "Ouvrir le filtre",
   "dtd_zoom_to": "Zoom sur",
-  "dtd_tab_labels": {
-    "catalog": "Catalogue de données",
-    "upload": "Upload",
-    "options": "Réglages"
-  },
   "dtd_background_label": "Fond",
   "duplicate_to_project": "Dupliquer comme projet",
   "edit_project": "Editer projet",
   "header_search_placeholder": "Recherche par...",
   "search_placeholder": "Recherche...",
   "lsb_cesium_toolbar_label": "Cesium Toolbar",
   "lsb_debug_tools": "Debug tools",
-  "lsb_settings": "Paramètres",
-  "lsb_share": "Partager",
-  "lsb_tools": "Outils",
   "lyr_3d_model_berne_label": "Modèle 3D Ville de Berne",
   "lyr_base_cenozoic_label": "Base du Cénozoïque",
   "lyr_base_mesozoic_label": "Base du Mésozoïque",

ui/locales/app/app.it.json

@@ -1,11 +1,12 @@
 {
+  "accept": "Accettare",
+  "cancel": "Cancellare",
+
   "menu_layers": "Dati Visualizzati",
   "menu_tools": "Strumenti",
   "menu_share": "Condividi",
   "menu_projects": "Progetti",
   "menu_settings": "Impostazioni",
-  "accept": "Accettare",
-  "app_cancel_btn_label": "Cancellare",
   "app_close_btn_label": "Chiudere",
   "by": "di",
   "cam_configuration_header": "Configurazione della camera",
@@ -21,7 +22,6 @@
   "camera_position_height_label": "Altitudine",
   "camera_position_height_unit": "(m AGL)",
   "camera_position_pitch_label": "Inclinazione",
-  "cancel": "Annullare",
   "contact_mailto_text": "Contatto",
   "created_on": "Creato lo",
   "dashboard_add_view": "Aggiungi vista",
@@ -60,56 +60,35 @@
   "disclaimer_href": "https://www.swissgeol.ch/it/impressum",
   "disclaimer_text": "Copyright e dichiarazione della protezione dei diritti d'autore",
   "dtd_add_ion_asset_btn": "Aggiungi",
-  "dtd_add_ion_token": "Aggiunta di contenuti da cesium ion",
   "dtd_ion_token_info": "Aggiungere geodati 3D tramite la piattaforma Cesium ion. Cesium ion offre l'accesso a contenuti come le immagini satellitari di Bing Maps o gli edifici OSM di Cesium. Questi dati possono essere combinati con i propri geodati 3D.",
-  "dtd_kml_upload_button_title": "Caricare dati KML",
-  "dtd_kml_upload_button_subtitle": "Fare clic per sfogliare o trascinare un file qui",
-  "dtd_upload_modal_title": "Upload",
-  "dtd_kml_add_button_label": "Aggiungi",
   "dtd_aerial_map_label": "Foto aerea",
   "dtd_all_label": "Tutti",
   "dtd_asset_exists_info": "Set di dati già aggiunto",
   "dtd_asset_added": "Dati aggiunti",
-  "dtd_cant_upload_kml_error": "Errore nel download di KML",
-  "dtd_clamp_to_ground": "Morsetto al terreno",
   "dtd_displayed_data_label": "Dati mostrati",
   "dtd_download_hint": "Scaricare / Scala",
-  "dtd_exaggeration_map": "Esagerazione verticale",
-  "dtd_file_not_kml": "Il formato non è supportato. Solo KML supportato.",
   "dtd_grey_map_label": "Mappa in scala di grigi",
   "dtd_hide": "Nascondere",
-  "dtd_hide_exaggeration": "Nascondere l'esagerazione",
   "dtd_ion_token_label": "Cesium Ion Token",
   "dtd_lakes_rivers_map_label": "Laghi e fiumi",
   "dtd_legend": "Leggenda",
   "dtd_documentation": "Documentazione",
   "dtd_load_ion_assets_btn": "Carica l'elenco dei set di dati",
-  "dtd_max_size_exceeded_warn": "La dimensione massima del file è ",
-  "dtd_no_file_to_upload_warn": "Nessun file da scaricare",
   "dtd_object_on_coordinates_not_found_warning": "Oggetto non trovato o camera spostata dalla sua posizione originale",
   "dtd_opacity": "Opacità",
   "dtd_remove": "Rimuovere",
   "dtd_remove_assets_confirmation": "Il token è stato modificato, i set di dati attuali saranno rimossi.",
   "dtd_show": "Mostrare",
-  "dtd_show_exaggeration": "Mostra l'esagerazione",
   "dtd_time_journey": "Viaggio nel tempo",
   "dtd_voxel_filter": "Aprire il filtro",
   "dtd_zoom_to": "Zoom su",
-  "dtd_tab_labels": {
-    "catalog": "Catalogo di dati",
-    "upload": "Upload",
-    "options": "Impostazioni"
-  },
   "dtd_background_label": "Sfondo",
   "duplicate_to_project": "Duplicare nei progetti",
   "edit_project": "Editare progetto",
   "header_search_placeholder": "Ricercare per...",
   "search_placeholder": "Ricercare...",
   "lsb_cesium_toolbar_label": "Cesium Toolbar",
   "lsb_debug_tools": "Debug tools",
-  "lsb_settings": "Impostazioni",
-  "lsb_share": "Condividere",
-  "lsb_tools": "Strumenti",
   "lyr_3d_model_berne_label": "Modello 3D Città di Berna",
   "lyr_base_cenozoic_label": "Base del Cenozoico",
   "lyr_base_mesozoic_label": "Base del Mesozoico",