Changeset 402 in josm

Timestamp:

19.10.2007 01:04:24 (5 years ago)

Author:

framm

Message:

• started adding support for uploading GPX files, not complete yet, disabled

Location:

trunk

Files:

• .classpath (modified) (1 diff)
• images/uploadtrace.png (added)
• src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified) (8 diffs)
• src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java (added)

trunk/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
-        <classpathentry excluding="build/|dist/|src/|test/" including="images/" kind="src" path=""/>
+        <classpathentry excluding="build/|dist/|src/|test/" including="images/|presets/" kind="src" path=""/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry kind="lib" path="lib/metadata-extractor-2.3.1-nosun.jar"/>
-        <classpathentry kind="lib" path="lib/gettext-commons-0.9.jar" />
+        <classpathentry kind="lib" path="lib/gettext-commons-0.9.jar"/>
         <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-        <classpathentry kind="lib" path="lib/jfcunit.jar" />
+        <classpathentry kind="lib" path="lib/jfcunit.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -54 +54 @@
         private Point mousePos;
         private SelectionManager selectionManager;
-
-        /**
-         * Create a new MoveAction
-         * @param mapFrame The MapFrame, this action belongs to.
+        
+        /**
+         * The time which needs to pass between click and release before something
+         * counts as a move
+         */
+        private int initialMoveDelay = 100;
+
+        /**
+         * Create a new SelectAction
+         * @param mapFrame The MapFrame this action belongs to.
          */
         public SelectAction(MapFrame mapFrame) {
@@ -64 +70 @@
                         getCursor("normal", "selection", Cursor.DEFAULT_CURSOR));
                 putValue("help", "Action/Move/Move");
-                selectionManager = new SelectionManager(this, false, mapFrame.mapView);
+                selectionManager = new SelectionManager(this, false, mapFrame.mapView);         
+                try { initialMoveDelay = Integer.parseInt(Main.pref.get("edit.initial-move-delay","100")); } catch (NumberFormatException x) {};
+
+
         }
 
@@ -114 +123 @@
                 
                 // do not count anything as a move if it lasts less than 100 milliseconds.
-                if ((mode == Mode.move) && (System.currentTimeMillis() - mouseDownTime < 100)) return;
+                if ((mode == Mode.move) && (System.currentTimeMillis() - mouseDownTime < initialMoveDelay)) return;
 
                 if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 0)

trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.awt.CheckboxGroup;
 import java.awt.Color;
 import java.awt.Component;
@@ -12 +13 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.UnknownHostException;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -20 +30 @@
 import javax.swing.ButtonGroup;
 import javax.swing.Icon;
+import javax.swing.JCheckBox;
 import javax.swing.JColorChooser;
 import javax.swing.JFileChooser;
@@ -28 +39 @@
 import javax.swing.JRadioButton;
 import javax.swing.JSeparator;
+import javax.swing.JTextField;
 import javax.swing.filechooser.FileFilter;
 
@@ -43 +55 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
+import org.openstreetmap.josm.io.MultiPartFormOutputStream;
+import org.openstreetmap.josm.io.OsmWriter;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.DontShowAgainInfo;
@@ -79 +93 @@
                         Main.main.addLayer(new OsmDataLayer(ds, tr("Converted from: {0}", RawGpsLayer.this.name), null));
                         Main.main.removeLayer(RawGpsLayer.this);
