Merge branch 'dev/add_options_param'

vrsource · Jan 10, 2013 · 0825c98 · 0825c98
2 parents 27e7e7e + 4ec60a2
commit 0825c98
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/leaflet-providers-0.0.2.js b/leaflet-providers-0.0.2.js
@@ -2,7 +2,7 @@
   var providers = {};
 
   L.TileLayer.Provider = L.TileLayer.extend({
-    initialize: function (arg) {
+    initialize: function (arg, options) {
       var parts = arg.split('.');
 
       var providerName = parts[0];
@@ -39,7 +39,9 @@
             return providers[attributionName].options.attribution;
           });
       }
-      L.TileLayer.prototype.initialize.call(this, provider.url, provider.options);
+      // Compute final options combining provider options with any user overrides
+      var layer_opts = L.Util.extend({}, provider.options, options);
+      L.TileLayer.prototype.initialize.call(this, provider.url, layer_opts);
     }
   });