Merge pull request #250 from emoen/master

dont throw error in getState()
planetfederal · Feb 18, 2016 · 2919a75 · 2919a75
2 parents ba0bc99 + 90ce03f
commit 2919a75
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/script/widgets/Viewer.js b/src/script/widgets/Viewer.js
@@ -726,16 +726,21 @@ gxp.Viewer = Ext.extend(Ext.util.Observable, {
         var sources = {};
         this.mapPanel.layers.each(function(record){
             var layer = record.getLayer();
-            if (layer.displayInLayerSwitcher && !(layer instanceof OpenLayers.Layer.Vector) ) {
+            if ( layer.displayInLayerSwitcher ) {
                 var id = record.get("source");
                 var source = this.layerSources[id];
                 if (!source) {
-                    throw new Error("Could not find source for record '" + record.get("name") + " and layer " + layer.name + "'");
-                }
-                // add layer
-                state.map.layers.push(source.getConfigForRecord(record));
-                if (!sources[id]) {
-                    sources[id] = source.getState();
+                    // Either the layer has no source (id=null) or this layer has a layerSources which isnt defined 
+                    // Provide a plugin source if the layer should be included in getState()
+                    if (window.console) {
+                        console.warn("Could not find source type (e.g gxp_wmssource) for layer '" + layer.name  + "' and layer id '" + layer.id + "'.");
+                    }
+                } else {
+                    // add layer
+                    state.map.layers.push(source.getConfigForRecord(record));
+                    if (!sources[id]) {
+                        sources[id] = source.getState();
+                    }
                 }
             }
         }, this);