Changeset 18 in josm for src/org

Timestamp:

2005-10-09T20:06:06+02:00 (19 years ago)

Author:

imi

Message:

added Server connection to osm server.

Location:

src/org/openstreetmap/josm

Files:

• actions/OpenGpxAction.java (modified) (1 diff)
• actions/OpenOsmServerAction.java (added)
• data/GeoPoint.java (modified) (1 diff)
• data/Preferences.java (modified) (4 diffs)
• data/osm/DataSet.java (modified) (2 diffs)
• data/osm/LineSegment.java (modified) (1 diff)
• gui/Main.java (modified) (4 diffs)
• gui/MapMover.java (modified) (1 diff)
• gui/PreferenceDialog.java (modified) (6 diffs)
• gui/dialogs/LayerList.java (modified) (1 diff)
• gui/engine/RawGpsEngine.java (modified) (9 diffs)
• io/OsmReader.java (added)

src/org/openstreetmap/josm/actions/OpenGpxAction.java

@@ -37 +37 @@
 
         /**
-         * Create an open action. The name is "&Open GPX".
+         * Create an open action. The name is "Open GPX".
          */
         public OpenGpxAction() {

src/org/openstreetmap/josm/data/GeoPoint.java

@@ -58 +58 @@
                 return (x-other.x)*(x-other.x)+(y-other.y)*(y-other.y);
         }
-        
+
         /**
          * @return <code>true</code>, if the other GeoPoint has the same lat/lon values.
          */
         public boolean equalsLatLon(GeoPoint other) {
-                return lat == other.lat && lon == other.lon;
+                return lat == other.lat && lon == other.lon && 
+                                !Double.isNaN(lat) && !Double.isNaN(lon);
         }
 }

src/org/openstreetmap/josm/data/Preferences.java

@@ -45 +45 @@
         private boolean drawRawGpsLines = false;
         /**
+         * Force the drawing of lines between raw gps points if there are no
+         * lines in the imported document.
+         */
+        private boolean forceRawGpsLines = false;
+        /**
          * Whether nodes on the same place should be considered identical.
          */
         public boolean mergeNodes = true;
-        
-        
+
+        /**
+         * Base URL to the osm data server
+         */
+        public String osmDataServer = "http://www.openstreetmap.org/api/0.1";
+        /**
+         * The username to the osm server
+         */
+        public String osmDataUsername = "";
+        /**
+         * The stored password or <code>null</code>, if the password should not be
+         * stored.
+         */
+        public String osmDataPassword = null;
 
         /**
@@ -105 +122 @@
                         }
 
+                        Element osmServer = root.getChild("osm-server");
+                        if (osmServer != null) {
+                                osmDataServer = osmServer.getChildText("url");
+                                osmDataUsername = osmServer.getChildText("username");
+                                osmDataPassword = osmServer.getChildText("password");
+                        }
                         mergeNodes = root.getChild("mergeNodes") != null;
                         drawRawGpsLines = root.getChild("drawRawGpsLines") != null;
@@ -129 +152 @@
                 if (drawRawGpsLines)
                         children.add(new Element("drawRawGpsLines"));
+                Element osmServer = new Element("osm-server");
+                osmServer.getChildren().add(new Element("url").setText(osmDataServer));
+                osmServer.getChildren().add(new Element("username").setText(osmDataUsername));
+                osmServer.getChildren().add(new Element("password").setText(osmDataPassword));
+                children.add(osmServer);
 
                 try {
@@ -200 +228 @@
                 return drawRawGpsLines;
         }
+        public void setForceRawGpsLines(boolean forceRawGpsLines) {
+                boolean old = this.forceRawGpsLines;
+                this.forceRawGpsLines = forceRawGpsLines;
+                firePropertyChanged("forceRawGpsLines", old, forceRawGpsLines);
+        }
+        public boolean isForceRawGpsLines() {
+                return forceRawGpsLines;
+        }
 }

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -3 +3 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
 
 import org.openstreetmap.josm.data.Bounds;
@@ -196 +200 @@
          */
         public void mergeFrom(DataSet ds, boolean mergeEqualNodes) {
+                System.out.println(nodes.size()+" "+pendingLineSegments.size()+" "+tracks.size());
                 if (mergeEqualNodes) {
-                        LinkedList<Node> nodesToAdd = new LinkedList<Node>();
-                        for (Node n : ds.nodes)
-                                for (Node mynode : nodes) {
-                                        if (mynode.coor.equalsLatLon(n.coor))
-                                                mynode.mergeFrom(n);
-                                        else
-                                                nodesToAdd.add(n);
+                        Map<Node, Node> mergeMap = new HashMap<Node, Node>();
+                        Set<Node> nodesToAdd = new HashSet<Node>();
+                        for (Node n : nodes) {
+                                for (Iterator<Node> it = ds.nodes.iterator(); it.hasNext();) {
+                                        Node dsn = it.next();
+                                        if (n.coor.equalsLatLon(dsn.coor)) {
+                                                mergeMap.put(dsn, n);
+                                                n.mergeFrom(dsn);
+                                                it.remove();
+                                        } else {
+                                                nodesToAdd.add(dsn);
+                                        }
                                 }
-                } else
+                        }
+                        nodes.addAll(nodesToAdd);
+                        for (Track t : ds.tracks) {
+                                for (LineSegment ls : t.segments()) {
+                                        Node n = mergeMap.get(ls.getStart());
+                                        if (n != null)
+                                                ls.start = n;
+                                        n = mergeMap.get(ls.getEnd());
+                                        if (n != null)
+                                                ls.end = n;
+                                }
+                        }
+                        tracks.addAll(ds.tracks);
+                        for (LineSegment ls : ds.pendingLineSegments) {
+                                Node n = mergeMap.get(ls.getStart());
+                                if (n != null)
+                                        ls.start = n;
+                                n = mergeMap.get(ls.getEnd());
+                                if (n != null)
+                                        ls.end = n;
+                        }
+                        pendingLineSegments.addAll(ds.pendingLineSegments);
+                } else {
                         nodes.addAll(ds.nodes);
-                tracks.addAll(ds.tracks);
-                pendingLineSegments.addAll(ds.pendingLineSegments);
+                        tracks.addAll(ds.tracks);
+                        pendingLineSegments.addAll(ds.pendingLineSegments);
+                }
+                System.out.println(nodes.size()+" "+pendingLineSegments.size()+" "+tracks.size());
         }
 

