Index: applications/editors/josm/plugins/alignways/.classpath =================================================================== --- applications/editors/josm/plugins/alignways/.classpath (revision 21613) +++ applications/editors/josm/plugins/alignways/.classpath (revision 21613) @@ -0,0 +1,10 @@ + + + + + + + + Index: applications/editors/josm/plugins/alignways/.project =================================================================== --- applications/editors/josm/plugins/alignways/.project (revision 21613) +++ applications/editors/josm/plugins/alignways/.project (revision 21613) @@ -0,0 +1,18 @@ + + + JOSM-alignways + + + JOSM + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + Index: applications/editors/josm/plugins/alignways/LICENSE =================================================================== --- applications/editors/josm/plugins/alignways/LICENSE (revision 21613) +++ applications/editors/josm/plugins/alignways/LICENSE (revision 21613) @@ -0,0 +1,345 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Index: applications/editors/josm/plugins/alignways/README =================================================================== --- applications/editors/josm/plugins/alignways/README (revision 21613) +++ applications/editors/josm/plugins/alignways/README (revision 21613) @@ -0,0 +1,9 @@ +README +====== + +The alignways plugin has been created by Attila SZASZ + +License: GPL v2 or later. + +The complete text of the GNU General Public License can be found +in the LICENSE file in the OSM subversion root directory. Index: applications/editors/josm/plugins/alignways/README.template =================================================================== --- applications/editors/josm/plugins/alignways/README.template (revision 21613) +++ applications/editors/josm/plugins/alignways/README.template (revision 21613) @@ -0,0 +1,75 @@ +README +====== + +This is a template project structure for a JOSM plugin. + +Layout +====== ++--- src source of your plugin + |- images images your plugin needs + |- resources resources your plugin needs + + LICENSE license file + README README for your plugin + + README.template this file + + +Build +===== +A JOSM plugin is built as a single jar. We use ant to build. + +See build.xml in this directory and update the plugin specific properties in the +configuration section. + + +Maintaining versions +==================== +There are two versions maintained with each plugin: + 1) the main version + You have to manually set the plugins main version in the build script. + Set the property plugin.main.version in build.xml accordingly. + + 2) the build version + The build version is unique for every build of the plugin. It is equal + to the SVN revision of your plugin directory. + + Both the main version and the build version are included in properties of the plugins + manifest: + Plugin-Version the build version + Plugin-Mainversion the main version + + JOSM automatically detects whether a plugin needs to be upgraded. It compares the build + version of the currently installed plugin jar with the build version of the plugin jar in + the SVN. The main version is irrelevant for this process. + + Making your plugin available to JOSM users + =========================================== + When a plugin jar is checked into SVN a script updates the plugins list on the JOSM wiki: + http://josm.openstreetmap.de/wiki/Plugins + JOSM retrieves the list of available plugins and their build versions from this list. + + commit publish read + meta data meta data + Build ==> SVN =======> JOSM Wiki <======= JOSM + ^ + ================================== + fetch current plugin jar + + Note that you have to manually publish (commit) your plugin jar. There is no nightly build + in place. Everything else (pulishing meta data, updating plugins in the client) is then handled + by automatic processes. + +See also +======== +* Developing Plugins + http://josm.openstreetmap.de/wiki/DevelopingPlugins + +* List of JOSM Plugins + http://josm.openstreetmap.de/wiki/Plugins + + + + + + Index: applications/editors/josm/plugins/alignways/build.xml =================================================================== --- applications/editors/josm/plugins/alignways/build.xml (revision 21613) +++ applications/editors/josm/plugins/alignways/build.xml (revision 21613) @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Building against core revision + ${coreversion.info.entry.revision}. + Plugin-Mainversion is set to ${plugin.main.version}. + + + + + + Commiting the plugin source with message '${commit.message}' ... + + + + + + + + + + + Updating plugin source ... + + + + + + Updating ${plugin.jar} ... + + + + + + + + + + + ***** Properties of published ${plugin.jar} ***** + Commit message + : '${commit.message}' + Plugin-Mainversion: ${plugin.main.version} + JOSM + build version: ${coreversion.info.entry.revision} + Plugin-Version : + ${version.entry.commit.revision} + ***** / Properties of published + ${plugin.jar} ***** + + Now commiting ${plugin.jar} ... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java (revision 21613) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java (revision 21613) @@ -0,0 +1,91 @@ +/** + * + */ +package org.openstreetmap.josm.plugins.alignways; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.util.Collection; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.visitor.AllNodesVisitor; +import org.openstreetmap.josm.tools.Shortcut; + +/** + * @author tilusnet + * + */ +public class AlignWaysAction extends JosmAction { + + /** + * + */ + private static final long serialVersionUID = -1540319652562985458L; + + public AlignWaysAction() { + super(tr("Align Way Segments"), "alignways", + tr("Makes a pair of selected way segments parallel by rotating one of them " + + "around a chosen pivot."), + Shortcut.registerShortcut("tools:alignways", tr("Tool: {0}", + tr("Align Ways")), KeyEvent.VK_A, Shortcut.GROUP_EDIT, + Shortcut.SHIFT_DEFAULT), true); + setEnabled(false); + } + + public void actionPerformed(ActionEvent e) { + if (!isEnabled()) + return; + if (getCurrentDataSet() == null) + return; + + Collection selection = getCurrentDataSet().getSelected(); + Collection affectedNodes = AllNodesVisitor.getAllNodes(selection); + + Command c = !Main.main.undoRedo.commands.isEmpty() ? Main.main.undoRedo.commands + .getLast() + : null; + + if (!(c instanceof AlignWaysRotateCommand && + affectedNodes.equals(((AlignWaysRotateCommand) c).getRotatedNodes()))) { + Main.main.undoRedo.add(c = new AlignWaysRotateCommand()); + } + + // Warn user if reference and alignee segment nodes are common: + // We cannot align two connected segment + if (((AlignWaysRotateCommand) c).areSegsConnected()) { + // Revert move + ((AlignWaysRotateCommand) c).undoCommand(); + JOptionPane.showMessageDialog(Main.parent, + tr("You cannot align connected segments.\n" + + "Please select two segments that don''t share any nodes."), + tr("AlignWayS message"), JOptionPane.WARNING_MESSAGE); + return; + } + + for (Node n : affectedNodes) { + if (n.getCoor().isOutSideWorld()) { + // Revert move + ((AlignWaysRotateCommand) c).undoCommand(); + JOptionPane.showMessageDialog(Main.parent, + tr("Aligning would result nodes outside the world." + + "Your action is being reverted."), + tr("AlignWayS message"), JOptionPane.WARNING_MESSAGE); + return; + } + + } + + Main.map.mapView.repaint(); + + return; + } + +} Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAlgnSegment.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAlgnSegment.java (revision 21613) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAlgnSegment.java (revision 21613) @@ -0,0 +1,213 @@ +package org.openstreetmap.josm.plugins.alignways; + +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.Point; +import java.awt.Shape; +import java.awt.geom.Ellipse2D; +import java.awt.geom.Line2D; +import java.util.EnumMap; +import java.util.Map; + +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.osm.WaySegment; +import org.openstreetmap.josm.gui.MapView; +import org.openstreetmap.josm.gui.NavigatableComponent; + +/** + * @author tilusnet The segment to be aligned to the + * reference segment. Actions it can do: - remember its selected pivot + * point - keeps its potential pivot point list up to date - rotate + * itself - paint itself and its selected pivot point + * + */ +public class AlignWaysAlgnSegment extends AlignWaysSegment { + + private enum PivotLocations { + NONE, NODE1, NODE2, CENTRE + }; + + private PivotLocations currPivot; + Map pivotList = new EnumMap( + PivotLocations.class); + private final Color pivotColor = Color.YELLOW; + private final Color crossColor = pivotColor; + + public AlignWaysAlgnSegment(MapView mapview, Point p) + throws IllegalArgumentException { + super(mapview, p); + setSegment(getNearestWaySegment(p)); + segmentColor = Color.ORANGE; + } + + /** + * Sets segment and initialises its pivot list and activates the centre + * rotation pivot. + */ + @Override + public void setSegment(WaySegment segment) { + super.setSegment(segment); + setPivots(); + } + + /** + * Useful when segments moves (or e.g. rotates) on the map. Updates the end + * segment points and the pivot coordinates without changing the current + * pivot. + */ + public void updatePivotsEndpoints() { + setPivots(currPivot); + setSegmentEndpoints(segment); + } + + /** + * Updates the segment's pivot list and sets the rotation pivot to centre. + */ + private void setPivots(PivotLocations pivotRef) { + if (segment != null) { + for (PivotLocations pl : PivotLocations.values()) { + pivotList.put(pl, getPivotCoord(pl)); + } + setPivotReference(pivotRef); + } else { + setPivotReference(PivotLocations.NONE); + } + } + + private void setPivots() { + setPivots(PivotLocations.CENTRE); + } + + private void setPivotReference(PivotLocations pp) { + currPivot = pp; + } + + /** + * Returns the EastNorth of the specified pivot point pp. It always returns + * up-to-date data from dataset. Assumes segment is not null. + * + * @param pp + * The pivot location + */ + private EastNorth getPivotCoord(PivotLocations pp) { + switch (pp) { + case NONE: + return null; + case NODE1: + return segment.way.getNode(segment.lowerIndex).getEastNorth(); + case NODE2: + return segment.way.getNode(segment.lowerIndex + 1).getEastNorth(); + case CENTRE: + return getPivotCoord(PivotLocations.NODE1).getCenter( + getPivotCoord(PivotLocations.NODE2)); + default: + // Should never happen + return null; + } + } + + /** + * @return The EastNorth of the currently selected pivot. + */ + public EastNorth getCurrPivotCoord() { + if (segment != null) + return getPivotCoord(currPivot); + return null; + } + + /** + * @param clickedPoint + * Pivot may be updated in the vicinity of this point + * @return true if a pivot is within reach on the segment, false otherwise + */ + public boolean updatePivot(Point clickedPoint) { + // tHQ Done. + PivotLocations tmpPivot = findNearbyPivot(clickedPoint); + if (tmpPivot != PivotLocations.NONE) { + setPivotReference(tmpPivot); + return true; + } else + return false; + } + + private PivotLocations findNearbyPivot(Point clickedPoint) { + PivotLocations nearest = PivotLocations.NONE; + int snapDistance = NavigatableComponent.snapDistance; + + // If no alignee selected yet, there's no point to carry on + if (segment == null) + return PivotLocations.NONE; + + for (PivotLocations pl : PivotLocations.values()) { + if (pl.equals(PivotLocations.NONE)) { + continue; + } + if (mapview.getPoint(pivotList.get(pl)).distance(clickedPoint) <= snapDistance) { + nearest = pl; + break; + } + } + return nearest; + } + + /* + * (non-Javadoc) + * + * @see + * org.openstreetmap.josm.plugins.alignways.AlignWaysRefSegment#paint(java + * .awt.Graphics2D, org.openstreetmap.josm.gui.MapView, + * org.openstreetmap.josm.data.Bounds) + */ + @Override + public void paint(Graphics2D g, MapView mv, Bounds bbox) { + // Note: segment should never be null here + super.paint(g, mv, bbox); + + // Highlight potential pivot points + for (PivotLocations pl : PivotLocations.values()) { + if (pl != PivotLocations.NONE) { + highlightCross(g, mv, pivotList.get(pl)); + } + } + + // Highlight active pivot + highlightPivot(g, mv, getPivotCoord(currPivot)); + + } + + private void highlightPivot(Graphics2D g, MapView mv, EastNorth pivot) { + g.setColor(pivotColor); + g.setStroke(new BasicStroke()); + + Shape pvCentrePoint = new Ellipse2D.Double( + mv.getPoint(pivot).getX() - 5.0f, + mv.getPoint(pivot).getY() - 5.0f, 10.0f, 10.0f); + g.fill(pvCentrePoint); + Shape pvPoint = new Ellipse2D.Double(mv.getPoint(pivot).getX() - 8.0f, + mv.getPoint(pivot).getY() - 8.0f, 16.0f, 16.0f); + + g.draw(pvCentrePoint); + g.draw(pvPoint); + } + + private void highlightCross(Graphics2D g, MapView mv, EastNorth en) { + + double crossX = mv.getPoint(en).getX(); + double crossY = mv.getPoint(en).getY(); + double crossSize = 10.0; + + Line2D crossV = new Line2D.Double(crossX, crossY - crossSize, crossX, + crossY + crossSize); + Line2D crossH = new Line2D.Double(crossX - crossSize, crossY, crossX + + crossSize, crossY); + + g.setColor(crossColor); + g.setStroke(new BasicStroke()); + g.draw(crossV); + g.draw(crossH); + + } + +} Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java (revision 21613) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java (revision 21613) @@ -0,0 +1,179 @@ +/** + * + */ +package org.openstreetmap.josm.plugins.alignways; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Cursor; +import java.awt.Point; +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.MouseEvent; + +import javax.swing.JDialog; +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.mapmode.MapMode; +import org.openstreetmap.josm.gui.MapFrame; + +/** + * @author tilusnet + * Handles the state machine and user interaction (mouse clicks). + * + */ +public class AlignWaysMode extends MapMode /* implements MapViewPaintable */{ + + private static final long serialVersionUID = -1090955708412011141L; + private final AlignWaysState noneSelected; + private final AlignWaysState referenceSelected; + private final AlignWaysState aligneeSelected; + private final AlignWaysState bothSelected; + private AlignWaysState currentState; + private AlignWaysSegmentMgr awSegs; + boolean tipShown; + + public AlignWaysMode(MapFrame mapFrame, String name, String desc) { + super(name, "alignways.png", desc, mapFrame, Cursor + .getPredefinedCursor(Cursor.DEFAULT_CURSOR)); + + noneSelected = new AlignWaysSelNoneState(); + referenceSelected = new AlignWaysSelRefState(); + aligneeSelected = new AlignWaysSelAlgnState(); + bothSelected = new AlignWaysSelBothState(); + tipShown = false; + + } + + @Override + public void enterMode() { + super.enterMode(); + boolean showTips = Boolean.parseBoolean(Main.pref.get("alignways.showtips", "true")); + if ((showTips) && (!tipShown)) { + showTips(); + } + awSegs = AlignWaysSegmentMgr.getInstance(Main.map.mapView); + Main.map.mapView.addMouseListener(this); + setCurrentState(noneSelected); + } + + @Override + public void exitMode() { + super.exitMode(); + Main.map.mapView.removeMouseListener(this); + setCurrentState(noneSelected); + AlignWaysPlugin.getAwAction().setEnabled(false); + } + + @Override + public void mouseClicked(MouseEvent e) { + + boolean ctrlPressed = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; + boolean altPressed = (e.getModifiers() & (ActionEvent.ALT_MASK | InputEvent.ALT_GRAPH_MASK)) != 0; + + if (e.getButton() == MouseEvent.BUTTON1) { + + if (altPressed) { + currentState.altLClick(this); + + } else { + Point clickedPoint = new Point(e.getX(), e.getY()); + + if (!ctrlPressed) { + // Alignee could change + + if (awSegs.algnUpdate(clickedPoint)) { + currentState.leftClick(this); + // Alignee changed, update selected nodes in the map + getCurrentDataSet().setSelected( + awSegs.getSelectedNodes()); + } + + } else { + // Reference could change + if (awSegs.refUpdate(clickedPoint)) { + currentState.ctrlLClick(this); + } + } + } + } + + // Activate the Align Ways button if we have enough selections + if (currentState == bothSelected) { + AlignWaysPlugin.getAwAction().setEnabled(true); + } else { + AlignWaysPlugin.getAwAction().setEnabled(false); + } + Main.map.mapView.repaint(); + } + + /** + * @param currentState + * One of the AlignWays states + */ + public void setCurrentState(AlignWaysState currentState) { + this.currentState = currentState; + currentState.setHelpText(); + + if (currentState == noneSelected) { + awSegs.cleanupWays(); + getCurrentDataSet().clearSelection(); + } + } + + /** + * @return the noneSelected + */ + public AlignWaysState getNoneSelected() { + return noneSelected; + } + + /** + * @return the referenceSelected + */ + public AlignWaysState getReferenceSelected() { + return referenceSelected; + } + + /** + * @return the aligneeSelected + */ + public AlignWaysState getAligneeSelected() { + return aligneeSelected; + } + + /** + * @return the bothSelected + */ + public AlignWaysState getBothSelected() { + return bothSelected; + } + + /** + * @return the current state + */ + public AlignWaysState getCurrentState() { + return currentState; + } + + private void showTips() { + + AlignWaysTipsPanel atd = new AlignWaysTipsPanel(); + Object[] okButton = {tr("I''m ready!")}; + JOptionPane tipPane = new JOptionPane(atd, JOptionPane.PLAIN_MESSAGE, JOptionPane.DEFAULT_OPTION, null, okButton, okButton[0]); + // JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips")); + // Take Main.map as frame as it's better to inherit its icon than the default Java cup + JDialog tipDialog = tipPane.createDialog(Main.parent, tr("AlignWays Tips")); + // ((Frame)tipDialog.getOwner()).setIconImage(new ImageIcon(getClass().getResource("/images/blank.png")).getImage()); + + tipDialog.setResizable(true); + tipDialog.setVisible(true); + tipShown = true; + + tipDialog.dispose(); + + Main.pref.put("alignways.showtips", !atd.isChkBoxSelected()); + + } +} Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java (revision 21613) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java (revision 21613) @@ -0,0 +1,63 @@ +package org.openstreetmap.josm.plugins.alignways; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import javax.swing.JMenuItem; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.gui.IconToggleButton; +import org.openstreetmap.josm.gui.MainMenu; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.plugins.Plugin; +import org.openstreetmap.josm.plugins.PluginInformation; + +/** + * @author tilusnet + * + */ + +public class AlignWaysPlugin extends Plugin { + + static AlignWaysMode awMode; + private final IconToggleButton btn; + static JMenuItem alignWaysMenuItem; + static JosmAction awAction; + + /** + * + */ + public AlignWaysPlugin(PluginInformation info) { + super(info); + awMode = new AlignWaysMode(Main.map, "alignways", tr("Align Ways mode")); + btn = new IconToggleButton(awMode); + btn.setVisible(true); + Main.main.menu.toolsMenu.addSeparator(); + awAction = new AlignWaysAction(); + alignWaysMenuItem = MainMenu.add(Main.main.menu.toolsMenu, awAction); + Main.main.menu.toolsMenu.addSeparator(); + + } + + @Override + public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) { + if (Main.map != null) { + Main.map.addMapMode(btn); + } + } + + /** + * @return the awAction + */ + public static JosmAction getAwAction() { + return awAction; + } + + /** + * @return the awMode + */ + public static AlignWaysMode getAwMode() { + return awMode; + } + +} Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRefSegment.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRefSegment.java (revision 21613) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRefSegment.java (revision 21613) @@ -0,0 +1,27 @@ +/** + * + */ +package org.openstreetmap.josm.plugins.alignways; + +import java.awt.Color; +import java.awt.Point; + +import org.openstreetmap.josm.gui.MapView; + +/** + * @author tilusnet The basic segment treated as reference. + * + */ +public class AlignWaysRefSegment extends AlignWaysSegment { + + // Note: segment may be null. This is normal. + + public AlignWaysRefSegment(MapView mapview, Point p) + throws IllegalArgumentException { + super(mapview, p); + setSegment(getNearestWaySegment(p)); + segmentColor = Color.GREEN; + + } + +} Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java (revision 21613) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java (revision 21613) @@ -0,0 +1,236 @@ +/** + * + */ +package org.openstreetmap.josm.plugins.alignways; + +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Stack; + +import javax.swing.JLabel; +import javax.swing.SwingConstants; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.MutableTreeNode; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.WaySegment; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * Rotates a way segment around a given pivot. + * + * @author tilusnet + */ + +public class AlignWaysRotateCommand extends Command { + + private final AlignWaysAlgnSegment algnSeg; + + /** + * The objects to rotate. + */ + private Collection nodes = new HashSet(); + + /** + * pivot point + */ + private final EastNorth pivot; + + /** + * Small helper for holding the interesting part of the old data state of + * the objects. + */ + public static class OldState { + LatLon latlon; + EastNorth eastNorth; + WaySegment ws; + boolean modified; + } + + /** + * computed rotation angle to rotate the segment + * + */ + private final double rotationAngle; + + /** + * List of all old states of the objects. + */ + private final Map oldState = new HashMap(); + private final Stack oldWS = new Stack(); + + /** + * Creates an AlignWaysRotateCommand. + */ + public AlignWaysRotateCommand() { + + algnSeg = AlignWaysSegmentMgr.getInstance(Main.map.mapView) + .getAlgnSeg(); + WaySegment algnWS = algnSeg.getSegment(); + WaySegment refWS = AlignWaysSegmentMgr.getInstance(Main.map.mapView) + .getRefSeg().getSegment(); + + this.pivot = algnSeg.getCurrPivotCoord(); + this.nodes = algnSeg.getSegmentEndPoints(); + + for (Node n : this.nodes) { + OldState os = new OldState(); + os.latlon = new LatLon(n.getCoor()); + os.eastNorth = n.getEastNorth(); + os.ws = algnWS; + os.modified = n.isModified(); + oldState.put(n, os); + } + oldWS.push(algnWS); + + EastNorth enRefNode1 = refWS.way.getNode(refWS.lowerIndex) + .getEastNorth(); + EastNorth enRefNode2 = refWS.way.getNode(refWS.lowerIndex + 1) + .getEastNorth(); + + EastNorth enAlgnNode1 = algnWS.way.getNode(algnWS.lowerIndex) + .getEastNorth(); + EastNorth enAlgnNode2 = algnWS.way.getNode(algnWS.lowerIndex + 1) + .getEastNorth(); + + // Calculate the rotation angle + double refAngle = Math.atan2(enRefNode1.north() - enRefNode2.north(), + enRefNode1.east() - enRefNode2.east()); + double algnAngle = Math.atan2( + enAlgnNode1.north() - enAlgnNode2.north(), enAlgnNode1.east() + - enAlgnNode2.east()); + + rotationAngle = normalise_angle(refAngle - algnAngle); + + /* For debug only + String s = "Ref Angle: " + refAngle + " (" + Math.toDegrees(refAngle) + + ")\n"; + s += "Algn Angle: " + algnAngle + " (" + Math.toDegrees(algnAngle) + + ")\n"; + s += "Rotation angle: " + rotationAngle + " (" + + Math.toDegrees(rotationAngle) + ")"; + */ + + rotateNodes(true); + + } + + /** + * Helper for actually rotating the nodes. + * + * @param setModified + * - true if rotated nodes should be flagged "modified" + */ + private void rotateNodes(boolean setModified) { + for (Node n : nodes) { + double cosPhi = Math.cos(rotationAngle); + double sinPhi = Math.sin(rotationAngle); + EastNorth oldEastNorth = oldState.get(n).eastNorth; + double x = oldEastNorth.east() - pivot.east(); + double y = oldEastNorth.north() - pivot.north(); + double nx = cosPhi * x - sinPhi * y + pivot.east(); + double ny = sinPhi * x + cosPhi * y + pivot.north(); + n.setEastNorth(new EastNorth(nx, ny)); + if (setModified) { + n.setModified(true); + } + } + algnSeg.updatePivotsEndpoints(); + } + + /** + * Make sure angle is in interval ( -Pi/2, Pi/2 ]. + */ + private static double normalise_angle(double a) { + while (a > Math.PI) { + a -= 2 * Math.PI; + } + while (a <= -Math.PI) { + a += 2 * Math.PI; + } + + if (a > Math.PI / 2) { + a -= Math.PI; + } else if (a < -Math.PI / 2) { + a += Math.PI; + } + return a; + } + + @Override + public MutableTreeNode description() { + return new DefaultMutableTreeNode( + new JLabel(trn("Align way segment", "", 1), ImageProvider.get( + "", "alignways"), SwingConstants.HORIZONTAL)); + } + + /* + * (non-Javadoc) + * + * @see + * org.openstreetmap.josm.command.Command#fillModifiedData(java.util.Collection + * , java.util.Collection, java.util.Collection) + */ + @Override + public void fillModifiedData(Collection modified, + Collection deleted, Collection added) { + for (OsmPrimitive osm : nodes) { + modified.add(osm); + } + } + + /* + * (non-Javadoc) + * + * @see org.openstreetmap.josm.command.Command#executeCommand() + */ + @Override + public boolean executeCommand() { + rotateNodes(true); + return true; + } + + /* + * (non-Javadoc) + * + * @see org.openstreetmap.josm.command.Command#undoCommand() + */ + @Override + public void undoCommand() { + for (Node n : nodes) { + OldState os = oldState.get(n); + n.setCoor(os.latlon); + n.setModified(os.modified); + } + algnSeg.updatePivotsEndpoints(); + } + + public Collection getRotatedNodes() { + return nodes; + } + + public boolean areSegsConnected() { + Collection algnNodes = nodes; + Collection refNodes = AlignWaysSegmentMgr.getInstance(Main.map.mapView) + .getRefSeg().getSegmentEndPoints(); + for (Node nA : algnNodes) { + for (Node nR : refNodes) { + if (nA.equals(nR)) + return true; + } + } + + return false; + } + + +} Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java (revision 21613) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java (revision 21613) @@ -0,0 +1,151 @@ +/** + * + */ +package org.openstreetmap.josm.plugins.alignways; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.Point; +import java.awt.geom.Line2D; +import java.util.Collection; +import java.util.HashSet; + +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.WaySegment; +import org.openstreetmap.josm.gui.MapView; +import org.openstreetmap.josm.gui.layer.MapViewPaintable; + +/** + * @author tilusnet + * + */ +public class AlignWaysSegment implements MapViewPaintable { + + protected WaySegment segment; + protected MapView mapview; + protected Color segmentColor = Color.WHITE; + protected Collection segmentEndPoints; + + public AlignWaysSegment(MapView mapview, Point p) + throws IllegalArgumentException { + if (mapview == null) + throw new IllegalArgumentException(tr( + "Parameter ''{0}'' must not be null", "mapview")); + if (p == null) + throw new IllegalArgumentException(tr( + "Parameter ''{0}'' must not be null", "p")); + + this.mapview = mapview; + } + + void setSegment(WaySegment segment) { + this.segment = segment; + if (segment != null) { + setSegmentEndpoints(segment); + mapview.addTemporaryLayer(this); + } + } + + + void setSegmentEndpoints(WaySegment segment) { + if (segment != null) { + Node node1 = segment.way.getNode(segment.lowerIndex); + Node node2 = segment.way.getNode(segment.lowerIndex + 1); + + segmentEndPoints = new HashSet(); + segmentEndPoints.add(node1); + segmentEndPoints.add(node2); + + } + } + + protected WaySegment getNearestWaySegment(Point p) { + + return mapview.getNearestWaySegment(p, OsmPrimitive.isUsablePredicate); + + } + + public void destroy() { + if (segment != null) { + mapview.removeTemporaryLayer(this); + } + } + + public WaySegment getSegment() { + return segment; + } + + public Collection getSegmentEndPoints() { + return segmentEndPoints; + } + + public void paint(Graphics2D g, MapView mv, Bounds bbox) { + highlightSegment(segmentColor, g, mv); + } + + protected void highlightSegment(Color c, Graphics2D g, MapView mv) { + + g.setColor(c); + g.setStroke(new BasicStroke(6, BasicStroke.CAP_ROUND, + BasicStroke.JOIN_ROUND)); + drawSegment(g, mv); + + } + + protected void drawSegment(Graphics2D g, MapView mv) { + Node n1 = segment.way.getNode(segment.lowerIndex); + Node n2 = segment.way.getNode(segment.lowerIndex + 1); + + Line2D newline = new Line2D.Double(mv.getPoint(n1), mv.getPoint(n2)); + g.draw(newline); + } + + /* + * (non-Javadoc) + * + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((segment == null) ? 0 : segment.hashCode()); + result = prime * result + + ((segmentColor == null) ? 0 : segmentColor.hashCode()); + return result; + } + + /* + * (non-Javadoc) + * + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof AlignWaysSegment)) + return false; + AlignWaysSegment other = (AlignWaysSegment) obj; + if (segment == null) { + if (other.segment != null) + return false; + } else if (!segment.equals(other.segment)) + return false; + /* Segment colour is ignored in comparison + if (segmentColor == null) { + if (other.segmentColor != null) + return false; + } else if (!segmentColor.equals(other.segmentColor)) + return false; + */ + return true; + } +} Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java (revision 21613) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java (revision 21613) @@ -0,0 +1,161 @@ +package org.openstreetmap.josm.plugins.alignways; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Point; +import java.util.Collection; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.gui.MapView; + +/** + * Should be a singleton class. The active alignee and reference objects + * manager. Can request alignee, reference segment updates and pivot updates on + * these. + * + * @author tilusnet + * + */ +public class AlignWaysSegmentMgr { + + private volatile static AlignWaysSegmentMgr singleton; + private AlignWaysRefSegment refSeg = null; + private AlignWaysAlgnSegment algnSeg = null; + private final MapView mv; + + private AlignWaysSegmentMgr(MapView mapView) { + mv = mapView; + } + + public static AlignWaysSegmentMgr getInstance(MapView mapView) { + if (singleton == null) { + synchronized (AlignWaysSegmentMgr.class) { + if (singleton == null) { + singleton = new AlignWaysSegmentMgr(mapView); + } + } + } + return singleton; + } + + /** + * @param clickedPoint + * Point nearby where user probably clicked + * @return true, if alignee changed, false otherwise + */ + public boolean algnUpdate(Point clickedPoint) { + + if (algnSeg != null) { + // Check first if there is a pivot point nearby that needs selection + if (algnSeg.updatePivot(clickedPoint)) + // Updated pivot, alignee reference unchanged + return false; + } + + // Previous attempt of pivot update unsuccessful, check alignee update + AlignWaysAlgnSegment tmpAlgnSeg = new AlignWaysAlgnSegment(mv, + clickedPoint); + if (tmpAlgnSeg.getSegment() == null) + return false; + else { + // Found a segment + // It may happen that the new segment is identical with the already + // selected reference: + if ((refSeg != null) && (tmpAlgnSeg.equals(refSeg))) { + // This action is then ignored (we won't clear the reference + // segment) + JOptionPane.showMessageDialog(Main.parent, + tr("Segment to be aligned cannot be the same with the reference segment.\n" + + "Please choose a different segment to be aligned."), + tr("AlignWayS message"), JOptionPane.WARNING_MESSAGE); + return false; + } + // This will be a new alignee, old alignee (if any) will be lost: + if (algnSeg != null) { + algnSeg.destroy(); + } + + // Update alignee + algnSeg = tmpAlgnSeg; + + return true; + } + + } + + /** + * @param clickedPoint + * Point nearby where user probably clicked + * @return true, if reference changed, false otherwise + */ + public boolean refUpdate(Point clickedPoint) { + + AlignWaysRefSegment tmpRefSeg = new AlignWaysRefSegment(mv, + clickedPoint); + // TODO Have to check what happens when refSeg wasn't null previously + if (tmpRefSeg.getSegment() == null) + return false; + else { + // Found a segment + // It may happen that the new segment is identical with the already + // selected alignee: + if ((algnSeg != null) && (tmpRefSeg.equals(algnSeg))) { + // This action is then ignored (we won't clear the alignee + // segment) + JOptionPane.showMessageDialog(Main.parent, + tr("Reference segment cannot be the same with the segment to be aligned.\n" + + "Please choose a different reference segment."), + tr("AlignWayS message"), JOptionPane.WARNING_MESSAGE); + return false; + } + // This will be a new reference, old reference (if any) will be lost: + if (refSeg != null) { + refSeg.destroy(); + } + + // Update reference + refSeg = tmpRefSeg; + return true; + + } + + } + + /** + * @return Collection of the nodes that belong to the selected alignee. + */ + public Collection getSelectedNodes() { + if (algnSeg != null) + return algnSeg.getSegmentEndPoints(); + return null; + } + + /** + * Performs "clean-up" on the initialised segments + */ + public void cleanupWays() { + if (algnSeg != null) { + algnSeg.destroy(); + algnSeg = null; + } + if (refSeg != null) { + refSeg.destroy(); + refSeg = null; + } + } + + public AlignWaysAlgnSegment getAlgnSeg() { + return algnSeg; + } + + /** + * @return the refSeg + */ + public AlignWaysRefSegment getRefSeg() { + return refSeg; + } + +} Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSelAlgnState.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSelAlgnState.java (revision 21613) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSelAlgnState.java (revision 21613) @@ -0,0 +1,30 @@ +/** + * + */ +package org.openstreetmap.josm.plugins.alignways; + +import org.openstreetmap.josm.Main; + +/** + * @author tilusnet + * + */ +public class AlignWaysSelAlgnState extends AlignWaysState { + + @Override + public void leftClick(AlignWaysMode alignWaysMode) { + // No state change, nothing to do + } + + @Override + public void ctrlLClick(AlignWaysMode alignWaysMode) { + alignWaysMode.setCurrentState(alignWaysMode.getBothSelected()); + } + + @Override + public void setHelpText() { + Main.map.statusLine + .setHelpText("Ctrl-Click: select reference way segment; Alt-click: Clear selection"); + } + +} Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSelBothState.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSelBothState.java (revision 21613) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSelBothState.java (revision 21613) @@ -0,0 +1,30 @@ +/** + * + */ +package org.openstreetmap.josm.plugins.alignways; + +import org.openstreetmap.josm.Main; + +/** + * @author tilusnet + * + */ +public class AlignWaysSelBothState extends AlignWaysState { + + @Override + public void leftClick(AlignWaysMode alignWaysMode) { + // No state change, nothing to do + } + + @Override + public void ctrlLClick(AlignWaysMode alignWaysMode) { + // No state change, nothing to do + } + + @Override + public void setHelpText() { + Main.map.statusLine + .setHelpText("Shift-A: Align segments; Alt-click: Clear selection"); + } + +} Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSelNoneState.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSelNoneState.java (revision 21613) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSelNoneState.java (revision 21613) @@ -0,0 +1,33 @@ +/** + * + */ +package org.openstreetmap.josm.plugins.alignways; + +import org.openstreetmap.josm.Main; + +/** + * @author tilusnet + * + */ +public class AlignWaysSelNoneState extends AlignWaysState { + + @Override + public void leftClick(AlignWaysMode alignWaysMode) { + // Reference way segment selected successfully + alignWaysMode.setCurrentState(alignWaysMode.getAligneeSelected()); + + } + + @Override + public void ctrlLClick(AlignWaysMode alignWaysMode) { + // Reference way segment selected successfully + alignWaysMode.setCurrentState(alignWaysMode.getReferenceSelected()); + } + + @Override + public void setHelpText() { + Main.map.statusLine + .setHelpText("Ctrl-click: select reference way segment; Click: select way segment to be aligned"); + } + +} Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSelRefState.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSelRefState.java (revision 21613) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSelRefState.java (revision 21613) @@ -0,0 +1,30 @@ +/** + * + */ +package org.openstreetmap.josm.plugins.alignways; + +import org.openstreetmap.josm.Main; + +/** + * @author tilusnet + * + */ +public class AlignWaysSelRefState extends AlignWaysState { + + @Override + public void leftClick(AlignWaysMode alignWaysMode) { + alignWaysMode.setCurrentState(alignWaysMode.getBothSelected()); + } + + @Override + public void ctrlLClick(AlignWaysMode alignWaysMode) { + // No state change, nothing to do + } + + @Override + public void setHelpText() { + Main.map.statusLine + .setHelpText("Click: select way segment to be aligned; Alt-click: Clear selection"); + } + +} Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysState.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysState.java (revision 21613) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysState.java (revision 21613) @@ -0,0 +1,26 @@ +/** + * + */ +package org.openstreetmap.josm.plugins.alignways; + +import org.openstreetmap.josm.Main; + +/** + * @author tilusnet + * + */ +public abstract class AlignWaysState { + + public abstract void leftClick(AlignWaysMode alignWaysMode); + + public abstract void ctrlLClick(AlignWaysMode alignWaysMode); + + public abstract void setHelpText(); + + public void altLClick(AlignWaysMode alignWaysMode) { + alignWaysMode.setCurrentState(alignWaysMode.getNoneSelected()); + Main.map.statusLine + .setHelpText("Ctrl-Click: select reference way segment; Click: select way segment to be aligned"); + } + +} Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java (revision 21613) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java (revision 21613) @@ -0,0 +1,204 @@ +/** + * + */ +package org.openstreetmap.josm.plugins.alignways; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Cursor; +import java.awt.Dimension; + +import javax.swing.ImageIcon; +import javax.swing.JCheckBox; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JSeparator; +import javax.swing.ScrollPaneConstants; +import javax.swing.SwingConstants; + +import org.jdesktop.layout.GroupLayout; +import org.jdesktop.layout.LayoutStyle; + +/** + * @author tilusnet + * + */ +public class AlignWaysTipsPanel extends javax.swing.JPanel { + + private static final long serialVersionUID = -8583989497599985140L; + + public AlignWaysTipsPanel() { + initComponents(); + } + + private void initComponents() { + + Title = new JPanel(); + WelcomeTo = new JLabel(); + Icon = new JLabel(); + separator = new JSeparator(); + Intro = new JPanel(); + introText = new JLabel(); + scrollableSteps = new JScrollPane(); + steps = new JPanel(); + step01 = new JLabel(); + step02 = new JLabel(); + step03 = new JLabel(); + step04 = new JLabel(); + lastHint = new JLabel(); + dontShow = new JCheckBox(); + + setAutoscrolls(true); + + WelcomeTo.setText(tr("\n
\nWelcome to the
\nAlignWayS Plugin
\n
\n...or it rather should be called
\nAlignWayS(egments) Plugin...\n
\n")); + + WelcomeTo.setVerticalAlignment(SwingConstants.TOP); + WelcomeTo.setPreferredSize(new Dimension(400, 128)); + + Icon.setIcon(new ImageIcon(getClass().getResource("/images/tipsdialog/alignways128.png"))); // NOI18N + GroupLayout TitleLayout = new GroupLayout(Title); + Title.setLayout(TitleLayout); + TitleLayout.setHorizontalGroup( + TitleLayout.createParallelGroup(GroupLayout.LEADING) + .add(GroupLayout.TRAILING, TitleLayout.createSequentialGroup() + .add(WelcomeTo, GroupLayout.DEFAULT_SIZE, 396, Short.MAX_VALUE) + .addPreferredGap(LayoutStyle.RELATED) + .add(Icon, GroupLayout.PREFERRED_SIZE, 132, GroupLayout.PREFERRED_SIZE)) + ); + TitleLayout.setVerticalGroup( + TitleLayout.createParallelGroup(GroupLayout.LEADING) + .add(TitleLayout.createSequentialGroup() + .add(Icon) + .addContainerGap()) + .add(WelcomeTo, GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE) + ); + + Intro.setCursor(new Cursor(Cursor.DEFAULT_CURSOR)); + + introText.setText(tr("\n

