Changeset 5707 in josm for trunk/src/org

Timestamp:

2013-02-12T16:59:01+01:00 (12 years ago)

Author:

akks

Message:

RemoteControl API version 1.5: addtags supported by add_node, add_way commands

Location:

trunk/src/org/openstreetmap/josm/io/remotecontrol

Files:

• AddTagsDialog.java (modified) (1 diff)
• RemoteControl.java (modified) (1 diff)
• handler/AddNodeHandler.java (modified) (2 diffs)
• handler/AddWayHandler.java (modified) (2 diffs)
• handler/LoadAndZoomHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

@@ -130 +130 @@
         // set the default Dimensions and show the dialog
         setPreferredSize(new Dimension(400,tablePanel.getPreferredSize().height+100));
-        showDialog();
     }
 

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java

@@ -25 +25 @@
      */
     static final int protocolMajorVersion = 1;
-    static final int protocolMinorVersion = 4;
+    static final int protocolMinorVersion = 5;
 
     /**

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java

@@ -69 +69 @@
             Main.map.mapView.repaint();
         }
+        // parse parameter addtags=tag1=value1|tag2=vlaue2
+        LoadAndZoomHandler.addTags(args);
     }
 
@@ -79 +81 @@
             throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+")");
         }
+        if (!Main.main.hasEditLayer()) {
+             throw new RequestHandlerBadRequestException(tr("There is no layer opened to add node"));
+        }
     }
 }

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java

@@ -54 +54 @@
             Main.map.mapView.repaint();
         }
+        // parse parameter addtags=tag1=value1|tag2=vlaue2
+        LoadAndZoomHandler.addTags(args);        
     }
 
@@ -88 +90 @@
             throw new RequestHandlerBadRequestException(tr("One node ways"));
         }
+        if (!Main.main.hasEditLayer()) {
+             throw new RequestHandlerBadRequestException(tr("There is no layer opened to add way"));
+        }
     }
 }

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -225 +225 @@
                         }
     
-                        new AddTagsDialog(keyValue);
+                        new AddTagsDialog(keyValue).showDialog();
                     }
                 }