Merge pull request #3 from meantrix/develop

v0.1.1

Author: viniciuszendron

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: leaflet.multiopacity
 Type: Package
 Title: Leaflet Multiple Opacity Controls for R
-Version: 0.1.0
+Version: 0.1.1
 Authors@R: c(
     person(
       given = "Vinícius",

NEWS.md

@@ -1,3 +1,8 @@
+# leaflet.multiopacity 0.1.1
+
+* Fix a bug with control icon when collapsed is TRUE.
+* Implement a new argument to set control size when collapsed is enabled.
+
 # leaflet.multiopacity 0.1.0
 
 * Initial release of `leaflet.multiopacity`.

R/multiopacity.R

@@ -21,6 +21,8 @@
 #' If FALSE (the default), the opacity control will always appear
 #' in its expanded state. Set to TRUE to have the opacity control
 #' rendered as an icon that expands when hovered over.
+#' @param size
+#' Collapsed control size: "m" (medium) or "s" (small).
 #' @param position
 #' Position of control: "topleft", "topright", "bottomleft", or "bottomright".
 #' @param title
@@ -67,6 +69,7 @@ addOpacityControls <- function(map,
                                category = NULL,
                                group = NULL,
                                collapsed = FALSE,
+                               size = c("m", "s"),
                                position = c(
                                  "topright",
                                  "topleft",
@@ -85,6 +88,7 @@ addOpacityControls <- function(map,
   stopifnot(inherits(collapsed, "logical"), length(collapsed) == 1)
   if (!is.null(title)) stopifnot(inherits(title, "character"), length(title) == 1)
   stopifnot(inherits(renderOnLayerAdd, "logical"), length(renderOnLayerAdd) == 1)
+  size <- match.arg(size)
   position <- match.arg(position)
 
   if (isTRUE(collapsed) && !is.null(title)) {
@@ -101,6 +105,7 @@ addOpacityControls <- function(map,
                  type = type,
                  collapsed = collapsed,
                  position = position,
+                 size = size,
                  label = title
                ))
 
@@ -139,6 +144,7 @@ addOpacityControls <- function(map,
                 options = {
                   collapsed: data.options.collapsed,
                   position: data.options.position,
+                  size: data.options.size,
                   label: data.options.label
                 }
               ).addTo(map);
@@ -175,6 +181,7 @@ addOpacityControls <- function(map,
           options = {
             collapsed: data.options.collapsed,
             position: data.options.position,
+            size: data.options.size,
             label: data.options.label
           }
         ).addTo(map);

README.md

@@ -1,12 +1,7 @@
 ## leaflet.multiopacity <a href='http://meantrix.com'><img src='man/figures/logo.png' align="right" height="139" /></a>
 
-<!--
-# leaflet.multiopacity
-<a href='http://meantrix.com'><img src='man/figures/header.png'/> 
--->
-
 <!-- badges: start -->
-[![version](https://img.shields.io/badge/version-0.1.0-blue.svg)](https://semver.org)
+[![version](https://img.shields.io/badge/version-0.1.1-blue.svg)](https://semver.org)
 [![CRAN status](https://www.r-pkg.org/badges/version/leaflet.multiopacity)](https://CRAN.R-project.org/package=leaflet.multiopacity)
 [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT)
 [![Codecov test coverage](https://codecov.io/gh/meantrix/leaflet.multiopacity/branch/main/graph/badge.svg)](https://codecov.io/gh/meantrix/leaflet.multiopacity?branch=main)

inst/src/Leaflet.Control.Opacity/L.Control.Opacity.css

@@ -33,9 +33,17 @@ input[type="range"]::-ms-thumb {
 
 /* 題名レイアウト */
 .leaflet-control-layers-label {
-    margin: 0px 0px 8px 1px
+    margin: 0px 0px 8px 1px;
 }
 
-.multiopacity {
-    background-image: url(images/alpha.png)!important;
+.multiopacity-m {
+    background-image: url(images/alpha-2x.png)!important;
+    background-size: 32px!important;
+}
+
+.multiopacity-s {
+    background-image: url(images/alpha-2x.png)!important;
+    background-size: 20px!important;
+    width: 30px!important;
+    height: 30px!important;
 }

inst/src/Leaflet.Control.Opacity/L.Control.Opacity.js

@@ -2,6 +2,7 @@ L.Control.Opacity = L.Control.extend({
 	options: {
 		collapsed: false,
 		position: 'topright',
+		size: 'm',
 		label: null
 	},
 	initialize: function (overlays, options) {
@@ -39,6 +40,7 @@ L.Control.Opacity = L.Control.extend({
 		var className = 'leaflet-control-layers',
 		    container = this._container = L.DomUtil.create('div', className),
 		    collapsed = this.options.collapsed;
+		    size = this.options.size;
 		container.setAttribute('aria-haspopup', true);
 		L.DomEvent.disableClickPropagation(container);
 		L.DomEvent.disableScrollPropagation(container);
@@ -58,7 +60,7 @@ L.Control.Opacity = L.Control.extend({
 			}
 		}
 		//var link = this._layersLink = L.DomUtil.create('a', className + '-toggle', container);
-		var link = this._layersLink = L.DomUtil.create('a', className + '-toggle multiopacity', container);
+		var link = this._layersLink = L.DomUtil.create('a', className + '-toggle multiopacity-' + size, container);
 		link.href = '#';
 		link.title = 'Layers';
 		if (L.Browser.touch) {

inst/src/Leaflet.Control.Opacity/images/alpha-2x.png

@@ -39,15 +39,15 @@ leaflet() %>%
 
 Note that each function call has its own layerId. If you don't provide a layerId for your layers, the opacity controls will still work, but will use the internal `_leaflet_id` as a label for each control.
 
-You can also customize some interface aspects such as box title, position and whether opacity controls will remain collapsed.
+You can also customize some interface aspects such as box title, position, size and whether opacity controls will remain collapsed.
 
 ```{r, warning=FALSE}
 leaflet() %>%
   addProviderTiles("OpenStreetMap", layerId = "base") %>%
   addRasterImage(r, layerId = "rast") %>%
   addAwesomeMarkers(lng = -2.79545, lat = 54.04321,
                     label = "Hospital", layerId = "hospital") %>%
-  addOpacityControls(collapsed = TRUE, position = "topleft")
+  addOpacityControls(collapsed = TRUE, position = "topleft", size = "s")
 ```
 
 You can also define the subset of layers you want to show opacity controls to. You can provide the layerId of the layers to be shown.