AlignWays will\nhelp you to align two way segments. This can be handy when for instance\nyou sketch the outlines of a building and want its side to be parallel\nwith a street or road.
\n
\nSome tips may help before you start:\n

\n\n\n")); + introText.setVerticalAlignment(SwingConstants.TOP); + + scrollableSteps.setBorder(null); + scrollableSteps.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + + step01.setIcon(new ImageIcon(getClass().getResource("/images/tipsdialog/hlpRefSel.png"))); // NOI18N + step01.setText(tr("\n
\n
    \n
  • Select a reference segment. You can do this by Ctrl-clicking\non a segment. The other, to be aligned segment will become parallel to\nthis one.
    • \n
\n
\n\n\n")); + step01.setVerticalAlignment(SwingConstants.TOP); + + step02.setIcon(new ImageIcon(getClass().getResource("/images/tipsdialog/hlpAlgSel.png"))); // NOI18N + step02.setText(tr("\n
\n
    \n
  • Select the to be aligned segment. You can do this by simply clicking on a different segment. \nThe rotation pivot will be highlighted by default in the centre of the segment.\n
    • \n
\n
\n\n\n")); + step02.setVerticalAlignment(SwingConstants.TOP); + + step03.setIcon(new ImageIcon(getClass().getResource("/images/tipsdialog/hlpPvtSel.png"))); // NOI18N + step03.setText(tr("\n
\n
    \n
  • Optionally change the rotation pivot point. In order to get parallel with the reference segment, the to be aligned segment will rotate around this point. You can choose the two extremities or the centre of the segment by clicking nearby. \n
    • \n
