Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java =================================================================== --- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java (revision 10538) +++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java (revision 10540) @@ -1,5 +1,7 @@ package org.openstreetmap.josm.plugins.validator; -import java.awt.*; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Point; import java.util.Collection; import java.util.Collections; @@ -8,5 +10,9 @@ import org.openstreetmap.josm.command.Command; -import org.openstreetmap.josm.data.osm.*; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Relation; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.data.osm.WaySegment; import org.openstreetmap.josm.data.osm.visitor.Visitor; import org.openstreetmap.josm.gui.MapView; @@ -16,398 +22,379 @@ * @author frsantos */ -public class TestError -{ - /** is this error on the ignore list */ - private Boolean ignored = false; - /** Severity */ - private Severity severity; - /** The error message */ - private String message; - /** Deeper error description */ - private String description; - private String description_en; - /** The affected primitives */ - private List primitives; - /** The primitives to be highlighted */ - private List highlighted; - /** The tester that raised this error */ - private Test tester; - /** Internal code used by testers to classify errors */ - private int code; - /** If this error is selected */ - private boolean selected; - - /** - * Constructors - * @param tester The tester - * @param severity The severity of this error - * @param message The error message - * @param primitive The affected primitive - * @param primitives The affected primitives - * @param code The test error reference code - */ - public TestError(Test tester, Severity severity, String message, String description, String description_en, int code, - List primitives, List highlighted) { - this.tester = tester; - this.severity = severity; - this.message = message; - this.description = description; - this.description_en = description_en; - this.primitives = primitives; - this.highlighted = highlighted; - this.code = code; - } - public TestError(Test tester, Severity severity, String message, int code, List primitives, List highlighted) - { - this(tester, severity, message, null, null, code, primitives, highlighted); - } - public TestError(Test tester, Severity severity, String message, String description, String description_en, - int code, List primitives) - { - this(tester, severity, message, description, description_en, code, primitives, primitives); - } - public TestError(Test tester, Severity severity, String message, int code, List primitives) - { - this(tester, severity, message, null, null, code, primitives, primitives); - } - public TestError(Test tester, Severity severity, String message, int code, OsmPrimitive primitive) - { - this(tester, severity, message, null, null, code, Collections.singletonList(primitive), Collections.singletonList(primitive)); - } - public TestError(Test tester, Severity severity, String message, String description, - String description_en, int code, OsmPrimitive primitive) - { - this(tester, severity, message, description, description_en, code, Collections.singletonList(primitive)); - } - - /** - * Gets the error message - * @return the error message - */ - public String getMessage() - { - return message; - } - - /** - * Gets the error message - * @return the error description - */ - public String getDescription() - { - return description; - } - - /** - * Sets the error message - * @param message The error message - */ - public void setMessage(String message) - { - this.message = message; - } - - /** - * Gets the list of primitives affected by this error - * @return the list of primitives affected by this error - */ - public List getPrimitives() - { - return primitives; - } - - /** - * Sets the list of primitives affected by this error - * @param primitives the list of primitives affected by this error - */ - - public void setPrimitives(List primitives) - { - this.primitives = primitives; - } - - /** - * Gets the severity of this error - * @return the severity of this error - */ - public Severity getSeverity() - { - return severity; - } - - /** - * Sets the severity of this error - * @param severity the severity of this error - */ - public void setSeverity(Severity severity) - { - this.severity = severity; - } - - /** - * Sets the ignore state for this error - */ - public String getIgnoreState() - { - Collection strings = new TreeSet(); - String ignorestring = getIgnoreSubGroup(); - for (OsmPrimitive o : primitives) - { - // ignore data not yet uploaded - if(o.id == 0) - return null; - String type = "u"; - if (o instanceof Way) type = "w"; - else if (o instanceof Relation) type = "r"; - else if (o instanceof Node) type = "n"; - strings.add(type + "_" + o.id); - } - for (String o : strings) - { - ignorestring += ":" + o; - } - return ignorestring; - } - - public String getIgnoreSubGroup() - { - String ignorestring = getIgnoreGroup(); - if(description_en != null) - ignorestring += "_"+description_en; - return ignorestring; - } - - public String getIgnoreGroup() - { - return Integer.toString(code); - } - - public void setIgnored(boolean state) - { - ignored = state; - } - - public Boolean getIgnored() - { - return ignored; - } - - /** - * Gets the tester that raised this error - * @return the tester that raised this error - */ - public Test getTester() - { - return tester; - } - - /** - * Gets the code - * @return the code - */ - public int getCode() - { - return code; - } - - /** - * Returns true if the error can be fixed automatically - * - * @return true if the error can be fixed - */ - public boolean isFixable() - { - return tester != null && tester.isFixable(this); - } - - /** - * Fixes the error with the appropiate command - * - * @return The command to fix the error - */ - public Command getFix() - { - if( tester == null ) - return null; - - return tester.fixError(this); - } - - /** - * Paints the error on affected primitives - * - * @param g The graphics - * @param mv The MapView - */ - public void paint(Graphics g, MapView mv) - { - if(!ignored) - { - PaintVisitor v = new PaintVisitor(g, mv); - for (Object o : highlighted) { - if (o instanceof OsmPrimitive) - v.visit((OsmPrimitive) o); - else if (o instanceof WaySegment) - v.visit((WaySegment) o); - } - } - } - - /** - * Visitor that highlights the primitives affected by this error - * @author frsantos - */ - class PaintVisitor implements Visitor - { - /** The graphics */ - private final Graphics g; - /** The MapView */ - private final MapView mv; - - /** - * Constructor - * @param g The graphics - * @param mv The Mapview - */ - public PaintVisitor(Graphics g, MapView mv) - { - this.g = g; - this.mv = mv; - } - - public void visit(OsmPrimitive p) { - if (!p.deleted && !p.incomplete) { - p.visit(this); - } - } - - /** - * Draws a circle around the node - * @param n The node - * @param color The circle color - */ - public void drawNode(Node n, Color color) - { - Point p = mv.getPoint(n.eastNorth); - g.setColor(color); - if( selected ) - { - g.fillOval(p.x-5, p.y-5, 10, 10); - } - else - g.drawOval(p.x-5, p.y-5, 10, 10); - } - - /** - * Draws a line around the segment - * - * @param s The segment - * @param color The color - */ - public void drawSegment(Node n1, Node n2, Color color) - { - Point p1 = mv.getPoint(n1.eastNorth); - Point p2 = mv.getPoint(n2.eastNorth); - g.setColor(color); - - double t = Math.atan2(p2.x-p1.x, p2.y-p1.y); - double cosT = Math.cos(t); - double sinT = Math.sin(t); - int deg = (int)Math.toDegrees(t); - if( selected ) - { - int[] x = new int[] {(int)(p1.x + 5*cosT), (int)(p2.x + 5*cosT), (int)(p2.x - 5*cosT), (int)(p1.x - 5*cosT)}; - int[] y = new int[] {(int)(p1.y - 5*sinT), (int)(p2.y - 5*sinT), (int)(p2.y + 5*sinT), (int)(p1.y + 5*sinT)}; - g.fillPolygon(x, y, 4); - g.fillArc(p1.x-5, p1.y-5, 10, 10, deg, 180 ); - g.fillArc(p2.x-5, p2.y-5, 10, 10, deg, -180); - } - else - { - g.drawLine((int)(p1.x + 5*cosT), (int)(p1.y - 5*sinT), (int)(p2.x + 5*cosT), (int)(p2.y - 5*sinT)); - g.drawLine((int)(p1.x - 5*cosT), (int)(p1.y + 5*sinT), (int)(p2.x - 5*cosT), (int)(p2.y + 5*sinT)); - g.drawArc(p1.x-5, p1.y-5, 10, 10, deg, 180 ); - g.drawArc(p2.x-5, p2.y-5, 10, 10, deg, -180); - } - } - - - /** - * Draw a small rectangle. - * White if selected (as always) or red otherwise. - * - * @param n The node to draw. - */ - public void visit(Node n) - { - if( isNodeVisible(n) ) - drawNode(n, severity.getColor()); - } - - public void visit(Way w) - { - Node lastN = null; - for (Node n : w.nodes) { - if (lastN == null) { - lastN = n; - continue; - } - if (isSegmentVisible(lastN, n)) - { - drawSegment(lastN, n, severity.getColor()); - } - lastN = n; - } - } - - public void visit(WaySegment ws) { - if (ws.lowerIndex < 0 || ws.lowerIndex + 1 >= ws.way.nodes.size()) return; - Node a = ws.way.nodes.get(ws.lowerIndex), - b = ws.way.nodes.get(ws.lowerIndex + 1); - if (isSegmentVisible(a, b)) { - drawSegment(a, b, severity.getColor()); - } - } - - public void visit(Relation r) - { - /* No idea how to draw a relation. */ - } - - /** - * Checks if the given node is in the visible area. - * @param n The node to check for visibility - * @return true if the node is visible - */ - protected boolean isNodeVisible(Node n) { - Point p = mv.getPoint(n.eastNorth); - return !((p.x < 0) || (p.y < 0) || (p.x > mv.getWidth()) || (p.y > mv.getHeight())); - } - - /** - * Checks if the given segment is in the visible area. - * NOTE: This will return true for a small number of non-visible - * segments. - * @param ls The segment to check - * @return true if the segment is visible - */ - protected boolean isSegmentVisible(Node n1, Node n2) { - Point p1 = mv.getPoint(n1.eastNorth); - Point p2 = mv.getPoint(n2.eastNorth); - if ((p1.x < 0) && (p2.x < 0)) return false; - if ((p1.y < 0) && (p2.y < 0)) return false; - if ((p1.x > mv.getWidth()) && (p2.x > mv.getWidth())) return false; - if ((p1.y > mv.getHeight()) && (p2.y > mv.getHeight())) return false; - return true; - } - } - - /** - * Sets the selection flag of this error - * @param selected if this error is selected - */ - public void setSelected(boolean selected) - { - this.selected = selected; - } +public class TestError { + /** is this error on the ignore list */ + private Boolean ignored = false; + /** Severity */ + private Severity severity; + /** The error message */ + private String message; + /** Deeper error description */ + private String description; + private String description_en; + /** The affected primitives */ + private List primitives; + /** The primitives to be highlighted */ + private List highlighted; + /** The tester that raised this error */ + private Test tester; + /** Internal code used by testers to classify errors */ + private int code; + /** If this error is selected */ + private boolean selected; + + /** + * Constructors + * @param tester The tester + * @param severity The severity of this error + * @param message The error message + * @param primitive The affected primitive + * @param primitives The affected primitives + * @param code The test error reference code + */ + public TestError(Test tester, Severity severity, String message, String description, String description_en, + int code, List primitives, List highlighted) { + this.tester = tester; + this.severity = severity; + this.message = message; + this.description = description; + this.description_en = description_en; + this.primitives = primitives; + this.highlighted = highlighted; + this.code = code; + } + + public TestError(Test tester, Severity severity, String message, int code, List primitives, + List highlighted) { + this(tester, severity, message, null, null, code, primitives, highlighted); + } + + public TestError(Test tester, Severity severity, String message, String description, String description_en, + int code, List primitives) { + this(tester, severity, message, description, description_en, code, primitives, primitives); + } + + public TestError(Test tester, Severity severity, String message, int code, List primitives) { + this(tester, severity, message, null, null, code, primitives, primitives); + } + + public TestError(Test tester, Severity severity, String message, int code, OsmPrimitive primitive) { + this(tester, severity, message, null, null, code, Collections.singletonList(primitive), Collections + .singletonList(primitive)); + } + + public TestError(Test tester, Severity severity, String message, String description, String description_en, + int code, OsmPrimitive primitive) { + this(tester, severity, message, description, description_en, code, Collections.singletonList(primitive)); + } + + /** + * Gets the error message + * @return the error message + */ + public String getMessage() { + return message; + } + + /** + * Gets the error message + * @return the error description + */ + public String getDescription() { + return description; + } + + /** + * Sets the error message + * @param message The error message + */ + public void setMessage(String message) { + this.message = message; + } + + /** + * Gets the list of primitives affected by this error + * @return the list of primitives affected by this error + */ + public List getPrimitives() { + return primitives; + } + + /** + * Sets the list of primitives affected by this error + * @param primitives the list of primitives affected by this error + */ + + public void setPrimitives(List primitives) { + this.primitives = primitives; + } + + /** + * Gets the severity of this error + * @return the severity of this error + */ + public Severity getSeverity() { + return severity; + } + + /** + * Sets the severity of this error + * @param severity the severity of this error + */ + public void setSeverity(Severity severity) { + this.severity = severity; + } + + /** + * Sets the ignore state for this error + */ + public String getIgnoreState() { + Collection strings = new TreeSet(); + String ignorestring = getIgnoreSubGroup(); + for (OsmPrimitive o : primitives) { + // ignore data not yet uploaded + if (o.id == 0) + return null; + String type = "u"; + if (o instanceof Way) + type = "w"; + else if (o instanceof Relation) + type = "r"; + else if (o instanceof Node) + type = "n"; + strings.add(type + "_" + o.id); + } + for (String o : strings) { + ignorestring += ":" + o; + } + return ignorestring; + } + + public String getIgnoreSubGroup() { + String ignorestring = getIgnoreGroup(); + if (description_en != null) + ignorestring += "_" + description_en; + return ignorestring; + } + + public String getIgnoreGroup() { + return Integer.toString(code); + } + + public void setIgnored(boolean state) { + ignored = state; + } + + public Boolean getIgnored() { + return ignored; + } + + /** + * Gets the tester that raised this error + * @return the tester that raised this error + */ + public Test getTester() { + return tester; + } + + /** + * Gets the code + * @return the code + */ + public int getCode() { + return code; + } + + /** + * Returns true if the error can be fixed automatically + * + * @return true if the error can be fixed + */ + public boolean isFixable() { + return tester != null && tester.isFixable(this); + } + + /** + * Fixes the error with the appropiate command + * + * @return The command to fix the error + */ + public Command getFix() { + if (tester == null) + return null; + + return tester.fixError(this); + } + + /** + * Paints the error on affected primitives + * + * @param g The graphics + * @param mv The MapView + */ + public void paint(Graphics g, MapView mv) { + if (!ignored) { + PaintVisitor v = new PaintVisitor(g, mv); + visitHighlighted(v); + } + } + + public void visitHighlighted(ValidatorVisitor v) { + for (Object o : highlighted) { + if (o instanceof OsmPrimitive) + v.visit((OsmPrimitive) o); + else if (o instanceof WaySegment) + v.visit((WaySegment) o); + } + } + + /** + * Visitor that highlights the primitives affected by this error + * @author frsantos + */ + class PaintVisitor implements ValidatorVisitor, Visitor { + /** The graphics */ + private final Graphics g; + /** The MapView */ + private final MapView mv; + + /** + * Constructor + * @param g The graphics + * @param mv The Mapview + */ + public PaintVisitor(Graphics g, MapView mv) { + this.g = g; + this.mv = mv; + } + + public void visit(OsmPrimitive p) { + if (!p.deleted && !p.incomplete) { + p.visit(this); + } + } + + /** + * Draws a circle around the node + * @param n The node + * @param color The circle color + */ + public void drawNode(Node n, Color color) { + Point p = mv.getPoint(n.eastNorth); + g.setColor(color); + if (selected) { + g.fillOval(p.x - 5, p.y - 5, 10, 10); + } else + g.drawOval(p.x - 5, p.y - 5, 10, 10); + } + + /** + * Draws a line around the segment + * + * @param s The segment + * @param color The color + */ + public void drawSegment(Node n1, Node n2, Color color) { + Point p1 = mv.getPoint(n1.eastNorth); + Point p2 = mv.getPoint(n2.eastNorth); + g.setColor(color); + + double t = Math.atan2(p2.x - p1.x, p2.y - p1.y); + double cosT = Math.cos(t); + double sinT = Math.sin(t); + int deg = (int) Math.toDegrees(t); + if (selected) { + int[] x = new int[] { (int) (p1.x + 5 * cosT), (int) (p2.x + 5 * cosT), (int) (p2.x - 5 * cosT), + (int) (p1.x - 5 * cosT) }; + int[] y = new int[] { (int) (p1.y - 5 * sinT), (int) (p2.y - 5 * sinT), (int) (p2.y + 5 * sinT), + (int) (p1.y + 5 * sinT) }; + g.fillPolygon(x, y, 4); + g.fillArc(p1.x - 5, p1.y - 5, 10, 10, deg, 180); + g.fillArc(p2.x - 5, p2.y - 5, 10, 10, deg, -180); + } else { + g.drawLine((int) (p1.x + 5 * cosT), (int) (p1.y - 5 * sinT), (int) (p2.x + 5 * cosT), + (int) (p2.y - 5 * sinT)); + g.drawLine((int) (p1.x - 5 * cosT), (int) (p1.y + 5 * sinT), (int) (p2.x - 5 * cosT), + (int) (p2.y + 5 * sinT)); + g.drawArc(p1.x - 5, p1.y - 5, 10, 10, deg, 180); + g.drawArc(p2.x - 5, p2.y - 5, 10, 10, deg, -180); + } + } + + /** + * Draw a small rectangle. + * White if selected (as always) or red otherwise. + * + * @param n The node to draw. + */ + public void visit(Node n) { + if (isNodeVisible(n)) + drawNode(n, severity.getColor()); + } + + public void visit(Way w) { + Node lastN = null; + for (Node n : w.nodes) { + if (lastN == null) { + lastN = n; + continue; + } + if (isSegmentVisible(lastN, n)) { + drawSegment(lastN, n, severity.getColor()); + } + lastN = n; + } + } + + public void visit(WaySegment ws) { + if (ws.lowerIndex < 0 || ws.lowerIndex + 1 >= ws.way.nodes.size()) + return; + Node a = ws.way.nodes.get(ws.lowerIndex), b = ws.way.nodes.get(ws.lowerIndex + 1); + if (isSegmentVisible(a, b)) { + drawSegment(a, b, severity.getColor()); + } + } + + public void visit(Relation r) { + /* No idea how to draw a relation. */ + } + + /** + * Checks if the given node is in the visible area. + * @param n The node to check for visibility + * @return true if the node is visible + */ + protected boolean isNodeVisible(Node n) { + Point p = mv.getPoint(n.eastNorth); + return !((p.x < 0) || (p.y < 0) || (p.x > mv.getWidth()) || (p.y > mv.getHeight())); + } + + /** + * Checks if the given segment is in the visible area. + * NOTE: This will return true for a small number of non-visible + * segments. + * @param ls The segment to check + * @return true if the segment is visible + */ + protected boolean isSegmentVisible(Node n1, Node n2) { + Point p1 = mv.getPoint(n1.eastNorth); + Point p2 = mv.getPoint(n2.eastNorth); + if ((p1.x < 0) && (p2.x < 0)) + return false; + if ((p1.y < 0) && (p2.y < 0)) + return false; + if ((p1.x > mv.getWidth()) && (p2.x > mv.getWidth())) + return false; + if ((p1.y > mv.getHeight()) && (p2.y > mv.getHeight())) + return false; + return true; + } + } + + /** + * Sets the selection flag of this error + * @param selected if this error is selected + */ + public void setSelected(boolean selected) { + this.selected = selected; + } } Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java =================================================================== --- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java (revision 10538) +++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java (revision 10540) @@ -26,9 +26,7 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.Command; -import org.openstreetmap.josm.data.coor.EastNorth; 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.Way; +import org.openstreetmap.josm.data.osm.WaySegment; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; import org.openstreetmap.josm.gui.SideButton; @@ -340,19 +338,17 @@ if (isDblClick) { Main.ds.setSelected(sel); - if (sel.size() == 1) { - // Center the view on the selected item - double scale = Main.map.mapView.getScale(); - OsmPrimitive prim = sel.iterator().next(); - BoundingXYVisitor box = new BoundingXYVisitor(); - if (prim instanceof Way) { - Way way = (Way) prim; - way.visitNodes(box); - EastNorth center = new EastNorth(box.min.east() / 2 + box.max.east() / 2, box.min.north() / 2 - + box.max.north() / 2); - Main.map.mapView.zoomTo(center, scale); - } else if (prim instanceof Node) { - Node node = (Node) prim; - Main.map.mapView.zoomTo(node.eastNorth, scale); - } + } + TreePath selPath = tree.getPathForLocation(e.getX(), e.getY()); + if ((selPath != null) && (e.getClickCount() == 2)) { + DefaultMutableTreeNode node = (DefaultMutableTreeNode) selPath + .getPathComponent(selPath.getPathCount() - 1); + if (node.getUserObject() instanceof TestError) { + TestError testError = (TestError) node.getUserObject(); + ValidatorBoundingXYVisitor box = new ValidatorBoundingXYVisitor(); + testError.visitHighlighted(box); + if (box.max.equals(box.min)) + Main.map.mapView.zoomTo(box.max, 0.00001); + else + Main.map.mapView.recalculateCenterScale(box); } } @@ -380,3 +376,19 @@ } } + + public static class ValidatorBoundingXYVisitor extends BoundingXYVisitor implements ValidatorVisitor { + + public void visit(OsmPrimitive p) { + if (!p.deleted && !p.incomplete) { + p.visit(this); + } + } + + public void visit(WaySegment ws) { + if (ws.lowerIndex < 0 || ws.lowerIndex + 1 >= ws.way.nodes.size()) + return; + visit(ws.way.nodes.get(ws.lowerIndex)); + visit(ws.way.nodes.get(ws.lowerIndex + 1)); + } + } } Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorVisitor.java =================================================================== --- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorVisitor.java (revision 10540) +++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorVisitor.java (revision 10540) @@ -0,0 +1,10 @@ +package org.openstreetmap.josm.plugins.validator; + +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.WaySegment; + +public interface ValidatorVisitor { + void visit(OsmPrimitive p); + + void visit(WaySegment ws); +}