Changeset 542 in josm for trunk/src/org/openstreetmap

Timestamp:

2008-02-16T10:59:29+01:00 (17 years ago)

Author:

david

Message:

option marker.namedtrackpoints determines whether markers are created for named trackpoints

File:

• trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/GpxReader.java

@@ -20 +20 @@
 import javax.xml.parsers.SAXParserFactory;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -237 +238 @@
                                         currentState = states.pop();
                                         currentTrackSeg.add(currentWayPoint);
-                                        if (currentWayPoint.attr.containsKey("name") || currentWayPoint.attr.containsKey("desc")) {
+                                        String option = "marker.namedtrackpoints";
+                                        if (Main.pref.hasKey(option) && 
+                                                Main.pref.getBoolean(option) && 
+                                                (currentWayPoint.attr.containsKey("name") || 
+                                                        currentWayPoint.attr.containsKey("desc"))) 
+                                        {
                                                 currentData.waypoints.add(currentWayPoint);
                                         }