From 3d311e2b3342fedb8c182870d163cadc44b3ad5b Mon Sep 17 00:00:00 2001
From: Julien Girault <jgirault@wikimedia.org>
Date: Fri, 17 Mar 2017 15:24:23 -0700
Subject: [PATCH] Updates featureLayer to be interactive only if there is popup
 content

---
 src/feature_layer.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/feature_layer.js b/src/feature_layer.js
index b73c0fe19..fd6272f23 100644
--- a/src/feature_layer.js
+++ b/src/feature_layer.js
@@ -91,10 +91,11 @@ var FeatureLayer = L.FeatureGroup.extend({
                 pointToLayer = this.options.pointToLayer || function(feature, latlon) {
                   return marker.style(feature, latlon, opts);
                 },
+                popupHtml = marker.createPopup(json, this.options.sanitizer),
                 layer = L.GeoJSON.geometryToLayer(json, {
-                    pointToLayer: pointToLayer
+                    pointToLayer: pointToLayer,
+                    interactive: !!popupHtml
                 }),
-                popupHtml = marker.createPopup(json, this.options.sanitizer),
                 style = this.options.style,
                 defaultStyle = style === simplestyle.style;