Index: /applications/editors/josm/plugins/tracer2/.classpath =================================================================== --- /applications/editors/josm/plugins/tracer2/.classpath (revision 30047) +++ /applications/editors/josm/plugins/tracer2/.classpath (revision 30047) @@ -0,0 +1,12 @@ + + + + + + Index: /applications/editors/josm/plugins/tracer2/GPL-v2.0.txt =================================================================== --- /applications/editors/josm/plugins/tracer2/GPL-v2.0.txt (revision 30047) +++ /applications/editors/josm/plugins/tracer2/GPL-v2.0.txt (revision 30047) @@ -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/tracer2/GPL-v3.0.txt =================================================================== --- /applications/editors/josm/plugins/tracer2/GPL-v3.0.txt (revision 30047) +++ /applications/editors/josm/plugins/tracer2/GPL-v3.0.txt (revision 30047) @@ -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/tracer2/LanguageGen/GetText.bat =================================================================== --- /applications/editors/josm/plugins/tracer2/LanguageGen/GetText.bat (revision 30047) +++ /applications/editors/josm/plugins/tracer2/LanguageGen/GetText.bat (revision 30047) @@ -0,0 +1,4 @@ +"C:\Program Files (x86)\GnuWin32\bin\xgettext" --files-from=files.txt --from-code=UTF-8 -k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3 +pause +"C:\Program Files (x86)\GnuWin32\bin\msgmerge" "messages_old.po" "messages.po" +pause Index: /applications/editors/josm/plugins/tracer2/LanguageGen/files.txt =================================================================== --- /applications/editors/josm/plugins/tracer2/LanguageGen/files.txt (revision 30047) +++ /applications/editors/josm/plugins/tracer2/LanguageGen/files.txt (revision 30047) @@ -0,0 +1,17 @@ +..\src\org\openstreetmap\josm\plugins\tracer2\ConnectWays.java +..\src\org\openstreetmap\josm\plugins\tracer2\StraightLine.java +..\src\org\openstreetmap\josm\plugins\tracer2\TagValues.java +..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java +..\src\org\openstreetmap\josm\plugins\tracer2\TracerDebug.java +..\src\org\openstreetmap\josm\plugins\tracer2\TracerException.java +..\src\org\openstreetmap\josm\plugins\tracer2\TracerGeometry.java +..\src\org\openstreetmap\josm\plugins\tracer2\TracerPlugin.java +..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParam.java +..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java +..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamList.java +..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java +..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPreference.java +..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamSelectDialog.java +..\src\org\openstreetmap\josm\plugins\tracer2\server\GetTrace.java +..\src\org\openstreetmap\josm\plugins\tracer2\server\GetVersion.java +..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java Index: /applications/editors/josm/plugins/tracer2/LanguageGen/messages.po =================================================================== --- /applications/editors/josm/plugins/tracer2/LanguageGen/messages.po (revision 30047) +++ /applications/editors/josm/plugins/tracer2/LanguageGen/messages.po (revision 30047) @@ -0,0 +1,208 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-11-11 18:11+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\ConnectWays.java:204 +msgid "Merge objects nodes" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:77 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:260 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:130 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:142 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPreference.java:38 +msgid "Tracer2" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:77 +msgid "Tracer2." +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:77 +#, java-format +msgid "Tool: {0}" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:118 +#, java-format +msgid "Change tag {0} to {1}" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:171 +msgid "Tracing" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:225 +#, java-format +msgid "" +"The Tracer2Server version isn''t compatible with this plugin. Please " +"download version {0} from" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:226 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:248 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:56 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:59 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:73 +msgid "Error" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:230 +#, java-format +msgid "" +"New version of Tracer2Server is avalibel. For best results please upgrade to " +"version {0}." +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:230 +msgid "Information" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:248 +msgid "No set of parameter is activ!" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:260 +msgid "Select parameter" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:333 +#, java-format +msgid "Tracer2 add a Way with {0} points" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:335 +#, java-format +msgid "Tracer2 modified Way to {0} points" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerException.java:31 +msgid "An unknown error has occurred" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParam.java:210 +msgid "Tracer2 error" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:130 +msgid "Parameter for server request" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:131 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:176 +msgid "OK" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:131 +msgid "Cancel" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:149 +msgid "Name:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:150 +msgid "Description:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:154 +msgid "URL:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:156 +msgid "Tile size:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:157 +msgid "Resolution:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:160 +msgid "Mode:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:161 +msgid "Threshold:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:163 +msgid "Points per circle:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:165 +msgid "Tag:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:166 +msgid "Preferred values:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:75 +msgid "Edit" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:88 +msgid "Delete" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:93 +#, java-format +msgid "Delete parameter \"{0}\"?" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:94 +msgid "Are you sure?" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:113 +msgid "Add new" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:130 +msgid "Add predefined" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:142 +msgid "Select predefined parameter" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPreference.java:38 +msgid "Preferences" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPreference.java:38 +msgid "Modify list of parameter for server request." +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamSelectDialog.java:87 +msgid "Parameter:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:55 +msgid "" +"Tracer2Server isn''t running. Pleas start the Server.\n" +"If you don''t have the Server please download it at\n" +"http://sourceforge.net/projects/tracer2server/." +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:59 +msgid "Tracer2Server has nothing found." +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:73 +msgid "Tracer2Server has an Error detected." +msgstr "" Index: /applications/editors/josm/plugins/tracer2/LanguageGen/messages_old.po =================================================================== --- /applications/editors/josm/plugins/tracer2/LanguageGen/messages_old.po (revision 30047) +++ /applications/editors/josm/plugins/tracer2/LanguageGen/messages_old.po (revision 30047) @@ -0,0 +1,208 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-11-11 18:11+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\ConnectWays.java:204 +msgid "Merge objects nodes" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:77 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:260 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:130 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:142 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPreference.java:38 +msgid "Tracer2" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:77 +msgid "Tracer2." +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:77 +#, java-format +msgid "Tool: {0}" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:118 +#, java-format +msgid "Change tag {0} to {1}" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:171 +msgid "Tracing" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:225 +#, java-format +msgid "" +"The Tracer2Server version isn''t compatible with this plugin. Please " +"download version {0} from" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:226 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:248 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:56 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:59 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:73 +msgid "Error" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:230 +#, java-format +msgid "" +"New version of Tracer2Server is avalibel. For best results please upgrade to " +"version {0}." +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:230 +msgid "Information" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:248 +msgid "No set of parameter is activ!" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:260 +msgid "Select parameter" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:333 +#, java-format +msgid "Tracer2 add a Way with {0} points" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerAction.java:335 +#, java-format +msgid "Tracer2 modified Way to {0} points" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\TracerException.java:31 +msgid "An unknown error has occurred" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParam.java:210 +msgid "Tracer2 error" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:130 +msgid "Parameter for server request" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:131 +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:176 +msgid "OK" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:131 +msgid "Cancel" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:149 +msgid "Name:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:150 +msgid "Description:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:154 +msgid "URL:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:156 +msgid "Tile size:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:157 +msgid "Resolution:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:160 +msgid "Mode:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:161 +msgid "Threshold:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:163 +msgid "Points per circle:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:165 +msgid "Tag:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamDialog.java:166 +msgid "Preferred values:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:75 +msgid "Edit" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:88 +msgid "Delete" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:93 +#, java-format +msgid "Delete parameter \"{0}\"?" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:94 +msgid "Are you sure?" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:113 +msgid "Add new" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:130 +msgid "Add predefined" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPanel.java:142 +msgid "Select predefined parameter" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPreference.java:38 +msgid "Preferences" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamPreference.java:38 +msgid "Modify list of parameter for server request." +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\preferences\ServerParamSelectDialog.java:87 +msgid "Parameter:" +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:55 +msgid "" +"Tracer2Server isn''t running. Pleas start the Server.\n" +"If you don''t have the Server please download it at\n" +"http://sourceforge.net/projects/tracer2server/." +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:59 +msgid "Tracer2Server has nothing found." +msgstr "" + +#: ..\src\org\openstreetmap\josm\plugins\tracer2\server\Request.java:73 +msgid "Tracer2Server has an Error detected." +msgstr "" Index: /applications/editors/josm/plugins/tracer2/README =================================================================== --- /applications/editors/josm/plugins/tracer2/README (revision 30047) +++ /applications/editors/josm/plugins/tracer2/README (revision 30047) @@ -0,0 +1,16 @@ +Tracer2 plugin +============== + +Traces buildings and other shapes from a map. +The plugin requires the Tracer2Server. +It can be downloaded at http://sourceforge.net/projects/tracer2server. + +Author: + Dirk Bruenig + +License: + GPL-v2.0 or later. + +Acknowledgements: + This plugin based on the plugin "Tracer" by Jan Bilak and Petr Dlouhý. + Includes parts from the plugin "ext_tools" by Upliner. Index: /applications/editors/josm/plugins/tracer2/build.xml =================================================================== --- /applications/editors/josm/plugins/tracer2/build.xml (revision 30047) +++ /applications/editors/josm/plugins/tracer2/build.xml (revision 30047) @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/tracer2/nbproject/project.xml =================================================================== --- /applications/editors/josm/plugins/tracer2/nbproject/project.xml (revision 30047) +++ /applications/editors/josm/plugins/tracer2/nbproject/project.xml (revision 30047) @@ -0,0 +1,66 @@ + + + org.netbeans.modules.ant.freeform + + + Tracer2 + + + + Tracer2 + + + + + java + src + UTF-8 + + + + . + UTF-8 + + + + + compile + + + clean + + + runjosm + + + clean + compile + + + + + + + src + + + build.xml + + + + + + + + + + + + + src + ../../core/src + 1.6 + + + + Index: /applications/editors/josm/plugins/tracer2/resources/serverParam.cfg =================================================================== --- /applications/editors/josm/plugins/tracer2/resources/serverParam.cfg (revision 30047) +++ /applications/editors/josm/plugins/tracer2/resources/serverParam.cfg (revision 30047) @@ -0,0 +1,13 @@ +name=Germany - NRW - Building +description= +url=wms:http://www.wms.nrw.de/geobasis/wms_nw_alk_vektor?FORMAT=image/png&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=nw_alk_vektor_gebaeude&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox} +tileSize=0.0004 +resolution=2048 +skipBottom=0 +mode=boundary +threshold=127 +pointsPerCircle=16 +tag=building +preferredValues=yes;house;garage +enabled=true + Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java (revision 30047) @@ -0,0 +1,476 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.geom.Point2D; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.AddCommand; +import org.openstreetmap.josm.command.ChangeCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.DeleteCommand; +import org.openstreetmap.josm.command.MoveCommand; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.data.osm.BBox; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.plugins.tracer2.preferences.ServerParam; +import org.openstreetmap.josm.tools.Pair; + +public class ConnectWays { + static double s_dMinDistance = 0.000006; // Minimal distance, for objects + static double s_dMinDistanceN2N = 0.0000005; // Minimal distance, when nodes are merged + static double s_dMinDistanceN2oW = 0.000001; // Minimal distance, when node is connected to other way + static double s_dMinDistanceN2tW = 0.000001; // Minimal distance, when other node is connected this way + final static double MAX_ANGLE = 30; // Minimal angle, when other node is connected this way + + static Way s_oWay; + static Way s_oWayOld; + static List s_oWays; + static List s_oNodes; + + static ServerParam s_oParam; + static boolean s_bCtrl; + static boolean s_bAlt; + + static boolean s_bAddNewWay; + + private static void calcDistance() + { + double dTileSize = Double.parseDouble(s_oParam.getTileSize()); + double dResolution = Double.parseDouble(s_oParam.getResolution()); + double dMin = dTileSize / dResolution; + + s_dMinDistance = dMin * 30; + s_dMinDistanceN2N = dMin * 2.5; + s_dMinDistanceN2oW = dMin * 5; + s_dMinDistanceN2tW = dMin * 5; + } + + private static void getWays(Way way) { + BBox bbox = new BBox(way); + bbox.addPrimitive(way,s_dMinDistance); + s_oWays = Main.main.getCurrentDataSet().searchWays(bbox); + } + + private static List getWaysOfNode(Node node) { + List ways; + ways = OsmPrimitive.getFilteredList(node.getReferrers(), Way.class); + return ways; + } + + private static void getNodes(Way way) { + BBox bbox = new BBox(way); + bbox.addPrimitive(way,s_dMinDistance); + s_oNodes = Main.main.getCurrentDataSet().searchNodes(bbox); + } + + private static double calcAlpha(LatLon oP1, Node n) { + LatLon oP2 = n.getCoor(); + + double dAlpha = Math.atan((oP2.getY() - oP1.getY()) / (oP2.getX() - oP1.getX())) * 180 / Math.PI + (oP1.getX() > oP2.getX() ? 180 : 0); + return checkAlpha(dAlpha); + } + + private static Double checkAlpha(Double dAlpha) { + if (dAlpha > 180) { + return dAlpha - 360; + } + if (dAlpha <= -180) { + return dAlpha + 360; + } + return dAlpha; + } + + private static boolean isNodeInsideWay(LatLon pos, Way way) { + List listNode = way.getNodes(); + + double dAlpha; + double dAlphaOld = calcAlpha(pos, listNode.get(listNode.size()-1)); + double dSumAlpha = 0; + + for (Node n : listNode) { + dAlpha = calcAlpha(pos, n); + dSumAlpha += checkAlpha( dAlpha - dAlphaOld ); + dAlphaOld = dAlpha; + } + dSumAlpha = Math.abs(dSumAlpha); + + return dSumAlpha > 359 && dSumAlpha < 361; + } + + private static Way getOldWay(LatLon pos) { + int i; + + for (i = 0; i < s_oWays.size(); i++) { + Way way = s_oWays.get(i); + if (!isSameTag(way)) { + continue; + } + if (isNodeInsideWay(pos, way)) { + s_oWays.remove(way); + return way; + } + } + return null; + } + + /** + * Try connect way to other buildings. + * @param way Way to connect. + * @return Commands. + */ + public static Command connect(Way newWay, LatLon pos, ServerParam param, boolean ctrl, boolean alt) { + LinkedList cmds = new LinkedList(); + LinkedList cmds2 = new LinkedList(); + + s_oParam = param; + s_bCtrl = ctrl; + s_bAlt = alt; + + calcDistance(); + getNodes(newWay); + getWays(newWay); + + s_oWayOld = getOldWay(pos); + + if (s_oWayOld == null) { + s_bAddNewWay = true; + cmds.add(new AddCommand(newWay)); + s_oWayOld = newWay; + s_oWay = new Way( newWay ); + } else { + int i; + Way tempWay; + s_bAddNewWay = false; + + //Main.main.getCurrentDataSet().setSelected(m_wayOld); + + tempWay = new Way(s_oWayOld); + + for (i = 0; i < newWay.getNodesCount(); i++) { + tempWay.addNode(tempWay.getNodesCount(), newWay.getNode(i)); + } + i++; + for (i = 0; i < s_oWayOld.getNodesCount() - 1; i++) { + tempWay.removeNode( s_oWayOld.getNode(i) ); + } + //cmds.add(new ChangeCommand(m_wayOld, tempWay)); + for (i = 0; i < s_oWayOld.getNodesCount() - 1; i++) { + Node n = s_oWayOld.getNode(i); + List ways = getWaysOfNode(n); + if (ways.size()<=1) { + cmds2.add(new DeleteCommand( s_oWayOld.getNode(i) )); + } + s_oNodes.remove(s_oWayOld.getNode(i)); + } + s_oWay = tempWay; + } + + { + cmds2.addAll(connectTo()); + + cmds.add(new ChangeCommand(s_oWayOld, trySplitWayByAnyNodes(s_oWay))); + } + cmds.addAll(cmds2); + + TracerDebug oTracerDebug = new TracerDebug(); + oTracerDebug.OutputCommands(cmds); + + Command cmd = new SequenceCommand(tr("Merge objects nodes"), cmds); + + return cmd; + } + + + /** + * Try connect way to other buildings. + * @param way Way to connect. + * @return Commands. + */ + public static List connectTo() { + Map modifiedWays = new HashMap(); + LinkedList cmds = new LinkedList(); + Way way = new Way(s_oWay); + for (int i = 0; i < way.getNodesCount() - 1; i++) { + Node n = way.getNode(i); + System.out.println("-------"); + System.out.println("Node: " + n); + LatLon ll = n.getCoor(); + //BBox bbox = new BBox( + // ll.getX() - MIN_DISTANCE, + // ll.getY() - MIN_DISTANCE, + // ll.getX() + MIN_DISTANCE, + // ll.getY() + MIN_DISTANCE); + + // bude se node slucovat s jinym? + double minDistanceSq = s_dMinDistanceN2N; + //List nodes = Main.main.getCurrentDataSet().searchNodes(bbox); + Node nearestNode = null; + for (Node nn : s_oNodes) { + System.out.println("Node: " + nn); + if (!nn.isUsable() || way.containsNode(nn) || s_oWay.containsNode(nn) || !isInSameTag(nn)) { + continue; + } + double dist = nn.getCoor().distance(ll); + if (dist < minDistanceSq) { + minDistanceSq = dist; + nearestNode = nn; + } + } + + System.out.println("Nearest: " + nearestNode + " distance: " + minDistanceSq); + if (nearestNode == null) { + tryConnectNodeToAnyWay(n, modifiedWays); + } else { + System.out.println("+add Node distance: " + minDistanceSq); + cmds.addAll(mergeNodes(n, nearestNode)); + } + } + + for (Map.Entry e : modifiedWays.entrySet()) { + cmds.add(new ChangeCommand(e.getKey(), e.getValue())); + } + + //cmds.addFirst(new ChangeCommand(way, trySplitWayByAnyNodes(newWay))); + + List cmd = cmds; + return cmd; + } + + /** + * Merges two nodes + * @param n1 First node + * @param n2 Second node + * @param way Way containing first node + * @return List of Commands. + */ + private static List mergeNodes(Node n1, Node n2){ + List cmds = new LinkedList(); + cmds.add(new MoveCommand(n2, + (n1.getEastNorth().getX() - n2.getEastNorth().getX())/2, + (n1.getEastNorth().getY() - n2.getEastNorth().getY())/2 + )); + + Way newWay = new Way(s_oWay); + + int j = s_oWay.getNodes().indexOf(n1); + newWay.addNode(j, n2); + if (j == 0) { + // first + last point + newWay.addNode(newWay.getNodesCount(), n2); + } + + newWay.removeNode(n1); + // cmds.add(new ChangeCommand(m_way, newWay)); + s_oWay = new Way(newWay); + + cmds.add(new DeleteCommand(n1)); + return cmds; + } + + /** + * Try connect node "node" to way of other building. + * + * Zkusi zjistit, zda node neni tak blizko nejake usecky existujici budovy, + * ze by mel byt zacnenen do teto usecky. Pokud ano, provede to. + * + * @param node Node to connect. + * @throws IllegalStateException + * @throws IndexOutOfBoundsException + * @return List of Commands. + */ + private static void tryConnectNodeToAnyWay(Node node, Map m) + throws IllegalStateException, IndexOutOfBoundsException { + + //List cmds = new LinkedList(); + + LatLon ll = node.getCoor(); + //BBox bbox = new BBox( + // ll.getX() - MIN_DISTANCE_TW, + // ll.getY() - MIN_DISTANCE_TW, + // ll.getX() + MIN_DISTANCE_TW, + // ll.getY() + MIN_DISTANCE_TW); + + // node nebyl slouceny s jinym + // hledani pripadne blizke usecky, kam bod pridat + //List ways = Main.main.getCurrentDataSet().searchWays(bbox); + double minDist = Double.MAX_VALUE; + Way nearestWay = null; + int nearestNodeIndex = 0; + for (Way ww : s_oWays) { + System.out.println("Way: " + ww); + if (!ww.isUsable() || ww.containsNode(node) || !isSameTag(ww)) { + continue; + } + + if (m.get(ww) != null) { + ww = m.get(ww); + } + + for (Pair np : ww.getNodePairs(false)) { + //double dist1 = TracerGeometry.distanceFromSegment(ll, np.a.getCoor(), np.b.getCoor()); + double dist = distanceFromSegment2(ll, np.a.getCoor(), np.b.getCoor()); + //System.out.println(" distance: " + dist1 + " " + dist); + + if (dist < minDist) { + minDist = dist; + nearestWay = ww; + nearestNodeIndex = ww.getNodes().indexOf(np.a); + } + } + } + System.out.println("Nearest way: " + nearestWay + " distance: " + minDist); + if (minDist < s_dMinDistanceN2oW) { + Way newNWay = new Way(nearestWay); + + newNWay.addNode(nearestNodeIndex + 1, node); + System.out.println("New way:" + newNWay); + System.out.println("+add WayOld.Node distance: " + minDist); + m.put(nearestWay, newNWay); + s_oWays.remove(newNWay); + s_oWays.add(nearestWay); + } + } + + private static double distanceFromSegment2(LatLon c, LatLon a, LatLon b) { + double x; + double y; + + StraightLine oStraightLine1 = new StraightLine( + new Point2D.Double(a.getX(),a.getY()), + new Point2D.Double(b.getX(),b.getY())); + StraightLine oStraightLine2 = new StraightLine( + new Point2D.Double(c.getX(),c.getY()), + new Point2D.Double(c.getX() + (a.getY()-b.getY()),c.getY() - (a.getX()-b.getX()))); + Point2D.Double oPoint = oStraightLine1.GetIntersectionPoint(oStraightLine2); + + if ((oPoint.x > a.getX() && oPoint.x > b.getX()) || (oPoint.x < a.getX() && oPoint.x < b.getX()) || + (oPoint.y > a.getY() && oPoint.y > b.getY()) || (oPoint.y < a.getY() && oPoint.y < b.getY())) { + return 100000; + } + + x=c.getX()-oPoint.getX(); + y=c.getY()-oPoint.getY(); + + return Math.sqrt((x*x)+(y*y)); + } + + /** + * Try split way by any existing building nodes. + * + * Zkusi zjistit zda nejake usecka z way by nemela prochazet nejakym existujicim bodem, + * ktery je ji velmi blizko. Pokud ano, tak puvodni usecku rozdeli na dve tak, aby + * prochazela takovym bodem. + * + * @param way Way to split. + * @throws IndexOutOfBoundsException + * @throws IllegalStateException + * @return Modified way + */ + private static Way trySplitWayByAnyNodes(Way way) + throws IndexOutOfBoundsException, IllegalStateException { + + // projdi kazdou novou usecku a zjisti, zda by nemela vest pres existujici body + int i = 0; + while (i < way.getNodesCount()) { + // usecka n1, n2 + LatLon n1 = way.getNodes().get(i).getCoor(); + LatLon n2 = way.getNodes().get((i + 1) % way.getNodesCount()).getCoor(); + System.out.println(way.getNodes().get(i) + "-----" + way.getNodes().get((i + 1) % way.getNodesCount())); + double minDistanceSq = Double.MAX_VALUE; +// double maxAngle = MAX_ANGLE; + //List nodes = Main.main.getCurrentDataSet().searchNodes(new BBox( + // Math.min(n1.getX(), n2.getX()) - minDistanceSq, + // Math.min(n1.getY(), n2.getY()) - minDistanceSq, + // Math.max(n1.getX(), n2.getX()) + minDistanceSq, + // Math.max(n1.getY(), n2.getY()) + minDistanceSq + //)); + + Node nearestNode = null; + for (Node nod : s_oNodes) { + if (!nod.isUsable() || way.containsNode(nod) || !isInSameTag(nod)) { + continue; + } + LatLon nn = nod.getCoor(); + //double dist = TracerGeometry.distanceFromSegment(nn, n1, n2); + double dist = distanceFromSegment2(nn, n1, n2); +// double angle = TracerGeometry.angleOfLines(n1, nn, nn, n2); + //System.out.println("Angle: " + angle + " distance: " + dist + " Node: " + nod); + if (!n1.equalsEpsilon(nn) && !n2.equalsEpsilon(nn) && dist < minDistanceSq){ // && Math.abs(angle) < maxAngle) { + minDistanceSq = dist; +// maxAngle = angle; + nearestNode = nod; + } + } + System.out.println("Nearest_: " + nearestNode + " distance: " + minDistanceSq); + if (nearestNode == null || minDistanceSq >= s_dMinDistanceN2tW) { + // tato usecka se nerozdeli + i++; + System.out.println(""); + continue; + } else { + // rozdeleni usecky + way.addNode(i + 1, nearestNode); + i++; + System.out.println("+add Way.Node distance: " + minDistanceSq); + System.out.println(""); + //i++; + continue; // i nezvetsuji, treba bude treba rozdelit usecku znovu + } + } + return way; + } + + private static boolean isInSameTag(Node n) { + for (OsmPrimitive op : n.getReferrers()) { + if (op instanceof Way) { + if (isSameTag((Way) op)) { + return true; + } + } + } + return false; + } + + /** + * Determines if the specified primitive denotes a building. + * @param p The primitive to be tested + * @return True if building key is set and different from no,entrance + */ + protected static final boolean isSameTag(OsmPrimitive p) { + String v = p.get(s_oParam.getTag()); + if (s_bCtrl || s_oParam.getTag().equals("")) { + return v == null || v.equals("no"); + } + if (s_oParam.getTag().equals("building")) { + return v != null && !v.equals("no") && !v.equals("entrance"); + } + return v != null && !v.equals("no"); + } + +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/StraightLine.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/StraightLine.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/StraightLine.java (revision 30047) @@ -0,0 +1,111 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2; + +import java.awt.geom.Point2D; + +public class StraightLine { + + private Double m_dm; // slope (gradient) + private Double m_dc; // y-intercept + private Double m_dx; // x-intercept (if y-intercept == NaN) + private Double m_dAlpha; // alpha (-180 < alpha <= 180) + + public StraightLine(Double dm, Double dc, boolean bRevert) { + this.m_dm = dm; + this.m_dc = dc; + this.m_dx = Double.NaN; + if (this.m_dm.isNaN()) { + this.m_dAlpha = Double.NaN; + } else if (this.m_dm.isInfinite()) { + this.m_dAlpha = CheckAlpha((Double.NEGATIVE_INFINITY == this.m_dm) ? -90.0 : 90.0); + } else { + this.m_dAlpha = CheckAlpha(Math.atan(dm) * 180 / Math.PI + (bRevert ? 180 : 0) ); + } + } + + public StraightLine(Point2D.Double oP1, Point2D.Double oP2) { + this.m_dm = (oP2.getY() - oP1.getY()) / (oP2.getX() - oP1.getX()); + this.m_dc = oP1.getY() - (m_dm * oP1.getX()); + + if (this.m_dm.isInfinite() || this.m_dm.isNaN()) { + this.m_dx = oP1.getX(); + this.m_dAlpha = CheckAlpha(oP1.getY() > oP2.getY() ? -90.0 : 90.0); + } else { + this.m_dx = Double.NaN; + this.m_dAlpha = CheckAlpha(Math.atan((oP2.getY() - oP1.getY()) / (oP2.getX() - oP1.getX())) * 180 / Math.PI + (oP1.getX() > oP2.getX() ? 180 : 0)); + } + } + + static private Double CheckAlpha(Double dAlpha) { + if (dAlpha > 180) { + return dAlpha - 360; + } + if (dAlpha <= -180) { + return dAlpha + 360; + } + return dAlpha; + } + + public Double getM() { + return m_dm; + } + public Double getC() { + return m_dc; + } + public Double getX() { + return m_dx; + } + public Double getAlpha() { + return m_dAlpha; + } + public boolean IsLine() { + return !(m_dx.isNaN() || m_dx.isInfinite() || m_dAlpha.isNaN() || m_dAlpha.isInfinite()) + || !(m_dm.isNaN() || m_dm.isInfinite() || m_dc.isNaN() || m_dc.isInfinite()); + } + + public Point2D.Double GetIntersectionPoint(StraightLine oLine) { + Double dx; + Double dy; + + if (!this.IsLine() || !oLine.IsLine()) { + // data missing + return new Point2D.Double(Double.NaN, Double.NaN); + } + + if (m_dm.isInfinite() || this.m_dm.isNaN()) { + if (oLine.getM().isInfinite() || oLine.getM().isNaN()) { + // no IntersectionPoint + return new Point2D.Double(Double.NaN, Double.NaN); + } else { + dx = this.m_dx; + dy = oLine.getM() * dx + oLine.getC(); + } + } else if (oLine.getM().isInfinite() || oLine.getM().isNaN()) { + dx = oLine.getX(); + dy = this.m_dm * dx + this.m_dc; + } else { + dx = (oLine.m_dc - this.m_dc) / (this.m_dm - oLine.m_dm); + dy = this.m_dm * dx + this.m_dc; + } + + return new Point2D.Double(dx, dy); + } + +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TagValues.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TagValues.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TagValues.java (revision 30047) @@ -0,0 +1,194 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2; + +import java.util.ArrayList; +import java.util.List; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem; +import org.openstreetmap.josm.plugins.tracer2.preferences.ServerParam; + +public class TagValues { + private String m_strTag = ""; + private String m_strPreferredValues = ""; + + private int m_nPos = 0; + private boolean m_bPreferred = false; + private String[] m_astrTagValues = null; + private String[] m_astrTagValuesPreferred = null; + + public TagValues() { + clearAll(); + } + + public void readBuildingTags(ServerParam param) { + if (param==null || param.getTag() == null || param.getTag().equals("")) { + clearAll(); + return; + } + if (param.getTag().equals(m_strTag) && param.getPreferredValues().equals(m_strPreferredValues)) { + return; + } + clearAll(); + + m_strTag = param.getTag(); + m_strPreferredValues = param.getPreferredValues(); + + // get values + List tagValues = new ArrayList(); + List values = Main.main.getCurrentDataSet().getAutoCompletionManager().getValues(m_strTag); + for ( AutoCompletionListItem i : values ) { + tagValues.add(i.getValue()); + } + m_astrTagValues = (String[])tagValues.toArray(new String[tagValues.size()]); + + // get preferred values + if ( m_strPreferredValues.equals("") ) { + m_astrTagValuesPreferred = new String[0]; + } else { + String[] prefered = m_strPreferredValues.split(";"); + tagValues = new ArrayList(); + + for (String str: prefered) { + String temp = str.trim(); + if (getPos(temp, m_astrTagValues) >= 0 ) { + tagValues.add(temp); + } + } + m_astrTagValuesPreferred = (String[])tagValues.toArray(new String[tagValues.size()]); + + // set to the first preferred + m_bPreferred = true; + m_nPos = 0; + } + } + + private void clearAll() { + m_strTag = ""; + m_strPreferredValues = ""; + + m_nPos = 0; + m_bPreferred = false; + m_astrTagValues = null; + m_astrTagValuesPreferred = null; + } + + public String getTag() { + if (m_strTag == null || m_strTag.equals("")) { + return null; + } + return m_strTag; + } + + public String getTagValue() { + if ( m_bPreferred == false ) { + if (m_astrTagValues != null && m_astrTagValues.length > m_nPos) { + return m_astrTagValues[m_nPos]; + } + } else { + if (m_astrTagValuesPreferred != null && m_astrTagValuesPreferred.length > m_nPos) { + return m_astrTagValuesPreferred[m_nPos]; + } + } + return null; + } + + private int getPos( String value, String[] values) { + if (value != null && values != null ) { + for ( int i = 0; i= m_astrTagValuesPreferred.length) m_nPos = 0; + } + + public void up() { + if (m_astrTagValues == null || m_astrTagValues.length == 0) { + return; + } + if (m_bPreferred == true) { + m_bPreferred = false; + m_nPos = getPos( m_astrTagValuesPreferred[m_nPos], m_astrTagValues); + if ( m_nPos < 0 ) { + m_nPos = 0; + return; + } + } + m_nPos--; + if (m_nPos < 0) m_nPos = m_astrTagValues.length-1; + } + + public void down() { + if (m_astrTagValues == null || m_astrTagValues.length == 0) { + return; + } + if (m_bPreferred == true) { + m_bPreferred = false; + m_nPos = getPos( m_astrTagValuesPreferred[m_nPos], m_astrTagValues); + if ( m_nPos < 0 ) { + m_nPos = 0; + return; + } + } + m_nPos++; + if (m_nPos >= m_astrTagValues.length) m_nPos = 0; + } + +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java (revision 30047) @@ -0,0 +1,393 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2; + +import static org.openstreetmap.josm.tools.I18n.tr; +//import static org.openstreetmap.josm.tools.I18n.trn; + +import java.awt.Cursor; +import java.awt.Point; +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.KeyListener; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +import javax.swing.JDialog; +import javax.swing.JOptionPane; + +import org.xml.sax.SAXException; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.mapmode.MapMode; +import org.openstreetmap.josm.command.AddCommand; +import org.openstreetmap.josm.command.ChangePropertyCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.PleaseWaitRunnable; +import org.openstreetmap.josm.gui.progress.ProgressMonitor; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.plugins.tracer2.preferences.ServerParam; +import org.openstreetmap.josm.plugins.tracer2.preferences.ServerParamList; +import org.openstreetmap.josm.plugins.tracer2.preferences.ServerParamSelectDialog; +import org.openstreetmap.josm.plugins.tracer2.server.GetVersion; +import org.openstreetmap.josm.plugins.tracer2.server.GetTrace; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.Shortcut; +import org.openstreetmap.josm.data.osm.OsmPrimitive; + +class TracerAction extends MapMode implements MouseListener, KeyListener { + private static final long serialVersionUID = 1L; + private static boolean s_bServerVersionOK = false; + + protected boolean m_bCancel; + private boolean m_bCtrl; // if pressed no tag is added + changes and connection are made to ways without tag + private boolean m_bAlt; // + private boolean m_bShift; // if pressed the new way will be add to the current selected + private boolean m_bEnter = false; + + private TagValues m_oTagValues = new TagValues(); + + TracerPlugin m_oPlugin; + + public TracerAction(MapFrame mapFrame) { + super(tr("Tracer2"), "tracer2-sml", tr("Tracer2."), Shortcut.registerShortcut("tools:tracer2", tr("Tool: {0}", tr("Tracer2")), KeyEvent.VK_T, Shortcut.DIRECT), mapFrame, getCursor()); + } + + @Override + public void keyPressed(KeyEvent e) { + //System.out.println("keyPressed: key:" + e.getKeyChar() + " code" + e.getKeyCode() + " Loc" + e.getKeyLocation()+ " ID" + KeyEvent.getKeyText(e.getKeyCode())); + + Collection selection = getCurrentDataSet().getSelected(); + List commands = new ArrayList(); + + if ( checkActiveServerParam() == false ) return; + + switch (e.getKeyCode()) { + case 37: // left + m_oTagValues.left(); + break; + case 38: // up + m_oTagValues.up(); + break; + case 39: // right + m_oTagValues.right(); + break; + case 40: // down + m_oTagValues.down(); + break; + default: + return; + } + + if (selection.isEmpty()) + { + return; + } + + String strTag = m_oTagValues.getTag(); + String strTagValue = m_oTagValues.getTagValue(); + + if ( strTag != null && strTagValue != null ) { + commands.add(new ChangePropertyCommand(selection, strTag, strTagValue)); + + if (!commands.isEmpty()) { + Main.main.undoRedo.add( new SequenceCommand( tr("Change tag {0} to {1}", strTag, strTagValue), commands )); + } + } + } + + @Override + public void keyReleased ( KeyEvent e ) { + //System.out.println("keyReleased: key:" + e.getKeyChar() + " code" + e.getKeyCode() + " Loc" + e.getKeyLocation()+ " chra" + KeyEvent.getKeyText(e.getKeyCode())); + } + + @Override + public void keyTyped ( KeyEvent e ) { + //System.out.println("keyTyped: key:" + e.getKeyChar() + " code" + e.getKeyCode() + " Loc" + e.getKeyLocation()+ " ID" + KeyEvent.getKeyText(e.getKeyCode())); + } + + @Override + public void enterMode() { + m_bEnter = true; + + // is not working hear + // because if JOSM exit it is called too + //checkActiveServerParam(); + + if (!isEnabled()) { + return; + } + super.enterMode(); + Main.map.mapView.setCursor(getCursor()); + Main.map.mapView.addMouseListener(this); + Main.map.mapView.addKeyListener(this); + } + + @Override + public void exitMode() { + m_bEnter = false; + + super.exitMode(); + Main.map.mapView.removeMouseListener(this); + Main.map.mapView.removeKeyListener(this); + } + + private static Cursor getCursor() { + return ImageProvider.getCursor("crosshair", "tracer2-sml"); + } + + protected void traceAsync(Point clickPoint) { + m_bCancel = false; + /** + * Positional data + */ + final LatLon pos = Main.map.mapView.getLatLon(clickPoint.x, clickPoint.y); + + try { + PleaseWaitRunnable tracerTask = new PleaseWaitRunnable(tr("Tracing")) { + @Override + protected void realRun() throws SAXException { + traceSync(pos, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)); + } + + @Override + protected void finish() { + } + + @Override + protected void cancel() { + TracerAction.this.cancel(); + } + }; + Thread executeTraceThread = new Thread(tracerTask); + executeTraceThread.start(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private void tagBuilding(Way way) { + String strTag = m_oTagValues.getTag(); + String strTagValue = m_oTagValues.getTagValue(); + + if ( strTag != null && strTagValue != null && !m_bCtrl) { + way.put(strTag, strTagValue); + } + } + + private boolean checkServerVersion() { + int nMajor = 1; + int nMinor = 0; + + if (s_bServerVersionOK == false) { + GetVersion oGetVersion = new GetVersion(); + oGetVersion.start(); + + int nRetray = 500; // 5 seconds + + while(oGetVersion.isAlive() && nRetray > 0) { + try { + Thread.sleep(10); + } catch (Exception e) { + break; + } + nRetray--; + } + + if (oGetVersion.m_nVersionMajor < 0 || oGetVersion.m_nVersionMinor < 0) { + return false; + } + if (oGetVersion.m_nVersionMajor != nMajor) { + JOptionPane.showMessageDialog(Main.parent, tr("The Tracer2Server version isn''t compatible with this plugin. Please download version {0} from",nMajor + ".x" ) + + "\nhttp://sourceforge.net/projects/tracer2server/." , tr("Error"), JOptionPane.ERROR_MESSAGE); + return false; + } + if (oGetVersion.m_nVersionMinor < nMinor) { + JOptionPane.showMessageDialog(Main.parent, tr("New version of Tracer2Server is avalibel. For best results please upgrade to version {0}.",nMajor + "." + nMinor ), tr("Information"), JOptionPane.INFORMATION_MESSAGE); + } + s_bServerVersionOK = true; + } + return true; + } + + private boolean checkActiveServerParam() { + if (checkServerVersion() == false) { + return false; + } + if ( m_bEnter == true || TracerPlugin.s_oPlugin.m_oParamList.getActivParam() == null ) { + + ServerParamList listParam = TracerPlugin.s_oPlugin.m_oParamList; + List listEnableParam = listParam.getEnableParamList(); + + if (listEnableParam == null || listEnableParam.size() == 0) { + listParam.setActivParam(null); + JOptionPane.showMessageDialog(Main.parent, tr("No set of parameter is activ!"), tr("Error"), JOptionPane.ERROR_MESSAGE); + return false; + } + if ( listEnableParam.size() == 1 ) { + listParam.setActivParam(listEnableParam.get(0)); + return true; + } + + ServerParamSelectDialog dialog = new ServerParamSelectDialog(listEnableParam, listParam.getActivParam()); + + if (dialog.getShow()) { + JOptionPane pane = new JOptionPane(dialog, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION); + JDialog dlg = pane.createDialog(Main.parent, tr("Tracer2") + " - " + tr("Select parameter")); + dlg.setVisible(true); + Object obj = pane.getValue(); + dlg.dispose(); + if(obj != null && ((Integer)obj) == JOptionPane.OK_OPTION) { + TracerPlugin.s_oPlugin.m_oParamList.setActivParam(dialog.getSelectedParam()); + } else { + return false; + } + } + } + ServerParam param = TracerPlugin.s_oPlugin.m_oParamList.getActivParam(); + if ( param == null ) { + return false; + } + m_bEnter = false; + m_oTagValues.readBuildingTags(param); + return true; + } + + private void traceSync(LatLon pos, ProgressMonitor progressMonitor) { + Collection commands = new LinkedList(); + + progressMonitor.beginTask(null, 3); + try { + ArrayList coordList; + + if ( checkActiveServerParam() == false ) return; + + ServerParam param = TracerPlugin.s_oPlugin.m_oParamList.getActivParam(); + GetTrace oTraceSimple = new GetTrace(pos, param); + oTraceSimple.start(); + try + { + while(oTraceSimple.isAlive()) + { + Thread.sleep(50); + if (m_bCancel == true) + { + oTraceSimple.interrupt(); + break; + } + } + coordList = oTraceSimple.m_listLatLon; + } catch (Exception e) { + coordList = new ArrayList(); + } + + if (m_bCancel == true || coordList.size() == 0) { + return; + } + + // make nodes a way + Way way = new Way(); + Node firstNode = null; + for (LatLon coord : coordList) { + Node node = new Node(coord); + if (firstNode == null) { + firstNode = node; + } + commands.add(new AddCommand(node)); + way.addNode(node); + } + way.addNode(firstNode); + + tagBuilding(way); + + // connect to other buildings + commands.add(ConnectWays.connect(way, pos, param, m_bCtrl, m_bAlt)); + + if (!commands.isEmpty()) { + String strCommand; + if (ConnectWays.s_bAddNewWay == true) { + strCommand = tr("Tracer2 add a Way with {0} points", coordList.size()); + } else { + strCommand = tr("Tracer2 modified Way to {0} points", coordList.size()); + } + Main.main.undoRedo.add(new SequenceCommand(strCommand, commands)); + + if (m_bShift) { + Main.main.getCurrentDataSet().addSelected(ConnectWays.s_oWay); + } else { + Main.main.getCurrentDataSet().setSelected(ConnectWays.s_oWay); + } + } else { + System.out.println("Failed"); + } + + } finally { + progressMonitor.finishTask(); + } + } + + public void cancel() { + m_bCancel = true; + } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (!Main.map.mapView.isActiveLayerDrawable()) { + return; + } + requestFocusInMapView(); + updateKeyModifiers(e); + if (e.getButton() == MouseEvent.BUTTON1) { + traceAsync(e.getPoint()); + } + } + + @Override + protected void updateKeyModifiers(MouseEvent e) { + m_bCtrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; + m_bAlt = (e.getModifiers() & (ActionEvent.ALT_MASK | InputEvent.ALT_GRAPH_MASK)) != 0; + m_bShift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; + } + + @Override + public void mouseReleased(MouseEvent e) { + } + +} + Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerDebug.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerDebug.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerDebug.java (revision 30047) @@ -0,0 +1,127 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2; + +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +import org.openstreetmap.josm.command.AddCommand; +import org.openstreetmap.josm.command.ChangeCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.DeleteCommand; +import org.openstreetmap.josm.command.MoveCommand; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Way; + +public class TracerDebug { + + private static String FormatPrimitive(String strIn) { + while (strIn.contains("{")) { + strIn = strIn.replace("{", "xxxxx"); + } + return strIn.replaceAll("xxxxx", "\r\n {"); + } + + public void OutputOsmPrimitive(Collection cOsmPrimitive) { + if (cOsmPrimitive != null) { + for (OsmPrimitive p : cOsmPrimitive) { + System.out.println(" OsmPrimitive: " + FormatPrimitive(p.toString())); + } + } + } + + public void OutputOsmExtendsPrimitive(Collection cOsmPrimitive) { + if (cOsmPrimitive != null) { + for (OsmPrimitive p : cOsmPrimitive) { + System.out.println(" OsmPrimitive x: " + FormatPrimitive(p.toString())); + } + } + } + + public void OutputCommands(LinkedList cmds) { + + for (Command c : cmds) { + System.out.println(""); + + Collection cp1 = null; + Collection cp2 = null; + Collection cp3 = null; + Collection cpx = null; + + List lp1 = new LinkedList(); + List lp2 = new LinkedList(); + List lp3 = new LinkedList(); + List lp = new LinkedList(); + + cp1 = lp1; + cp2 = lp2; + cp3 = lp3; + cpx = lp; + + //OsmPrimitive op = new OsmPrimitive(); + OsmPrimitive op1 = new Way(); + + System.out.println("Command: " + c.toString()); + + if (c instanceof AddCommand) { + AddCommand x = (AddCommand) c; + x.fillModifiedData(cp1, cp2, cp3); + OutputOsmPrimitive(cp1); + OutputOsmPrimitive(cp2); + OutputOsmPrimitive(cp3); + cpx = x.getParticipatingPrimitives(); + OutputOsmExtendsPrimitive(cpx); + } else if (c instanceof ChangeCommand) { // order is important! + ChangeCommand x = (ChangeCommand) c; + x.fillModifiedData(cp1, cp2, cp3); + x.getOrig(op1); + OutputOsmPrimitive(cp1); + OutputOsmPrimitive(cp2); + OutputOsmPrimitive(cp3); + cpx = x.getParticipatingPrimitives(); + OutputOsmExtendsPrimitive(cpx); + } else if (c instanceof DeleteCommand) { + DeleteCommand x = (DeleteCommand) c; + x.fillModifiedData(cp1, cp2, cp3); + OutputOsmPrimitive(cp1); + OutputOsmPrimitive(cp2); + OutputOsmPrimitive(cp3); + cpx = x.getParticipatingPrimitives(); + OutputOsmExtendsPrimitive(cpx); + } else if (c instanceof MoveCommand) { // order is important! + MoveCommand x = (MoveCommand) c; + x.fillModifiedData(cp1, cp2, cp3); + OutputOsmPrimitive(cp1); + OutputOsmPrimitive(cp2); + OutputOsmPrimitive(cp3); + cpx = x.getParticipatingPrimitives(); + OutputOsmExtendsPrimitive(cpx); + } else { + c.fillModifiedData(cp1, cp2, cp3); + OutputOsmPrimitive(cp1); + OutputOsmPrimitive(cp2); + OutputOsmPrimitive(cp3); + cpx = c.getParticipatingPrimitives(); + OutputOsmExtendsPrimitive(cpx); + } + } + } + +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerException.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerException.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerException.java (revision 30047) @@ -0,0 +1,37 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2; + +import static org.openstreetmap.josm.tools.I18n.tr; + +class TracerException extends Exception { + + /** + * + */ + private static final long serialVersionUID = 4404064875119981715L; + + public TracerException() { + super(tr("An unknown error has occurred")); + } + + public TracerException(String err) { + super(err); + } +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerGeometry.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerGeometry.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerGeometry.java (revision 30047) @@ -0,0 +1,75 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2; + +import org.openstreetmap.josm.data.coor.LatLon; + +public class TracerGeometry { + + /** + * Angle between line AB and CD + * @param a Point A. + * @param b Point B. + * @param c Point C. + * @param d Point D. + * @return Angle in degrees. + */ + static public double angleOfLines(LatLon a, LatLon b, LatLon c, LatLon d) { + return (Math.abs( + Math.atan2(a.lat() - b.lat(), a.lon() - b.lon()) - + Math.atan2(c.lat() - d.lat(), c.lon() - d.lon()) + ) / Math.PI * 180) % 360; + } + + /** + * Distance of point C from line segment AB. + * @param c Point C. + * @param a Point A. + * @param b Point B. + * @return Distance. + */ + static public double distanceFromSegment(LatLon c, LatLon a, LatLon b) { + return distanceFromSegment( + c.getX(), c.getY(), + a.getX(), a.getY(), + b.getX(), b.getY() + ); + } + + static private double distanceFromSegment(double cx, double cy, double ax, double ay, double bx, double by) { + double r_numerator = (cx - ax) * (bx - ax) + (cy - ay) * (by - ay); + double r_denomenator = (bx - ax) * (bx - ax) + (by - ay) * (by - ay); + if(r_denomenator == 0)System.out.println("r_denomenator == 0 ------------"); + double r = r_numerator / r_denomenator; + double s = ((ay - cy) * (bx - ax) - (ax - cx) * (by - ay)) / r_denomenator; + double distanceLine = Math.abs(s) * Math.sqrt(r_denomenator); + + if ((r >= 0) && (r <= 1)) { + return distanceLine; + } else { + double dist1 = (cx - ax) * (cx - ax) + (cy - ay) * (cy - ay); + double dist2 = (cx - bx) * (cx - bx) + (cy - by) * (cy - by); + if (dist1 < dist2) { + return Math.sqrt(dist1); + } else { + return Math.sqrt(dist2); + } + } + } +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerPlugin.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerPlugin.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerPlugin.java (revision 30047) @@ -0,0 +1,56 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2; + +import java.io.File; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.MainMenu; +import org.openstreetmap.josm.gui.preferences.PreferenceSetting; +import org.openstreetmap.josm.plugins.Plugin; +import org.openstreetmap.josm.plugins.PluginInformation; +import org.openstreetmap.josm.plugins.tracer2.preferences.ServerParamList; +import org.openstreetmap.josm.plugins.tracer2.preferences.ServerParamPreference; + +public class TracerPlugin extends Plugin { + + public static TracerPlugin s_oPlugin; + + public final ServerParamList m_oParamList; + + public TracerPlugin(PluginInformation info) { + super(info); + MainMenu.add(Main.main.menu.moreToolsMenu, new TracerAction(Main.map)); + + s_oPlugin = this; + + File plugindir = new File(this.getPluginDir()); + if (!plugindir.exists()) { + plugindir.mkdirs(); + } + + m_oParamList = new ServerParamList(new File(plugindir, "serverParam.cfg").getAbsolutePath()); + } + + @Override + public PreferenceSetting getPreferenceSetting() { + return new ServerParamPreference(this); + } + +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParam.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParam.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParam.java (revision 30047) @@ -0,0 +1,215 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2.preferences; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagLayout; + +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.SwingUtilities; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.JMultilineLabel; +import org.openstreetmap.josm.tools.GBC; + +public class ServerParam { + + protected boolean m_bEnabled; + private String m_strName = "Name"; + private String m_strDescription = ""; + private String m_strUrl = ""; + private String m_strTileSize = "0.0004"; + private String m_strResolution = "2048"; + private String m_strSkipBottom = "0"; + private String m_strMode = "boundary"; + private String m_strThreshold = "127"; + private String m_strPointsPerCircle = "16"; + private String m_strTag = "building"; + private String m_strPreferredValues = "yes;house;garage"; + + protected JMenuItem m_oMenuItem; + + public boolean isEnabled() { + return m_bEnabled; + } + public void setEnabled(boolean enabled) { + if (!m_bEnabled ^ enabled) + return; + m_bEnabled = enabled; + } + + public String getName() { + return m_strName; + } + public void setName(String name) { + m_strName = name; + } + + public String getDescription() { + return m_strDescription; + } + public void setDescription(String description) { + m_strDescription = description; + } + + public String getUrl() { + return m_strUrl; + } + public void setUrl(String url) { + m_strUrl = url; + } + + public String getTileSize() { + return m_strTileSize; + } + public void setTileSize(String tileSize) { + m_strTileSize = tileSize; + } + + public String getResolution() { + return m_strResolution; + } + public void setResolution(String resolution) { + m_strResolution = resolution; + } + + public String getSkipBottom() { + return m_strSkipBottom; + } + public void setSkipBottom(String skipBottom) { + m_strSkipBottom = skipBottom; + } + + public String getMode() { + return m_strMode; + } + public void setMode(String mode) { + m_strMode = mode; + } + + public String getThreshold() { + return m_strThreshold; + } + public void setThreshold(String threshold) { + m_strThreshold = threshold; + } + + public String getPointsPerCircle() { + return m_strPointsPerCircle; + } + public void setPointsPerCircle(String pointsPerCircle) { + m_strPointsPerCircle = pointsPerCircle; + } + + public String getTag() { + return m_strTag; + } + public void setTag(String tag) { + m_strTag = tag; + } + + public String getPreferredValues() { + return m_strPreferredValues; + } + public void setPreferredValues(String preferredValues) { + m_strPreferredValues = preferredValues; + } + + public ServerParam() { + m_bEnabled = false; + } + + public ServerParam(String name) { + this(); + m_strName = name; + } + + public String serialize() { + StringBuilder oBuilder = new StringBuilder(); + oBuilder.append("name=").append(m_strName).append('\n'); + oBuilder.append("description=").append(m_strDescription).append('\n'); + oBuilder.append("url=").append(m_strUrl).append('\n'); + oBuilder.append("tileSize=").append(m_strTileSize).append('\n'); + oBuilder.append("resolution=").append(m_strResolution).append('\n'); + oBuilder.append("skipBottom=").append(m_strSkipBottom).append('\n'); + oBuilder.append("mode=").append(m_strMode).append('\n'); + oBuilder.append("threshold=").append(m_strThreshold).append('\n'); + oBuilder.append("pointsPerCircle=").append(m_strPointsPerCircle).append('\n'); + oBuilder.append("tag=").append(m_strTag).append('\n'); + oBuilder.append("preferredValues=").append(m_strPreferredValues).append('\n'); + oBuilder.append("enabled=").append(m_bEnabled).append('\n'); + oBuilder.append('\n'); + return oBuilder.toString(); + } + + public static ServerParam unserialize(String str) { + ServerParam oParam = new ServerParam(); + String[] lines = str.split("\n"); + for (String line : lines) { + String[] parts = line.split("=", 2); + if (parts[0].equals("name")) + oParam.m_strName = parts[1]; + else if (parts[0].equals("description")) + oParam.m_strDescription = parts[1]; + else if (parts[0].equals("url")) + oParam.m_strUrl = parts[1]; + else if (parts[0].equals("tileSize")) + oParam.m_strTileSize = parts[1]; + else if (parts[0].equals("resolution")) + oParam.m_strResolution = parts[1]; + else if (parts[0].equals("skipBottom")) + oParam.m_strSkipBottom = parts[1]; + else if (parts[0].equals("mode")) + oParam.m_strMode = parts[1]; + else if (parts[0].equals("threshold")) + oParam.m_strThreshold = parts[1]; + else if (parts[0].equals("pointsPerCircle")) + oParam.m_strPointsPerCircle = parts[1]; + else if (parts[0].equals("tag")) + oParam.m_strTag = parts[1]; + else if (parts[0].equals("preferredValues")) + oParam.m_strPreferredValues = parts[1]; + else if (parts[0].equals("enabled")) + oParam.m_bEnabled = parts[1].equalsIgnoreCase("true"); + } + return oParam; + } + + protected void showErrorMessage(String message, String details) { + final JPanel p = new JPanel(new GridBagLayout()); + p.add(new JMultilineLabel(message),GBC.eol()); + if (details != null) { + JTextArea info = new JTextArea(details, 20, 60); + info.setCaretPosition(0); + info.setEditable(false); + p.add(new JScrollPane(info), GBC.eop()); + } + SwingUtilities.invokeLater(new Runnable() { + public void run() { + JOptionPane.showMessageDialog(Main.parent, p, tr("Tracer2 error"), JOptionPane.ERROR_MESSAGE); + } + }); + } + +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamDialog.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamDialog.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamDialog.java (revision 30047) @@ -0,0 +1,183 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2.preferences; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Component; +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; + +import javax.swing.JComboBox; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.JTextField; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.ExtendedDialog; +import org.openstreetmap.josm.tools.GBC; + +public class ServerParamDialog extends ExtendedDialog { + /** + * + */ + private static final long serialVersionUID = -3229680217088662218L; + + private String[] m_astrTileSize = new String[] {"0.0001", "0.0002", "0.0004", "0.0008", "0.001", "0.002", "0.004", "0.008", "0.01"}; + private String[] m_astrResolution = new String[] {"512", "1024", "2048", "4096"}; + private String[] m_astrMode = new String[] {"boundary", "match color"}; + private String[] m_astrPointsPerCircle = new String[] {"0", "8", "12", "16", "20", "24", "32"}; + + private ServerParam m_oParam; + + private JPanel m_oPanel = new JPanel(new GridBagLayout()); + private JTextField m_oName = new JTextField(); + private JTextField m_oDescription = new JTextField(); + private JTextArea m_oUrl = new JTextArea(5,5); + private JComboBox m_oTileSize; + private JComboBox m_oResolution; + //private JTextField m_oSkipBottom = new JTextField(); + private JComboBox m_oMode; + private JTextField m_oThreshold = new JTextField(); + private JComboBox m_oPointsPerCircle; + private JTextField m_oTag = new JTextField(); + private JTextField m_oPreferredValues = new JTextField(); + + private JScrollPane m_oScrollpaneUrl; + + public ServerParam getServerParam() { + return m_oParam; + } + + private void addLabelled(String str, Component c) { + JLabel label = new JLabel(str); + m_oPanel.add(label, GBC.std()); + label.setLabelFor(c); + m_oPanel.add(c, GBC.eol().fill(GridBagConstraints.HORIZONTAL)); + } + + private void addGap() { + JPanel p = new JPanel(); + p.setMinimumSize(new Dimension(10,0)); + m_oPanel.add(p, GBC.eol().fill(GridBagConstraints.HORIZONTAL)); + } + + private void load() { + m_oName.setText(m_oParam.getName()); + m_oDescription.setText(m_oParam.getDescription()); + m_oUrl.setText(m_oParam.getUrl()); + loadComboBox( m_oTileSize, m_oParam.getTileSize(), m_astrTileSize); + loadComboBox( m_oResolution, m_oParam.getResolution(), m_astrResolution); + //m_oSkipBottom.setText(param.getSkipBottom()); + loadComboBox( m_oMode, m_oParam.getMode(), m_astrMode); + m_oThreshold.setText(m_oParam.getThreshold()); + loadComboBox( m_oPointsPerCircle, m_oParam.getPointsPerCircle(), m_astrPointsPerCircle); + m_oTag.setText(m_oParam.getTag()); + m_oPreferredValues.setText(m_oParam.getPreferredValues()); + } + + private void save() { + m_oParam.setName(m_oName.getText()); + m_oParam.setDescription(m_oDescription.getText()); + m_oParam.setUrl(m_oUrl.getText()); + m_oParam.setTileSize(saveComboBox(m_oTileSize, m_astrTileSize)); + m_oParam.setResolution(saveComboBox(m_oResolution, m_astrResolution)); + //m_oParam.setSkipBottom(m_oSkipBottom.getText()); + m_oParam.setMode(saveComboBox(m_oMode, m_astrMode)); + m_oParam.setThreshold(m_oThreshold.getText()); + m_oParam.setPointsPerCircle(saveComboBox(m_oPointsPerCircle, m_astrPointsPerCircle)); + m_oParam.setTag(m_oTag.getText()); + m_oParam.setPreferredValues(m_oPreferredValues.getText()); + } + + private void loadComboBox( JComboBox c, String strValue, String[] astrValues ) { + int pos = 0; + for ( String str: astrValues ) { + if (strValue.equals(str)) { + c.setSelectedIndex(pos); + return; + } + pos++; + } + } + + private String saveComboBox( JComboBox c, String[] astrValues ) { + return astrValues[c.getSelectedIndex()]; + } + + public ServerParamDialog(ServerParam param) { + super(Main.parent, tr("Tracer2") + " - " + tr("Parameter for server request"), + new String[] { tr("OK"), tr("Cancel") }, + true); + if (param == null) { + m_oParam = new ServerParam(); + } else { + m_oParam = param; + } + + contentInsets = new Insets(15, 15, 5, 15); + setButtonIcons(new String[] { "ok.png", "cancel.png" }); + + m_oTileSize = new JComboBox(m_astrTileSize); + m_oResolution = new JComboBox(m_astrResolution); + m_oMode = new JComboBox(m_astrMode); + m_oPointsPerCircle = new JComboBox(m_astrPointsPerCircle); + + load(); + + addLabelled(tr("Name:"), m_oName); + addLabelled(tr("Description:"), m_oDescription); + addGap(); + m_oUrl.setLineWrap(true); + m_oScrollpaneUrl = new JScrollPane(m_oUrl); + addLabelled(tr("URL:"), m_oScrollpaneUrl); + addGap(); + addLabelled(tr("Tile size:"), m_oTileSize); + addLabelled(tr("Resolution:"), m_oResolution); + //addLabelled(tr("Skip bottom:"), m_oSkipBottom); + addGap(); + addLabelled(tr("Mode:"), m_oMode); + addLabelled(tr("Threshold:"), m_oThreshold); + addGap(); + addLabelled(tr("Points per circle:"), m_oPointsPerCircle); + addGap(); + addLabelled(tr("Tag:"), m_oTag); + addLabelled(tr("Preferred values:"), m_oPreferredValues); + + setMinimumSize(new Dimension(500, 0)); + + setContent(m_oPanel); + setupDialog(); + } + + @Override + protected void buttonAction(int buttonIndex, ActionEvent evt) { + if (evt.getActionCommand().equals(tr("OK"))) { + save(); + } else { + m_oParam = null; + } + super.buttonAction(buttonIndex, evt); + } +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamList.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamList.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamList.java (revision 30047) @@ -0,0 +1,127 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2.preferences; + +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.util.ArrayList; +import java.util.List; + +public class ServerParamList { + ArrayList m_listServerParam = new ArrayList(); + ServerParam m_oActivParam = null; + String m_strFilename; + + public ServerParamList(String filename) { + this.m_strFilename = filename; + if (filename == null) { + loadDefault(); + } else { + load(); + } + } + + public void load() { + try { + BufferedReader oReader = new BufferedReader(new InputStreamReader(new FileInputStream(m_strFilename), "UTF-8")); + StringBuilder oBuilder = new StringBuilder(); + String strLine; + while ((strLine = oReader.readLine()) != null) { + oBuilder.append(strLine).append('\n'); + if (strLine.equals("")) { + m_listServerParam.add(ServerParam.unserialize(oBuilder.toString())); + oBuilder = new StringBuilder(); + } + } + oReader.close(); + } catch (Exception e) { + loadDefault(); + } + } + + public void loadDefault() { + try { + InputStream oIP = getClass().getResourceAsStream("/resources/serverParam.cfg"); + BufferedReader oReader = new BufferedReader(new InputStreamReader(oIP)); + StringBuilder oBuilder = new StringBuilder(); + String strLine; + while ((strLine = oReader.readLine()) != null) { + oBuilder.append(strLine).append('\n'); + if (strLine.equals("")) { + m_listServerParam.add(ServerParam.unserialize(oBuilder.toString())); + oBuilder = new StringBuilder(); + } + } + oReader.close(); + } catch (Exception e) { + System.err.println("Tracer2 warning: can't load file " + m_strFilename); + //e.printStackTrace(); + } + } + + public void save() { + try { + OutputStreamWriter oWriter = new OutputStreamWriter(new FileOutputStream(m_strFilename), "UTF-8"); + for (ServerParam param : m_listServerParam) { + oWriter.write(param.serialize()); + } + oWriter.close(); + } catch (Exception e) { + System.err.println("Tracer2 warning: can't save file " + m_strFilename); + //e.printStackTrace(); + } + } + + public List getParamList() { + return m_listServerParam; + } + + public ServerParam getActivParam() { + return m_oActivParam; + } + public void setActivParam(ServerParam param) { + if ( m_listServerParam.contains(param)) { + m_oActivParam = param; + } + } + + public List getEnableParamList() { + List listParam = new ArrayList(); + for ( ServerParam param: m_listServerParam) { + if (param.isEnabled()) { + listParam.add(param); + } + } + return listParam; + } + + public void addParam(ServerParam param) { + m_listServerParam.add(param); + } + + public void removeParam(ServerParam param) { + param.setEnabled(false); + m_listServerParam.remove(param); + } + +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamPanel.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamPanel.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamPanel.java (revision 30047) @@ -0,0 +1,175 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2.preferences; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JDialog; +import javax.swing.JOptionPane; +import javax.swing.JPanel; + +import org.openstreetmap.josm.Main; + +public class ServerParamPanel extends JPanel { + /** + * + */ + private static final long serialVersionUID = -6174275926314685531L; + + ServerParamList m_listParam; + + public ServerParamPanel(ServerParamList listParam) { + super(new GridBagLayout()); + m_listParam = listParam; + } + + public void refresh() { + removeAll(); + GridBagConstraints gbc = new GridBagConstraints(); + gbc.gridy = 0; + gbc.fill = GridBagConstraints.HORIZONTAL; + gbc.insets = new Insets(2, 5, 2, 5); + + for (final ServerParam param : m_listParam.getParamList()) { + gbc.gridx = 0; + gbc.weightx = 1.0; + gbc.anchor = GridBagConstraints.WEST; + + final JCheckBox cbParam = new JCheckBox(param.getName()); + cbParam.setSelected(param.isEnabled()); + cbParam.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + param.setEnabled(cbParam.isSelected()); + } + }); + add(cbParam, gbc); + + gbc.gridx = 1; + gbc.weightx = 0; + gbc.anchor = GridBagConstraints.EAST; + + final JButton bEdit = new JButton(tr("Edit")); + bEdit.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent arg0) { + JDialog dlg = new ServerParamDialog(param); + dlg.setVisible(true); + dlg.dispose(); + refresh(); + } + }); + add(bEdit, gbc); + + gbc.gridx = 2; + final JButton bDel = new JButton(tr("Delete")); + bDel.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent arg0) { + if (JOptionPane.showConfirmDialog(Main.parent, + tr("Delete parameter \"{0}\"?", param.getName()), + tr("Are you sure?"), + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) + { + m_listParam.removeParam(param); + refresh(); + } + } + }); + add(bDel, gbc); + + gbc.gridy++; + } + gbc.gridx = 0; + gbc.fill = GridBagConstraints.NONE; + gbc.anchor = GridBagConstraints.WEST; + + JPanel p = new JPanel(new GridBagLayout()); + + final JButton bNew = new JButton(tr("Add new")); + bNew.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent arg0) { + JDialog dlg = new ServerParamDialog(null); + dlg.setVisible(true); + dlg.dispose(); + ServerParam param = ((ServerParamDialog)dlg).getServerParam(); + if (param != null && param.getName() != null && (!"".equals(param.getName()))) { + m_listParam.addParam(param); + param.setEnabled(true); + } + refresh(); + } + }); + p.add(bNew); + + final JButton bPredefined = new JButton(tr("Add predefined")); + bPredefined.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent arg0) { + ServerParamList myParamList; + + myParamList = new ServerParamList(null); + + ServerParamSelectDialog dialog = new ServerParamSelectDialog(myParamList.getParamList(), null); + + if (dialog.getShow()) { + JOptionPane pane = new JOptionPane(dialog, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION); + JDialog dlg = pane.createDialog(Main.parent, tr("Tracer2") + " - " + tr("Select predefined parameter")); + dlg.setVisible(true); + Object obj = pane.getValue(); + dlg.dispose(); + if(obj != null && ((Integer)obj) == JOptionPane.OK_OPTION) { + ServerParam param = dialog.getSelectedParam(); + + dlg = new ServerParamDialog(param); + dlg.setVisible(true); + dlg.dispose(); + param = ((ServerParamDialog)dlg).getServerParam(); + if (param != null && param.getName() != null && (!"".equals(param.getName()))) { + m_listParam.addParam(param); + param.setEnabled(true); + } + } + } + refresh(); + } + }); + p.add(bPredefined); + + add(p, gbc); + gbc.gridy++; + + gbc.weightx = 1.0; + gbc.weighty = 1.0; + gbc.fill = GridBagConstraints.BOTH; + add(new JPanel(), gbc); + revalidate(); + repaint(); + } + +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamPreference.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamPreference.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamPreference.java (revision 30047) @@ -0,0 +1,58 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2.preferences; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagConstraints; + +import javax.swing.JPanel; +import javax.swing.JScrollPane; + +import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting; +import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane; +import org.openstreetmap.josm.plugins.tracer2.TracerPlugin; +import org.openstreetmap.josm.tools.GBC; + +public class ServerParamPreference extends DefaultTabPreferenceSetting { + + TracerPlugin m_oPlugin; + + public ServerParamPreference(TracerPlugin plugin) { + super("tracer2", tr("Tracer2") + " - " + tr("Preferences"), tr("Modify list of parameter for server request.")); + + m_oPlugin = plugin; + } + + @Override + public void addGui(PreferenceTabbedPane gui) { + JPanel p = gui.createPreferenceTab(this); + ServerParamPanel spp = new ServerParamPanel(m_oPlugin.m_oParamList); + spp.refresh(); + JScrollPane sp = new JScrollPane(spp); + p.add(sp, GBC.eol().fill(GridBagConstraints.BOTH)); + } + + @Override + public boolean ok() { + m_oPlugin.m_oParamList.save(); + return false; + } + +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamSelectDialog.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamSelectDialog.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamSelectDialog.java (revision 30047) @@ -0,0 +1,105 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2.preferences; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.util.List; + +import javax.swing.JComboBox; +import javax.swing.JLabel; +import javax.swing.JPanel; + +import org.openstreetmap.josm.plugins.tracer2.TracerPlugin; + +public class ServerParamSelectDialog extends JPanel { + + /** + * + */ + private static final long serialVersionUID = 5655941545321036641L; + + private JComboBox m_oComboBox; + List m_listServerParam; + private boolean m_bShow = true; + + public boolean getShow() { + return m_bShow; + } + + public ServerParamSelectDialog(List listParam) { + Init(m_listServerParam, null); + } + + public ServerParamSelectDialog(List listServerParam, ServerParam activParam) { + Init(listServerParam, activParam); + } + + private void Init(List listParam, ServerParam activParam) { + GridBagConstraints c = new GridBagConstraints(); + + String[] astr = new String[listParam.size()]; + + m_listServerParam = listParam; + + if ( activParam == null ) { + activParam = m_listServerParam.get(0); + } + int i = 0; + int pos = 0; + for ( ServerParam param: m_listServerParam ) { + astr[i] = param.getName(); + if (param.equals(activParam)) { + pos = i; + } + i++; + } + m_oComboBox = new JComboBox(astr); + m_oComboBox.setSelectedIndex(pos); + + setLayout(new GridBagLayout()); + + c.insets = new Insets(4,4,4,4); + c.gridwidth = 1; + c.weightx = 0.8; + c.fill = GridBagConstraints.HORIZONTAL; + c.gridx = 0; + c.gridy = 0; + add(new JLabel(tr("Parameter:")), c); + + c.gridwidth = 1; + c.gridx = 1; + c.gridy = 0; + c.weightx = 1.5; + add(m_oComboBox, c); + } + + public ServerParam getSelectedParam() { + int nSel = m_oComboBox.getSelectedIndex(); + return m_listServerParam.get(nSel); + } + public void checkComboBox() { + int nSel = m_oComboBox.getSelectedIndex(); + TracerPlugin.s_oPlugin.m_oParamList.setActivParam(m_listServerParam.get(nSel)); + } + +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetTrace.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetTrace.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetTrace.java (revision 30047) @@ -0,0 +1,88 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2.server; + +import java.util.ArrayList; + +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.plugins.tracer2.preferences.ServerParam; + +public class GetTrace extends Request { + + private LatLon m_oLatLon; + private ServerParam m_oServerParam; + public ArrayList m_listLatLon = new ArrayList(); + + /** + * Trace s simple shape on position. + * @param oLatLon position of starting traceing. + * @param oParam parameter for tracing. + */ + public GetTrace(LatLon oLatLon, ServerParam oParam) { + m_oLatLon = oLatLon; + m_oServerParam = oParam; + } + + /** + * Thread that get a shape from the Server. + */ + public void run() { + try { + String strResponse = callServer("traceOrder=GetTrace" + + "&traceLat=" + m_oLatLon.lat() + + "&traceLon=" + m_oLatLon.lon() + + "&traceName=" + m_oServerParam.getName() + + "&traceUrl=" + m_oServerParam.getUrl() + + "&traceTileSize=" + m_oServerParam.getTileSize() + + "&traceResolution=" + m_oServerParam.getResolution() + //+ "&traceSkipBottom=" + param.getSkipBottom() + + "&traceMode=" + m_oServerParam.getMode() + + "&traceThreshold=" + m_oServerParam.getThreshold() + + "&tracePointsPerCircle=" + m_oServerParam.getPointsPerCircle() + ); + + if (strResponse == null || strResponse.equals("")) { + return; + } + + if (checkError(strResponse) == true) { + return; + } + + if (!strResponse.startsWith("(") || !strResponse.endsWith(")")){ + return; + } + strResponse = strResponse.substring(1, strResponse.length()-1); + + ArrayList nodelist = new ArrayList(); + + String[] astrPoints = strResponse.split("\\)\\("); + for (String strPoint : astrPoints) { + String[] astrParts = strPoint.split(":"); + double x = Double.parseDouble(astrParts[0]); + double y = Double.parseDouble(astrParts[1]); + nodelist.add(new LatLon(x, y)); + } + m_listLatLon = nodelist; + } catch (Exception e) { + m_listLatLon = new ArrayList(); + } + } + +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetVersion.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetVersion.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetVersion.java (revision 30047) @@ -0,0 +1,59 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2.server; + +public class GetVersion extends Request { + + public int m_nVersionMajor = -1; + public int m_nVersionMinor = -1; + + /** + * Get version from server. + */ + public GetVersion() { + } + + /** + * Thread that get the version of the Server. + */ + public void run() { + try { + String strResponse = callServer("traceOrder=GetVersion" ); + + if (strResponse == null || strResponse.equals("")) { + return; + } + + if (checkError(strResponse) == true) { + return; + } + + String[] astrParts = strResponse.split(":"); + if (astrParts.length != 2) { + return; + } + int nMajor = Integer.parseInt(astrParts[0]); + int nMinor = Integer.parseInt(astrParts[1]); + m_nVersionMajor = nMajor; + m_nVersionMinor = nMinor; + } catch (Exception e) { + } + } + +} Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/Request.java =================================================================== --- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/Request.java (revision 30047) +++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/Request.java (revision 30047) @@ -0,0 +1,82 @@ +/** + * Tracer2 - plug-in for JOSM to capture contours + * + * 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. + */ + +package org.openstreetmap.josm.plugins.tracer2.server; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.ConnectException; +import java.net.URL; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; + +public class Request extends Thread { + + static final String URL = "http://localhost:49243/"; + + public Request() { + } + + /** + * Send request to the server. + * @param strUrl request. + * @return Result text. + */ + protected String callServer(String strUrl) { + try { + URL oUrl = new URL(URL + strUrl); + BufferedReader oReader = new BufferedReader(new InputStreamReader(oUrl.openStream())); + StringBuilder oBuilder = new StringBuilder(); + String strLine; + while ((strLine = oReader.readLine()) != null) { + oBuilder.append(strLine); + } + return oBuilder.toString(); + } catch (ConnectException e) { + JOptionPane.showMessageDialog(Main.parent, tr("Tracer2Server isn''t running. Pleas start the Server.\nIf you don''t have the Server please download it at" + + "\nhttp://sourceforge.net/projects/tracer2server/.") , tr("Error"), JOptionPane.ERROR_MESSAGE); + return ""; + } catch (Exception e) { + JOptionPane.showMessageDialog(Main.parent, tr("Tracer2Server has nothing found.") + "\n", tr("Error"), JOptionPane.ERROR_MESSAGE); + return ""; + } + } + + /** + * Checks errors in response from the server. + * @param strResponse response from the server. + * @return Result text. + */ + protected boolean checkError(String strResponse) { + String strIdentifier = "&traceError="; + if (strResponse.contains(strIdentifier)) { + String strError = strResponse.replaceFirst(strIdentifier, "").trim(); + JOptionPane.showMessageDialog(Main.parent, tr("Tracer2Server has an Error detected.") + "\n" + strError, tr("Error"), JOptionPane.ERROR_MESSAGE); + return true; + } + return false; + } + + public void run() { + } + +}