Index: applications/editors/josm/plugins/addrinterpolation/LICENSE =================================================================== --- applications/editors/josm/plugins/addrinterpolation/LICENSE (revision 17721) +++ applications/editors/josm/plugins/addrinterpolation/LICENSE (revision 17721) @@ -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/addrinterpolation/README =================================================================== --- applications/editors/josm/plugins/addrinterpolation/README (revision 17721) +++ applications/editors/josm/plugins/addrinterpolation/README (revision 17721) @@ -0,0 +1,15 @@ +README +====== + +Address Interpolation Plugin + + +The Address Interpolation described in the Karlsruhe Schema allows marking +many house addresses with minimal effort. While JOSM has a preset to assist +with creating the key, there are several steps required to create each +address interpolation way. This plugin combines the steps into one screen +for ease of use and to minimize chances for error. + +For more information, refer to the Wiki page at +http://wiki.openstreetmap.org/wiki/JOSM/Plugins/AddrInterpolation + Index: applications/editors/josm/plugins/addrinterpolation/build.xml =================================================================== --- applications/editors/josm/plugins/addrinterpolation/build.xml (revision 17721) +++ applications/editors/josm/plugins/addrinterpolation/build.xml (revision 17721) @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/addrinterpolation/build/LICENSE =================================================================== --- applications/editors/josm/plugins/addrinterpolation/build/LICENSE (revision 17721) +++ applications/editors/josm/plugins/addrinterpolation/build/LICENSE (revision 17721) @@ -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/addrinterpolation/build/README =================================================================== --- applications/editors/josm/plugins/addrinterpolation/build/README (revision 17721) +++ applications/editors/josm/plugins/addrinterpolation/build/README (revision 17721) @@ -0,0 +1,15 @@ +README +====== + +Address Interpolation Plugin + + +The Address Interpolation described in the Karlsruhe Schema allows marking +many house addresses with minimal effort. While JOSM has a preset to assist +with creating the key, there are several steps required to create each +address interpolation way. This plugin combines the steps into one screen +for ease of use and to minimize chances for error. + +For more information, refer to the Wiki page at +http://wiki.openstreetmap.org/wiki/JOSM/Plugins/AddrInterpolation + Index: applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java =================================================================== --- applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java (revision 17721) +++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java (revision 17721) @@ -0,0 +1,55 @@ +// License: GPL. Copyright 2009 by Mike Nice and others +// Connects from JOSM menu action to Plugin +package org.openstreetmap.josm.plugins.AddrInterpolation; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; +import java.util.Collection; + +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.data.SelectionChangedListener; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.tools.Shortcut; + + +@SuppressWarnings("serial") +public class AddrInterpolationAction extends JosmAction implements +SelectionChangedListener { + + public AddrInterpolationAction(){ + super(tr("Address Interpolation"), "AddrInterpolation", tr("Handy Address Interpolation Functions"), + Shortcut.registerShortcut("tools:AddressInterpolation", tr("Tool: {0}", tr("Address Interpolation")), + KeyEvent.VK_A, Shortcut.GROUP_MENU, + InputEvent.ALT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK), false); + setEnabled(false); + DataSet.selListeners.add(this); + } + + public void actionPerformed(ActionEvent e) { + AddrInterpolationDialog addrDialog = new AddrInterpolationDialog(tr("Define Address Interpolation"), "AddrInterpolation", + tr("Define Address Interpolation"), null, 100); + + + } + + public void selectionChanged( + Collection newSelection) { + + for (OsmPrimitive osm : newSelection) { + if (osm instanceof Way) { + setEnabled(true); + return; + } + } + setEnabled(false); + + } + +} + + Index: applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java =================================================================== --- applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java (revision 17721) +++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java (revision 17721) @@ -0,0 +1,835 @@ +// License: GPL. Copyright 2009 by Mike Nice and others + +// Main plugin logic +package org.openstreetmap.josm.plugins.AddrInterpolation; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.Point; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.ArrayList; +import java.util.regex.Pattern; + +import javax.swing.BorderFactory; +import javax.swing.ButtonGroup; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JTextField; +import javax.swing.border.Border; +import javax.swing.border.TitledBorder; + +import org.openstreetmap.josm.Main; +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.Relation; +import org.openstreetmap.josm.data.osm.RelationMember; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.dialogs.ToggleDialog; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.Shortcut; +import org.openstreetmap.josm.tools.UrlLabel; + +/** + * + */ + + + + + +public class AddrInterpolationDialog extends ToggleDialog implements ActionListener { + + private Way selectedStreet = null; + private Way addrInterpolationWay = null; + private Relation associatedStreetRelation = null; + private ArrayList houseNumberNodes = null; // Additional nodes with addr:housenumber + + private static String lastCity = ""; + private static String lastState = ""; + private static String lastPostCode = ""; + private static String lastCountry = ""; + private static String lastFullAddress = ""; + + // Edit controls + private EscapeDialog dialog=null; + private JRadioButton streetNameButton = null; + private JRadioButton streetRelationButton = null; + private JTextField startTextField = null; + private JTextField endTextField = null; + private JTextField cityTextField = null; + private JTextField stateTextField = null; + private JTextField postCodeTextField = null; + private JTextField countryTextField = null; + private JTextField allTextField = null; + + private boolean relationChanged = false; // Whether to re-trigger data changed for relation + + + // NOTE: The following 2 arrays must match in number of elements and position + String[] addrInterpolationTags = { "odd", "even", "all", "alphabetic" }; // Tag values for map + String[] addrInterpolationStrings = { tr("Odd"), tr("Even"), tr("All"), tr("Alphabetic") }; // Translatable names for display + private JComboBox addrInterpolationList = null; + + + public AddrInterpolationDialog(String name, String iconName, + String tooltip, Shortcut shortcut, int preferredHeight) { + super(name, iconName, tooltip, shortcut, preferredHeight); + + if (!FindAndSaveSelections()) { + return; + } + + JPanel editControlsPane = CreateEditControls(); + + ShowDialog(editControlsPane, name); + + } + + + + private void ShowDialog(JPanel editControlsPane, String name) { + dialog = new EscapeDialog((Frame) Main.parent, name, true); + + dialog.add(editControlsPane); + dialog.setSize(new Dimension(300,450)); + dialog.setLocation(new Point(100,300)); + + // Listen for windowOpened event to set focus + dialog.addWindowListener( new WindowAdapter() + { + @Override + public void windowOpened( WindowEvent e ) + { + if (addrInterpolationWay != null) { + addrInterpolationList.requestFocus(); + } + else { + cityTextField.requestFocus(); + } + } + }); + + dialog.setVisible(true); + + lastCity = cityTextField.getText(); + lastState = stateTextField.getText(); + lastPostCode = postCodeTextField.getText(); + lastCountry = countryTextField.getText(); + lastFullAddress = allTextField.getText(); + + } + + + + // Create edit control items and return JPanel on which they reside + private JPanel CreateEditControls() { + + JPanel editControlsPane = new JPanel(); + GridBagLayout gridbag = new GridBagLayout(); + GridBagConstraints c = new GridBagConstraints(); + + editControlsPane.setLayout(gridbag); + + editControlsPane.setBorder(BorderFactory.createEmptyBorder(15,15,15,15)); + + + String streetName = selectedStreet.get("name"); + String streetRelation = FindRelation(); + if (streetRelation.equals("")) { + streetRelation = " (Create new)"; + } + streetNameButton = new JRadioButton(tr("Name: {0}", streetName)); + streetRelationButton = new JRadioButton(tr("Relation: {0}", streetRelation)); + if (associatedStreetRelation == null) { + streetNameButton.setSelected(true); + }else { + streetRelationButton.setSelected(true); + } + + // Create edit controls for street / relation radio buttons + ButtonGroup group = new ButtonGroup(); + group.add(streetNameButton); + group.add(streetRelationButton); + JPanel radioButtonPanel = new JPanel(new BorderLayout()); + radioButtonPanel.setBorder(BorderFactory.createTitledBorder(tr("Associate with street using:"))); + radioButtonPanel.add(streetNameButton, BorderLayout.NORTH); + radioButtonPanel.add(streetRelationButton, BorderLayout.SOUTH); + + // Add to edit panel + c.gridx = 0; + c.gridwidth = 2; // # of columns to span + c.fill = GridBagConstraints.HORIZONTAL; // Full width + c.gridwidth = GridBagConstraints.REMAINDER; //end row + editControlsPane.add(radioButtonPanel, c); + + JLabel numberingLabel = new JLabel(tr("Numbering Scheme:")); + addrInterpolationList = new JComboBox(addrInterpolationStrings); + + JLabel startLabel = new JLabel(tr("Starting #:")); + JLabel endLabel = new JLabel(tr("Ending #:")); + + startTextField = new JTextField(10); + endTextField = new JTextField(10); + + + + + // Preload any values already set in map + GetExistingMapKeys(); + + + JLabel[] textLabels = {numberingLabel, startLabel, endLabel}; + Component[] editFields = {addrInterpolationList, startTextField, endTextField}; + AddEditControlRows(textLabels, editFields, editControlsPane); + + JPanel optionPanel = new JPanel(new BorderLayout()); + + Border dividerBorder = BorderFactory.createEtchedBorder(); + TitledBorder titleBorder = BorderFactory.createTitledBorder(dividerBorder, tr("Optional Information:"), + TitledBorder.LEFT, TitledBorder.BOTTOM); + + optionPanel.setBorder(titleBorder); + editControlsPane.add(optionPanel, c); + + // Address interpolation fields not valid if Way not selected + if (addrInterpolationWay == null) { + addrInterpolationList.setEnabled(false); + startTextField.setEnabled(false); + endTextField.setEnabled(false); + } + + JLabel[] optionalTextLabels = {new JLabel(tr("City:")), + new JLabel(tr("State:")), + new JLabel(tr("Post Code:")), + new JLabel(tr("Country:")), + new JLabel(tr("All:"))}; + cityTextField = new JTextField(lastCity, 100); + stateTextField = new JTextField(lastState, 100); + postCodeTextField = new JTextField(lastPostCode, 20); + countryTextField = new JTextField(lastCountry, 2); + allTextField = new JTextField(lastFullAddress, 300); + + // Special processing for addr:country code, max length and uppercase + countryTextField.addKeyListener(new KeyAdapter() { + @Override + public void keyTyped(KeyEvent e) { + JTextField jtextfield = (JTextField)e.getSource(); + String text = jtextfield.getText(); + int length = text.length(); + if (length == jtextfield.getColumns()) { + e.consume(); + } else if (length > jtextfield.getColumns()) { + // show error message ?? + } else { + // Accept key; convert to upper case + if (!e.isActionKey()) { + e.setKeyChar(Character.toUpperCase(e.getKeyChar()) ); + } + } + } + }); + + + KeyAdapter enterProcessor = new KeyAdapter() { + @Override + public void keyPressed(KeyEvent e) { + if (e.getKeyCode() == KeyEvent.VK_ENTER) { + if (ValidateAndSave()) { + dialog.dispose(); + } + + } + } + }; + + // Make Enter == OK click on fields using this adapter + endTextField.addKeyListener(enterProcessor); + cityTextField.addKeyListener(enterProcessor); + + + Component[] optionalEditFields = {cityTextField, stateTextField, postCodeTextField, countryTextField, allTextField}; + AddEditControlRows(optionalTextLabels, optionalEditFields, editControlsPane); + + + + c.gridx = 0; + c.gridwidth = 2; // # of columns to span + c.fill = GridBagConstraints.BOTH; // Full width + c.gridwidth = GridBagConstraints.REMAINDER; //end row + + if (houseNumberNodes.size() > 0) { + JLabel houseNumberNodeNote = new JLabel(tr("Will associate {0} additional house number nodes", + houseNumberNodes.size() )); + editControlsPane.add(houseNumberNodeNote, c); + } + + editControlsPane.add(new UrlLabel("http://wiki.openstreetmap.org/wiki/JOSM/Plugins/AddrInterpolation", + tr("More information about this feature")), c); + + + c.gridx = 0; + c.gridwidth = 1; //next-to-last + c.fill = GridBagConstraints.NONE; //reset to default + c.weightx = 0.0; + c.insets = new Insets(15, 0, 0, 0); + c.anchor = GridBagConstraints.LINE_END; + JButton okButton = new JButton(tr("OK"), ImageProvider.get("ok")); + editControlsPane.add(okButton, c); + + c.gridx = 1; + c.gridwidth = GridBagConstraints.REMAINDER; //end row + c.weightx = 1.0; + c.anchor = GridBagConstraints.LINE_START; + + JButton cancelButton = new JButton(tr("Cancel"), ImageProvider.get("cancel")); + editControlsPane.add(cancelButton, c); + + okButton.setActionCommand("ok"); + okButton.addActionListener(this); + cancelButton.setActionCommand("cancel"); + cancelButton.addActionListener(this); + + return editControlsPane; + } + + + + // Populate dialog for any possible existing settings if editing an existing Address interpolation way + private void GetExistingMapKeys() { + + + // Check all nodes for optional addressing data + // Address interpolation nodes will overwrite these value if they contain optional data + for (Node node : houseNumberNodes) { + CheckNodeForAddressTags(node); + } + + if (addrInterpolationWay != null) { + String currentMethod = addrInterpolationWay.get("addr:interpolation"); + if (currentMethod != null) { + + int currentIndex = 0; + // Must scan key values because combo box is already loaded with translated strings + for (int i=0; i(); + // Check selected nodes + for (OsmPrimitive osm : currentDataSet.getSelectedNodes()) { + Node node = (Node) osm; + if (node.getKeys().containsKey("addr:housenumber")) { + houseNumberNodes.add(node); + } + } + + if (addrInterpolationWay != null) { + // Check nodes in middle of address interpolation way + if (addrInterpolationWay.getNodesCount() > 2) { + for (int i=1; i<(addrInterpolationWay.getNodesCount()-2); i++) { + Node testNode = addrInterpolationWay.getNode(i); + if (testNode.getKeys().containsKey("addr:housenumber")) { + houseNumberNodes.add(testNode); + } + } + } + } + + } + + if (namedWayCount != 1) { + JOptionPane.showMessageDialog( + Main.parent, + tr("Please select a street to associate with address interpolation way"), + tr("Error"), + JOptionPane.ERROR_MESSAGE + ); + } else { + // Avoid 2 error dialogs if both conditions don't match + if (unNamedWayCount != 1) { + // Allow for street + house number nodes only to be selected (no address interpolation way). + if (houseNumberNodes.size() > 0) { + isValid = true; + } else { + JOptionPane.showMessageDialog( + Main.parent, + tr("Please select address interpolation way for this street"), + tr("Error"), + JOptionPane.ERROR_MESSAGE + ); + } + } else { + isValid = true; + } + } + + + return isValid; + } + + + /** + * Add rows of edit controls - with labels in the left column, and controls in the right + * column on the gridbag of the specified container. + */ + private void AddEditControlRows(JLabel[] labels, + Component[] editFields, + Container container) { + GridBagConstraints c = new GridBagConstraints(); + c.anchor = GridBagConstraints.EAST; + int numLabels = labels.length; + + for (int i = 0; i < numLabels; i++) { + c.gridx = 0; + c.gridwidth = 1; //next-to-last + c.fill = GridBagConstraints.NONE; //reset to default + c.weightx = 0.0; //reset to default + container.add(labels[i], c); + + c.gridx = 1; + c.gridwidth = GridBagConstraints.REMAINDER; //end row + c.fill = GridBagConstraints.HORIZONTAL; + c.weightx = 1.0; + container.add(editFields[i], c); + } + } + + + + public void actionPerformed(ActionEvent e) { + if ("ok".equals(e.getActionCommand())) { + if (ValidateAndSave()) { + dialog.dispose(); + } + + } else if ("cancel".equals(e.getActionCommand())) { + dialog.dispose(); + + } + } + + + // Test for valid long int + private boolean isLong( String input ) + { + try + { + Long.parseLong( input ); + return true; + } + catch( Exception e) + { + return false; + } + } + + private boolean isEven( Long input ) + { + return ((input %2) == 0); + } + + private static Pattern p = Pattern.compile("^[0-9]+$"); + private static boolean IsNumeric(String s) { + return p.matcher(s).matches(); + } + + + private boolean ValidateAndSave() { + + String startValueString = ReadTextField(startTextField); + String endValueString = ReadTextField(endTextField); + String city = ReadTextField(cityTextField); + String state = ReadTextField(stateTextField); + String postCode = ReadTextField(postCodeTextField); + String country = ReadTextField(countryTextField); + String fullAddress = ReadTextField(allTextField); + + String selectedMethod = GetInterpolationMethod(); + if (addrInterpolationWay != null) { + Long startAddr=0L, endAddr=0L; + if (!selectedMethod.equals("alphabetic")) { + Long[] addrArray = {startAddr, endAddr}; + if (!ValidAddressNumbers(startValueString, endValueString, addrArray )) { + return false; + } + startAddr = addrArray[0]; + endAddr = addrArray[1]; + } + + String errorMessage = ""; + if (selectedMethod.equals("odd")) { + if (isEven(startAddr) || isEven(endAddr)) { + errorMessage = tr("Expected odd numbers for addresses"); + } + + } else if (selectedMethod.equals("even")) { + if (!isEven(startAddr) || !isEven(endAddr)) { + errorMessage = tr("Expected even numbers for addresses"); + } + } else if (selectedMethod.equals("all")) { + + }else if (selectedMethod.equals("alphabetic")) { + errorMessage = ValidateAlphaAddress(startValueString, endValueString); + } + if (!errorMessage.equals("")) { + JOptionPane.showMessageDialog(Main.parent, errorMessage, tr("Error"), JOptionPane.ERROR_MESSAGE); + return false; + } + } + + if (country != null) { + if (country.length() != 2) { + JOptionPane.showMessageDialog(Main.parent, + tr("Country code must be 2 letters"), tr("Error"), JOptionPane.ERROR_MESSAGE); + return false; + } + } + + // Entries are valid ... save in map + String streetName = selectedStreet.get("name"); + + if (addrInterpolationWay != null) { + addrInterpolationWay.modified = true; + + Node firstNode = addrInterpolationWay.getNode(0); + Node lastNode = addrInterpolationWay.getNode(addrInterpolationWay.getNodesCount()-1); + + addrInterpolationWay.put("addr:interpolation", selectedMethod); + firstNode.put("addr:housenumber", startValueString); + lastNode.put("addr:housenumber", endValueString); + if (streetNameButton.isSelected()) { + + firstNode.put("addr:street", streetName); + lastNode.put("addr:street", streetName); + + } + // Add address interpolation house number nodes to main house number node list for common processing + houseNumberNodes.add(firstNode); + houseNumberNodes.add(lastNode); + + // De-select address interpolation way; leave street selected + addrInterpolationWay.setSelected(false); + } + + + + if (streetRelationButton.isSelected()) { + + // Relation button was selected + if (associatedStreetRelation == null) { + CreateRelation(streetName); + relationChanged = true; + } + + + if (addrInterpolationWay != null) { + AddToRelation(associatedStreetRelation, addrInterpolationWay, "house"); + } + } + + + // For all nodes, add to relation and + // Add optional text fields to all nodes if specified + for (Node node : houseNumberNodes) { + + node.modified = true; // Trigger re-upload in case there is a change + + if (streetRelationButton.isSelected()) { + AddToRelation(associatedStreetRelation, node, "house"); + } + if ((city != null) || (streetNameButton.isSelected()) ) { + // Include street unconditionally if adding nodes only or city name specified + node.put("addr:street", streetName); + } + // Set or remove remaining optional fields + node.put("addr:city", city); + node.put("addr:state", state); + node.put("addr:postcode", postCode); + node.put("addr:country", country); + node.put("addr:full", fullAddress); + } + + if (relationChanged) { + associatedStreetRelation.modified = true; + + // Redraw relation list dialog + Main.main.getEditLayer().setModified(true); + Main.main.getEditLayer().fireDataChange(); + } + + + Main.map.mapView.repaint(); + + return true; + } + + // Create Associated Street relation, add street, and add to map + private void CreateRelation(String streetName) { + associatedStreetRelation = new Relation(); + associatedStreetRelation.put("name", streetName); + associatedStreetRelation.put("type", "associatedStreet"); + RelationMember newStreetMember = new RelationMember("street", selectedStreet); + associatedStreetRelation.addMember(newStreetMember); + Main.main.getCurrentDataSet().addPrimitive(associatedStreetRelation); + } + + + + // Read from dialog text box, removing leading and trailing spaces + // Return the string, or null for a zero length string + private String ReadTextField(JTextField field) { + String value = field.getText(); + if (value != null) { + value = value.trim(); + if (value.equals("")) { + value = null; + } + } + return value; + } + + + // Test if relation contains specified member + // If not already present, it is added + private void AddToRelation(Relation relation, OsmPrimitive testMember, String role) { + boolean isFound = false; + for (RelationMember relationMember : relation.getMembers()) { + + if (testMember == relationMember.member) { + isFound = true; + break; + } + } + + if (!isFound) { + RelationMember newMember = new RelationMember(role, testMember); + associatedStreetRelation.addMember(newMember); + relationChanged = true; + } + } + + + + // Check alphabetic style address + // Last character of both must be alpha + // Last character of ending must be greater than starting + // Return empty error message if OK + private String ValidateAlphaAddress(String startValueString, + String endValueString) { + String errorMessage=""; + + if (startValueString.equals("") || endValueString.equals("")) { + errorMessage = tr("Please enter valid number for starting and ending address"); + } else { + char startingChar = startValueString.charAt(startValueString.length()-1); + char endingChar = endValueString.charAt(endValueString.length()-1); + + if ( (IsNumeric("" + startingChar)) || (IsNumeric("" + endingChar)) ) { + errorMessage = tr("Alphabetic address must end with a letter"); + } + + // ?? Character collation in all languages ?? + if (startingChar >= endingChar) { + errorMessage = tr("Starting address letter must be less than ending address letter"); + } + + } + + return errorMessage; + } + + + + // Convert string addresses to numeric, with error check + private boolean ValidAddressNumbers(String startValueString, + String endValueString, Long[] addrArray) { + String errorMessage = ""; + + if (!isLong(startValueString)) { + errorMessage = tr("Please enter valid number for starting address"); + } + if (!isLong(endValueString)) { + errorMessage = tr("Please enter valid number for ending address"); + } + if (errorMessage.equals("")) { + addrArray[0] = Long.parseLong( startValueString ); + addrArray[1] = Long.parseLong( endValueString ); + + if (addrArray[1] <= addrArray[0]) { + errorMessage = tr("Starting address number must be less than ending address number"); + } + } + + if (errorMessage.equals("")) { + return true; + + } else { + JOptionPane.showMessageDialog(Main.parent, errorMessage, tr("Error"), JOptionPane.ERROR_MESSAGE); + return false; + } + } + + + + private String GetInterpolationMethod() { + int selectedIndex = addrInterpolationList.getSelectedIndex(); + return addrInterpolationTags[selectedIndex]; + } + + + + + + + +} + + Index: applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationPlugin.java =================================================================== --- applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationPlugin.java (revision 17721) +++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationPlugin.java (revision 17721) @@ -0,0 +1,21 @@ +// License: GPL. Copyright 2009 by Mike Nice and others +package org.openstreetmap.josm.plugins.AddrInterpolation; + + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.plugins.Plugin; + +public class AddrInterpolationPlugin extends Plugin { + + AddrInterpolationAction action = null; + + /** + * constructor + */ + public AddrInterpolationPlugin() { + action = new AddrInterpolationAction(); + Main.main.menu.toolsMenu.add(action); + } + + +} Index: applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/EscapeDialog.java =================================================================== --- applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/EscapeDialog.java (revision 17721) +++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/EscapeDialog.java (revision 17721) @@ -0,0 +1,61 @@ +// License: GPL. Copyright 2009 by Mike Nice and others +// Handles ESC key to close a dialog +package org.openstreetmap.josm.plugins.AddrInterpolation; + +import java.awt.Dialog; +import java.awt.Frame; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; + +import javax.swing.JComponent; +import javax.swing.JDialog; +import javax.swing.JRootPane; +import javax.swing.KeyStroke; + +public class EscapeDialog extends JDialog { + public EscapeDialog() { + this((Frame)null, false); + } + public EscapeDialog(Frame owner) { + this(owner, false); + } + public EscapeDialog(Frame owner, boolean modal) { + this(owner, null, modal); + } + public EscapeDialog(Frame owner, String title) { + this(owner, title, false); + } + public EscapeDialog(Frame owner, String title, boolean modal) { + super(owner, title, modal); + } + public EscapeDialog(Dialog owner) { + this(owner, false); + } + public EscapeDialog(Dialog owner, boolean modal) { + this(owner, null, modal); + } + public EscapeDialog(Dialog owner, String title) { + this(owner, title, false); + } + public EscapeDialog(Dialog owner, String title, boolean modal) { + super(owner, title, modal); + } + + + @Override + protected JRootPane createRootPane() { + ActionListener escapeActionListener = new ActionListener() { + public void actionPerformed(ActionEvent actionEvent) { + dispose(); + // setVisible(false); + } + }; + JRootPane rootPane = new JRootPane(); + KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0); + rootPane.registerKeyboardAction(escapeActionListener, stroke, JComponent.WHEN_IN_FOCUSED_WINDOW); + + return rootPane; + } +} +