Changeset 25670 in osm for applications/editors/josm

Timestamp:

2011-03-22T22:57:56+01:00 (14 years ago)

Author:

zverik

Message:

popup menu for chosen relation (relcontext plugin)

Location:

applications/editors/josm/plugins/relcontext/src/relcontext

Files:

• ChosenRelationComponent.java (modified) (2 diffs)
• RelContextDialog.java (modified) (5 diffs)
• actions/CreateMultipolygonAction.java (modified) (3 diffs)
• actions/DeleteChosenRelationAction.java (added)
• actions/SelectMembersAction.java (added)

applications/editors/josm/plugins/relcontext/src/relcontext/ChosenRelationComponent.java

@@ -1 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package relcontext;
 
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import javax.swing.JLabel;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
 
 /**
@@ -28 +19 @@
         this.chRel = rel;
         rel.addChosenRelationListener(this);
-        addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseClicked( MouseEvent e ) {
-                if( chRel.get() != null && Main.map.mapView.getEditLayer() != null )
-                    Main.map.mapView.getEditLayer().data.setSelected(chRel.get());
-            }
-        });
     }
 

applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java

@@ -26 +26 @@
 import java.util.*;
 import javax.swing.*;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
 import relcontext.actions.*;
@@ -40 +39 @@
     private ChosenRelation chosenRelation;
     private JPanel topLine;
+    private ChosenRelationPopupMenu popupMenu;
 
     public RelContextDialog() {
@@ -80 +80 @@
         topLeftButtons.add(new JButton(new ClearChosenRelationAction(chosenRelation)));
         topLine.add(topLeftButtons, BorderLayout.WEST);
-        topLine.add(new ChosenRelationComponent(chosenRelation), BorderLayout.CENTER);
+        final ChosenRelationComponent chosenRelationComponent = new ChosenRelationComponent(chosenRelation);
+        chosenRelationComponent.addMouseListener(new ChosenRelationMouseAdapter());
+        topLine.add(chosenRelationComponent, BorderLayout.CENTER);
         JPanel topRightButtons = new JPanel(new FlowLayout(FlowLayout.RIGHT));
         final Action downloadChosenRelationAction = new DownloadChosenRelationAction(chosenRelation);
@@ -104 +106 @@
 
         add(rcPanel, BorderLayout.CENTER);
+
+        popupMenu = new ChosenRelationPopupMenu();
     }
 
@@ -160 +164 @@
         updateSelection();
     }
+
+    private class ChosenRelationMouseAdapter extends MouseAdapter {
+        @Override
+        public void mouseClicked( MouseEvent e ) {
+            if( SwingUtilities.isLeftMouseButton(e) && chosenRelation.get() != null && Main.map.mapView.getEditLayer() != null ) {
+                Main.map.mapView.getEditLayer().data.setSelected(chosenRelation.get());
+            }
+        }
+
+        @Override
+        public void mousePressed( MouseEvent e ) {
+            checkPopup(e);
+        }
+
+        @Override
+        public void mouseReleased( MouseEvent e ) {
+            checkPopup(e);
+        }
+
+        private void checkPopup( MouseEvent e ) {
+            if( e.isPopupTrigger() && chosenRelation.get() != null ) {
+                popupMenu.show(e.getComponent(), e.getX(), e.getY());
+            }
+        }
+    }
+
+    private class ChosenRelationPopupMenu extends JPopupMenu {
+        public ChosenRelationPopupMenu() {
+            add(new SelectMembersAction(chosenRelation));
+            add(new DeleteChosenRelationAction(chosenRelation));
+        }
+    }
 }

applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateMultipolygonAction.java

@@ -1 +1 @@
 package relcontext.actions;
 
-import java.util.Collection;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import java.awt.event.ActionEvent;
-import java.util.LinkedList;
+import java.util.*;
+import javax.swing.JOptionPane;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.osm.MultipolygonCreate;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -36 +39 @@
 
     public void actionPerformed( ActionEvent e ) {
-        // todo!
-        
+        // for now, just copying standard action
+        MultipolygonCreate mpc = new MultipolygonCreate();
+        String error = mpc.makeFromWays(getCurrentDataSet().getSelectedWays());
+        if( error != null ) {
+            JOptionPane.showMessageDialog(Main.parent, error);
+            return;
+        }
         Relation rel = new Relation();
         rel.put("type", "multipolygon");
-        for( OsmPrimitive selected : getCurrentDataSet().getSelected() ) {
-            rel.addMember(new RelationMember("", selected));
-        }
-
-        Collection<Command> cmds = new LinkedList<Command>();
-        Main.main.undoRedo.add(new AddCommand(rel));
-
-        if( chRel != null ) {
+        for( MultipolygonCreate.JoinedPolygon poly : mpc.outerWays )
+            for( Way w : poly.ways )
+                rel.addMember(new RelationMember("outer", w));
+        for( MultipolygonCreate.JoinedPolygon poly : mpc.innerWays )
+            for( Way w : poly.ways )
+                rel.addMember(new RelationMember("inner", w));
+        List<Command> list = removeTagsFromInnerWays(rel);
+        list.add(new AddCommand(rel));
+        Main.main.undoRedo.add(new SequenceCommand(tr("Create multipolygon"), list));
+        
+        if( chRel != null )
             chRel.set(rel);
-        }
     }
 
@@ -75 +85 @@
         setEnabled(enabled);
     }
+
+    /**
+     * This method removes tags/value pairs from inner ways that are present in relation or outer ways.
+     * It was copypasted from the standard {@link org.openstreetmap.josm.actions.CreateMultipolygonAction}.
+     * Todo: rewrite it.
+     */
+    private List<Command> removeTagsFromInnerWays(Relation relation) {
+        Map<String, String> values = new HashMap<String, String>();
+
+        if (relation.hasKeys()){
+            for(String key: relation.keySet()) {
+                values.put(key, relation.get(key));
+            }
+        }
+
+        List<Way> innerWays = new ArrayList<Way>();
+
+        for (RelationMember m: relation.getMembers()) {
+
+            if (m.hasRole() && m.getRole() == "inner" && m.isWay() && m.getWay().hasKeys()) {
+                innerWays.add(m.getWay());
+            }
+
+            if (m.hasRole() && m.getRole() == "outer" && m.isWay() && m.getWay().hasKeys()) {
+                Way way = m.getWay();
+                for (String key: way.keySet()) {
+                    if (!values.containsKey(key)) { //relation values take precedence
+                        values.put(key, way.get(key));
+                    }
+                }
+            }
+        }
+
+        List<Command> commands = new ArrayList<Command>();
+
+        for(String key: values.keySet()) {
+            List<OsmPrimitive> affectedWays = new ArrayList<OsmPrimitive>();
+            String value = values.get(key);
+
+            for (Way way: innerWays) {
+                if (value.equals(way.get(key))) {
+                    affectedWays.add(way);
+                }
+            }
+
+            if (affectedWays.size() > 0) {
+                commands.add(new ChangePropertyCommand(affectedWays, key, null));
+            }
+        }
+
+        return commands;
+    }
 }