Changeset 27066 in osm for applications/editors/josm/plugins/print/src/org

Timestamp:

2011-11-15T23:00:51+01:00 (13 years ago)

Author:

kpastor

Message:

Prints more types of layers correctly now, tested with PicLayer

File:

• applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintableMapView.java (modified) (2 diffs)

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintableMapView.java

@@ -49 +49 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.layer.ImageryLayer;
 
 /**
@@ -162 +161 @@
         List<Layer> visibleLayers = getVisibleLayersInZOrder();
         for (Layer l : visibleLayers) {
-            if (l instanceof ImageryLayer) {
-                try {
-                    /* This statement may have all kinds of unwanted side effects
-                     * but ImageryLayers heavily depend on Main.map.mapView. */
+            try {
+                if (! (l instanceof OsmDataLayer)) {
+                    /* OsmDataLayer does not need this.*/
+                    
+                    /* This manipulations may have all kinds of unwanted side effects
+                     * but many Layer implementations heavily depend on Main.map.mapView. */
                     Main.map.mapView = this;
-                    l.paint(g2d, this, box);
                 }
-                finally {
-                    Main.map.mapView = mapView;
-                }
+                l.paint(g2d, this, box);
             }
-            else {
-                l.paint(g2d, this, box);
+            finally {
+                Main.map.mapView = mapView;
             }
         }