Changeset 3591 in osm for applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java

Timestamp:

2007-07-15T03:44:47+02:00 (19 years ago)

Author:

ulf

Message:

fix the whole XML handler, so the sequence of the XML tags doesn't matter

optional new feature (experimental): show/hide elements depending on current zoomlevel and scale_max setting in elemstyles.xml. Can be enabled by setting mappaint.zoomLevelDisplay to true (default is false). It's working fine, but is still really experimental, as the scale_max settings in elemstyles.xml currently doesn't make a lot of sense (at least for editing).

File:

• applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java (modified) (6 diffs)

applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java

@@ -30 +30 @@
 public class MapPaintVisitor extends SimplePaintVisitor {
 
+        protected boolean isZoomOk(ElemStyle e) {
+                double circum = Main.map.mapView.getScale()*100*Main.proj.scaleFactor()*40041455; // circumference of the earth in meter
+                
+                /* show everything, if the user wishes so */
+                if(!Main.pref.getBoolean("mappaint.zoomLevelDisplay",false)) {
+                        return true;
+                }
+                        
+                if(e == null) {
+                        /* the default for things that don't have a rule (show, if scale is smaller than 1500m) */
+                        if(circum < 1500) {
+                                return true;
+                        } else {
+                                return false;
+                        }
+                }
+                
+                if(circum>=e.getMinZoom() / 70) {
+                        return false;
+                } else {
+                        return true;
+                }
+        }
+        
         /**
          * Draw a small rectangle.
@@ -39 +63 @@
         @Override public void visit(Node n) {
                 ElemStyle nodeStyle = MapPaintPlugin.elemStyles.getStyle(n);
-                if(nodeStyle!=null && Main.map.mapView.zoom()>=nodeStyle.getMinZoom()){
+                if(nodeStyle!=null){
                         if(nodeStyle instanceof IconElemStyle) {
-                                drawNode(n, ((IconElemStyle)nodeStyle).getIcon());
+                                if(isZoomOk(nodeStyle)) {
+                                        drawNode(n, ((IconElemStyle)nodeStyle).getIcon());
+                                }
                         } else {
                                 // throw some sort of exception
@@ -58 +84 @@
          */
         @Override public void visit(Segment ls) {
+                ElemStyle segmentStyle = MapPaintPlugin.elemStyles.getStyle(ls);
+                if(isZoomOk(segmentStyle)) {
                         drawSegment(ls, getPreferencesColor("untagged",Color.GRAY),Main.pref.getBoolean("draw.segment.direction"));
+                }
         }
 
@@ -75 +104 @@
                 boolean area=false;
                 ElemStyle wayStyle = MapPaintPlugin.elemStyles.getStyle(w);
+                
+                if(!isZoomOk(wayStyle)) {
+                        return;
+                }
+                
                 if(wayStyle!=null)
                 {
@@ -188 +222 @@
                 Point p1 = nc.getPoint(ls.from.eastNorth);
                 Point p2 = nc.getPoint(ls.to.eastNorth);
-
+                
                 // checking if this segment is visible
                 if ((p1.x < 0) && (p2.x < 0)) return ;
@@ -223 +257 @@
          */
         @Override public void drawNode(Node n, Color color) {
-                Point p = nc.getPoint(n.eastNorth);
-                if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
-                g.setColor(color);
-                g.drawRect(p.x-1, p.y-1, 2, 2);
+                if(isZoomOk(null)) {
+                        Point p = nc.getPoint(n.eastNorth);
+                        if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
+                        g.setColor(color);
+                        g.drawRect(p.x-1, p.y-1, 2, 2);
+                }
         }