Changeset 36 in josm for src

Timestamp:

2005-12-29T02:06:38+01:00 (18 years ago)

Author:

imi

Message:

added Mercator projection

Location:

src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (2 diffs)
• data/osm/LineSegment.java (modified) (2 diffs)
• data/projection/Mercator.java (added)
• gui/MapStatus.java (modified) (5 diffs)
• gui/MapView.java (modified) (3 diffs)
• gui/dialogs/PropertiesDialog.java (modified) (3 diffs)

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

@@ -19 +19 @@
 import org.jdom.output.XMLOutputter;
 import org.openstreetmap.josm.data.projection.LatitudeLongitude;
+import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.UTM;
@@ -69 +70 @@
          */
         public static final Projection[] allProjections = new Projection[]{
+                new Mercator(),
                 new UTM(),
                 new LatitudeLongitude()

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

@@ -1 +1 @@
 package org.openstreetmap.josm.data.osm;
 
+import org.openstreetmap.josm.data.GeoPoint;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
 
@@ -35 +36 @@
                 visitor.visit(this);
         }
+        
+        /**
+         * @return <code>true</code>, if the <code>ls</code> occupy
+         * exactly the same place as <code>this</code>.
+         */
+        public boolean equalPlace(LineSegment ls) {
+                if (equals(ls))
+                        return true;
+                GeoPoint s1 = start.coor;
+                GeoPoint s2 = ls.start.coor;
+                GeoPoint e1 = end.coor;
+                GeoPoint e2 = ls.end.coor;
+                return ((s1.equalsLatLon(s2) && e1.equalsLatLon(e2)) ||
+                                (s1.equalsLatLon(e2) && e1.equalsLatLon(s2)));
+        }
 }       

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

@@ -2 +2 @@
 
 import java.awt.AWTEvent;
+import java.awt.Font;
+import java.awt.GridBagLayout;
 import java.awt.Point;
 import java.awt.Toolkit;
@@ -10 +12 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.Collection;
 import java.util.Map.Entry;
 
@@ -63 +66 @@
                  * The last object displayed in status line.
                  */
