Ignore:
Timestamp:
2017-09-12T11:28:18+02:00 (7 years ago)
Author:
donvip
Message:

update to JOSM 12825

Location:
applications/editors/josm/plugins/opendata
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/opendata/build.xml

    r33553 r33595  
    11<?xml version="1.0" encoding="utf-8"?>
    22<project name="opendata" default="dist" basedir=".">
    3     <property name="plugin.main.version" value="12671"/>
     3    <property name="plugin.main.version" value="12825"/>
    44    <property name="plugin.author" value="Don-vip"/>
    55    <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>
  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java

    r33518 r33595  
    1919import org.openstreetmap.josm.data.osm.OsmPrimitive;
    2020import org.openstreetmap.josm.data.preferences.sources.ExtendedSourceEntry;
     21import org.openstreetmap.josm.data.preferences.sources.SourceType;
    2122import org.openstreetmap.josm.io.AbstractReader;
    2223import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
     
    402403
    403404    protected final ExtendedSourceEntry getMapPaintStyle(String displayName, String fileNameWithoutExtension) {
    404         return new ExtendedSourceEntry(displayName, OdConstants.PROTO_RSRC+//"/"+
     405        return new ExtendedSourceEntry(SourceType.MAP_PAINT_STYLE, displayName, OdConstants.PROTO_RSRC+//"/"+
    405406                this.getClass().getPackage().getName().replace(".", "/")+"/"+
    406407                fileNameWithoutExtension+"."+OdConstants.MAPCSS_EXT);
  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java

    r33358 r33595  
    6161                    atNodes.add(w.getNode((int) ((i / n) * w.getNodesCount())));
    6262                }
    63                 SplitWayResult res = SplitWayAction.split(null, w, atNodes, Collections.emptyList());
     63                SplitWayResult res = SplitWayAction.split(w, atNodes, Collections.emptyList());
    6464                if (res != null) {
    6565                    res.getCommand().executeCommand();
  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ProjectionChooser.java

    r33518 r33595  
    1616
    1717import org.openstreetmap.josm.data.Bounds;
    18 import org.openstreetmap.josm.data.coor.CoordinateFormat;
     18import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
     19import org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat;
    1920import org.openstreetmap.josm.data.projection.Projection;
    2021import org.openstreetmap.josm.gui.ExtendedDialog;
     
    131132        projectionName.setText(proj.toString());
    132133        Bounds b = proj.getWorldBoundsLatLon();
    133         CoordinateFormat cf = CoordinateFormat.getDefaultFormat();
    134         bounds.setText(b.getMin().lonToString(cf)+", "+b.getMin().latToString(cf)+" : "+
    135                        b.getMax().lonToString(cf)+", "+b.getMax().latToString(cf));
     134        ICoordinateFormat cf = CoordinateFormatManager.getDefaultFormat();
     135        bounds.setText(cf.lonToString(b.getMin())+", "+cf.latToString(b.getMin())+" : "+
     136                       cf.lonToString(b.getMax())+", "+cf.latToString(b.getMax()));
    136137        boolean showCode = true;
    137138        boolean showName = false;
Note: See TracChangeset for help on using the changeset viewer.