ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

be more forgiving in removeMarker() -- do not cause script error if marker has already been removed r=cr5 (Closes #1152)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@5899 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
euzuro
2008-01-25 23:46:03 +00:00
parent fd321883a8
commit 082ff954d6
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Layer/Markers.js
+7 -5
View File
@@ -120,11 +120,13 @@ OpenLayers.Layer.Markers = OpenLayers.Class(OpenLayers.Layer, {
* marker - {<OpenLayers.Marker>} * marker - {<OpenLayers.Marker>}
*/ */
removeMarker: function(marker) { removeMarker: function(marker) {
OpenLayers.Util.removeItem(this.markers, marker); if (this.markers && this.markers.length) {
if ((marker.icon != null) && (marker.icon.imageDiv != null) && OpenLayers.Util.removeItem(this.markers, marker);
(marker.icon.imageDiv.parentNode == this.div) ) { if ((marker.icon != null) && (marker.icon.imageDiv != null) &&
this.div.removeChild(marker.icon.imageDiv); (marker.icon.imageDiv.parentNode == this.div) ) {
marker.drawn = false; this.div.removeChild(marker.icon.imageDiv);
marker.drawn = false;
}
} }
}, },
tests/Layer/test_Markers.html
+6 -1
View File
@@ -23,7 +23,7 @@
t.eq( layer.markers.length, 1, "addLayer adds marker to layer." ); t.eq( layer.markers.length, 1, "addLayer adds marker to layer." );
} }
function test_98_Layer_Markers_addMarker_removeMarker (t) { function test_98_Layer_Markers_addMarker_removeMarker (t) {
t.plan( 3 ); t.plan( 4 );
var map = new OpenLayers.Map('map'); var map = new OpenLayers.Map('map');
var baseLayer = new OpenLayers.Layer.WMS("Test Layer", var baseLayer = new OpenLayers.Layer.WMS("Test Layer",
@@ -40,6 +40,11 @@
t.ok( marker.icon.imageDiv.parentNode != layer.div, "removeMarker removes marker image node from layer node." ); t.ok( marker.icon.imageDiv.parentNode != layer.div, "removeMarker removes marker image node from layer node." );
layer.addMarker(marker); layer.addMarker(marker);
t.ok( marker.icon.imageDiv.parentNode == layer.div, "addMarker adds marker image node into layer node." ); t.ok( marker.icon.imageDiv.parentNode == layer.div, "addMarker adds marker image node into layer node." );
layer.markers = null;
layer.removeMarker(marker);
t.ok(true, "removing marker when no markers present does not script error");
} }
function test_99_Layer_Markers_destroy (t) { function test_99_Layer_Markers_destroy (t) {
t.plan( 1 ); t.plan( 1 );