Changeset 34746 in osm for applications/editors/josm

Timestamp:

2018-11-28T22:53:01+01:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14456

Location:

applications/editors/josm/plugins/ElevationProfile

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/ElevationHelper.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationProfile.java (modified) (4 diffs)

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

@@ -4 +4 @@
     <property name="commit.message" value="[josm_elevationprofile]"/>
     <!-- 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/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationHelper.java

@@ -343 +343 @@
 
         Calendar calendar = GregorianCalendar.getInstance(); // creates a new calendar instance
-        calendar.setTime(wpt.getTime());   // assigns calendar to given date
+        calendar.setTime(wpt.getDate());   // assigns calendar to given date
         return calendar.get(Calendar.HOUR_OF_DAY);
     }
@@ -354 +354 @@
 
         Calendar calendar = GregorianCalendar.getInstance(); // creates a new calendar instance
-        calendar.setTime(wpt.getTime());   // assigns calendar to given date
+        calendar.setTime(wpt.getDate());   // assigns calendar to given date
         return calendar.get(Calendar.MINUTE);
     }

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationProfile.java

@@ -195 +195 @@
     protected void setStart(WayPoint wp) {
         importantWayPoints[WAYPOINT_START] = wp;
-        this.start = wp.getTime();
+        this.start = wp.getDate();
     }
 
@@ -203 +203 @@
     protected void setEnd(WayPoint wp) {
         importantWayPoints[WAYPOINT_END] = wp;
-        this.end = wp.getTime();
+        this.end = wp.getDate();
     }
 
@@ -305 +305 @@
 
         if (wp1 != null && wp2 != null) {
-            long diff = wp2.getTime().getTime() - wp1.getTime().getTime();
+            long diff = wp2.getDate().getTime() - wp1.getDate().getTime();
             return diff;
         }
@@ -378 +378 @@
     @Override
     public void visitWayPoint(WayPoint wp) {
-        if (wp.getTime().after(end)) {
+        if (wp.getDate().after(end)) {
             setEnd(wp);
         }
 
-        if (wp.getTime().before(start)) {
+        if (wp.getDate().before(start)) {
             setStart(wp);
         }