update to JOSM 12825

git-svn-id: https://josm.openstreetmap.de/osmsvn/applications/editors/josm/plugins@33595 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
JOSM · Sep 12, 2017 · c9faaf1 · c9faaf1
1 parent c675543
commit c9faaf1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/opendata/build.xml b/opendata/build.xml
@@ -1,6 +1,6 @@
 <?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"/>
     <property name="plugin.description" value="Convert data from Open Data portals to OSM layer"/>

diff --git a/...ata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java b/...ata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java
@@ -18,6 +18,7 @@
 import org.openstreetmap.josm.data.osm.IPrimitive;
 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;
 import org.openstreetmap.josm.plugins.opendata.core.io.archive.ArchiveHandler;
@@ -401,7 +402,7 @@ protected final ExtendedSourceEntry getMapPaintStyle(String displayName) {
     }
 
     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);
     }

diff --git a/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java b/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java
@@ -60,7 +60,7 @@ public static final void updateDataSet(DataSet dataSet, AbstractDataSetHandler h
                 for (int i = 1; i < n; i++) {
                     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();
                 }

diff --git a/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ProjectionChooser.java b/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ProjectionChooser.java
@@ -15,7 +15,8 @@
 import javax.swing.JPanel;
 
 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;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionChoice;
@@ -130,9 +131,9 @@ private void updateMeta(ProjectionChoice pc) {
         projectionCode.setText(proj.toCode());
         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;
         if (pc instanceof SubPrefsOptions) {