feat: implement OpenFreeMap vector styles and a hybrid Sentinel-2 basemap with dynamic label visibility, replacing previous basemap options.

global.R

@@ -10,6 +10,14 @@ library(plotly)
 library(writexl)
 
 
+# OpenFreeMap Style URLs
+ofm_positron_style <- "https://tiles.openfreemap.org/styles/positron"
+ofm_bright_style <- "https://tiles.openfreemap.org/styles/bright"
+
+# EOX Sentinel-2 Cloudless (Free for commercial use with attribution)
+sentinel_url <- "https://tiles.maps.eox.at/wmts/1.0.0/s2cloudless-2023_3857/default/GoogleMapsCompatible/{z}/{y}/{x}.jpg"
+sentinel_attribution <- '<a href="https://s2maps.eu" target="_blank">Sentinel-2 cloudless - by EOX IT Services GmbH</a> (Contains modified Copernicus Sentinel data 2023)'
+
 # Load Data
 stations_file <- "data/jma_stations_full.csv"
 if (!file.exists(stations_file)) {

server.R

@@ -267,7 +267,7 @@ server <- function(input, output, session) {
 
     output$map <- renderMaplibre({
         maplibre(
-            style = "https://basemaps.cartocdn.com/gl/positron-gl-style/style.json",
+            style = ofm_positron_style,
             center = c(138, 36),
             zoom = 4
         ) %>%
@@ -318,9 +318,66 @@ server <- function(input, output, session) {
         }
     })
 
-    # --- Basemap Switching ---
+    # --- Basemap Switching Logic ---
+    label_layer_ids <- c(
+        # OpenFreeMap Positron & Bright common labels
+        "waterway_line_label", "water_name_point_label", "water_name_line_label",
+        "highway-name-path", "highway-name-minor", "highway-name-major",
+        "highway-shield-non-us", "highway-shield-us-interstate", "road_shield_us",
+        "airport", "label_other", "label_village", "label_town", "label_state",
+        "label_city", "label_city_capital", "label_country_3", "label_country_2", "label_country_1",
+        # Bright specific labels (POIs & Directions)
+        "road_oneway", "road_oneway_opposite", "poi_r20", "poi_r7", "poi_r1", "poi_transit",
+        # Dash variants (sometimes used in different versions)
+        "waterway-line-label", "water-name-point-label", "water-name-line-label",
+        "highway-shield-non-us", "highway-shield-us-interstate", "road-shield-us",
+        "label-other", "label-village", "label-town", "label-state",
+        "label-city", "label-city-capital", "label-country-3", "label-country-2", "label-country-1",
+        # Legacy/Carto/OSM label names (for compatibility)
+        "place_villages", "place_town", "place_country_2", "place_country_1",
+        "place_state", "place_continent", "place_city_r6", "place_city_r5",
+        "place_city_dot_r7", "place_city_dot_r4", "place_city_dot_r2", "place_city_dot_z7",
+        "place_capital_dot_z7", "place_capital", "roadname_minor", "roadname_sec",
+        "roadname_pri", "roadname_major", "motorway_name", "watername_ocean",
+        "watername_sea", "watername_lake", "watername_lake_line", "poi_stadium",
+        "poi_park", "poi_zoo", "airport_label", "country-label", "state-label",
+        "settlement-major-label", "settlement-minor-label", "settlement-subdivision-label",
+        "road-label", "waterway-label", "natural-point-label", "poi-label", "airport-label"
+    )
+
+    # Layers to hide in Satellite (Hybrid) mode to let the raster shows through
+    # This includes all non-symbol layers (background, water, roads, boundaries, etc.)
+    non_label_layer_ids <- c(
+        "background", "park", "water", "landcover_ice_shelf", "landcover_glacier",
+        "landuse_residential", "landcover_wood", "waterway", "building",
+        "tunnel_motorway_casing", "tunnel_motorway_inner", "aeroway-taxiway",
+        "aeroway-runway-casing", "aeroway-area", "aeroway-runway",
+        "road_area_pier", "road_pier", "highway_path", "highway_minor",
+        "highway_major_casing", "highway_major_inner", "highway_major_subtle",
+        "highway_motorway_casing", "highway_motorway_inner", "highway_motorway_subtle",
+        "railway_transit", "railway_transit_dashline", "railway_service",
+        "railway_service_dashline", "railway", "railway_dashline",
+        "highway_motorway_bridge_casing", "highway_motorway_bridge_inner",
+        "boundary_3", "boundary_2", "boundary_disputed"
+    )
+
+    apply_label_visibility <- function(proxy, show_labels) {
+        visibility <- if (isTRUE(show_labels)) "visible" else "none"
+        for (layer_id in label_layer_ids) {
+            tryCatch(
+                {
+                    proxy %>% set_layout_property(layer_id, "visibility", visibility)
+                },
+                error = function(e) {
+                    # Layer may not exist in current style, ignore silently
+                }
+            )
+        }
+    }
+
     observeEvent(input$basemap, {
         proxy <- maplibre_proxy("map")
+        basemap <- input$basemap
 
         # Explicitly remove any previously added raster layers
         old_layers <- isolate(current_raster_layers())
@@ -331,28 +388,21 @@ server <- function(input, output, session) {
             current_raster_layers(character(0))
         }
 
-        if (input$basemap %in% c("carto_positron", "carto_voyager")) {
-            # VECTOR LOGIC (Carto-based styles)
-            style_url <- switch(input$basemap,
-                "carto_positron" = "https://basemaps.cartocdn.com/gl/positron-gl-style/style.json",
-                "carto_voyager" = "https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json"
+        if (basemap %in% c("ofm_positron", "ofm_bright")) {
+            # VECTOR LOGIC (OpenFreeMap styles)
+            style_url <- switch(basemap,
+                "ofm_positron" = ofm_positron_style,
+                "ofm_bright" = ofm_bright_style
             )
 
             proxy %>%
-                set_style(style_url)
+                set_style(style_url, preserve_layers = FALSE)
 
-            # For vector sandwich, we want stations below labels
-            stations_before_id("watername_ocean")
-            style_change_trigger(isolate(style_change_trigger()) + 1)
-        } else if (input$basemap == "esri_imagery") {
-            # Esri Imagery (Raster + Styles?) - DWD implementation uses Voyager style base + Raster layer
-            proxy %>%
-                set_style("https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json")
-
-            stations_before_id("watername_ocean")
+            # For OpenFreeMap sandwich, we want stations below labels
+            stations_before_id("waterway_line_label")
 
             current_session <- shiny::getDefaultReactiveDomain()
-            selected_basemap <- input$basemap
+            selected_basemap <- basemap
 
             later::later(function() {
                 shiny::withReactiveDomain(current_session, {
@@ -362,61 +412,19 @@ server <- function(input, output, session) {
                         return()
                     }
 
-                    unique_suffix <- as.numeric(Sys.time()) * 1000
-                    source_id <- paste0("esri_imagery_source_", unique_suffix)
-                    layer_id <- paste0("esri_imagery_layer_", unique_suffix)
-
-                    esri_url <- "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}"
-
-                    maplibre_proxy("map") %>%
-                        add_raster_source(id = source_id, tiles = c(esri_url), tileSize = 256) %>%
-                        add_layer(
-                            id = layer_id,
-                            type = "raster",
-                            source = source_id,
-                            paint = list("raster-opacity" = 1),
-                            before_id = "watername_ocean"
-                        )
-
-                    current_raster_layers(c(layer_id))
+                    # Trigger re-render of stations and apply label visibility
+                    apply_label_visibility(maplibre_proxy("map"), isolate(input$show_labels))
                     style_change_trigger(isolate(style_change_trigger()) + 1)
                 })
             }, delay = 0.5)
-        } else {
-            # RASTER LOGIC (Esri Topo, OSM)
-            tile_url <- if (input$basemap %in% c("osm", "osm_gray")) {
-                "https://tile.openstreetmap.org/{z}/{x}/{y}.png"
-            } else {
-                "https://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}"
-            }
-
-            attribution_text <- if (input$basemap %in% c("osm", "osm_gray")) {
-                '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
-            } else {
-                "Tiles &copy; Esri"
-            }
-
-            paint_props <- list("raster-opacity" = 1)
-            if (input$basemap == "osm_gray") {
-                paint_props[["raster-saturation"]] <- -0.9
-                paint_props[["raster-contrast"]] <- 0.3
-            }
-
-            # Use blank style + raster layer
-            blank_style <- list(
-                version = 8,
-                sources = list(),
-                layers = list(),
-                metadata = list(timestamp = as.numeric(Sys.time()))
-            )
-            json_blank <- jsonlite::toJSON(blank_style, auto_unbox = TRUE)
-            blank_uri <- paste0("data:application/json,", URLencode(as.character(json_blank), reserved = TRUE))
-
+        } else if (basemap == "sentinel") {
+            # HYBRID LOGIC (EOX Sentinel-2 Satellite + OpenFreeMap Labels/Roads)
+            # Use Positron as the base for labels/roads
             proxy %>%
-                set_style(blank_uri)
+                set_style(ofm_positron_style, preserve_layers = FALSE)
 
             current_session <- shiny::getDefaultReactiveDomain()
-            selected_basemap <- input$basemap
+            selected_basemap <- basemap
 
             later::later(function() {
                 shiny::withReactiveDomain(current_session, {
@@ -426,19 +434,37 @@ server <- function(input, output, session) {
                     }
 
                     unique_suffix <- as.numeric(Sys.time()) * 1000
-                    source_id <- paste0("raster_source_", unique_suffix)
-                    layer_id <- paste0("raster_layer_", unique_suffix)
+                    source_id <- paste0("sentinel_source_", unique_suffix)
+                    layer_id <- paste0("sentinel_layer_", unique_suffix)
 
+                    # Add Sentinel layer at the very bottom (before 'background')
                     maplibre_proxy("map") %>%
-                        add_raster_source(id = source_id, tiles = c(tile_url), tileSize = 256, attribution = attribution_text) %>%
+                        add_raster_source(id = source_id, tiles = sentinel_url, tileSize = 256, attribution = sentinel_attribution) %>%
                         add_layer(
                             id = layer_id,
                             type = "raster",
                             source = source_id,
-                            paint = paint_props
+                            paint = list("raster-opacity" = 1),
+                            before_id = "background"
+                        )
+
+                    # Hide all non-label vector layers so only satellite + symbols show
+                    for (layer_id_kill in non_label_layer_ids) {
+                        tryCatch(
+                            {
+                                maplibre_proxy("map") %>% set_layout_property(layer_id_kill, "visibility", "none")
+                            },
+                            error = function(e) {
+                                # Layer might not exist, ignore
+                            }
                         )
+                    }
+
+                    # Ensure labels according to user preference
+                    apply_label_visibility(maplibre_proxy("map"), isolate(input$show_labels))
 
-                    stations_before_id(NULL)
+                    # Stations should be above the satellite layer
+                    stations_before_id("waterway_line_label")
                     current_raster_layers(c(layer_id))
                     style_change_trigger(isolate(style_change_trigger()) + 1)
                 })
@@ -449,36 +475,7 @@ server <- function(input, output, session) {
     # Toggle Labels visibility
     observeEvent(input$show_labels,
         {
-            visibility <- if (input$show_labels) "visible" else "none"
-
-            label_layers <- c(
-                "place_villages", "place_town", "place_country_2", "place_country_1",
-                "place_state", "place_continent",
-                "place_city_r6", "place_city_r5", "place_city_dot_r7", "place_city_dot_r4",
-                "place_city_dot_r2", "place_city_dot_z7",
-                "place_capital_dot_z7", "place_capital",
-                "roadname_minor", "roadname_sec", "roadname_pri", "roadname_major",
-                "motorway_name",
-                "watername_ocean", "watername_sea", "watername_lake", "watername_lake_line",
-                "poi_stadium", "poi_park", "poi_zoo",
-                "airport_label",
-                "country-label", "state-label", "settlement-major-label", "settlement-minor-label",
-                "settlement-subdivision-label", "road-label", "waterway-label", "natural-point-label",
-                "poi-label", "airport-label"
-            )
-
-            proxy <- maplibre_proxy("map")
-
-            for (layer_id in label_layers) {
-                tryCatch(
-                    {
-                        proxy <- proxy %>% set_layout_property(layer_id, "visibility", visibility)
-                    },
-                    error = function(e) {
-                        # Layer may not exist in current style, ignore silently
-                    }
-                )
-            }
+            apply_label_visibility(maplibre_proxy("map"), input$show_labels)
         },
         ignoreInit = TRUE
     )

ui.R

@@ -97,14 +97,11 @@ ui <- page_navbar(
                         inputId = "basemap",
                         label = "Basemap",
                         choices = c(
-                            "Carto Positron (Light)" = "carto_positron",
-                            "Carto Voyager" = "carto_voyager",
-                            "OpenStreetMap" = "osm",
-                            "OpenStreetMap Gray" = "osm_gray",
-                            "Esri World Topo Map" = "esri_topo",
-                            "Esri World Imagery" = "esri_imagery"
+                            "OpenFreeMap Positron" = "ofm_positron",
+                            "OpenFreeMap Bright" = "ofm_bright",
+                            "Satellite (Sentinel-2)" = "sentinel"
                         ),
-                        selected = "carto_positron"
+                        selected = "ofm_positron"
                     ),
                     hr(style = "margin: 8px 0;"),
                     checkboxInput(