fix dupe nodes stuff

[potlatch2.git] / net / systemeD / halcyon / connection / XMLConnection.as

diff --git a/net/systemeD/halcyon/connection/XMLConnection.as b/net/systemeD/halcyon/connection/XMLConnection.as
index b2e7624327a09cdd892481ce62a8d537ff565869..f65e20cb619d73540425d503bb79d51597ee6d65 100644 (file)
--- a/net/systemeD/halcyon/connection/XMLConnection.as
+++ b/net/systemeD/halcyon/connection/XMLConnection.as
@@ -218,23 +218,15 @@ package net.systemeD.halcyon.connection {
 
                                if (newID==0) {
                                        // delete
-                       if ( type == "node" ) killNode(oldID);
-                       else if ( type == "way" ) killWay(oldID);
-                       else if ( type == "relation" ) killRelation(oldID);
+                       if      (type == "node"    ) { killNode(oldID); }
+                       else if (type == "way"     ) { killWay(oldID); }
+                       else if (type == "relation") { killRelation(oldID); }
                                        
                                } else {
                                        // create/update
-                       var entity:Entity;
-                       if ( type == "node" ) entity = getNode(oldID);
-                       else if ( type == "way" ) entity = getWay(oldID);
-                       else if ( type == "relation" ) entity = getRelation(oldID);
-                       entity.markClean(newID, version);
-                
-                       if ( oldID != newID ) {
-                           if ( type == "node" ) renumberNode(oldID, entity as Node, false);
-                           else if ( type == "way" ) renumberWay(oldID, entity as Way, false);
-                           else if ( type == "relation" ) renumberRelation(oldID, entity as Relation, false);
-                       }
+                       if      (type == "node"    ) { renumberNode(oldID, newID, version); getNode(newID).markClean(); }
+                       else if (type == "way"     ) { renumberWay(oldID, newID, version); getWay(newID).markClean(); }
+                       else if (type == "relation") { renumberRelation(oldID, newID, version); getRelation(newID).markClean(); }
                                }
             }