Changeset 33595 in osm for applications/editors/josm/plugins

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:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/core/gui/ProjectionChooser.java (modified) (2 diffs)

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="12671"/>
+    <property name="plugin.main.version" value="12825"/>
     <property name="plugin.author" value="Don-vip"/>
     <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

@@ -19 +19 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.preferences.sources.ExtendedSourceEntry;
+import org.openstreetmap.josm.data.preferences.sources.SourceType;
 import org.openstreetmap.josm.io.AbstractReader;
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
@@ -402 +403 @@
 
     protected final ExtendedSourceEntry getMapPaintStyle(String displayName, String fileNameWithoutExtension) {
-        return new ExtendedSourceEntry(displayName, OdConstants.PROTO_RSRC+//"/"+
+        return new ExtendedSourceEntry(SourceType.MAP_PAINT_STYLE, displayName, OdConstants.PROTO_RSRC+//"/"+
                 this.getClass().getPackage().getName().replace(".", "/")+"/"+
                 fileNameWithoutExtension+"."+OdConstants.MAPCSS_EXT);

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java

@@ -61 +61 @@
                     atNodes.add(w.getNode((int) ((i / n) * w.getNodesCount())));
                 }
-                SplitWayResult res = SplitWayAction.split(null, w, atNodes, Collections.emptyList());
+                SplitWayResult res = SplitWayAction.split(w, atNodes, Collections.emptyList());
                 if (res != null) {
                     res.getCommand().executeCommand();

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ProjectionChooser.java

@@ -16 +16 @@
 
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.coor.CoordinateFormat;
+import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
+import org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -131 +132 @@
         projectionName.setText(proj.toString());
         Bounds b = proj.getWorldBoundsLatLon();
-        CoordinateFormat cf = CoordinateFormat.getDefaultFormat();
-        bounds.setText(b.getMin().lonToString(cf)+", "+b.getMin().latToString(cf)+" : "+
-                       b.getMax().lonToString(cf)+", "+b.getMax().latToString(cf));
+        ICoordinateFormat cf = CoordinateFormatManager.getDefaultFormat();
+        bounds.setText(cf.lonToString(b.getMin())+", "+cf.latToString(b.getMin())+" : "+
+                       cf.lonToString(b.getMax())+", "+cf.latToString(b.getMax()));
         boolean showCode = true;
         boolean showName = false;