src/org/openstreetmap/josm/data/osm/LineSegment.java

@@ -18 +18 @@
          * The starting node of the line segment
          */
-        private Node start;
+        Node start;
         
         /**
          * The ending node of the line segment
          */
-        private Node end;
+        Node end;
 
         /**

src/org/openstreetmap/josm/gui/Main.java

@@ -15 +15 @@
 import org.openstreetmap.josm.actions.ExitAction;
 import org.openstreetmap.josm.actions.OpenGpxAction;
+import org.openstreetmap.josm.actions.OpenOsmServerAction;
 import org.openstreetmap.josm.actions.PreferencesAction;
 import org.openstreetmap.josm.actions.SaveGpxAction;
@@ -63 +64 @@
                 
                 // creating actions
+                OpenOsmServerAction openServerAction = new OpenOsmServerAction();
                 OpenGpxAction openGpxAction = new OpenGpxAction();
                 SaveGpxAction saveGpxAction = new SaveGpxAction();
@@ -80 +82 @@
                 mainMenu.add(fileMenu);
                 
+                JMenu connectionMenu = new JMenu("Connection");
+                connectionMenu.setMnemonic('C');
+                connectionMenu.add(openServerAction);
+                mainMenu.add(connectionMenu);
+                
                 JMenu editMenu = new JMenu("Edit");
                 editMenu.setMnemonic('E');
@@ -88 +95 @@
                 JToolBar toolBar = new JToolBar();
                 toolBar.setFloatable(false);
+                toolBar.add(openServerAction);
                 toolBar.add(openGpxAction);
                 toolBar.add(saveGpxAction);

src/org/openstreetmap/josm/gui/MapMover.java

@@ -55 +55 @@
                         GeoPoint p = new GeoPoint();
                         p.x = mousePosMove.x + center.x - mouseCenter.x;  
-                        p.y = mousePosMove.y + center.y - mouseCenter.y;  
+                        p.y = mousePosMove.y + center.y - mouseCenter.y;
                         mv.zoomTo(p, mv.getScale());
                 } else

src/org/openstreetmap/josm/gui/PreferenceDialog.java

@@ -21 +21 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JPasswordField;
 import javax.swing.JTabbedPane;
+import javax.swing.JTextField;
 import javax.swing.ListCellRenderer;
 import javax.swing.UIManager;
@@ -52 +54 @@
                         Main.pref.setProjection(projection);
                         Main.pref.mergeNodes = mergeNodes.isSelected();
+                        Main.pref.osmDataServer = osmDataServer.getText();
+                        Main.pref.osmDataUsername = osmDataUsername.getText();
+                        Main.pref.osmDataPassword = String.valueOf(osmDataPassword.getPassword());
+                        if (Main.pref.osmDataPassword == "")
+                                Main.pref.osmDataPassword = null;
                         Main.pref.setDrawRawGpsLines(drawRawGpsLines.isSelected());
+                        Main.pref.setForceRawGpsLines(forceRawGpsLines.isSelected());
                         try {
                                 Main.pref.save();
@@ -97 +105 @@
 
         /**
+         * Editfield for the Base url to the REST API from OSM. 
+         */
+        private JTextField osmDataServer = new JTextField(20);
+        /**
+         * Editfield for the username to the OSM account.
+         */
+        private JTextField osmDataUsername = new JTextField(20);
+        /**
+         * Passwordfield for the userpassword of the REST API.
+         */
+        private JPasswordField osmDataPassword = new JPasswordField(20);
+        /**
          * The checkbox stating whether nodes should be merged together.
          */
         private JCheckBox drawRawGpsLines = new JCheckBox("Draw lines between raw gps points.");
