Changeset 18 in josm for src/org/openstreetmap/josm/data

Timestamp:

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

Author:

imi

Message:

added Server connection to osm server.

Location:

src/org/openstreetmap/josm/data

Files:

• GeoPoint.java (modified) (1 diff)
• Preferences.java (modified) (4 diffs)
• osm/DataSet.java (modified) (2 diffs)
• osm/LineSegment.java (modified) (1 diff)

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;
 
         /**