-                OsmPrimitive osmStatus;
-                /**
-                 * A visitor to retrieve name information about the osm primitive
-                 */
-                private SelectionComponentVisitor visitor = new SelectionComponentVisitor();
+                Collection<OsmPrimitive> osmStatus;
                 /**
                  * The old modifiers, that was pressed the last time this collector ran.
@@ -96 +95 @@
                                 if ((ms.modifiers & MouseEvent.CTRL_DOWN_MASK) != 0 || ms.mousePos == null)
                                         continue; // freeze display when holding down ctrl
-                                OsmPrimitive osm = mv.getNearest(ms.mousePos, (ms.modifiers & MouseEvent.ALT_DOWN_MASK) != 0);
-                                if (osm == osmStatus && ms.modifiers == oldModifiers)
+                                Collection<OsmPrimitive> osms = mv.getAllNearest(ms.mousePos);
+                                
+                                if (osms == null && osmStatus == null && ms.modifiers == oldModifiers)
                                         continue;
-                                osmStatus = osm;
+                                if (osms != null && osms.equals(osmStatus) && ms.modifiers == oldModifiers)
+                                        continue;
+
+                                osmStatus = osms;
                                 oldModifiers = ms.modifiers;
-                                if (osm != null) {
-                                        osm.visit(visitor);
+                                
+                                // Set the text label in the bottom status bar
+                                OsmPrimitive osmNearest = mv.getNearest(ms.mousePos, (ms.modifiers & MouseEvent.ALT_DOWN_MASK) != 0);
+                                if (osmNearest != null) {
+                                        SelectionComponentVisitor visitor = new SelectionComponentVisitor();
+                                        osmNearest.visit(visitor);
                                         nameText.setText(visitor.name);
                                 } else
@@ -108 +115 @@
                                 
                                 // Popup Information
-                                if ((ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0 && osm != null) {
+                                if ((ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0 && osms != null) {
                                         if (popup != null)
                                                 popup.hide();
                                         
-                                        StringBuilder text = new StringBuilder("<html>");
-                                        text.append(visitor.name);
-                                        if (osm.keys != null) {
-                                                for (Entry<Key, String> e : osm.keys.entrySet()) {
-                                                        text.append("<br>");
-                                                        text.append(e.getKey().name);
-                                                        text.append("=");
-                                                        text.append(e.getValue());
-                                                }
+                                        JPanel c = new JPanel(new GridBagLayout());
+                                        for (OsmPrimitive osm : osms) {
+                                                SelectionComponentVisitor visitor = new SelectionComponentVisitor();
+                                                osm.visit(visitor);
+                                                StringBuilder text = new StringBuilder("<html>");
+                                                if (osm.id == 0 || osm.modified || osm.modifiedProperties)
+                                                        visitor.name = "<i><b>"+visitor.name+"*</b></i>";
+                                                text.append(visitor.name);
+                                                if (osm.id != 0)
+                                                        text.append("<br>id="+osm.id);
+                                                if (osm.keys != null)
+                                                        for (Entry<Key, String> e : osm.keys.entrySet())
+                                                                text.append("<br>"+e.getKey().name+"="+e.getValue());
+                                                JLabel l = new JLabel(text.toString()+"</html>", visitor.icon, JLabel.HORIZONTAL);
+                                                l.setFont(l.getFont().deriveFont(Font.PLAIN));
+                                                l.setVerticalTextPosition(JLabel.TOP);
+                                                c.add(l, GBC.eol());
                                         }
-                                        JLabel l = new JLabel(text.toString(), visitor.icon, JLabel.HORIZONTAL);
-                                        l.setVerticalTextPosition(JLabel.TOP);
                                         
                                         Point p = mv.getLocationOnScreen();
-                                        popup = PopupFactory.getSharedInstance().getPopup(mv, l, p.x+ms.mousePos.x+16, p.y+ms.mousePos.y+16);
+                                        popup = PopupFactory.getSharedInstance().getPopup(mv, c, p.x+ms.mousePos.x+16, p.y+ms.mousePos.y+16);
                                         popup.show();
                                 } else if (popup != null) {

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

@@ -11 +11 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedList;
 
@@ -137 +138 @@
                 // autoselect the new layer
                 setActiveLayer(layer);
+                recalculateCenterScale();
         }
 
@@ -292 +294 @@
         }
 
+        /**
+         * @return A list of all objects that are nearest to 
+         * the mouse. To do this, first the nearest object is 
+         * determined.
+         * 
+         * If its a node, return all line segments and
+         * streets the node is part of, as well as all nodes
+         * (with their line segments and tracks) with the same
+         * location.
+         * 
+         * If its a line segment, return all tracks this segment 
+         * belongs to as well as all line segments that are between
+         * the same nodes (in both direction) with all their tracks.
+         * 
+         * @return A collection of all items or <code>null</code>
+         *              if no item under or near the point. The returned
+         *              list is never empty.
+         */
+        public Collection<OsmPrimitive> getAllNearest(Point p) {
+                OsmPrimitive osm = getNearest(p, false);
+                if (osm == null)
+                        return null;
+                Collection<OsmPrimitive> c = new HashSet<OsmPrimitive>();
+                c.add(osm);
+                if (osm instanceof Node) {
+                        Node node = (Node)osm;
+                        for (Node n : Main.main.ds.nodes)
+                                if (n.coor.equalsLatLon(node.coor))
+                                        c.add(n);
+                        for (LineSegment ls : Main.main.ds.lineSegments)
+                                // line segments never match nodes, so they are skipped by contains
+                                if (c.contains(ls.start) || c.contains(ls.end))
+                                        c.add(ls);
+                } 
+                if (osm instanceof LineSegment) {
+                        LineSegment line = (LineSegment)osm;
+                        for (LineSegment ls : Main.main.ds.lineSegments)
+                                if (ls.equalPlace(line))
+                                        c.add(ls);
+                }
+                if (osm instanceof Node || osm instanceof LineSegment) {
+                        for (Track t : Main.main.ds.tracks) {
+                                for (LineSegment ls : t.segments) {
+                                        if (c.contains(ls)) {
+                                                c.add(t);
+                                                break;
+                                        }
+                                }
+                        }
+                }
+                return c;
+        }
         
         /**

src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -96 +96 @@
 
                 final JOptionPane optionPane = new JOptionPane(p, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
-                final JDialog dlg = optionPane.createDialog(PropertiesDialog.this, "Change values?");
+                final JDialog dlg = optionPane.createDialog(Main.main, "Change values?");
                 dlg.addWindowFocusListener(new WindowFocusListener(){
                         public void windowGainedFocus(WindowEvent e) {
@@ -162 +162 @@
                 JTextField values = new JTextField();
                 p2.add(values, BorderLayout.CENTER);
-                int answer = JOptionPane.showConfirmDialog(PropertiesDialog.this, p, 
+                int answer = JOptionPane.showConfirmDialog(Main.main, p, 
                                 "Change values?", JOptionPane.OK_CANCEL_OPTION); 
                 if (answer != JOptionPane.OK_OPTION)
@@ -251 +251 @@
                                 else if (e.getActionCommand().equals("Edit")) {
                                         if (sel == -1)
-                                                JOptionPane.showMessageDialog(PropertiesDialog.this, "Please select the row to edit.");
+                                                JOptionPane.showMessageDialog(Main.main, "Please select the row to edit.");
                                         else
                                                 edit(sel);
                                 } else if (e.getActionCommand().equals("Delete")) {
                                         if (sel == -1)
-                                                JOptionPane.showMessageDialog(PropertiesDialog.this, "Please select the row to delete.");
+                                                JOptionPane.showMessageDialog(Main.main, "Please select the row to delete.");
                                         else
                                                 delete(sel);