Changeset 41 in josm for src/org/openstreetmap

Timestamp:

2006-01-19T08:22:18+01:00 (19 years ago)

Author:

imi

Message:

• renamed EPSG projection
• started WorldChooser in download menu (not finished)

Location:

src/org/openstreetmap/josm

Files:

• actions/DownloadAction.java (modified) (4 diffs)
• data/GeoPoint.java (modified) (1 diff)
• data/Preferences.java (modified) (1 diff)
• data/osm/visitor/SimplePaintVisitor.java (modified) (5 diffs)
• data/projection/Projection.java (modified) (1 diff)
• gui/BookmarkList.java (modified) (1 diff)
• gui/ImageProvider.java (modified) (3 diffs)
• gui/MapMover.java (modified) (6 diffs)
• gui/MapView.java (modified) (9 diffs)
• gui/NavigatableComponent.java (added)
• gui/WorldChooser.java (added)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)
• io/OsmServerReader.java (modified) (1 diff)
• io/OsmServerWriter.java (modified) (1 diff)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.actions;
 
+import java.awt.Dimension;
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
@@ -30 +31 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.WorldChooser;
 import org.openstreetmap.josm.gui.BookmarkList.Bookmark;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -60 +62 @@
         public void actionPerformed(ActionEvent e) {
                 JPanel dlg = new JPanel(new GridBagLayout());
+                
+                WorldChooser wc = new WorldChooser();
+                dlg.add(wc, GBC.eop());
+
                 dlg.add(new JLabel("Bounding box"), GBC.eol());
-
                 dlg.add(new JLabel("min lat"), GBC.std().insets(10,0,5,0));
                 dlg.add(latlon[0], GBC.std());
@@ -139 +144 @@
                 dlg.add(buttons, GBC.eop().fill(GBC.HORIZONTAL));
                 
+                Dimension d = dlg.getPreferredSize();
+                wc.setPreferredSize(new Dimension(d.width, d.width/2));
+                
                 int r = JOptionPane.showConfirmDialog(Main.main, dlg, "Choose an area", 
                                 JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);

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

@@ -35 +35 @@
                 this.lat = lat;
                 this.lon = lon;
+        }
+
+        /**
+         * Construct the point with all values available.
+         */
+        public GeoPoint(double lat, double lon, double x, double y) {
+                this.lat = lat;
+                this.lon = lon;
+                this.x = x;
+                this.y = y;
         }
 

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

@@ -55 +55 @@
          * Base URL to the osm data server
          */
-        public String osmDataServer = "http://www.openstreetmap.org/api/0.1";
+        public String osmDataServer = "http://www.openstreetmap.org/api/0.2";
         /**
          * The username to the osm server

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

@@ -9 +9 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Track;
-import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.NavigatableComponent;
 
 /**
@@ -29 +29 @@
          * MapView to get screen coordinates.
          */
-        private final MapView mv;
+        private final NavigatableComponent nc;
         
         /**
@@ -36 +36 @@
          * @param mv  The view to get screen coordinates from.
          */
