Changeset 1823 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2009-07-22T20:33:41+02:00 (15 years ago)

Author:

stoecker

Message:

some projection and zoom cleanups - projection classes still need better handling of outside-world coordinates

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (4 diffs)

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

@@ -196 +196 @@
      */
     @Override public void paint(final Graphics g, final MapView mv) {
-        boolean active = Main.map.mapView.getActiveLayer() == this;
+        boolean active = mv.getActiveLayer() == this;
         boolean inactive = !active && Main.pref.getBoolean("draw.data.inactive_color", true);
-        boolean virtual = !inactive && Main.map.mapView.isVirtualNodesEnabled();
+        boolean virtual = !inactive && mv.isVirtualNodesEnabled();
 
         // draw the hatched area for non-downloaded region. only draw if we're the active
@@ -204 +204 @@
         if (active && Main.pref.getBoolean("draw.data.downloaded_area", true) && !data.dataSources.isEmpty()) {
             // initialize area with current viewport
-            Rectangle b = Main.map.mapView.getBounds();
+            Rectangle b = mv.getBounds();
             // on some platforms viewport bounds seem to be offset from the left,
             // over-grow it just to be sure
@@ -213 +213 @@
             for (DataSource src : data.dataSources) {
                 if (src.bounds != null && !src.bounds.min.equals(src.bounds.max)) {
-                    EastNorth en1 = Main.proj.latlon2eastNorth(src.bounds.min);
-                    EastNorth en2 = Main.proj.latlon2eastNorth(src.bounds.max);
+                    EastNorth en1 = mv.getProjection().latlon2eastNorth(src.bounds.min);
+                    EastNorth en2 = mv.getProjection().latlon2eastNorth(src.bounds.max);
                     Point p1 = mv.getPoint(en1);
                     Point p2 = mv.getPoint(en2);
@@ -536 +536 @@
     /**
      * replies the set of conflicts currently managed in this layer
-     * 
+     *
      * @return the set of conflicts currently managed in this layer
      */