Ticket #57: 57.4.patch

tests/lib/GeoExt/data/LayerStore.html

@@ -169 +169 @@
-
-        function test_add_remove(t) {
-            
-2
+6
-            
-            var map = new OpenLayers.Map("mappanel");
-            var store = new GeoExt.data.LayerStore({
@@ -184 +184 @@
-            
-            store.remove(record);
-            t.eq(store.getCount(), 0, "removing a single record from the store removes one record");
+
+            // add back the original and prepare to add copy
+            store.add([record]);            
+            t.eq(store.getCount(), 1, "store has a single record before adding copy");
+            t.eq(map.layers.length, 1, "map has a single layer before adding copy");
-            
+            // create a copy of the record with the same layer
+            var copy = record.copy(); // record with same id will replace original
+            copy.set("layer", record.get("layer")); // force records to have same layer            
+            store.add(copy);
+            t.eq(store.getCount(), 1, "store has a single record after adding copy");
+            t.eq(map.layers.length, 1, "map has a single layer after adding copy");
+            
-        }
-        
-        function test_reorder(t) {

lib/GeoExt/data/LayerStore.js

@@ -151 +151 @@
-            "remove": this.onRemove,
-            scope: this
-        });
+        this.data.on({
+            "replace" : this.onReplace,
+            scope: this
+        });
-    },
-
-    /**
@@ -170 +174 @@
-            this.un("add", this.onAdd, this);
-            this.un("remove", this.onRemove, this);
-
+            this.data.un("replace", this.onReplace, this);
+
-            this.map = null;
-        }
-    },
@@ -324 +330 @@
-            var layer = record.get("layer");
-            if (this.map.getLayer(layer.id) != null) {
-                this._removing = true;
-map.removeLayer(record.get("layer")
+removeMapLayer(record
-                delete this._removing;
-            }
-        }
+    },
+
+    /**
+     * Method: removeMapLayers
+     * Removes a record's layer from the bound map.
+     * 
+     * Parameters:
+     * record - {<Ext.data.Record>}
+     */
+    removeMapLayer: function(record){
+        this.map.removeLayer(record.get("layer"));
+    },
+
+    /**
+     * Method: onReplace
+     * Handler for a store's data collections' replace event
+     * 
+     * Parameters:
+     * key - {String}
+     * oldRecord - {Object} In this case, a record that has been replaced.
+     * newRecord - {Object} In this case, a record that is replacing oldRecord.
+     */
+    onReplace: function(key, oldRecord, newRecord){
+        this.removeMapLayer(oldRecord);
-    }
-};
-