Changeset 11722 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

Timestamp:

2017-03-13T17:04:29+01:00 (7 years ago)

Author:

michael2402

Message:

Do not include text label in area style - use a separate class and start merging code for on-line and in-area drawing.

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (7 diffs)

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

@@ -75 +75 @@
 import org.openstreetmap.josm.gui.mappaint.styleelement.MapImage;
 import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.PositionForAreaStrategy;
 import org.openstreetmap.josm.gui.mappaint.styleelement.RepeatImageElement.LineImageAlignment;
 import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.Symbol;
+import org.openstreetmap.josm.gui.mappaint.styleelement.TextElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.TextLabel;
 import org.openstreetmap.josm.tools.CompositeList;
@@ -400 +402 @@
     protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color,
             MapImage fillImage, Float extent, Path2D.Double pfClip, boolean disabled, TextLabel text) {
-
-        Shape area = path.createTransformedShape(mapState.getAffineTransform());
-
-        if (color.getAlpha() == 0) {
-            // skip drawing
-        } else if (!isOutlineOnly) {
+        if (!isOutlineOnly && color.getAlpha() != 0) {
+            Shape area = path.createTransformedShape(mapState.getAffineTransform());
             g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
             if (fillImage == null) {
@@ -451 +449 @@
         }
 
-        drawAreaText(osm, text, area);
-    }
-
-    private void drawAreaText(OsmPrimitive osm, TextLabel text, Shape area) {
-        if (text != null && isShowNames()) {
+        drawAreaText(osm, text, path);
+    }
+
+    private void drawAreaText(OsmPrimitive osm, TextLabel text, Path2D.Double path) {
+        if (text != null && isShowNames() && isAreaVisible(path)) {
             // abort if we can't compose the label to be rendered
             if (text.labelCompositionStrategy == null) return;
@@ -461 +459 @@
             if (name == null || name.isEmpty()) return;
 
+            Shape area = path.createTransformedShape(mapState.getAffineTransform());
             FontMetrics fontMetrics = g.getFontMetrics(orderFont); // if slow, use cache
             Rectangle2D nb = fontMetrics.getStringBounds(name, g); // if slow, approximate by strlen()*maxcharbounds(font)
 
-            Rectangle centeredNBounds = findLabelPlacement(area, nb);
+            Rectangle2D centeredNBounds = text.getLabelPositionSteategy().findLabelPlacement(area, nb);
             if (centeredNBounds != null) {
                 Font defaultFont = g.getFont();
@@ -475 +474 @@
             }
         }
-    }
-
-    /**
-     * Finds the correct position of a label / icon inside the area.
-     * @param area The area to search in
-     * @param nb The bounding box of the thing we are searching a place for.
-     * @return The position as rectangle with the same dimension as nb. <code>null</code> if none was found.
-     */
-    private Rectangle findLabelPlacement(Shape area, Rectangle2D nb) {
-        // Using the Centroid is Nicer for buildings like: +--------+
-        // but this needs to be fast.  As most houses are  |   42   |
-        // boxes anyway, the center of the bounding box    +---++---+
-        // will have to do.                                    ++
-        // Centroids are not optimal either, just imagine a U-shaped house.
-
-        Rectangle pb = area.getBounds();
-
-        // quick check to see if label box is smaller than primitive box
-        if (pb.width < nb.getWidth() || pb.height < nb.getHeight()) {
-            return null;
-        }
-
-        final double w = pb.width - nb.getWidth();
-        final double h = pb.height - nb.getHeight();
-
-        final int x2 = pb.x + (int) (w/2.0);
-        final int y2 = pb.y + (int) (h/2.0);
-
-        final int nbw = (int) nb.getWidth();
-        final int nbh = (int) nb.getHeight();
-
-        Rectangle centeredNBounds = new Rectangle(x2, y2, nbw, nbh);
-
-        // slower check to see if label is displayed inside primitive shape
-        if (area.contains(centeredNBounds)) {
-            return centeredNBounds;
-        }
-
-        // if center position (C) is not inside osm shape, try naively some other positions as follows:
-        // CHECKSTYLE.OFF: SingleSpaceSeparator
-        final int x1 = pb.x + (int)   (w/4.0);
-        final int x3 = pb.x + (int) (3*w/4.0);
-        final int y1 = pb.y + (int)   (h/4.0);
-        final int y3 = pb.y + (int) (3*h/4.0);
-        // CHECKSTYLE.ON: SingleSpaceSeparator
-        // +-----------+
-        // |  5  1  6  |
-        // |  4  C  2  |
-        // |  8  3  7  |
-        // +-----------+
-        Rectangle[] candidates = new Rectangle[] {
-                new Rectangle(x2, y1, nbw, nbh),
-                new Rectangle(x3, y2, nbw, nbh),
-                new Rectangle(x2, y3, nbw, nbh),
-                new Rectangle(x1, y2, nbw, nbh),
-                new Rectangle(x1, y1, nbw, nbh),
-                new Rectangle(x3, y1, nbw, nbh),
-                new Rectangle(x3, y3, nbw, nbh),
-                new Rectangle(x1, y3, nbw, nbh)
-        };
-        // Dumb algorithm to find a better placement. We could surely find a smarter one but it should
-        // solve most of building issues with only few calculations (8 at most)
-        for (int i = 0; i < candidates.length; i++) {
-            centeredNBounds = candidates[i];
-            if (area.contains(centeredNBounds)) {
-                return centeredNBounds;
-            }
-        }
-
-        // none found
-        return null;
     }
 
@@ -1181 +1109 @@
 
     /**
+     * Draws a text for the given primitive
+     * @param osm The primitive to draw the text for
+     * @param text The text definition (font/position/.../text content) to draw.
+     * @since 11722
+     */
+    public void drawText(OsmPrimitive osm, TextLabel text) {
+        PositionForAreaStrategy position = text.getLabelPositionSteategy();
+        if (position.supportsGlyphVector()) {
+            if (osm instanceof Way) {
+                // we might allow this for the outline of relations as well.
+                drawTextOnPath((Way) osm, text);
+            }
+        } else {
+            if (osm instanceof Way) {
+                drawAreaText(osm, text, getPath((Way) osm));
+            } else if (osm instanceof Relation) {
+                Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, (Relation) osm);
+                if (!multipolygon.getOuterWays().isEmpty()) {
+                    for (PolyData pd : multipolygon.getCombinedPolygons()) {
+                        drawAreaText(osm, text, pd.get());
+                    }
+                }
+            }
+        }
+    }
+
+    /**
      * Draws a text along a given way.
      * @param way The way to draw the text on.
@@ -1822 +1777 @@
                 if (drawMultipolygon && drawArea && s instanceof AreaElement && (flags & FLAG_DISABLED) == 0) {
                     output.add(new StyleRecord(s, osm, flags));
+                } else if (drawMultipolygon && drawArea && s instanceof TextElement) {
+                    output.add(new StyleRecord(s, osm, flags));
                 } else if (drawRestriction && s instanceof NodeElement) {
                     output.add(new StyleRecord(s, osm, flags));