ready for v1.1.1 release

.gitignore

@@ -12,3 +12,6 @@ inst/examples/recipes.html
 inst/examples/recipes.gfm.md
 inst/examples/test.html
 inst/examples/img
+inst/examples/recipes.md
+inst/examples/viz-test.R
+inst/examples/gen-symbol-svg.R

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: leaflegend
 Type: Package
 Title: Add Custom Legends to 'leaflet' Maps
-Version: 1.1.0
+Version: 1.1.1
 Authors@R: c(
     person("Thomas", "Roh", email = "thomas@roh.engineering", role = c("aut", "cre")),
     person("Ricardo Rodrigo", "Basa", email = "radbasa@gmail.com", role = c("ctb")))
@@ -18,7 +18,7 @@ Imports:
     stats, 
     base64enc,
     htmlwidgets
-RoxygenNote: 7.2.2
+RoxygenNote: 7.2.3
 URL: https://leaflegend.roh.engineering, https://github.com/tomroh/leaflegend
 BugReports: https://github.com/tomroh/leaflegend/issues
 Suggests: 

NEWS.md

@@ -1,3 +1,9 @@
+# leaflegend 1.1.1
+
+* updating test for 'leaflet' changes in v2.2.0
+
+* pch solid symbols 15-20 will use `color` if `fillColor` is missing
+
 # leaflegend 1.1.0
 
 * `availableShapes` is provided for convenience to look up supported symbol

R/legend.R

@@ -370,6 +370,8 @@ pchSvg <- function(shape, width, height, color, fillColor, opacity,
   if ( 'stroke-width' %in% names(list(...)) ) {
     strokeWidth <- list(...)[['stroke-width']]
   }
+  # TODO: handle 15-20, contains solid
+  # if missing fillColor, use color
   pchShape <-
     list(
       'open-rect' = htmltools::tags$g(
@@ -741,7 +743,7 @@ pchSvg <- function(shape, width, height, color, fillColor, opacity,
         height = height,
         width = width,
         stroke = 'transparent',
-        fill = fillColor,
+        fill = coalesce_missing(fillColor, color),
         'fill-opacity' = fillOpacity,
         ...
       ),
@@ -751,7 +753,7 @@ pchSvg <- function(shape, width, height, color, fillColor, opacity,
         cy = height / 2 + strokeWidth,
         r =  height *  3 / 4 / 2,
         stroke = 'transparent',
-        fill = fillColor,
+        fill = coalesce_missing(fillColor, color),
         'fill-opacity' = fillOpacity,
         ...
       ),
@@ -760,7 +762,7 @@ pchSvg <- function(shape, width, height, color, fillColor, opacity,
         points = drawTriangle(width = width, height = height,
           offset = strokeWidth),
         stroke = 'transparent',
-        fill = fillColor,
+        fill = coalesce_missing(fillColor, color),
         'fill-opacity' = fillOpacity,
         ...
       ),
@@ -769,7 +771,7 @@ pchSvg <- function(shape, width, height, color, fillColor, opacity,
         points = drawDiamond(width = width, height = height,
           offset = strokeWidth),
         stroke = 'transparent',
-        fill = fillColor,
+        fill = coalesce_missing(fillColor, color),
         'fill-opacity' = fillOpacity,
         ...
       ),
@@ -779,7 +781,7 @@ pchSvg <- function(shape, width, height, color, fillColor, opacity,
         cy = height / 2 + strokeWidth,
         r =  height *  4 / 4 / 2,
         stroke = 'transparent',
-        fill = fillColor,
+        fill = coalesce_missing(fillColor, color),
         'fill-opacity' = fillOpacity,
         ...
       ),
@@ -789,7 +791,7 @@ pchSvg <- function(shape, width, height, color, fillColor, opacity,
         cy = height / 2 + strokeWidth,
         r = height *  2 / 4 / 2,
         stroke = 'transparent',
-        fill = fillColor,
+        fill = coalesce_missing(fillColor, color),
         'fill-opacity' = fillOpacity,
         ...
       ),
@@ -858,6 +860,9 @@ pchSvg <- function(shape, width, height, color, fillColor, opacity,
   }
   pchShape[[shape]]
 }
+coalesce_missing <- function(x, y) {
+  if (missing(x)) y else x
+}
 #' @param svg
 #'
 #' inner svg tags for symbol