placeholders for second half of the code (will need a small API update before this...

diff --git a/net/systemeD/halcyon/connection/Entity.as b/net/systemeD/halcyon/connection/Entity.as
index c365930f38720cdf5e965b7f6a70e3108ed0ef58..3a1491eca2171cea6f3391a918a9ff33d7acd443 100644 (file)
--- a/net/systemeD/halcyon/connection/Entity.as
+++ b/net/systemeD/halcyon/connection/Entity.as
@@ -16,6 +16,7 @@ package net.systemeD.halcyon.connection {
                private var parents:Dictionary = new Dictionary();
                public var locked:Boolean = false;                                              // lock against purging when off-screen
                public var deleted:Boolean = false;
+//             public var parentsLoaded:Boolean = true;                                // are all its parents in memory?
 
         public function Entity(id:Number, version:uint, tags:Object, loaded:Boolean, uid:Number, timestamp:String) {
             this._id = id;

diff --git a/net/systemeD/halcyon/connection/XMLBaseConnection.as b/net/systemeD/halcyon/connection/XMLBaseConnection.as
index e304384750339cdf80d69e6c04deb8152f23c3ca..16cbeb206d70186d049ef264d4ce5d6e8eceb719 100644 (file)
--- a/net/systemeD/halcyon/connection/XMLBaseConnection.as
+++ b/net/systemeD/halcyon/connection/XMLBaseConnection.as
@@ -30,6 +30,11 @@ package net.systemeD.halcyon.connection {
             var node:Node, newNode:Node;
             var unusedNodes:Object={};
 
+                       var minlon:Number=map.bounds.@minlon;
+                       var maxlon:Number=map.bounds.@maxlon;
+                       var minlat:Number=map.bounds.@minlat;
+                       var maxlat:Number=map.bounds.@maxlat;
+
             for each(var relData:XML in map.relation) {
                 id = Number(relData.@id);
                 version = uint(relData.@version);
@@ -93,9 +98,12 @@ package net.systemeD.halcyon.connection {
                                                   nodeData.@timestamp);
                                
                                if ( node == null || !node.loaded) {
+//                                     newNode.parentsLoaded=newNode.within(minlon,maxlon,minlat,maxlat);
+//                                     ** updateEntityProperties will need to do parentsLoaded as well
                                        setOrUpdateNode(newNode, true);
                                } else {
                                        // the node's already in memory, but store it in case one of the new ways needs it
+//                                     if (newNode.within(minlon,maxlon,minlat,maxlat)) newNode.parentsLoaded=true;
                                        unusedNodes[id]=newNode;
                                }
                        }

diff --git a/net/systemeD/halcyon/connection/XMLConnection.as b/net/systemeD/halcyon/connection/XMLConnection.as
index c4e48dbdb2b5e290760feba2262dfd744e225d9c..f3f44dd5c29193c54df92059989a58f26dbe7b84 100644 (file)
--- a/net/systemeD/halcyon/connection/XMLConnection.as
+++ b/net/systemeD/halcyon/connection/XMLConnection.as
@@ -265,6 +265,7 @@ package net.systemeD.halcyon.connection {
                     continue;
                     
                 var xml:XML = serialise(entity);
+                // ** if parentsLoaded==false, do a soft delete only
                 xml.@changeset = changeset.id;
                 del.appendChild(xml);
             }