Changeset 1728 in josm

Timestamp:

Jul 4, 2009 2:04:08 PM (4 years ago)

Author:

stoecker

Message:

fixed #2804 - move mode not working

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/MoveCommand.java (modified) (1 diff)
• command/RotateCommand.java (modified) (1 diff)
• data/coor/CachedLatLon.java (modified) (1 diff)
• data/coor/LatLon.java (modified) (1 diff)
• data/osm/visitor/MapPaintVisitor.java (modified) (2 diffs)
• gui/NavigatableComponent.java (modified) (1 diff)

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

@@ -69 +69 @@
         for (Node n : this.objects) {
             OldState os = new OldState();
-            os.latlon = n.getCoor();
+            os.latlon = new LatLon(n.getCoor());
             os.modified = n.modified;
             oldState.add(os);

trunk/src/org/openstreetmap/josm/command/RotateCommand.java

@@ -75 +75 @@
         for (Node n : this.objects) {
             OldState os = new OldState();
-            os.latlon = n.getCoor();
+            os.latlon = new LatLon(n.getCoor());
             os.eastNorth = n.getEastNorth();
             os.modified = n.modified;

trunk/src/org/openstreetmap/josm/data/coor/CachedLatLon.java

@@ -25 +25 @@
     public final void setEastNorth(EastNorth eastNorth) {
         proj = Main.proj;
-        eastNorth = eastNorth;
+        this.eastNorth = eastNorth;
         LatLon l = proj.eastNorth2latlon(eastNorth);
-        setLocation(l.lat(), l.lon());
+        setLocation(l.lon(), l.lat());
     }
 

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -47 +47 @@
     public LatLon(double lat, double lon) {
         super(lon, lat);
+    }
+
+    public LatLon(LatLon coor) {
+        super(coor.lon(), coor.lat());
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -85 +85 @@
             return (circum < 1500);
 
-        /* formula to calculate a map scale: natural size / map size = scale
-           example: 876000mm (876m as displayed) / 22mm (roughly estimated screen size of legend bar) = 39818
-
-           so the exact "correcting value" below depends only on the screen size and resolution
-           XXX - do we need a Preference setting for this (if things vary widely)? */
-        return !(circum >= e.maxScale / 22 || circum < e.minScale / 22);
+        return !(circum >= e.maxScale || circum < e.minScale);
     }
 
@@ -1274 +1269 @@
         useRealWidth = Main.pref.getBoolean("mappaint.useRealWidth",false);
         zoomLevelDisplay = Main.pref.getBoolean("mappaint.zoomLevelDisplay",false);
-        circum = Main.map.mapView.getMapScale();
+        circum = Main.map.mapView.getDist100Pixel();
         styles = MapPaintStyles.getStyles().getStyleSet();
         drawMultipolygon = Main.pref.getBoolean("mappaint.multipolygon",true);

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

@@ -70 +70 @@
         id.update(x.getBytes());
         return new Long(id.getValue()).intValue();
-    }
-
-    public double getMapScale() {
-        /* TODO: we assume a pixel is 0.025mm */
-        return getDist100Pixel()/(0.00025*100);
     }