Changeset 35221 in osm for applications/editors/josm/plugins/NanoLog

Timestamp:

2019-11-03T22:22:25+01:00 (5 years ago)

Author:

donvip

Message:

see #josm16796 - update to JOSM 15502 - use IGpxTrack in GpxData (patch by Bjoeni)

Location:

applications/editors/josm/plugins/NanoLog

Files:

• build.xml (modified) (1 diff)
• src/nanolog/Correlator.java (modified) (4 diffs)

applications/editors/josm/plugins/NanoLog/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="NanoLog"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="15496"/>
+    <property name="plugin.main.version" value="15502"/>
     <property name="plugin.author" value="Ilya Zverev"/>
     <property name="plugin.class" value="nanolog.NanoLogPlugin"/>

applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrack;
 import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -42 +42 @@
         long firstGPXDate = -1;
         outer:
-        for (GpxTrack trk : data.tracks) {
+        for (IGpxTrack trk : data.tracks) {
             for (IGpxTrackSegment segment : trk.getSegments()) {
                 for (WayPoint curWp : segment.getWayPoints()) {
@@ -84 +84 @@
         //int ret = 0;
         Collections.sort(sortedEntries);
-        for (GpxTrack track : data.tracks) {
+        for (IGpxTrack track : data.tracks) {
             for (IGpxTrackSegment segment : track.getSegments()) {
                 long prevWpTime = 0;
@@ -220 +220 @@
     public static long getGpxDate(GpxData data, LatLon pos) {
         EastNorth en = ProjectionRegistry.getProjection().latlon2eastNorth(pos);
-        for (GpxTrack track : data.tracks) {
+        for (IGpxTrack track : data.tracks) {
             for (IGpxTrackSegment segment : track.getSegments()) {
                 long prevWpTime = 0;