\n
\n\n\n")); + step03.setVerticalAlignment(SwingConstants.TOP); + + step04.setIcon(new ImageIcon(getClass().getResource("/images/tipsdialog/hlpAlgCmd.png"))); // NOI18N + step04.setText(tr("\n
\n
    \n
  • Align the segments. Press Shift-A. Alternatively you''ll find the command in the Tools\n menu or may want to place the action on the toolbar.\n
    • \n
\n
\n\n\n")); + step04.setVerticalAlignment(SwingConstants.TOP); + + lastHint.setText(tr("\n
\nLast hint: There is an easy way to start over your selections if you want: Alt-Click somewhere on the map.\n
\n\n\n")); + lastHint.setVerticalAlignment(SwingConstants.TOP); + + GroupLayout stepsLayout = new GroupLayout(steps); + steps.setLayout(stepsLayout); + stepsLayout.setHorizontalGroup( + stepsLayout.createParallelGroup(GroupLayout.LEADING) + .add(stepsLayout.createSequentialGroup() + .addContainerGap() + .add(stepsLayout.createParallelGroup(GroupLayout.TRAILING) + .add(GroupLayout.LEADING, lastHint, 0, 0, Short.MAX_VALUE) + .add(GroupLayout.LEADING, step04, 0, 0, Short.MAX_VALUE) + .add(GroupLayout.LEADING, step03, 0, 0, Short.MAX_VALUE) + .add(GroupLayout.LEADING, step02, 0, 0, Short.MAX_VALUE) + .add(GroupLayout.LEADING, step01, GroupLayout.DEFAULT_SIZE, 496, Short.MAX_VALUE)) + .add(18, 18, 18)) + ); + stepsLayout.setVerticalGroup( + stepsLayout.createParallelGroup(GroupLayout.LEADING) + .add(stepsLayout.createSequentialGroup() + .add(step01, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(LayoutStyle.RELATED) + .add(step02, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(LayoutStyle.RELATED) + .add(step03, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(LayoutStyle.RELATED) + .add(step04, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(LayoutStyle.RELATED) + .add(lastHint, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addContainerGap(22, Short.MAX_VALUE)) + ); + + scrollableSteps.setViewportView(steps); + + dontShow.setText(tr("Don''t show this again")); + + GroupLayout IntroLayout = new GroupLayout(Intro); + Intro.setLayout(IntroLayout); + IntroLayout.setHorizontalGroup( + IntroLayout.createParallelGroup(GroupLayout.LEADING) + .add(IntroLayout.createSequentialGroup() + .addContainerGap() + .add(dontShow, GroupLayout.PREFERRED_SIZE, 245, GroupLayout.PREFERRED_SIZE) + .addContainerGap(283, Short.MAX_VALUE)) + .add(scrollableSteps, GroupLayout.DEFAULT_SIZE, 534, Short.MAX_VALUE) + .add(introText, GroupLayout.DEFAULT_SIZE, 534, Short.MAX_VALUE) + ); + IntroLayout.setVerticalGroup( + IntroLayout.createParallelGroup(GroupLayout.LEADING) + .add(GroupLayout.TRAILING, IntroLayout.createSequentialGroup() + .add(introText, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(LayoutStyle.RELATED, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(scrollableSteps, GroupLayout.PREFERRED_SIZE, 209, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(LayoutStyle.UNRELATED) + .add(dontShow) + .addContainerGap()) + ); + + GroupLayout layout = new GroupLayout(this); + this.setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(GroupLayout.LEADING) + .add(GroupLayout.TRAILING, layout.createSequentialGroup() + .addContainerGap() + .add(layout.createParallelGroup(GroupLayout.TRAILING) + .add(GroupLayout.LEADING, separator, GroupLayout.DEFAULT_SIZE, 534, Short.MAX_VALUE) + .add(Title, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(Intro, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap()) + ); + layout.setVerticalGroup( + layout.createParallelGroup(GroupLayout.LEADING) + .add(layout.createSequentialGroup() + .addContainerGap() + .add(Title, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(LayoutStyle.UNRELATED) + .add(separator, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(LayoutStyle.RELATED) + .add(Intro, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addContainerGap(45, Short.MAX_VALUE)) + ); + } + + + private JLabel Icon; + private JPanel Intro; + private JPanel Title; + private JLabel WelcomeTo; + private JCheckBox dontShow; + private JLabel introText; + private JLabel lastHint; + private JScrollPane scrollableSteps; + private JSeparator separator; + private JLabel step01; + private JLabel step02; + private JLabel step03; + private JLabel step04; + private JPanel steps; + + public boolean isChkBoxSelected() { + return dontShow.isSelected(); + } + +}