Index: applications/editors/josm/plugins/imagewaypoint/build.xml
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 14122)
+++ applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 16294)
@@ -26,5 +26,5 @@
                 <attribute name="Plugin-Description" value="Another plugin to match images to the waypoints in a GPX file. A match is made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches the filename of an image."/>
                 <attribute name="Plugin-Early" value="false"/>
-                <attribute name="Plugin-Mainversion" value="1498"/>
+                <attribute name="Plugin-Mainversion" value="1725"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java	(revision 14122)
+++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java	(revision 16294)
@@ -151,5 +151,5 @@
         bounds = null;
     } else {
-        final Point point = mapView.getPoint(this.getWayPoint().eastNorth);
+        final Point point = mapView.getPoint(this.getWayPoint().getCoor());
         bounds = new Rectangle(point.x - ImageEntry.ICON_WIDTH,
         point.y - ImageEntry.ICON_HEIGHT,
Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java	(revision 14122)
+++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java	(revision 16294)
@@ -150,8 +150,6 @@
                 final ImageEntry imageEntry = images[index];
 
-                if (null != imageEntry.getWayPoint()
-                && null != imageEntry.getWayPoint().eastNorth) {
-                    visitor.visit(imageEntry.getWayPoint().eastNorth);
-                }
+                if (imageEntry.getWayPoint() != null)
+                    visitor.visit(imageEntry.getWayPoint().getCoor());
             }
         }