Changeset 653 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2008-06-13T00:44:36+02:00 (17 years ago)

Author:

framm

Message:

• add a "download members" button to relation editor, patch by Christian Malolepszy <c.malolepszy@…>

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/RelationEditor.java (modified) (4 diffs)
• io/OsmServerObjectReader.java (added)

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java

@@ -13 +13 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Map.Entry;
 
 import javax.swing.JButton;
+import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -32 +34 @@
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.visitor.MergeVisitor;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.io.OsmServerObjectReader;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.xml.sax.SAXException;
 
 /**
@@ -238 +245 @@
                         }
                 }));
+        buttonPanel.add(createButton(marktr("Download Members"),"down", tr("Download all incomplete ways and nodes in relation"), KeyEvent.VK_L, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                downloadRelationMembers();                
+                refreshTables();
+            }            
+        }));
+        
+        
                 bothTables.add(buttonPanel, GBC.eop().fill(GBC.HORIZONTAL));
 
@@ -285 +300 @@
                 refreshTables();
         }
+    private void downloadRelationMembers()  {
+
+        boolean download = false;
+        for (RelationMember member : clone.members) {
+            if (member.member.incomplete) {
+                download = true;
+                break;
+            }
+        }
+        if (download) {
+            OsmServerObjectReader reader = new OsmServerObjectReader();
+            try {
+                DataSet dataSet = reader.parseOsm(clone.id,
+                        OsmServerObjectReader.TYPE_REL, true);
+                if (dataSet != null) {
+                    final MergeVisitor visitor = new MergeVisitor(Main.main
+                            .editLayer().data, dataSet);
+                    for (final OsmPrimitive osm : dataSet.allPrimitives())
+                        osm.visit(visitor);
+                    visitor.fixReferences();
+
+                    // copy the merged layer's data source info
+                    for (DataSource src : dataSet.dataSources)
+                        Main.main.editLayer().data.dataSources.add(src);
+                    Main.main.editLayer().fireDataChange();
+
+                    if (visitor.conflicts.isEmpty())
+                        return;
+                    final ConflictDialog dlg = Main.map.conflictDialog;
+                    dlg.add(visitor.conflicts);
+                    JOptionPane.showMessageDialog(Main.parent,
+                            tr("There were conflicts during import."));
+                    if (!dlg.isVisible())
+                        dlg.action
+                                .actionPerformed(new ActionEvent(this, 0, ""));
+                }
+
+            } catch (SAXException e) {
+                e.printStackTrace();
+                JOptionPane.showMessageDialog(this,tr("Error parsing server response.")+": "+e.getMessage(), tr("Error"), JOptionPane.ERROR_MESSAGE);        
+            } catch (IOException e) {
+                e.printStackTrace();                
+                JOptionPane.showMessageDialog(this,tr("Cannot connect to server.")+": "+e.getMessage(), tr("Error"), JOptionPane.ERROR_MESSAGE);
+            }
+        }
+
+    }
 }