[OpenLayers-Commits] r2299 - in sandbox/bwoodall/T450: . openlayers/build openlayers/lib/OpenLayers/Control openlayers/lib/OpenLayers/Layer

[commits at openlayers.org]

Author: bwoodall
Date: 2007-03-04 01:43:55 -0500 (Sun, 04 Mar 2007)
New Revision: 2299

Added:
   sandbox/bwoodall/T450/openlayers/
Modified:
   sandbox/bwoodall/T450/openlayers/build/build.py
   sandbox/bwoodall/T450/openlayers/lib/OpenLayers/Control/MousePosition.js
   sandbox/bwoodall/T450/openlayers/lib/OpenLayers/Layer/Markers.js
Log:
Code, patch, and test for Ticket #450



Copied: sandbox/bwoodall/T450/openlayers (from rev 2286, trunk/openlayers)

Modified: sandbox/bwoodall/T450/openlayers/build/build.py
===================================================================
--- trunk/openlayers/build/build.py	2007-02-26 04:02:58 UTC (rev 2286)
+++ sandbox/bwoodall/T450/openlayers/build/build.py	2007-03-04 06:43:55 UTC (rev 2299)
@@ -16,10 +16,11 @@
 
 print "Merging libraries."
 merged = mergejs.run(sourceDirectory, None, configFilename)
-print "Compressing."
-minimized = jsmin.jsmin(merged)
-print "Adding license file."
-minimized = file("license.txt").read() + minimized
+#print "Compressing."
+#minimized = jsmin.jsmin(merged)
+#print "Adding license file."
+#minimized = file("license.txt").read() + minimized
+minimized = merged
 
 print "Writing to %s." % outputFilename
 file(outputFilename, "w").write(minimized)

Modified: sandbox/bwoodall/T450/openlayers/lib/OpenLayers/Control/MousePosition.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Control/MousePosition.js	2007-02-26 04:02:58 UTC (rev 2286)
+++ sandbox/bwoodall/T450/openlayers/lib/OpenLayers/Control/MousePosition.js	2007-03-04 06:43:55 UTC (rev 2299)
@@ -81,8 +81,10 @@
             this.lastXy = evt.xy;
         }
         
+// SAD
         var digits = parseInt(this.numdigits);
         var newHtml =
+            this.map.getZoom()+' '+
             this.prefix +
             lonLat.lon.toFixed(digits) +
             this.separator + 

Modified: sandbox/bwoodall/T450/openlayers/lib/OpenLayers/Layer/Markers.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Layer/Markers.js	2007-02-26 04:02:58 UTC (rev 2286)
+++ sandbox/bwoodall/T450/openlayers/lib/OpenLayers/Layer/Markers.js	2007-03-04 06:43:55 UTC (rev 2299)
@@ -31,6 +31,10 @@
     initialize: function(name, options) {
         OpenLayers.Layer.prototype.initialize.apply(this, arguments);
         this.markers = new Array();
+
+        if (this.map && this.map.getExtent()) {
+            this.markers.viewRequestID = this.map.viewRequestID;
+        }
     },
     
     /**
@@ -51,9 +55,13 @@
     moveTo:function(bounds, zoomChanged, dragging) {
         OpenLayers.Layer.prototype.moveTo.apply(this, arguments);
 
-        if (zoomChanged) {
+        if (zoomChanged || 
+            (this.map && 
+             this.markers.viewRequestID != this.map.viewRequestID)) {
             this.redraw();
         }
+
+        this.markers.viewRequestID = this.map.viewRequestID;
     },
 
     /**