Changeset 34507 in osm for applications/editors/josm/plugins/ElevationProfile

Timestamp:

2018-08-18T17:09:37+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/ElevationProfile

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/HgtReader.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java (modified) (5 diffs)

applications/editors/josm/plugins/ElevationProfile/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
-        <classpathentry kind="src" path="test/unit"/>
+        <classpathentry kind="src" output="buildtest" path="test/unit">
+                <attributes>
+                        <attribute name="test" value="true"/>
+                </attributes>
+        </classpathentry>
         <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

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

@@ -4 +4 @@
     <property name="commit.message" value="[josm_elevationprofile]"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12669"/>
+    <property name="plugin.main.version" value="14153"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/HgtReader.java

@@ -11 +11 @@
 import java.util.HashMap;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -44 +44 @@
                 cache.put(file, null);
                 // Try all resource directories
-                for (String location : Main.pref.getAllPossiblePreferenceDirs()) {
+                for (String location : Preferences.getAllPossiblePreferenceDirs()) {
                     String fullPath = new File(location + File.separator + "elevation", file).getPath();
                     File f = new File(fullPath);

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java

@@ -19 +19 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
@@ -151 +151 @@
 
         // transform to view
-        Point pnt1 = mv.getPoint(wpt1.getEastNorth(Main.getProjection()));
-        Point pnt2 = mv.getPoint(wpt2.getEastNorth(Main.getProjection()));
+        Point pnt1 = mv.getPoint(wpt1.getEastNorth(ProjectionRegistry.getProjection()));
+        Point pnt2 = mv.getPoint(wpt2.getEastNorth(ProjectionRegistry.getProjection()));
 
         // use thick line, if possible
@@ -189 +189 @@
 
         Color c = getColorForWaypoint(profile, wpt, kind);
-        Point pnt = mv.getPoint(wpt.getEastNorth(Main.getProjection()));
+        Point pnt = mv.getPoint(wpt.getEastNorth(ProjectionRegistry.getProjection()));
 
         /* Paint full hour label */
@@ -236 +236 @@
         Color c = getColorForWaypoint(profile, wpt, kind);
         int eleH = (int) ElevationHelper.getElevation(wpt);
-        Point pnt = mv.getPoint(wpt.getEastNorth(Main.getProjection()));
+        Point pnt = mv.getPoint(wpt.getEastNorth(ProjectionRegistry.getProjection()));
 
         TriangleDir td = TriangleDir.Up;
@@ -360 +360 @@
 
         Color c = getColorForWaypoint(profile, wpt, kind);
-        Point pnt = mv.getPoint(wpt.getEastNorth(Main.getProjection()));
+        Point pnt = mv.getPoint(wpt.getEastNorth(ProjectionRegistry.getProjection()));
         drawSphere(g, Color.WHITE, c, pnt.x, pnt.y, BIG_WPT_RADIUS);
     }