Index: applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/ConvertedWay.java =================================================================== --- applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/ConvertedWay.java (revision 22590) +++ applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/ConvertedWay.java (revision 23189) @@ -11,81 +11,81 @@ public class ConvertedWay { - - public class WayEnd { - private Node end; - - public WayEnd(Node end) { - this.end = end; - } - - @Override - public boolean equals(Object o) { - if (o instanceof WayEnd) { - WayEnd otherEnd = (WayEnd)o; - return end.equals(otherEnd.end) && routes.equals(otherEnd.getRoutes()); - } else { - return false; - } - } - - @Override - public int hashCode() { - return end.hashCode() + routes.hashCode(); - } - - public BitSet getRoutes() { - return routes; - } - - public ConvertedWay getWay() { - return ConvertedWay.this; - } - } - - private List nodes = new ArrayList(); - private BitSet routes; - - public ConvertedWay(BitSet routes, Way way) { - this.routes = routes; - nodes.addAll(way.getNodes()); - } - - public WayEnd getStart() { - return new WayEnd(nodes.get(0)); - } - - public WayEnd getStop() { - return new WayEnd(nodes.get(nodes.size() - 1)); - } - - /** - * Connects way to this way. Other ways internal representation is destroyed!!! - * @param way - */ - public void connect(ConvertedWay way) { - for (int i=0; i<2; i++) { - if (way.nodes.get(0).equals(nodes.get(nodes.size() - 1))) { - way.nodes.remove(0); - nodes.addAll(way.nodes); - return; - } - - if (way.nodes.get(way.nodes.size() - 1).equals(nodes.get(0))) { - nodes.remove(0); - way.nodes.addAll(nodes); - nodes = way.nodes; - return; - } - Collections.reverse(nodes); - } - } - public List getNodes() { - return nodes; - } + public class WayEnd { + private Node end; - public BitSet getRoutes() { - return routes; - } + public WayEnd(Node end) { + this.end = end; + } + + @Override + public boolean equals(Object o) { + if (o instanceof WayEnd) { + WayEnd otherEnd = (WayEnd)o; + return end.equals(otherEnd.end) && routes.equals(otherEnd.getRoutes()); + } else { + return false; + } + } + + @Override + public int hashCode() { + return end.hashCode() + routes.hashCode(); + } + + public BitSet getRoutes() { + return routes; + } + + public ConvertedWay getWay() { + return ConvertedWay.this; + } + } + + private List nodes = new ArrayList(); + private BitSet routes; + + public ConvertedWay(BitSet routes, Way way) { + this.routes = routes; + nodes.addAll(way.getNodes()); + } + + public WayEnd getStart() { + return new WayEnd(nodes.get(0)); + } + + public WayEnd getStop() { + return new WayEnd(nodes.get(nodes.size() - 1)); + } + + /** + * Connects way to this way. Other ways internal representation is destroyed!!! + * @param way + */ + public void connect(ConvertedWay way) { + for (int i=0; i<2; i++) { + if (way.nodes.get(0).equals(nodes.get(nodes.size() - 1))) { + way.nodes.remove(0); + nodes.addAll(way.nodes); + return; + } + + if (way.nodes.get(way.nodes.size() - 1).equals(nodes.get(0))) { + nodes.remove(0); + way.nodes.addAll(nodes); + nodes = way.nodes; + return; + } + Collections.reverse(nodes); + } + } + + public List getNodes() { + return nodes; + } + + public BitSet getRoutes() { + return routes; + } Index: applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/PathBuilder.java =================================================================== --- applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/PathBuilder.java (revision 22590) +++ applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/PathBuilder.java (revision 23189) @@ -14,60 +14,60 @@ public class PathBuilder { - private Map wayRoutes = new HashMap(); - private Collection convertedWays; + private Map wayRoutes = new HashMap(); + private Collection convertedWays; - public void addWay(Way way, RouteDefinition route) { + public void addWay(Way way, RouteDefinition route) { - if (way.getNodesCount() >= 2) { - BitSet routes = wayRoutes.get(way); - if (routes == null) { - routes = new BitSet(); - wayRoutes.put(way, routes); - } - routes.set(route.getIndex()); - } + if (way.getNodesCount() >= 2) { + BitSet routes = wayRoutes.get(way); + if (routes == null) { + routes = new BitSet(); + wayRoutes.put(way, routes); + } + routes.set(route.getIndex()); + } - } + } - public Collection getConvertedWays() { - if (convertedWays == null) { - Map ways = new HashMap(); + public Collection getConvertedWays() { + if (convertedWays == null) { + Map ways = new HashMap(); - for (Entry wayEntry:wayRoutes.entrySet()) { - ConvertedWay way = new ConvertedWay(wayEntry.getValue(), wayEntry.getKey()); + for (Entry wayEntry:wayRoutes.entrySet()) { + ConvertedWay way = new ConvertedWay(wayEntry.getValue(), wayEntry.getKey()); - ConvertedWay wayBefore = ways.get(way.getStart()); - ConvertedWay wayAfter = ways.get(way.getStop()); + ConvertedWay wayBefore = ways.get(way.getStart()); + ConvertedWay wayAfter = ways.get(way.getStop()); - if (wayBefore != null) { - removeWay(ways, wayBefore); - way.connect(wayBefore); - } + if (wayBefore != null) { + removeWay(ways, wayBefore); + way.connect(wayBefore); + } - if (wayAfter != null) { - removeWay(ways, wayAfter); - way.connect(wayAfter); - } + if (wayAfter != null) { + removeWay(ways, wayAfter); + way.connect(wayAfter); + } - ways.put(way.getStart(), way); - ways.put(way.getStop(), way); - } + ways.put(way.getStart(), way); + ways.put(way.getStop(), way); + } - Set uniqueWays = new HashSet(); - uniqueWays.addAll(ways.values()); - convertedWays = uniqueWays; - } - return convertedWays; - } + Set uniqueWays = new HashSet(); + uniqueWays.addAll(ways.values()); + convertedWays = uniqueWays; + } + return convertedWays; + } - private void removeWay(Map map, ConvertedWay wayInMap) { - map.remove(wayInMap.getStart()); - map.remove(wayInMap.getStop()); - } + private void removeWay(Map map, ConvertedWay wayInMap) { + map.remove(wayInMap.getStart()); + map.remove(wayInMap.getStop()); + } - public void clear() { - convertedWays = null; - wayRoutes.clear(); - } + public void clear() { + convertedWays = null; + wayRoutes.clear(); + } } Index: applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java =================================================================== --- applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java (revision 22590) +++ applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java (revision 23189) @@ -21,77 +21,77 @@ public class RelationEditMode extends MapMode { - private static final long serialVersionUID = -7767329767438266289L; + private static final long serialVersionUID = -7767329767438266289L; - private Way highlightedWay; + private Way highlightedWay; - public RelationEditMode(MapFrame mapFrame) { - super(tr("Edit relation"), "node/autonode", tr("Edit relations"), - Shortcut.registerShortcut("mapmode:editRelation", tr("Mode: {0}", tr("Edit relation")), KeyEvent.VK_H, Shortcut.GROUP_EDIT), - mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); - } + public RelationEditMode(MapFrame mapFrame) { + super(tr("Edit relation"), "node/autonode", tr("Edit relations"), + Shortcut.registerShortcut("mapmode:editRelation", tr("Mode: {0}", tr("Edit relation")), KeyEvent.VK_H, Shortcut.GROUP_EDIT), + mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); + } - @Override - public void enterMode() { - super.enterMode(); - Main.map.mapView.addMouseListener(this); - Main.map.mapView.addMouseMotionListener(this); - } + @Override + public void enterMode() { + super.enterMode(); + Main.map.mapView.addMouseListener(this); + Main.map.mapView.addMouseMotionListener(this); + } - @Override - public void exitMode() { - super.exitMode(); - Main.map.mapView.removeMouseListener(this); - Main.map.mapView.removeMouseMotionListener(this); - } + @Override + public void exitMode() { + super.exitMode(); + Main.map.mapView.removeMouseListener(this); + Main.map.mapView.removeMouseMotionListener(this); + } - @Override - public void mouseMoved(MouseEvent e) { - Way nearestWay = Main.map.mapView.getNearestWay(e.getPoint(), OsmPrimitive.isUsablePredicate); - if (nearestWay != highlightedWay) { - if (highlightedWay != null) { - highlightedWay.setHighlighted(false); - } - if (nearestWay != null) { - nearestWay.setHighlighted(true); - } - highlightedWay = nearestWay; - Main.map.mapView.repaint(); - } - } + @Override + public void mouseMoved(MouseEvent e) { + Way nearestWay = Main.map.mapView.getNearestWay(e.getPoint(), OsmPrimitive.isUsablePredicate); + if (nearestWay != highlightedWay) { + if (highlightedWay != null) { + highlightedWay.setHighlighted(false); + } + if (nearestWay != null) { + nearestWay.setHighlighted(true); + } + highlightedWay = nearestWay; + Main.map.mapView.repaint(); + } + } - @Override - public void mouseClicked(MouseEvent e) { - if (Main.main.getCurrentDataSet() == null) - return; + @Override + public void mouseClicked(MouseEvent e) { + if (Main.main.getCurrentDataSet() == null) + return; - Way way = Main.map.mapView.getNearestWay(e.getPoint(), OsmPrimitive.isUsablePredicate); - Collection selectedRelations = Main.main.getCurrentDataSet().getSelectedRelations(); + Way way = Main.map.mapView.getNearestWay(e.getPoint(), OsmPrimitive.isUsablePredicate); + Collection selectedRelations = Main.main.getCurrentDataSet().getSelectedRelations(); - if (way != null) { + if (way != null) { - if (selectedRelations.isEmpty()) { - JOptionPane.showMessageDialog(Main.parent, tr("No relation is selected")); - } + if (selectedRelations.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, tr("No relation is selected")); + } - for (OsmPrimitive rel:selectedRelations) { - Relation r = (Relation)rel; - RelationMember foundMember = null; - for (RelationMember member:r.getMembers()) { - if (member.getMember() == way) { - foundMember = member; - break; - } - } + for (OsmPrimitive rel:selectedRelations) { + Relation r = (Relation)rel; + RelationMember foundMember = null; + for (RelationMember member:r.getMembers()) { + if (member.getMember() == way) { + foundMember = member; + break; + } + } - if (foundMember != null) { - Main.main.undoRedo.add(new RemoveRelationMemberCommand(r, new RelationMember("", way))); - } else { - Relation newRelation = new Relation(r); - newRelation.addMember(new RelationMember("", way)); - Main.main.undoRedo.add(new ChangeCommand(r, newRelation)); - } - } - } - } + if (foundMember != null) { + Main.main.undoRedo.add(new RemoveRelationMemberCommand(r, new RelationMember("", way))); + } else { + Relation newRelation = new Relation(r); + newRelation.addMember(new RelationMember("", way)); + Main.main.undoRedo.add(new ChangeCommand(r, newRelation)); + } + } + } + } Index: applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteDefinition.java =================================================================== --- applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteDefinition.java (revision 22590) +++ applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteDefinition.java (revision 23189) @@ -10,37 +10,37 @@ public class RouteDefinition { - private final Color color; - private final String matchString; - private Match match; - private final int index; + private final Color color; + private final String matchString; + private Match match; + private final int index; - public RouteDefinition(int index, Color color, String expression) { - this.color = color; - this.matchString = expression; - this.index = index; - try { - match = SearchCompiler.compile(expression, false, false); - } catch (ParseError e) { - match = new SearchCompiler.Never(); - e.printStackTrace(); - } - } + public RouteDefinition(int index, Color color, String expression) { + this.color = color; + this.matchString = expression; + this.index = index; + try { + match = SearchCompiler.compile(expression, false, false); + } catch (ParseError e) { + match = new SearchCompiler.Never(); + e.printStackTrace(); + } + } - public boolean matches(OsmPrimitive primitive) { - return match.match(primitive); - } + public boolean matches(OsmPrimitive primitive) { + return match.match(primitive); + } - public Color getColor() { - return color; - } + public Color getColor() { + return color; + } - public int getIndex() { - return index; - } + public int getIndex() { + return index; + } - @Override - public String toString() { - return color.toString() + " " + matchString; - } + @Override + public String toString() { + return color.toString() + " " + matchString; + } } Index: applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java =================================================================== --- applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java (revision 22590) +++ applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java (revision 23189) @@ -33,124 +33,124 @@ public class RouteLayer extends Layer implements DataSetListenerAdapter.Listener { - private final PathPainter pathPainter; - private final PathBuilder pathBuilder = new PathBuilder(); - private final List routes = new ArrayList(); - private volatile boolean datasetChanged = true; + private final PathPainter pathPainter; + private final PathBuilder pathBuilder = new PathBuilder(); + private final List routes = new ArrayList(); + private volatile boolean datasetChanged = true; - public RouteLayer(RoutesXMLLayer xmlLayer) { - super(xmlLayer.getName()); + public RouteLayer(RoutesXMLLayer xmlLayer) { + super(xmlLayer.getName()); - int index = 0; - for (RoutesXMLRoute route:xmlLayer.getRoute()) { - if (route.isEnabled()) { - Color color = ColorHelper.html2color(route.getColor()); - if (color == null) { - color = Color.RED; - System.err.printf("Routes plugin - unable to convert color (%s)\n", route.getColor()); - } - routes.add(new RouteDefinition(index++, color, route.getPattern())); - } - } + int index = 0; + for (RoutesXMLRoute route:xmlLayer.getRoute()) { + if (route.isEnabled()) { + Color color = ColorHelper.html2color(route.getColor()); + if (color == null) { + color = Color.RED; + System.err.printf("Routes plugin - unable to convert color (%s)\n", route.getColor()); + } + routes.add(new RouteDefinition(index++, color, route.getPattern())); + } + } - if ("wide".equals(Main.pref.get("routes.painter"))) { - pathPainter = new WideLinePainter(this); - } else { - pathPainter = new NarrowLinePainter(this); - } + if ("wide".equals(Main.pref.get("routes.painter"))) { + pathPainter = new WideLinePainter(this); + } else { + pathPainter = new NarrowLinePainter(this); + } - DatasetEventManager.getInstance().addDatasetListener(new DataSetListenerAdapter(this), FireMode.IMMEDIATELY); - } + DatasetEventManager.getInstance().addDatasetListener(new DataSetListenerAdapter(this), FireMode.IMMEDIATELY); + } - @Override - public Icon getIcon() { - return ImageProvider.get("layer", "osmdata_small"); - } + @Override + public Icon getIcon() { + return ImageProvider.get("layer", "osmdata_small"); + } - @Override - public Object getInfoComponent() { - return null; - } + @Override + public Object getInfoComponent() { + return null; + } - @Override - public Action[] getMenuEntries() { - return new Action[0]; - } + @Override + public Action[] getMenuEntries() { + return new Action[0]; + } - @Override - public String getToolTipText() { - return "Hiking routes"; - } + @Override + public String getToolTipText() { + return "Hiking routes"; + } - @Override - public boolean isMergable(Layer other) { - return false; - } + @Override + public boolean isMergable(Layer other) { + return false; + } - @Override - public void mergeFrom(Layer from) { - // Merging is not supported - } + @Override + public void mergeFrom(Layer from) { + // Merging is not supported + } - private void addRelation(Relation relation, RouteDefinition route) { - for (RelationMember member:relation.getMembers()) { - if (member.getMember() instanceof Way) { - Way way = (Way)member.getMember(); - pathBuilder.addWay(way, route); - } - } - } + private void addRelation(Relation relation, RouteDefinition route) { + for (RelationMember member:relation.getMembers()) { + if (member.getMember() instanceof Way) { + Way way = (Way)member.getMember(); + pathBuilder.addWay(way, route); + } + } + } - @Override - public void paint(Graphics2D g, MapView mv, Bounds bounds) { + @Override + public void paint(Graphics2D g, MapView mv, Bounds bounds) { - DataSet dataset = Main.main.getCurrentDataSet(); + DataSet dataset = Main.main.getCurrentDataSet(); - if (dataset == null) { - return; - } + if (dataset == null) { + return; + } - if (datasetChanged) { - datasetChanged = false; - pathBuilder.clear(); + if (datasetChanged) { + datasetChanged = false; + pathBuilder.clear(); - for (Relation relation:dataset.getRelations()) { - for (RouteDefinition route:routes) { - if (route.matches(relation)) { - addRelation(relation, route); - } - } - } + for (Relation relation:dataset.getRelations()) { + for (RouteDefinition route:routes) { + if (route.matches(relation)) { + addRelation(relation, route); + } + } + } - for (Way way:dataset.getWays()) { - for (RouteDefinition route:routes) { - if (route.matches(way)) { - pathBuilder.addWay(way, route); - } - } - } - } + for (Way way:dataset.getWays()) { + for (RouteDefinition route:routes) { + if (route.matches(way)) { + pathBuilder.addWay(way, route); + } + } + } + } - Stroke stroke = g.getStroke(); - Color color = g.getColor(); - for (ConvertedWay way:pathBuilder.getConvertedWays()) { - pathPainter.drawWay(way, mv, g); - } - g.setStroke(stroke); - g.setColor(color); + Stroke stroke = g.getStroke(); + Color color = g.getColor(); + for (ConvertedWay way:pathBuilder.getConvertedWays()) { + pathPainter.drawWay(way, mv, g); + } + g.setStroke(stroke); + g.setColor(color); - } + } - @Override - public void visitBoundingBox(BoundingXYVisitor v) { + @Override + public void visitBoundingBox(BoundingXYVisitor v) { - } + } - public List getRoutes() { - return routes; - } + public List getRoutes() { + return routes; + } - public void processDatasetEvent(AbstractDatasetChangedEvent event) { - datasetChanged = true; - } + public void processDatasetEvent(AbstractDatasetChangedEvent event) { + datasetChanged = true; + } } Index: applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RoutesPlugin.java =================================================================== --- applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RoutesPlugin.java (revision 22590) +++ applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RoutesPlugin.java (revision 23189) @@ -26,35 +26,35 @@ public class RoutesPlugin extends Plugin implements LayerChangeListener { - + private final List routeLayers = new ArrayList(); private boolean isShown; - + public RoutesPlugin(PluginInformation info) { - super(info); - MapView.addLayerChangeListener(this); - + super(info); + MapView.addLayerChangeListener(this); + File routesFile = new File(getPluginDir() + File.separator + "routes.xml"); if (!routesFile.exists()) { System.out.println("File with route definitions doesn't exist, using default"); - + try { routesFile.getParentFile().mkdir(); OutputStream outputStream = new FileOutputStream(routesFile); InputStream inputStream = Routes.class.getResourceAsStream("routes.xml"); - - byte[] b = new byte[512]; - int read; - while ((read = inputStream.read(b)) != -1) { + + byte[] b = new byte[512]; + int read; + while ((read = inputStream.read(b)) != -1) { outputStream.write(b, 0, read); } - - outputStream.close(); + + outputStream.close(); inputStream.close(); - + } catch (IOException e) { e.printStackTrace(); } } - + try { JAXBContext context = JAXBContext.newInstance( @@ -64,11 +64,11 @@ new FileInputStream(getPluginDir() + File.separator + "routes.xml")); for (RoutesXMLLayer layer:routes.getLayer()) { - if (layer.isEnabled()) { - routeLayers.add(new RouteLayer(layer)); - } + if (layer.isEnabled()) { + routeLayers.add(new RouteLayer(layer)); + } } } catch (Exception e) { e.printStackTrace(); - } + } //new RelationEditMode(Main.map); @@ -77,7 +77,7 @@ public void activeLayerChange(Layer oldLayer, Layer newLayer) { - // TODO Auto-generated method stub + // TODO Auto-generated method stub } - + private void checkLayers() { if (Main.map != null && Main.map.mapView != null) { @@ -91,9 +91,9 @@ Main.main.addLayer(routeLayer); } - } + } }); } return; - } + } } if (isShown) { @@ -104,5 +104,5 @@ Main.main.removeLayer(routeLayer); } - } + } }); } Index: applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/paint/AbstractLinePainter.java =================================================================== --- applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/paint/AbstractLinePainter.java (revision 22590) +++ applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/paint/AbstractLinePainter.java (revision 23189) @@ -17,164 +17,164 @@ public abstract class AbstractLinePainter implements PathPainter { - // Following two method copied from http://blog.persistent.info/2004/03/java-lineline-intersections.html - protected boolean getLineLineIntersection(Line2D.Double l1, - Line2D.Double l2, - Point intersection) - { - double x1 = l1.getX1(), y1 = l1.getY1(), - x2 = l1.getX2(), y2 = l1.getY2(), - x3 = l2.getX1(), y3 = l2.getY1(), - x4 = l2.getX2(), y4 = l2.getY2(); - double dx1 = x2 - x1; - double dx2 = x4 - x3; - double dy1 = y2 - y1; - double dy2 = y4 - y3; + // Following two method copied from http://blog.persistent.info/2004/03/java-lineline-intersections.html + protected boolean getLineLineIntersection(Line2D.Double l1, + Line2D.Double l2, + Point intersection) + { + double x1 = l1.getX1(), y1 = l1.getY1(), + x2 = l1.getX2(), y2 = l1.getY2(), + x3 = l2.getX1(), y3 = l2.getY1(), + x4 = l2.getX2(), y4 = l2.getY2(); + double dx1 = x2 - x1; + double dx2 = x4 - x3; + double dy1 = y2 - y1; + double dy2 = y4 - y3; - double ua = (dx2 * (y1 - y3) - dy2 * (x1 - x3)) / (dy2 * dx1 - dx2 * dy1); + double ua = (dx2 * (y1 - y3) - dy2 * (x1 - x3)) / (dy2 * dx1 - dx2 * dy1); - if (Math.abs(dy2 * dx1 - dx2 * dy1) < 0.0001) { - intersection.x = (int)l1.x2; - intersection.y = (int)l1.y2; - return false; - } else { - intersection.x = (int)(x1 + ua * (x2 - x1)); - intersection.y = (int)(y1 + ua * (y2 - y1)); - } + if (Math.abs(dy2 * dx1 - dx2 * dy1) < 0.0001) { + intersection.x = (int)l1.x2; + intersection.y = (int)l1.y2; + return false; + } else { + intersection.x = (int)(x1 + ua * (x2 - x1)); + intersection.y = (int)(y1 + ua * (y2 - y1)); + } - return true; - } + return true; + } - protected double det(double a, double b, double c, double d) - { - return a * d - b * c; - } + protected double det(double a, double b, double c, double d) + { + return a * d - b * c; + } - protected Point shiftPoint(Point2D p1, Point2D p2, double shift) { - double dx = p2.getX() - p1.getX(); - double dy = p2.getY() - p1.getY(); + protected Point shiftPoint(Point2D p1, Point2D p2, double shift) { + double dx = p2.getX() - p1.getX(); + double dy = p2.getY() - p1.getY(); - // Perpendicular vector - double ndx = -dy; - double ndy = dx; + // Perpendicular vector + double ndx = -dy; + double ndy = dx; - // Normalize - double length = Math.sqrt(ndx * ndx + ndy * ndy); - ndx = ndx / length; - ndy = ndy / length; + // Normalize + double length = Math.sqrt(ndx * ndx + ndy * ndy); + ndx = ndx / length; + ndy = ndy / length; - return new Point((int)(p1.getX() + shift * ndx), (int)(p1.getY() + shift * ndy)); - } + return new Point((int)(p1.getX() + shift * ndx), (int)(p1.getY() + shift * ndy)); + } - protected Line2D.Double shiftLine(Point2D p1, Point2D p2, double shift) { - double dx = p2.getX() - p1.getX(); - double dy = p2.getY() - p1.getY(); + protected Line2D.Double shiftLine(Point2D p1, Point2D p2, double shift) { + double dx = p2.getX() - p1.getX(); + double dy = p2.getY() - p1.getY(); - Point2D point1 = shiftPoint(p1, p2, shift); - Point2D point2 = new Point2D.Double(point1.getX() + dx, point1.getY() + dy); + Point2D point1 = shiftPoint(p1, p2, shift); + Point2D point2 = new Point2D.Double(point1.getX() + dx, point1.getY() + dy); - return new Line2D.Double( - point1, point2); - } + return new Line2D.Double( + point1, point2); + } - protected GeneralPath getPath(Graphics2D g, MapView mapView, List nodes, double shift) { + protected GeneralPath getPath(Graphics2D g, MapView mapView, List nodes, double shift) { - GeneralPath path = new GeneralPath(); + GeneralPath path = new GeneralPath(); - if (nodes.size() < 2) { - return path; - } + if (nodes.size() < 2) { + return path; + } - Point p1 = null; - Point p2 = null; - Point p3 = null; - Point lastPoint = null; + Point p1 = null; + Point p2 = null; + Point p3 = null; + Point lastPoint = null; - for (Node n: nodes) { - Point p = mapView.getPoint(n); + for (Node n: nodes) { + Point p = mapView.getPoint(n); - if (!p.equals(p3)) { - p1 = p2; - p2 = p3; - p3 = p; - } else { - continue; - } + if (!p.equals(p3)) { + p1 = p2; + p2 = p3; + p3 = p; + } else { + continue; + } - p = null; - if (p2 != null) { - if (p1 == null) { - p = shiftPoint(p2, p3, shift); - } else { - Line2D.Double line1 = shiftLine(p1, p2, shift); - Line2D.Double line2 = shiftLine(p2, p3, shift); + p = null; + if (p2 != null) { + if (p1 == null) { + p = shiftPoint(p2, p3, shift); + } else { + Line2D.Double line1 = shiftLine(p1, p2, shift); + Line2D.Double line2 = shiftLine(p2, p3, shift); - /*path.moveTo((float)line1.x1, (float)line1.y1); - path.lineTo((float)line1.x2, (float)line1.y2); - path.moveTo((float)line2.x1, (float)line2.y1); - path.lineTo((float)line2.x2, (float)line2.y2);*/ + /*path.moveTo((float)line1.x1, (float)line1.y1); + path.lineTo((float)line1.x2, (float)line1.y2); + path.moveTo((float)line2.x1, (float)line2.y1); + path.lineTo((float)line2.x2, (float)line2.y2);*/ - p = new Point(); - if (!getLineLineIntersection(line1, line2, p)) { - p = null; - } else { - int dx = p.x - p2.x; - int dy = p.y - p2.y; - int distance = (int)Math.sqrt(dx * dx + dy * dy); - if (distance > 10) { - p.x = p2.x + dx / (distance / 10); - p.y = p2.y + dy / (distance / 10); - } - } - } - } + p = new Point(); + if (!getLineLineIntersection(line1, line2, p)) { + p = null; + } else { + int dx = p.x - p2.x; + int dy = p.y - p2.y; + int distance = (int)Math.sqrt(dx * dx + dy * dy); + if (distance > 10) { + p.x = p2.x + dx / (distance / 10); + p.y = p2.y + dy / (distance / 10); + } + } + } + } - if (p != null && lastPoint != null) { - drawSegment(g, mapView, path, lastPoint, p); - } - if (p != null) { - lastPoint = p; - } - } + if (p != null && lastPoint != null) { + drawSegment(g, mapView, path, lastPoint, p); + } + if (p != null) { + lastPoint = p; + } + } - if (p2 != null && p3 != null && lastPoint != null) { - p3 = shiftPoint(p3, p2, -shift); - drawSegment(g, mapView, path, lastPoint, p3); - } + if (p2 != null && p3 != null && lastPoint != null) { + p3 = shiftPoint(p3, p2, -shift); + drawSegment(g, mapView, path, lastPoint, p3); + } - return path; - } + return path; + } - private void drawSegment(Graphics2D g, NavigatableComponent nc, GeneralPath path, Point p1, Point p2) { - boolean drawIt = false; - if (Main.isOpenjdk) { - /** - * Work around openjdk bug. It leads to drawing artefacts when zooming in a lot. (#4289, #4424) - * (It looks like int overflow when clipping.) We do custom clipping. - */ - Rectangle bounds = g.getClipBounds(); - bounds.grow(100, 100); // avoid arrow heads at the border - LineClip clip = new LineClip(); - drawIt = clip.cohenSutherland(p1.x, p1.y, p2.x, p2.y, bounds.x, bounds.y, bounds.x+bounds.width, bounds.y+bounds.height); - if (drawIt) { - p1 = clip.getP1(); - p2 = clip.getP2(); - } - } else { - drawIt = isSegmentVisible(nc, p1, p2); - } - if (drawIt) { - /* draw segment line */ - path.moveTo(p1.x, p1.y); - path.lineTo(p2.x, p2.y); - } - } + private void drawSegment(Graphics2D g, NavigatableComponent nc, GeneralPath path, Point p1, Point p2) { + boolean drawIt = false; + if (Main.isOpenjdk) { + /** + * Work around openjdk bug. It leads to drawing artefacts when zooming in a lot. (#4289, #4424) + * (It looks like int overflow when clipping.) We do custom clipping. + */ + Rectangle bounds = g.getClipBounds(); + bounds.grow(100, 100); // avoid arrow heads at the border + LineClip clip = new LineClip(); + drawIt = clip.cohenSutherland(p1.x, p1.y, p2.x, p2.y, bounds.x, bounds.y, bounds.x+bounds.width, bounds.y+bounds.height); + if (drawIt) { + p1 = clip.getP1(); + p2 = clip.getP2(); + } + } else { + drawIt = isSegmentVisible(nc, p1, p2); + } + if (drawIt) { + /* draw segment line */ + path.moveTo(p1.x, p1.y); + path.lineTo(p2.x, p2.y); + } + } - private boolean isSegmentVisible(NavigatableComponent nc, 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 boolean isSegmentVisible(NavigatableComponent nc, 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; + } Index: applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/paint/NarrowLinePainter.java =================================================================== --- applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/paint/NarrowLinePainter.java (revision 22590) +++ applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/paint/NarrowLinePainter.java (revision 23189) @@ -14,41 +14,41 @@ public class NarrowLinePainter extends AbstractLinePainter { - private static final float LINE_WIDTH = 5; - private final RouteLayer layer; + private static final float LINE_WIDTH = 5; + private final RouteLayer layer; - public NarrowLinePainter(RouteLayer layer) { - this.layer = layer; - } + public NarrowLinePainter(RouteLayer layer) { + this.layer = layer; + } - public void drawWay(ConvertedWay way, MapView mapView, Graphics2D g) { - List nodes = way.getNodes(); - BitSet routes = way.getRoutes(); + public void drawWay(ConvertedWay way, MapView mapView, Graphics2D g) { + List nodes = way.getNodes(); + BitSet routes = way.getRoutes(); - if (nodes.size() < 2) { - return; - } + if (nodes.size() < 2) { + return; + } - //double totalWidth = LINE_WIDTH + (colors.size() - 1) * 4; - //double width = totalWidth / colors.size(); - //double shift = -totalWidth / 2 + width / 2; - double width = LINE_WIDTH; - double shift = - (LINE_WIDTH * routes.cardinality()) / 2 + width / 2; + //double totalWidth = LINE_WIDTH + (colors.size() - 1) * 4; + //double width = totalWidth / colors.size(); + //double shift = -totalWidth / 2 + width / 2; + double width = LINE_WIDTH; + double shift = - (LINE_WIDTH * routes.cardinality()) / 2 + width / 2; - for (int k=0; k nodes = way.getNodes(); - BitSet routes = way.getRoutes(); + public void drawWay(ConvertedWay way, MapView mapView, Graphics2D g) { + List nodes = way.getNodes(); + BitSet routes = way.getRoutes(); - if (nodes.size() < 2) { - return; - } + if (nodes.size() < 2) { + return; + } - double totalWidth = LINE_WIDTH + (routes.size() - 1) * 4; - double width = totalWidth / routes.cardinality(); - double shift = -totalWidth / 2 + width / 2; + double totalWidth = LINE_WIDTH + (routes.size() - 1) * 4; + double width = totalWidth / routes.cardinality(); + double shift = -totalWidth / 2 + width / 2; - for (int k=0; khttp://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.07.19 at 03:50:48 odp. CEST +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.07.19 at 03:50:48 odp. CEST // @@ -13,16 +13,16 @@ /** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.openstreetmap.josm.plugins.routes.xml package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.openstreetmap.josm.plugins.routes.xml package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are * provided in this class. - * + * */ @XmlRegistry @@ -32,5 +32,5 @@ /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.openstreetmap.josm.plugins.routes.xml - * + * */ public ObjectFactory() { @@ -39,5 +39,5 @@ /** * Create an instance of {@link RoutesXMLRoute } - * + * */ public RoutesXMLRoute createRoutesXMLRoute() { @@ -47,5 +47,5 @@ /** * Create an instance of {@link RoutesXMLLayer } - * + * */ public RoutesXMLLayer createRoutesXMLLayer() { @@ -55,5 +55,5 @@ /** * Create an instance of {@link Routes } - * + * */ public Routes createRoutes() { Index: applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/Routes.java =================================================================== --- applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/Routes.java (revision 22590) +++ applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/Routes.java (revision 23189) @@ -1,7 +1,7 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.07.19 at 03:50:48 odp. CEST +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.07.19 at 03:50:48 odp. CEST // @@ -19,7 +19,7 @@ /** *

Java class for anonymous complex type. - * + * *

The following schema fragment specifies the expected content contained within this class. - * + * * 

  * <complexType>
@@ -33,6 +33,6 @@
  * </complexType>
  *
- * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @@ -47,5 +47,5 @@ /** * Gets the value of the layer property. - * + * *

* This accessor method returns a reference to the live list, @@ -53,5 +53,5 @@ * returned list will be present inside the JAXB object. * This is why there is not a set method for the layer property. - * + * *

* For example, to add a new item, do as follows: @@ -59,11 +59,11 @@ * getLayer().add(newItem); * - * - * + * + * *

* Objects of the following type(s) are allowed in the list * {@link RoutesXMLLayer } - * - * + * + * */ public List getLayer() { Index: applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/RoutesXMLLayer.java =================================================================== --- applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/RoutesXMLLayer.java (revision 22590) +++ applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/RoutesXMLLayer.java (revision 23189) @@ -1,7 +1,7 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.07.19 at 03:50:48 odp. CEST +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.07.19 at 03:50:48 odp. CEST // @@ -19,7 +19,7 @@ /** *

Java class for layer complex type. - * + * *

The following schema fragment specifies the expected content contained within this class. - * + * * 

  * <complexType name="layer">
@@ -35,6 +35,6 @@
  * </complexType>
  *
- * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @@ -52,5 +52,5 @@ /** * Gets the value of the route property. - * + * *

* This accessor method returns a reference to the live list, @@ -58,5 +58,5 @@ * returned list will be present inside the JAXB object. * This is why there is not a set method for the route property. - * + * *

* For example, to add a new item, do as follows: @@ -64,11 +64,11 @@ * getRoute().add(newItem); * - * - * + * + * *

* Objects of the following type(s) are allowed in the list * {@link RoutesXMLRoute } - * - * + * + * */ public List getRoute() { @@ -81,9 +81,9 @@ /** * Gets the value of the name property. - * + * * @return * possible object is * {@link String } - * + * */ public String getName() { @@ -93,9 +93,9 @@ /** * Sets the value of the name property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setName(String value) { @@ -105,9 +105,9 @@ /** * Gets the value of the enabled property. - * + * * @return * possible object is * {@link Boolean } - * + * */ public boolean isEnabled() { @@ -121,9 +121,9 @@ /** * Sets the value of the enabled property. - * + * * @param value * allowed object is * {@link Boolean } - * + * */ public void setEnabled(Boolean value) { Index: applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/RoutesXMLRoute.java =================================================================== --- applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/RoutesXMLRoute.java (revision 22590) +++ applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/RoutesXMLRoute.java (revision 23189) @@ -1,7 +1,7 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.07.19 at 03:50:48 odp. CEST +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.07.19 at 03:50:48 odp. CEST // @@ -18,7 +18,7 @@ /** *

Java class for route complex type. - * + * *

The following schema fragment specifies the expected content contained within this class. - * + * * 

  * <complexType name="route">
@@ -34,6 +34,6 @@
  * </complexType>
  *
- * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @@ -52,9 +52,9 @@ /** * Gets the value of the pattern property. - * + * * @return * possible object is * {@link String } - * + * */ public String getPattern() { @@ -64,9 +64,9 @@ /** * Sets the value of the pattern property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setPattern(String value) { @@ -76,9 +76,9 @@ /** * Gets the value of the color property. - * + * * @return * possible object is * {@link String } - * + * */ public String getColor() { @@ -88,9 +88,9 @@ /** * Sets the value of the color property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setColor(String value) { @@ -100,9 +100,9 @@ /** * Gets the value of the enabled property. - * + * * @return * possible object is * {@link Boolean } - * + * */ public boolean isEnabled() { @@ -116,9 +116,9 @@ /** * Sets the value of the enabled property. - * + * * @param value * allowed object is * {@link Boolean } - * + * */ public void setEnabled(Boolean value) { Index: applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/package-info.java =================================================================== --- applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/package-info.java (revision 22590) +++ applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/package-info.java (revision 23189) @@ -1,7 +1,7 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.07.19 at 03:50:48 odp. CEST +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.07.19 at 03:50:48 odp. CEST //