- Initial Support for Proj4Leaflet

Author: bhaskarvk

NAMESPACE

@@ -25,7 +25,6 @@ export(addMiniMap)
 export(addPolygons)
 export(addPolylines)
 export(addPopups)
-export(addProj4Leaflet)
 export(addProviderTiles)
 export(addRasterImage)
 export(addRectangles)

R/leaflet.R

@@ -19,15 +19,17 @@
 #' @param width the width of the map
 #' @param height the height of the map
 #' @param padding the padding of the map
+#' @param mapOptions the map options
 #' @return A HTML widget object, on which we can add graphics layers using
 #'   \code{\%>\%} (see examples).
 #' @example inst/examples/leaflet.R
 #' @export
-leaflet = function(data = NULL, width = NULL, height = NULL, padding = 0) {
+leaflet = function(data = NULL, width = NULL, height = NULL,
+                   padding = 0, mapOptions = list()) {
   htmlwidgets::createWidget(
     'leaflet',
     structure(
-      list(),
+      list(options = mapOptions),
       leafletData = data
     ),
     width = width, height = height,
@@ -44,6 +46,10 @@ getMapData = function(map) {
   attr(map$x, "leafletData", exact = TRUE)
 }
 
+getMapOptions = function(map) {
+  attr(map$x, "options", exact = TRUE)
+}
+
 #' Set options on a leaflet map object
 #'
 #' @param map A map widget object created from \code{\link{leaflet}()}

R/plugin-Proj4Leaflet.R

@@ -32,13 +32,14 @@ m %>%
   addMiniMap(
              tiles = esri[[1]],
              toggleDisplay = T) %>%
-  htmlwidgets::onRender("function(el, x) {
-                            var myMap = this;
-                            this.on('baselayerchange',
-                                    function (e) {
-                                        myMap.minimap.changeLayer(L.tileLayer.provider(e.name));
-                                    })
-                        }")
+  htmlwidgets::onRender("
+    function(el, x) {
+      var myMap = this.getMap();
+      myMap.on('baselayerchange',
+        function (e) {
+          myMap.minimap.changeLayer(L.tileLayer.provider(e.name));
+        })
+    }")
 
 #' <br/><br/>
 #' Another advanced use case
@@ -69,33 +70,27 @@ leaflet() %>% addTiles() %>%
              options = markerOptions(riseOnHover = TRUE, opacity = 0.75),
              group = 'pubs') %>%
   addMiniMap() %>%
-  htmlwidgets::onRender("function(el, t) {
-                             var myMap = this;
+  htmlwidgets::onRender("
+    function(el, t) {
+      var myMap = this.getMap();
 
-                             var pubs = myMap.layerManager._byGroup.pubs;
-                             var pubs2 = new L.FeatureGroup();
+      var pubs = myMap.layerManager._byGroup.pubs;
+      var pubs2 = new L.FeatureGroup();
 
-                             for(pub in pubs) {
-                                 var m = new L.CircleMarker(pubs[pub]._latlng,
-                                                            {radius: 2});
-                                 pubs2.addLayer(m);
-
-                             }
-                             var layers = new L.LayerGroup([myMap.minimap._layer, pubs2]);
-
-                             myMap.minimap.changeLayer(layers);
-                        }")
+      for(pub in pubs) {
+        var m = new L.CircleMarker(pubs[pub]._latlng, {radius: 2});
+        pubs2.addLayer(m);
+      }
+      var layers = new L.LayerGroup([myMap.minimap._layer, pubs2]);
+      myMap.minimap.changeLayer(layers);
+    }")
 
 #' <br/><br/>
 #' Finally combine the approaches in last 2 examples
 #' Minimap w/ changable layers and circle markers.
 m <- leaflet()
-esri <- providers %>%
-  purrr::keep(~ grepl('^Esri',.))
-
 esri %>%
   purrr::walk(function(x) m <<- m %>% addProviderTiles(x,group=x))
-
 m %>%
   setView(10.758276373601069, 59.92448055859924, 13) %>%
   addAwesomeMarkers(data=spdf,
@@ -109,27 +104,24 @@ m %>%
   ) %>%
   addMiniMap(tiles = esri[[1]],
              toggleDisplay = T) %>%
-  htmlwidgets::onRender("function(el, t) {
-                             var myMap = this;
-
-                             var pubs = myMap.layerManager._byGroup.pubs;
-                             var pubs2 = new L.FeatureGroup();
-
-                             for(pub in pubs) {
-                                 var m = new L.CircleMarker(pubs[pub]._latlng,
-                                                            {radius: 2});
-                                 pubs2.addLayer(m);
-
-                             }
-                             var layers = new L.LayerGroup([myMap.minimap._layer, pubs2]);
-
-                             myMap.minimap.changeLayer(layers);
-
-                             myMap.on('baselayerchange',
-                                      function (e) {
-                                          debugger;
-                                          myMap.minimap.changeLayer(
-                                             new L.LayerGroup([L.tileLayer.provider(e.name),
-                                                pubs2]));
-                                      });
-                        }")
+  htmlwidgets::onRender("
+    function(el, t) {
+      var myMap = this.getMap();
+
+      var pubs = myMap.layerManager._byGroup.pubs;
+      var pubs2 = new L.FeatureGroup();
+
+      for(pub in pubs) {
+        var m = new L.CircleMarker(pubs[pub]._latlng, {radius: 2});
+        pubs2.addLayer(m);
+      }
+      var layers = new L.LayerGroup([myMap.minimap._layer, pubs2]);
+
+      myMap.minimap.changeLayer(layers);
+
+      myMap.on('baselayerchange',
+        function (e) {
+          myMap.minimap.changeLayer(
+            new L.LayerGroup([L.tileLayer.provider(e.name), pubs2]));
+        });
+    }")