Changeset 35936 in osm

Timestamp:

2022-03-22T19:22:47+01:00 (2 years ago)

Author:

taylor.smock

Message:

fix #21770: Update deprecated functions in splinex

This replaces usages of LatLon#isOutsideWorld with Node#isOutsideWorld

Location:

applications/editors/josm/plugins/splinex

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/Splinex/DrawSplineAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/Splinex/Spline.java (modified) (1 diff)

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

@@ -5 +5 @@
     <property name="commit.message" value="Update spline shortcut key"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14281"/>
+    <property name="plugin.main.version" value="14960"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/splinex/src/org/openstreetmap/josm/plugins/Splinex/DrawSplineAction.java

@@ -29 +29 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
-import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -264 +263 @@
             return;
         EastNorth en = MainApplication.getMap().mapView.getEastNorth(e.getX(), e.getY());
-        if (ProjectionRegistry.getProjection().eastNorth2latlon(en).isOutSideWorld())
+        if (new Node(en).isOutSideWorld())
             return;
         if (dragSpline) {

applications/editors/josm/plugins/splinex/src/org/openstreetmap/josm/plugins/Splinex/Spline.java

@@ -264 +264 @@
                     Node n = new Node(ProjectionRegistry.getProjection().eastNorth2latlon(
                             cubicBezier(a, ca, cb, b, (double) i / detail)));
-                    if (n.getCoor().isOutSideWorld()) {
+                    if (n.isOutSideWorld()) {
                         JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Spline goes outside of the world."));
                         return;