-        public SimplePaintVisitor(Graphics g, MapView mv) {
+        public SimplePaintVisitor(Graphics g, NavigatableComponent mv) {
                 this.g = g;
-                this.mv = mv;
+                this.nc = mv;
         }
         
@@ -83 +83 @@
          */
         private void drawNode(Node n, Color color) {
-                Point p = mv.getScreenPoint(n.coor);
+                Point p = nc.getScreenPoint(n.coor);
                 g.setColor(color);
                 g.drawRect(p.x-1, p.y-1, 2, 2);
@@ -95 +95 @@
                         col = Color.WHITE;
                 g.setColor(col);
-                Point p1 = mv.getScreenPoint(ls.start.coor);
-                Point p2 = mv.getScreenPoint(ls.end.coor);
+                Point p1 = nc.getScreenPoint(ls.start.coor);
+                Point p2 = nc.getScreenPoint(ls.end.coor);
                 g.drawLine(p1.x, p1.y, p2.x, p2.y);
         }

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

@@ -19 +19 @@
 abstract public class Projection implements Cloneable {
 
-        public static double MAX_LAT = 85; // yep - JOSM cannot cartograph the poles.
-        public static double MAX_LON = 179.99999;
+        public static double MAX_LAT = 85;
+        public static double MAX_LON = 180;
 
         /**

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

@@ -44 +44 @@
                 setModel(new DefaultListModel());
                 load();
-                setVisibleRowCount(10);
+                setVisibleRowCount(7);
                 setCellRenderer(new DefaultListCellRenderer(){
                         @Override

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

@@ -30 +30 @@
          * The icon cache
          */
-        private static Map<URL, Icon> cache = new HashMap<URL, Icon>();
+        private static Map<URL, ImageIcon> cache = new HashMap<URL, ImageIcon>();
         
         /**
@@ -39 +39 @@
          * @return      The requested ImageIcon.
          */
-        public static Icon get(String subdir, String name) {
+        public static ImageIcon get(String subdir, String name) {
                 if (subdir != "")
                         subdir += "/";
                 URL path = Main.class.getResource("/images/"+subdir+name+".png");
-                Icon icon = cache.get(path);
+                ImageIcon icon = cache.get(path);
                 if (icon == null) {
-                        icon = new ImageIcon(Main.class.getResource("/images/"+subdir+name+".png"));
+                        icon = new ImageIcon(path);
                         cache.put(path, icon);
                 }
@@ -54 +54 @@
          * Shortcut for get("", name);
          */
-        public static Icon get(String name) {
+        public static ImageIcon get(String name) {
                 return get("", name);
         }

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

@@ -26 +26 @@
          * The map to move around.
          */
-        private final MapView mv;
+        private final NavigatableComponent nc;
         /**
          * The old cursor when we changed it to movement cursor.
@@ -36 +36 @@
          * @param mapView The map that should be moved.
          */
-        public MapMover(MapView mapView) {
-                this.mv = mapView;
-                mv.addMouseListener(this);
-                mv.addMouseMotionListener(this);
-                mv.addMouseWheelListener(this);
+        public MapMover(NavigatableComponent mapView) {
+                this.nc = mapView;
+                nc.addMouseListener(this);
+                nc.addMouseMotionListener(this);
+                nc.addMouseWheelListener(this);
         }
         
@@ -51 +51 @@
                         if (mousePosMove == null)
                                 startMovement(e);
-                        GeoPoint center = mv.getCenter();
-                        GeoPoint mouseCenter = mv.getPoint(e.getX(), e.getY(), false);
+                        GeoPoint center = nc.getCenter();
+                        GeoPoint mouseCenter = nc.getPoint(e.getX(), e.getY(), false);
                         GeoPoint p = new GeoPoint();
                         p.x = mousePosMove.x + center.x - mouseCenter.x;  
                         p.y = mousePosMove.y + center.y - mouseCenter.y;
-                        mv.zoomTo(p, mv.getScale());
+                        nc.zoomTo(p, nc.getScale());
                 } else
                         endMovement();
@@ -86 +86 @@
          */
         private void startMovement(MouseEvent e) {
-                mousePosMove = mv.getPoint(e.getX(), e.getY(), false);
-                oldCursor = mv.getCursor();
-                mv.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+                mousePosMove = nc.getPoint(e.getX(), e.getY(), false);
+                oldCursor = nc.getCursor();
+                nc.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
         }
         
@@ -96 +96 @@
         private void endMovement() {
                 if (oldCursor != null)
-                        mv.setCursor(oldCursor);
+                        nc.setCursor(oldCursor);
                 else
-                        mv.setCursor(Cursor.getDefaultCursor());
+                        nc.setCursor(Cursor.getDefaultCursor());
                 mousePosMove = null;
                 oldCursor = null;
@@ -109 +109 @@
         public void mouseWheelMoved(MouseWheelEvent e) {
                 double zoom = Math.max(0.1, 1 + e.getWheelRotation()/5.0);
-                mv.zoomTo(mv.getCenter(), mv.getScale()*zoom);
+                nc.zoomTo(nc.getCenter(), nc.getScale()*zoom);
         }
 

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

@@ -14 +14 @@
 import java.util.LinkedList;
 
-import javax.swing.JComponent;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -43 +42 @@
  * @author imi
  */
-public class MapView extends JComponent implements ChangeListener, PropertyChangeListener {
+public class MapView extends NavigatableComponent implements ChangeListener, PropertyChangeListener  {
 
         /**
@@ -59 +58 @@
          */
         boolean autoScale = true;
-
-        /**
-         * The scale factor in meter per pixel.
-         */
-        private double scale;
-        /**
-         * Center n/e coordinate of the desired screen center.
-         */
-        private GeoPoint center;
 
         /**
@@ -169 +159 @@
                 else
                         layers.add(pos, layer);
-        }
-
-        /**
-         * Get geographic coordinates from a specific pixel coordination
-         * on the screen.
-         * 
-         * If you don't need it, provide false at third parameter to speed
-         * up the calculation.
-         *  
-         * @param x X-Pixelposition to get coordinate from
-         * @param y Y-Pixelposition to get coordinate from
-         * @param latlon If set, the return value will also have the 
-         *                               latitude/longitude filled.
-         * 
-         * @return The geographic coordinate, filled with x/y (northing/easting)
-         *              settings and, if requested with latitude/longitude.
-         */
-        public GeoPoint getPoint(int x, int y, boolean latlon) {
-                GeoPoint p = new GeoPoint();
-                p.x = (x - getWidth()/2.0)*scale + center.x;
-                p.y = (getHeight()/2.0 - y)*scale + center.y;
-                if (latlon)
-                        Main.pref.getProjection().xy2latlon(p);
-                return p;
-        }
-        
-        /**
-         * Return the point on the screen where this GeoPoint would be.
-         * @param point The point, where this geopoint would be drawn.
-         * @return The point on screen where "point" would be drawn, relative
-         *              to the own top/left.
-         */
-        public Point getScreenPoint(GeoPoint point) {
-                GeoPoint p;
-                if (!Double.isNaN(point.x) && !Double.isNaN(point.y))
-                        p = point;
-                else {
-                        if (Double.isNaN(point.lat) || Double.isNaN(point.lon))
-                                throw new IllegalArgumentException("point: Either lat/lon or x/y must be set.");
-                        p = point.clone();
-                        Main.pref.getProjection().latlon2xy(p);
-                }
-                int x = ((int)Math.round((p.x-center.x) / scale + getWidth()/2));
-                int y = ((int)Math.round((center.y-p.y) / scale + getHeight()/2));
-                return new Point(x,y);
         }
 
@@ -358 +303 @@
         
         /**
-         * Zoom to the given coordinate.
-         * @param centerX The center x-value (easting) to zoom to.
-         * @param centerY The center y-value (northing) to zoom to.
-         * @param scale The scale to use.
-         */
-        public void zoomTo(GeoPoint newCenter, double scale) {
-                boolean oldAutoScale = autoScale;
-                GeoPoint oldCenter = center;
-                double oldScale = this.scale;
-                
-                autoScale = false;
-                center = newCenter.clone();
-                Main.pref.getProjection().xy2latlon(center);
-                this.scale = scale;
-                recalculateCenterScale();
-
-                firePropertyChange("center", oldCenter, center);
-                if (oldAutoScale != autoScale)
-                        firePropertyChange("autoScale", oldAutoScale, autoScale);
-                if (oldScale != scale)
-                        firePropertyChange("scale", oldScale, scale);
-        }
-
-        /**
          * Draw the component.
          */
@@ -394 +315 @@
                                 l.paint(g, this);
                 }
-                
+
                 // draw world borders
-                g.setColor(Color.DARK_GRAY);
+                g.setColor(Color.WHITE);
                 Bounds b = new Bounds();
                 Point min = getScreenPoint(b.min);
@@ -404 +325 @@
                 int x2 = Math.max(min.x, max.x);
                 int y2 = Math.max(min.y, max.y);
-                g.drawRect(x1, y1, x2-x1+1, y2-y1+1);
-        }
-
-        /**
-         * Notify from the projection, that something has changed.
-         * @param e
-         */
-        public void stateChanged(ChangeEvent e) {
-                // reset all datasets.
-                Projection p = Main.pref.getProjection();
-                for (Node n : Main.main.ds.nodes)
-                        p.latlon2xy(n.coor);
-                recalculateCenterScale();
-        }
-
-        /**
-         * Return the current scale value.
-         * @return The scale value currently used in display
-         */
-        public double getScale() {
-                return scale;
+                if (x1 > 0 || y1 > 0 || x2 < getWidth() || y2 < getHeight())
+                        g.drawRect(x1, y1, x2-x1+1, y2-y1+1);
         }
 
@@ -444 +346 @@
                 }
         }
-        /**
-         * @return Returns the center point. A copy is returned, so users cannot
-         *              change the center by accessing the return value. Use zoomTo instead.
-         */
-        public GeoPoint getCenter() {
-                return center.clone();
-        }
-
-        
-        /**
-         * Change to the new projection. Recalculate the dataset and zoom, if autoZoom
-         * is active.
-         * @param oldProjection The old projection. Unregister from this.
-         * @param newProjection The new projection. Register as state change listener.
-         */
-        public void propertyChange(PropertyChangeEvent evt) {
-                if (!evt.getPropertyName().equals("projection"))
-                        return;
-                if (evt.getOldValue() != null)
-                        ((Projection)evt.getOldValue()).removeChangeListener(this);
-                if (evt.getNewValue() != null) {
-                        Projection p = (Projection)evt.getNewValue();
-                        p.addChangeListener(this);
-
-                        stateChanged(new ChangeEvent(this));
-                }
-        }
-        
         /**
          * Set the new dimension to the projection class. Also adjust the components 
@@ -581 +455 @@
                 return editLayer;
         }
+
+        /**
+         * In addition to the base class funcitonality, this keep trak of the autoscale
+         * feature.
+         */
+        @Override
+        public void zoomTo(GeoPoint newCenter, double scale) {
+                boolean oldAutoScale = autoScale;
+                GeoPoint oldCenter = center;
+                double oldScale = this.scale;
+                autoScale = false;
+
+                super.zoomTo(newCenter, scale);
+                
+                recalculateCenterScale();
+                
+                firePropertyChange("center", oldCenter, center);
+                if (oldAutoScale != autoScale)
+                        firePropertyChange("autoScale", oldAutoScale, autoScale);
+                if (oldScale != scale)
+                        firePropertyChange("scale", oldScale, scale);
+        }
+
+        /**
+         * Notify from the projection, that something has changed.
+         */
+        public void stateChanged(ChangeEvent e) {
+                // reset all datasets.
+                Projection p = Main.pref.getProjection();
+                for (Node n : Main.main.ds.nodes)
+                        p.latlon2xy(n.coor);
+                recalculateCenterScale();
+        }
+
+        /**
+         * Change to the new projection. Recalculate the dataset and zoom, if autoZoom
+         * is active.
+         * @param oldProjection The old projection. Unregister from this.
+         * @param newProjection The new projection. Register as state change listener.
+         */
+        public void propertyChange(PropertyChangeEvent evt) {
+                if (!evt.getPropertyName().equals("projection"))
+                        return;
+                if (evt.getOldValue() != null)
+                        ((Projection)evt.getOldValue()).removeChangeListener(this);
+                if (evt.getNewValue() != null) {
+                        Projection p = (Projection)evt.getNewValue();
+                        p.addChangeListener(this);
+        
+                        stateChanged(new ChangeEvent(this));
+                }
+        }
 }

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

@@ -2 +2 @@
 
 import java.awt.Graphics;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.util.Collection;
 import java.util.Iterator;
@@ -54 +56 @@
                 super(name);
                 this.data = data;
+                Main.pref.addPropertyChangeListener(new PropertyChangeListener() {
+                        public void propertyChange(PropertyChangeEvent evt) {
+                                if (evt.getPropertyName().equals("projection"))
+                                        for (Node n : OsmDataLayer.this.data.nodes)
+                                                ((Projection)evt.getNewValue()).latlon2xy(n.coor);
+                        }
+                });
         }
 

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

@@ -78 +78 @@
          */
         public DataSet parseOsm() throws JDOMException, IOException {
-                long start = System.currentTimeMillis();
                 Reader r = getReader(Main.pref.osmDataServer+"/map?bbox="+lon1+","+lat1+","+lon2+","+lat2);
-                System.out.println(System.currentTimeMillis() - start);
                 if (r == null)
                         return null;

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

@@ -123 +123 @@
                                 Document doc = new Document(root);
                                 xmlOut.output(doc, out);
-                                xmlOut.output(doc, System.out);
                                 out.close();
                         }