Fix labels/border/remove/clear-instances, **Src-functions, etc..

.github/workflows/R-CMD-check.yaml

@@ -29,7 +29,7 @@ jobs:
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 

.github/workflows/test-coverage.yaml

@@ -15,7 +15,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-r@v2
         with:
@@ -44,7 +44,7 @@ jobs:
 
       - name: Upload test results
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-test-failures
           path: ${{ runner.temp }}/package

DESCRIPTION

@@ -29,13 +29,13 @@ Authors@R:
 Description: Provides bindings to the 'Leaflet.glify' JavaScript library which extends the 'leaflet' JavaScript library to render large data in the browser using 'WebGl'.
 License: MIT + file LICENSE
 Encoding: UTF-8
+LazyData: false
 RoxygenNote: 7.3.2
 Imports:
-  geojsonsf,
   htmltools,
-  jsonify,
   leaflet,
   sf,
+  yyjsonr,
   grDevices
 Suggests:
   colourvalues,

NAMESPACE

@@ -26,6 +26,7 @@ S3method(makePopup,shiny.tag)
 export(addGlPoints)
 export(addGlPolygons)
 export(addGlPolylines)
+export(clearGlGroup)
 export(clearGlLayers)
 export(leafglOutput)
 export(makeColorMatrix)
@@ -37,5 +38,6 @@ export(renderLeafgl)
 importFrom(htmltools,htmlDependencies)
 importFrom(htmltools,tagList)
 importFrom(htmltools,tags)
+importFrom(leaflet,evalFormula)
 importFrom(leaflet,leafletOutput)
 importFrom(leaflet,renderLeaflet)

NEWS

@@ -1,8 +1,32 @@
+ leafgl development-version
+
+ * Added some @details for Shiny click and mouseover events and their corresponding input. #77
+ * Use `@inheritParams leaflet::**` for identical function arguments
+
+miscellaneous
+
+ * update upstream javascript dependency to 3.3.1. #49
+  Note: If you previously used the workaround `L.glify.Shapes.instances.splice(0, 1)`, please remove it with this new version.
+ * unified / simplified the dependency functions/calls
+
+
 leafgl 0.2.2 (2024-11-13)
 
+ * Switched from `jsonify` and `geojsonsf` to `yyjsonr`
+ * New method *clearGlGroup* removes a group from leaflet and the Leaflet.Glify instances.
+ * The JavaScript methods of the `removeGl**` functions was rewritten to correctly remove an element identified by `layerId`
+ * `clearGlLayers` now correctly removes all Leaflet.Glify instances
+ * When showing/hiding Leaflet.Glify layers, they are set to active = TRUE/FALSE to make mouseevents work again. #48 #50
+
 bug fixes
 
-  * src version now works also in shiny. #71
+ * Increase precision of points, lines and shapes by translating them closer to the Pixel Origin. Thanks @RayLarone #93
+ * src version now works also in shiny. #71
+ * added `popupOptions` and `labelOptions`. #83
+ * added `stroke` (default=TRUE) in `addGlPolygons` and `addGlPolygonsSrc` for drawing borders. #3 #68
+ * Labels work similar to `leaflet`. `leafgl` accepts a single string, a vector of strings or a formula. #78
+ * The `...` arguments are now passed to all methods in the underlying library. This allows us to set
+    additional arguments like `fragmentShaderSource`, `sensitivity` or `sensitivityHover`. #81
 
 documentation etc
 

NEWS.md

