r-spatial / mapview
Showing 2 of 2 files from the diff.

@@ -361,13 +361,18 @@
Loading
361 361
                   funs = funs,
362 362
                   args = args)
363 363
364 -
  try(
365 -
    if (attributes(popup)$popup == "leafpop") {
366 -
      m$dependencies <- c(m$dependencies, popupLayoutDependencies())
367 -
    }
368 -
    , silent = TRUE
364 +
  m$dependencies = c(
365 +
    m$dependencies
366 +
    , mapviewCSSDependencies()
369 367
  )
370 368
369 +
  # try(
370 +
  #   if (attributes(popup)$popup == "leafpop") {
371 +
  #     m$dependencies <- c(m$dependencies, popupLayoutDependencies())
372 +
  #   }
373 +
  #   , silent = TRUE
374 +
  # )
375 +
371 376
  if (is.function(legend)) m <- legend(m)
372 377
  m = removeDuplicatedMapDependencies(m)
373 378
  out <- new("mapview", object = list(x), map = m)
@@ -680,13 +685,18 @@
Loading
680 685
                   funs = funs,
681 686
                   args = args)
682 687
683 -
  try(
684 -
    if (attributes(popup)$popup == "leafpop") {
685 -
      m$dependencies <- c(m$dependencies, popupLayoutDependencies())
686 -
    }
687 -
    , silent = TRUE
688 +
  m$dependencies = c(
689 +
    m$dependencies
690 +
    , mapviewCSSDependencies()
688 691
  )
689 692
693 +
  # try(
694 +
  #   if (attributes(popup)$popup == "leafpop") {
695 +
  #     m$dependencies <- c(m$dependencies, popupLayoutDependencies())
696 +
  #   }
697 +
  #   , silent = TRUE
698 +
  # )
699 +
690 700
  # m$dependencies = c(
691 701
  #   m$dependencies
692 702
  #   , mapviewCSSDependencies()

@@ -63,7 +63,7 @@
Loading
63 63
    htmltools::htmlDependency(
64 64
      "PopupTable",
65 65
      '0.0.1',
66 -
      system.file("htmlwidgets/lib/popup", package = "mapview"),
67 -
      stylesheet = 'popup.css'
66 +
      system.file("htmlwidgets/lib/css", package = "mapview"),
67 +
      stylesheet = 'mapview-popup.css'
68 68
    ))
69 69
}
Files Coverage
R 41.76%
Project Totals (26 files) 41.76%
Sunburst
The inner-most circle is the entire project, moving away from the center are folders then, finally, a single file. The size and color of each slice is representing the number of statements and the coverage, respectively.
Icicle
The top section represents the entire project. Proceeding with folders and finally individual files. The size and color of each slice is representing the number of statements and the coverage, respectively.
Grid
Each block represents a single file in the project. The size and color of each block is represented by the number of statements and the coverage, respectively.
Loading