+        /**
+         * The checkbox stating whether raw gps lines should be forced.
+         */
+        private JCheckBox forceRawGpsLines = new JCheckBox("Force lines if no line segments imported.");
         /**
          * The checkbox stating whether nodes should be merged together.
@@ -155 +179 @@
                 });
                 
+                // drawRawGpsLines
+                drawRawGpsLines.addActionListener(new ActionListener(){
+                        public void actionPerformed(ActionEvent e) {
+                                if (!drawRawGpsLines.isSelected())
+                                        forceRawGpsLines.setSelected(false);
+                                forceRawGpsLines.setEnabled(drawRawGpsLines.isSelected());
+                        }
+                });
+
+                
                 // tooltips
+                osmDataServer.setToolTipText("The base URL to the OSM server (REST API)");
+                osmDataUsername.setToolTipText("Login name (email) to the OSM account.");
+                osmDataPassword.setToolTipText("Login password to the OSM account. Leave blank to not store any password.");
                 drawRawGpsLines.setToolTipText("If your gps device draw to few lines, select this to draw lines along your track.");
                 drawRawGpsLines.setSelected(Main.pref.isDrawRawGpsLines());
+                forceRawGpsLines.setToolTipText("Force drawing of lines if the imported data contain no line information.");
+                forceRawGpsLines.setSelected(Main.pref.isForceRawGpsLines());
                 mergeNodes.setToolTipText("When importing GPX data, all nodes with exact the same lat/lon are merged.");
                 mergeNodes.setSelected(Main.pref.mergeNodes);
-                
+
+                osmDataServer.setText(Main.pref.osmDataServer);
+                osmDataUsername.setText(Main.pref.osmDataUsername);
+                osmDataPassword.setText(Main.pref.osmDataPassword);
+
                 // Display tab
                 JPanel display = createPreferenceTab("display", "Display Settings", "Various settings that influence the visual representation of the whole program.");
@@ -167 +210 @@
                 display.add(lafCombo, GBC.eol().fill(GBC.HORIZONTAL));
                 display.add(drawRawGpsLines, GBC.eol().insets(20,0,0,0));
+                display.add(forceRawGpsLines, GBC.eol().insets(40,0,0,0));
                 display.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
 
+                // Connection tab
+                JPanel con = createPreferenceTab("connection", "Connection Settings", "Connection Settings to the OSM server.");
+                con.add(new JLabel("Base Server URL"), GBC.std());
+                con.add(osmDataServer, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
+                con.add(new JLabel("OSM username (email)"), GBC.std());
+                con.add(osmDataUsername, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
+                con.add(new JLabel("OSM password"), GBC.std());
+                con.add(osmDataPassword, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,0));
+                JLabel warning = new JLabel("<html>" +
+                                "WARNING: The password is stored in plain text in the preferences file.<br>" +
+                                "The password is transfered in plain text to the server, encoded in the url.<br>" +
+                                "<b>Do not use a valuable Password.</b></html>");
+                warning.setFont(warning.getFont().deriveFont(Font.ITALIC));
+                con.add(warning, GBC.eop().fill(GBC.HORIZONTAL));
+
+                
                 // Map tab
                 JPanel map = createPreferenceTab("map", "Map Settings", "Settings for the map projection and data interpretation.");
@@ -221 +281 @@
 
                 tabPane.addTab(null, ImageProvider.get("preferences", icon), p);
+                tabPane.setToolTipTextAt(tabPane.getTabCount()-1, desc);
                 return p;
         }

src/org/openstreetmap/josm/gui/dialogs/LayerList.java

@@ -89 +89 @@
                                         icon = ImageProvider.overlay(icon, invisible, ImageProvider.OverlayPosition.SOUTHEAST);
                                 label.setIcon(icon);
+                                
+                                DataSet ds = layer.getDataSet();
+                                if (ds != null) {
+                                        label.setToolTipText(ds.nodes.size()+" nodes, "+
+                                                        ds.tracks().size()+" tracks");
+                                }
                                 return label;
                         }

src/org/openstreetmap/josm/gui/engine/RawGpsEngine.java

@@ -2 +2 @@
 
 import java.awt.Color;
+import java.awt.Graphics;
 import java.awt.Point;
 import java.beans.PropertyChangeEvent;
@@ -10 +11 @@
 import org.openstreetmap.josm.data.osm.Track;
 import org.openstreetmap.josm.gui.Main;
+import org.openstreetmap.josm.gui.MapView;
 
 /**
@@ -19 +21 @@
 
         /**
+         * Draw a line to this node if forceRawGpsLines is set.
+         */
+        private Node lastNode;
+        
+        /**
          * Create a raw gps engine. The engine will register itself as listener on
          * the main preference settings to capture the drawRawGpsLines changes.
@@ -24 +31 @@
         public RawGpsEngine() {
                 Main.pref.addPropertyChangeListener(this);
+        }
+
+        
+        @Override
+        public void init(Graphics g, MapView mv) {
+                super.init(g, mv);
+                lastNode = null;
         }
 
@@ -34 +48 @@
                 g.setColor(n.isSelected() ? Color.WHITE : Color.GRAY);
                 g.drawRect(p.x, p.y, 0, 0);
+                if (Main.pref.isForceRawGpsLines()) {
+                        if (lastNode != null)
+                                drawLine(lastNode, n, false, Color.GRAY);
+                        lastNode = n;
+                }
         }
 
@@ -46 +65 @@
                         return;
                 for (LineSegment ls : t.segments())
-                        drawLineSegment(ls, t.isSelected() ? Color.WHITE : Color.GRAY);
+                        drawLine(ls.getStart(), ls.getEnd(), ls.isSelected(), t.isSelected() ? Color.WHITE : Color.GRAY);
         }
 
@@ -54 +73 @@
         @Override
         public void drawPendingLineSegment(LineSegment ls) {
-                drawLineSegment(ls, Color.GRAY);
+                drawLine(ls.getStart(), ls.getEnd(), ls.isSelected(), Color.GRAY);
         }
 
@@ -62 +81 @@
          * @param color         The color, the line segment should be drawn in.
          */
-        private void drawLineSegment(LineSegment ls, Color color) {
-                g.setColor(ls.isSelected() ? Color.WHITE : color);
-                Point p1 = mv.getScreenPoint(ls.getStart().coor);
-                Point p2 = mv.getScreenPoint(ls.getEnd().coor);
+        private void drawLine(Node start, Node end, boolean isSelected, Color color) {
+                g.setColor(isSelected ? Color.WHITE : color);
+                Point p1 = mv.getScreenPoint(start.coor);
+                Point p2 = mv.getScreenPoint(end.coor);
                 g.drawLine(p1.x, p1.y, p2.x, p2.y);
         }
@@ -74 +93 @@
          */
         public void propertyChange(PropertyChangeEvent e) {
-                if (e.getPropertyName().equals("drawRawGpsLines"))
+                if (e.getPropertyName().equals("drawRawGpsLines") || e.getPropertyName().equals("forceRawGpsLines"))
                         mv.repaint();
         }