@@ -1,8 +1,31 @@
+# leafgl dev-version
+
+-   Added some @details for Shiny click and mouseover events and their corresponding input. [#77](https://github.com/r-spatial/leafgl/issues/77)
+-   Use `@inheritParams leaflet::**` for identical function arguments
+-   unified / simplified the dependency functions/calls
+
+#### 🍬 miscellaneous
+
+-   update upstream javascript dependency to 3.3.0. [#49](https://github.com/r-spatial/leafgl/issues/49)
+    ⚠️If you previously used the workaround `L.glify.Shapes.instances.splice(0, 1)`, please remove it with this new version.
+
+
 # leafgl 0.2.2 (2024-11-13)
 
+-   Switched from `jsonify` and `geojsonsf` to `yyjsonr`
+-   New method `clearGlGroup` removes a group from leaflet and the Leaflet.Glify instances.
+-   The JavaScript methods of the `removeGl**` functions was rewritten to correctly remove an element identified by `layerId`
+-   `clearGlLayers` now correctly removes all Leaflet.Glify instances
+-   When showing/hiding Leaflet.Glify layers, they are set to active = TRUE/FALSE to make mouseevents work again. [#48](https://github.com/r-spatial/leafgl/issues/48) [#50](https://github.com/r-spatial/leafgl/issues/50)
+
 #### 🐛 bug fixes
 
-  * src version now works also in shiny. #71
+-   Increase precision of points, lines and shapes by translating them closer to the Pixel Origin. Thanks @RayLarone [#93](https://github.com/r-spatial/leafgl/issues/93)
+-   src version now works also in shiny. [#71](https://github.com/r-spatial/leafgl/issues/71)
+-   added `popupOptions` and `labelOptions`. [#83](https://github.com/r-spatial/leafgl/issues/83)
+-   added `stroke` (default=TRUE) in `addGlPolygons` and `addGlPolygonsSrc` for drawing borders. [#3](https://github.com/r-spatial/leafgl/issues/3) [#68](https://github.com/r-spatial/leafgl/issues/68)
+-   Labels work similar to `leaflet`. `leafgl` accepts a single string, a vector of strings or a formula. [#78](https://github.com/r-spatial/leafgl/issues/78)
+-   The `...` arguments are now passed to all methods in the underlying library. This allows us to set additional arguments like `fragmentShaderSource`, `sensitivity` or `sensitivityHover`. [#81](https://github.com/r-spatial/leafgl/issues/81)
 
 #### 💬 documentation etc
 
@@ -16,7 +39,7 @@
 
 new features:
 
-  * all methods can now have labels/tooltips. Currently only lines and polygons support passing of a column name, points need a predefined label vector.
+-   all methods can now have labels/tooltips. Currently only lines and polygons support passing of a column name, points need a predefined label vector.
 
 miscallaneous:
 
@@ -26,7 +49,7 @@ miscallaneous:
 
 miscallaneous:
 
-  * update upstream javascript dependency to 3.2.0
+-   update upstream javascript dependency to 3.2.0
 
 ## leafgl 0.1.2
 

R/glify-helpers.R

@@ -1,31 +1,16 @@
-# helpers
-glifyDependencies = function() {
+# dependencies
+glifyDependencies = function(src = FALSE) {
+  src <- ifelse(src, "Src", "")
   list(
     htmltools::htmlDependency(
       "Leaflet.glify",
-      '3.2.0',
+      '3.3.1',
       system.file("htmlwidgets/Leaflet.glify", package = "leafgl"),
       script = c(
-        "addGlifyPoints.js"
-        , "addGlifyPolygons.js"
-        , "addGlifyPolylines.js"
-        , "glify-browser.js"
-      )
-    )
-  )
-}
-
-# helpers
-glifyDependenciesSrc = function() {
-  list(
-    htmltools::htmlDependency(
-      "Leaflet.glifySrc",
-      '3.2.0',
-      system.file("htmlwidgets/Leaflet.glify", package = "leafgl"),
-      script = c(
-        "addGlifyPointsSrc.js"
-        , "addGlifyPolygonsSrc.js"
-        , "addGlifyPolylinesSrc.js"
+        "GlifyUtils.js"
+        , paste0("addGlifyPoints", src, ".js")
+        , paste0("addGlifyPolygons", src, ".js")
+        , paste0("addGlifyPolylines", src, ".js")
         , "glify-browser.js"
       )
     )
@@ -56,101 +41,87 @@ glifyDataAttachmentSrc = function(fl_data, group, async = FALSE) {
   }
 }
 
-glifyColorAttachmentSrc = function(fl_color, group) {
-  data_dir <- dirname(fl_color)
-  data_file <- basename(fl_color)
-  list(
-    htmltools::htmlDependency(
-      name = paste0(group, "col"),
-      version = 1,
-      src = c(file = data_dir),
-      script = list(data_file)
-    )
-  )
-}
-
-glifyPopupAttachmentSrc = function(fl_popup, group) {
-  data_dir <- dirname(fl_popup)
-  data_file <- basename(fl_popup)
+glifyAttachmentSrc <- function(fl, group, type) {
+  valid_types <- c("col", "pop", "lab", "rad")
+  if (!type %in% valid_types) {
+    stop("Invalid type. Valid types are: col, pop, lab, rad.")
+  }
+  data_dir <- dirname(fl)
+  data_file <- basename(fl)
   list(
     htmltools::htmlDependency(
-      name = paste0(group, "pop"),
+      name = paste0(group, type),
       version = 1,
       src = c(file = data_dir),
       script = list(data_file)
     )
   )
 }
 
-glifyRadiusAttachmentSrc = function(fl_radius, group) {
-  data_dir <- dirname(fl_radius)
-  data_file <- basename(fl_radius)
-  list(
-    htmltools::htmlDependency(
-      name = paste0(group, "rad"),
-      version = 1,
-      src = c(file = data_dir),
-      script = list(data_file)
-    )
-  )
-}
 
-glifyDataAttachment = function(fl_data, group) {
-  data_dir <- dirname(fl_data)
-  data_file <- basename(fl_data)
-  list(
-    htmltools::htmlDependency(
-      name = paste0(group, "dt"),
-      version = 1,
-      src = c(file = data_dir),
-      attachment = list(data_file)
-    )
-  )
+# helpers
+yyson_json_str <- function(x, ...) {
+  dt <- yyjsonr::write_json_str(x, ...)
+  class(dt) <- "json"
+  dt
 }
-
-
-glifyColorAttachment = function(fl_color, group) {
-  data_dir <- dirname(fl_color)
-  data_file <- basename(fl_color)
-  list(
-    htmltools::htmlDependency(
-      name = paste0(group, "cl"),
-      version = 1,
-      src = c(file = data_dir),
-      attachment = list(data_file)
-    )
-  )
-}
-
-glifyPopupAttachment = function(fl_popup, group) {
-  data_dir <- dirname(fl_popup)
-  data_file <- basename(fl_popup)
-  list(
-    htmltools::htmlDependency(
-      name = paste0(group, "pop"),
-      version = 1,
-      src = c(file = data_dir),
-      attachment = list(data_file)
-    )
-  )
+yyson_geojson_str <- function(x, ...) {
+  dt <- yyjsonr::write_geojson_str(x, ...)
+  class(dt) <- "json"
+  dt
 }
 
 
-
-
-# helpers
-glifyDependenciesFl = function() {
-  list(
-    htmltools::htmlDependency(
-      "Leaflet.glify",
-      '2.2.0',
-      system.file("htmlwidgets/Leaflet.glify", package = "leafgl"),
-      script = c(
-        "addGlifyPoints.js"
-        , "addGlifyPolygonsFl.js"
-        , "addGlifyPolylines.js"
-        , "glify.js"
-      )
-    )
-  )
-}
+## Not used ##########
+# glifyDependenciesFl = function() {
+#   list(
+#     htmltools::htmlDependency(
+#       "Leaflet.glify",
+#       '2.2.0',
+#       system.file("htmlwidgets/Leaflet.glify", package = "leafgl"),
+#       script = c(
+#         "GlifyUtils.js"
+#         , "addGlifyPoints.js"
+#         , "addGlifyPolygonsFl.js"
+#         , "addGlifyPolylines.js"
+#         , "glify-browser.js"
+#       )
+#     )
+#   )
+# }
+# glifyDataAttachment = function(fl_data, group) {
+#   data_dir <- dirname(fl_data)
+#   data_file <- basename(fl_data)
+#   list(
+#     htmltools::htmlDependency(
+#       name = paste0(group, "dt"),
+#       version = 1,
+#       src = c(file = data_dir),
+#       attachment = list(data_file)
+#     )
+#   )
+# }
+# glifyColorAttachment = function(fl_color, group) {
+#   data_dir <- dirname(fl_color)
+#   data_file <- basename(fl_color)
+#   list(
+#     htmltools::htmlDependency(
+#       name = paste0(group, "cl"),
+#       version = 1,
+#       src = c(file = data_dir),
+#       attachment = list(data_file)
+#     )
+#   )
+# }
+# glifyPopupAttachment = function(fl_popup, group) {
+#   data_dir <- dirname(fl_popup)
+#   data_file <- basename(fl_popup)
+#   list(
+#     htmltools::htmlDependency(
+#       name = paste0(group, "pop"),
+#       version = 1,
+#       src = c(file = data_dir),
+#       attachment = list(data_file)
+#     )
+#   )
+# }