Figure out which entity is which, and populate the tag grid

diff --git a/net/systemeD/potlatch2/TagViewer.mxml b/net/systemeD/potlatch2/TagViewer.mxml
index fdc0ba60dd5dee6351ad826781b922985dec38d5..9cc3a38b470c3aef33b9aada9d88e66e4944aa85 100644 (file)
--- a/net/systemeD/potlatch2/TagViewer.mxml
+++ b/net/systemeD/potlatch2/TagViewer.mxml
@@ -299,7 +299,7 @@
         } else if (entities.length==2
                       && xor(entities[0].connection is SnapshotConnection, entities[1].connection is SnapshotConnection)
                       && xor(!controller.map.getLayerForEntity(entities[0]).isBackground, !controller.map.getLayerForEntity(entities[1]).isBackground) ) {
-            //backgroundMergePanel.init(entities, layer)
+            backgroundMergePanelContents.init(entities);
             sidebar.selectedChild = backgroundMergePanel;
 
                } else if(isMultipleEditable(entities)) {

diff --git a/net/systemeD/potlatch2/panels/BackgroundMergePanel.mxml b/net/systemeD/potlatch2/panels/BackgroundMergePanel.mxml
index a5de13fa2dc38117a906fdba6dee9baa9fed6cfa..ca397504347e19b42ec39737c0ed32846202bd0b 100644 (file)
--- a/net/systemeD/potlatch2/panels/BackgroundMergePanel.mxml
+++ b/net/systemeD/potlatch2/panels/BackgroundMergePanel.mxml
@@ -6,4 +6,59 @@
 
 <mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" height="100%">
   <mx:Text id="backgroundMergePanelText" text="W00t!!!" width="100%" styleName="helpInfo" />
+  <mx:DataGrid editable="false" id="backgroundPanelDG" width="100%" height="50%">
+    <mx:columns>
+      <mx:DataGridColumn editable="false" dataField="k" headerText="key" />
+      <mx:DataGridColumn editable="false" dataField="e" headerText="OSM value" />
+      <mx:DataGridColumn editable="false" dataField="b" headerText="Background value" />
+    </mx:columns>
+  </mx:DataGrid>
+  <mx:Script><![CDATA[
+
+      import net.systemeD.halcyon.connection.*;
+      import mx.collections.*;
+
+      private var editableEntity:Entity;
+      private var backgroundEntity:Entity;
+      private var tagDataProvider:ArrayCollection;
+
+      public function init(entities:Array):void {
+          if ( tagDataProvider == null ) {
+              tagDataProvider = new ArrayCollection();
+              backgroundPanelDG.dataProvider = tagDataProvider;
+          }
+
+          if (parentDocument.controller.map.getLayerForEntity(entities[0]).isBackground) {
+              backgroundEntity = entities[0];
+              editableEntity = entities[1];
+          } else {
+              backgroundEntity = entities[1];
+              editableEntity = entities[0];
+          }
+          updateTagDataProvider();
+      }
+
+      private function updateTagDataProvider():void {
+          var tag:Tag;
+          var keys:Array = [];
+
+          tagDataProvider.removeAll();
+
+          for each (tag in backgroundEntity.getTagArray() ) {
+              keys.push(tag.key);
+          }
+
+          for each (tag in editableEntity.getTagArray() ) {
+              keys.push(tag.key);
+          }
+
+          keys=keys.filter(function(k:*, i:int, arr:Array):Boolean { return arr.indexOf(k) == i } ); // remove duplicates
+          keys.sort();
+
+          for each (var key:String in keys) {
+              tagDataProvider.addItem({k:key, e:editableEntity.getTag(key), b:backgroundEntity.getTag(key)});
+          }
+      }
+  ]]>
+  </mx:Script>
 </mx:VBox>
\ No newline at end of file