Changeset 33920 in osm for applications/editors/josm/plugins/seachartedit/src/panels

Timestamp:

2017-11-26T15:47:40+01:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 12643

File:

• applications/editors/josm/plugins/seachartedit/src/panels/PanelS57.java (modified) (5 diffs)

applications/editors/josm/plugins/seachartedit/src/panels/PanelS57.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -33 +34 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
@@ -72 +74 @@
         if (returnVal == JFileChooser.APPROVE_OPTION) {
             Main.pref.put("smed2plugin.typesfile", ifc.getSelectedFile().getPath());
-            Scanner tin = new Scanner(new FileInputStream(ifc.getSelectedFile()));
+            Scanner tin = new Scanner(new FileInputStream(ifc.getSelectedFile()), "UTF-8");
             while (tin.hasNext()) {
                 Obj type = S57obj.enumType(tin.next());
@@ -86 +88 @@
 
         DataSet data = new DataSet();
-        data.setUploadDiscouraged(true);
+        data.setUploadPolicy(UploadPolicy.DISCOURAGED);
 
         for (long id : map.index.keySet()) {
@@ -201 +203 @@
 
         OsmDataLayer layer = new OsmDataLayer(data, "S-57 Import", null);
-        Main.getLayerManager().addLayer(layer);
-        Main.map.mapView.zoomTo(new Bounds(Math.toDegrees(map.bounds.minlat), Math.toDegrees(map.bounds.minlon),
+        MainApplication.getLayerManager().addLayer(layer);
+        MainApplication.getMap().mapView.zoomTo(new Bounds(Math.toDegrees(map.bounds.minlat), Math.toDegrees(map.bounds.minlon),
                                            Math.toDegrees(map.bounds.maxlat), Math.toDegrees(map.bounds.maxlon)));
         PanelMain.setStatus("Import done", Color.green);