Changeset 35978 in osm for applications/editors/josm/plugins/imagery_offset_db
- Timestamp:
- 2022-06-15T20:10:48+02:00 (3 years ago)
- 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 5 5 <property name="commit.message" value="Imagery Offset Database"/> 6 6 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 7 <property name="plugin.main.version" value="1 4221"/>7 <property name="plugin.main.version" value="18494"/> 8 8 <property name="plugin.canloadatruntime" value="true"/> 9 9 -
applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/ImageryOffsetWatcher.java
r34596 r35978 11 11 import java.util.TreeMap; 12 12 13 import org.openstreetmap.josm.data.coor.ILatLon; 13 14 import org.openstreetmap.josm.data.coor.LatLon; 14 15 import org.openstreetmap.josm.data.imagery.OffsetBookmark; … … 151 152 setOffsetGood(true); 152 153 } else { 153 setOffsetGood(data.lastChecked != null && center.greatCircleDistance(data.lastChecked) <= maxDistance * 1000); 154 setOffsetGood(data.lastChecked != null && center.greatCircleDistance((ILatLon) data.lastChecked) <= maxDistance * 1000); 154 155 } 155 156 } … … 264 265 continue; 265 266 } 266 LatLon lastPos = new LatLon(dparts[0], dparts[1]); 267 ILatLon lastPos = new LatLon(dparts[0], dparts[1]); 267 268 if (lastPos.greatCircleDistance(ImageryOffsetTools.getMapCenter()) < Math.max(maxDistance, 3.0) * 1000) { 268 269 // apply offset -
applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/OffsetDialogButton.java
r34596 r35978 26 26 27 27 import org.openstreetmap.josm.data.coor.EastNorth; 28 import org.openstreetmap.josm.data.coor.ILatLon; 28 29 import org.openstreetmap.josm.data.coor.LatLon; 29 30 import org.openstreetmap.josm.data.projection.Projection; … … 68 69 */ 69 70 public void updateLocation() { 70 LatLon center = ImageryOffsetTools.getMapCenter(); 71 ILatLon center = ImageryOffsetTools.getMapCenter(); 71 72 directionArrow.updateIcon(center); 72 73 double distance = center.greatCircleDistance(offset.getPosition()); … … 151 152 Projection proj = ProjectionRegistry.getProjection(); 152 153 EastNorth pos = proj.latlon2eastNorth(offset.getPosition()); 153 LatLon correctedCenterLL = proj.eastNorth2latlon(pos.add(-dx, -dy)); 154 ILatLon correctedCenterLL = proj.eastNorth2latlon(pos.add(-dx, -dy)); 154 155 double length = correctedCenterLL.greatCircleDistance(offset.getImageryPos()); 155 156 double direction = length < 1e-2 ? 0.0 : -correctedCenterLL.bearing(offset.getImageryPos()); … … 261 262 } 262 263 263 public void updateIcon(LatLon from) { 264 public void updateIcon(ILatLon from) { 264 265 distance = from.greatCircleDistance(to); 265 266 direction = -to.bearing(from); -
applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/OffsetInfoAction.java
r34596 r35978 12 12 import javax.swing.JOptionPane; 13 13 14 import org.openstreetmap.josm.data.coor.ILatLon; 14 15 import org.openstreetmap.josm.gui.MainApplication; 15 16 import org.openstreetmap.josm.tools.ImageProvider; … … 80 81 StringBuilder sb = new StringBuilder(); 81 82 if (offset instanceof ImageryOffset) { 82 double odist = ((ImageryOffset) offset).getImageryPos().greatCircleDistance(offset.getPosition()); 83 double odist = ((ImageryOffset) offset).getImageryPos().greatCircleDistance((ILatLon) offset.getPosition()); 83 84 if (odist < 1e-2) odist = 0.0; 84 85 sb.append(tr("An imagery offset of {0}", ImageryOffsetTools.formatDistance(odist))).append('\n'); … … 88 89 } 89 90 90 double dist = ImageryOffsetTools.getMapCenter().greatCircleDistance(offset.getPosition()); 91 double dist = ImageryOffsetTools.getMapCenter().greatCircleDistance((ILatLon) offset.getPosition()); 91 92 sb.append(dist < 50 ? tr("Determined right here") : tr("Determined {0} away", 92 93 ImageryOffsetTools.formatDistance(dist)));
Note:
See TracChangeset
for help on using the changeset viewer.