Index: applications/editors/josm/plugins/conflation/GPL-v2.0.txt =================================================================== --- applications/editors/josm/plugins/conflation/GPL-v2.0.txt (revision 25942) +++ applications/editors/josm/plugins/conflation/GPL-v2.0.txt (revision 25942) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, 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 Lesser 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 Street, 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 Lesser General +Public License instead of this License. Index: applications/editors/josm/plugins/conflation/GPL-v3.0.txt =================================================================== --- applications/editors/josm/plugins/conflation/GPL-v3.0.txt (revision 25942) +++ applications/editors/josm/plugins/conflation/GPL-v3.0.txt (revision 25942) @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. 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 +them 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 prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. 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. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey 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; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + 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. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +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. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + 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 +state 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 3 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, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program 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, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU 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 Lesser General +Public License instead of this License. But first, please read +. Index: applications/editors/josm/plugins/conflation/README =================================================================== --- applications/editors/josm/plugins/conflation/README (revision 25942) +++ applications/editors/josm/plugins/conflation/README (revision 25942) @@ -0,0 +1,10 @@ +README +====== + +This is a JOSM plugin for conflating data in OSM. Conflation in GIS is the process +of combining two or more sources of data to produce a higher quality version, +in terms of spatial accuracy and/or attributed data (tags). + + * Original author is Josh Doe + * The code is licensed under GPL v2 or later. + * This is an experimental plugin and not ready for widespread use Index: applications/editors/josm/plugins/conflation/README.template =================================================================== --- applications/editors/josm/plugins/conflation/README.template (revision 25942) +++ applications/editors/josm/plugins/conflation/README.template (revision 25942) @@ -0,0 +1,78 @@ +README +====== + +This is a template project structure for a JOSM plugin. + +Layout +====== ++--- src source of your plugin + |- images images your plugin needs + |- resources resources your plugin needs + + README README for your plugin + + GPL-v2.0.txt GPL version 2 license text + GPL-v3.0.txt GPL version 3 license text + + README.template this file + + +Build +===== +A JOSM plugin is built as a single jar. We use ant to build. + +See build.xml in this directory and update the plugin specific properties in the +configuration section. + + +Maintaining versions +==================== +There are two versions maintained with each plugin: + 1) the main version + This is the lowest JOSM version required by this plugin. + You have to manually set the plugins main version in the build script. + Set the property plugin.main.version in build.xml accordingly. + + 2) the build version + The build version is unique for every build of the plugin. It is equal + to the SVN revision of your plugin directory. + + Both the main version and the build version are included in properties of the plugins + manifest: + Plugin-Version the build version + Plugin-Mainversion the main version + + JOSM automatically detects whether a plugin needs to be upgraded. It compares the build + version of the currently installed plugin jar with the build version of the plugin jar in + the SVN. The main version is irrelevant for this process. + + Making your plugin available to JOSM users + =========================================== + When a plugin jar is checked into SVN a script updates the plugins list on the JOSM wiki: + http://josm.openstreetmap.de/wiki/Plugins + JOSM retrieves the list of available plugins and their build versions from this list. + + commit publish read + meta data meta data + Build ==> SVN =======> JOSM Wiki <======= JOSM + ^ + ================================== + fetch current plugin jar + + Note that you have to manually publish (commit) your plugin jar. There is no nightly build + in place. Everything else (pulishing meta data, updating plugins in the client) is then handled + by automatic processes. + +See also +======== +* Developing Plugins + http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins + +* List of JOSM Plugins + http://josm.openstreetmap.de/wiki/Plugins + + + + + + Index: applications/editors/josm/plugins/conflation/REVISION =================================================================== --- applications/editors/josm/plugins/conflation/REVISION (revision 25942) +++ applications/editors/josm/plugins/conflation/REVISION (revision 25942) @@ -0,0 +1,3 @@ + + +svn: '.' is not a working copy Index: applications/editors/josm/plugins/conflation/build.xml =================================================================== --- applications/editors/josm/plugins/conflation/build.xml (revision 25942) +++ applications/editors/josm/plugins/conflation/build.xml (revision 25942) @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java =================================================================== --- applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java (revision 25942) +++ applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java (revision 25942) @@ -0,0 +1,201 @@ +// License: GPL. Copyright 2011 by Josh Doe and others +// Connects from JOSM menu action to Plugin +package org.openstreetmap.josm.plugins.conflation; + +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.ArrayList; +import java.util.Collection; +import java.util.List; +import javax.swing.JOptionPane; +import org.openstreetmap.josm.Main; + +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.actions.search.SearchAction.SearchMode; +import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting; +import org.openstreetmap.josm.actions.search.SearchCompiler; +import org.openstreetmap.josm.data.conflict.ConflictCollection; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.tools.Shortcut; + +//@SuppressWarnings("serial") +public class ConflationAction extends JosmAction { + ConflictCollection conflicts; + + public ConflationAction() { + super(tr("Conflation"), "conflation", tr("Conflation tool for merging data"), + Shortcut.registerShortcut("tool:conflation", tr("Tool: {0}", tr("Conflation")), + KeyEvent.VK_C, Shortcut.GROUP_MENU, + InputEvent.ALT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK), true); + //setEnabled(false); + //DataSet.selListeners.add(this); + + conflicts = new ConflictCollection(); + } + + public void actionPerformed(ActionEvent e) { + // get list of OsmDataLayers + List layerList = null; + if (Main.map != null && Main.map.mapView != null) { + layerList = Main.map.mapView.getLayersOfType(OsmDataLayer.class); + } + if (layerList == null || layerList.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, tr("There are no data layers " + + "present. Please open or create at least one data layer and try again."), + tr("Cannot perform conflation"), JOptionPane.ERROR_MESSAGE); + return; + } + + // show options dialog + ConflationOptionsDialog conflationDialog = new ConflationOptionsDialog(Main.parent, layerList); + conflationDialog.setVisible(true); + + if (conflationDialog.isCanceled()) { + return; + } + + // get layer and filter settings + final OsmDataLayer refLayer = conflationDialog.getPanel().getRefLayer(); + final OsmDataLayer nonRefLayer = conflationDialog.getPanel().getNonRefLayer(); + SearchSetting refSearchSetting = conflationDialog.getPanel().getRefSearchSetting(); + SearchSetting nonRefSearchSetting = conflationDialog.getPanel().getNonRefSearchSetting(); + + // apply filter criteria to each layer + Collection refColl = getSelection(refSearchSetting, refLayer.data); + Collection nonRefColl = getSelection(nonRefSearchSetting, nonRefLayer.data); + + if (refColl.isEmpty() || nonRefColl.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, tr("At least one layer has no primitives given current filter settings."), + tr("Cannot perform conflation"), JOptionPane.ERROR_MESSAGE); + return; + } + + ArrayList refList = new ArrayList(refColl); + ArrayList nonRefList = new ArrayList(nonRefColl); + + int n = refList.size(); + int m = nonRefList.size(); + int maxLen = Math.max(n, m); + double cost[][] = new double[maxLen][maxLen]; + + // calculate cost matrix + for (int i = 0; i < n; i++) { + for (int j = 0; j < m; j++) { + cost[i][j] = calcCost(refList.get(i), nonRefList.get(j)); + } + } + + // perform assignment using Hungarian algorithm + int[][] assignment = new int[maxLen][2]; + assignment = HungarianAlgorithm.hgAlgorithm(cost, "min"); + + // create array of primitives based on indices from assignment + OsmPrimitive[][] pairs = new OsmPrimitive[maxLen][2]; + for (int i = 0; i < maxLen; i++) { + if (assignment[i][0] < n) + pairs[i][0] = refList.get(assignment[i][0]); + else + pairs[i][0] = null; + if (assignment[i][1] < m) + pairs[i][1] = nonRefList.get(assignment[i][1]); + else + pairs[i][1] = null; + + if (pairs[i][0] != null && pairs[i][1] != null) { + conflicts.add(pairs[i][0], pairs[i][1]); + } + } + + // add conflation layer + try { + ConflationLayer conflationLayer = new ConflationLayer(refLayer.data, conflicts); + Main.main.addLayer(conflationLayer); + } catch (Exception ex) { + JOptionPane.showMessageDialog(Main.parent, ex.toString(), + "Error adding conflation layer", JOptionPane.ERROR_MESSAGE); + } + + // print list of matched pairsalong with distance + // upon selection of one pair, highlight them and draw arrow + + + } + + /** + * Get selection of primitives for a given layer based on filter settings. + * + * @param s the given SearchSetting's. + * @param ds the DataSet of the selected Layer. + */ + public static Collection getSelection(SearchSetting s, DataSet ds) { + Collection sel = new ArrayList(); + try { + String searchText = s.text; + SearchCompiler.Match matcher = SearchCompiler.compile(searchText, s.caseSensitive, s.regexSearch); + + Collection all; + if (s.allElements) + all = ds.allPrimitives(); + else + all = ds.allNonDeletedCompletePrimitives(); + + if (s.mode != SearchMode.replace) + sel = ds.getSelected(); + + for (OsmPrimitive osm : all) { + if (s.mode == SearchMode.replace) { + if (matcher.match(osm)) { + sel.add(osm); + } + } else if (s.mode == SearchMode.add && !ds.isSelected(osm) && matcher.match(osm)) { + sel.add(osm); + } else if (s.mode == SearchMode.remove && ds.isSelected(osm) && matcher.match(osm)) { + sel.remove(osm); + } else if (s.mode == SearchMode.in_selection && ds.isSelected(osm)&& !matcher.match(osm)) { + sel.remove(osm); + } + } + } catch (SearchCompiler.ParseError e) { + JOptionPane.showMessageDialog( + Main.parent, + e.getMessage(), + tr("Error"), + JOptionPane.ERROR_MESSAGE + + ); + } + return sel; + } + + public static EastNorth getCenter(OsmPrimitive prim) { + LatLon center = prim.getBBox().getTopLeft().getCenter(prim.getBBox().getBottomRight()); + return Main.map.mapView.getProjection().latlon2eastNorth(center); + } + + /** + * Calculate the cost of a pair of OsmPrimitive's. A + * simple cost consisting of the Euclidean distance is used + * now, later we can also use dissimilarity between tags. + * + * @param refPrim the reference OsmPrimitive. + * @param nonRefPrim the non-reference OsmPrimitive. + */ + public double calcCost(OsmPrimitive refPrim, OsmPrimitive nonRefPrim) { + double dist; + try { + dist = getCenter(refPrim).distance(getCenter(nonRefPrim)); + } catch (Exception e) { + dist = 1000; // FIXME: what number to use? + } + + // TODO: use other "distance" measures, i.e. matching tags + return dist; + } +} Index: applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationLayer.java =================================================================== --- applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationLayer.java (revision 25942) +++ applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationLayer.java (revision 25942) @@ -0,0 +1,169 @@ +// License: GPL. See LICENSE file for details. +package org.openstreetmap.josm.plugins.conflation; + +import java.awt.BasicStroke; +import java.awt.Color; +import javax.swing.Action; +import javax.swing.Icon; +import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Graphics2D; +import java.awt.Point; +import java.awt.geom.GeneralPath; +import org.openstreetmap.josm.actions.RenameLayerAction; + + +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.conflict.Conflict; +import org.openstreetmap.josm.data.conflict.ConflictCollection; +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.gui.MapView; +import org.openstreetmap.josm.gui.MapView.LayerChangeListener; +import org.openstreetmap.josm.gui.dialogs.LayerListDialog; +import org.openstreetmap.josm.gui.dialogs.LayerListPopup; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.Layer.SeparatorLayerAction; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * A layer to show arrows and other symbols to indicate what primitives have been matched. + * + * @author Josh Doe + */ +public class ConflationLayer extends OsmDataLayer implements LayerChangeListener { + // TODO: this really shouldn't be OsmDataLayer, but easy to use conflict dialog + + ConflictCollection conflicts; + + public ConflationLayer(DataSet ds, ConflictCollection conflicts) { + super(ds, tr("Conflation symbols"), null); + MapView.addLayerChangeListener(this); + this.conflicts = conflicts; + } + + /** + * Draw symbols connecting matched primitives. + */ + @SuppressWarnings("unchecked") + @Override + public void paint(final Graphics2D g, final MapView mv, Bounds bounds) { + Graphics2D g2 = g; + BasicStroke line = new BasicStroke(3, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND); + g2.setColor(Color.blue); + g2.setStroke(line); + + GeneralPath path = new GeneralPath(); + + final double PHI = Math.toRadians(20); + final double cosPHI = Math.cos(PHI); + final double sinPHI = Math.sin(PHI); + + for (Conflict c : conflicts) { + OsmPrimitive p = c.getMy(); + OsmPrimitive q = c.getTheir(); + if (p != null && q != null) { + // we have a pair, so draw line between them + Point p1 = mv.getPoint(ConflationAction.getCenter(p)); + Point p2 = mv.getPoint(ConflationAction.getCenter(q)); + path.moveTo(p1.x, p1.y); + path.lineTo(p2.x, p2.y); + //logger.info(String.format("Line %d,%d to %d,%d", p1.x, p1.y, p2.x, p2.y)); + + // draw arrow head + if (true) { + final double segmentLength = p1.distance(p2); + if (segmentLength != 0.0) { + final double l = (10. + line.getLineWidth()) / segmentLength; + + final double sx = l * (p1.x - p2.x); + final double sy = l * (p1.y - p2.y); + + path.moveTo(p2.x + cosPHI * sx - sinPHI * sy, p2.y + sinPHI * sx + cosPHI * sy); + path.lineTo(p2.x, p2.y); + path.lineTo(p2.x + cosPHI * sx + sinPHI * sy, p2.y - sinPHI * sx + cosPHI * sy); + } + } + } + // TODO: handle other than just Node->Node cases + // TODO: draw color coded circle around unmatched nodes + } + + g2.draw(path); + } + + + @Override + public Icon getIcon() { + // TODO: change icon + return ImageProvider.get("layer", "gpx_small"); + } + + @Override + public String getToolTipText() { + return "Conflation tool tip text goes here"; + } + + @Override + public void mergeFrom(Layer layer) { + // we can't merge, so do nothing + } + + @Override + public boolean isMergable(Layer layer) { + return false; + } + + @Override + public void visitBoundingBox(BoundingXYVisitor v) { + //TODO: handle Way/Relation types + for (Conflict c : conflicts) { + OsmPrimitive my = c.getMy(); + OsmPrimitive their = c.getTheir(); + if (my != null && my instanceof Node) + v.visit((Node)my); + if (their != null && their instanceof Node) + v.visit((Node)their); + } + } + + @Override + public Object getInfoComponent() { + return getToolTipText(); + } + + @Override + public Action[] getMenuEntries() { + return new Action[]{ + LayerListDialog.getInstance().createShowHideLayerAction(), + LayerListDialog.getInstance().createDeleteLayerAction(), + SeparatorLayerAction.INSTANCE, + new RenameLayerAction(this.getAssociatedFile(), this), + SeparatorLayerAction.INSTANCE, + new LayerListPopup.InfoAction(this)}; + } + + public void activeLayerChange(Layer layer, Layer layer1) { + //TODO: possibly change arrow styling depending on active layer? + } + + public void layerAdded(Layer layer) { + // shouldn't have to do anything here + } + + public void layerRemoved(Layer layer) { + //TODO: if ref or non-ref layer removed, remove arrows + } + + /** + * replies the set of conflicts currently managed in this layer + * + * @return the set of conflicts currently managed in this layer + */ + public ConflictCollection getConflicts() { + return conflicts; + } +} Index: applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java =================================================================== --- applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java (revision 25942) +++ applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java (revision 25942) @@ -0,0 +1,68 @@ +// License: GPL. Copyright 2011 by Josh Doe and others +package org.openstreetmap.josm.plugins.conflation; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.util.List; +import javax.swing.AbstractAction; +import javax.swing.JComponent; +import javax.swing.JDialog; +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * + * @author Josh Doe + */ +public class ConflationOptionsDialog extends JDialog { + private boolean canceled = false; + private ConflationOptionsPanel panel; + + public ConflationOptionsDialog(Component parent, List layers) { + super(JOptionPane.getFrameForComponent(parent),tr("Conflation Options"), ModalityType.DOCUMENT_MODAL); + getContentPane().setLayout(new BorderLayout()); + panel = new ConflationOptionsPanel(this, layers); + getContentPane().add(panel, BorderLayout.CENTER); + + pack(); + + // make dialog respond to ESCAPE + getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE,0), "escape"); + getRootPane().getActionMap().put("escape", new CancelAction()); + + // make dialog respond to F1 + // TODO: set help context, whatever that means + //HelpUtil.setHelpContext(getRootPane(), help); + } + + public void setCanceled(boolean canceled) { + this.canceled = canceled; + } + + public boolean isCanceled() { + return canceled; + } + + class CancelAction extends AbstractAction { + public CancelAction() { + putValue(NAME, tr("Cancel")); + putValue(SHORT_DESCRIPTION, tr("Close the dialog, do not perform conflation")); + putValue(SMALL_ICON, ImageProvider.get("cancel")); + } + + public void actionPerformed(ActionEvent e) { + setCanceled(true); + setVisible(false); + } + } + + public ConflationOptionsPanel getPanel() { + return panel; + } +} Index: applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.form =================================================================== --- applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.form (revision 25942) +++ applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.form (revision 25942) @@ -0,0 +1,568 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java =================================================================== --- applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java (revision 25942) +++ applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java (revision 25942) @@ -0,0 +1,525 @@ +// License: GPL. Copyright 2011 by Josh Doe and others + +/* + * ConflationPanel.java + * + * Created on Apr 26, 2011, 10:47:18 PM + */ + +package org.openstreetmap.josm.plugins.conflation; + +import java.awt.Component; + +import java.util.List; +import javax.swing.DefaultListCellRenderer; +import javax.swing.Icon; +import javax.swing.JLabel; +import javax.swing.JList; +import org.openstreetmap.josm.actions.search.SearchAction; +import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; + +/** + * + * @author Josh + */ +public class ConflationOptionsPanel extends javax.swing.JPanel { + ConflationOptionsDialog dlg = null; + + /** Creates new form ConflationPanel */ + public ConflationOptionsPanel(ConflationOptionsDialog dlg, List layers) { + initComponents(); + + this.dlg = dlg; + + // set layer names to comboboxes + if (layers != null && layers.size() > 0) { + refLayerComboBox.setModel(new javax.swing.DefaultComboBoxModel(layers.toArray())); + refLayerComboBox.setRenderer(new LayerListCellRenderer()); + nonRefLayerComboBox.setModel(new javax.swing.DefaultComboBoxModel(layers.toArray())); + nonRefLayerComboBox.setRenderer(new LayerListCellRenderer()); + } + + } + + /** This method is called from within the constructor to + * initialize the form. + * WARNING: Do NOT modify this code. The content of this method is + * always regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + refSearchModeButtonGroup = new javax.swing.ButtonGroup(); + nonRefSearchModeButtonGroup = new javax.swing.ButtonGroup(); + resultsTabPanel = new javax.swing.JTabbedPane(); + objectTabPanel = new javax.swing.JPanel(); + refSetPanel = new javax.swing.JPanel(); + jPanel4 = new javax.swing.JPanel(); + jLabel1 = new javax.swing.JLabel(); + refLayerComboBox = new javax.swing.JComboBox(); + jLabel2 = new javax.swing.JLabel(); + refFilterTextField = new javax.swing.JTextField(); + jPanel5 = new javax.swing.JPanel(); + refReplaceRadio = new javax.swing.JRadioButton(); + refAddRadio = new javax.swing.JRadioButton(); + refRemoveRadio = new javax.swing.JRadioButton(); + refInSelectionRadio = new javax.swing.JRadioButton(); + refCaseSensitiveCheckBox = new javax.swing.JCheckBox(); + refAllObjectsCheckBox = new javax.swing.JCheckBox(); + refRegExCheckBox = new javax.swing.JCheckBox(); + nonRefSetPanel = new javax.swing.JPanel(); + jPanel7 = new javax.swing.JPanel(); + jLabel3 = new javax.swing.JLabel(); + nonRefLayerComboBox = new javax.swing.JComboBox(); + jLabel4 = new javax.swing.JLabel(); + nonRefFilterTextField = new javax.swing.JTextField(); + jPanel8 = new javax.swing.JPanel(); + nonRefReplaceRadio = new javax.swing.JRadioButton(); + nonRefAddRadio = new javax.swing.JRadioButton(); + nonRefRemoveRadio = new javax.swing.JRadioButton(); + nonRefInSelectionRadio = new javax.swing.JRadioButton(); + nonRefCaseSensitiveCheckBox = new javax.swing.JCheckBox(); + nonRefAllObjectsCheckBox = new javax.swing.JCheckBox(); + nonRefRegExCheckBox = new javax.swing.JCheckBox(); + objectTabCancelButton = new javax.swing.JButton(); + objectTabNextButton = new javax.swing.JButton(); + criteriaTabPanel = new javax.swing.JPanel(); + criteriaTabConflateButton = new javax.swing.JButton(); + jPanel1 = new javax.swing.JPanel(); + + setLayout(new javax.swing.BoxLayout(this, javax.swing.BoxLayout.LINE_AXIS)); + + refSetPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Reference Set")); + + jLabel1.setText("Layer"); + + refLayerComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + + jLabel2.setText("Filter"); + + jPanel5.setBorder(javax.swing.BorderFactory.createEtchedBorder()); + + refSearchModeButtonGroup.add(refReplaceRadio); + refReplaceRadio.setSelected(true); + refReplaceRadio.setText("Replace selection"); + + refSearchModeButtonGroup.add(refAddRadio); + refAddRadio.setText("Add to selection"); + refAddRadio.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + refAddRadioActionPerformed(evt); + } + }); + + refSearchModeButtonGroup.add(refRemoveRadio); + refRemoveRadio.setText("Remove from selection"); + + refSearchModeButtonGroup.add(refInSelectionRadio); + refInSelectionRadio.setText("Find in selection"); + + javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(jPanel5); + jPanel5.setLayout(jPanel5Layout); + jPanel5Layout.setHorizontalGroup( + jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel5Layout.createSequentialGroup() + .addContainerGap() + .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(refReplaceRadio) + .addComponent(refAddRadio) + .addComponent(refRemoveRadio) + .addComponent(refInSelectionRadio)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + ); + jPanel5Layout.setVerticalGroup( + jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel5Layout.createSequentialGroup() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(refReplaceRadio) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(refAddRadio) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(refRemoveRadio) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(refInSelectionRadio)) + ); + + refCaseSensitiveCheckBox.setText("Case sensitive"); + + refAllObjectsCheckBox.setText("All objects"); + + refRegExCheckBox.setText("Regular expression"); + + javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4); + jPanel4.setLayout(jPanel4Layout); + jPanel4Layout.setHorizontalGroup( + jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel4Layout.createSequentialGroup() + .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel4Layout.createSequentialGroup() + .addContainerGap() + .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel1) + .addComponent(jLabel2)) + .addGap(18, 18, 18) + .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(refLayerComboBox, 0, 246, Short.MAX_VALUE) + .addComponent(refFilterTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 246, Short.MAX_VALUE))) + .addGroup(jPanel4Layout.createSequentialGroup() + .addComponent(jPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(refCaseSensitiveCheckBox) + .addComponent(refAllObjectsCheckBox) + .addComponent(refRegExCheckBox)))) + .addContainerGap()) + ); + jPanel4Layout.setVerticalGroup( + jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel4Layout.createSequentialGroup() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel1) + .addComponent(refLayerComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel2) + .addComponent(refFilterTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(jPanel4Layout.createSequentialGroup() + .addComponent(refCaseSensitiveCheckBox) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(refAllObjectsCheckBox) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(refRegExCheckBox)))) + ); + + javax.swing.GroupLayout refSetPanelLayout = new javax.swing.GroupLayout(refSetPanel); + refSetPanel.setLayout(refSetPanelLayout); + refSetPanelLayout.setHorizontalGroup( + refSetPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jPanel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + ); + refSetPanelLayout.setVerticalGroup( + refSetPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jPanel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + ); + + nonRefSetPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Non-Reference Set")); + + jLabel3.setText("Layer"); + + nonRefLayerComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + + jLabel4.setText("Filter"); + + jPanel8.setBorder(javax.swing.BorderFactory.createEtchedBorder()); + + nonRefSearchModeButtonGroup.add(nonRefReplaceRadio); + nonRefReplaceRadio.setSelected(true); + nonRefReplaceRadio.setText("Replace selection"); + + nonRefSearchModeButtonGroup.add(nonRefAddRadio); + nonRefAddRadio.setText("Add to selection"); + nonRefAddRadio.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + nonRefAddRadioActionPerformed(evt); + } + }); + + nonRefSearchModeButtonGroup.add(nonRefRemoveRadio); + nonRefRemoveRadio.setText("Remove from selection"); + + nonRefSearchModeButtonGroup.add(nonRefInSelectionRadio); + nonRefInSelectionRadio.setText("Find in selection"); + + javax.swing.GroupLayout jPanel8Layout = new javax.swing.GroupLayout(jPanel8); + jPanel8.setLayout(jPanel8Layout); + jPanel8Layout.setHorizontalGroup( + jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel8Layout.createSequentialGroup() + .addContainerGap() + .addGroup(jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(nonRefReplaceRadio) + .addComponent(nonRefAddRadio) + .addComponent(nonRefRemoveRadio) + .addComponent(nonRefInSelectionRadio)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + ); + jPanel8Layout.setVerticalGroup( + jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel8Layout.createSequentialGroup() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(nonRefReplaceRadio) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(nonRefAddRadio) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(nonRefRemoveRadio) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(nonRefInSelectionRadio)) + ); + + nonRefCaseSensitiveCheckBox.setText("Case sensitive"); + + nonRefAllObjectsCheckBox.setText("All objects"); + + nonRefRegExCheckBox.setText("Regular expression"); + + javax.swing.GroupLayout jPanel7Layout = new javax.swing.GroupLayout(jPanel7); + jPanel7.setLayout(jPanel7Layout); + jPanel7Layout.setHorizontalGroup( + jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel7Layout.createSequentialGroup() + .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel7Layout.createSequentialGroup() + .addContainerGap() + .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel3) + .addComponent(jLabel4)) + .addGap(18, 18, 18) + .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(nonRefLayerComboBox, 0, 246, Short.MAX_VALUE) + .addComponent(nonRefFilterTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 246, Short.MAX_VALUE))) + .addGroup(jPanel7Layout.createSequentialGroup() + .addComponent(jPanel8, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(nonRefCaseSensitiveCheckBox) + .addComponent(nonRefAllObjectsCheckBox) + .addComponent(nonRefRegExCheckBox)))) + .addContainerGap()) + ); + jPanel7Layout.setVerticalGroup( + jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel7Layout.createSequentialGroup() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel3) + .addComponent(nonRefLayerComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel4) + .addComponent(nonRefFilterTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jPanel8, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(jPanel7Layout.createSequentialGroup() + .addComponent(nonRefCaseSensitiveCheckBox) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(nonRefAllObjectsCheckBox) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(nonRefRegExCheckBox)))) + ); + + javax.swing.GroupLayout nonRefSetPanelLayout = new javax.swing.GroupLayout(nonRefSetPanel); + nonRefSetPanel.setLayout(nonRefSetPanelLayout); + nonRefSetPanelLayout.setHorizontalGroup( + nonRefSetPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jPanel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + ); + nonRefSetPanelLayout.setVerticalGroup( + nonRefSetPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jPanel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + ); + + objectTabCancelButton.setText("Cancel"); + objectTabCancelButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + objectTabCancelButtonActionPerformed(evt); + } + }); + + objectTabNextButton.setMnemonic('N'); + objectTabNextButton.setText("Next"); + objectTabNextButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + objectTabNextButtonActionPerformed(evt); + } + }); + + javax.swing.GroupLayout objectTabPanelLayout = new javax.swing.GroupLayout(objectTabPanel); + objectTabPanel.setLayout(objectTabPanelLayout); + objectTabPanelLayout.setHorizontalGroup( + objectTabPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(objectTabPanelLayout.createSequentialGroup() + .addGroup(objectTabPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(nonRefSetPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(refSetPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, objectTabPanelLayout.createSequentialGroup() + .addContainerGap() + .addComponent(objectTabCancelButton) + .addGap(81, 81, 81) + .addComponent(objectTabNextButton))) + .addContainerGap()) + ); + objectTabPanelLayout.setVerticalGroup( + objectTabPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(objectTabPanelLayout.createSequentialGroup() + .addComponent(refSetPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(nonRefSetPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(objectTabPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(objectTabNextButton) + .addComponent(objectTabCancelButton)) + .addGap(55, 55, 55)) + ); + + resultsTabPanel.addTab("Object selection", objectTabPanel); + + criteriaTabConflateButton.setMnemonic('f'); + criteriaTabConflateButton.setText("Conflate"); + criteriaTabConflateButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + criteriaTabConflateButtonActionPerformed(evt); + } + }); + + javax.swing.GroupLayout criteriaTabPanelLayout = new javax.swing.GroupLayout(criteriaTabPanel); + criteriaTabPanel.setLayout(criteriaTabPanelLayout); + criteriaTabPanelLayout.setHorizontalGroup( + criteriaTabPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, criteriaTabPanelLayout.createSequentialGroup() + .addContainerGap(254, Short.MAX_VALUE) + .addComponent(criteriaTabConflateButton) + .addContainerGap()) + ); + criteriaTabPanelLayout.setVerticalGroup( + criteriaTabPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, criteriaTabPanelLayout.createSequentialGroup() + .addContainerGap(404, Short.MAX_VALUE) + .addComponent(criteriaTabConflateButton) + .addContainerGap()) + ); + + resultsTabPanel.addTab("Matching criteria", criteriaTabPanel); + + javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); + jPanel1.setLayout(jPanel1Layout); + jPanel1Layout.setHorizontalGroup( + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 337, Short.MAX_VALUE) + ); + jPanel1Layout.setVerticalGroup( + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 438, Short.MAX_VALUE) + ); + + resultsTabPanel.addTab("Results", jPanel1); + + add(resultsTabPanel); + }// //GEN-END:initComponents + + private void refAddRadioActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_refAddRadioActionPerformed + // TODO add your handling code here: + }//GEN-LAST:event_refAddRadioActionPerformed + + private void nonRefAddRadioActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_nonRefAddRadioActionPerformed + // TODO add your handling code here: + }//GEN-LAST:event_nonRefAddRadioActionPerformed + + private void objectTabCancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_objectTabCancelButtonActionPerformed + dlg.setCanceled(true); + dlg.setVisible(false); + }//GEN-LAST:event_objectTabCancelButtonActionPerformed + + private void criteriaTabConflateButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_criteriaTabConflateButtonActionPerformed + dlg.setVisible(false); + }//GEN-LAST:event_criteriaTabConflateButtonActionPerformed + + private void objectTabNextButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_objectTabNextButtonActionPerformed + if (criteriaTabPanel != null) + resultsTabPanel.setSelectedComponent(criteriaTabPanel); + }//GEN-LAST:event_objectTabNextButtonActionPerformed + + static public class LayerListCellRenderer extends DefaultListCellRenderer { + @Override + public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, + boolean cellHasFocus) { + Layer layer = (Layer) value; + JLabel label = (JLabel) super.getListCellRendererComponent(list, layer.getName(), index, isSelected, + cellHasFocus); + Icon icon = layer.getIcon(); + label.setIcon(icon); + label.setToolTipText(layer.getToolTipText()); + return label; + } + } + + public OsmDataLayer getRefLayer() { + return (OsmDataLayer) refLayerComboBox.getModel().getSelectedItem(); + } + + public OsmDataLayer getNonRefLayer() { + return (OsmDataLayer) nonRefLayerComboBox.getModel().getSelectedItem(); + } + + public SearchSetting getRefSearchSetting() { + SearchSetting s = new SearchSetting(); + s.text = refFilterTextField.getText(); + s.allElements = refAllObjectsCheckBox.isSelected(); + s.caseSensitive = refCaseSensitiveCheckBox.isSelected(); + s.regexSearch = refRegExCheckBox.isSelected(); + s.mode = refReplaceRadio.isSelected() ? SearchAction.SearchMode.replace + : (refAddRadio.isSelected() ? SearchAction.SearchMode.add + : (refRemoveRadio.isSelected() ? SearchAction.SearchMode.remove : SearchAction.SearchMode.in_selection)); + return s; + } + + public SearchSetting getNonRefSearchSetting() { + SearchSetting s = new SearchSetting(); + s.text = nonRefFilterTextField.getText(); + s.allElements = nonRefAllObjectsCheckBox.isSelected(); + s.caseSensitive = nonRefCaseSensitiveCheckBox.isSelected(); + s.regexSearch = nonRefRegExCheckBox.isSelected(); + s.mode = nonRefReplaceRadio.isSelected() ? SearchAction.SearchMode.replace + : (nonRefAddRadio.isSelected() ? SearchAction.SearchMode.add + : (nonRefRemoveRadio.isSelected() ? SearchAction.SearchMode.remove : SearchAction.SearchMode.in_selection)); + return s; + } + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JButton criteriaTabConflateButton; + private javax.swing.JPanel criteriaTabPanel; + private javax.swing.JLabel jLabel1; + private javax.swing.JLabel jLabel2; + private javax.swing.JLabel jLabel3; + private javax.swing.JLabel jLabel4; + private javax.swing.JPanel jPanel1; + private javax.swing.JPanel jPanel4; + private javax.swing.JPanel jPanel5; + private javax.swing.JPanel jPanel7; + private javax.swing.JPanel jPanel8; + private javax.swing.JRadioButton nonRefAddRadio; + private javax.swing.JCheckBox nonRefAllObjectsCheckBox; + private javax.swing.JCheckBox nonRefCaseSensitiveCheckBox; + private javax.swing.JTextField nonRefFilterTextField; + private javax.swing.JRadioButton nonRefInSelectionRadio; + private javax.swing.JComboBox nonRefLayerComboBox; + private javax.swing.JCheckBox nonRefRegExCheckBox; + private javax.swing.JRadioButton nonRefRemoveRadio; + private javax.swing.JRadioButton nonRefReplaceRadio; + private javax.swing.ButtonGroup nonRefSearchModeButtonGroup; + private javax.swing.JPanel nonRefSetPanel; + private javax.swing.JButton objectTabCancelButton; + private javax.swing.JButton objectTabNextButton; + private javax.swing.JPanel objectTabPanel; + private javax.swing.JRadioButton refAddRadio; + private javax.swing.JCheckBox refAllObjectsCheckBox; + private javax.swing.JCheckBox refCaseSensitiveCheckBox; + private javax.swing.JTextField refFilterTextField; + private javax.swing.JRadioButton refInSelectionRadio; + private javax.swing.JComboBox refLayerComboBox; + private javax.swing.JCheckBox refRegExCheckBox; + private javax.swing.JRadioButton refRemoveRadio; + private javax.swing.JRadioButton refReplaceRadio; + private javax.swing.ButtonGroup refSearchModeButtonGroup; + private javax.swing.JPanel refSetPanel; + private javax.swing.JTabbedPane resultsTabPanel; + // End of variables declaration//GEN-END:variables + +} Index: applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationPlugin.java =================================================================== --- applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationPlugin.java (revision 25942) +++ applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationPlugin.java (revision 25942) @@ -0,0 +1,51 @@ +// License: GPL. Copyright 2011 by Josh Doe and others +package org.openstreetmap.josm.plugins.conflation; + +import static org.openstreetmap.josm.gui.help.HelpUtil.ht; +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.KeyEvent; +import java.io.IOException; +import java.util.logging.FileHandler; +import java.util.logging.Logger; +import javax.swing.JMenu; +import javax.swing.JOptionPane; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.MainMenu; +import org.openstreetmap.josm.plugins.Plugin; +import org.openstreetmap.josm.plugins.PluginInformation; + + +public class ConflationPlugin extends Plugin { + + ConflationAction action = null; + Logger logger; + + /** + * constructor + */ + public ConflationPlugin(PluginInformation info) { + super(info); + + try { + logger = Logger.getLogger(ConflationPlugin.class.getName()); + FileHandler fh = new FileHandler("C:/temp/log.txt"); + logger.addHandler(fh); + } + catch (IOException e) { + JOptionPane.showMessageDialog(Main.parent, "Failed to create log file", + "Failed to create logger", JOptionPane.ERROR_MESSAGE); + } + + try { + JMenu conflationMenu = Main.main.menu.addMenu(tr("Conflation"), KeyEvent.VK_R, + Main.main.menu.defaultMenuPos, ht("/Plugin/Conflation")); + MainMenu.add(conflationMenu, new ConflationAction()); + + + } catch (Exception e) { + JOptionPane.showMessageDialog(Main.parent, e.toString(), + "Error adding conflation menu item", JOptionPane.ERROR_MESSAGE); + } + } +} Index: applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationResultsDialog.java =================================================================== --- applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationResultsDialog.java (revision 25942) +++ applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationResultsDialog.java (revision 25942) @@ -0,0 +1,20 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.openstreetmap.josm.plugins.conflation; + +import javax.swing.JDialog; + +/** + * + * @author Josh Doe + */ +public class ConflationResultsDialog extends JDialog { + + public ConflationResultsDialog() { + } + + +} Index: applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationResultsPanel.form =================================================================== --- applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationResultsPanel.form (revision 25942) +++ applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationResultsPanel.form (revision 25942) @@ -0,0 +1,28 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Index: applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationResultsPanel.java =================================================================== --- applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationResultsPanel.java (revision 25942) +++ applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationResultsPanel.java (revision 25942) @@ -0,0 +1,50 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +/* + * ConflationResultsPanel.java + * + * Created on Apr 28, 2011, 3:30:59 PM + */ + +package org.openstreetmap.josm.plugins.conflation; + +/** + * + * @author Josh + */ +public class ConflationResultsPanel extends javax.swing.JPanel { + + /** Creates new form ConflationResultsPanel */ + public ConflationResultsPanel() { + initComponents(); + } + + /** This method is called from within the constructor to + * initialize the form. + * WARNING: Do NOT modify this code. The content of this method is + * always regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); + this.setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 726, Short.MAX_VALUE) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 552, Short.MAX_VALUE) + ); + }// //GEN-END:initComponents + + + // Variables declaration - do not modify//GEN-BEGIN:variables + // End of variables declaration//GEN-END:variables + +} Index: applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/HungarianAlgorithm.java =================================================================== --- applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/HungarianAlgorithm.java (revision 25942) +++ applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/HungarianAlgorithm.java (revision 25942) @@ -0,0 +1,605 @@ +/* + * Created on Apr 25, 2005 + * + * Munkres-Kuhn (Hungarian) Algorithm Clean Version: 0.11 + * + * Konstantinos A. Nedas + * Department of Spatial Information Science & Engineering + * University of Maine, Orono, ME 04469-5711, USA + * kostas@spatial.maine.edu + * http://www.spatial.maine.edu/~kostas + * + * This Java class implements the Hungarian algorithm [a.k.a Munkres' algorithm, + * a.k.a. Kuhn algorithm, a.k.a. Assignment problem, a.k.a. Marriage problem, + * a.k.a. Maximum Weighted Maximum Cardinality Bipartite Matching]. + * + * [It can be used as a method call from within any main (or other function).] + * It takes 2 arguments: + * a. A 2-D array (could be rectangular or square). + * b. A string ("min" or "max") specifying whether you want the min or max assignment. + * [It returns an assignment matrix[array.length][2] that contains the row and col of + * the elements (in the original inputted array) that make up the optimum assignment.] + * + * [This version contains only scarce comments. If you want to understand the + * inner workings of the algorithm, get the tutorial version of the algorithm + * from the same website you got this one (http://www.spatial.maine.edu/~kostas/dev/soft/munkres.htm)] + * + * Any comments, corrections, or additions would be much appreciated. + * Credit due to professor Bob Pilgrim for providing an online copy of the + * pseudocode for this algorithm (http://216.249.163.93/bob.pilgrim/445/munkres.html) + * + * Feel free to redistribute this source code, as long as this header--with + * the exception of sections in brackets--remains as part of the file. + * + * Requirements: JDK 1.5.0_01 or better. + * [Created in Eclipse 3.1M6 (www.eclipse.org).] + * + */ + +package org.openstreetmap.josm.plugins.conflation; + +import static java.lang.Math.*; +import java.util.*; + +public class HungarianAlgorithm { + + //********************************// + //METHODS FOR CONSOLE INPUT-OUTPUT// + //********************************// + + public static int readInput(String prompt) //Reads input,returns double. + { + Scanner in = new Scanner(System.in); + System.out.print(prompt); + int input = in.nextInt(); + return input; + } + public static void printTime(double time) //Formats time output. + { + String timeElapsed = ""; + int days = (int)floor(time)/(24 * 3600); + int hours = (int)floor(time%(24*3600))/(3600); + int minutes = (int)floor((time%3600)/60); + int seconds = (int)round(time%60); + + if (days > 0) + timeElapsed = Integer.toString(days) + "d:"; + if (hours > 0) + timeElapsed = timeElapsed + Integer.toString(hours) + "h:"; + if (minutes > 0) + timeElapsed = timeElapsed + Integer.toString(minutes) + "m:"; + + timeElapsed = timeElapsed + Integer.toString(seconds) + "s"; + System.out.print("\nTotal time required: " + timeElapsed + "\n\n"); + } + + //*******************************************// + //METHODS THAT PERFORM ARRAY-PROCESSING TASKS// + //*******************************************// + + public static void generateRandomArray //Generates random 2-D array. + (double[][] array, String randomMethod) + { + Random generator = new Random(); + for (int i=0; i 0.5) {array[i][j] = 0.5;} //eliminate outliers. + if (array[i][j] < -0.5) {array[i][j] = -0.5;} //eliminate outliers. + array[i][j] = array[i][j] + 0.5; //make elements positive. + } + } + } + } + public static double findLargest //Finds the largest element in a positive array. + (double[][] array) + //works for arrays where all values are >= 0. + { + double largest = 0; + for (int i=0; i largest) + { + largest = array[i][j]; + } + } + } + + return largest; + } + public static double[][] transpose //Transposes a double[][] array. + (double[][] array) + { + double[][] transposedArray = new double[array[0].length][array.length]; + for (int i=0; icost[i][j]) + { + minval=cost[i][j]; + } + } + for (int j=0; j=mask.length) //Should be cost.length but ok, because mask has same dimensions. + { + step=7; + } + else + { + step=4; + } + + return step; + } + public static int hg_step4(int step, double[][] cost, int[][] mask, int[] rowCover, int[] colCover, int[] zero_RC) + { + //What STEP 4 does: + //Find an uncovered zero in cost and prime it (if none go to step 6). Check for star in same row: + //if yes, cover the row and uncover the star's column. Repeat until no uncovered zeros are left + //and go to step 6. If not, save location of primed zero and go to step 5. + + int[] row_col = new int[2]; //Holds row and col of uncovered zero. + boolean done = false; + while (done == false) + { + row_col = findUncoveredZero(row_col, cost, rowCover, colCover); + if (row_col[0] == -1) + { + done = true; + step = 6; + } + else + { + mask[row_col[0]][row_col[1]] = 2; //Prime the found uncovered zero. + + boolean starInRow = false; + for (int j=0; j= cost.length) + { + done = true; + } + }//end outer while + + return row_col; + } + public static int hg_step5(int step, int[][] mask, int[] rowCover, int[] colCover, int[] zero_RC) + { + //What STEP 5 does: + //Construct series of alternating primes and stars. Start with prime from step 4. + //Take star in the same column. Next take prime in the same row as the star. Finish + //at a prime with no star in its column. Unstar all stars and star the primes of the + //series. Erasy any other primes. Reset covers. Go to step 3. + + int count = 0; //Counts rows of the path matrix. + int[][] path = new int[(mask[0].length*mask.length)][2]; //Path matrix (stores row and col). + path[count][0] = zero_RC[0]; //Row of last prime. + path[count][1] = zero_RC[1]; //Column of last prime. + + boolean done = false; + while (done == false) + { + int r = findStarInCol(mask, path[count][1]); + if (r>=0) + { + count = count+1; + path[count][0] = r; //Row of starred zero. + path[count][1] = path[count-1][1]; //Column of starred zero. + } + else + { + done = true; + } + + if (done == false) + { + int c = findPrimeInRow(mask, path[count][0]); + count = count+1; + path[count][0] = path [count-1][0]; //Row of primed zero. + path[count][1] = c; //Col of primed zero. + } + }//end while + + convertPath(mask, path, count); + clearCovers(rowCover, colCover); + erasePrimes(mask); + + step = 3; + return step; + + } + public static int findStarInCol //Aux 1 for hg_step5. + (int[][] mask, int col) + { + int r=-1; //Again this is a check value. + for (int i=0; i cost[i][j])) + { + minval = cost[i][j]; + } + } + } + + return minval; + } + + //***********// + //MAIN METHOD// + //***********// + + public static void main(String[] args) + { + //Below enter "max" or "min" to find maximum sum or minimum sum assignment. + String sumType = "max"; + + //Hard-coded example. + //double[][] array = + //{ + // {1, 2, 3}, + // {2, 4, 6}, + // {3, 6, 9} + //}; + + // BELOW AND COMMENT BLOCK ABOVE TO USE A RANDOMLY GENERATED MATRIX + int numOfRows = readInput("How many rows for the matrix? "); + int numOfCols = readInput("How many columns for the matrix? "); + double[][] array = new double[numOfRows][numOfCols]; + generateRandomArray(array, "random"); //All elements within [0,1]. + // + + if (array.length > array[0].length) + { + System.out.println("Array transposed (because rows>columns).\n"); //Cols must be >= Rows. + array = transpose(array); + } + + // TO AVOID PRINTING THE MATRIX FOR WHICH THE ASSIGNMENT IS CALCULATED + System.out.println("\n(Printing out only 2 decimals)\n"); + System.out.println("The matrix is:"); + for (int i=0; i*/ + + double startTime = System.nanoTime(); + int[][] assignment = new int[array.length][2]; + assignment = hgAlgorithm(array, sumType); //Call Hungarian algorithm. + double endTime = System.nanoTime(); + + System.out.println("The winning assignment (" + sumType + " sum) is:\n"); + double sum = 0; + for (int i=0; i to avoid printing the elements that make up the assignment + System.out.printf("array(%d,%d) = %.2f\n", (assignment[i][0]+1), (assignment[i][1]+1), + array[assignment[i][0]][assignment[i][1]]); + sum = sum + array[assignment[i][0]][assignment[i][1]]; + // + } + + System.out.printf("\nThe %s is: %.2f\n", sumType, sum); + printTime((endTime - startTime)/1000000000.0); + + } +}