Changeset 118 in josm

Timestamp:

2006-07-20T17:30:46+02:00 (19 years ago)

Author:

imi

Message:

• fixed scale bar color reset after every JOSM restart
• fixed NPE when selecting in straight-line mode from single node
• fixed import of trackpoint-time for tracks with more than <time> tag

Location:

src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectionAction.java (modified) (1 diff)
• data/Preferences.java (modified) (1 diff)
• gui/PreferenceDialog.java (modified) (1 diff)
• io/RawGpsReader.java (modified) (3 diffs)

src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java

@@ -202 +202 @@
         private Node addNearest(Collection<OsmPrimitive> path, Node start, Node end) {
                 Collection<Segment> c = reverseSegmentMap.get(start);
-                //if (c == null)
-                        //return null; // start may be a waypoint without segments
+                if (c == null)
+                        return null; // start may be a waypoint without segments
                 double min = Double.MAX_VALUE;
                 Node next = null;

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

@@ -143 +143 @@
         public final void upgrade(int oldVersion) {
                 if (oldVersion > 117) return;
-                properties.put("color.scale", ColorHelper.color2html(Color.white));
+                if (!properties.containsKey("color.scale"))
+                        properties.put("color.scale", ColorHelper.color2html(Color.white));
         }
 }

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

@@ -88 +88 @@
                                         sb.append(";"+annotationSources.getModel().getElementAt(i));
                                 Main.pref.put("annotation.sources", sb.toString().substring(1));
-                        }
+                        } else
+                                Main.pref.put("annotation.sources", null);
 
                         for (int i = 0; i < colors.getRowCount(); ++i) {

src/org/openstreetmap/josm/io/RawGpsReader.java

@@ -32 +32 @@
                 public Collection<Collection<GpsPoint>> data = new LinkedList<Collection<GpsPoint>>();
                 private LatLon currentLatLon;
-                private String currentTime = null;
+                private String currentTime = "";
                 private Stack<String> tags = new Stack<String>();
 
@@ -49 +49 @@
                         throw new SAXException(e);
                 }
+                currentTime = "";
                         }
                         tags.push(qName);
@@ -69 +70 @@
                         if (qName.equals("wpt") || qName.equals("trkpt")) {
                                 current.add(new GpsPoint(currentLatLon, currentTime));
-                        } else if (qName.equals("trkseg") || qName.equals("trk") || qName.equals("gpx"))
+                                currentTime = "";
+                        } else if (qName.equals("trkseg") || qName.equals("trk") || qName.equals("gpx")) {
                                 newTrack();
-                        
-                        if (!qName.equals("time"))
                                 currentTime = "";
+                        }
                         tags.pop();
         }