Merge changes from trunk to 2.4:

svn merge trunk/openlayers/@3088 trunk/openlayers/@HEAD branches/openlayers/2.4/

Changes include:
 * Improved GML parsing to catch fid better
 * Letting panels pass mouseup through
 * Fixing small bug in panel example
 * Display of markers/layers when out of range on startup.
 * Fix to aspect ratio of Overview Map.


git-svn-id: http://svn.openlayers.org/branches/openlayers/2.4@3112 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2007-05-02 14:06:41 +00:00
parent b5103eb8ce
commit 3c6cd6f559
13 changed files with 159 additions and 195 deletions
+11 -1
View File
@@ -21,6 +21,15 @@ OpenLayers.Layer.Markers.prototype =
/** internal marker list
* @type Array(OpenLayers.Marker) */
markers: null,
/** internal state of drawing. This is a workaround for the fact
* that the map does not call moveTo with a zoomChanged when the
* map is first starting up. This lets us catch the case where we
* have *never* drawn the layer, and draw it even if the zoom hasn't
* changed.
* @type Boolean */
drawn: false,
/**
* @constructor
@@ -51,8 +60,9 @@ OpenLayers.Layer.Markers.prototype =
moveTo:function(bounds, zoomChanged, dragging) {
OpenLayers.Layer.prototype.moveTo.apply(this, arguments);
if (zoomChanged) {
if (zoomChanged || !this.drawn) {
this.redraw();
this.drawn = true;
}
},
+6
View File
@@ -248,6 +248,12 @@ OpenLayers.Layer.Vector.prototype =
this.features = OpenLayers.Util.removeItem(this.features, feature);
this.renderer.eraseGeometry(feature.geometry);
//in the case that this feature is one of the selected features,
// remove it from that array as well.
if (OpenLayers.Util.indexOf(this.selectedFeatures, feature) != -1){
OpenLayers.Util.removeItem(this.selectedFeatures, feature);
}
}
},