Upload 2 files

Dockerfile

@@ -1,44 +1,18 @@
-# Dockerfile for Hugging Face Spaces - R Shiny App
-# Risk Monitoring Dashboard
+# Dockerfile for Hugging Face Spaces - R Shiny App (Lightweight version)
+# Risk Monitoring Dashboard - No leaflet dependency
 
 FROM rocker/r-ver:4.3.2
 
-# Install system dependencies for leaflet and other packages
+# Install minimal system dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
     libcurl4-openssl-dev \
     libssl-dev \
     libxml2-dev \
-    libfontconfig1-dev \
-    libfreetype6-dev \
-    libpng-dev \
-    libtiff5-dev \
-    libjpeg-dev \
-    libharfbuzz-dev \
-    libfribidi-dev \
-    libgdal-dev \
-    libgeos-dev \
-    libproj-dev \
-    libudunits2-dev \
-    libsqlite3-dev \
-    libv8-dev \
     pandoc \
-    make \
-    g++ \
     && rm -rf /var/lib/apt/lists/*
 
-# Install R packages one by one for better error handling
-RUN R -e "install.packages('shiny', repos='https://cloud.r-project.org/')"
-RUN R -e "install.packages('bslib', repos='https://cloud.r-project.org/')"
-RUN R -e "install.packages('htmltools', repos='https://cloud.r-project.org/')"
-RUN R -e "install.packages('htmlwidgets', repos='https://cloud.r-project.org/')"
-RUN R -e "install.packages('leaflet', repos='https://cloud.r-project.org/')"
-RUN R -e "install.packages('plotly', repos='https://cloud.r-project.org/')"
-RUN R -e "install.packages('DT', repos='https://cloud.r-project.org/')"
-RUN R -e "install.packages('dplyr', repos='https://cloud.r-project.org/')"
-RUN R -e "install.packages('lubridate', repos='https://cloud.r-project.org/')"
-
-# Verify leaflet is installed
-RUN R -e "library(leaflet); cat('leaflet installed successfully\n')"
+# Install R packages
+RUN R -e "install.packages(c('shiny', 'bslib', 'plotly', 'DT', 'dplyr', 'lubridate'), repos='https://cloud.r-project.org/')"
 
 # Create app directory
 WORKDIR /app

app.R

@@ -5,7 +5,7 @@
 
 library(shiny)
 library(bslib)
-library(leaflet)
+# library(leaflet)  # Replaced with plotly geo
 library(plotly)
 library(DT)
 library(dplyr)
@@ -354,7 +354,7 @@ ui <- page_navbar(
         border-radius: 2px;
       }
       
-      .leaflet-container {
+      .plotly-container {
         border-radius: 8px;
       }
       
@@ -425,7 +425,7 @@ ui <- page_navbar(
           col_widths = c(8, 4),
           card(
             card_header("世界リスクマップ"),
-            leafletOutput("risk_map", height = "350px")
+            plotlyOutput("risk_map", height = "350px")
           ),
           layout_columns(
             col_widths = 12,
@@ -682,48 +682,53 @@ server <- function(input, output, session) {
   })
   
   # ----- リスクマップ -----
-  output$risk_map <- renderLeaflet({
-    leaflet(country_data) %>%
-      addProviderTiles(providers$CartoDB.Positron) %>%
-      setView(lng = 20, lat = 20, zoom = 2) %>%
-      addCircleMarkers(
-        ~lng, ~lat,
-        radius = ~sqrt(risk_score) * 1.5,
-        color = ~ifelse(risk_score >= 70, "#E53E3E",
-                       ifelse(risk_score >= 40, "#DD6B20", "#38A169")),
-        fillOpacity = 0.7,
-        stroke = TRUE,
-        weight = 2,
-        popup = ~paste0(
-          "<strong>", country_jp, "</strong><br>",
-          "リスクスコア: <span style='color:", 
-          ifelse(risk_score >= 70, "#E53E3E",
-                ifelse(risk_score >= 40, "#DD6B20", "#38A169")),
-          "; font-weight: bold;'>", risk_score, "</span><br>",
+  output$risk_map <- renderPlotly({
+    # Color based on risk score
+    colors <- sapply(country_data$risk_score, function(s) {
+      if (s >= 70) "#E53E3E"
+      else if (s >= 40) "#DD6B20"
+      else "#38A169"
+    })
+    
+    plot_geo(country_data, locationmode = 'world') %>%
+      add_markers(
+        x = ~lng,
+        y = ~lat,
+        size = ~risk_score,
+        color = I(colors),
+        text = ~paste0(
+          "<b>", country_jp, "</b><br>",
+          "リスクスコア: ", risk_score, "<br>",
           "地域: ", region
+        ),
+        hoverinfo = "text",
+        marker = list(
+          sizemode = 'diameter',
+          sizeref = 2,
+          opacity = 0.7,
+          line = list(width = 1, color = 'white')
         )
+      ) %>%
+      layout(
+        geo = list(
+          scope = 'world',
+          projection = list(type = 'natural earth'),
+          showland = TRUE,
+          landcolor = toRGB("gray95"),
+          showocean = TRUE,
+          oceancolor = toRGB("lightblue"),
+          showcountries = TRUE,
+          countrycolor = toRGB("gray80"),
+          showframe = FALSE
+        ),
+        margin = list(l = 0, r = 0, t = 0, b = 0)
       )
   })
   
-  # マップの選択国ハイライト
-  observe({
-    current <- selected_country()
-    current_data <- country_data %>% filter(country == current)
-    
-    leafletProxy("risk_map") %>%
-      clearGroup("highlight") %>%
-      addCircleMarkers(
-        data = current_data,
-        ~lng, ~lat,
-        radius = 20,
-        color = "#FF6B35",
-        fillOpacity = 0,
-        stroke = TRUE,
-        weight = 3,
-        group = "highlight"
-      )
-  })
-  
+  # マップの選択国ハイライト（plotlyでは動的ハイライトを簡略化）
+  # Note: plotlyでは leafletProxy のような動的更新が異なるため、
+  # 選択国のハイライトはクリックイベントで対応
+
   # ----- メトリクス -----
   output$high_risk_count <- renderText({
     sum(country_data$risk_score >= 70)