Merge branch 'master' into snapshotserver
[potlatch2.git] / net / systemeD / halcyon / connection / XMLBaseConnection.as
index 1fce363..48159ba 100644 (file)
@@ -108,6 +108,7 @@ package net.systemeD.halcyon.connection {
                                                                           Number(nodeData.@lon),
                                                                           Number(nodeData.@uid),
                                                                           nodeData.@timestamp);
+                if ( inlineStatus ) { newNode.status = nodeData.@status; }
                                
                                        if ( singleEntityRequest ) {
                                                // it's a revert request, so create/update the node
@@ -143,11 +144,13 @@ package net.systemeD.halcyon.connection {
                                                tags = parseTags(data.tag);
                                                if ( way == null ) {
                                                        way=new Way(this, id, version, tags, true, nodelist, uid, timestamp)
+                                                       if ( inlineStatus ) { way.status = data.@status; }
                                                        setWay(way,false);
                                                        createdEntities.push(way);
                                                } else {
                                                        waycount++;
                                                        way.update(version, tags, true, true, nodelist, uid, timestamp);
+                                                       if ( inlineStatus ) { way.status = data.@status; }
                                                        sendEvent(new EntityEvent(NEW_WAY, way), false);
                                                }
                                        }