Changeset 34337 in osm for applications/editors/josm/plugins/imagery_offset_db/src

Timestamp:

2018-06-22T22:40:09+02:00 (6 years ago)

Author:

donvip

Message:

see #josm14120 - fix deprecation warnings

Location:

applications/editors/josm/plugins/imagery_offset_db/src/iodb

Files:

• OffsetDialogButton.java (modified) (3 diffs)
• SimpleOffsetQueryTask.java (modified) (2 diffs)

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

@@ -127 +127 @@
      */
     private double[] getLengthAndDirection(ImageryOffset offset) {
-        AbstractTileSourceLayer layer = ImageryOffsetTools.getTopImageryLayer();
+        AbstractTileSourceLayer<?> layer = ImageryOffsetTools.getTopImageryLayer();
         double[] dxy = layer == null ? new double[] {0.0, 0.0} :
                 new double[] {layer.getDisplaySettings().getDx(), layer.getDisplaySettings().getDy()};
@@ -144 +144 @@
         LatLon correctedCenterLL = proj.eastNorth2latlon(pos.add(-dx, -dy));
         double length = correctedCenterLL.greatCircleDistance(offset.getImageryPos());
-        double direction = length < 1e-2 ? 0.0 : correctedCenterLL.heading(offset.getImageryPos());
+        double direction = length < 1e-2 ? 0.0 : -correctedCenterLL.bearing(offset.getImageryPos());
         if (direction < 0)
             direction += Math.PI * 2;
@@ -253 +253 @@
         public void updateIcon(LatLon from) {
             distance = from.greatCircleDistance(to);
-            direction = to.heading(from);
+            direction = -to.bearing(from);
         }
 

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

@@ -9 +9 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.Scanner;
 import java.util.regex.Matcher;
@@ -139 +140 @@
         String response = "";
         if (inp != null) {
-            Scanner sc = new Scanner(inp).useDelimiter("\\A");
+            Scanner sc = new Scanner(inp, StandardCharsets.UTF_8.name()).useDelimiter("\\A");
             response = sc.hasNext() ? sc.next() : "";
         }