Changeset 34755 in osm for applications/editors

Timestamp:

2018-11-30T00:19:38+01:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14456

Location:

applications/editors/josm/plugins/infomode

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/infomode/InfoMode.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java (modified) (3 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="InfoMode : for shortcurt parser"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="14456"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java

@@ -224 +224 @@
                 sg: for (GpxTrackSegment seg : track.getSegments()) {
                     for (WayPoint S : seg.getWayPoints()) {
-                        if (S.time != 0) {
+                        if (S.hasDate()) {
                             f = false;
                             break sg;
@@ -288 +288 @@
                     if (oldPopup != null) oldPopup.hide();
                     double vel = -1;
-                    if (prevWp != null && wp.time != prevWp.time) {
+                    if (prevWp != null && wp.getTimeInMillis() != prevWp.getTimeInMillis()) {
                         vel = wp.getCoor().greatCircleDistance(prevWp.getCoor())/
-                                (wp.time-prevWp.time);
+                                (wp.getTime()-prevWp.getTime());
                     }
                     infoPanel.setData(wp, trk, vel, gpxL.data.tracks);

applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java

@@ -78 +78 @@
             for (GpxTrackSegment seg : trk.getSegments()) {
                     for (WayPoint S : seg.getWayPoints()) {
-                        if (S.time > tm) {
-                            tm = S.time;
+                        if (S.getTime() > tm) {
+                            tm = S.getTime();
                         }
                     }
@@ -88 +88 @@
                 sg: for (GpxTrackSegment seg : track.getSegments()) {
                     for (WayPoint S : seg.getWayPoints()) {
-                        if (S.time > tm) {
+                        if (S.getTime() > tm) {
                             f = false;
                             break sg;
@@ -105 +105 @@
         this.tracks = tracks;
         this.trk = trk;
-        if (wp.time == 0.0) {
+        if (!wp.hasDate()) {
             label1.setText(tr("No timestamp"));
             but2.setVisible(false);
         } else {
-            label1.setText(DateUtils.formatDateTime(wp.getTime(), DateFormat.DEFAULT, DateFormat.DEFAULT));
+            label1.setText(DateUtils.formatDateTime(wp.getDate(), DateFormat.DEFAULT, DateFormat.DEFAULT));
             but2.setVisible(true);
         }