fix minor url issues

sheppard · sheppard · commit a80ccd039c9d · 2014-10-10T17:07:34.000-05:00
diff --git a/index.html b/index.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="refresh" content="0; url=./examples/" />
diff --git a/leaflet.wms.js b/leaflet.wms.js
@@ -151,17 +151,23 @@ L.WMS.Overlay = L.LayerGroup.extend({
         'transparent': false
     },
 
-    'initialize': function(url, params) {
+    'initialize': function(url, options) {
         this._url = url;
 
-        // Move non-WMS parameters to options object
-        var options = {};
-        ['crs', 'uppercase', 'tiled', 'attribution'].forEach(function(opt) {
-             if (params[opt]) {
-                 options[opt] = params[opt];
-                 delete params[opt];
+        // Move WMS parameters to params object
+        var optNames = {
+            'crs': true,
+            'uppercase': true,
+            'tiled': true,
+            'attribution': true
+        };
+        var params = {};
+        for (var opt in options) {
+             if (options.hasOwnProperty(opt) && !optNames[opt]) {
+                 params[opt] = options[opt];
+                 delete options[opt];
              }
-        });
+        }
         L.setOptions(this, options);
         this.wmsParams = L.extend({}, this.defaultWmsParams, params);
     },
@@ -183,6 +189,10 @@ L.WMS.Overlay = L.LayerGroup.extend({
     'onRemove': function(map) {
         if (this._currentOverlay) {
             map.removeLayer(this._currentOverlay);
+            delete this._currentOverlay;
+        }
+        if (this._currentUrl) {
+            delete this._currentUrl;
         }
     },
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+<!DOCTYPE html>`
`1`	`2`	`<html>`
`2`	`3`	`<head>`
`3`	`4`	`<meta http-equiv="refresh" content="0; url=./examples/" />`