Merge pull request #625 from aoles/master

Add check for `properties` in GeoJSON objects

Author: schloerke

NEWS

@@ -6,6 +6,7 @@ BUG FIXES and IMPROVEMENTS
 * invokeRemote() now resolves html dependencies before passing them to shiny::createWebDependency() (#620).
 * Upgrade leaflet-provider to 1.4.0, enable more map variants such as CartoDB.Voyager (#567)
 * `sf` objects with `names` attributes in the `st_geometry` now visualise correctly (#595)
+* GeoJSON objects missing `properties` can now be displayed (#622)
 
 
 

inst/htmlwidgets/leaflet.js

@@ -1779,7 +1779,7 @@ methods.addGeoJSON = function (data, layerId, group, style) {
         featureId: feature.id,
         properties: feature.properties
       };
-      var popup = feature.properties.popup;
+      var popup = feature.properties ? feature.properties.popup : null;
       if (typeof popup !== "undefined" && popup !== null) layer.bindPopup(popup);
       layer.on("click", mouseHandler(self.id, layerId, group, "geojson_click", extraInfo), this);
       layer.on("mouseover", mouseHandler(self.id, layerId, group, "geojson_mouseover", extraInfo), this);

javascript/src/methods.js

@@ -591,7 +591,7 @@ methods.addGeoJSON = function(data, layerId, group, style) {
         featureId: feature.id,
         properties: feature.properties
       };
-      let popup = feature.properties.popup;
+      let popup = feature.properties ? feature.properties.popup : null;
       if (typeof popup !== "undefined" && popup !== null) layer.bindPopup(popup);
       layer.on("click", mouseHandler(self.id, layerId, group, "geojson_click", extraInfo), this);
       layer.on("mouseover", mouseHandler(self.id, layerId, group, "geojson_mouseover", extraInfo), this);