Don't duplicate bugs. The complete reimplementation of Connection in VectorLayer...

diff --git a/TODO.txt b/TODO.txt
index f430415376bc53674dacd4ba8395a7ce1a9a01ba..c48dbcb8e25db30cb84b5ada427b9057ce3c9e82 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -64,7 +64,6 @@ Potlatch 2: main outstanding issues
 * View comments and add new comments
 * Reopen?
 * Handle errors when closing bugs (especially nickname-based errors)
-* Multiple downloads create multiple copies of the same bug...
 
 Requested enhancements
 ----------------------

diff --git a/net/systemeD/halcyon/VectorLayer.as b/net/systemeD/halcyon/VectorLayer.as
index 5ab6db97121e10ac44cf0c0a366a1ff5a9600ad1..b1640d4cfe65354293aa10384962a44b9f4916d2 100644 (file)
--- a/net/systemeD/halcyon/VectorLayer.as
+++ b/net/systemeD/halcyon/VectorLayer.as
@@ -78,9 +78,25 @@ package net.systemeD.halcyon {
             return relation;
                }
 
-        public function createMarker(tags:Object,lat:Number,lon:Number):Marker {
-            var marker:Marker = new Marker(negativeID, 0, tags, true, lat, lon);
-            markers[negativeID]=marker; negativeID--;
+        /**
+        * Create a new Marker on the VectorLayer. If you pass in an id it'll check first whether that
+        * marker has been created already, and won't duplicate it.
+        *
+        * @param tags The tags for the new Marker
+        * @param lat The latitude
+        * @param lon The longitude
+        * @param id Use this id for the marker, useful for when layer might be reloaded during panning
+        */
+        public function createMarker(tags:Object,lat:Number,lon:Number,id:Number=NaN):Marker {
+            if (!id) {
+              id = negativeID;
+              negativeID--;
+            }
+            var marker:Marker = markers[id];
+            if (marker == null) {
+              marker = new Marker(id, 0, tags, true, lat, lon);
+              markers[id]=marker;
+            }
             return marker;
         }
 

diff --git a/net/systemeD/potlatch2/BugLayer.as b/net/systemeD/potlatch2/BugLayer.as
index cfeb1d22fc425da6d8a842e936886f406e30cff7..69dafc8007d32c8b1e81bbe14ca214bdadf7b813 100644 (file)
--- a/net/systemeD/potlatch2/BugLayer.as
+++ b/net/systemeD/potlatch2/BugLayer.as
@@ -67,7 +67,7 @@ package net.systemeD.potlatch2 {
                 tags["date_updated"] = feature.properties.date_updated;
                 tags["source"] = feature.properties.source;
                 tags["status"] = status[int(feature.properties.status)];
-                var marker:Marker = createMarker(tags, lat, lon);
+                var marker:Marker = createMarker(tags, lat, lon, Number(feature.id));
               }
               paint.updateEntityUIs(getObjectsByBbox(map.edge_l,map.edge_r,map.edge_t,map.edge_b), true, false);
             }