Ignore:
Timestamp:
2019-11-02T15:49:01+01:00 (5 years ago)
Author:
donvip
Message:

update to JOSM 15496

Location:
applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSAddCommand.java

    r34718 r35219  
    2121    private GTFSStopTableModel gtfsStopTM = null;
    2222
    23     private String type = null;
    24 
    2523    public GTFSAddCommand(GTFSImporterAction controller) {
    2624        super(MainApplication.getLayerManager().getEditDataSet());
    2725        gtfsStopTM = controller.getGTFSStopTableModel();
    28         type = controller.getDialog().getStoptype();
    2926        workingLines = new Vector<>();
    3027        typesForUndo = new Vector<>();
  • applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java

    r34718 r35219  
    1010import org.openstreetmap.josm.command.Command;
    1111import org.openstreetmap.josm.data.coor.LatLon;
    12 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
     12import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    1313import org.openstreetmap.josm.data.gpx.WayPoint;
    1414import org.openstreetmap.josm.data.osm.Node;
     
    3535    private double threshold;
    3636
    37     private Collection<GpxTrackSegment> segments = null;
     37    private Collection<IGpxTrackSegment> segments = null;
    3838
    3939    private Vector<Vector<Object>> tableDataModel = null;
     
    7676
    7777        Vector<WayPoint> wayPoints = new Vector<>();
    78         Iterator<GpxTrackSegment> siter = segments.iterator();
     78        Iterator<IGpxTrackSegment> siter = segments.iterator();
    7979        while (siter.hasNext()) {
    8080            Iterator<WayPoint> witer = siter.next().getWayPoints().iterator();
  • applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/AbstractImporterDialog.java

    r34718 r35219  
    1919/**
    2020 * Abstract superclass of {@link GTFSImporterDialog} and {@link StopImporterDialog}.
     21 * @param <T> type of action
    2122 */
    2223public abstract class AbstractImporterDialog<T extends JosmAction> {
  • applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java

    r34718 r35219  
    1515import org.openstreetmap.josm.data.coor.LatLon;
    1616import org.openstreetmap.josm.data.gpx.GpxTrack;
    17 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
     17import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    1818import org.openstreetmap.josm.data.gpx.WayPoint;
    1919import org.openstreetmap.josm.data.osm.Node;
     
    3838    public double threshold;
    3939
    40     private StopImporterAction controller = null;
    41 
    4240    public boolean inEvent = false;
    4341
     
    4846        this.gpsStartTime = null;
    4947        this.gpsSyncTime = null;
    50         this.controller = controller;
    5148        if (track != null) {
    52             Iterator<GpxTrackSegment> siter = track.getSegments().iterator();
     49            Iterator<IGpxTrackSegment> siter = track.getSegments().iterator();
    5350            while (siter.hasNext() && this.gpsSyncTime == null) {
    5451                Iterator<WayPoint> witer = siter.next().getWayPoints().iterator();
     
    131128        double wayPointTime = 0;
    132129        double lastWayPointTime = 0;
    133         Iterator<GpxTrackSegment> siter = track.getSegments().iterator();
     130        Iterator<IGpxTrackSegment> siter = track.getSegments().iterator();
    134131        while (siter.hasNext()) {
    135132            Iterator<WayPoint> witer = siter.next().getWayPoints().iterator();
Note: See TracChangeset for help on using the changeset viewer.