Changeset 25688 in osm for applications/editors/josm/plugins/relcontext/src/relcontext

Timestamp:

2011-03-24T14:52:57+01:00 (14 years ago)

Author:

zverik

Message:

final stretch for beta

Location:

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

Files:

• ChosenRelationComponent.java (modified) (2 diffs)
• RelContextDialog.java (modified) (8 diffs)
• actions/AddRemoveMemberAction.java (modified) (2 diffs)
• actions/CreateRelationAction.java (modified) (1 diff)
• actions/SortAndFixAction.java (modified) (5 diffs)

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

@@ -1 +1 @@
 package relcontext;
 
+import java.awt.Color;
 import javax.swing.JLabel;
+import javax.swing.border.BevelBorder;
+import javax.swing.border.LineBorder;
 import org.openstreetmap.josm.data.osm.Relation;
 
@@ -17 +20 @@
     public ChosenRelationComponent(ChosenRelation rel) {
         super("");
+/*        setBackground(Color.white);
+        setOpaque(true);
+        setBorder(new LineBorder(Color.black, 1, true));*/
         this.chRel = rel;
         rel.addChosenRelationListener(this);

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

@@ -1 +1 @@
 package relcontext;
 
+import java.awt.Component;
 import java.awt.Dimension;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -14 +15 @@
 
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Dialog.ModalityType;
-import java.awt.FlowLayout;
 import java.awt.GridBagLayout;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.table.DefaultTableCellRenderer;
 
 import org.openstreetmap.josm.Main;
@@ -37 +39 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.command.ChangeCommand;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
@@ -58 +59 @@
 
     public RelContextDialog() {
-        super(tr("Advanced Relation Editor"), "icon_relcontext",
-                tr("Opens advanced relation/multipolygon editor panel"),
-                Shortcut.registerShortcut("view:relcontext", tr("Toggle: {0}", tr("Open Relation Editor")),
+        super(tr("Relation Toolbox"), "reltoolbox",
+                tr("Open relation/multipolygon editor panel"),
+                Shortcut.registerShortcut("subwindow:reltoolbox", tr("Toggle: {0}", tr("Relation Toolbox")),
                 KeyEvent.VK_R, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150, true);
-
-        // todo: shrink all panels to ~20 pixels
 
         JPanel rcPanel = new JPanel(new BorderLayout());
@@ -166 +165 @@
     }
 
+    private static final Color CHOSEN_RELATION_COLOR = new Color(255, 255, 128);
+
     private void configureRelationsTable( final JTable relationsTable ) {
         relationsTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -174 +175 @@
             protected String getComponentToolTipText( OsmPrimitive value ) {
                 return null;
+            }
+
+            @Override
+            public Component getTableCellRendererComponent( JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column ) {
+                Component c = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+                if( !isSelected && value instanceof Relation && chosenRelation.get() != null && value.equals(chosenRelation.get()) )
+                    c.setBackground(CHOSEN_RELATION_COLOR);
+                else
+                    c.setBackground(table.getBackground());
+                return c;
+            }
+
+        });
+        columns.getColumn(1).setCellRenderer(new DefaultTableCellRenderer() {
+            @Override
+            public Component getTableCellRendererComponent( JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column ) {
+                Component c = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+                if( !isSelected && chosenRelation.get() != null && table.getValueAt(row, 0).equals(chosenRelation.get()) )
+                    c.setBackground(CHOSEN_RELATION_COLOR);
+                else
+                    c.setBackground(table.getBackground());
+                return c;
             }
         });
@@ -307 +330 @@
         possibleRoles.put("tunnel", new String[] {"through", "outline", "edge"});
         possibleRoles.put("surveillance", new String[] {"camera", "extent", "visible", "hidden"});
+        possibleRoles.put("street", new String[] {"street", "address", "house", "associated"});
+        possibleRoles.put("collection", new String[] {"member", "street", "river", "railway", "address", "associated"});
     }
 
@@ -341 +366 @@
         final AutoCompletingComboBox role = new AutoCompletingComboBox();
         List<AutoCompletionListItem> items = new ArrayList<AutoCompletionListItem>();
-        for( int i = 0; i < roleBox.getModel().getSize(); i++ )
-            items.add((AutoCompletionListItem)roleBox.getModel().getElementAt(i));
+        for( int i = 0; i < roleBox.getModel().getSize(); i++ ) {
+            final AutoCompletionListItem item = (AutoCompletionListItem)roleBox.getModel().getElementAt(i);
+            if( item.getValue().length() > 1 )
+                items.add(item);
+        }
         role.setPossibleACItems(items);
         role.setEditable(true);

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

@@ -8 +8 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.ImageProvider;
 import relcontext.ChosenRelation;
@@ -47 +50 @@
         // 2. add all new members
         for( OsmPrimitive p : toAdd ) {
-            r.addMember(new RelationMember("", p));
+            int pos = -1; //p instanceof Way ? findAdjacentMember(p, r) : -1;
+            if( pos < 0 )
+                r.addMember(new RelationMember("", p));
+            else
+                r.addMember(pos, new RelationMember("", p));
         }
 
         if( !r.getMemberPrimitives().equals(rel.get().getMemberPrimitives()) )
             Main.main.undoRedo.add(new ChangeCommand(rel.get(), r));
+    }
+
+    /**
+     * Finds two relation members between which to place given way. Incomplete.
+     * @see org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel#determineDirection
+     */
+    protected int findAdjacentMember( Way w, Relation r ) {
+        Node firstNode = w.firstNode();
+        Node lastNode = w.lastNode();
+
+        if( firstNode != null && !firstNode.equals(lastNode) ) {
+            for( int i = 0; i < r.getMembersCount(); i++ ) {
+                if( r.getMember(i).getType().equals(OsmPrimitiveType.WAY) ) {
+                    Way rw = (Way)r.getMember(i).getMember();
+                    Node firstNodeR = rw.firstNode();
+                    Node lastNodeR = rw.lastNode();
+                    if( firstNode.equals(firstNodeR) || firstNode.equals(lastNodeR) || lastNode.equals(firstNodeR) || lastNode.equals(lastNodeR) )
+                        return i + 1;
+                }
+            }
+        }
+        return -1;
     }
 

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

@@ -79 +79 @@
     private static final List<String> RELATION_TYPES = Arrays.asList(new String[] {
         "multipolygon", "boundary", "route", "site", "restriction", "associatedStreet", "public_transport",
-        "street", "collection", "address", "enforcement", "destination_sign", "route_master", "junction", "site",
+        "street", "collection", "address", "enforcement", "destination_sign", "route_master", "junction",
         "waterway", "bridge", "tunnel", "surveillance"
     });

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

@@ -8 +8 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangeCommand;
-import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.*;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -31 +29 @@
         if( rel.get() == null ) return;
         Relation r = rel.get();
-        List<Command> commands = new ArrayList<Command>();
+        boolean fixed = false;
         // todo: sort members
         // todo: set roles for multipolygon members
-        Relation fixed = fixMultipolygonRoles(rel.get());
-        if( fixed != null ) {
-            commands.add(new ChangeCommand(r, fixed));
-            r = fixed;
+        Relation rr = fixMultipolygonRoles(r);
+        if( rr != null ) {
+            r = rr;
+            fixed = true;
         }
         // todo: set roles for boundary members
+        rr= fixBoundaryRoles(r);
+        if( rr != null ) {
+            r = rr;
+            fixed = true;
+        }
 
-        if( !commands.isEmpty() )
-            Main.main.undoRedo.add(new SequenceCommand(tr("Sort and fix relation"), commands));
+        if( fixed )
+            Main.main.undoRedo.add(new ChangeCommand(rel.get(), r));
     }
 
     public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
-        setEnabled(newRelation != null && areMultipolygonTagsEmpty());
-        // todo: enable when needs fixing (empty roles or not ordered members)
+        setEnabled(newRelation != null && !isIncomplete(newRelation) && (areMultipolygonTagsEmpty() || areBoundaryTagsNotRight()));
     }
 
