Changeset 885 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2008-08-28T22:07:04+02:00 (16 years ago)

Author:

stoecker

Message:

added multi-style mappaint support. Closes #1186

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) (9 diffs)

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

@@ -48 +48 @@
 
         protected boolean isZoomOk(ElemStyle e) {
+                if (!zoomLevelDisplay) /* show everything if the user wishes so */
+                        return true;
+
                 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 (!zoomLevelDisplay) {
-                        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;
-                        return false;
-                }
+                if(e == null) /* the default for things that don't have a rule (show, if scale is smaller than 1500m) */
+                        return (circum < 1500);
 
                 // formula to calculate a map scale: natural size / map size = scale
@@ -67 +61 @@
                 // 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)?
-                /*System.out.println(
-                "Circum: " + circum +
-                " max: " + e.getMaxScale() + "(" + e.getMaxScale()/22 + ")" +
-                " min:" + e.getMinScale() + "(" + e.getMinScale()/22 + ")");*/
-                if(circum>=e.getMaxScale() / 22 || circum<e.getMinScale() / 22)
-                        return false;
-                return true;
+                return !(circum >= e.maxScale / 22 || circum < e.minScale / 22);
         }
 
@@ -83 +71 @@
          */
         public void visit(Node n) {
-                ElemStyle nodeStyle = MapPaintStyles.getStyle(n);
-                if (nodeStyle!=null) {
-                        if (nodeStyle instanceof IconElemStyle) {
-                                if (isZoomOk(nodeStyle)) {
-                                        drawNode(n, ((IconElemStyle)nodeStyle).getIcon(), ((IconElemStyle)nodeStyle).doAnnotate());
-                                }
-                        } else {
-                                // throw some sort of exception
-                        }
-                } else {
+                IconElemStyle nodeStyle = MapPaintStyles.getStyles().get(n);
+                if (nodeStyle != null && isZoomOk(nodeStyle))
+                        drawNode(n, nodeStyle.icon, nodeStyle.annotate);
+                else {
                         if (n.selected)
                                 drawNode(n, selectedColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
@@ -113 +95 @@
                  && (!showRelevantDirectionsOnly || w.hasDirectionKeys)));
 
-                Color colour = untaggedColor;
-                Color areacolour = untaggedColor;
+                Color color = untaggedColor;
+                Color areacolor = untaggedColor;
                 int width = defaultSegmentWidth;
                 int realWidth = 0; //the real width of the element in meters
                 boolean dashed = false;
                 boolean area = false;
-                ElemStyle wayStyle = MapPaintStyles.getStyle(w);
-
-                if(!isZoomOk(wayStyle)) {
+                ElemStyle wayStyle = MapPaintStyles.getStyles().get(w);
+
+                if(!isZoomOk(wayStyle))
                         return;
-                }
-
+
+                LineElemStyle l = null;
                 if(wayStyle!=null)
                 {
-                        LineElemStyle l = null;
                         if(wayStyle instanceof LineElemStyle)
-                        {
                                 l = (LineElemStyle)wayStyle;
-                        }
                         else if (wayStyle instanceof AreaElemStyle)
                         {
-                                areacolour = ((AreaElemStyle)wayStyle).colour;
-                                colour = areacolour;
+                                areacolor = ((AreaElemStyle)wayStyle).color;
+                                color = areacolor;
                                 l = ((AreaElemStyle)wayStyle).line;
                                 area = true;
@@ -141 +120 @@
                         if(l != null)
                         {
-                                colour = l.colour;
+                                color = l.color;
                                 width = l.width;
                                 realWidth = l.realWidth;
@@ -149 +128 @@
 
                 if (area && fillAreas)
-                        drawWayAsArea(w, areacolour);
-                int orderNumber = 0;
-
-                Node lastN = null;
-                for (Node n : w.nodes) {
-                        if (lastN == null) {
+                        drawWayAsArea(w, areacolor);
+                if (realWidth > 0 && useRealWidth && !showDirection)
+                {
+                        int tmpWidth = (int) (100 /  (float) (circum / realWidth));
+                        if (tmpWidth > width) width = tmpWidth;
+                }
+
+                Node lastN;
+                if(l != null && l.overlays != null)
+                {
+                        for(LineElemStyle s : l.overlays)
+                        {
+                                if(!s.over)
+                                {
+                                        lastN = null;
+                                        for(Node n : w.nodes)
+                                        {
+                                                if(lastN != null)
+                                                        drawSeg(lastN, n, s.color != null ? s.color : color, false, s.getWidth(width), s.dashed);
+                                                lastN = n;
+                                        }
+                                }
+                        }
+                }
+
+                lastN = null;
+                for(Node n : w.nodes)
+                {
+                        if(lastN != null)
+                                drawSeg(lastN, n, w.selected ? selectedColor : color, showDirection, width, dashed);
+                        lastN = n;
+                }
+
+                if(l != null && l.overlays != null)
+                {
+                        for(LineElemStyle s : l.overlays)
+                        {
+                                if(s.over)
+                                {
+                                        lastN = null;
+                                        for(Node n : w.nodes)
+                                        {
+                                                if(lastN != null)
+                                                        drawSeg(lastN, n, s.color != null ? s.color : color, false, s.getWidth(width), s.dashed);
+                                                lastN = n;
+                                        }
+                                }
+                        }
+                }
+
+                if(showOrderNumber)
+                {
+                        int orderNumber = 0;
+                        lastN = null;
+                        for(Node n : w.nodes)
+                        {
+                                if(lastN != null)
+                                {
+                                        orderNumber++;
+                                        drawOrderNumber(lastN, n, orderNumber);
+                                }
                                 lastN = n;
-                                continue;
-                        }
-                        orderNumber++;
-
-                        if (realWidth > 0 && useRealWidth && !showDirection)
-                        {
-                                int tmpWidth = (int) (100 /  (float) (circum / realWidth));
-                                if (tmpWidth > width) width = tmpWidth;
-                        }
-                        drawSeg(lastN, n, w.selected ? selectedColor : colour, showDirection, width, dashed);
-
-                        if (showOrderNumber)
-                                drawOrderNumber(lastN, n, orderNumber);
-
-                        lastN = n;
+                        }
                 }
         }
@@ -179 +199 @@
 
         // This assumes that all segments are aligned in the same direction!
-        protected void drawWayAsArea(Way w, Color colour)
+        protected void drawWayAsArea(Way w, Color color)
         {
                 Polygon polygon = new Polygon();
@@ -189 +209 @@
                 }
 
-                Color mycolor = w.selected ? selectedColor : colour;
+                Color mycolor = w.selected ? selectedColor : color;
                 // set the opacity (alpha) level of the filled polygon
                 g.setColor(new Color( mycolor.getRed(), mycolor.getGreen(), mycolor.getBlue(), fillAlpha));
@@ -299 +319 @@
 
                 for (final OsmPrimitive osm : data.ways)
-                        if (!osm.incomplete && !osm.deleted && MapPaintStyles.isArea(osm))
+                        if (!osm.incomplete && !osm.deleted && MapPaintStyles.getStyles().isArea((Way)osm))
                                 osm.visit(this);
                         else if (!osm.deleted && !osm.incomplete)