Changeset 28693 in osm for applications/editors/josm/plugins/reltoolbox

Timestamp:

2012-09-07T16:40:13+02:00 (12 years ago)

Author:

larry0ua

Message:

'RelToolbox: refactored relation fixing code, added associatedStreet as a fixable relation'

Location:

applications/editors/josm/plugins/reltoolbox

Files:

• build.xml (modified) (1 diff)
• src/relcontext/ChosenRelation.java (modified) (2 diffs)
• src/relcontext/RelContextDialog.java (modified) (2 diffs)
• src/relcontext/actions/AddRemoveMemberAction.java (modified) (6 diffs)
• src/relcontext/actions/SortAndFixAction.java (modified) (4 diffs)
• src/relcontext/relationfix (added)
• src/relcontext/relationfix/AssociatedStreetFixer.java (added)
• src/relcontext/relationfix/BoundaryFixer.java (added)
• src/relcontext/relationfix/MultipolygonFixer.java (added)
• src/relcontext/relationfix/NothingFixer.java (added)
• src/relcontext/relationfix/RelationFixer.java (added)

applications/editors/josm/plugins/reltoolbox/build.xml

@@ -30 +30 @@
 <project name="reltoolbox" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="RelToolbox: fix redifinition warnings"/>
+    <property name="commit.message" value="RelToolbox: refactored relation fixing code, added associatedStreet as a fixable relation"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="5018"/>

applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java

@@ -118 +118 @@
         if( opacity < 0.01 )
             return;
-
+        
+        Composite oldComposite = g.getComposite();
         Stroke oldStroke = g.getStroke();