+    protected boolean isIncomplete( Relation r ) {
+        if( r == null || r.isIncomplete() || r.isDeleted() )
+            return true;
+        for( RelationMember m : r.getMembers())
+            if( m.getMember().isIncomplete() )
+                return true;
+        return false;
+    }
+
+    /**
+     * Check for ways that have roles different from "outer" and "inner".
+     */
     private boolean areMultipolygonTagsEmpty() {
         Relation r = rel == null ? null : rel.get();
@@ -56 +70 @@
         for( RelationMember m : r.getMembers() ) {
             if( m.getType().equals(OsmPrimitiveType.WAY) && (m.getRole() == null || (!m.getRole().equals("outer") && !m.getRole().equals("inner"))) )
+                return true;
+        }
+        return false;
+    }
+
+    /**
+     * Check for nodes and relations without needed roles.
+     */
+    private boolean areBoundaryTagsNotRight() {
+        Relation r = rel == null ? null : rel.get();
+        if( r == null || r.getMembersCount() == 0 || !r.hasKey("type") || !r.get("type").equals("boundary") )
+            return false;
+        for( RelationMember m : r.getMembers() ) {
+            if( m.getType().equals(OsmPrimitiveType.RELATION) && (m.getRole() == null || !m.getRole().equals("subarea")) )
+                return true;
+            else if(m.getType().equals(OsmPrimitiveType.NODE) && (m.getRole() == null || (!m.getRole().equals("label") && !m.getRole().equals("admin_centre"))) )
                 return true;
         }
@@ -88 +118 @@
             if( m.getType().equals(OsmPrimitiveType.WAY) ) {
                 String role = null;
-                if( outerWays.contains(m.getMember()) )
+                if( outerWays.contains((Way)m.getMember()) )
                     role = "outer";
-                else if( innerWays.contains(m.getMember()) )
+                else if( innerWays.contains((Way)m.getMember()) )
                     role = "inner";
                 if( role != null && !role.equals(m.getRole()) ) {
@@ -100 +130 @@
         return fixed ? r : null;
     }
+
+    private Relation fixBoundaryRoles( Relation source ) {
+        Relation r = new Relation(source);
+        boolean fixed = false;
+        for( int i = 0; i < r.getMembersCount(); i++ ) {
+            RelationMember m = r.getMember(i);
+            String role = null;
+            if( m.getType().equals(OsmPrimitiveType.RELATION) )
+                role = "subarea";
+            else if( m.getType().equals(OsmPrimitiveType.NODE) ) {
+                Node n = (Node)m.getMember();
+                if( !n.isIncomplete() ) {
+                    if( n.hasKey("place") )
+                        role = "admin_centre";
+                    else
+                        role = "label";
+                }
+            }
+            if( role != null && !role.equals(m.getRole()) ) {
+                r.setMember(i, new RelationMember(role, m.getMember()));
+                fixed = true;
+            }
+        }
+        return fixed ? r : null;
+    }
 }