Changeset 65 in josm for src

Timestamp:

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

Author:

imi

Message:

• Zoom via scroll wheel now to cursor, not to center of screen (thanks Ben K.)
• fixed silly broken gpx download. Raw Gps data should work now.

Location:

src/org/openstreetmap/josm

Files:

• gui/MapMover.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (2 diffs)
• io/OsmReader.java (modified) (1 diff)
• io/OsmServerReader.java (modified) (1 diff)

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

@@ -109 +109 @@
         public void mouseWheelMoved(MouseWheelEvent e) {
                 double zoom = Math.max(0.1, 1 + e.getWheelRotation()/5.0);
-                nc.zoomTo(nc.getCenter(), nc.getScale()*zoom);
+                double zoomfactor = (zoom -1)/2+1;
+                int newHalfWidth = (int) (nc.getWidth()*zoomfactor - nc.getWidth()/2);
+                int centerx = e.getX() - (e.getX()-nc.getWidth()/2)*newHalfWidth*2/nc.getWidth();
+                int newHalfHeight = (int) (nc.getHeight()*zoomfactor - nc.getHeight()/2);
+                int centery = e.getY() - (e.getY()-nc.getHeight()/2)*newHalfHeight*2/nc.getHeight();
+                GeoPoint newCenter = nc.getPoint(centerx, centery, false); 
+                nc.zoomTo(newCenter, nc.getScale()*zoom);
         }
 

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

@@ -149 +149 @@
                         return minPrimitive;
                 
-                // for whole waies, try the waies first
+                // for whole ways, try the ways first
                 minDistanceSq = Double.MAX_VALUE;
                 if (!lsInsteadWay) {
-                        for (Way t : Main.main.ds.waies) {
-                                if (t.isDeleted())
+                        for (Way w : Main.main.ds.waies) {
+                                if (w.isDeleted())
                                         continue;
-                                for (LineSegment ls : t.segments) {
+                                for (LineSegment ls : w.segments) {
                                         if (ls.isDeleted())
                                                 continue;
@@ -166 +166 @@
                                         if (perDist < 100 && minDistanceSq > perDist && a < c+100 && b < c+100) {
                                                 minDistanceSq = perDist;
-                                                minPrimitive = t;
+                                                minPrimitive = w;
                                         }
                                 }                       

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

@@ -96 +96 @@
                                         LineSegment ls = lineSegments.get(getLong(atts, "id"));
                                         if (ls == null)
-                                                fatalError(new SAXParseException("Line segment "+getLong(atts, "id")+"has not been transfered before.", null));
+                                                fatalError(new SAXParseException("Line segment "+getLong(atts, "id")+" has not been transfered before.", null));
                                         ((Way)current).segments.add(ls);
                                 }

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

@@ -48 +48 @@
          */
         public Collection<Collection<GeoPoint>> parseRawGps() throws IOException, JDOMException {
-                String url = Main.pref.osmDataServer+"/0.3/waypoints?bbox="+lon1+","+lat1+","+lon2+","+lat2+"&page=";
+                String url = Main.pref.osmDataServer+"/0.3/trackpoints?bbox="+lon1+","+lat1+","+lon2+","+lat2+"&page=";
                 Collection<Collection<GeoPoint>> data = new LinkedList<Collection<GeoPoint>>();
                 Collection<GeoPoint> list = new LinkedList<GeoPoint>();