Ignore:
Timestamp:
2022-06-15T20:10:48+02:00 (3 years ago)
Author:
taylor.smock
Message:

See #22115: Extract methods from LatLon into ILatLon where they are generally applicable

This uses the extracted methods where possible, and removes unnecessary
Node#getCoor calls.

Location:
applications/editors/josm/plugins/imagery_offset_db
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/imagery_offset_db/build.xml

    r34641 r35978  
    55    <property name="commit.message" value="Imagery Offset Database"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="14221"/>
     7    <property name="plugin.main.version" value="18494"/>
    88    <property name="plugin.canloadatruntime" value="true"/>
    99
  • applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/ImageryOffsetWatcher.java

    r34596 r35978  
    1111import java.util.TreeMap;
    1212
     13import org.openstreetmap.josm.data.coor.ILatLon;
    1314import org.openstreetmap.josm.data.coor.LatLon;
    1415import org.openstreetmap.josm.data.imagery.OffsetBookmark;
     
    151152                setOffsetGood(true);
    152153            } else {
    153                 setOffsetGood(data.lastChecked != null && center.greatCircleDistance(data.lastChecked) <= maxDistance * 1000);
     154                setOffsetGood(data.lastChecked != null && center.greatCircleDistance((ILatLon) data.lastChecked) <= maxDistance * 1000);
    154155            }
    155156        }
     
    264265                    continue;
    265266                }
    266                 LatLon lastPos = new LatLon(dparts[0], dparts[1]);
     267                ILatLon lastPos = new LatLon(dparts[0], dparts[1]);
    267268                if (lastPos.greatCircleDistance(ImageryOffsetTools.getMapCenter()) < Math.max(maxDistance, 3.0) * 1000) {
    268269                    // apply offset
  • applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/OffsetDialogButton.java

    r34596 r35978  
    2626
    2727import org.openstreetmap.josm.data.coor.EastNorth;
     28import org.openstreetmap.josm.data.coor.ILatLon;
    2829import org.openstreetmap.josm.data.coor.LatLon;
    2930import org.openstreetmap.josm.data.projection.Projection;
     
    6869     */
    6970    public void updateLocation() {
    70         LatLon center = ImageryOffsetTools.getMapCenter();
     71        ILatLon center = ImageryOffsetTools.getMapCenter();
    7172        directionArrow.updateIcon(center);
    7273        double distance = center.greatCircleDistance(offset.getPosition());
     
    151152        Projection proj = ProjectionRegistry.getProjection();
    152153        EastNorth pos = proj.latlon2eastNorth(offset.getPosition());
    153         LatLon correctedCenterLL = proj.eastNorth2latlon(pos.add(-dx, -dy));
     154        ILatLon correctedCenterLL = proj.eastNorth2latlon(pos.add(-dx, -dy));
    154155        double length = correctedCenterLL.greatCircleDistance(offset.getImageryPos());
    155156        double direction = length < 1e-2 ? 0.0 : -correctedCenterLL.bearing(offset.getImageryPos());
     
    261262        }
    262263
    263         public void updateIcon(LatLon from) {
     264        public void updateIcon(ILatLon from) {
    264265            distance = from.greatCircleDistance(to);
    265266            direction = -to.bearing(from);
  • applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/OffsetInfoAction.java

    r34596 r35978  
    1212import javax.swing.JOptionPane;
    1313
     14import org.openstreetmap.josm.data.coor.ILatLon;
    1415import org.openstreetmap.josm.gui.MainApplication;
    1516import org.openstreetmap.josm.tools.ImageProvider;
     
    8081        StringBuilder sb = new StringBuilder();
    8182        if (offset instanceof ImageryOffset) {
    82             double odist = ((ImageryOffset) offset).getImageryPos().greatCircleDistance(offset.getPosition());
     83            double odist = ((ImageryOffset) offset).getImageryPos().greatCircleDistance((ILatLon) offset.getPosition());
    8384            if (odist < 1e-2) odist = 0.0;
    8485            sb.append(tr("An imagery offset of {0}", ImageryOffsetTools.formatDistance(odist))).append('\n');
     
    8889        }
    8990
    90         double dist = ImageryOffsetTools.getMapCenter().greatCircleDistance(offset.getPosition());
     91        double dist = ImageryOffsetTools.getMapCenter().greatCircleDistance((ILatLon) offset.getPosition());
    9192        sb.append(dist < 50 ? tr("Determined right here") : tr("Determined {0} away",
    9293                ImageryOffsetTools.formatDistance(dist)));
Note: See TracChangeset for help on using the changeset viewer.