Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 577) +++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 578) @@ -25,4 +25,6 @@ import java.net.UnknownHostException; import java.util.Iterator; +import java.util.Collections; +import java.util.Comparator; import javax.swing.AbstractAction; @@ -46,4 +48,5 @@ import org.openstreetmap.josm.actions.SaveAsAction; import org.openstreetmap.josm.actions.RenameLayerAction; +import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.gpx.GpxData; import org.openstreetmap.josm.data.gpx.GpxTrack; @@ -499,45 +502,71 @@ String uri = "file:".concat(wavFile.getAbsolutePath()); MarkerLayer ml = new MarkerLayer(new GpxData(), tr("Audio markers from {0}", name), associatedFile, me); - - // (a) try explicit waypoints - unless suppressed + + Collection waypoints = new ArrayList(); + boolean timedMarkersOmitted = false; + boolean untimedMarkersOmitted = false; + + // determine time of first point in track + double firstTime = -1.0; + if (data.tracks != null && ! data.tracks.isEmpty()) { + for (GpxTrack track : data.tracks) { + if (track.trackSegs == null) continue; + for (Collection seg : track.trackSegs) { + for (WayPoint w : seg) { + firstTime = w.time; + break; + } + if (firstTime >= 0.0) break; + } + if (firstTime >= 0.0) break; + } + } + if (firstTime < 0.0) { + JOptionPane.showMessageDialog(Main.parent, tr("No GPX track available in layer to associate audio with.")); + return; + } + + // (a) try explicit timestamped waypoints - unless suppressed if (Main.pref.getBoolean("marker.audiofromexplicitwaypoints", true) && - data.waypoints != null && - ! data.waypoints.isEmpty()) + data.waypoints != null && ! data.waypoints.isEmpty()) { - double firstTime = -1.0; for (WayPoint w : data.waypoints) { - if (firstTime < 0.0) firstTime = w.time; - double offset = w.time - firstTime; - String name = w.attr.containsKey("name") ? w.getString("name") : - w.attr.containsKey("desc") ? w.getString("desc") : - AudioMarker.inventName(offset); - AudioMarker am = AudioMarker.create(w.latlon, - name, uri, ml, w.time, offset); - ml.data.add(am); + if (w.time > firstTime) { + waypoints.add(w); + } else if (w.time > 0.0) { + timedMarkersOmitted = true; + } } } - // (b) use explicitly named track points, again unless suppressed - if (ml.data.isEmpty() && - Main.pref.getBoolean("marker.namedtrackpoints") && - data.tracks != null && - ! data.tracks.isEmpty()) + // (b) try explicit waypoints without timestamps - unless suppressed + if (Main.pref.getBoolean("marker.audiofromuntimedwaypoints", true) && + data.waypoints != null && ! data.waypoints.isEmpty()) { - double firstTime = -1.0; + for (WayPoint w : data.waypoints) { + if (waypoints.contains(w)) { continue; } + WayPoint wNear = nearestPointOnTrack(w.eastNorth, 10.0e-7 /* about 25m */); + if (wNear != null) { + WayPoint wc = new WayPoint(w.latlon); + wc.time = wNear.time; + if (w.attr.containsKey("name")) wc.attr.put("name", w.getString("name")); + waypoints.add(wc); + } else { + untimedMarkersOmitted = true; + } + } + } + + // (c) use explicitly named track points, again unless suppressed + if ((Main.pref.getBoolean("marker.audiofromnamedtrackpoints", Main.pref.getBoolean("marker.namedtrackpoints") /* old name */)) && + data.tracks != null && ! data.tracks.isEmpty()) + { for (GpxTrack track : data.tracks) { + if (track.trackSegs == null) continue; for (Collection seg : track.trackSegs) { for (WayPoint w : seg) { - String name; - if (w.attr.containsKey("name")) - name = w.getString("name"); - else if (w.attr.containsKey("desc")) - name = w.getString("desc"); - else - continue; - if (firstTime < 0.0) firstTime = w.time; - double offset = w.time - firstTime; - AudioMarker am = AudioMarker.create(w.latlon, - name, uri, ml, w.time, offset); - ml.data.add(am); + if (w.attr.containsKey("name") || w.attr.containsKey("desc")) { + waypoints.add(w); + } } } @@ -545,30 +574,178 @@ } - // (c) analyse audio for spoken markers here, in due course + // (d) analyse audio for spoken markers here, in due course - // (d) simply add a single marker at the start of the track - if (ml.data.isEmpty() && - data.tracks != null && - ! data.tracks.isEmpty()) + // (e) simply add a single marker at the start of the track + if ((Main.pref.getBoolean("marker.audiofromstart") || waypoints.isEmpty()) && + data.tracks != null && ! data.tracks.isEmpty()) { + boolean gotOne = false; for (GpxTrack track : data.tracks) { + if (track.trackSegs == null) continue; for (Collection seg : track.trackSegs) { for (WayPoint w : seg) { - AudioMarker am = AudioMarker.create(w.latlon, - tr("start"), uri, ml, w.time, 0.0); - ml.data.add(am); + WayPoint wStart = new WayPoint(w.latlon); + wStart.attr.put("name", "start"); + wStart.time = w.time; + waypoints.add(wStart); + gotOne = true; break; } - if (! ml.data.isEmpty()) break; + if (gotOne) break; } - if (! ml.data.isEmpty()) break; + if (gotOne) break; } } + + /* we must have got at least one waypoint now */ - if (! ml.data.isEmpty()) { - Main.main.addLayer(ml); - } else { - JOptionPane.showMessageDialog(Main.parent, tr("Nothing available to associate audio with.")); - } + Collections.sort((ArrayList) waypoints, new Comparator() { + public int compare(WayPoint a, WayPoint b) { + return a.time <= b.time ? -1 : 1; + } + }); + + firstTime = -1.0; /* this time of the first waypoint, not first trackpoint */ + for (WayPoint w : waypoints) { + if (firstTime < 0.0) firstTime = w.time; + double offset = w.time - firstTime; + String name; + if (w.attr.containsKey("name")) + name = w.getString("name"); + else if (w.attr.containsKey("desc")) + name = w.getString("desc"); + else + name = AudioMarker.inventName(offset); + AudioMarker am = AudioMarker.create(w.latlon, + name, uri, ml, w.time, offset); + ml.data.add(am); + } + Main.main.addLayer(ml); + + if (timedMarkersOmitted) { + JOptionPane.showMessageDialog(Main.parent, tr("Some waypoints with timestamps from before the start of the track were omitted.")); + } + if (untimedMarkersOmitted) { + JOptionPane.showMessageDialog(Main.parent, tr("Some waypoints which were too far from the track to sensibly estimate their time were omitted.")); + } + } + + /** + * Makes a WayPoint at the projection of point P onto the track providing P is + * less than tolerance away from the track + + * @param P : the point to determine the projection for + * @param tolerance : must be no further than this from the track + * @return the closest point on the track to P, which may be the + * first or last point if off the end of a segment, or may be null if + * nothing close enough + */ + public WayPoint nearestPointOnTrack(EastNorth P, double tolerance) { + /* + * assume the coordinates of P are xp,yp, and those of a section of track + * between two trackpoints are R=xr,yr and S=xs,ys. Let N be the projected point. + * + * The equation of RS is Ax + By + C = 0 where + * A = ys - yr + * B = xr - xs + * C = - Axr - Byr + * + * Also, note that the distance RS^2 is A^2 + B^2 + * + * If RS^2 == 0.0 ignore the degenerate section of track + * + * PN^2 = (Axp + Byp + C)^2 / RS^2 + * that is the distance from P to the line + * + * so if PN^2 is less than PNmin^2 (initialized to tolerance) we can reject + * the line; otherwise... + * determine if the projected poijnt lies within the bounds of the line: + * PR^2 - PN^2 <= RS^2 and PS^2 - PN^2 <= RS^2 + * + * where PR^2 = (xp - xr)^2 + (yp-yr)^2 + * and PS^2 = (xp - xs)^2 + (yp-ys)^2 + * + * If so, calculate N as + * xn = xr + (RN/RS) B + * yn = y1 + (RN/RS) A + * + * where RN = sqrt(PR^2 - PN^2) + */ + + double PNminsq = tolerance * tolerance; + EastNorth bestEN = null; + double bestTime = 0.0; + double px = P.east(); + double py = P.north(); + double rx = 0.0, ry = 0.0, sx, sy, x, y; + if (data.tracks == null) return null; + for (GpxTrack track : data.tracks) { + if (track.trackSegs == null) continue; + for (Collection seg : track.trackSegs) { + WayPoint R = null; + for (WayPoint S : seg) { + if (R == null) { + R = S; + rx = R.eastNorth.east(); + ry = R.eastNorth.north(); + x = px - rx; + y = py - ry; + double PRsq = x * x + y * y; + if (PRsq < PNminsq) { + PNminsq = PRsq; + bestEN = R.eastNorth; + bestTime = R.time; + } + } else { + sx = S.eastNorth.east(); + sy = S.eastNorth.north(); + double A = sy - ry; + double B = rx - sx; + double C = - A * rx - B * ry; + double RSsq = A * A + B * B; + if (RSsq == 0.0) continue; + double PNsq = A * px + B * py + C; + PNsq = PNsq * PNsq / RSsq; + if (PNsq < PNminsq) { + x = px - rx; + y = py - ry; + double PRsq = x * x + y * y; + x = px - sx; + y = py - sy; + double PSsq = x * x + y * y; + if (PRsq - PNsq <= RSsq && PSsq - PNsq <= RSsq) { + double RNoverRS = Math.sqrt((PRsq - PNsq)/RSsq); + double nx = rx - RNoverRS * B; + double ny = ry + RNoverRS * A; + bestEN = new EastNorth(nx, ny); + bestTime = R.time + RNoverRS * (S.time - R.time); + PNminsq = PNsq; + } + } + R = S; + rx = sx; + ry = sy; + } + } + if (R != null) { + /* if there is only one point in the seg, it will do this twice, but no matter */ + rx = R.eastNorth.east(); + ry = R.eastNorth.north(); + x = px - rx; + y = py - ry; + double PRsq = x * x + y * y; + if (PRsq < PNminsq) { + PNminsq = PRsq; + bestEN = R.eastNorth; + bestTime = R.time; + } + + } + } + } + if (bestEN == null) return null; + WayPoint best = new WayPoint(Main.proj.eastNorth2latlon(bestEN)); + best.time = bestTime; + return best; } } Index: trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java (revision 577) +++ trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java (revision 578) @@ -30,7 +30,11 @@ private JCheckBox markerButtonLabels = new JCheckBox(tr("Label audio (and image and web) markers.")); private JCheckBox markerAudioTraceVisible = new JCheckBox(tr("Display live audio trace.")); - private JCheckBox markersNamedTrackpoints = new JCheckBox(tr("Create audio markers from named trackpoints.")); private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create non-audio markers when reading GPX.")); - private JCheckBox audioMarkersFromExplicitWaypoints = new JCheckBox(tr("Import audio uses explicit waypoints.")); + + // various methods of making markers on import audio + private JCheckBox audioMarkersFromExplicitWaypoints = new JCheckBox(tr("Explicit waypoints with valid timestamps.")); + private JCheckBox audioMarkersFromUntimedWaypoints = new JCheckBox(tr("Explicit waypoints with time estimated from track position.")); + private JCheckBox audioMarkersFromNamedTrackpoints = new JCheckBox(tr("Named trackpoints.")); + private JCheckBox audioMarkersFromStart = new JCheckBox(tr("Start of track (will always do this if no other markers available).")); private JTextField audioLeadIn = new JTextField(8); @@ -57,5 +61,4 @@ if (!markerAudioTraceVisible.isSelected()) markerAudioTraceVisible.setSelected(false); - markerAudioTraceVisible.setEnabled(markerAudioTraceVisible.isSelected()); } }); @@ -69,5 +72,4 @@ if (!markerButtonLabels.isSelected()) markerButtonLabels.setSelected(false); - markerButtonLabels.setEnabled(markerButtonLabels.isSelected()); } }); @@ -76,16 +78,4 @@ gui.audio.add(markerButtonLabels, GBC.eol().insets(0,0,0,0)); - // markersNamedTrackpoints - markersNamedTrackpoints.addActionListener(new ActionListener(){ - public void actionPerformed(ActionEvent e) { - if (!markersNamedTrackpoints.isSelected()) - markersNamedTrackpoints.setSelected(false); - markersNamedTrackpoints.setEnabled(markersNamedTrackpoints.isSelected()); - } - }); - markersNamedTrackpoints.setSelected(Main.pref.getBoolean("marker.namedtrackpoints")); - markersNamedTrackpoints.setToolTipText(tr("Automatically create audio markers from trackpoints (rather than explicit waypoints) with names or descriptions.")); - gui.audio.add(markersNamedTrackpoints, GBC.eol().insets(0,0,0,0)); - // makeAutoMarkers makeAutoMarkers.addActionListener(new ActionListener(){ @@ -93,5 +83,4 @@ if (!makeAutoMarkers.isSelected()) makeAutoMarkers.setSelected(false); - makeAutoMarkers.setEnabled(makeAutoMarkers.isSelected()); } }); @@ -100,4 +89,6 @@ gui.audio.add(makeAutoMarkers, GBC.eol().insets(0,0,0,0)); + gui.audio.add(new JLabel(tr("When importing audio, make markers from...")), GBC.eol()); + // audioMarkersFromExplicitWaypoints audioMarkersFromExplicitWaypoints.addActionListener(new ActionListener(){ @@ -105,10 +96,42 @@ if (!audioMarkersFromExplicitWaypoints.isSelected()) audioMarkersFromExplicitWaypoints.setSelected(false); - audioMarkersFromExplicitWaypoints.setEnabled(audioMarkersFromExplicitWaypoints.isSelected()); } }); audioMarkersFromExplicitWaypoints.setSelected(Main.pref.getBoolean("marker.audiofromexplicitwaypoints", true)); audioMarkersFromExplicitWaypoints.setToolTipText(tr("When importing audio, apply it to any waypoints in the GPX layer.")); - gui.audio.add(audioMarkersFromExplicitWaypoints, GBC.eol().insets(0,0,0,0)); + gui.audio.add(audioMarkersFromExplicitWaypoints, GBC.eol().insets(10,0,0,0)); + + // audioMarkersFromUntimedWaypoints + audioMarkersFromUntimedWaypoints.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e) { + if (!audioMarkersFromUntimedWaypoints.isSelected()) + audioMarkersFromUntimedWaypoints.setSelected(false); + } + }); + audioMarkersFromUntimedWaypoints.setSelected(Main.pref.getBoolean("marker.audiofromuntimedwaypoints", true)); + audioMarkersFromUntimedWaypoints.setToolTipText(tr("When importing audio, apply it to any waypoints in the GPX layer.")); + gui.audio.add(audioMarkersFromUntimedWaypoints, GBC.eol().insets(10,0,0,0)); + + // audioMarkersFromNamedTrackpoints + audioMarkersFromNamedTrackpoints.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e) { + if (!audioMarkersFromNamedTrackpoints.isSelected()) + audioMarkersFromNamedTrackpoints.setSelected(false); + } + }); + audioMarkersFromNamedTrackpoints.setSelected(Main.pref.getBoolean("marker.audiofromnamedtrackpoints", Main.pref.getBoolean("marker.namedtrackpoints"))); + audioMarkersFromNamedTrackpoints.setToolTipText(tr("Automatically create audio markers from trackpoints (rather than explicit waypoints) with names or descriptions.")); + gui.audio.add(audioMarkersFromNamedTrackpoints, GBC.eol().insets(10,0,0,0)); + + // audioMarkersFromStart + audioMarkersFromStart.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e) { + if (!audioMarkersFromStart.isSelected()) + audioMarkersFromStart.setSelected(false); + } + }); + audioMarkersFromStart.setSelected(Main.pref.getBoolean("marker.audiofromstart")); + audioMarkersFromStart.setToolTipText(tr("Automatically create audio markers from trackpoints (rather than explicit waypoints) with names or descriptions.")); + gui.audio.add(audioMarkersFromStart, GBC.eol().insets(10,0,0,0)); audioForwardBackAmount.setText(Main.pref.get("audio.forwardbackamount", "10")); @@ -139,7 +162,9 @@ Main.pref.put("marker.traceaudio", markerAudioTraceVisible.isSelected()); Main.pref.put("marker.buttonlabels", markerButtonLabels.isSelected()); - Main.pref.put("marker.namedtrackpoints", markersNamedTrackpoints.isSelected()); Main.pref.put("marker.makeautomarkers", makeAutoMarkers.isSelected()); Main.pref.put("marker.audiofromexplicitwaypoints", audioMarkersFromExplicitWaypoints.isSelected()); + Main.pref.put("marker.audiofromuntimedwaypoints", audioMarkersFromUntimedWaypoints.isSelected()); + Main.pref.put("marker.audiofromnamedtrackpoints", audioMarkersFromNamedTrackpoints.isSelected()); + Main.pref.put("marker.audiofromstart", audioMarkersFromStart.isSelected()); Main.pref.put("audio.forwardbackamount", audioForwardBackAmount.getText()); Main.pref.put("audio.fastfwdmultiplier", audioFastForwardMultiplier.getText());