-        Composite oldComposite = g.getComposite();
+        g.setStroke(new BasicStroke(9, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
         g.setColor(Color.yellow);
-        g.setStroke(new BasicStroke(9, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
         g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f * opacity));
-        for( OsmPrimitive element : chosenRelation.getMemberPrimitives() ) {
+        
+        drawRelations(g, mv, bbox, chosenRelation);
+        
+        g.setComposite(oldComposite);
+        g.setStroke(oldStroke);
+        
+    }
+    private void drawRelations(Graphics2D g, MapView mv, Bounds bbox, Relation rel) {
+        for( OsmPrimitive element : rel.getMemberPrimitives() ) {
             if( element.getType() == OsmPrimitiveType.NODE ) {
                 Node node = (Node)element;
@@ -142 +150 @@
                 }
             } else if( element.getType() == OsmPrimitiveType.RELATION ) {
-                // todo: draw all relation members (recursion?)
+                Color oldColor = g.getColor();
+                g.setColor(Color.magenta);
+                drawRelations(g, mv, bbox, (Relation)element);
+                g.setColor(oldColor);
             }
             // todo: closedway, multipolygon - ?
         }
-        g.setStroke(oldStroke);
-        g.setComposite(oldComposite);
     }
 

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

@@ -108 +108 @@
         roleBox.setVisible(false);
         enterRoleAction = new EnterRoleAction(); // just for the shortcut
+        sortAndFixAction = new SortAndFixAction(chosenRelation);
 
         // [±][X] relation U [AZ][Down][Edit]
         chosenRelationPanel = new JPanel(new GridBagLayout());
-        addRemoveMemberAction = new AddRemoveMemberAction(chosenRelation);
+        addRemoveMemberAction = new AddRemoveMemberAction(chosenRelation, sortAndFixAction);
         chosenRelationPanel.add(new JButton(addRemoveMemberAction), GBC.std());
         chosenRelationPanel.add(sizeButton(new JButton(new ClearChosenRelationAction(chosenRelation)), 32, 0), GBC.std());
@@ -118 +119 @@
         chosenRelationPanel.add(chosenRelationComponent, GBC.std().fill().insets(5, 0, 5, 0));
         chosenRelationPanel.add(roleBox, GBC.std().fill().insets(5, 0, 5, 0));
-        sortAndFixAction = new SortAndFixAction(chosenRelation);
         final JButton sortAndFixButton = (JButton) sizeButton(new JButton(sortAndFixAction), 32, 0);
         chosenRelationPanel.add(sortAndFixButton, GBC.std().fill(GBC.VERTICAL));

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

@@ -1 +1 @@
 package relcontext.actions;
 
-import java.util.*;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -11 +13 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -17 +20 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
+
 import relcontext.ChosenRelation;
 import relcontext.ChosenRelationListener;
@@ -30 +34 @@
     private static final String ACTION_NAME = "Add/remove member";
     private ChosenRelation rel;
+    private SortAndFixAction sortAndFix;
 
-    public AddRemoveMemberAction( ChosenRelation rel ) {
+    public AddRemoveMemberAction( ChosenRelation rel, SortAndFixAction sortAndFix ) {
         super(null, "relcontext/addremove", tr("Add/remove members from the chosen relation"),
                 Shortcut.registerShortcut("reltoolbox:addremove", tr("Relation Toolbox: {0}", tr("Add/remove members from the chosen relation")),
                 KeyEvent.VK_EQUALS, Shortcut.DIRECT), false);
         this.rel = rel;
+        this.sortAndFix = sortAndFix;
         rel.addChosenRelationListener(this);
         updateEnabledState();
@@ -51 +57 @@
 
         // 0. check if relation is broken (temporary)
-        boolean isBroken = !toAdd.isEmpty() && SortAndFixAction.needsFixing(r);
+        boolean isBroken = !toAdd.isEmpty() && sortAndFix.needsFixing(r);
 
         // 1. remove all present members
@@ -66 +72 @@
 
         // 3. check for roles again (temporary)
-        Command roleFix = !isBroken && SortAndFixAction.needsFixing(r) ? SortAndFixAction.fixRelation(r) : null;
+        Command roleFix = !isBroken && sortAndFix.needsFixing(r) ? sortAndFix.fixRelation(r) : null;
         if( roleFix != null )
             roleFix.executeCommand();

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

@@ -1 +1 @@
 package relcontext.actions;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.swing.AbstractAction;
 import javax.swing.Action;
-import static org.openstreetmap.josm.tools.I18n.tr;
+
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.data.osm.*;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.tools.ImageProvider;
+
 import relcontext.ChosenRelation;
 import relcontext.ChosenRelationListener;
+import relcontext.relationfix.AssociatedStreetFixer;
+import relcontext.relationfix.BoundaryFixer;
+import relcontext.relationfix.MultipolygonFixer;
+import relcontext.relationfix.NothingFixer;
+import relcontext.relationfix.RelationFixer;
 
 public class SortAndFixAction extends AbstractAction implements ChosenRelationListener {
-    private ChosenRelation rel;
+        private static final long serialVersionUID = 1L;
+        private ChosenRelation rel;
+    private List<RelationFixer> fixers;
 
     public SortAndFixAction( ChosenRelation rel ) {
@@ -25 +37 @@
         rel.addChosenRelationListener(this);
         setEnabled(false);
+        
+        // construct all available fixers
+        fixers = new ArrayList<RelationFixer>();
+        fixers.add(new BoundaryFixer()); // should be before multipolygon as takes special case of multipolygon relation - boundary
+        fixers.add(new MultipolygonFixer());
+        fixers.add(new AssociatedStreetFixer());
+        
     }
 
@@ -37 +56 @@
     }
 
-    public static boolean needsFixing( Relation rel ) {
-        return !isIncomplete(rel) && (areMultipolygonTagsEmpty(rel) || areBoundaryTagsNotRight(rel));
+    public boolean needsFixing( Relation rel ) {
+        return !isIncomplete(rel) && !getFixer(rel).isRelationGood(rel);
+    }
+    
+    private RelationFixer getFixer( Relation rel ) {
+        for(RelationFixer fixer : fixers)
+                if (fixer.isFixerApplicable(rel))
+                        return fixer;
+        return new NothingFixer();
     }
 
-    public static Command fixRelation( Relation rel ) {
-        Relation r = rel;
-        boolean fixed = false;
-        // todo: sort members
-        // todo: set roles for multipolygon members
-        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;
-        }
-
-        return fixed ? new ChangeCommand(rel, r) : null;
+    public Command fixRelation( Relation rel ) {
+        return getFixer(rel).fixRelation(rel);
     }
 
@@ -70 +80 @@
     }
 
-    /**
-     * Check for ways that have roles different from "outer" and "inner".
-     */
-    private static boolean areMultipolygonTagsEmpty( Relation r ) {
-        if( r == null || r.getMembersCount() == 0 || !ChosenRelation.isMultipolygon(r) )
-            return false;
-        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 static boolean areBoundaryTagsNotRight( Relation r ) {
-        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;
-        }
-        return false;
-    }
-
-    /**
-     * Basically, created multipolygon from scratch, and if successful, replace roles with new ones.
-     */
-    private static Relation fixMultipolygonRoles( Relation source ) {
-        Collection<Way> ways = new ArrayList<Way>();
-        for( OsmPrimitive p : source.getMemberPrimitives() )
-            if( p instanceof Way )
-                ways.add((Way)p);
-        MultipolygonCreate mpc = new MultipolygonCreate();
-        String error = mpc.makeFromWays(ways);
-        if( error != null )
-            return null;
-
-        Relation r = new Relation(source);
-        boolean fixed = false;
-        Set<Way> outerWays = new HashSet<Way>();
-        for( MultipolygonCreate.JoinedPolygon poly : mpc.outerWays )
-            for( Way w : poly.ways )
-                outerWays.add(w);
-        Set<Way> innerWays = new HashSet<Way>();
-        for( MultipolygonCreate.JoinedPolygon poly : mpc.innerWays )
-            for( Way w : poly.ways )
-                innerWays.add(w);
-        for( int i = 0; i < r.getMembersCount(); i++ ) {
-            RelationMember m = r.getMember(i);
-            if( m.isWay() ) {
-                String role = null;
-                if( outerWays.contains((Way)m.getMember()) )
-                    role = "outer";
-                else if( innerWays.contains((Way)m.getMember()) )
-                    role = "inner";
-                if( role != null && !role.equals(m.getRole()) ) {
-                    r.setMember(i, new RelationMember(role, m.getMember()));
-                    fixed = true;
-                }
-            }
-        }
-        return fixed ? r : null;
-    }
-
-    private static 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.isRelation() )
-                role = "subarea";
-            else if( m.isNode() ) {
-                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;
-    }
 }