Fixed refreshing layers not using new layer config

eugenehuangsg · eugenehuangsg · commit f6db0212360c · 2017-12-11T12:19:07.000+08:00
diff --git a/src/directives/layers.js b/src/directives/layers.js
@@ -155,7 +155,11 @@ angular.module('ui-leaflet').directive('layers', function (leafletLogger, $q, le
                             map.removeLayer(leafletLayers.baselayers[name]);
                         }
                         if (!map.hasLayer(leafletLayers.baselayers[name])) {
-                            safeAddLayer(map, leafletLayers.baselayers[name]);
+                            var testBaseLayer = createLayer(layerData);
+                            if (isDefined(testBaseLayer)) {
+                                leafletLayers.baselayers[name] = testBaseLayer;
+                                safeAddLayer(map, leafletLayers.baselayers[name]);
+                            }
                         }
                         layerData.doRefresh = false;
                         return;
@@ -260,7 +264,11 @@ angular.module('ui-leaflet').directive('layers', function (leafletLogger, $q, le
                             safeRemoveLayer(map, leafletLayers.overlays[name], options);
                         }
                         if (!map.hasLayer(leafletLayers.overlays[name])) {
-                            safeAddLayer(map, leafletLayers.overlays[name]);
+                            var testOverlayLayer = createLayer(layerData);
+                            if (isDefined(testOverlayLayer)) {
+                                leafletLayers.overlays[name] = testOverlayLayer;
+                                safeAddLayer(map, leafletLayers.overlays[name]);
+                            }
                         }
                         layerData.doRefresh = false;
                     }

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,11 @@ angular.module('ui-leaflet').directive('layers', function (leafletLogger, $q, le`
`155`	`155`	`map.removeLayer(leafletLayers.baselayers[name]);`
`156`	`156`	`}`
`157`	`157`	`if (!map.hasLayer(leafletLayers.baselayers[name])) {`
`158`		`- safeAddLayer(map, leafletLayers.baselayers[name]);`
	`158`	`+ var testBaseLayer = createLayer(layerData);`
	`159`	`+ if (isDefined(testBaseLayer)) {`
	`160`	`+ leafletLayers.baselayers[name] = testBaseLayer;`
	`161`	`+ safeAddLayer(map, leafletLayers.baselayers[name]);`
	`162`	`+ }`
`159`	`163`	`}`
`160`	`164`	`layerData.doRefresh = false;`
`161`	`165`	`return;`
`@@ -260,7 +264,11 @@ angular.module('ui-leaflet').directive('layers', function (leafletLogger, $q, le`
`260`	`264`	`safeRemoveLayer(map, leafletLayers.overlays[name], options);`
`261`	`265`	`}`
`262`	`266`	`if (!map.hasLayer(leafletLayers.overlays[name])) {`
`263`		`- safeAddLayer(map, leafletLayers.overlays[name]);`
	`267`	`+ var testOverlayLayer = createLayer(layerData);`
	`268`	`+ if (isDefined(testOverlayLayer)) {`
	`269`	`+ leafletLayers.overlays[name] = testOverlayLayer;`
	`270`	`+ safeAddLayer(map, leafletLayers.overlays[name]);`
	`271`	`+ }`
`264`	`272`	`}`
`265`	`273`	`layerData.doRefresh = false;`
`266`	`274`	`}`