Ignore:
Timestamp:
2018-11-25T13:34:03+01:00 (6 years ago)
Author:
donvip
Message:

see #josm16995 - update to JOSM 14434

Location:
applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java

    r34505 r34737  
    131131     * convert a DataSet to GPX
    132132     *
    133      * @param boolean anonTime If true set all time and date in GPX to 01/01/1970 00:00 ?
    134      * @return GPXData
     133     * @param anonTime If true set all time and date in GPX to 01/01/1970 00:00 ?
     134     * @return GpxData
    135135     */
    136136    private GpxData toGpxData(boolean anonTime) {

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java

    r34505 r34737  
    107107    /**
    108108     * create rectangle out of two given corners
     109     * @param p1 first corner
     110     * @param p2 second corner
     111     * @return rectangle
    109112     */
    110113    public Rectangle createRect(Point p1, Point p2) {
    … …  
    137140    /**
    138141     * Draw a selection rectangle on screen.
     142     * @param p1 first corner
     143     * @param p2 second corner
    139144     */
    140145    private void paintRect(Point p1, Point p2) {

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java

    r30737 r34737  
    7171     * time of the oldest waypoint in the set of non-deleted waypoints
    7272     * in this data (in seconds since Epoch)
     73     * @return time in seconds since Epoch
    7374     */
    7475    public double minNonDeletedTime() {
    … …  
    8081                try {
    8182                    double t = track.minNonDeletedTime();
    82                     if ((!foundOne) || (t < minTime)) {
     83                    if (!foundOne || t < minTime) {
    8384                        minTime = t;
    8485                    }

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java

    r30737 r34737  
    55import java.util.ArrayList;
    66import java.util.Collection;
    7 import java.util.Date;
    87import java.util.HashMap;
    98import java.util.List;
    … …  
    4241
    4342        final DateFormat iso8601 =
    44             new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
     43                new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
    4544        final TimeZone utc = TimeZone.getTimeZone("UTC");
    4645        iso8601.setTimeZone(utc);
    … …  
    5453                        for (WayPoint w : points) {
    5554                            double t = w.time - minTime;
    56                             w.attr.put("time", iso8601.format(
    57                                     new Date((long)(t * 1000))));
    58                             w.setTime();
     55                            w.setTimeInMillis((long)(t * 1000));
    5956                            assert w.time == t;
    6057                            if (w.attr.containsKey("name")) {
    … …  
    8784     * time of the oldest waypoint in the set of non-deleted waypoints
    8885     * in this track (in seconds since Epoch)
     86     * @return time in seconds since Epoch
    8987     */
    9088    public double minNonDeletedTime() {
    … …  
    9694                try {
    9795                    double t = segment.minNonDeletedTime();
    98                     if ((!foundOne) || (t < minTime)) {
     96                    if (!foundOne || t < minTime) {
    9997                        minTime = t;
    10098                    }

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java

    r30737 r34737  
    4646     * time of the oldest waypoint in the set of non-deleted waypoints
    4747     * in this segment (in seconds since Epoch)
     48     * @return time in seconds since Epoch
    4849     */
    4950    public double minNonDeletedTime() {

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxWayPoint.java

    r33782 r34737  
    3636    /**
    3737     * returns this waypoint's time in seconds since Epoch
     38     * @return time in seconds since Epoch
    3839     */
    3940    public double getTime() {
Note: See TracChangeset for help on using the changeset viewer.