Index: trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java (revision 1228) +++ trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java (revision 1230) @@ -23,38 +23,39 @@ public HistoryInfoAction() { - super(tr("History of Node/Way"), "about",tr("Display history information about OSM ways or nodes."), - Shortcut.registerShortcut("core:history", tr("History of Node/Way"), KeyEvent.VK_H, Shortcut.GROUP_HOTKEY), true); + super(tr("History of Element"), "about", + tr("Display history information about OSM ways or nodes."), + Shortcut.registerShortcut("core:history", + tr("History of Element"), KeyEvent.VK_H, Shortcut.GROUP_HOTKEY), true); } public void actionPerformed(ActionEvent e) { - final Collection sel = new LinkedList(); - new Visitor() { - public void visit(Node n) { - OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/node/" + n.id + "/history"); - sel.add(n); - } + final Collection sel = new LinkedList(); + new Visitor() { + public void visit(Node n) { + OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/node/" + n.id + "/history"); + sel.add(n); + } - public void visit(Way w) { - OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/way/" + w.id + "/history"); - sel.add(w); - } + public void visit(Way w) { + OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/way/" + w.id + "/history"); + sel.add(w); + } - public void visit(Relation e) { - OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/relation/" + e.id + "/history"); - sel.add(e); - } + public void visit(Relation e) { + OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/relation/" + e.id + "/history"); + sel.add(e); + } - public void visitAll() { - for (OsmPrimitive osm : Main.ds.getSelected()) - osm.visit(this); - } - }.visitAll(); + public void visitAll() { + for (OsmPrimitive osm : Main.ds.getSelected()) + osm.visit(this); + } + }.visitAll(); - if (sel.isEmpty()) { - JOptionPane.showMessageDialog(Main.parent, - tr("Please select at least one node or way.")); - return; - } + if (sel.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, + tr("Please select at least one node, way or relation.")); + return; + } } - } Index: trunk/src/org/openstreetmap/josm/data/projection/LambertEST.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/LambertEST.java (revision 1230) +++ trunk/src/org/openstreetmap/josm/data/projection/LambertEST.java (revision 1230) @@ -0,0 +1,116 @@ +//License: GPL. For details, see LICENSE file. +//Thanks to Johan Montagnat and its geoconv java converter application +//(http://www.i3s.unice.fr/~johan/gps/ , published under GPL license) +//from which some code and constants have been reused here. +package org.openstreetmap.josm.data.projection; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.coor.LatLon; + +public class LambertEST implements Projection { + + public static final double ef = 500000; //Easting at false origin = 5000000 m + public static final double nf = 6375000; //Northing at false origin = 6375000 m + public static final double lat1 = Math.toRadians(59 + 1.0/3.0); //Latitude of 1st standard parallel = 59o20`0`` N + public static final double lat2 = Math.toRadians( 58);//Latitude of 2nd standard parallel = 58o0`0`` N + public static final double latf = Math.toRadians(57.517553930555555555555555555556);//'Latitude of false origin = 57o31`3,19415`` N + public static final double lonf = Math.toRadians( 24.0); + public static final double a = 6378137; + public static final double ee = 0.081819191042815792; + public static final double m1 = Math.cos(lat1) / (Math.sqrt(1 - ee *ee * Math.pow(Math.sin(lat1), 2))); + public static final double m2 = Math.cos(lat2) / (Math.sqrt(1 - ee *ee * Math.pow(Math.sin(lat2), 2))); + public static final double t1 = Math.tan(Math.PI / 4.0 - lat1 / 2.0) + / Math.pow(( (1.0 - ee * Math.sin(lat1)) / (1.0 + ee * Math.sin(lat1))) ,(ee / 2.0)); + public static final double t2 = Math.tan(Math.PI / 4.0 - lat2 / 2.0) + / Math.pow(( (1.0 - ee * Math.sin(lat2)) / (1.0 + ee * Math.sin(lat2))) ,(ee / 2.0)); + public static final double tf = Math.tan(Math.PI / 4.0 - latf / 2.0) + / Math.pow(( (1.0 - ee * Math.sin(latf)) / (1.0 + ee * Math.sin(latf))) ,(ee / 2.0)); + public static final double n = (Math.log(m1) - Math.log(m2)) + / (Math.log(t1) - Math.log(t2)); + public static final double f = m1 / (n * Math.pow(t1, n)); + public static final double rf = a * f * Math.pow(tf, n); + + /** + * precision in iterative schema + */ + public static final double epsilon = 1e-11; + + /** + * @param p WGS84 lat/lon (ellipsoid GRS80) (in degree) + * @return eastnorth projection in Lambert Zone (ellipsoid GRS80) + */ + public EastNorth latlon2eastNorth(LatLon p) + { + + double t = Math.tan(Math.PI / 4.0 - Math.toRadians(p.lat()) / 2.0) + / Math.pow(( (1.0 - ee * Math.sin(Math.toRadians(p.lat()))) / (1.0 + + ee * Math.sin(Math.toRadians(p.lat())))) ,(ee / 2.0)); + double r = a * f * Math.pow(t, n); + double theta = n * (Math.toRadians(p.lon()) - lonf); + + double x = ef + r * Math.sin(theta); //587446.7 + double y = nf + rf - r * Math.cos(theta); //6485401.6 + + return new EastNorth(x,y); + } + + public static double IterateAngle(double e, double t) + { + double a1 = 0.0; + double a2 = 3.1415926535897931; + double a = 1.5707963267948966; + double b = 1.5707963267948966 - (2.0 * Math.atan(t * Math.pow((1.0 + - (e * Math.sin(a))) / (1.0 + (e * Math.sin(a))), e / 2.0))); + while (Math.abs(a-b) > epsilon) + { + a = a1 + ((a2 - a1) / 2.0); + b = 1.5707963267948966 - (2.0 * Math.atan(t * Math.pow((1.0 + - (e * Math.sin(a))) / (1.0 + (e * Math.sin(a))), e / 2.0))); + if (a1 == a2) + { + return 0.0; + } + if (b > a) + a1 = a; + else + a2 = a; + } + return b; + } + + public LatLon eastNorth2latlon(EastNorth p) + { + double r = Math.sqrt(Math.pow((p.getX() - ef), 2.0) + Math.pow((rf + - p.getY() + nf), 2.0) ) * Math.signum(n); + double T = Math.pow((r / (a * f)), (1.0/ n)) ; + double theta = Math.atan((p.getX() - ef) / (rf - p.getY() + nf)); + double y = (theta / n + lonf) ; + double x = (IterateAngle(ee, T)) ; + return new LatLon(Math.toDegrees(x),Math.toDegrees(y)); + } + + @Override + public String toString() { + return tr("Lambert Zone (Estonia)"); + } + + public String getCacheDirectoryName() { + return "lambertest"; + } + + public double scaleFactor() { + return 1.0 / 360; + } + + @Override + public boolean equals(Object o) { + return o instanceof LambertEST; + } + + @Override + public int hashCode() { + return LambertEST.class.hashCode(); + } +} Index: trunk/src/org/openstreetmap/josm/data/projection/Projection.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/Projection.java (revision 1228) +++ trunk/src/org/openstreetmap/josm/data/projection/Projection.java (revision 1230) @@ -34,5 +34,6 @@ new Epsg4326(), new Mercator(), - new Lambert() + new Lambert(), + new LambertEST() }; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 1228) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 1230) @@ -196,5 +196,5 @@ // show the close button JButton close = new JButton(ImageProvider.get("misc", "close")); - close.setToolTipText(tr("Close this panel. You can reopen it with the buttons in the left toolbar")); + close.setToolTipText(tr("Close this panel. You can reopen it with the buttons in the left toolbar.")); close.setBorder(BorderFactory.createEmptyBorder()); final ActionListener closeActionListener = new ActionListener(){