Index: core/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java
===================================================================
--- core/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java (revision 5570)
+++ core/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java (working copy)
@@ -1,8 +1,19 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm.visitor.paint;
+import java.awt.Color;
import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Point2D;
+import java.util.Iterator;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.WaySegment;
import org.openstreetmap.josm.gui.NavigatableComponent;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -16,11 +27,29 @@
protected Graphics2D g;
/** the map viewport - provides projection and hit detection functionality */
protected NavigatableComponent nc;
+
/** if true, the paint visitor shall render OSM objects such that they
- * look inactive. Example: rendering of data in an inactive layer using light gray as color only.
- */
+ * look inactive. Example: rendering of data in an inactive layer using light gray as color only. */
protected boolean isInactiveMode;
+ /** Color Preference for background */
+ protected Color backgroundColor;
+ /** Color Preference for inactive objects */
+ protected Color inactiveColor;
+ /** Color Preference for selected objects */
+ protected Color selectedColor;
+ /** Color Preference for nodes */
+ protected Color nodeColor;
+
+ /** Color Preference for hightlighted objects */
+ protected Color highlightColor;
+ /** Preference: size of virtual nodes (0 displayes display) */
+ protected int virtualNodeSize;
+ /** Preference: minimum space (displayed way length) to display virtual nodes */
+ protected int virtualNodeSpace;
+ /** Preference: minimum space (displayed way length) to display segment numbers */
+ protected int segmentNumberSpace;
+
/**
* Creates an abstract paint visitor
*
@@ -38,4 +67,155 @@
this.nc = nc;
this.isInactiveMode = isInactiveMode;
}
+
+ /**
+ * Draw the node as small rectangle with the given color.
+ *
+ * @param n The node to draw.
+ * @param color The color of the node.
+ */
+ public abstract void drawNode(Node n, Color color, int size, boolean fill);
+
+ /**
+ * Draw an number of the order of the two consecutive nodes within the
+ * parents way
+ *
+ * @param p1 First point of the way segment.
+ * @param p2 Second point of the way segment.
+ * @param orderNumber The number of the segment in the way.
+ */
+ protected void drawOrderNumber(Point p1, Point p2, int orderNumber, Color clr) {
+ if (isSegmentVisible(p1, p2) && isLargeSegment(p1, p2, segmentNumberSpace)) {
+ String on = Integer.toString(orderNumber);
+ int strlen = on.length();
+ int x = (p1.x+p2.x)/2 - 4*strlen;
+ int y = (p1.y+p2.y)/2 + 4;
+
+ if (virtualNodeSize != 0 && isLargeSegment(p1, p2, virtualNodeSpace)) {
+ y = (p1.y+p2.y)/2 - virtualNodeSize - 3;
+ }
+
+ g.setColor(backgroundColor);
+ g.fillRect(x-1, y-12, 8*strlen+1, 14);
+ g.setColor(clr);
+ g.drawString(on, x, y);
+ }
+ }
+
+ /**
+ * Draws virtual nodes.
+ *
+ * @param data The data set being rendered.
+ * @param bbox The bounding box being displayed.
+ */
+ public void drawVirtualNodes(DataSet data, BBox bbox) {
+ if (virtualNodeSize == 0 || data == null || bbox == null)
+ return;
+ // print normal virtual nodes
+ GeneralPath path = new GeneralPath();
+ for (Way osm : data.searchWays(bbox)) {
+ if (osm.isUsable() && !osm.isDisabledAndHidden() && !osm.isDisabled()) {
+ visitVirtual(path, osm);
+ }
+ }
+ g.setColor(nodeColor);
+ g.draw(path);
+ try {
+ // print highlighted virtual nodes. Since only the color changes, simply
+ // drawing them over the existing ones works fine (at least in their current
+ // simple style)
+ path = new GeneralPath();
+ for (WaySegment wseg: data.getHighlightedVirtualNodes()) {
+ if (wseg.way.isUsable() && !wseg.way.isDisabled()) {
+ visitVirtual(path, wseg.toWay());
+ }
+ }
+ g.setColor(highlightColor);
+ g.draw(path);
+ } catch (ArrayIndexOutOfBoundsException e) {
+ // Silently ignore any ArrayIndexOutOfBoundsException that may be raised
+ // if the way has changed while being rendered (fix #7979)
+ }
+ }
+
+ /**
+ * Reads the color definitions from preferences. This function is public, so that
+ * color names in preferences can be displayed even without calling the wireframe display before.
+ */
+ public void getColors() {
+ this.backgroundColor = PaintColors.BACKGROUND.get();
+ this.inactiveColor = PaintColors.INACTIVE.get();
+ this.selectedColor = PaintColors.SELECTED.get();
+ this.nodeColor = PaintColors.NODE.get();
+ this.highlightColor = PaintColors.HIGHLIGHT.get();
+ }
+
+ /**
+ * Reads all the settings from preferences. Calls the @{link #getColors}
+ * function.
+ *
+ * @param virtual true if virtual nodes are used
+ */
+ protected void getSettings(boolean virtual) {
+ this.virtualNodeSize = virtual ? Main.pref.getInteger("mappaint.node.virtual-size", 8) / 2 : 0;
+ this.virtualNodeSpace = Main.pref.getInteger("mappaint.node.virtual-space", 70);
+ this.segmentNumberSpace = Main.pref.getInteger("mappaint.segmentnumber.space", 40);
+ getColors();
+ }
+
+ /**
+ * Checks if a way segemnt is large enough for additional information display.
+ *
+ * @param p1 First point of the way segment.
+ * @param p2 Second point of the way segment.
+ * @param space The free space to check against.
+ * @return true if segment is larger than required space
+ */
+ public static boolean isLargeSegment(Point2D p1, Point2D p2, int space) {
+ double xd = Math.abs(p1.getX()-p2.getX());
+ double yd = Math.abs(p1.getY()-p2.getY());
+ return (xd+yd > space);
+ }
+
+ /**
+ * Checks if segment is visible in display.
+ *
+ * @param p1 First point of the way segment.
+ * @param p2 Second point of the way segment.
+ * @return true if segment is visible.
+ */
+ protected boolean isSegmentVisible(Point p1, Point p2) {
+ if ((p1.x < 0) && (p2.x < 0)) return false;
+ if ((p1.y < 0) && (p2.y < 0)) return false;
+ if ((p1.x > nc.getWidth()) && (p2.x > nc.getWidth())) return false;
+ if ((p1.y > nc.getHeight()) && (p2.y > nc.getHeight())) return false;
+ return true;
+ }
+
+ /**
+ * Creates path for drawing virtual nodes for one way.
+ *
+ * @param path The path to append drawing to.
+ * @param w The ways to draw node for.
+ */
+ public void visitVirtual(GeneralPath path, Way w) {
+ Iterator it = w.getNodes().iterator();
+ if (it.hasNext()) {
+ Point lastP = nc.getPoint(it.next());
+ while (it.hasNext())
+ {
+ Point p = nc.getPoint(it.next());
+ if (isSegmentVisible(lastP, p) && isLargeSegment(lastP, p, virtualNodeSpace))
+ {
+ int x = (p.x+lastP.x)/2;
+ int y = (p.y+lastP.y)/2;
+ path.moveTo(x-virtualNodeSize, y);
+ path.lineTo(x+virtualNodeSize, y);
+ path.moveTo(x, y-virtualNodeSize);
+ path.lineTo(x, y+virtualNodeSize);
+ }
+ lastP = p;
+ }
+ }
+ }
}
Index: core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java
===================================================================
--- core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (revision 5570)
+++ core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (working copy)
@@ -1,1255 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm.visitor.paint;
-
-import java.awt.AlphaComposite;
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.Polygon;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.TexturePaint;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.font.LineMetrics;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Path2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.swing.ImageIcon;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmUtils;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
-import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData;
-import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
-import org.openstreetmap.josm.gui.NavigatableComponent;
-import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle;
-import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.HorizontalTextAlignment;
-import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.VerticalTextAlignment;
-import org.openstreetmap.josm.gui.mappaint.MapImage;
-import org.openstreetmap.josm.gui.mappaint.NodeElemStyle.Symbol;
-import org.openstreetmap.josm.gui.mappaint.TextElement;
-import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.Utils;
-
-public class MapPainter {
-
- private final Graphics2D g;
- private final NavigatableComponent nc;
- private final boolean inactive;
- private final MapPaintSettings settings;
- private final Collection highlightWaySegments;
-
- private final boolean useStrokes;
- private final boolean showNames;
- private final boolean showIcons;
-
- private final boolean isOutlineOnly;
-
- private final Color inactiveColor;
- private final Color selectedColor;
- private final Color relationSelectedColor;
- private final Color nodeColor;
- private final Color highlightColor;
- private final Color highlightColorTransparent;
- private final Color backgroundColor;
-
- private final Font orderFont;
- private final int virtualNodeSize;
- private final int virtualNodeSpace;
- private final int segmentNumberSpace;
-
- private final double circum;
-
- private final boolean leftHandTraffic;
-
- private static final double PHI = Math.toRadians(20);
- private static final double cosPHI = Math.cos(PHI);
- private static final double sinPHI = Math.sin(PHI);
-
- public MapPainter(MapPaintSettings settings, Graphics2D g,
- boolean inactive, NavigatableComponent nc, boolean virtual,
- double circum, boolean leftHandTraffic,
- Collection highlightWaySegments){
- this.settings = settings;
- this.g = g;
- this.inactive = inactive;
- this.nc = nc;
- this.highlightWaySegments = highlightWaySegments;
- this.useStrokes = settings.getUseStrokesDistance() > circum;
- this.showNames = settings.getShowNamesDistance() > circum;
- this.showIcons = settings.getShowIconsDistance() > circum;
-
- this.isOutlineOnly = settings.isOutlineOnly();
-
- this.inactiveColor = PaintColors.INACTIVE.get();
- this.selectedColor = PaintColors.SELECTED.get();
- this.relationSelectedColor = PaintColors.RELATIONSELECTED.get();
- this.nodeColor = PaintColors.NODE.get();
- this.highlightColor = PaintColors.HIGHLIGHT.get();
- this.highlightColorTransparent = new Color(highlightColor.getRed(), highlightColor.getGreen(), highlightColor.getBlue(), 100);
- this.backgroundColor = PaintColors.getBackgroundColor();
-
- this.orderFont = new Font(Main.pref.get("mappaint.font", "Helvetica"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
- this.virtualNodeSize = virtual ? Main.pref.getInteger("mappaint.node.virtual-size", 8) / 2 : 0;
- this.virtualNodeSpace = Main.pref.getInteger("mappaint.node.virtual-space", 70);
- this.segmentNumberSpace = Main.pref.getInteger("mappaint.segmentnumber.space", 40);
-
- this.circum = circum;
- this.leftHandTraffic = leftHandTraffic;
- }
-
- /**
- * draw way
- * @param showOrientation show arrows that indicate the technical orientation of
- * the way (defined by order of nodes)
- * @param showOneway show symbols that indicate the direction of the feature,
- * e.g. oneway street or waterway
- * @param onewayReversed for oneway=-1 and similar
- */
- public void drawWay(Way way, Color color, BasicStroke line, BasicStroke dashes, Color dashedColor, float offset,
- boolean showOrientation, boolean showHeadArrowOnly,
- boolean showOneway, boolean onewayReversed) {
-
- GeneralPath path = new GeneralPath();
- GeneralPath orientationArrows = showOrientation ? new GeneralPath() : null;
- GeneralPath onewayArrows = showOneway ? new GeneralPath() : null;
- GeneralPath onewayArrowsCasing = showOneway ? new GeneralPath() : null;
- Rectangle bounds = g.getClipBounds();
- bounds.grow(100, 100); // avoid arrow heads at the border
-
- double wayLength = 0;
- Point lastPoint = null;
- boolean initialMoveToNeeded = true;
- List wayNodes = way.getNodes();
- if (wayNodes.size() < 2) return;
-
- // only highlight the segment if the way itself is not highlighted
- if(!way.isHighlighted()) {
- GeneralPath highlightSegs = null;
- for(WaySegment ws : highlightWaySegments) {
- if(ws.way != way || ws.lowerIndex < offset) {
- continue;
- }
- if(highlightSegs == null) {
- highlightSegs = new GeneralPath();
- }
-
- Point p1 = nc.getPoint(ws.getFirstNode());
- Point p2 = nc.getPoint(ws.getSecondNode());
- highlightSegs.moveTo(p1.x, p1.y);
- highlightSegs.lineTo(p2.x, p2.y);
- }
-
- drawPathHighlight(highlightSegs, line);
- }
-
-
- Iterator it = new OffsetIterator(wayNodes, offset);
- while (it.hasNext()) {
- Point p = it.next();
- if (lastPoint != null) {
- Point p1 = lastPoint;
- Point p2 = p;
-
- /**
- * Do custom clipping to work around openjdk bug. It leads to
- * drawing artefacts when zooming in a lot. (#4289, #4424)
- * (Looks like int overflow.)
- */
- LineClip clip = new LineClip(p1, p2, bounds);
- if (clip.execute()) {
- if (!p1.equals(clip.getP1())) {
- p1 = clip.getP1();
- path.moveTo(p1.x, p1.y);
- } else if (initialMoveToNeeded) {
- initialMoveToNeeded = false;
- path.moveTo(p1.x, p1.y);
- }
- p2 = clip.getP2();
- path.lineTo(p2.x, p2.y);
-
- /* draw arrow */
- if (showHeadArrowOnly ? !it.hasNext() : showOrientation) {
- final double segmentLength = p1.distance(p2);
- if (segmentLength != 0.0) {
- final double l = (10. + line.getLineWidth()) / segmentLength;
-
- final double sx = l * (p1.x - p2.x);
- final double sy = l * (p1.y - p2.y);
-
- orientationArrows.moveTo (p2.x + cosPHI * sx - sinPHI * sy, p2.y + sinPHI * sx + cosPHI * sy);
- orientationArrows.lineTo(p2.x, p2.y);
- orientationArrows.lineTo (p2.x + cosPHI * sx + sinPHI * sy, p2.y - sinPHI * sx + cosPHI * sy);
- }
- }
- if (showOneway) {
- final double segmentLength = p1.distance(p2);
- if (segmentLength != 0.0) {
- final double nx = (p2.x - p1.x) / segmentLength;
- final double ny = (p2.y - p1.y) / segmentLength;
-
- final double interval = 60;
- // distance from p1
- double dist = interval - (wayLength % interval);
-
- while (dist < segmentLength) {
- for (Pair sizeAndPath : Arrays.asList(new Pair[] {
- new Pair(3f, onewayArrowsCasing),
- new Pair(2f, onewayArrows)})) {
-
- // scale such that border is 1 px
- final double fac = - (onewayReversed ? -1 : 1) * sizeAndPath.a * (1 + sinPHI) / (sinPHI * cosPHI);
- final double sx = nx * fac;
- final double sy = ny * fac;
-
- // Attach the triangle at the incenter and not at the tip.
- // Makes the border even at all sides.
- final double x = p1.x + nx * (dist + (onewayReversed ? -1 : 1) * (sizeAndPath.a / sinPHI));
- final double y = p1.y + ny * (dist + (onewayReversed ? -1 : 1) * (sizeAndPath.a / sinPHI));
-
- sizeAndPath.b.moveTo(x, y);
- sizeAndPath.b.lineTo (x + cosPHI * sx - sinPHI * sy, y + sinPHI * sx + cosPHI * sy);
- sizeAndPath.b.lineTo (x + cosPHI * sx + sinPHI * sy, y - sinPHI * sx + cosPHI * sy);
- sizeAndPath.b.lineTo(x, y);
- }
- dist += interval;
- }
- }
- wayLength += segmentLength;
- }
- }
- }
- lastPoint = p;
- }
- if(way.isHighlighted()) {
- drawPathHighlight(path, line);
- }
- displaySegments(path, orientationArrows, onewayArrows, onewayArrowsCasing, color, line, dashes, dashedColor);
- }
-
- /**
- * Iterates over a list of Way Nodes and returns screen coordinates that
- * represent a line that is shifted by a certain offset perpendicular
- * to the way direction.
- *
- * There is no intention, to handle consecutive duplicate Nodes in a
- * perfect way, but it is should not throw an exception.
- */
- public class OffsetIterator implements Iterator {
-
- private List nodes;
- private float offset;
- private int idx;
-
- private Point prev = null;
- /* 'prev0' is a point that has distance 'offset' from 'prev' and the
- * line from 'prev' to 'prev0' is perpendicular to the way segment from
- * 'prev' to the next point.
- */
- private int x_prev0, y_prev0;
-
- public OffsetIterator(List nodes, float offset) {
- this.nodes = nodes;
- this.offset = offset;
- idx = 0;
- }
-
- @Override
- public boolean hasNext() {
- return idx < nodes.size();
- }
-
- @Override
- public Point next() {
- if (Math.abs(offset) < 0.1f) return nc.getPoint(nodes.get(idx++));
-
- Point current = nc.getPoint(nodes.get(idx));
-
- if (idx == nodes.size() - 1) {
- ++idx;
- return new Point(x_prev0 + current.x - prev.x, y_prev0 + current.y - prev.y);
- }
-
- Point next = nc.getPoint(nodes.get(idx+1));
-
- int dx_next = next.x - current.x;
- int dy_next = next.y - current.y;
- double len_next = Math.sqrt(dx_next*dx_next + dy_next*dy_next);
-
- if (len_next == 0) {
- len_next = 1; // value does not matter, because dy_next and dx_next is 0
- }
-
- int x_current0 = current.x + (int) Math.round(offset * dy_next / len_next);
- int y_current0 = current.y - (int) Math.round(offset * dx_next / len_next);
-
- if (idx==0) {
- ++idx;
- prev = current;
- x_prev0 = x_current0;
- y_prev0 = y_current0;
- return new Point(x_current0, y_current0);
- } else {
- int dx_prev = current.x - prev.x;
- int dy_prev = current.y - prev.y;
-
- // determine intersection of the lines parallel to the two
- // segments
- int det = dx_next*dy_prev - dx_prev*dy_next;
-
- if (det == 0) {
- ++idx;
- prev = current;
- x_prev0 = x_current0;
- y_prev0 = y_current0;
- return new Point(x_current0, y_current0);
- }
-
- int m = dx_next*(y_current0 - y_prev0) - dy_next*(x_current0 - x_prev0);
-
- int cx_ = x_prev0 + Math.round((float)m * dx_prev / det);
- int cy_ = y_prev0 + Math.round((float)m * dy_prev / det);
- ++idx;
- prev = current;
- x_prev0 = x_current0;
- y_prev0 = y_current0;
- return new Point(cx_, cy_);
- }
- }
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
- }
-
- private void displaySegments(GeneralPath path, GeneralPath orientationArrows, GeneralPath onewayArrows, GeneralPath onewayArrowsCasing,
- Color color, BasicStroke line, BasicStroke dashes, Color dashedColor) {
- g.setColor(inactive ? inactiveColor : color);
- if (useStrokes) {
- g.setStroke(line);
- }
- g.draw(path);
-
- if(!inactive && useStrokes && dashes != null) {
- g.setColor(dashedColor);
- g.setStroke(dashes);
- g.draw(path);
- }
-
- if (orientationArrows != null) {
- g.setColor(inactive ? inactiveColor : color);
- g.setStroke(new BasicStroke(line.getLineWidth(), line.getEndCap(), BasicStroke.JOIN_MITER, line.getMiterLimit()));
- g.draw(orientationArrows);
- }
-
- if (onewayArrows != null) {
- g.setStroke(new BasicStroke(1, line.getEndCap(), BasicStroke.JOIN_MITER, line.getMiterLimit()));
- g.fill(onewayArrowsCasing);
- g.setColor(inactive ? inactiveColor : backgroundColor);
- g.fill(onewayArrows);
- }
-
- if(useStrokes) {
- g.setStroke(new BasicStroke());
- }
- }
-
- /**
- * highlights a given GeneralPath using the settings from BasicStroke to match the line's
- * style. Width of the highlight is hard coded.
- * @param path
- * @param line
- */
- private void drawPathHighlight(GeneralPath path, BasicStroke line) {
- if(path == null)
- return;
- g.setColor(highlightColorTransparent);
- float w = (line.getLineWidth() + 4);
- while(w >= line.getLineWidth()) {
- g.setStroke(new BasicStroke(w, line.getEndCap(), line.getLineJoin(), line.getMiterLimit()));
- g.draw(path);
- w -= 4;
- }
- }
-
- private boolean isSegmentVisible(Point p1, Point p2) {
- if ((p1.x < 0) && (p2.x < 0)) return false;
- if ((p1.y < 0) && (p2.y < 0)) return false;
- if ((p1.x > nc.getWidth()) && (p2.x > nc.getWidth())) return false;
- if ((p1.y > nc.getHeight()) && (p2.y > nc.getHeight())) return false;
- return true;
- }
-
- private static Boolean IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = null;
-
- /**
- * Check, if this System has the GlyphVector double translation bug.
- *
- * With this bug, gv.setGlyphTransform(i, trfm) has a different
- * effect than on most other systems, namely the translation components
- * ("m02" & "m12", {@link AffineTransform}) appear to be twice as large, as
- * they actually are. The rotation is unaffected (scale & shear not tested
- * so far).
- *
- * This bug has only been observed on Mac OS X, see #7841.
- *
- * @return true, if the GlyphVector double translation bug is present on
- * this System
- */
- public static boolean isGlyphVectorDoubleTranslationBug() {
- if (IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG != null)
- return IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG;
- FontRenderContext frc = new FontRenderContext(null, false, false);
- Font font = new Font("Dialog", Font.PLAIN, 12);
- GlyphVector gv = font.createGlyphVector(frc, "x");
- gv.setGlyphTransform(0, AffineTransform.getTranslateInstance(1000, 1000));
- Shape shape = gv.getGlyphOutline(0);
- // x is about 1000 on normal stystems and about 2000 when the bug occurs
- int x = shape.getBounds().x;
- IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = x > 1500;
- return IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG;
- }
-
- public void drawTextOnPath(Way way, TextElement text) {
- if (way == null || text == null)
- return;
- String name = text.getString(way);
- if (name == null || name.isEmpty())
- return;
-
- Polygon poly = new Polygon();
- Point lastPoint = null;
- Iterator it = way.getNodes().iterator();
- double pathLength = 0;
- long dx, dy;
- while (it.hasNext()) {
- Node n = it.next();
- Point p = nc.getPoint(n);
- poly.addPoint(p.x, p.y);
-
- if(lastPoint != null) {
- dx = p.x - lastPoint.x;
- dy = p.y - lastPoint.y;
- pathLength += Math.sqrt(dx*dx + dy*dy);
- }
- lastPoint = p;
- }
-
- FontMetrics fontMetrics = g.getFontMetrics(text.font); // if slow, use cache
- Rectangle2D rec = fontMetrics.getStringBounds(name, g); // if slow, approximate by strlen()*maxcharbounds(font)
-
- if (rec.getWidth() > pathLength)
- return;
-
- double t1 = (pathLength/2 - rec.getWidth()/2) / pathLength;
- double t2 = (pathLength/2 + rec.getWidth()/2) / pathLength;
-
- double[] p1 = pointAt(t1, poly, pathLength);
- double[] p2 = pointAt(t2, poly, pathLength);
-
- if (p1 == null || p2 == null)
- return;
-
- double angleOffset;
- double offsetSign;
- double tStart;
-
- if (p1[0] < p2[0] &&
- p1[2] < Math.PI/2 &&
- p1[2] > -Math.PI/2) {
- angleOffset = 0;
- offsetSign = 1;
- tStart = t1;
- } else {
- angleOffset = Math.PI;
- offsetSign = -1;
- tStart = t2;
- }
-
- FontRenderContext frc = g.getFontRenderContext();
- GlyphVector gv = text.font.createGlyphVector(frc, name);
-
- for (int i=0; i curLen + segLen) {
- curLen += segLen;
- continue;
- }
- return new double[] {
- poly.xpoints[i-1]+(totalLen - curLen)/segLen*dx,
- poly.ypoints[i-1]+(totalLen - curLen)/segLen*dy,
- Math.atan2(dy, dx)};
- }
- return null;
- }
-
- public void drawLinePattern(Way way, Image pattern) {
- final int width = pattern.getWidth(null);
- final int height = pattern.getHeight(null);
-
- Point lastP = null;
- double wayLength = 0;
-
- Iterator it = way.getNodes().iterator();
- while (it.hasNext()) {
- Node n = it.next();
- Point thisP = nc.getPoint(n);
-
- if (lastP != null) {
- final double segmentLength = thisP.distance(lastP);
-
- final double dx = thisP.x - lastP.x;
- final double dy = thisP.y - lastP.y;
-
- double dist = wayLength == 0 ? 0 : width - (wayLength % width);
-
- AffineTransform saveTransform = g.getTransform();
- g.translate(lastP.x, lastP.y);
- g.rotate(Math.atan2(dy, dx));
-
- if (dist > 0) {
- g.drawImage(pattern, 0, 0, (int) dist, height,
- width - (int) dist, 0, width, height, null);
- }
- while (dist < segmentLength) {
- if (dist + width > segmentLength) {
- g.drawImage(pattern, (int) dist, 0, (int) segmentLength, height,
- 0, 0, (int) segmentLength - (int) dist, height, null);
- } else {
- g.drawImage(pattern, (int) dist, 0, nc);
- }
- dist += width;
- }
- g.setTransform(saveTransform);
-
- wayLength += segmentLength;
- }
- lastP = thisP;
- }
- }
-
- public void drawNodeIcon(Node n, Image img, float alpha, boolean selected, boolean member) {
- Point p = nc.getPoint(n);
-
- final int w = img.getWidth(null), h=img.getHeight(null);
- if(n.isHighlighted()) {
- drawPointHighlight(p, Math.max(w, h));
- }
-
- if (alpha != 1f) {
- g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha));
- }
- g.drawImage(img, p.x-w/2, p.y-h/2, nc);
- g.setPaintMode();
- if (selected || member)
- {
- Color color = null;
- if (inactive || n.isDisabled()) {
- color = inactiveColor;
- } else if (selected) {
- color = selectedColor;
- } else {
- color = relationSelectedColor;
- }
- g.setColor(color);
- g.drawRect(p.x-w/2-2, p.y-h/2-2, w+4, h+4);
- }
- }
-
- private Polygon buildPolygon(Point center, int radius, int sides, double rotation) {
- Polygon polygon = new Polygon();
- for (int i = 0; i < sides; i++) {
- double angle = ((2 * Math.PI / sides) * i) - rotation;
- int x = (int) Math.round(center.x + radius * Math.cos(angle));
- int y = (int) Math.round(center.y + radius * Math.sin(angle));
- polygon.addPoint(x, y);
- }
- return polygon;
- }
-
- private Polygon buildPolygon(Point center, int radius, int sides) {
- return buildPolygon(center, radius, sides, 0.0);
- }
-
- public void drawNodeSymbol(Node n, Symbol s, Color fillColor, Color strokeColor) {
- Point p = nc.getPoint(n);
- int radius = s.size / 2;
-
- if(n.isHighlighted()) {
- drawPointHighlight(p, s.size);
- }
-
- if (fillColor != null) {
- g.setColor(fillColor);
- switch (s.symbol) {
- case SQUARE:
- g.fillRect(p.x - radius, p.y - radius, s.size, s.size);
- break;
- case CIRCLE:
- g.fillOval(p.x - radius, p.y - radius, s.size, s.size);
- break;
- case TRIANGLE:
- g.fillPolygon(buildPolygon(p, radius, 3, Math.PI / 2));
- break;
- case PENTAGON:
- g.fillPolygon(buildPolygon(p, radius, 5, Math.PI / 2));
- break;
- case HEXAGON:
- g.fillPolygon(buildPolygon(p, radius, 6));
- break;
- case HEPTAGON:
- g.fillPolygon(buildPolygon(p, radius, 7, Math.PI / 2));
- break;
- case OCTAGON:
- g.fillPolygon(buildPolygon(p, radius, 8, Math.PI / 8));
- break;
- case NONAGON:
- g.fillPolygon(buildPolygon(p, radius, 9, Math.PI / 2));
- break;
- case DECAGON:
- g.fillPolygon(buildPolygon(p, radius, 10));
- break;
- default:
- throw new AssertionError();
- }
- }
- if (s.stroke != null) {
- g.setStroke(s.stroke);
- g.setColor(strokeColor);
- switch (s.symbol) {
- case SQUARE:
- g.drawRect(p.x - radius, p.y - radius, s.size - 1, s.size - 1);
- break;
- case CIRCLE:
- g.drawOval(p.x - radius, p.y - radius, s.size - 1, s.size - 1);
- break;
- case TRIANGLE:
- g.drawPolygon(buildPolygon(p, radius, 3, Math.PI / 2));
- break;
- case PENTAGON:
- g.drawPolygon(buildPolygon(p, radius, 5, Math.PI / 2));
- break;
- case HEXAGON:
- g.drawPolygon(buildPolygon(p, radius, 6));
- break;
- case HEPTAGON:
- g.drawPolygon(buildPolygon(p, radius, 7, Math.PI / 2));
- break;
- case OCTAGON:
- g.drawPolygon(buildPolygon(p, radius, 8, Math.PI / 8));
- break;
- case NONAGON:
- g.drawPolygon(buildPolygon(p, radius, 9, Math.PI / 2));
- break;
- case DECAGON:
- g.drawPolygon(buildPolygon(p, radius, 10));
- break;
- default:
- throw new AssertionError();
- }
- g.setStroke(new BasicStroke());
- }
- }
-
- /**
- * Draw the node as small rectangle with the given color.
- *
- * @param n The node to draw.
- * @param color The color of the node.
- */
- public void drawNode(Node n, Color color, int size, boolean fill) {
- if(size <= 0 && !n.isHighlighted())
- return;
-
- Point p = nc.getPoint(n);
-
- if(n.isHighlighted()) {
- drawPointHighlight(p, size);
- }
-
- if (size > 1) {
- if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
- int radius = size / 2;
-
- if (inactive || n.isDisabled()) {
- g.setColor(inactiveColor);
- } else {
- g.setColor(color);
- }
- if (fill) {
- g.fillRect(p.x-radius-1, p.y-radius-1, size + 1, size + 1);
- } else {
- g.drawRect(p.x-radius-1, p.y-radius-1, size, size);
- }
- }
- }
-
- /**
- * highlights a given point by drawing a rounded rectangle around it. Give the
- * size of the object you want to be highlighted, width is added automatically.
- */
- private void drawPointHighlight(Point p, int size) {
- g.setColor(highlightColorTransparent);
- int s = size + 7;
- while(s >= size) {
- int r = (int) Math.floor(s/2);
- g.fillRoundRect(p.x-r, p.y-r, s, s, r, r);
- s -= 4;
- }
- }
-
- public void drawBoxText(Node n, BoxTextElemStyle bs) {
- if (!isShowNames() || bs == null)
- return;
-
- Point p = nc.getPoint(n);
- TextElement text = bs.text;
- String s = text.labelCompositionStrategy.compose(n);
- if (s == null) return;
-
- Font defaultFont = g.getFont();
- g.setFont(text.font);
-
- int x = p.x + text.xOffset;
- int y = p.y + text.yOffset;
- /**
- *
- * left-above __center-above___ right-above
- * left-top| |right-top
- * | |
- * left-center| center-center |right-center
- * | |
- * left-bottom|_________________|right-bottom
- * left-below center-below right-below
- *
- */
- Rectangle box = bs.getBox();
- if (bs.hAlign == HorizontalTextAlignment.RIGHT) {
- x += box.x + box.width + 2;
- } else {
- FontRenderContext frc = g.getFontRenderContext();
- Rectangle2D bounds = text.font.getStringBounds(s, frc);
- int textWidth = (int) bounds.getWidth();
- if (bs.hAlign == HorizontalTextAlignment.CENTER) {
- x -= textWidth / 2;
- } else if (bs.hAlign == HorizontalTextAlignment.LEFT) {
- x -= - box.x + 4 + textWidth;
- } else throw new AssertionError();
- }
-
- if (bs.vAlign == VerticalTextAlignment.BOTTOM) {
- y += box.y + box.height;
- } else {
- FontRenderContext frc = g.getFontRenderContext();
- LineMetrics metrics = text.font.getLineMetrics(s, frc);
- if (bs.vAlign == VerticalTextAlignment.ABOVE) {
- y -= - box.y + metrics.getDescent();
- } else if (bs.vAlign == VerticalTextAlignment.TOP) {
- y -= - box.y - metrics.getAscent();
- } else if (bs.vAlign == VerticalTextAlignment.CENTER) {
- y += (metrics.getAscent() - metrics.getDescent()) / 2;
- } else if (bs.vAlign == VerticalTextAlignment.BELOW) {
- y += box.y + box.height + metrics.getAscent() + 2;
- } else throw new AssertionError();
- }
- if (inactive || 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);
- }
- g.setFont(defaultFont);
- }
-
- private Path2D.Double getPath(Way w) {
- Path2D.Double path = new Path2D.Double();
- boolean initial = true;
- for (Node n : w.getNodes())
- {
- Point2D p = n.getEastNorth();
- if (p != null) {
- if (initial) {
- path.moveTo(p.getX(), p.getY());
- initial = false;
- } else {
- path.lineTo(p.getX(), p.getY());
- }
- }
- }
- return path;
- }
-
- public void drawArea(Way w, Color color, MapImage fillImage, TextElement text) {
- drawArea(w, getPath(w), color, fillImage, text);
- }
-
- protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color, MapImage fillImage, TextElement text) {
-
- Shape area = path.createTransformedShape(nc.getAffineTransform());
-
- if (!isOutlineOnly) {
- if (fillImage == null) {
- if (inactive) {
- g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.33f));
- }
- g.setColor(color);
- g.fill(area);
- } else {
- TexturePaint texture = new TexturePaint(fillImage.getImage(),
- // new Rectangle(polygon.xpoints[0], polygon.ypoints[0], fillImage.getWidth(), fillImage.getHeight()));
- new Rectangle(0, 0, fillImage.getWidth(), fillImage.getHeight()));
- g.setPaint(texture);
- Float alpha = Utils.color_int2float(fillImage.alpha);
- if (alpha != 1f) {
- g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha));
- }
- g.fill(area);
- g.setPaintMode();
- }
- }
-
- if (text != null && isShowNames()) {
- /*
- * abort if we can't compose the label to be rendered
- */
- if (text.labelCompositionStrategy == null) return;
- String name = text.labelCompositionStrategy.compose(osm);
- if (name == null) return;
-
- Rectangle pb = area.getBounds();
- FontMetrics fontMetrics = g.getFontMetrics(orderFont); // if slow, use cache
- Rectangle2D nb = fontMetrics.getStringBounds(name, g); // if slow, approximate by strlen()*maxcharbounds(font)
-
- // Point2D c = getCentroid(polygon);
- // 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.
- // Point2D c = new Point2D.Double(pb.x + pb.width / 2.0, pb.y + pb.height / 2.0);
- // Rectangle2D.Double centeredNBounds =
- // new Rectangle2D.Double(c.getX() - nb.getWidth()/2,
- // c.getY() - nb.getHeight()/2,
- // nb.getWidth(),
- // nb.getHeight());
-
- Rectangle centeredNBounds = new Rectangle(pb.x + (int)((pb.width - nb.getWidth())/2.0),
- pb.y + (int)((pb.height - nb.getHeight())/2.0),
- (int)nb.getWidth(),
- (int)nb.getHeight());
-
- if ((pb.width >= nb.getWidth() && pb.height >= nb.getHeight()) && // quick check
- area.contains(centeredNBounds) // slow but nice
- ) {
- if (inactive || 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()));
- g.setFont(defaultFont);
- }
- }
- }
-
- public void drawArea(Relation r, Color color, MapImage fillImage, TextElement text) {
- Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, r);
- if (!r.isDisabled() && !multipolygon.getOuterWays().isEmpty()) {
- for (PolyData pd : multipolygon.getCombinedPolygons()) {
- Path2D.Double p = pd.get();
- if (!isAreaVisible(p)) {
- continue;
- }
- drawArea(r, p,
- pd.selected ? settings.getRelationSelectedColor(color.getAlpha()) : color,
- fillImage, text);
- }
- }
- }
-
- private boolean isAreaVisible(Path2D.Double area) {
- Rectangle2D bounds = area.getBounds2D();
- if (bounds.isEmpty()) return false;
- Point2D p = nc.getPoint2D(new EastNorth(bounds.getX(), bounds.getY()));
- if (p.getX() > nc.getWidth()) return false;
- if (p.getY() < 0) return false;
- p = nc.getPoint2D(new EastNorth(bounds.getX() + bounds.getWidth(), bounds.getY() + bounds.getHeight()));
- if (p.getX() < 0) return false;
- if (p.getY() > nc.getHeight()) return false;
- return true;
- }
-
- public void drawRestriction(Image img, Point pVia, double vx, double vx2, double vy, double vy2, double angle, boolean selected) {
- /* rotate image with direction last node in from to */
- Image rotatedImg = ImageProvider.createRotatedImage(null , img, angle);
-
- /* scale down image to 16*16 pixels */
- Image smallImg = new ImageIcon(rotatedImg.getScaledInstance(16 , 16, Image.SCALE_SMOOTH)).getImage();
- int w = smallImg.getWidth(null), h=smallImg.getHeight(null);
- g.drawImage(smallImg, (int)(pVia.x+vx+vx2)-w/2, (int)(pVia.y+vy+vy2)-h/2, nc);
-
- if (selected) {
- g.setColor(inactive ? inactiveColor : relationSelectedColor);
- g.drawRect((int)(pVia.x+vx+vx2)-w/2-2,(int)(pVia.y+vy+vy2)-h/2-2, w+4, h+4);
- }
- }
-
- public void drawRestriction(Relation r, MapImage icon) {
- Way fromWay = null;
- Way toWay = null;
- OsmPrimitive via = null;
-
- /* find the "from", "via" and "to" elements */
- for (RelationMember m : r.getMembers())
- {
- if(m.getMember().isIncomplete())
- return;
- else
- {
- if(m.isWay())
- {
- Way w = m.getWay();
- if(w.getNodesCount() < 2) {
- continue;
- }
-
- if("from".equals(m.getRole())) {
- if(fromWay == null) {
- fromWay = w;
- }
- } else if("to".equals(m.getRole())) {
- if(toWay == null) {
- toWay = w;
- }
- } else if("via".equals(m.getRole())) {
- if(via == null) {
- via = w;
- }
- }
- }
- else if(m.isNode())
- {
- Node n = m.getNode();
- if("via".equals(m.getRole()) && via == null) {
- via = n;
- }
- }
- }
- }
-
- if (fromWay == null || toWay == null || via == null)
- return;
-
- Node viaNode;
- if(via instanceof Node)
- {
- viaNode = (Node) via;
- if(!fromWay.isFirstLastNode(viaNode))
- return;
- }
- else
- {
- Way viaWay = (Way) via;
- Node firstNode = viaWay.firstNode();
- Node lastNode = viaWay.lastNode();
- Boolean onewayvia = false;
-
- String onewayviastr = viaWay.get("oneway");
- if(onewayviastr != null)
- {
- if("-1".equals(onewayviastr)) {
- onewayvia = true;
- Node tmp = firstNode;
- firstNode = lastNode;
- lastNode = tmp;
- } else {
- onewayvia = OsmUtils.getOsmBoolean(onewayviastr);
- if (onewayvia == null) {
- onewayvia = false;
- }
- }
- }
-
- if(fromWay.isFirstLastNode(firstNode)) {
- viaNode = firstNode;
- } else if (!onewayvia && fromWay.isFirstLastNode(lastNode)) {
- viaNode = lastNode;
- } else
- return;
- }
-
- /* find the "direct" nodes before the via node */
- Node fromNode = null;
- if(fromWay.firstNode() == via) {
- fromNode = fromWay.getNode(1);
- } else {
- fromNode = fromWay.getNode(fromWay.getNodesCount()-2);
- }
-
- Point pFrom = nc.getPoint(fromNode);
- Point pVia = nc.getPoint(viaNode);
-
- /* starting from via, go back the "from" way a few pixels
- (calculate the vector vx/vy with the specified length and the direction
- away from the "via" node along the first segment of the "from" way)
- */
- double distanceFromVia=14;
- double dx = (pFrom.x >= pVia.x) ? (pFrom.x - pVia.x) : (pVia.x - pFrom.x);
- double dy = (pFrom.y >= pVia.y) ? (pFrom.y - pVia.y) : (pVia.y - pFrom.y);
-
- double fromAngle;
- if(dx == 0.0) {
- fromAngle = Math.PI/2;
- } else {
- fromAngle = Math.atan(dy / dx);
- }
- double fromAngleDeg = Math.toDegrees(fromAngle);
-
- double vx = distanceFromVia * Math.cos(fromAngle);
- double vy = distanceFromVia * Math.sin(fromAngle);
-
- if(pFrom.x < pVia.x) {
- vx = -vx;
- }
- if(pFrom.y < pVia.y) {
- vy = -vy;
- }
-
- /* go a few pixels away from the way (in a right angle)
- (calculate the vx2/vy2 vector with the specified length and the direction
- 90degrees away from the first segment of the "from" way)
- */
- double distanceFromWay=10;
- double vx2 = 0;
- double vy2 = 0;
- double iconAngle = 0;
-
- if(pFrom.x >= pVia.x && pFrom.y >= pVia.y) {
- if(!leftHandTraffic) {
- vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg - 90));
- vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg - 90));
- } else {
- vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 90));
- vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 90));
- }
- iconAngle = 270+fromAngleDeg;
- }
- if(pFrom.x < pVia.x && pFrom.y >= pVia.y) {
- if(!leftHandTraffic) {
- vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg));
- vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg));
- } else {
- vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 180));
- vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 180));
- }
- iconAngle = 90-fromAngleDeg;
- }
- if(pFrom.x < pVia.x && pFrom.y < pVia.y) {
- if(!leftHandTraffic) {
- vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 90));
- vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 90));
- } else {
- vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg - 90));
- vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg - 90));
- }
- iconAngle = 90+fromAngleDeg;
- }
- if(pFrom.x >= pVia.x && pFrom.y < pVia.y) {
- if(!leftHandTraffic) {
- vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 180));
- vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 180));
- } else {
- vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg));
- vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg));
- }
- iconAngle = 270-fromAngleDeg;
- }
-
- drawRestriction(inactive || r.isDisabled() ? icon.getDisabled() : icon.getImage(),
- pVia, vx, vx2, vy, vy2, iconAngle, r.isSelected());
- }
-
- public void drawVirtualNodes(Collection ways, Collection highlightVirtualNodes) {
- if (virtualNodeSize == 0)
- return;
- // print normal virtual nodes
- GeneralPath path = new GeneralPath();
- for (Way osm: ways){
- if (osm.isUsable() && !osm.isDisabled()) {
- visitVirtual(path, osm);
- }
- }
- g.setColor(nodeColor);
- g.draw(path);
- // print highlighted virtual nodes. Since only the color changes, simply
- // drawing them over the existing ones works fine (at least in their current
- // simple style)
- path = new GeneralPath();
- for (WaySegment wseg: highlightVirtualNodes){
- if (wseg.way.isUsable() && !wseg.way.isDisabled()) {
- visitVirtual(path, wseg.toWay());
- }
- }
- g.setColor(highlightColor);
- g.draw(path);
- }
-
- public void visitVirtual(GeneralPath path, Way w) {
- Iterator it = w.getNodes().iterator();
- if (it.hasNext()) {
- Point lastP = nc.getPoint(it.next());
- while(it.hasNext())
- {
- Point p = nc.getPoint(it.next());
- if(isSegmentVisible(lastP, p) && isLargeSegment(lastP, p, virtualNodeSpace))
- {
- int x = (p.x+lastP.x)/2;
- int y = (p.y+lastP.y)/2;
- path.moveTo(x-virtualNodeSize, y);
- path.lineTo(x+virtualNodeSize, y);
- path.moveTo(x, y-virtualNodeSize);
- path.lineTo(x, y+virtualNodeSize);
- }
- lastP = p;
- }
- }
- }
-
- private static boolean isLargeSegment(Point p1, Point p2, int space) {
- int xd = p1.x-p2.x; if(xd < 0) {
- xd = -xd;
- }
- int yd = p1.y-p2.y; if(yd < 0) {
- yd = -yd;
- }
- return (xd+yd > space);
- }
-
- /**
- * Draw a number of the order of the two consecutive nodes within the
- * parents way
- */
- public void drawOrderNumber(Node n1, Node n2, int orderNumber, Color clr) {
- Point p1 = nc.getPoint(n1);
- Point p2 = nc.getPoint(n2);
- drawOrderNumber(p1, p2, orderNumber, clr);
- }
-
- /**
- * Draw an number of the order of the two consecutive nodes within the
- * parents way
- */
- protected void drawOrderNumber(Point p1, Point p2, int orderNumber, Color clr) {
- if (isSegmentVisible(p1, p2) && isLargeSegment(p1, p2, segmentNumberSpace)) {
- String on = Integer.toString(orderNumber);
- int strlen = on.length();
- int x = (p1.x+p2.x)/2 - 4*strlen;
- int y = (p1.y+p2.y)/2 + 4;
-
- if(virtualNodeSize != 0 && isLargeSegment(p1, p2, virtualNodeSpace))
- {
- y = (p1.y+p2.y)/2 - virtualNodeSize - 3;
- }
-
- g.setColor(backgroundColor);
- g.fillRect(x-1, y-12, 8*strlen+1, 14);
- g.setColor(clr);
- g.drawString(on, x, y);
- }
- }
-
- public boolean isShowNames() {
- return showNames;
- }
-
- public double getCircum() {
- return circum;
- }
-
- public boolean isShowIcons() {
- return showIcons;
- }
-
- public boolean isInactiveMode() {
- return inactive;
- }
-}
Index: core/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- core/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 5570)
+++ core/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (working copy)
@@ -1,93 +1,167 @@
// License: GPL. Copyright 2007 by Immanuel Scholz and others
package org.openstreetmap.josm.data.osm.visitor.paint;
+import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.FontMetrics;
import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.Polygon;
+import java.awt.Rectangle;
import java.awt.RenderingHints;
+import java.awt.Shape;
+import java.awt.TexturePaint;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
+import java.awt.font.LineMetrics;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Path2D;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
+import javax.swing.ImageIcon;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.osm.BBox;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
import org.openstreetmap.josm.gui.NavigatableComponent;
import org.openstreetmap.josm.gui.mappaint.AreaElemStyle;
+import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle;
+import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.HorizontalTextAlignment;
+import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.VerticalTextAlignment;
import org.openstreetmap.josm.gui.mappaint.ElemStyle;
import org.openstreetmap.josm.gui.mappaint.ElemStyles;
+import org.openstreetmap.josm.gui.mappaint.MapImage;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
import org.openstreetmap.josm.gui.mappaint.NodeElemStyle;
+import org.openstreetmap.josm.gui.mappaint.NodeElemStyle.Symbol;
import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
+import org.openstreetmap.josm.gui.mappaint.TextElement;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Utils;
/**
* A map renderer which renders a map according to style rules in a set of style sheets.
*
*/
-public class StyledMapRenderer extends AbstractMapRenderer{
+public class StyledMapRenderer extends AbstractMapRenderer {
- private ElemStyles styles;
- private double circum;
- private MapPainter painter;
- private MapPaintSettings paintSettings;
+ /**
+ * Iterates over a list of Way Nodes and returns screen coordinates that
+ * represent a line that is shifted by a certain offset perpendicular
+ * to the way direction.
+ *
+ * There is no intention, to handle consecutive duplicate Nodes in a
+ * perfect way, but it is should not throw an exception.
+ */
+ private class OffsetIterator implements Iterator {
- private static int FLAG_NORMAL = 0;
- private static int FLAG_DISABLED = 1;
- private static int FLAG_MEMBER_OF_SELECTED = 2;
- private static int FLAG_SELECTED = 4;
+ private List nodes;
+ private float offset;
+ private int idx;
- private static class StyleRecord implements Comparable {
- final ElemStyle style;
- final OsmPrimitive osm;
- final int flags;
+ private Point prev = null;
+ /* 'prev0' is a point that has distance 'offset' from 'prev' and the
+ * line from 'prev' to 'prev0' is perpendicular to the way segment from
+ * 'prev' to the next point.
+ */
+ private int x_prev0, y_prev0;
- public StyleRecord(ElemStyle style, OsmPrimitive osm, int flags) {
- this.style = style;
- this.osm = osm;
- this.flags = flags;
+ public OffsetIterator(List nodes, float offset) {
+ this.nodes = nodes;
+ this.offset = offset;
+ idx = 0;
}
@Override
- public int compareTo(StyleRecord other) {
- if ((this.flags & FLAG_DISABLED) != 0 && (other.flags & FLAG_DISABLED) == 0)
- return -1;
- if ((this.flags & FLAG_DISABLED) == 0 && (other.flags & FLAG_DISABLED) != 0)
- return 1;
+ public boolean hasNext() {
+ return idx < nodes.size();
+ }
- int d0 = Float.compare(this.style.major_z_index, other.style.major_z_index);
- if (d0 != 0)
- return d0;
+ @Override
+ public Point next() {
+ if (Math.abs(offset) < 0.1f) return nc.getPoint(nodes.get(idx++));
- // selected on top of member of selected on top of unselected
- // FLAG_DISABLED bit is the same at this point
- if (this.flags > other.flags)
- return 1;
- if (this.flags < other.flags)
- return -1;
+ Point current = nc.getPoint(nodes.get(idx));
- int dz = Float.compare(this.style.z_index, other.style.z_index);
- if (dz != 0)
- return dz;
+ if (idx == nodes.size() - 1) {
+ ++idx;
+ return new Point(x_prev0 + current.x - prev.x, y_prev0 + current.y - prev.y);
+ }
- // simple node on top of icons and shapes
- if (this.style == NodeElemStyle.SIMPLE_NODE_ELEMSTYLE && other.style != NodeElemStyle.SIMPLE_NODE_ELEMSTYLE)
- return 1;
- if (this.style != NodeElemStyle.SIMPLE_NODE_ELEMSTYLE && other.style == NodeElemStyle.SIMPLE_NODE_ELEMSTYLE)
- return -1;
+ Point next = nc.getPoint(nodes.get(idx+1));
- // newer primitives to the front
- long id = this.osm.getUniqueId() - other.osm.getUniqueId();
- if (id > 0)
- return 1;
- if (id < 0)
- return -1;
+ int dx_next = next.x - current.x;
+ int dy_next = next.y - current.y;
+ double len_next = Math.sqrt(dx_next*dx_next + dy_next*dy_next);
- return Float.compare(this.style.object_z_index, other.style.object_z_index);
+ if (len_next == 0) {
+ len_next = 1; // value does not matter, because dy_next and dx_next is 0
+ }
+
+ int x_current0 = current.x + (int) Math.round(offset * dy_next / len_next);
+ int y_current0 = current.y - (int) Math.round(offset * dx_next / len_next);
+
+ if (idx==0) {
+ ++idx;
+ prev = current;
+ x_prev0 = x_current0;
+ y_prev0 = y_current0;
+ return new Point(x_current0, y_current0);
+ } else {
+ int dx_prev = current.x - prev.x;
+ int dy_prev = current.y - prev.y;
+
+ // determine intersection of the lines parallel to the two
+ // segments
+ int det = dx_next*dy_prev - dx_prev*dy_next;
+
+ if (det == 0) {
+ ++idx;
+ prev = current;
+ x_prev0 = x_current0;
+ y_prev0 = y_current0;
+ return new Point(x_current0, y_current0);
+ }
+
+ int m = dx_next*(y_current0 - y_prev0) - dy_next*(x_current0 - x_prev0);
+
+ int cx_ = x_prev0 + Math.round((float)m * dx_prev / det);
+ int cy_ = y_prev0 + Math.round((float)m * dy_prev / det);
+ ++idx;
+ prev = current;
+ x_prev0 = x_current0;
+ y_prev0 = y_current0;
+ return new Point(cx_, cy_);
+ }
+ }
+
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
}
}
@@ -112,24 +186,24 @@
}
}
- public void add(Way osm, int flags) {
+ public void add(Relation osm, int flags) {
StyleList sl = styles.get(osm, circum, nc);
for (ElemStyle s : sl) {
- if (!(drawArea && (flags & FLAG_DISABLED) == 0) && s instanceof AreaElemStyle) {
- continue;
+ if (drawMultipolygon && drawArea && s instanceof AreaElemStyle && (flags & FLAG_DISABLED) == 0) {
+ styleElems.add(new StyleRecord(s, osm, flags));
+ } else if (drawRestriction && s instanceof NodeElemStyle) {
+ styleElems.add(new StyleRecord(s, osm, flags));
}
- styleElems.add(new StyleRecord(s, osm, flags));
}
}
- public void add(Relation osm, int flags) {
+ public void add(Way osm, int flags) {
StyleList sl = styles.get(osm, circum, nc);
for (ElemStyle s : sl) {
- if (drawMultipolygon && drawArea && s instanceof AreaElemStyle && (flags & FLAG_DISABLED) == 0) {
- styleElems.add(new StyleRecord(s, osm, flags));
- } else if (drawRestriction && s instanceof NodeElemStyle) {
- styleElems.add(new StyleRecord(s, osm, flags));
+ if (!(drawArea && (flags & FLAG_DISABLED) == 0) && s instanceof AreaElemStyle) {
+ continue;
}
+ styleElems.add(new StyleRecord(s, osm, flags));
}
}
@@ -139,13 +213,121 @@
r.style.paintPrimitive(
r.osm,
paintSettings,
- painter,
+ StyledMapRenderer.this,
(r.flags & FLAG_SELECTED) != 0,
(r.flags & FLAG_MEMBER_OF_SELECTED) != 0
);
}
}
}
+
+ private static class StyleRecord implements Comparable {
+ final ElemStyle style;
+ final OsmPrimitive osm;
+ final int flags;
+
+ public StyleRecord(ElemStyle style, OsmPrimitive osm, int flags) {
+ this.style = style;
+ this.osm = osm;
+ this.flags = flags;
+ }
+
+ @Override
+ public int compareTo(StyleRecord other) {
+ if ((this.flags & FLAG_DISABLED) != 0 && (other.flags & FLAG_DISABLED) == 0)
+ return -1;
+ if ((this.flags & FLAG_DISABLED) == 0 && (other.flags & FLAG_DISABLED) != 0)
+ return 1;
+
+ int d0 = Float.compare(this.style.major_z_index, other.style.major_z_index);
+ if (d0 != 0)
+ return d0;
+
+ // selected on top of member of selected on top of unselected
+ // FLAG_DISABLED bit is the same at this point
+ if (this.flags > other.flags)
+ return 1;
+ if (this.flags < other.flags)
+ return -1;
+
+ int dz = Float.compare(this.style.z_index, other.style.z_index);
+ if (dz != 0)
+ return dz;
+
+ // simple node on top of icons and shapes
+ if (this.style == NodeElemStyle.SIMPLE_NODE_ELEMSTYLE && other.style != NodeElemStyle.SIMPLE_NODE_ELEMSTYLE)
+ return 1;
+ if (this.style != NodeElemStyle.SIMPLE_NODE_ELEMSTYLE && other.style == NodeElemStyle.SIMPLE_NODE_ELEMSTYLE)
+ return -1;
+
+ // newer primitives to the front
+ long id = this.osm.getUniqueId() - other.osm.getUniqueId();
+ if (id > 0)
+ return 1;
+ if (id < 0)
+ return -1;
+
+ return Float.compare(this.style.object_z_index, other.style.object_z_index);
+ }
+ }
+
+ private static Boolean IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = null;
+
+ /**
+ * Check, if this System has the GlyphVector double translation bug.
+ *
+ * With this bug, gv.setGlyphTransform(i, trfm) has a different
+ * effect than on most other systems, namely the translation components
+ * ("m02" & "m12", {@link AffineTransform}) appear to be twice as large, as
+ * they actually are. The rotation is unaffected (scale & shear not tested
+ * so far).
+ *
+ * This bug has only been observed on Mac OS X, see #7841.
+ *
+ * @return true, if the GlyphVector double translation bug is present on
+ * this System
+ */
+ public static boolean isGlyphVectorDoubleTranslationBug() {
+ if (IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG != null)
+ return IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG;
+ FontRenderContext frc = new FontRenderContext(null, false, false);
+ Font font = new Font("Dialog", Font.PLAIN, 12);
+ GlyphVector gv = font.createGlyphVector(frc, "x");
+ gv.setGlyphTransform(0, AffineTransform.getTranslateInstance(1000, 1000));
+ Shape shape = gv.getGlyphOutline(0);
+ // x is about 1000 on normal stystems and about 2000 when the bug occurs
+ int x = shape.getBounds().x;
+ IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = x > 1500;
+ return IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG;
+ }
+
+ private ElemStyles styles;
+ private double circum;
+
+ private MapPaintSettings paintSettings;
+
+ private Color relationSelectedColor;
+ private Color highlightColorTransparent;
+
+ private static int FLAG_NORMAL = 0;
+ private static int FLAG_DISABLED = 1;
+ private static int FLAG_MEMBER_OF_SELECTED = 2;
+ private static int FLAG_SELECTED = 4;
+
+ private static final double PHI = Math.toRadians(20);
+ private static final double cosPHI = Math.cos(PHI);
+ private static final double sinPHI = Math.sin(PHI);
+
+ private Collection highlightWaySegments;
+
+ private boolean useStrokes;
+ private boolean showNames;
+ private boolean showIcons;
+ private boolean isOutlineOnly;
+
+ private Font orderFont;
+
+ private boolean leftHandTraffic;
/**
* {@inheritDoc}
@@ -154,6 +336,21 @@
super(g, nc, isInactiveMode);
}
+ private Polygon buildPolygon(Point center, int radius, int sides) {
+ return buildPolygon(center, radius, sides, 0.0);
+ }
+
+ private Polygon buildPolygon(Point center, int radius, int sides, double rotation) {
+ Polygon polygon = new Polygon();
+ for (int i = 0; i < sides; i++) {
+ double angle = ((2 * Math.PI / sides) * i) - rotation;
+ int x = (int) Math.round(center.x + radius * Math.cos(angle));
+ int y = (int) Math.round(center.y + radius * Math.sin(angle));
+ polygon.addPoint(x, y);
+ }
+ return polygon;
+ }
+
private void collectNodeStyles(DataSet data, StyleCollector sc, BBox bbox) {
for (final Node n: data.searchNodes(bbox)) {
if (n.isDrawable()) {
@@ -170,6 +367,20 @@
}
}
+ private void collectRelationStyles(DataSet data, StyleCollector sc, BBox bbox) {
+ for (Relation r: data.searchRelations(bbox)) {
+ if (r.isDrawable()) {
+ if (r.isDisabled()) {
+ sc.add(r, FLAG_DISABLED);
+ } else if (data.isSelected(r)) {
+ sc.add(r, FLAG_SELECTED);
+ } else {
+ sc.add(r, FLAG_NORMAL);
+ }
+ }
+ }
+ }
+
private void collectWayStyles(DataSet data, StyleCollector sc, BBox bbox) {
for (final Way w : data.searchWays(bbox)) {
if (w.isDrawable()) {
@@ -186,43 +397,947 @@
}
}
- private void collectRelationStyles(DataSet data, StyleCollector sc, BBox bbox) {
- for (Relation r: data.searchRelations(bbox)) {
- if (r.isDrawable()) {
- if (r.isDisabled()) {
- sc.add(r, FLAG_DISABLED);
- } else if (data.isSelected(r)) {
- sc.add(r, FLAG_SELECTED);
+ private void displaySegments(GeneralPath path, GeneralPath orientationArrows, GeneralPath onewayArrows, GeneralPath onewayArrowsCasing,
+ Color color, BasicStroke line, BasicStroke dashes, Color dashedColor) {
+ g.setColor(isInactiveMode ? inactiveColor : color);
+ if (useStrokes) {
+ g.setStroke(line);
+ }
+ g.draw(path);
+
+ if(!isInactiveMode && useStrokes && dashes != null) {
+ g.setColor(dashedColor);
+ g.setStroke(dashes);
+ g.draw(path);
+ }
+
+ if (orientationArrows != null) {
+ g.setColor(isInactiveMode ? inactiveColor : color);
+ g.setStroke(new BasicStroke(line.getLineWidth(), line.getEndCap(), BasicStroke.JOIN_MITER, line.getMiterLimit()));
+ g.draw(orientationArrows);
+ }
+
+ if (onewayArrows != null) {
+ g.setStroke(new BasicStroke(1, line.getEndCap(), BasicStroke.JOIN_MITER, line.getMiterLimit()));
+ g.fill(onewayArrowsCasing);
+ g.setColor(isInactiveMode ? inactiveColor : backgroundColor);
+ g.fill(onewayArrows);
+ }
+
+ if (useStrokes) {
+ g.setStroke(new BasicStroke());
+ }
+ }
+
+ protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color, MapImage fillImage, TextElement text) {
+
+ Shape area = path.createTransformedShape(nc.getAffineTransform());
+
+ if (!isOutlineOnly) {
+ if (fillImage == null) {
+ if (isInactiveMode) {
+ g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.33f));
+ }
+ g.setColor(color);
+ g.fill(area);
+ } else {
+ TexturePaint texture = new TexturePaint(fillImage.getImage(),
+ // new Rectangle(polygon.xpoints[0], polygon.ypoints[0], fillImage.getWidth(), fillImage.getHeight()));
+ new Rectangle(0, 0, fillImage.getWidth(), fillImage.getHeight()));
+ g.setPaint(texture);
+ Float alpha = Utils.color_int2float(fillImage.alpha);
+ if (alpha != 1f) {
+ g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha));
+ }
+ g.fill(area);
+ g.setPaintMode();
+ }
+ }
+
+ if (text != null && isShowNames()) {
+ /*
+ * abort if we can't compose the label to be rendered
+ */
+ if (text.labelCompositionStrategy == null) return;
+ String name = text.labelCompositionStrategy.compose(osm);
+ if (name == null) return;
+
+ Rectangle pb = area.getBounds();
+ FontMetrics fontMetrics = g.getFontMetrics(orderFont); // if slow, use cache
+ Rectangle2D nb = fontMetrics.getStringBounds(name, g); // if slow, approximate by strlen()*maxcharbounds(font)
+
+ // Point2D c = getCentroid(polygon);
+ // 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.
+ // Point2D c = new Point2D.Double(pb.x + pb.width / 2.0, pb.y + pb.height / 2.0);
+ // Rectangle2D.Double centeredNBounds =
+ // new Rectangle2D.Double(c.getX() - nb.getWidth()/2,
+ // c.getY() - nb.getHeight()/2,
+ // nb.getWidth(),
+ // nb.getHeight());
+
+ Rectangle centeredNBounds = new Rectangle(pb.x + (int)((pb.width - nb.getWidth())/2.0),
+ pb.y + (int)((pb.height - nb.getHeight())/2.0),
+ (int)nb.getWidth(),
+ (int)nb.getHeight());
+
+ 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 {
- sc.add(r, FLAG_NORMAL);
+ 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()));
+ g.setFont(defaultFont);
}
}
}
+
+ public void drawArea(Relation r, Color color, MapImage fillImage, TextElement text) {
+ Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, r);
+ if (!r.isDisabled() && !multipolygon.getOuterWays().isEmpty()) {
+ for (PolyData pd : multipolygon.getCombinedPolygons()) {
+ Path2D.Double p = pd.get();
+ if (!isAreaVisible(p)) {
+ continue;
+ }
+ drawArea(r, p,
+ pd.selected ? paintSettings.getRelationSelectedColor(color.getAlpha()) : color,
+ fillImage, text);
+ }
+ }
+ }
+
+ public void drawArea(Way w, Color color, MapImage fillImage, TextElement text) {
+ drawArea(w, getPath(w), color, fillImage, text);
+ }
+
+ public void drawBoxText(Node n, BoxTextElemStyle bs) {
+ if (!isShowNames() || bs == null)
+ return;
+
+ Point p = nc.getPoint(n);
+ TextElement text = bs.text;
+ String s = text.labelCompositionStrategy.compose(n);
+ if (s == null) return;
+
+ Font defaultFont = g.getFont();
+ g.setFont(text.font);
+
+ int x = p.x + text.xOffset;
+ int y = p.y + text.yOffset;
+ /**
+ *
+ * left-above __center-above___ right-above
+ * left-top| |right-top
+ * | |
+ * left-center| center-center |right-center
+ * | |
+ * left-bottom|_________________|right-bottom
+ * left-below center-below right-below
+ *
+ */
+ Rectangle box = bs.getBox();
+ if (bs.hAlign == HorizontalTextAlignment.RIGHT) {
+ x += box.x + box.width + 2;
+ } else {
+ FontRenderContext frc = g.getFontRenderContext();
+ Rectangle2D bounds = text.font.getStringBounds(s, frc);
+ int textWidth = (int) bounds.getWidth();
+ if (bs.hAlign == HorizontalTextAlignment.CENTER) {
+ x -= textWidth / 2;
+ } else if (bs.hAlign == HorizontalTextAlignment.LEFT) {
+ x -= - box.x + 4 + textWidth;
+ } else throw new AssertionError();
+ }
+
+ if (bs.vAlign == VerticalTextAlignment.BOTTOM) {
+ y += box.y + box.height;
+ } else {
+ FontRenderContext frc = g.getFontRenderContext();
+ LineMetrics metrics = text.font.getLineMetrics(s, frc);
+ if (bs.vAlign == VerticalTextAlignment.ABOVE) {
+ y -= - box.y + metrics.getDescent();
+ } else if (bs.vAlign == VerticalTextAlignment.TOP) {
+ y -= - box.y - metrics.getAscent();
+ } else if (bs.vAlign == VerticalTextAlignment.CENTER) {
+ y += (metrics.getAscent() - metrics.getDescent()) / 2;
+ } else if (bs.vAlign == VerticalTextAlignment.BELOW) {
+ 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);
+ }
+ g.setFont(defaultFont);
+ }
+
+ public void drawLinePattern(Way way, Image pattern) {
+ final int width = pattern.getWidth(null);
+ final int height = pattern.getHeight(null);
+
+ Point lastP = null;
+ double wayLength = 0;
+
+ Iterator it = way.getNodes().iterator();
+ while (it.hasNext()) {
+ Node n = it.next();
+ Point thisP = nc.getPoint(n);
+
+ if (lastP != null) {
+ final double segmentLength = thisP.distance(lastP);
+
+ final double dx = thisP.x - lastP.x;
+ final double dy = thisP.y - lastP.y;
+
+ double dist = wayLength == 0 ? 0 : width - (wayLength % width);
+
+ AffineTransform saveTransform = g.getTransform();
+ g.translate(lastP.x, lastP.y);
+ g.rotate(Math.atan2(dy, dx));
+
+ if (dist > 0) {
+ g.drawImage(pattern, 0, 0, (int) dist, height,
+ width - (int) dist, 0, width, height, null);
+ }
+ while (dist < segmentLength) {
+ if (dist + width > segmentLength) {
+ g.drawImage(pattern, (int) dist, 0, (int) segmentLength, height,
+ 0, 0, (int) segmentLength - (int) dist, height, null);
+ } else {
+ g.drawImage(pattern, (int) dist, 0, nc);
+ }
+ dist += width;
+ }
+ g.setTransform(saveTransform);
+ wayLength += segmentLength;
+ }
+ lastP = thisP;
+ }
+ }
+
@Override
- public void render(final DataSet data, boolean renderVirtualNodes, Bounds bounds) {
- //long start = System.currentTimeMillis();
- BBox bbox = new BBox(bounds);
+ public void drawNode(Node n, Color color, int size, boolean fill) {
+ if(size <= 0 && !n.isHighlighted())
+ return;
- styles = MapPaintStyles.getStyles();
+ Point p = nc.getPoint(n);
+
+ if(n.isHighlighted()) {
+ drawPointHighlight(p, size);
+ }
- this.paintSettings = MapPaintSettings.INSTANCE;
+ if (size > 1) {
+ if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
+ int radius = size / 2;
+
+ if (isInactiveMode || n.isDisabled()) {
+ g.setColor(inactiveColor);
+ } else {
+ g.setColor(color);
+ }
+ if (fill) {
+ g.fillRect(p.x-radius-1, p.y-radius-1, size + 1, size + 1);
+ } else {
+ g.drawRect(p.x-radius-1, p.y-radius-1, size, size);
+ }
+ }
+ }
+
+ public void drawNodeIcon(Node n, Image img, float alpha, boolean selected, boolean member) {
+ Point p = nc.getPoint(n);
+
+ final int w = img.getWidth(null), h=img.getHeight(null);
+ if(n.isHighlighted()) {
+ drawPointHighlight(p, Math.max(w, h));
+ }
+
+ if (alpha != 1f) {
+ g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha));
+ }
+ g.drawImage(img, p.x-w/2, p.y-h/2, nc);
+ g.setPaintMode();
+ if (selected || member)
+ {
+ Color color = null;
+ if (isInactiveMode || n.isDisabled()) {
+ color = inactiveColor;
+ } else if (selected) {
+ color = selectedColor;
+ } else {
+ color = relationSelectedColor;
+ }
+ g.setColor(color);
+ g.drawRect(p.x-w/2-2, p.y-h/2-2, w+4, h+4);
+ }
+ }
+
+ public void drawNodeSymbol(Node n, Symbol s, Color fillColor, Color strokeColor) {
+ Point p = nc.getPoint(n);
+ int radius = s.size / 2;
+
+ if(n.isHighlighted()) {
+ drawPointHighlight(p, s.size);
+ }
+
+ if (fillColor != null) {
+ g.setColor(fillColor);
+ switch (s.symbol) {
+ case SQUARE:
+ g.fillRect(p.x - radius, p.y - radius, s.size, s.size);
+ break;
+ case CIRCLE:
+ g.fillOval(p.x - radius, p.y - radius, s.size, s.size);
+ break;
+ case TRIANGLE:
+ g.fillPolygon(buildPolygon(p, radius, 3, Math.PI / 2));
+ break;
+ case PENTAGON:
+ g.fillPolygon(buildPolygon(p, radius, 5, Math.PI / 2));
+ break;
+ case HEXAGON:
+ g.fillPolygon(buildPolygon(p, radius, 6));
+ break;
+ case HEPTAGON:
+ g.fillPolygon(buildPolygon(p, radius, 7, Math.PI / 2));
+ break;
+ case OCTAGON:
+ g.fillPolygon(buildPolygon(p, radius, 8, Math.PI / 8));
+ break;
+ case NONAGON:
+ g.fillPolygon(buildPolygon(p, radius, 9, Math.PI / 2));
+ break;
+ case DECAGON:
+ g.fillPolygon(buildPolygon(p, radius, 10));
+ break;
+ default:
+ throw new AssertionError();
+ }
+ }
+ if (s.stroke != null) {
+ g.setStroke(s.stroke);
+ g.setColor(strokeColor);
+ switch (s.symbol) {
+ case SQUARE:
+ g.drawRect(p.x - radius, p.y - radius, s.size - 1, s.size - 1);
+ break;
+ case CIRCLE:
+ g.drawOval(p.x - radius, p.y - radius, s.size - 1, s.size - 1);
+ break;
+ case TRIANGLE:
+ g.drawPolygon(buildPolygon(p, radius, 3, Math.PI / 2));
+ break;
+ case PENTAGON:
+ g.drawPolygon(buildPolygon(p, radius, 5, Math.PI / 2));
+ break;
+ case HEXAGON:
+ g.drawPolygon(buildPolygon(p, radius, 6));
+ break;
+ case HEPTAGON:
+ g.drawPolygon(buildPolygon(p, radius, 7, Math.PI / 2));
+ break;
+ case OCTAGON:
+ g.drawPolygon(buildPolygon(p, radius, 8, Math.PI / 8));
+ break;
+ case NONAGON:
+ g.drawPolygon(buildPolygon(p, radius, 9, Math.PI / 2));
+ break;
+ case DECAGON:
+ g.drawPolygon(buildPolygon(p, radius, 10));
+ break;
+ default:
+ throw new AssertionError();
+ }
+ g.setStroke(new BasicStroke());
+ }
+ }
+
+ /**
+ * Draw a number of the order of the two consecutive nodes within the
+ * parents way
+ */
+ public void drawOrderNumber(Node n1, Node n2, int orderNumber, Color clr) {
+ Point p1 = nc.getPoint(n1);
+ Point p2 = nc.getPoint(n2);
+ StyledMapRenderer.this.drawOrderNumber(p1, p2, orderNumber, clr);
+ }
+
+ /**
+ * highlights a given GeneralPath using the settings from BasicStroke to match the line's
+ * style. Width of the highlight is hard coded.
+ * @param path
+ * @param line
+ */
+ private void drawPathHighlight(GeneralPath path, BasicStroke line) {
+ if(path == null)
+ return;
+ g.setColor(highlightColorTransparent);
+ float w = (line.getLineWidth() + 4);
+ while(w >= line.getLineWidth()) {
+ g.setStroke(new BasicStroke(w, line.getEndCap(), line.getLineJoin(), line.getMiterLimit()));
+ g.draw(path);
+ w -= 4;
+ }
+ }
+ /**
+ * highlights a given point by drawing a rounded rectangle around it. Give the
+ * size of the object you want to be highlighted, width is added automatically.
+ */
+ private void drawPointHighlight(Point p, int size) {
+ g.setColor(highlightColorTransparent);
+ int s = size + 7;
+ while(s >= size) {
+ int r = (int) Math.floor(s/2);
+ g.fillRoundRect(p.x-r, p.y-r, s, s, r, r);
+ s -= 4;
+ }
+ }
+
+ public void drawRestriction(Image img, Point pVia, double vx, double vx2, double vy, double vy2, double angle, boolean selected) {
+ /* rotate image with direction last node in from to */
+ Image rotatedImg = ImageProvider.createRotatedImage(null , img, angle);
+
+ /* scale down image to 16*16 pixels */
+ Image smallImg = new ImageIcon(rotatedImg.getScaledInstance(16 , 16, Image.SCALE_SMOOTH)).getImage();
+ int w = smallImg.getWidth(null), h=smallImg.getHeight(null);
+ g.drawImage(smallImg, (int)(pVia.x+vx+vx2)-w/2, (int)(pVia.y+vy+vy2)-h/2, nc);
+
+ if (selected) {
+ g.setColor(isInactiveMode ? inactiveColor : relationSelectedColor);
+ g.drawRect((int)(pVia.x+vx+vx2)-w/2-2,(int)(pVia.y+vy+vy2)-h/2-2, w+4, h+4);
+ }
+ }
+
+ public void drawRestriction(Relation r, MapImage icon) {
+ Way fromWay = null;
+ Way toWay = null;
+ OsmPrimitive via = null;
+
+ /* find the "from", "via" and "to" elements */
+ for (RelationMember m : r.getMembers())
+ {
+ if(m.getMember().isIncomplete())
+ return;
+ else
+ {
+ if(m.isWay())
+ {
+ Way w = m.getWay();
+ if(w.getNodesCount() < 2) {
+ continue;
+ }
+
+ if("from".equals(m.getRole())) {
+ if(fromWay == null) {
+ fromWay = w;
+ }
+ } else if("to".equals(m.getRole())) {
+ if(toWay == null) {
+ toWay = w;
+ }
+ } else if("via".equals(m.getRole())) {
+ if(via == null) {
+ via = w;
+ }
+ }
+ }
+ else if(m.isNode())
+ {
+ Node n = m.getNode();
+ if("via".equals(m.getRole()) && via == null) {
+ via = n;
+ }
+ }
+ }
+ }
+
+ if (fromWay == null || toWay == null || via == null)
+ return;
+
+ Node viaNode;
+ if(via instanceof Node)
+ {
+ viaNode = (Node) via;
+ if(!fromWay.isFirstLastNode(viaNode))
+ return;
+ }
+ else
+ {
+ Way viaWay = (Way) via;
+ Node firstNode = viaWay.firstNode();
+ Node lastNode = viaWay.lastNode();
+ Boolean onewayvia = false;
+
+ String onewayviastr = viaWay.get("oneway");
+ if(onewayviastr != null)
+ {
+ if("-1".equals(onewayviastr)) {
+ onewayvia = true;
+ Node tmp = firstNode;
+ firstNode = lastNode;
+ lastNode = tmp;
+ } else {
+ onewayvia = OsmUtils.getOsmBoolean(onewayviastr);
+ if (onewayvia == null) {
+ onewayvia = false;
+ }
+ }
+ }
+
+ if(fromWay.isFirstLastNode(firstNode)) {
+ viaNode = firstNode;
+ } else if (!onewayvia && fromWay.isFirstLastNode(lastNode)) {
+ viaNode = lastNode;
+ } else
+ return;
+ }
+
+ /* find the "direct" nodes before the via node */
+ Node fromNode = null;
+ if(fromWay.firstNode() == via) {
+ fromNode = fromWay.getNode(1);
+ } else {
+ fromNode = fromWay.getNode(fromWay.getNodesCount()-2);
+ }
+
+ Point pFrom = nc.getPoint(fromNode);
+ Point pVia = nc.getPoint(viaNode);
+
+ /* starting from via, go back the "from" way a few pixels
+ (calculate the vector vx/vy with the specified length and the direction
+ away from the "via" node along the first segment of the "from" way)
+ */
+ double distanceFromVia=14;
+ double dx = (pFrom.x >= pVia.x) ? (pFrom.x - pVia.x) : (pVia.x - pFrom.x);
+ double dy = (pFrom.y >= pVia.y) ? (pFrom.y - pVia.y) : (pVia.y - pFrom.y);
+
+ double fromAngle;
+ if(dx == 0.0) {
+ fromAngle = Math.PI/2;
+ } else {
+ fromAngle = Math.atan(dy / dx);
+ }
+ double fromAngleDeg = Math.toDegrees(fromAngle);
+
+ double vx = distanceFromVia * Math.cos(fromAngle);
+ double vy = distanceFromVia * Math.sin(fromAngle);
+
+ if(pFrom.x < pVia.x) {
+ vx = -vx;
+ }
+ if(pFrom.y < pVia.y) {
+ vy = -vy;
+ }
+
+ /* go a few pixels away from the way (in a right angle)
+ (calculate the vx2/vy2 vector with the specified length and the direction
+ 90degrees away from the first segment of the "from" way)
+ */
+ double distanceFromWay=10;
+ double vx2 = 0;
+ double vy2 = 0;
+ double iconAngle = 0;
+
+ if(pFrom.x >= pVia.x && pFrom.y >= pVia.y) {
+ if(!leftHandTraffic) {
+ vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg - 90));
+ vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg - 90));
+ } else {
+ vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 90));
+ vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 90));
+ }
+ iconAngle = 270+fromAngleDeg;
+ }
+ if(pFrom.x < pVia.x && pFrom.y >= pVia.y) {
+ if(!leftHandTraffic) {
+ vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg));
+ vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg));
+ } else {
+ vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 180));
+ vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 180));
+ }
+ iconAngle = 90-fromAngleDeg;
+ }
+ if(pFrom.x < pVia.x && pFrom.y < pVia.y) {
+ if(!leftHandTraffic) {
+ vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 90));
+ vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 90));
+ } else {
+ vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg - 90));
+ vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg - 90));
+ }
+ iconAngle = 90+fromAngleDeg;
+ }
+ if(pFrom.x >= pVia.x && pFrom.y < pVia.y) {
+ if(!leftHandTraffic) {
+ vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 180));
+ vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 180));
+ } else {
+ vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg));
+ vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg));
+ }
+ iconAngle = 270-fromAngleDeg;
+ }
+
+ drawRestriction(isInactiveMode || r.isDisabled() ? icon.getDisabled() : icon.getImage(),
+ pVia, vx, vx2, vy, vy2, iconAngle, r.isSelected());
+ }
+
+ public void drawTextOnPath(Way way, TextElement text) {
+ if (way == null || text == null)
+ return;
+ String name = text.getString(way);
+ if (name == null || name.isEmpty())
+ return;
+
+ Polygon poly = new Polygon();
+ Point lastPoint = null;
+ Iterator it = way.getNodes().iterator();
+ double pathLength = 0;
+ long dx, dy;
+ while (it.hasNext()) {
+ Node n = it.next();
+ Point p = nc.getPoint(n);
+ poly.addPoint(p.x, p.y);
+
+ if(lastPoint != null) {
+ dx = p.x - lastPoint.x;
+ dy = p.y - lastPoint.y;
+ pathLength += Math.sqrt(dx*dx + dy*dy);
+ }
+ lastPoint = p;
+ }
+
+ FontMetrics fontMetrics = g.getFontMetrics(text.font); // if slow, use cache
+ Rectangle2D rec = fontMetrics.getStringBounds(name, g); // if slow, approximate by strlen()*maxcharbounds(font)
+
+ if (rec.getWidth() > pathLength)
+ return;
+
+ double t1 = (pathLength/2 - rec.getWidth()/2) / pathLength;
+ double t2 = (pathLength/2 + rec.getWidth()/2) / pathLength;
+
+ double[] p1 = pointAt(t1, poly, pathLength);
+ double[] p2 = pointAt(t2, poly, pathLength);
+
+ if (p1 == null || p2 == null)
+ return;
+
+ double angleOffset;
+ double offsetSign;
+ double tStart;
+
+ if (p1[0] < p2[0] &&
+ p1[2] < Math.PI/2 &&
+ p1[2] > -Math.PI/2) {
+ angleOffset = 0;
+ offsetSign = 1;
+ tStart = t1;
+ } else {
+ angleOffset = Math.PI;
+ offsetSign = -1;
+ tStart = t2;
+ }
+
+ FontRenderContext frc = g.getFontRenderContext();
+ GlyphVector gv = text.font.createGlyphVector(frc, name);
+
+ for (int i=0; i wayNodes = way.getNodes();
+ if (wayNodes.size() < 2) return;
+
+ // only highlight the segment if the way itself is not highlighted
+ if (!way.isHighlighted()) {
+ GeneralPath highlightSegs = null;
+ for (WaySegment ws : highlightWaySegments) {
+ if (ws.way != way || ws.lowerIndex < offset) {
+ continue;
+ }
+ if(highlightSegs == null) {
+ highlightSegs = new GeneralPath();
+ }
+
+ Point p1 = nc.getPoint(ws.getFirstNode());
+ Point p2 = nc.getPoint(ws.getSecondNode());
+ highlightSegs.moveTo(p1.x, p1.y);
+ highlightSegs.lineTo(p2.x, p2.y);
+ }
+
+ drawPathHighlight(highlightSegs, line);
+ }
+
+ Iterator it = new OffsetIterator(wayNodes, offset);
+ while (it.hasNext()) {
+ Point p = it.next();
+ if (lastPoint != null) {
+ Point p1 = lastPoint;
+ Point p2 = p;
+
+ /**
+ * Do custom clipping to work around openjdk bug. It leads to
+ * drawing artefacts when zooming in a lot. (#4289, #4424)
+ * (Looks like int overflow.)
+ */
+ LineClip clip = new LineClip(p1, p2, bounds);
+ if (clip.execute()) {
+ if (!p1.equals(clip.getP1())) {
+ p1 = clip.getP1();
+ path.moveTo(p1.x, p1.y);
+ } else if (initialMoveToNeeded) {
+ initialMoveToNeeded = false;
+ path.moveTo(p1.x, p1.y);
+ }
+ p2 = clip.getP2();
+ path.lineTo(p2.x, p2.y);
+
+ /* draw arrow */
+ if (showHeadArrowOnly ? !it.hasNext() : showOrientation) {
+ final double segmentLength = p1.distance(p2);
+ if (segmentLength != 0.0) {
+ final double l = (10. + line.getLineWidth()) / segmentLength;
+
+ final double sx = l * (p1.x - p2.x);
+ final double sy = l * (p1.y - p2.y);
+
+ orientationArrows.moveTo (p2.x + cosPHI * sx - sinPHI * sy, p2.y + sinPHI * sx + cosPHI * sy);
+ orientationArrows.lineTo(p2.x, p2.y);
+ orientationArrows.lineTo (p2.x + cosPHI * sx + sinPHI * sy, p2.y - sinPHI * sx + cosPHI * sy);
+ }
+ }
+ if (showOneway) {
+ final double segmentLength = p1.distance(p2);
+ if (segmentLength != 0.0) {
+ final double nx = (p2.x - p1.x) / segmentLength;
+ final double ny = (p2.y - p1.y) / segmentLength;
+
+ final double interval = 60;
+ // distance from p1
+ double dist = interval - (wayLength % interval);
+
+ while (dist < segmentLength) {
+ for (Pair sizeAndPath : Arrays.asList(new Pair[] {
+ new Pair(3f, onewayArrowsCasing),
+ new Pair(2f, onewayArrows)})) {
+
+ // scale such that border is 1 px
+ final double fac = - (onewayReversed ? -1 : 1) * sizeAndPath.a * (1 + sinPHI) / (sinPHI * cosPHI);
+ final double sx = nx * fac;
+ final double sy = ny * fac;
+
+ // Attach the triangle at the incenter and not at the tip.
+ // Makes the border even at all sides.
+ final double x = p1.x + nx * (dist + (onewayReversed ? -1 : 1) * (sizeAndPath.a / sinPHI));
+ final double y = p1.y + ny * (dist + (onewayReversed ? -1 : 1) * (sizeAndPath.a / sinPHI));
+
+ sizeAndPath.b.moveTo(x, y);
+ sizeAndPath.b.lineTo (x + cosPHI * sx - sinPHI * sy, y + sinPHI * sx + cosPHI * sy);
+ sizeAndPath.b.lineTo (x + cosPHI * sx + sinPHI * sy, y - sinPHI * sx + cosPHI * sy);
+ sizeAndPath.b.lineTo(x, y);
+ }
+ dist += interval;
+ }
+ }
+ wayLength += segmentLength;
+ }
+ }
+ }
+ lastPoint = p;
+ }
+ if(way.isHighlighted()) {
+ drawPathHighlight(path, line);
+ }
+ displaySegments(path, orientationArrows, onewayArrows, onewayArrowsCasing, color, line, dashes, dashedColor);
+ }
+
+ public double getCircum() {
+ return circum;
+ }
+
+ @Override
+ public void getColors() {
+ super.getColors();
+ this.relationSelectedColor = PaintColors.RELATIONSELECTED.get();
+ this.highlightColorTransparent = new Color(highlightColor.getRed(), highlightColor.getGreen(), highlightColor.getBlue(), 100);
+ this.backgroundColor = PaintColors.getBackgroundColor();
+ }
+
+ @Override
+ protected void getSettings(boolean virtual) {
+ super.getSettings(virtual);
+ paintSettings = MapPaintSettings.INSTANCE;
circum = nc.getDist100Pixel();
- boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10000000);
- boolean drawMultipolygon = drawArea && Main.pref.getBoolean("mappaint.multipolygon", true);
- styles.setDrawMultipolygon(drawMultipolygon);
- boolean drawRestriction = Main.pref.getBoolean("mappaint.restriction", true);
- boolean leftHandTraffic = Main.pref.getBoolean("mappaint.lefthandtraffic", false);
+
+ leftHandTraffic = Main.pref.getBoolean("mappaint.lefthandtraffic", false);
+
+ useStrokes = paintSettings.getUseStrokesDistance() > circum;
+ showNames = paintSettings.getShowNamesDistance() > circum;
+ showIcons = paintSettings.getShowIconsDistance() > circum;
+ isOutlineOnly = paintSettings.isOutlineOnly();
+ orderFont = new Font(Main.pref.get("mappaint.font", "Helvetica"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
Main.pref.getBoolean("mappaint.use-antialiasing", true) ?
RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF);
+ }
- Collection hws = data.getHighlightedWaySegments();
+ private Path2D.Double getPath(Way w) {
+ Path2D.Double path = new Path2D.Double();
+ boolean initial = true;
+ for (Node n : w.getNodes()) {
+ Point2D p = n.getEastNorth();
+ if (p != null) {
+ if (initial) {
+ path.moveTo(p.getX(), p.getY());
+ initial = false;
+ } else {
+ path.lineTo(p.getX(), p.getY());
+ }
+ }
+ }
+ return path;
+ }
- this.painter = new MapPainter(paintSettings, g, isInactiveMode, nc, renderVirtualNodes, circum, leftHandTraffic, hws);
+ private boolean isAreaVisible(Path2D.Double area) {
+ Rectangle2D bounds = area.getBounds2D();
+ if (bounds.isEmpty()) return false;
+ Point2D p = nc.getPoint2D(new EastNorth(bounds.getX(), bounds.getY()));
+ if (p.getX() > nc.getWidth()) return false;
+ if (p.getY() < 0) return false;
+ p = nc.getPoint2D(new EastNorth(bounds.getX() + bounds.getWidth(), bounds.getY() + bounds.getHeight()));
+ if (p.getX() < 0) return false;
+ if (p.getY() > nc.getHeight()) return false;
+ return true;
+ }
+
+ public boolean isInactiveMode() {
+ return isInactiveMode;
+ }
+
+ public boolean isShowIcons() {
+ return showIcons;
+ }
+
+ public boolean isShowNames() {
+ return showNames;
+ }
+
+ private double[] pointAt(double t, Polygon poly, double pathLength) {
+ double totalLen = t * pathLength;
+ double curLen = 0;
+ long dx, dy;
+ double segLen;
+
+ // Yes, it is inefficient to iterate from the beginning for each glyph.
+ // Can be optimized if it turns out to be slow.
+ for (int i = 1; i < poly.npoints; ++i) {
+ dx = poly.xpoints[i] - poly.xpoints[i-1];
+ dy = poly.ypoints[i] - poly.ypoints[i-1];
+ segLen = Math.sqrt(dx*dx + dy*dy);
+ if (totalLen > curLen + segLen) {
+ curLen += segLen;
+ continue;
+ }
+ return new double[] {
+ poly.xpoints[i-1]+(totalLen - curLen)/segLen*dx,
+ poly.ypoints[i-1]+(totalLen - curLen)/segLen*dy,
+ Math.atan2(dy, dx)};
+ }
+ return null;
+ }
+
+ @Override
+ public void render(final DataSet data, boolean renderVirtualNodes, Bounds bounds) {
+ //long start = System.currentTimeMillis();
+ BBox bbox = new BBox(bounds);
+ getSettings(renderVirtualNodes);
+
+ boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10000000);
+ boolean drawMultipolygon = drawArea && Main.pref.getBoolean("mappaint.multipolygon", true);
+ boolean drawRestriction = Main.pref.getBoolean("mappaint.restriction", true);
+
+ styles = MapPaintStyles.getStyles();
+ styles.setDrawMultipolygon(drawMultipolygon);
+
+ highlightWaySegments = data.getHighlightedWaySegments();
StyleCollector sc = new StyleCollector(drawArea, drawMultipolygon, drawRestriction);
collectNodeStyles(data, sc, bbox);
@@ -231,7 +1346,7 @@
//long phase1 = System.currentTimeMillis();
sc.drawAll();
sc = null;
- painter.drawVirtualNodes(data.searchWays(bbox), data.getHighlightedVirtualNodes());
+ drawVirtualNodes(data, bbox);
//long now = System.currentTimeMillis();
//System.err.println(String.format("PAINTING TOOK %d [PHASE1 took %d] (at scale %s)", now - start, phase1 - start, circum));
Index: core/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
===================================================================
--- core/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 5570)
+++ core/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (working copy)
@@ -10,8 +10,6 @@
import java.awt.RenderingHints;
import java.awt.Stroke;
import java.awt.geom.GeneralPath;
-import java.awt.geom.Point2D;
-import java.util.Collection;
import java.util.Iterator;
import org.openstreetmap.josm.Main;
@@ -34,22 +32,12 @@
*/
public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor {
- /** Color Preference for inactive objects */
- protected Color inactiveColor;
- /** Color Preference for selected objects */
- protected Color selectedColor;
- /** Color Preference for nodes */
- protected Color nodeColor;
/** Color Preference for ways not matching any other group */
protected Color dfltWayColor;
/** Color Preference for relations */
protected Color relationColor;
/** Color Preference for untagged ways */
protected Color untaggedWayColor;
- /** Color Preference for background */
- protected Color backgroundColor;
- /** Color Preference for hightlighted objects */
- protected Color highlightColor;
/** Color Preference for tagged nodes */
protected Color taggedColor;
/** Color Preference for multiply connected nodes */
@@ -80,12 +68,6 @@
protected int connectionNodeSize;
/** Preference: size of tagged nodes */
protected int taggedNodeSize;
- /** Preference: size of virtual nodes (0 displayes display) */
- protected int virtualNodeSize;
- /** Preference: minimum space (displayed way length) to display virtual nodes */
- protected int virtualNodeSpace;
- /** Preference: minimum space (displayed way length) to display segment numbers */
- protected int segmentNumberSpace;
/** Color cache to draw subsequent segments of same color as one Path. */
protected Color currentColor = null;
@@ -122,19 +104,12 @@
super(g, nc, isInactiveMode);
}
- /**
- * Reads the color definitions from preferences. This function is public, so that
- * color names in preferences can be displayed even without calling the wireframe display before.
- */
- public void getColors()
- {
- inactiveColor = PaintColors.INACTIVE.get();
- selectedColor = PaintColors.SELECTED.get();
- nodeColor = PaintColors.NODE.get();
+ @Override
+ public void getColors() {
+ super.getColors();
dfltWayColor = PaintColors.DEFAULT_WAY.get();
relationColor = PaintColors.RELATION.get();
untaggedWayColor = PaintColors.UNTAGGED_WAY.get();
- backgroundColor = PaintColors.BACKGROUND.get();
highlightColor = PaintColors.HIGHLIGHT_WIREFRAME.get();
taggedColor = PaintColors.TAGGED.get();
connectionColor = PaintColors.CONNECTION.get();
@@ -146,13 +121,9 @@
}
}
- /**
- * Reads all the settings from preferences. Calls the @{link #getColors}
- * function.
- *
- * @param virtual true if virtual nodes are used
- */
+ @Override
protected void getSettings(boolean virtual) {
+ super.getSettings(virtual);
MapPaintSettings settings = MapPaintSettings.INSTANCE;
showDirectionArrow = settings.isShowDirectionArrow();
showOnewayArrow = settings.isShowOnewayArrow();
@@ -166,10 +137,6 @@
fillUnselectedNode = settings.isFillUnselectedNode();
fillConnectionNode = settings.isFillConnectionNode();
fillTaggedNode = settings.isFillTaggedNode();
- virtualNodeSize = virtual ? Main.pref.getInteger("mappaint.node.virtual-size", 8) / 2 : 0;
- virtualNodeSpace = Main.pref.getInteger("mappaint.node.virtual-space", 70);
- segmentNumberSpace = Main.pref.getInteger("mappaint.segmentnumber.space", 40);
- getColors();
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
Main.pref.getBoolean("mappaint.wireframe.use-antialiasing", false) ?
@@ -223,13 +190,13 @@
osm.visit(this);
}
}
- drawVirtualNodes(data.searchWays(bbox), data.getHighlightedVirtualNodes());
+ drawVirtualNodes(data, bbox);
// draw highlighted way segments over the already drawn ways. Otherwise each
// way would have to be checked if it contains a way segment to highlight when
// in most of the cases there won't be more than one segment. Since the wireframe
// renderer does not feature any transparency there should be no visual difference.
- for(final WaySegment wseg : data.getHighlightedWaySegments()) {
+ for (final WaySegment wseg : data.getHighlightedWaySegments()) {
drawSegment(nc.getPoint(wseg.getFirstNode()), nc.getPoint(wseg.getSecondNode()), highlightColor, false);
}
displaySegments();
@@ -295,79 +262,6 @@
}
/**
- * Checks if a way segemnt is large enough for additional information display.
- *
- * @param p1 First point of the way segment.
- * @param p2 Second point of the way segment.
- * @param space The free space to check against.
- * @return true if segment is larger than required space
- */
- public static boolean isLargeSegment(Point2D p1, Point2D p2, int space)
- {
- double xd = Math.abs(p1.getX()-p2.getX());
- double yd = Math.abs(p1.getY()-p2.getY());
- return (xd+yd > space);
- }
-
- /**
- * Draws virtual nodes.
- *
- * @param ways The ways to draw nodes for.
- * @param highlightVirtualNodes Way segements, where nodesshould be highlighted.
- */
- public void drawVirtualNodes(Collection ways, Collection highlightVirtualNodes) {
- if (virtualNodeSize == 0)
- return;
- // print normal virtual nodes
- GeneralPath path = new GeneralPath();
- for (Way osm : ways) {
- if (osm.isUsable() && !osm.isDisabledAndHidden() && !osm.isDisabled()) {
- visitVirtual(path, osm);
- }
- }
- g.setColor(nodeColor);
- g.draw(path);
- // print highlighted virtual nodes. Since only the color changes, simply
- // drawing them over the existing ones works fine (at least in their current
- // simple style)
- path = new GeneralPath();
- for (WaySegment wseg: highlightVirtualNodes){
- if (wseg.way.isUsable() && !wseg.way.isDisabled()) {
- visitVirtual(path, wseg.toWay());
- }
- }
- g.setColor(highlightColor);
- g.draw(path);
- }
-
- /**
- * Creates path for drawing virtual nodes for one way.
- *
- * @param path The path to append drawing to.
- * @param w The ways to draw node for.
- */
- public void visitVirtual(GeneralPath path, Way w) {
- Iterator it = w.getNodes().iterator();
- if (it.hasNext()) {
- Point lastP = nc.getPoint(it.next());
- while(it.hasNext())
- {
- Point p = nc.getPoint(it.next());
- if(isSegmentVisible(lastP, p) && isLargeSegment(lastP, p, virtualNodeSpace))
- {
- int x = (p.x+lastP.x)/2;
- int y = (p.y+lastP.y)/2;
- path.moveTo(x-virtualNodeSize, y);
- path.lineTo(x+virtualNodeSize, y);
- path.moveTo(x, y-virtualNodeSize);
- path.lineTo(x, y+virtualNodeSize);
- }
- lastP = p;
- }
- }
- }
-
- /**
* Draw a line for all way segments.
* @param w The way to draw.
*/
@@ -405,7 +299,7 @@
drawSegment(lastP, p, wayColor,
showOnlyHeadArrowOnly ? !it.hasNext() : showThisDirectionArrow);
if (showOrderNumber && !isInactiveMode) {
- drawOrderNumber(lastP, p, orderNumber);
+ drawOrderNumber(lastP, p, orderNumber, g.getColor());
}
lastP = p;
}
@@ -472,41 +366,7 @@
@Override
public void visit(Changeset cs) {/* ignore */}
- /**
- * Draw an number of the order of the two consecutive nodes within the
- * parents way
- *
- * @param p1 First point of the way segment.
- * @param p2 Second point of the way segment.
- * @param orderNumber The number of the segment in the way.
- */
- protected void drawOrderNumber(Point p1, Point p2, int orderNumber) {
- if (isSegmentVisible(p1, p2) && isLargeSegment(p1, p2, segmentNumberSpace)) {
- String on = Integer.toString(orderNumber);
- int strlen = on.length();
- int x = (p1.x+p2.x)/2 - 4*strlen;
- int y = (p1.y+p2.y)/2 + 4;
-
- if(virtualNodeSize != 0 && isLargeSegment(p1, p2, virtualNodeSpace))
- {
- y = (p1.y+p2.y)/2 - virtualNodeSize - 3;
- }
-
- displaySegments(); /* draw nodes on top! */
- Color c = g.getColor();
- g.setColor(backgroundColor);
- g.fillRect(x-1, y-12, 8*strlen+1, 14);
- g.setColor(c);
- g.drawString(on, x, y);
- }
- }
-
- /**
- * Draw the node as small rectangle with the given color.
- *
- * @param n The node to draw.
- * @param color The color of the node.
- */
+ @Override
public void drawNode(Node n, Color color, int size, boolean fill) {
if (size > 1) {
int radius = size / 2;
@@ -571,21 +431,6 @@
}
/**
- * Checks if segment is visible in display.
- *
- * @param p1 First point of the way segment.
- * @param p2 Second point of the way segment.
- * @return true if segment is visible.
- */
- protected boolean isSegmentVisible(Point p1, Point p2) {
- if ((p1.x < 0) && (p2.x < 0)) return false;
- if ((p1.y < 0) && (p2.y < 0)) return false;
- if ((p1.x > nc.getWidth()) && (p2.x > nc.getWidth())) return false;
- if ((p1.y > nc.getHeight()) && (p2.y > nc.getHeight())) return false;
- return true;
- }
-
- /**
* Checks if a polygon is visible in display.
*
* @param polygon The polygon to check.
Index: core/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java
===================================================================
--- core/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java (revision 5570)
+++ core/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java (working copy)
@@ -10,7 +10,7 @@
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
-import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -77,7 +77,7 @@
}
@Override
- public void paintPrimitive(OsmPrimitive osm, MapPaintSettings paintSettings, MapPainter painter, boolean selected, boolean member) {
+ public void paintPrimitive(OsmPrimitive osm, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
if (osm instanceof Way)
{
Color myColor = color;
Index: core/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
===================================================================
--- core/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java (revision 5570)
+++ core/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java (working copy)
@@ -9,7 +9,7 @@
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
-import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -180,7 +180,7 @@
}
@Override
- public void paintPrimitive(OsmPrimitive osm, MapPaintSettings settings, MapPainter painter, boolean selected, boolean member) {
+ public void paintPrimitive(OsmPrimitive osm, MapPaintSettings settings, StyledMapRenderer painter, boolean selected, boolean member) {
if (osm instanceof Node) {
painter.drawBoxText((Node) osm, this);
}
Index: core/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
===================================================================
--- core/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (revision 5570)
+++ core/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (working copy)
@@ -10,7 +10,7 @@
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
-import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.RelativeFloat;
abstract public class ElemStyle implements StyleKeys {
@@ -43,7 +43,7 @@
* @param selected true, if primitive is selected
* @param member true, if primitive is not selected and member of a selected relation
*/
- public abstract void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected, boolean member);
+ public abstract void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member);
public boolean isProperLineStyle() {
return false;
Index: core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java
===================================================================
--- core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java (revision 5570)
+++ core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java (working copy)
@@ -11,7 +11,7 @@
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
-import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.RelativeFloat;
import org.openstreetmap.josm.tools.Utils;
@@ -265,7 +265,7 @@
}
@Override
- public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected, boolean member) {
+ public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
Way w = (Way)primitive;
/* show direction arrows, if draw.segment.relevant_directions_only is not set,
the way is tagged with a direction key
Index: core/src/org/openstreetmap/josm/gui/mappaint/LinePatternElemStyle.java
===================================================================
--- core/src/org/openstreetmap/josm/gui/mappaint/LinePatternElemStyle.java (revision 5570)
+++ core/src/org/openstreetmap/josm/gui/mappaint/LinePatternElemStyle.java (working copy)
@@ -4,7 +4,7 @@
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
-import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
/**
@@ -30,7 +30,7 @@
}
@Override
- public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected, boolean member) {
+ public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
Way w = (Way)primitive;
painter.drawLinePattern(w, pattern.getImage());
}
Index: core/src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java
===================================================================
--- core/src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java (revision 5570)
+++ core/src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java (working copy)
@@ -4,7 +4,7 @@
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
-import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
import org.openstreetmap.josm.tools.Utils;
@@ -30,7 +30,7 @@
}
@Override
- public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected, boolean member) {
+ public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
Way w = (Way)primitive;
painter.drawTextOnPath(w, text);
}
Index: core/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
===================================================================
--- core/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java (revision 5570)
+++ core/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java (working copy)
@@ -13,7 +13,7 @@
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
-import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.BoxProvider;
import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.SimpleBoxProvider;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
@@ -229,7 +229,7 @@
}
@Override
- public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings settings, MapPainter painter, boolean selected, boolean member) {
+ public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings settings, StyledMapRenderer painter, boolean selected, boolean member) {
if (primitive instanceof Node) {
Node n = (Node) primitive;
if (mapImage != null && painter.isShowIcons()) {