fix #385 - handle missing bos&natuur ha

inbo · Jun 6, 2024 · a9d6da8 · a9d6da8
1 parent 9186c0a
commit a9d6da8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/reporting-grofwild/R/mapFlanders.R b/reporting-grofwild/R/mapFlanders.R
@@ -117,6 +117,11 @@ createSpaceData <- function(data, allSpatialData, biotoopData,
       tmpData <- biotoopData[, c("regio", areaVariable)]
 
     colnames(tmpData) <- c("NAAM", "AREA")
+
+    if (unit == "relativeDekking")
+      # cut-off at 100ha bos&natuur #385
+      tmpData$AREA[tmpData$AREA < 1] <- NA
+
     fullData$AREA <- NULL
     fullData <- merge(fullData, tmpData)
   }
@@ -210,7 +215,7 @@ createSpaceData <- function(data, allSpatialData, biotoopData,
 
   # unit taken into account
   if (grepl("relative", unit))
-    summaryData2$freq <- summaryData2$freq/summaryData2$AREA 
+    summaryData2$freq <- ifelse(summaryData2$freq == 0, 0, summaryData2$freq/summaryData2$AREA)
 
 
   # Create group variable
@@ -366,9 +371,6 @@ mapFlanders <- function(
 
   }
 
-
-  palette <- colorFactor(palette = colorScheme, levels = levels(summaryData$group))
-
   myMap <- leaflet(spatialData) %>%
 
     addPolygons(
@@ -390,6 +392,7 @@ mapFlanders <- function(
       values = if (regionLevel == "WBE_buitengrenzen")
           valuesPalette[!is.na(valuesPalette)] else 
           valuesPalette,
+      na.label = "bos & natuur < 100ha",
       opacity = 0.8,
       title = legendText,
       layerId = "legend"
@@ -724,7 +727,7 @@ mapFlandersServer <- function(id, defaultYear, species, currentWbe = reactive(NU
             data = geoData(), 
             allSpatialData = allSpatialData,
             biotoopData = if (is.list(biotoopData))
-              biotoopData[[results$regionLevelLocal()]] else
+              biotoopData[[regionLevelLocal()]] else
               biotoopData,
             year = input$year,
             species = species(),
@@ -994,6 +997,7 @@ mapFlandersServer <- function(id, defaultYear, species, currentWbe = reactive(NU
                 position = input$legend,
                 pal = palette, 
                 values = valuesPalette,
+                na.label = "bos & natuur < 100ha",
                 opacity = 0.8,
                 title = simpleCap(unitText(), keepNames = FALSE),
                 layerId = "legend"

diff --git a/reporting-grofwild/inst/ui/app_public/serverFiles/serverWildschade.R b/reporting-grofwild/inst/ui/app_public/serverFiles/serverWildschade.R
@@ -122,6 +122,7 @@ mapFlandersServer(id = "schade",
   type = "wildschade",
   species = reactive(req(input$schade_species)),
   geoData = results$schade_data,
+  biotoopData = biotoopData,
   allSpatialData = spatialData,
   sourceChoices = loadMetaSchade()$sources 
   )

diff --git a/reporting-grofwild/tests/testthat/testGrofwild.R b/reporting-grofwild/tests/testthat/testGrofwild.R
@@ -479,10 +479,10 @@ test_that("The interactive map", {
           data = geoData, 
           allSpatialData = spatialData,
           biotoopData = biotoopData[[regionLevel]],
-          year = 2016,
+          year = 2007,
           species = iSpecies,
           regionLevel = regionLevel,
-          unit = c("absolute", "relative")[2]
+          unit = c("absolute", "relative", "relativeDekking")[3]
         )
 
         if (doPrint) {

diff --git a/reporting-grofwild/tests/testthat/testWildschade.R b/reporting-grofwild/tests/testthat/testWildschade.R
@@ -13,6 +13,8 @@ schadeData <- loadRawData(type = "wildschade")
 wildSchadeData <- subset(sf::st_drop_geometry(schadeData), 
   wildsoort %in% c("Wild zwijn", "Edelhert", "Ree", "Smient")[1])
 
+biotoopData <- loadHabitats()
+
 species <- sort(unique(schadeData$wildsoort))
 
 
@@ -40,11 +42,12 @@ test_that("Number of cases per region level", {
         spaceData <- createSpaceData(
           data = schadeData, 
           allSpatialData = spatialData,
+          biotoopData = biotoopData[[regionLevel]],
           year = 2020,
           species = iSpecies,
           regionLevel = regionLevel,
-          unit = "absolute",
-          sourceIndicator = "HVV_Wilder"
+          unit = c("absolute", "relative", "relativeDekking")[2],
+          sourceIndicator = c("Hist_PZ_CARMA", "Natuurpunt")
         )
 
         if (doPrint) {