Changeset 25671 in osm for applications

Timestamp:

2011-03-23T07:57:47+01:00 (13 years ago)

Author:

zverik

Message:

sort and fix relation, some listener updates (relcontext plugin)

Location:

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

Files:

• ChosenRelation.java (modified) (2 diffs)
• RelContextDialog.java (modified) (3 diffs)
• actions/SortAndFixAction.java (added)

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

@@ -44 +44 @@
     public void clear() {
         set(null);
+    }
+    
+    private final static String[] MULTIPOLYGON_TYPES = new String[] {
+        "multipolygon", "boundary", "natural_reserve"
+    };
+
+    /**
+     * Check if the relation type assumes all ways inside it form a multipolygon.
+     */
+    public boolean isMultipolygon() {
+        if( chosenRelation == null )
+            return false;
+        String type = chosenRelation.get("type");
+        if( type == null )
+            return false;
+        for( String t : MULTIPOLYGON_TYPES )
+            if( t.equals(type) )
+                return true;
+        return false;
     }
 
@@ -127 +146 @@
     }
 
+    public void primtivesRemoved( PrimitivesRemovedEvent event ) {
+        if( chosenRelation != null && event.getPrimitives().contains(chosenRelation) )
+            clear();
+    }
+
     public void nodeMoved( NodeMovedEvent event ) {}
     public void otherDatasetChange( AbstractDatasetChangedEvent event ) {}
     public void primtivesAdded( PrimitivesAddedEvent event ) {}
-    public void primtivesRemoved( PrimitivesRemovedEvent event ) {}
     public void wayNodesChanged( WayNodesChangedEvent event ) {}
 }

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

@@ -84 +84 @@
         topLine.add(chosenRelationComponent, BorderLayout.CENTER);
         JPanel topRightButtons = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+        final Action sortAndFixAction = new SortAndFixAction(chosenRelation);
+        final JButton sortAndFixButton = new JButton(sortAndFixAction);
+        topRightButtons.add(sortAndFixButton);
         final Action downloadChosenRelationAction = new DownloadChosenRelationAction(chosenRelation);
         final JButton downloadButton = new JButton(downloadChosenRelationAction);
@@ -91 +94 @@
         rcPanel.add(topLine, BorderLayout.NORTH);
 
+        sortAndFixAction.addPropertyChangeListener(new PropertyChangeListener() {
+            public void propertyChange( PropertyChangeEvent evt ) {
+                sortAndFixButton.setVisible(sortAndFixAction.isEnabled());
+            }
+        });
+        sortAndFixButton.setVisible(false);
+
         downloadChosenRelationAction.addPropertyChangeListener(new PropertyChangeListener() {
             public void propertyChange( PropertyChangeEvent evt ) {
@@ -131 +141 @@
         if( topLine != null )
             topLine.setVisible(newRelation != null);
+        if( oldRelation != newRelation && Main.main.getCurrentDataSet() != null )
+            selectionChanged(Main.main.getCurrentDataSet().getSelected());
         // ?
     }