+                }
+        }
+        
+        public class UploadTraceAction extends AbstractAction {
+                public UploadTraceAction() {
+                        super(tr("Upload this trace..."), ImageProvider.get("uploadtrace"));
+                }
+                public void actionPerformed(ActionEvent e) {
+                        JPanel msg = new JPanel(new GridBagLayout());
+                        msg.add(new JLabel(tr("<html>This functionality has been added only recently. Please<br>"+
+                                                      "use with care and check if it works as expected.</html>")), GBC.eop());
+                        ButtonGroup bg = new ButtonGroup();
+                        JRadioButton c1 = null;
+                        JRadioButton c2 = null;
+                        
+                        if (associatedFile != null) {
+                                c1 = new JRadioButton(tr("Upload track filtered by JOSM"), false);
+                                c2 = new JRadioButton(tr("Upload raw file: {0}", associatedFile.getName()), true);
+                        }
+                        else
+                        {
+                                c1 = new JRadioButton(tr("Upload track filtered by JOSM"), true);
+                                c2 = new JRadioButton(tr("Upload raw file: "), false);
+                                c2.setEnabled(false);
+                        }
+                        c1.setEnabled(false);
+                        bg.add(c1);
+                        bg.add(c2);
+
+                        msg.add(c1, GBC.eol());
+                        msg.add(c2, GBC.eop());
+
+                        
+                        JTextField description = new JTextField();
+                        JTextField tags = new JTextField();
+                        msg.add(new JLabel(tr("Description:")), GBC.std());
+                        msg.add(description, GBC.eol().fill(GBC.HORIZONTAL));
+                        msg.add(new JLabel(tr("Tags:")), GBC.std());
+                        msg.add(tags, GBC.eol().fill(GBC.HORIZONTAL));
+                        JCheckBox c3 = new JCheckBox("public");
+                        msg.add(c3, GBC.eop());
+                        msg.add(new JLabel("Please ensure that you don't upload your traces twice."), GBC.eop());
+                        
+                        int answer = JOptionPane.showConfirmDialog(Main.parent, msg, tr("GPX-Upload"), JOptionPane.OK_CANCEL_OPTION);
+                        if (answer == JOptionPane.OK_OPTION)
+                        {
+                                try {
+                                        String version = Main.pref.get("osm-server.version", "0.5");
+                                        URL url = new URL(Main.pref.get("osm-server.url") +
+                                                        "/" + version + "/gpx/create");
+
+                                        // create a boundary string
+                                        String boundary = MultiPartFormOutputStream.createBoundary();
+                                        URLConnection urlConn = MultiPartFormOutputStream.createConnection(url);
+                                        urlConn.setRequestProperty("Accept", "*/*");
+                                        urlConn.setRequestProperty("Content-Type", 
+                                                MultiPartFormOutputStream.getContentType(boundary));
+                                        // set some other request headers...
+                                        urlConn.setRequestProperty("Connection", "Keep-Alive");
+                                        urlConn.setRequestProperty("Cache-Control", "no-cache");
+                                        // no need to connect cuz getOutputStream() does it
+                                        MultiPartFormOutputStream out = 
+                                                new MultiPartFormOutputStream(urlConn.getOutputStream(), boundary);
+                                        out.writeField("description", description.getText());
+                                        out.writeField("tags", tags.getText());
+                                        out.writeField("public", (c3.getSelectedObjects() != null) ? "1" : "0");
+                                        // upload a file
+                                        out.writeFile("gpx_file", "text/xml", associatedFile);
+                                        // can also write bytes directly
+                                        // out.writeFile("myFile", "text/plain", "C:\\test.txt", 
+                                        // "This is some file text.".getBytes("ASCII"));
+                                        out.close();
+                                        // read response from server
+                                        BufferedReader in = new BufferedReader(
+                                                new InputStreamReader(urlConn.getInputStream()));
+                                        String line = "";
+                                        while((line = in.readLine()) != null) {
+                                                 System.out.println(line);
+                                        }
+                                        in.close();
+                                        
+                                        /*
+                                        int retCode = activeConnection.getResponseCode();
+                                        System.out.println("got return: "+retCode);
+                                        String retMsg = activeConnection.getResponseMessage();
+                                        activeConnection.disconnect();
+                                        if (retCode != 200) {
+                                                // Look for a detailed error message from the server
+                                                if (activeConnection.getHeaderField("Error") != null)
+                                                        retMsg += "\n" + activeConnection.getHeaderField("Error");
+
+                                                // Report our error
+                                                ByteArrayOutputStream o = new ByteArrayOutputStream();
+                                                System.out.println(new String(o.toByteArray(), "UTF-8").toString());
+                                                throw new RuntimeException(retCode+" "+retMsg);
+                                        }
+                                        */
+                                } catch (UnknownHostException ex) {
+                                        throw new RuntimeException(tr("Unknown host")+": "+ex.getMessage(), ex);
+                                } catch (Exception ex) {
+                                        //if (cancel)
+                                        //      return; // assume cancel
+                                        if (ex instanceof RuntimeException)
+                                                throw (RuntimeException)ex;
+                                        throw new RuntimeException(ex.getMessage(), ex);
+                                }       
+                        }
                 }
         }
@@ -278 +399 @@
                                 line,
                                 new JMenuItem(new ConvertToDataLayerAction()),
+                                //new JMenuItem(new UploadTraceAction()),
                                 new JSeparator(),
                                 new JMenuItem(new RenameLayerAction(associatedFile, this)),
@@ -291 +413 @@
                                 tagimage,
                                 new JMenuItem(new ConvertToDataLayerAction()),
+                                //new JMenuItem(new UploadTraceAction()),
                                 new JSeparator(),
                                 new JMenuItem(new RenameLayerAction(associatedFile, this)),