Ticket #8934: 8934-4b-HaloedTextsRefactored2.patch

src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -441 +441 @@
         }
     }
 
+    /**
+     * Displays text at specified position including its halo, if applicable.
+     * 
+     * @param s text to display
+     * @param x X position
+     * @param y Y position
+     * @param disabled {@code true} if element is disabled (filtered out)
+     * @param text text style to use
+     */
+    private void displayText(String s, int x, int y, boolean disabled, TextElement text) {
+        FontRenderContext frc = g.getFontRenderContext();
+        GlyphVector gv = text.font.createGlyphVector(frc, s);
+        displayText(gv, x, y, disabled, text);
+    }
+    
+    /**
+     * Displays text at specified position including its halo, if applicable.
+     * 
+     * @param gv text's glyphs to display
+     * @param x X position
+     * @param y Y position
+     * @param disabled {@code true} if element is disabled (filtered out)
+     * @param text text style to use
+     */
+    private void displayText(GlyphVector gv, int x, int y, boolean disabled, TextElement text) {
+        if (isInactiveMode || disabled) {
+            g.setColor(inactiveColor);
+            g.drawGlyphVector(gv, x, y);
+        } else if (text.haloRadius != null) {
+            g.setStroke(new BasicStroke(2*text.haloRadius, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
+            g.setColor(text.haloColor);
+            Shape textOutline = gv.getOutline(x, y);
+            g.draw(textOutline);
+            g.setStroke(new BasicStroke());
+            g.setColor(text.color);
+            g.fill(textOutline);
+        } else {
+            g.setColor(text.color);
+            g.drawGlyphVector(gv, x, y);
+        }
+    }
+    
     protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color, MapImage fillImage, TextElement text) {
 
         Shape area = path.createTransformedShape(nc.getAffineTransform());
@@ -499 +541 @@
             if ((pb.width >= nb.getWidth() && pb.height >= nb.getHeight()) && // quick check
                     area.contains(centeredNBounds) // slow but nice
             ) {
-                if (isInactiveMode || osm.isDisabled()) {
-                    g.setColor(inactiveColor);
-                } else {
-                    g.setColor(text.color);
-                }
                 Font defaultFont = g.getFont();
-                g.setFont (text.font);
-                g.drawString (name,
-                        (int)(centeredNBounds.getMinX() - nb.getMinX()),
-                        (int)(centeredNBounds.getMinY() - nb.getMinY()));
+                int x = (int)(centeredNBounds.getMinX() - nb.getMinX());
+                int y = (int)(centeredNBounds.getMinY() - nb.getMinY());
+                displayText(name, x, y, osm.isDisabled(), text);
                 g.setFont(defaultFont);
             }
         }
@@ -587 +623 @@
                 y += box.y + box.height + metrics.getAscent() + 2;
             } else throw new AssertionError();
         }
-        if (isInactiveMode || n.isDisabled()) {
-            g.setColor(inactiveColor);
-        } else {
-            g.setColor(text.color);
-        }
-        if (text.haloRadius != null) {
-            g.setStroke(new BasicStroke(2*text.haloRadius, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
-            g.setColor(text.haloColor);
-            FontRenderContext frc = g.getFontRenderContext();
-            GlyphVector gv = text.font.createGlyphVector(frc, s);
-            Shape textOutline = gv.getOutline(x, y);
-            g.draw(textOutline);
-            g.setStroke(new BasicStroke());
-            g.setColor(text.color);
-            g.fill(textOutline);
-        } else {
-            g.drawString(s, x, y);
-        }
+        displayText(s, x, y, n.isDisabled(), text);
         g.setFont(defaultFont);
     }
 
@@ -1150 +1169 @@
                 gv.setGlyphTransform(i, trfm);
             }
         }
-        if (text.haloRadius != null) {
-            Shape textOutline = gv.getOutline();
-            g.setStroke(new BasicStroke(2*text.haloRadius, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
-            g.setColor(text.haloColor);
-            g.draw(textOutline);
-            g.setStroke(new BasicStroke());
-            g.setColor(text.color);
-            g.fill(textOutline);
-        } else {
-            g.setColor(text.color);
-            g.drawGlyphVector(gv, 0, 0);
-        }
+        displayText(gv, 0, 0, way.isDisabled(), text);
     }
 
     /**