Index: applications/editors/josm/plugins/build.xml =================================================================== --- applications/editors/josm/plugins/build.xml (revision 20244) +++ applications/editors/josm/plugins/build.xml (revision 20245) @@ -8,4 +8,5 @@ + @@ -52,4 +53,5 @@ + Index: applications/editors/josm/plugins/buildings_tools/.classpath =================================================================== --- applications/editors/josm/plugins/buildings_tools/.classpath (revision 20245) +++ applications/editors/josm/plugins/buildings_tools/.classpath (revision 20245) @@ -0,0 +1,7 @@ + + + + + + + Index: applications/editors/josm/plugins/buildings_tools/.project =================================================================== --- applications/editors/josm/plugins/buildings_tools/.project (revision 20245) +++ applications/editors/josm/plugins/buildings_tools/.project (revision 20245) @@ -0,0 +1,18 @@ + + + buildings_tools + + + josm + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + Index: applications/editors/josm/plugins/buildings_tools/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- applications/editors/josm/plugins/buildings_tools/.settings/org.eclipse.jdt.ui.prefs (revision 20245) +++ applications/editors/josm/plugins/buildings_tools/.settings/org.eclipse.jdt.ui.prefs (revision 20245) @@ -0,0 +1,3 @@ +#Sat Jun 06 18:09:10 MSD 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.ui.text.custom_code_templates= Index: applications/editors/josm/plugins/buildings_tools/LICENSE =================================================================== --- applications/editors/josm/plugins/buildings_tools/LICENSE (revision 20245) +++ applications/editors/josm/plugins/buildings_tools/LICENSE (revision 20245) @@ -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/buildings_tools/build.xml =================================================================== --- applications/editors/josm/plugins/buildings_tools/build.xml (revision 20245) +++ applications/editors/josm/plugins/buildings_tools/build.xml (revision 20245) @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/buildings_tools/src/buildings_tools/AddressDialog.java =================================================================== --- applications/editors/josm/plugins/buildings_tools/src/buildings_tools/AddressDialog.java (revision 20245) +++ applications/editors/josm/plugins/buildings_tools/src/buildings_tools/AddressDialog.java (revision 20245) @@ -0,0 +1,85 @@ +package buildings_tools; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Choice; +import java.awt.Component; +import java.awt.GridBagLayout; +import java.text.NumberFormat; +import java.text.ParseException; + +import javax.swing.JTextField; +import javax.swing.JLabel; +import javax.swing.JPanel; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.ExtendedDialog; +import org.openstreetmap.josm.tools.GBC; + +@SuppressWarnings("serial") +public class AddressDialog extends ExtendedDialog { + private static String lhousenum,lstreetname; + private static boolean inc = true; + private JTextField housenum = new JTextField(); + private JTextField streetname = new JTextField(); + private Choice cincdec = new Choice(); + + private JPanel panel = new JPanel(new GridBagLayout()); + private void addLabelled(String str, Component c) { + JLabel label = new JLabel(str); + panel.add(label, GBC.std()); + label.setLabelFor(c); + panel.add(c, GBC.eol().fill(GBC.HORIZONTAL)); + } + + public AddressDialog() { + super(Main.parent, tr("Building address"), + new String[] { tr("OK"), tr("Cancel") }, + true); + + contentConstraints = GBC.eol().fill().insets(15,15,15,5); + setButtonIcons(new String[] {"ok.png", "cancel.png" }); + + addLabelled(tr("House number:"),housenum); + addLabelled(tr("Street Name:"),streetname); + housenum.setText(nextHouseNum()); + streetname.setText(lstreetname); + + cincdec.add(tr("Increment")); + cincdec.add(tr("Decrement")); + cincdec.select(inc?0:1); + addLabelled(tr("Numbers:"), cincdec); + + setContent(panel); + setupDialog(); + setVisible(true); + } + + private static String nextHouseNum() + { + if (lhousenum==null) return ""; + try + { + Integer num = NumberFormat.getInstance().parse(lhousenum).intValue(); + if (inc) num=num+2; else num = num-2; + return num.toString(); + } catch (ParseException e) + { + return lhousenum; + } + } + public void saveValues() + { + lhousenum = housenum.getText(); + lstreetname = streetname.getText(); + inc = cincdec.getSelectedItem() == tr("Increment"); + } + public String getHouseNum() + { + return housenum.getText(); + } + public String getStreetName() + { + return streetname.getText(); + } +} Index: applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java =================================================================== --- applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java (revision 20245) +++ applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java (revision 20245) @@ -0,0 +1,167 @@ +package buildings_tools; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import static buildings_tools.BuildingsToolsPlugin.eastNorth2latlon; +import static buildings_tools.BuildingsToolsPlugin.latlon2eastNorth; + +import java.awt.Graphics2D; +import java.awt.Point; +import java.awt.geom.GeneralPath; +import java.util.Collection; +import java.util.LinkedList; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.AddCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.coor.*; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.MapView; + +class Building { + private static final double eqlen = 40075004; // length of equator in metres + private EastNorth en1; + private EastNorth en2; + private EastNorth en3; + private EastNorth en4; + + private EastNorth p1; + private Node node; + double meter = 0; + + private double len = 0; + double lwidth; + private boolean angconstrainted; + private double angconstraint = 0; + + public void disableAngConstraint() { + angconstrainted = false; + } + public void setAngConstraint(double angle) { + angconstrainted = true; + angconstraint = angle; + while (angconstraint>(Math.PI/4)) angconstraint-=Math.PI/4; + } + public double getLength() + { + return len; + } + + public void reset() + { + len = 0; + en1=null; + en2=null; + en3=null; + en4=null; + } + public EastNorth Point1() { return en1; } + public EastNorth Point2() { return en2; } + public EastNorth Point3() { return en3; } + public EastNorth Point4() { return en4; } + private void updMetrics() + { + meter = 2*Math.PI/(Math.cos(Math.toRadians(eastNorth2latlon(p1).lat())) * eqlen); + reset(); + } + public void setBase(EastNorth base) + { + node = null; + p1 = base; + updMetrics(); + } + public void setBase(Node base) + { + node = base; + p1 = latlon2eastNorth(base.getCoor()); + updMetrics(); + } + public void setPlace(EastNorth p2,double width,double lenstep) + { + double heading = p1.heading(p2); + double hdang = 0; + if (angconstrainted) + { + hdang = Math.round((heading-angconstraint)/Math.PI*4); + if (hdang>=8)hdang-=8; + if (hdang<0)hdang+=8; + heading = hdang*Math.PI/4+angconstraint; + } + double distance = eastNorth2latlon(p1).greatCircleDistance(eastNorth2latlon(p2)); + if (lenstep <= 0) len=distance; else len = Math.round(distance/lenstep)*lenstep; + if (len == 0) return; + + en1 = p1; + en2 = new EastNorth(p1.east()+Math.sin(heading)*len*meter,p1.north()+Math.cos(heading)*len*meter); + en3 = new EastNorth(p1.east()+Math.sin(heading)*len*meter+Math.cos(heading)*width*meter,p1.north()+Math.cos(heading)*len*meter-Math.sin(heading)*width*meter); + en4 = new EastNorth(p1.east()+Math.cos(heading)*width*meter,p1.north()-Math.sin(heading)*width*meter); + + lwidth = width; + Main.map.statusLine.setHeading(Math.toDegrees(heading)); + if (angconstrainted) + { + Main.map.statusLine.setAngle(hdang*45); + } + } + public void paint(Graphics2D g, MapView mv) + { + if (len == 0) return; + GeneralPath b = new GeneralPath(); + Point pp1 = mv.getPoint(eastNorth2latlon(en1)); + Point pp2 = mv.getPoint(eastNorth2latlon(en2)); + Point pp3 = mv.getPoint(eastNorth2latlon(en4)); + Point pp4 = mv.getPoint(eastNorth2latlon(en3)); + + b.moveTo(pp1.x, pp1.y); b.lineTo(pp3.x, pp3.y); + b.lineTo(pp4.x, pp4.y); b.lineTo(pp2.x, pp2.y); + b.lineTo(pp1.x, pp1.y); + g.draw(b); + } + public Way create() + { + if (len == 0) return null; + Node n1; + if (node==null) + n1 = new Node(eastNorth2latlon(en1)); + else + n1 = node; + Node n2 = new Node(eastNorth2latlon(en2)); + Node n3 = new Node(eastNorth2latlon(en3)); + Node n4 = new Node(eastNorth2latlon(en4)); + if (n1.getCoor().isOutSideWorld()||n2.getCoor().isOutSideWorld()|| + n3.getCoor().isOutSideWorld()||n4.getCoor().isOutSideWorld()) + { + JOptionPane.showMessageDialog(Main.parent, + tr("Cannot place building outside of the world.")); + return null; + } + Way w = new Way(); + w.addNode(n1); + if (lwidth>=0) + { + w.addNode(n2); + w.addNode(n3); + w.addNode(n4); + } else + { + w.addNode(n4); + w.addNode(n3); + w.addNode(n2); + } + w.addNode(n1); + w.put("building", "yes"); + Collection cmds = new LinkedList(); + if (node==null) cmds.add(new AddCommand(n1)); + cmds.add(new AddCommand(n2)); + cmds.add(new AddCommand(n3)); + cmds.add(new AddCommand(n4)); + cmds.add(new AddCommand(w)); + Command c = new SequenceCommand(tr("Create building"), cmds); + Main.main.undoRedo.add(c); + return w; + } +} Index: applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java =================================================================== --- applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java (revision 20245) +++ applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java (revision 20245) @@ -0,0 +1,32 @@ +package buildings_tools; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; + +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.tools.Shortcut; + +@SuppressWarnings("serial") +public class BuildingSizeAction extends JosmAction { + + public BuildingSizeAction() + { + super(tr("Set buildings size"),"mapmode/building",tr("Set buildings size"), + Shortcut.registerShortcut("edit:buildingsdialog", + tr("Edit: {0}", tr("Set buildings size")), + KeyEvent.VK_W, Shortcut.GROUP_EDIT, + Shortcut.SHIFT_DEFAULT), + true); + } + public void actionPerformed(ActionEvent arg0) { + BuildingSizeDialog dlg = new BuildingSizeDialog(); + int answer = dlg.getValue(); + if (answer == 1) { + DrawBuildingAction.SetSizes(dlg.width(), dlg.lenstep()); + DrawBuildingAction.SetAddrDialog(dlg.useAddr()); + } + } + +} Index: applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java =================================================================== --- applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java (revision 20245) +++ applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java (revision 20245) @@ -0,0 +1,71 @@ +package buildings_tools; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Component; +import java.awt.GridBagLayout; +import java.text.NumberFormat; +import java.text.ParseException; + +import javax.swing.JFormattedTextField; +import javax.swing.JCheckBox; +import javax.swing.JLabel; +import javax.swing.JPanel; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.ExtendedDialog; +import org.openstreetmap.josm.tools.GBC; + +@SuppressWarnings("serial") +public class BuildingSizeDialog extends ExtendedDialog { + private JFormattedTextField twidth = new JFormattedTextField(NumberFormat.getInstance()); + private JFormattedTextField tlenstep = new JFormattedTextField(NumberFormat.getInstance()); + private JPanel panel = new JPanel(new GridBagLayout()); + private JCheckBox caddr = new JCheckBox(tr("Use Address dialog")); + private void addLabelled(String str, Component c) { + JLabel label = new JLabel(str); + panel.add(label, GBC.std()); + label.setLabelFor(c); + panel.add(c, GBC.eol().fill(GBC.HORIZONTAL)); + } + public BuildingSizeDialog() { + super(Main.parent, tr("Set buildings size"), + new String[] { tr("OK"), tr("Cancel") }, + true); + contentConstraints = GBC.eol().fill().insets(15,15,15,5); + setButtonIcons(new String[] {"ok.png", "cancel.png" }); + + addLabelled(tr("Buildings width:"),twidth); + addLabelled(tr("Length step:"),tlenstep); + twidth.setValue(DrawBuildingAction.getWidth()); + tlenstep.setValue(DrawBuildingAction.getLenStep()); + panel.add(caddr,GBC.eol().fill(GBC.HORIZONTAL)); + setContent(panel); + setupDialog(); + setVisible(true); + } + public double width() + { + try + { + return NumberFormat.getInstance().parse(twidth.getText()).doubleValue(); + } catch (ParseException e) + { + return 0; + } + } + public double lenstep() + { + try + { + return NumberFormat.getInstance().parse(tlenstep.getText()).doubleValue(); + } catch (ParseException e) + { + return 0; + } + } + public boolean useAddr() + { + return caddr.isSelected(); + } +} Index: applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingsToolsPlugin.java =================================================================== --- applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingsToolsPlugin.java (revision 20245) +++ applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingsToolsPlugin.java (revision 20245) @@ -0,0 +1,34 @@ +package buildings_tools; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.projection.Mercator; +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; + +public class BuildingsToolsPlugin extends Plugin { + public static Mercator proj = new Mercator(); + + public static EastNorth latlon2eastNorth(LatLon p) { + return proj.latlon2eastNorth(p); + } + public static LatLon eastNorth2latlon(EastNorth p) { + return proj.eastNorth2latlon(p); + } + + public BuildingsToolsPlugin(PluginInformation info) + { + super(info); + Main.main.menu.editMenu.addSeparator(); + MainMenu.add(Main.main.menu.editMenu, new BuildingSizeAction()); + } + @Override public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) { + if (oldFrame==null && newFrame!=null) { + Main.map.addMapMode(new IconToggleButton(new DrawBuildingAction(Main.map))); + } + } +} Index: applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java =================================================================== --- applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java (revision 20245) +++ applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java (revision 20245) @@ -0,0 +1,336 @@ +package buildings_tools; + +import static org.openstreetmap.josm.tools.I18n.marktr; +import static org.openstreetmap.josm.tools.I18n.tr; + +import static buildings_tools.BuildingsToolsPlugin.latlon2eastNorth; + +import java.awt.AWTEvent; +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Cursor; +import java.awt.EventQueue; +import java.awt.Graphics2D; +import java.awt.Point; +import java.awt.Toolkit; +import java.awt.event.AWTEventListener; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.util.Collection; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.mapmode.MapMode; +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.SelectionChangedListener; +import org.openstreetmap.josm.data.coor.*; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.gui.MapView; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.MapViewPaintable; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.Shortcut; + +@SuppressWarnings("serial") +public class DrawBuildingAction extends MapMode +implements MapViewPaintable, AWTEventListener, SelectionChangedListener +{ + enum Mode {None, Drawing, DrawingWidth} + final private Cursor cursorCrosshair; + final private Cursor cursorJoinNode; + private Cursor currCursor; + + private static double width = 0; + private static double lenstep = 0; + private static boolean useAddr; + + private Mode mode = Mode.None; + private EastNorth p1,p2,p3; + private Color selectedColor; + private Point mousePos; + + private Point drawStartPos; + + Building building = new Building(); + + public static void SetAddrDialog(boolean _useAddr) + { + useAddr = _useAddr; + } + public static void SetSizes(double newwidth,double newlenstep) + { + width = newwidth; + lenstep = newlenstep; + } + public static double getWidth() + { + return width; + } + + public static double getLenStep() + { + return lenstep; + } + public DrawBuildingAction(MapFrame mapFrame) + { + super(tr("Draw buildings"),"building",tr("Draw buildings"), + Shortcut.registerShortcut("mapmode:buildings", + tr("Mode: {0}", tr("Draw buildings")), + KeyEvent.VK_W, Shortcut.GROUP_EDIT), + mapFrame,getCursor()); + + cursorCrosshair = getCursor(); + cursorJoinNode = ImageProvider.getCursor("crosshair", "joinnode"); + currCursor = cursorCrosshair; + + selectedColor = Main.pref.getColor(marktr("selected"), Color.red); + } + private static Cursor getCursor() { + try { + return ImageProvider.getCursor("crosshair", null); + } catch (Exception e) { + } + return Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR); + } + /** + * Displays the given cursor instead of the normal one + * @param Cursors One of the available cursors + */ + private void setCursor(final Cursor c) { + if(currCursor.equals(c)) + return; + try { + // We invoke this to prevent strange things from happening + EventQueue.invokeLater(new Runnable() { + public void run() { + // Don't change cursor when mode has changed already + if(!(Main.map.mapMode instanceof DrawBuildingAction)) + return; + Main.map.mapView.setCursor(c); + } + }); + currCursor = c; + } catch(Exception e) {} + } + private static void showAddrDialog(Way w) + { + AddressDialog dlg = new AddressDialog(); + int answer = dlg.getValue(); + if (answer == 1) { + dlg.saveValues(); + String tmp; + tmp = dlg.getHouseNum(); + if (tmp!=null&&tmp!="") w.put("addr:housenumber",tmp); + tmp = dlg.getStreetName(); + if (tmp!=null&&tmp!="") w.put("addr:street",tmp); + } + } + + @Override public void enterMode() { + super.enterMode(); + currCursor = cursorCrosshair; + Main.map.mapView.addMouseListener(this); + Main.map.mapView.addMouseMotionListener(this); + Main.map.mapView.addTemporaryLayer(this); + DataSet.selListeners.add(this); + UpdateConstraint(getCurrentDataSet().getSelected()); + try { + Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK); + } catch (SecurityException ex) { } + } + + @Override public void exitMode() { + super.exitMode(); + Main.map.mapView.removeMouseListener(this); + Main.map.mapView.removeMouseMotionListener(this); + Main.map.mapView.removeTemporaryLayer(this); + DataSet.selListeners.remove(this); + try { + Toolkit.getDefaultToolkit().removeAWTEventListener(this); + } catch (SecurityException ex) { } + if (mode!=Mode.None) Main.map.mapView.repaint(); + mode = Mode.None; + } + + public void cancelDrawing() + { + mode = Mode.None; + if(Main.map == null || Main.map.mapView == null) + return; + Main.map.mapView.repaint(); + } + + public void eventDispatched(AWTEvent arg0) { + if (!(arg0 instanceof KeyEvent)) return; + KeyEvent ev = (KeyEvent)arg0; + if (ev.getKeyCode() == KeyEvent.VK_ESCAPE) + cancelDrawing(); + } + + private void ProcessMouseEvent(MouseEvent e) + { + mousePos = e.getPoint(); + if (mode == Mode.None) return; + Node n; + if (mode == Mode.Drawing) + { + if (e.isControlDown()) n = null; else n = Main.map.mapView.getNearestNode(mousePos); + if (n == null) + p2 = latlon2eastNorth(Main.map.mapView.getLatLon(mousePos.x, mousePos.y)); + else + p2 = latlon2eastNorth(n.getCoor()); + building.setPlace(p2, width, e.isControlDown()?0:lenstep); + Main.map.statusLine.setDist(building.getLength()); + return; + } + if (mode == Mode.DrawingWidth) + { + if (e.isControlDown()) n = null; else n = Main.map.mapView.getNearestNode(mousePos); + if (n == null) + p3 = latlon2eastNorth(Main.map.mapView.getLatLon(mousePos.x, mousePos.y)); + else + p3 = latlon2eastNorth(n.getCoor()); + + double mwidth = + ((p3.east()-p2.east())*(p2.north()-p1.north())+ + (p3.north()-p2.north())*(p1.east()-p2.east())) + /p1.distanceSq(p2) * building.getLength(); + + building.setPlace(p2, mwidth, lenstep); + Main.map.statusLine.setDist(Math.abs(mwidth)); + return; + } + } + public void paint(Graphics2D g, MapView mv,Bounds bbox) + { + if (mode == Mode.None) return; + if (building.getLength()==0)return; + + g.setColor(selectedColor); + g.setStroke(new BasicStroke(3, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND)); + + building.paint(g, mv); + + g.setStroke(new BasicStroke(1)); + + } + + private void drawingStart(MouseEvent e) + { + mousePos = e.getPoint(); + drawStartPos = mousePos; + + Node n = Main.map.mapView.getNearestNode(mousePos); + if (n == null) + { + p1 = latlon2eastNorth(Main.map.mapView.getLatLon(mousePos.x, mousePos.y)); + building.setBase(p1); + } else + { + p1 = latlon2eastNorth(n.getCoor()); + building.setBase(n); + } + mode = Mode.Drawing; + updateStatusLine(); + } + + private void drawingAdvance(MouseEvent e) + { + ProcessMouseEvent(e); + if (building.getLength() > 0) + { + if (width == 0 && mode == Mode.Drawing) + { + p2 = building.Point2(); + mode = Mode.DrawingWidth; + updateStatusLine(); + return; + } + Way w = building.create(); + if (w != null && useAddr) + showAddrDialog(w); + } + Main.map.mapView.repaint(); + mode = Mode.None; + Main.map.statusLine.setHeading(-1); + Main.map.statusLine.setAngle(-1); + building.reset(); + updateStatusLine(); + } + + @Override public void mousePressed(MouseEvent e) + { + if (e.getButton() != MouseEvent.BUTTON1) return; + if(!Main.map.mapView.isActiveLayerDrawable()) return; + + if (mode == Mode.None) + drawingStart(e); + } + + @Override public void mouseDragged(MouseEvent e) + { + ProcessMouseEvent(e); + updCursor(); + if (mode!=Mode.None) Main.map.mapView.repaint(); + } + + @Override public void mouseReleased(MouseEvent e) + { + if (e.getButton() != MouseEvent.BUTTON1) return; + if(!Main.map.mapView.isActiveLayerDrawable()) return; + + boolean dragged = true; + if (drawStartPos != null) + dragged = e.getPoint().distance(drawStartPos) > 10; + drawStartPos = null; + + if ((mode == Mode.Drawing && dragged) || mode == Mode.DrawingWidth) + drawingAdvance(e); + } + + private void updCursor() + { + if (mousePos==null) return; + Node n = Main.map.mapView.getNearestNode(mousePos); + if (n != null) setCursor(cursorJoinNode); else setCursor(cursorCrosshair); + + } + @Override public void mouseMoved(MouseEvent e) + { + if(!Main.map.mapView.isActiveLayerDrawable()) return; + ProcessMouseEvent(e); + updCursor(); + if (mode!=Mode.None) Main.map.mapView.repaint(); + } + + @Override public String getModeHelpText() { + if (mode==Mode.None) return "Point on angle of building to start drawing"; + if (mode==Mode.Drawing) return "Point on opposite end of building"; + if (mode==Mode.DrawingWidth) return "Set width of building"; + return ""; + } + + @Override public boolean layerIsSupported(Layer l) { + return l instanceof OsmDataLayer; + } + + public void UpdateConstraint(Collection newSelection) + { + building.disableAngConstraint(); + if (newSelection.size()!=2)return; + Object[] arr = newSelection.toArray(); + if (!(arr[0] instanceof Node&&arr[1] instanceof Node)) return; + EastNorth p1,p2; + p1=latlon2eastNorth(((Node)arr[0]).getCoor()); + p2=latlon2eastNorth(((Node)arr[1]).getCoor()); + building.setAngConstraint(p1.heading(p2)); + } + + public void selectionChanged(Collection newSelection) { + UpdateConstraint(newSelection); + } +}