Changeset 73 in josm

Timestamp:

Mar 28, 2006 5:45:45 PM (7 years ago)

Author:

imi

Message:

fixed bug where lat/lon was exchanged in download dialog and quick fix for Java6 - gui problem

Location:

src/org/openstreetmap/josm

Files:

• Main.java (modified) (3 diffs)
• actions/DownloadAction.java (modified) (2 diffs)
• command/MoveCommand.java (modified) (2 diffs)
• data/Bounds.java (modified) (1 diff)
• data/osm/Node.java (modified) (1 diff)
• data/osm/visitor/BoundingXYVisitor.java (modified) (1 diff)
• data/projection/Mercator.java (modified) (1 diff)
• gui/BookmarkList.java (modified) (1 diff)
• gui/MapView.java (modified) (2 diffs)
• gui/NavigatableComponent.java (modified) (1 diff)
• gui/PreferenceDialog.java (modified) (4 diffs)
• gui/WorldChooser.java (modified) (4 diffs)
• gui/layer/RawGpsDataLayer.java (modified) (1 diff)
• io/OsmServerReader.java (modified) (1 diff)

src/org/openstreetmap/josm/Main.java

@@ -35 +35 @@
 import org.openstreetmap.josm.data.Preferences.PreferencesException;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.ShowModifiers;
@@ -53 +54 @@
          */
         public static Main main;
+
+        public static Projection proj;
 
         /**
@@ -183 +186 @@
                 });
                 setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+                
+                proj = pref.getProjection();
         }
 

src/org/openstreetmap/josm/actions/DownloadAction.java

@@ -58 +58 @@
     private enum DownloadStatus {FINISHED, REDISPLAY}
 
+    /**
+     * minlat, minlon, maxlat, maxlon
+     */
         JTextField[] latlon = new JTextField[]{
                         new JTextField(9),
@@ -68 +71 @@
                 super("Download from OSM", "download", "Download map data from the OSM server.", "Ctrl-Shift-D", 
                                 KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
+                // TODO remove when bug in Java6 is fixed
+                for (JTextField f : latlon)
+                        f.setMinimumSize(new Dimension(100,new JTextField().getMinimumSize().height));
         }
 

src/org/openstreetmap/josm/command/MoveCommand.java

@@ -78 +78 @@
                 for (Node n : objects) {
                         n.eastNorth = new EastNorth(n.eastNorth.east()+x, n.eastNorth.north()+y);
-                        n.coor = Main.pref.getProjection().eastNorth2latlon(n.eastNorth);
+                        n.coor = Main.proj.eastNorth2latlon(n.eastNorth);
                 }
                 this.x += x;
@@ -87 +87 @@
                 for (Node n : objects) {
                         n.eastNorth = new EastNorth(n.eastNorth.east()+x, n.eastNorth.north()+y);
-                        n.coor = Main.pref.getProjection().eastNorth2latlon(n.eastNorth);
+                        n.coor = Main.proj.eastNorth2latlon(n.eastNorth);
                         n.modified = true;
                 }

src/org/openstreetmap/josm/data/Bounds.java

@@ -34 +34 @@
                 max = new LatLon(Projection.MAX_LAT, Projection.MAX_LON);
         }
+        
+        @Override
+        public String toString() {
+                return "Bounds["+min.lat()+","+min.lon()+","+max.lat()+","+max.lon()+"]";
+        }
 }

src/org/openstreetmap/josm/data/osm/Node.java

@@ -19 +19 @@
         public Node(LatLon latlon) {
                 this.coor = latlon;
-                eastNorth = Main.pref.getProjection().latlon2eastNorth(latlon);
+                eastNorth = Main.proj.latlon2eastNorth(latlon);
         }
 

src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -53 +53 @@
                 if (min == null || max == null)
                         return null;
-                return new Bounds(Main.pref.getProjection().eastNorth2latlon(min), Main.pref.getProjection().eastNorth2latlon(max));
+                return new Bounds(Main.proj.eastNorth2latlon(min), Main.proj.eastNorth2latlon(max));
         }
 }

src/org/openstreetmap/josm/data/projection/Mercator.java

