Changeset 4282 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

Timestamp:

2011-08-07T09:08:29+02:00 (13 years ago)

Author:

jttt

Message:

Allow to specify custom pattern for marker text labels

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -32 +32 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxLink;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -72 +71 @@
         this.fromLayer = fromLayer;
         double firstTime = -1.0;
-        String lastLinkedFile = "";
 
         for (WayPoint wpt : indata.waypoints) {
-            /* calculate time differences in waypoints */
             double time = wpt.time;
-            boolean wpt_has_link = wpt.attr.containsKey(GpxData.META_LINKS);
-            if (firstTime < 0 && wpt_has_link) {
+            if (firstTime < 0) {
                 firstTime = time;
-                for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get(GpxData.META_LINKS)) {
-                    lastLinkedFile = oneLink.uri;
-                    break;
-                }
-            }
-            if (wpt_has_link) {
-                for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get(GpxData.META_LINKS)) {
-                    if (!oneLink.uri.equals(lastLinkedFile)) {
-                        firstTime = time;
-                    }
-                    lastLinkedFile = oneLink.uri;
-                    break;
-                }
             }
             Marker m = Marker.createMarker(wpt, indata.storageFile, this, time, time - firstTime);
@@ -274 +257 @@
                     tr("Error"),
                     JOptionPane.ERROR_MESSAGE
-            );
+                    );
             return null;
         }
 
         // make our new marker
-        AudioMarker newAudioMarker = AudioMarker.create(coor,
-                AudioMarker.inventName(offset), AudioPlayer.url().toString(), this, time, offset);
+        AudioMarker newAudioMarker = new AudioMarker(coor,
+                null, AudioPlayer.url(), this, time, offset);
 
         // insert it at the right place in a copy the collection
@@ -425 +408 @@
                         tr("Warning"),
                         JOptionPane.WARNING_MESSAGE
-                );
+                        );
                 return;
             }
@@ -432 +415 @@
                 JOptionPane.showMessageDialog(
                         Main.parent,
-                        tr("Audio synchronized at point {0}.", recent.text),
+                        tr("Audio synchronized at point {0}.", recent.getText()),
                         tr("Information"),
                         JOptionPane.INFORMATION_MESSAGE
-                );
+                        );
             } else {
                 JOptionPane.showMessageDialog(
@@ -442 +425 @@
                         tr("Error"),
                         JOptionPane.ERROR_MESSAGE
-                );
+                        );
             }
         }
@@ -462 +445 @@
                         tr("Warning"),
                         JOptionPane.WARNING_MESSAGE
-                );
+                        );
                 return;
             }