Changeset 26804 in osm

Timestamp:

2011-10-08T12:00:46+02:00 (13 years ago)

Author:

zverik

Message:

fix a couple of bugs

Location:

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils

Files:

• PasteRelationsAction.java (modified) (1 diff)
• ReplaceGeometryAction.java (modified) (2 diffs)

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java

@@ -55 +55 @@
             boolean changed = false;
             for( OsmPrimitive p : selection ) {
-                if( !r.getMemberPrimitives().contains(p) ) {
+                if( !r.getMemberPrimitives().contains(p) && !r.equals(p) ) {
                     r.addMember(new RelationMember(relations.get(rel), p));
                     changed = true;

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java

@@ -32 +32 @@
     }
 
+    @Override
     public void actionPerformed( ActionEvent e ) {
         if( getCurrentDataSet() == null ) return;
@@ -43 +44 @@
         }
         int idxNew = selection.get(0).isNew() ? 0 : 1;
+        boolean overrideNewCheck = false;
+        if( selection.get(1-idxNew).isNew() ) {
+            // if both are new, select the one with all the DB nodes
+            boolean areNewNodes = false;
+            for( Node n : selection.get(0).getNodes() )
+                if( n.isNew() )
+                    areNewNodes = true;
+            idxNew = areNewNodes ? 0 : 1;
+            overrideNewCheck = true;
+            for( Node n : selection.get(1-idxNew).getNodes() )
+                if( n.isNew() )
+                    overrideNewCheck = false;
+        }
         Way geometry = selection.get(idxNew);
         Way way = selection.get(1 - idxNew);
-        if( way.isNew() || !geometry.isNew() ) {
+        if( !overrideNewCheck && (way.isNew() || !geometry.isNew()) ) {
             JOptionPane.showMessageDialog(Main.parent,
                     tr("Please select one way that exists in the database and one new way with correct geometry."),