@@ -23 +23 @@
         public LatLon eastNorth2latlon(EastNorth p) {
                 return new LatLon(
-                        p.east()*180/Math.PI,
-                        Math.atan(Math.sinh(p.north()))*180/Math.PI);
+                        Math.atan(Math.sinh(p.north()))*180/Math.PI,
+                        p.east()*180/Math.PI);
         }
 

src/org/openstreetmap/josm/gui/BookmarkList.java

@@ -32 +32 @@
         public static class Bookmark {
                 public String name;
-                public double[] latlon = new double[4];
+                public double[] latlon = new double[4]; // minlat, minlon, maxlat, maxlon
                 public boolean rawgps;
                 @Override public String toString() {

src/org/openstreetmap/josm/gui/MapView.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -228 +229 @@
                         if (v.min == null || v.max == null) {
                                 // no bounds means standard scale and center 
-                                center = new EastNorth(51.526447, -0.14746371);
+                                center = Main.proj.latlon2eastNorth(new LatLon(51.526447, -0.14746371));
                                 scale = 10;
                         } else {

src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -248 +248 @@
          */
         protected Projection getProjection() {
-                return Main.pref.getProjection();
+                return Main.proj;
         }
 }

src/org/openstreetmap/josm/gui/PreferenceDialog.java

@@ -90 +90 @@
          * Indicate, that the application has to be restarted for the settings to take effect.
          */
-        boolean requiresRestart = false;
+        private boolean requiresRestart = false;
         /**
          * ComboBox with all look and feels.
@@ -149 +149 @@
                 lafCombo.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
-                                setRequiresRestart();
+                                requiresRestart = true;
                         }});
 
@@ -159 +159 @@
                         }
                 }
+                projectionCombo.addActionListener(new ActionListener(){
+                        public void actionPerformed(ActionEvent e) {
+                                requiresRestart = true;
+                        }
+                });
                 
                 // drawRawGpsLines
@@ -265 +270 @@
                 return p;
         }
-        
-        /**
-         * Remember, that the settings made requires a restart of the application.
-         * Called from various actionListener - classes
-         */
-        protected void setRequiresRestart() {
-                requiresRestart = true;
-        }
 }

src/org/openstreetmap/josm/gui/WorldChooser.java

@@ -69 +69 @@
                         public LatLon eastNorth2latlon(EastNorth p) {
                                 return new LatLon(
-                                                p.east()*360/world.getIconWidth() - 180,
-                                                p.north()*180/world.getIconHeight() - 90);
+                                                p.north()*180/world.getIconHeight() - 90,
+                                                p.east()*360/world.getIconWidth() - 180);
                         }
                         @Override
@@ -77 +77 @@
                         }
                 };
+                setMinimumSize(new Dimension(350, 350/2));
         }
 
@@ -120 +121 @@
         @Override
         public void zoomTo(EastNorth newCenter, double scale) {
-                if (getWidth() != 0 && scale > scaleMax)
+                if (getWidth() != 0 && scale > scaleMax) {
                         scale = scaleMax;
+                        newCenter = center;
+                }
                 super.zoomTo(newCenter, scale);
         }
@@ -202 +205 @@
                         }
                 }
-                markerMin = new EastNorth(v[0], v[1]);
-                markerMax = new EastNorth(v[2], v[3]);
+                markerMin = getProjection().latlon2eastNorth(new LatLon(v[0], v[1]));
+                markerMax = getProjection().latlon2eastNorth(new LatLon(v[2], v[3]));
                 repaint();
         }

src/org/openstreetmap/josm/gui/layer/RawGpsDataLayer.java

@@ -112 +112 @@
                         Collection<EastNorth> eastNorthList = new LinkedList<EastNorth>();
                         for (LatLon ll : c)
-                                eastNorthList.add(Main.pref.getProjection().latlon2eastNorth(ll));
+                                eastNorthList.add(Main.proj.latlon2eastNorth(ll));
                         this.eastNorth.add(eastNorthList);
                 }

src/org/openstreetmap/josm/io/OsmServerReader.java

@@ -101 +101 @@
                 HttpURLConnection con = (HttpURLConnection)url.openConnection();
                 con.setConnectTimeout(20000);
-                System.out.println("response: "+con.getResponseCode());
                 if (con.getResponseCode() == 401 && isCancelled())
                         return null;