Changeset 33774 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java

Timestamp:

2017-11-05T19:09:17+01:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 12840

File:

• applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java (modified) (4 diffs)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java

@@ -18 +18 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.coor.CoordinateFormat;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -59 +59 @@
         Projection proj = MainApplication.getMap().mapView.getProjection();
         LatLon center = proj.eastNorth2latlon(MainApplication.getMap().mapView.getCenter());
-        AbstractTileSourceLayer layer = ImageryOffsetTools.getTopImageryLayer();
+        AbstractTileSourceLayer<?> layer = ImageryOffsetTools.getTopImageryLayer();
         String imagery = ImageryOffsetTools.getImageryID(layer);
         if (imagery == null)
@@ -77 +77 @@
         if (!MainApplication.isDisplayingMapView() || !MainApplication.getMap().isVisible())
             state = false;
-        AbstractTileSourceLayer layer = ImageryOffsetTools.getTopImageryLayer();
+        AbstractTileSourceLayer<?> layer = ImageryOffsetTools.getTopImageryLayer();
         if (ImageryOffsetTools.getImageryID(layer) == null)
             state = false;
@@ -131 +131 @@
          * @param imagery Imagery ID for the layer.
          */
-        DownloadOffsetsTask(LatLon center, AbstractTileSourceLayer layer, String imagery) {
+        DownloadOffsetsTask(LatLon center, AbstractTileSourceLayer<?> layer, String imagery) {
             super(null, tr("Loading imagery offsets..."));
             try {
-                String query = "get?lat=" + center.latToString(CoordinateFormat.DECIMAL_DEGREES)
-                + "&lon=" + center.lonToString(CoordinateFormat.DECIMAL_DEGREES)
+                String query = "get?lat=" + DecimalDegreesCoordinateFormat.INSTANCE.latToString(center)
+                + "&lon=" + DecimalDegreesCoordinateFormat.INSTANCE.lonToString(center)
                 + "&imagery=" + URLEncoder.encode(imagery, "UTF8");
-                int radius = Main.pref.getInteger("iodb.radius", -1);
+                int radius = Main.pref.getInt("iodb.radius", -1);
                 if (radius > 0)
                     query = query + "&radius=" + radius;