Index: /applications/editors/josm/plugins/gpxfilter/GPL-v2.0.txt =================================================================== --- /applications/editors/josm/plugins/gpxfilter/GPL-v2.0.txt (revision 23541) +++ /applications/editors/josm/plugins/gpxfilter/GPL-v2.0.txt (revision 23541) @@ -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/gpxfilter/GPL-v3.0.txt =================================================================== --- /applications/editors/josm/plugins/gpxfilter/GPL-v3.0.txt (revision 23541) +++ /applications/editors/josm/plugins/gpxfilter/GPL-v3.0.txt (revision 23541) @@ -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/gpxfilter/README =================================================================== --- /applications/editors/josm/plugins/gpxfilter/README (revision 23541) +++ /applications/editors/josm/plugins/gpxfilter/README (revision 23541) @@ -0,0 +1,10 @@ +README +====== + +Readme for your plugin + + * Plugin author is Upliner + + * The license for plugin is "GPL v2 or later". + + * No other notes. Index: /applications/editors/josm/plugins/gpxfilter/README.template =================================================================== --- /applications/editors/josm/plugins/gpxfilter/README.template (revision 23541) +++ /applications/editors/josm/plugins/gpxfilter/README.template (revision 23541) @@ -0,0 +1,78 @@ +README +====== + +This is a template project structure for a JOSM plugin. + +Layout +====== ++--- src source of your plugin + |- images images your plugin needs + |- resources resources your plugin needs + + README README for your plugin + + GPL-v2.0.txt GPL version 2 license text + GPL-v3.0.txt GPL version 3 license text + + README.template this file + + +Build +===== +A JOSM plugin is built as a single jar. We use ant to build. + +See build.xml in this directory and update the plugin specific properties in the +configuration section. + + +Maintaining versions +==================== +There are two versions maintained with each plugin: + 1) the main version + This is the lowest JOSM version required by this plugin. + You have to manually set the plugins main version in the build script. + Set the property plugin.main.version in build.xml accordingly. + + 2) the build version + The build version is unique for every build of the plugin. It is equal + to the SVN revision of your plugin directory. + + Both the main version and the build version are included in properties of the plugins + manifest: + Plugin-Version the build version + Plugin-Mainversion the main version + + JOSM automatically detects whether a plugin needs to be upgraded. It compares the build + version of the currently installed plugin jar with the build version of the plugin jar in + the SVN. The main version is irrelevant for this process. + + Making your plugin available to JOSM users + =========================================== + When a plugin jar is checked into SVN a script updates the plugins list on the JOSM wiki: + http://josm.openstreetmap.de/wiki/Plugins + JOSM retrieves the list of available plugins and their build versions from this list. + + commit publish read + meta data meta data + Build ==> SVN =======> JOSM Wiki <======= JOSM + ^ + ================================== + fetch current plugin jar + + Note that you have to manually publish (commit) your plugin jar. There is no nightly build + in place. Everything else (pulishing meta data, updating plugins in the client) is then handled + by automatic processes. + +See also +======== +* Developing Plugins + http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins + +* List of JOSM Plugins + http://josm.openstreetmap.de/wiki/Plugins + + + + + + Index: /applications/editors/josm/plugins/gpxfilter/build.xml =================================================================== --- /applications/editors/josm/plugins/gpxfilter/build.xml (revision 23541) +++ /applications/editors/josm/plugins/gpxfilter/build.xml (revision 23541) @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Building against core revision ${coreversion.info.entry.revision}. + Plugin-Mainversion is set to ${plugin.main.version}. + + + + + + Commiting the plugin source with message '${commit.message}' ... + + + + + + + + + + + Updating plugin source ... + + + + + + Updating ${plugin.jar} ... + + + + + + + + + + + ***** Properties of published ${plugin.jar} ***** + Commit message : '${commit.message}' + Plugin-Mainversion: ${plugin.main.version} + JOSM build version: ${coreversion.info.entry.revision} + Plugin-Version : ${version.entry.commit.revision} + ***** / Properties of published ${plugin.jar} ***** + + Now commiting ${plugin.jar} ... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java =================================================================== --- /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java (revision 23541) +++ /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java (revision 23541) @@ -0,0 +1,32 @@ +package gpxfilter; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.tools.Shortcut; + +@SuppressWarnings("serial") +public class AddEGpxLayerAction extends JosmAction { + + public AddEGpxLayerAction() { + super(tr("Add EGPX layer"),null,tr("Add EGPX layer"), + Shortcut.registerShortcut("tool:egpx", + tr("Tool: {0}", tr("Add EGPX layer")), + KeyEvent.VK_G, Shortcut.GROUP_EDIT, + Shortcut.SHIFT_DEFAULT), + true); + } + + @Override + protected void updateEnabledState() { + setEnabled(getCurrentDataSet() != null); + } + + public void actionPerformed(ActionEvent arg0) { + Main.main.addLayer(new EGpxLayer(Main.map.mapView.getRealBounds())); + } +} Index: /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/EGpxLayer.java =================================================================== --- /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/EGpxLayer.java (revision 23541) +++ /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/EGpxLayer.java (revision 23541) @@ -0,0 +1,1505 @@ +// License: GPL. See LICENSE file for details. + +package gpxfilter; + +import static org.openstreetmap.josm.gui.help.HelpUtil.ht; +import static org.openstreetmap.josm.tools.I18n.marktr; +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.GridBagLayout; +import java.awt.Point; +import java.awt.event.ActionEvent; +import java.awt.geom.Area; +import java.awt.geom.Rectangle2D; +import java.io.File; +import java.text.DateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.Future; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.Box; +import javax.swing.ButtonGroup; +import javax.swing.Icon; +import javax.swing.JColorChooser; +import javax.swing.JFileChooser; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JScrollPane; +import javax.swing.SwingUtilities; +import javax.swing.filechooser.FileFilter; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.RenameLayerAction; +import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTaskList; +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.gpx.GpxData; +import org.openstreetmap.josm.data.gpx.GpxTrack; +import org.openstreetmap.josm.data.gpx.GpxTrackSegment; +import org.openstreetmap.josm.data.gpx.WayPoint; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; +import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; +import org.openstreetmap.josm.gui.HelpAwareOptionPane; +import org.openstreetmap.josm.gui.MapView; +import org.openstreetmap.josm.gui.NavigatableComponent; +import org.openstreetmap.josm.gui.dialogs.LayerListDialog; +import org.openstreetmap.josm.gui.dialogs.LayerListPopup; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker; +import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; +import org.openstreetmap.josm.gui.progress.NullProgressMonitor; +import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor; +import org.openstreetmap.josm.gui.widgets.HtmlPanel; +import org.openstreetmap.josm.io.JpgImporter; +import org.openstreetmap.josm.tools.AudioUtil; +import org.openstreetmap.josm.tools.DateUtils; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.UrlLabel; + +public class EGpxLayer extends Layer { + + private static final String PREF_DOWNLOAD_ALONG_TRACK_DISTANCE = "gpxLayer.downloadAlongTrack.distance"; + private static final String PREF_DOWNLOAD_ALONG_TRACK_AREA = "gpxLayer.downloadAlongTrack.area"; + private static final String PREF_DOWNLOAD_ALONG_TRACK_NEAR = "gpxLayer.downloadAlongTrack.near"; + + public final GpxData data = new GpxData(); + protected static final double PHI = Math.toRadians(15); + private boolean computeCacheInSync; + private int computeCacheMaxLineLengthUsed; + private Color computeCacheColorUsed; + private colorModes computeCacheColored; + private int computeCacheColorTracksTune; + private boolean isLocalFile; + + private final List lastTracks = new ArrayList(); // List of tracks at last paint + private int lastUpdateCount; + private final Bounds bounds; + private volatile boolean painting; + + private static class Markers { + public boolean timedMarkersOmitted = false; + public boolean untimedMarkersOmitted = false; + } + + public EGpxLayer(Bounds b) { + super("GPX Data"); + this.bounds = b; + Thread t = new Thread(new Runnable() + { + @Override + public void run() { + GpxGrabber grabber = new GpxGrabber(EGpxLayer.this.bounds); + while (true) { + GpxData newData; + try { + newData = grabber.parseRawGps(); + } catch (Exception e) { + e.printStackTrace(); + break; + } + if (newData == null || !newData.hasTrackPoints()) break; + synchronized (this) { + data.mergeFrom(newData); + } + + if (!EGpxLayer.this.painting) { + Main.map.repaint(); + } + } + grabber.cancel(); + } + }); + t.setDaemon(true); + t.start(); + } + + @Override + public Icon getIcon() { + return ImageProvider.get("layer", "gpx_small"); + } + + @Override + public synchronized Object getInfoComponent() { + StringBuilder info = new StringBuilder(); + + if (data.attr.containsKey("name")) { + info.append(tr("Name: {0}", data.attr.get(GpxData.META_NAME))).append("
"); + } + + if (data.attr.containsKey("desc")) { + info.append(tr("Description: {0}", data.attr.get(GpxData.META_DESC))).append("
"); + } + + if (data.tracks.size() > 0) { + info.append(""); + + for (GpxTrack trk : data.tracks) { + WayPoint earliest = null, latest = null; + + info.append(""); + } + + info.append("
" + + trn("{0} track", "{0} tracks", data.tracks.size(), data.tracks.size()) + + "
" + tr("Name") + "" + + tr("Description") + "" + tr("Timespan") + + "" + tr("Length") + "" + tr("URL") + + "
"); + if (trk.getAttributes().containsKey("name")) { + info.append(trk.getAttributes().get("name")); + } + info.append(""); + if (trk.getAttributes().containsKey("desc")) { + info.append(" ").append(trk.getAttributes().get("desc")); + } + info.append(""); + + for (GpxTrackSegment seg : trk.getSegments()) { + for (WayPoint pnt : seg.getWayPoints()) { + if (latest == null) { + latest = earliest = pnt; + } else { + if (pnt.compareTo(earliest) < 0) { + earliest = pnt; + } else { + latest = pnt; + } + } + } + } + + if (earliest != null && latest != null) { + DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT); + String earliestDate = df.format(earliest.getTime()); + String latestDate = df.format(latest.getTime()); + + if (earliestDate.equals(latestDate)) { + DateFormat tf = DateFormat.getTimeInstance(DateFormat.SHORT); + info.append(earliestDate).append(" "); + info.append(tf.format(earliest.getTime())).append(" - ").append(tf.format(latest.getTime())); + } else { + DateFormat dtf = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT); + info.append(dtf.format(earliest.getTime())).append(" - ").append(dtf.format(latest.getTime())); + } + + int diff = (int) (latest.time - earliest.time); + info.append(String.format(" (%d:%02d)", diff / 3600, (diff % 3600) / 60)); + } + + info.append(""); + info.append(NavigatableComponent.getSystemOfMeasurement().getDistText(trk.length())); + info.append(""); + if (trk.getAttributes().containsKey("url")) { + info.append(trk.getAttributes().get("url")); + } + info.append("


"); + + } + + info.append(tr("Length: {0}", NavigatableComponent.getSystemOfMeasurement().getDistText(data.length()))).append("
"); + + info.append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size())).append( + trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("
"); + + final JScrollPane sp = new JScrollPane(new HtmlPanel(info.toString()), JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + sp.setPreferredSize(new Dimension(sp.getPreferredSize().width, 350)); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + sp.getVerticalScrollBar().setValue(0); + } + }); + return sp; + } + + static public Color getColor(String name) { + return Main.pref.getColor(marktr("gps point"), name != null ? "layer " + name : null, Color.gray); + } + + @Override + public Action[] getMenuEntries() { + if (Main.applet) + return new Action[] { + LayerListDialog.getInstance().createShowHideLayerAction(), + LayerListDialog.getInstance().createDeleteLayerAction(), + SeparatorLayerAction.INSTANCE, + new CustomizeColor(), + new CustomizeLineDrawing(), + new ConvertToDataLayerAction(), + SeparatorLayerAction.INSTANCE, + new RenameLayerAction(getAssociatedFile(), this), + SeparatorLayerAction.INSTANCE, + new LayerListPopup.InfoAction(this) }; + return new Action[] { + LayerListDialog.getInstance().createShowHideLayerAction(), + LayerListDialog.getInstance().createDeleteLayerAction(), + SeparatorLayerAction.INSTANCE, + new LayerSaveAction(this), + new LayerSaveAsAction(this), + new CustomizeColor(), + new CustomizeLineDrawing(), + new ImportImages(), + new ImportAudio(), + new MarkersFromNamedPoins(), + new ConvertToDataLayerAction(), + new DownloadAlongTrackAction(), + SeparatorLayerAction.INSTANCE, + new RenameLayerAction(getAssociatedFile(), this), + SeparatorLayerAction.INSTANCE, + new LayerListPopup.InfoAction(this) }; + } + + @Override + public synchronized String getToolTipText() { + StringBuilder info = new StringBuilder().append(""); + + if (data.attr.containsKey("name")) { + info.append(tr("Name: {0}", data.attr.get(GpxData.META_NAME))).append("
"); + } + + if (data.attr.containsKey("desc")) { + info.append(tr("Description: {0}", data.attr.get(GpxData.META_DESC))).append("
"); + } + + info.append(trn("{0} track, ", "{0} tracks, ", data.tracks.size(), data.tracks.size())); + info.append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size())); + info.append(trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("
"); + + info.append(tr("Length: {0}", NavigatableComponent.getSystemOfMeasurement().getDistText(data.length()))); + info.append("
"); + + return info.append("").toString(); + } + + @Override + public boolean isMergable(Layer other) { + return other instanceof EGpxLayer; + } + + private synchronized int sumUpdateCount() { + int updateCount = 0; + for (GpxTrack track: data.tracks) { + updateCount += track.getUpdateCount(); + } + return updateCount; + } + + @Override + public synchronized boolean isChanged() { + if (data.tracks.equals(lastTracks)) + return sumUpdateCount() != lastUpdateCount; + else + return true; + } + + @Override + public synchronized void mergeFrom(Layer from) { + data.mergeFrom(((EGpxLayer) from).data); + computeCacheInSync = false; + } + + private static Color[] colors = new Color[256]; + static { + for (int i = 0; i < colors.length; i++) { + colors[i] = Color.getHSBColor(i / 300.0f, 1, 1); + } + } + + // lookup array to draw arrows without doing any math + private static int ll0 = 9; + private static int sl4 = 5; + private static int sl9 = 3; + private static int[][] dir = { { +sl4, +ll0, +ll0, +sl4 }, { -sl9, +ll0, +sl9, +ll0 }, { -ll0, +sl4, -sl4, +ll0 }, + { -ll0, -sl9, -ll0, +sl9 }, { -sl4, -ll0, -ll0, -sl4 }, { +sl9, -ll0, -sl9, -ll0 }, + { +ll0, -sl4, +sl4, -ll0 }, { +ll0, +sl9, +ll0, -sl9 }, { +sl4, +ll0, +ll0, +sl4 }, + { -sl9, +ll0, +sl9, +ll0 }, { -ll0, +sl4, -sl4, +ll0 }, { -ll0, -sl9, -ll0, +sl9 } }; + + // the different color modes + enum colorModes { + none, velocity, dilution + } + + @Override + public synchronized void paint(Graphics2D g, MapView mv, Bounds box) { + painting = true; + lastUpdateCount = sumUpdateCount(); + lastTracks.clear(); + lastTracks.addAll(data.tracks); + + /**************************************************************** + ********** STEP 1 - GET CONFIG VALUES ************************** + ****************************************************************/ + // Long startTime = System.currentTimeMillis(); + Color neutralColor = getColor(getName()); + // also draw lines between points belonging to different segments + boolean forceLines = Main.pref.getBoolean("draw.rawgps.lines.force"); + // draw direction arrows on the lines + boolean direction = Main.pref.getBoolean("draw.rawgps.direction"); + // don't draw lines if longer than x meters + int lineWidth = Main.pref.getInteger("draw.rawgps.linewidth",0); + + int maxLineLength; + if (this.isLocalFile) { + maxLineLength = Main.pref.getInteger("draw.rawgps.max-line-length.local", -1); + } else { + maxLineLength = Main.pref.getInteger("draw.rawgps.max-line-length", 200); + } + // draw line between points, global setting + boolean lines = (Main.pref.getBoolean("draw.rawgps.lines", true) || (Main.pref + .getBoolean("draw.rawgps.lines.localfiles") && this.isLocalFile)); + String linesKey = "draw.rawgps.lines.layer " + getName(); + // draw lines, per-layer setting + if (Main.pref.hasKey(linesKey)) { + lines = Main.pref.getBoolean(linesKey); + } + // paint large dots for points + boolean large = Main.pref.getBoolean("draw.rawgps.large"); + boolean hdopcircle = Main.pref.getBoolean("draw.rawgps.hdopcircle", true); + // color the lines + colorModes colored = colorModes.none; + try { + colored = colorModes.values()[Main.pref.getInteger("draw.rawgps.colors", 0)]; + } catch (Exception e) { + } + // paint direction arrow with alternate math. may be faster + boolean alternatedirection = Main.pref.getBoolean("draw.rawgps.alternatedirection"); + // don't draw arrows nearer to each other than this + int delta = Main.pref.getInteger("draw.rawgps.min-arrow-distance", 0); + // allows to tweak line coloring for different speed levels. + int colorTracksTune = Main.pref.getInteger("draw.rawgps.colorTracksTune", 45); + + if(lineWidth != 0) + { + g.setStroke(new BasicStroke(lineWidth,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND)); + } + + /**************************************************************** + ********** STEP 2a - CHECK CACHE VALIDITY ********************** + ****************************************************************/ + if ((computeCacheMaxLineLengthUsed != maxLineLength) || (!neutralColor.equals(computeCacheColorUsed)) + || (computeCacheColored != colored) || (computeCacheColorTracksTune != colorTracksTune)) { + // System.out.println("(re-)computing gpx line styles, reason: CCIS=" + + // computeCacheInSync + " CCMLLU=" + (computeCacheMaxLineLengthUsed != maxLineLength) + + // " CCCU=" + (!neutralColor.equals(computeCacheColorUsed)) + " CCC=" + + // (computeCacheColored != colored)); + computeCacheMaxLineLengthUsed = maxLineLength; + computeCacheInSync = false; + computeCacheColorUsed = neutralColor; + computeCacheColored = colored; + computeCacheColorTracksTune = colorTracksTune; + } + + /**************************************************************** + ********** STEP 2b - RE-COMPUTE CACHE DATA ********************* + ****************************************************************/ + if (!computeCacheInSync) { // don't compute if the cache is good + WayPoint oldWp = null; + for (GpxTrack trk : data.tracks) { + for (GpxTrackSegment segment : trk.getSegments()) { + if (!forceLines) { // don't draw lines between segments, unless forced to + oldWp = null; + } + for (WayPoint trkPnt : segment.getWayPoints()) { + LatLon c = trkPnt.getCoor(); + if (Double.isNaN(c.lat()) || Double.isNaN(c.lon())) { + continue; + } + trkPnt.customColoring = neutralColor; + if (oldWp != null) { + double dist = c.greatCircleDistance(oldWp.getCoor()); + + switch (colored) { + case velocity: + double dtime = trkPnt.time - oldWp.time; + double vel = dist / dtime; + double velColor = vel / colorTracksTune * 255; + // Bad case first + if (dtime <= 0 || vel < 0 || velColor > 255) { + trkPnt.customColoring = colors[255]; + } else { + trkPnt.customColoring = colors[(int) (velColor)]; + } + break; + + case dilution: + if (trkPnt.attr.get("hdop") != null) { + float hdop = ((Float) trkPnt.attr.get("hdop")).floatValue(); + if (hdop < 0) { + hdop = 0; + } + int hdoplvl = Math.round(hdop * Main.pref.getInteger("hdop.factor", 25)); + // High hdop is bad, but high values in colors are green. + // Therefore inverse the logic + int hdopcolor = 255 - (hdoplvl > 255 ? 255 : hdoplvl); + trkPnt.customColoring = colors[hdopcolor]; + } + break; + } + + if (maxLineLength == -1 || dist <= maxLineLength) { + trkPnt.drawLine = true; + trkPnt.dir = (int) oldWp.getCoor().heading(trkPnt.getCoor()); + } else { + trkPnt.drawLine = false; + } + } else { // make sure we reset outdated data + trkPnt.drawLine = false; + } + oldWp = trkPnt; + } + } + } + computeCacheInSync = true; + } + + List> visibleSegments = new ArrayList>(); + for (GpxTrack trk: data.tracks) { + for (GpxTrackSegment trkSeg: trk.getSegments()) { + if (trkSeg.getBounds() != null && trkSeg.getBounds().intersects(box)) { + visibleSegments.add(trkSeg.getWayPoints()); + } + } + } + + /**************************************************************** + ********** STEP 3a - DRAW LINES ******************************** + ****************************************************************/ + if (lines) { + Point old = null; + for (Collection segment : visibleSegments) { + for (WayPoint trkPnt : segment) { + LatLon c = trkPnt.getCoor(); + if (Double.isNaN(c.lat()) || Double.isNaN(c.lon())) { + continue; + } + Point screen = mv.getPoint(trkPnt.getEastNorth()); + if (trkPnt.drawLine) { + // skip points that are on the same screenposition + if (old != null && ((old.x != screen.x) || (old.y != screen.y))) { + g.setColor(trkPnt.customColoring); + g.drawLine(old.x, old.y, screen.x, screen.y); + } + } + old = screen; + } // end for trkpnt + } // end for segment + } // end if lines + + /**************************************************************** + ********** STEP 3b - DRAW NICE ARROWS ************************** + ****************************************************************/ + if (lines && direction && !alternatedirection) { + Point old = null; + Point oldA = null; // last arrow painted + for (Collection segment : visibleSegments) { + for (WayPoint trkPnt : segment) { + LatLon c = trkPnt.getCoor(); + if (Double.isNaN(c.lat()) || Double.isNaN(c.lon())) { + continue; + } + if (trkPnt.drawLine) { + Point screen = mv.getPoint(trkPnt.getEastNorth()); + // skip points that are on the same screenposition + if (old != null + && (oldA == null || screen.x < oldA.x - delta || screen.x > oldA.x + delta + || screen.y < oldA.y - delta || screen.y > oldA.y + delta)) { + g.setColor(trkPnt.customColoring); + double t = Math.atan2(screen.y - old.y, screen.x - old.x) + Math.PI; + g.drawLine(screen.x, screen.y, (int) (screen.x + 10 * Math.cos(t - PHI)), + (int) (screen.y + 10 * Math.sin(t - PHI))); + g.drawLine(screen.x, screen.y, (int) (screen.x + 10 * Math.cos(t + PHI)), + (int) (screen.y + 10 * Math.sin(t + PHI))); + oldA = screen; + } + old = screen; + } + } // end for trkpnt + } // end for segment + } // end if lines + + /**************************************************************** + ********** STEP 3c - DRAW FAST ARROWS ************************** + ****************************************************************/ + if (lines && direction && alternatedirection) { + Point old = null; + Point oldA = null; // last arrow painted + for (Collection segment : visibleSegments) { + for (WayPoint trkPnt : segment) { + LatLon c = trkPnt.getCoor(); + if (Double.isNaN(c.lat()) || Double.isNaN(c.lon())) { + continue; + } + if (trkPnt.drawLine) { + Point screen = mv.getPoint(trkPnt.getEastNorth()); + // skip points that are on the same screenposition + if (old != null + && (oldA == null || screen.x < oldA.x - delta || screen.x > oldA.x + delta + || screen.y < oldA.y - delta || screen.y > oldA.y + delta)) { + g.setColor(trkPnt.customColoring); + g.drawLine(screen.x, screen.y, screen.x + dir[trkPnt.dir][0], screen.y + + dir[trkPnt.dir][1]); + g.drawLine(screen.x, screen.y, screen.x + dir[trkPnt.dir][2], screen.y + + dir[trkPnt.dir][3]); + oldA = screen; + } + old = screen; + } + } // end for trkpnt + } // end for segment + } // end if lines + + /**************************************************************** + ********** STEP 3d - DRAW LARGE POINTS AND HDOP CIRCLE ********* + ****************************************************************/ + if (large || hdopcircle) { + g.setColor(neutralColor); + for (Collection segment : visibleSegments) { + for (WayPoint trkPnt : segment) { + LatLon c = trkPnt.getCoor(); + if (Double.isNaN(c.lat()) || Double.isNaN(c.lon())) { + continue; + } + Point screen = mv.getPoint(trkPnt.getEastNorth()); + g.setColor(trkPnt.customColoring); + if (hdopcircle && trkPnt.attr.get("hdop") != null) { + // hdop value + float hdop = ((Float)trkPnt.attr.get("hdop")).floatValue(); + if (hdop < 0) { + hdop = 0; + } + // hdop pixels + int hdopp = mv.getPoint(new LatLon(trkPnt.getCoor().lat(), trkPnt.getCoor().lon() + 2*6*hdop*360/40000000)).x - screen.x; + g.drawArc(screen.x-hdopp/2, screen.y-hdopp/2, hdopp, hdopp, 0, 360); + } + if (large) { + g.fillRect(screen.x-1, screen.y-1, 3, 3); + } + } // end for trkpnt + } // end for segment + } // end if large || hdopcircle + + /**************************************************************** + ********** STEP 3e - DRAW SMALL POINTS FOR LINES *************** + ****************************************************************/ + if (!large && lines) { + g.setColor(neutralColor); + for (Collection segment : visibleSegments) { + for (WayPoint trkPnt : segment) { + LatLon c = trkPnt.getCoor(); + if (Double.isNaN(c.lat()) || Double.isNaN(c.lon())) { + continue; + } + if (!trkPnt.drawLine) { + Point screen = mv.getPoint(trkPnt.getEastNorth()); + g.drawRect(screen.x, screen.y, 0, 0); + } + } // end for trkpnt + } // end for segment + } // end if large + + /**************************************************************** + ********** STEP 3f - DRAW SMALL POINTS INSTEAD OF LINES ******** + ****************************************************************/ + if (!large && !lines) { + g.setColor(neutralColor); + for (Collection segment : visibleSegments) { + for (WayPoint trkPnt : segment) { + LatLon c = trkPnt.getCoor(); + if (Double.isNaN(c.lat()) || Double.isNaN(c.lon())) { + continue; + } + Point screen = mv.getPoint(trkPnt.getEastNorth()); + g.setColor(trkPnt.customColoring); + g.drawRect(screen.x, screen.y, 0, 0); + } // end for trkpnt + } // end for segment + } // end if large + + // Long duration = System.currentTimeMillis() - startTime; + // System.out.println(duration); + painting = false; + } // end paint + + @Override + public synchronized void visitBoundingBox(BoundingXYVisitor v) { + v.visit(data.recalculateBounds()); + } + + public class ConvertToDataLayerAction extends AbstractAction { + public ConvertToDataLayerAction() { + super(tr("Convert to data layer"), ImageProvider.get("converttoosm")); + } + + public void actionPerformed(ActionEvent e) { + JPanel msg = new JPanel(new GridBagLayout()); + msg + .add( + new JLabel( + tr("Upload of unprocessed GPS data as map data is considered harmful.
If you want to upload traces, look here:")), + GBC.eol()); + msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces")), GBC.eop()); + if (!ConditionalOptionPaneUtil.showConfirmationDialog("convert_to_data", Main.parent, msg, tr("Warning"), + JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, JOptionPane.OK_OPTION)) + return; + DataSet ds = new DataSet(); + for (GpxTrack trk : data.tracks) { + for (GpxTrackSegment segment : trk.getSegments()) { + List nodes = new ArrayList(); + for (WayPoint p : segment.getWayPoints()) { + Node n = new Node(p.getCoor()); + String timestr = p.getString("time"); + if (timestr != null) { + n.setTimestamp(DateUtils.fromString(timestr)); + } + ds.addPrimitive(n); + nodes.add(n); + } + Way w = new Way(); + w.setNodes(nodes); + ds.addPrimitive(w); + } + } + Main.main + .addLayer(new OsmDataLayer(ds, tr("Converted from: {0}", EGpxLayer.this.getName()), getAssociatedFile())); + Main.main.removeLayer(EGpxLayer.this); + } + } + + @Override + public File getAssociatedFile() { + return data.storageFile; + } + + @Override + public void setAssociatedFile(File file) { + data.storageFile = file; + } + + /** + * Action that issues a series of download requests to the API, following the GPX track. + * + * @author fred + */ + public class DownloadAlongTrackAction extends AbstractAction { + public DownloadAlongTrackAction() { + super(tr("Download from OSM along this track"), ImageProvider.get("downloadalongtrack")); + } + + public void actionPerformed(ActionEvent e) { + JPanel msg = new JPanel(new GridBagLayout()); + Integer dist[] = { 5000, 500, 50 }; + Integer area[] = { 20, 10, 5, 1 }; + + msg.add(new JLabel(tr("Download everything within:")), GBC.eol()); + String s[] = new String[dist.length]; + for (int i = 0; i < dist.length; ++i) { + s[i] = tr("{0} meters", dist[i]); + } + JList buffer = new JList(s); + buffer.setSelectedIndex(Main.pref.getInteger(PREF_DOWNLOAD_ALONG_TRACK_DISTANCE, 0)); + msg.add(buffer, GBC.eol()); + + msg.add(new JLabel(tr("Maximum area per request:")), GBC.eol()); + s = new String[area.length]; + for (int i = 0; i < area.length; ++i) { + s[i] = tr("{0} sq km", area[i]); + } + JList maxRect = new JList(s); + maxRect.setSelectedIndex(Main.pref.getInteger(PREF_DOWNLOAD_ALONG_TRACK_AREA, 0)); + msg.add(maxRect, GBC.eol()); + + msg.add(new JLabel(tr("Download near:")), GBC.eol()); + JList downloadNear = new JList(new String[] { tr("track only"), tr("waypoints only"), tr("track and waypoints") }); + int NEAR_TRACK=0; + int NEAR_WAYPOINTS=1; + int NEAR_BOTH=2; + + downloadNear.setSelectedIndex(Main.pref.getInteger(PREF_DOWNLOAD_ALONG_TRACK_NEAR, 0)); + msg.add(downloadNear, GBC.eol()); + + int ret = JOptionPane.showConfirmDialog( + Main.parent, + msg, + tr("Download from OSM along this track"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE + ); + switch(ret) { + case JOptionPane.CANCEL_OPTION: + case JOptionPane.CLOSED_OPTION: + return; + default: + // continue + } + + Main.pref.putInteger(PREF_DOWNLOAD_ALONG_TRACK_DISTANCE, buffer.getSelectedIndex()); + Main.pref.putInteger(PREF_DOWNLOAD_ALONG_TRACK_AREA, maxRect.getSelectedIndex()); + int near = downloadNear.getSelectedIndex(); + Main.pref.putInteger(PREF_DOWNLOAD_ALONG_TRACK_NEAR, near); + + /* + * Find the average latitude for the data we're contemplating, so we can know how many + * metres per degree of longitude we have. + */ + double latsum = 0; + int latcnt = 0; + + if (near == NEAR_TRACK || near == NEAR_BOTH) { + for (GpxTrack trk : data.tracks) { + for (GpxTrackSegment segment : trk.getSegments()) { + for (WayPoint p : segment.getWayPoints()) { + latsum += p.getCoor().lat(); + latcnt++; + } + } + } + } + + if (near == NEAR_WAYPOINTS || near == NEAR_BOTH) { + for (WayPoint p : data.waypoints) { + latsum += p.getCoor().lat(); + latcnt++; + } + } + + double avglat = latsum / latcnt; + double scale = Math.cos(Math.toRadians(avglat)); + + /* + * Compute buffer zone extents and maximum bounding box size. Note that the maximum we + * ever offer is a bbox area of 0.002, while the API theoretically supports 0.25, but as + * soon as you touch any built-up area, that kind of bounding box will download forever + * and then stop because it has more than 50k nodes. + */ + Integer i = buffer.getSelectedIndex(); + int buffer_dist = dist[i < 0 ? 0 : i]; + double buffer_y = buffer_dist / 100000.0; + double buffer_x = buffer_y / scale; + i = maxRect.getSelectedIndex(); + double max_area = area[i < 0 ? 0 : i] / 10000.0 / scale; + Area a = new Area(); + Rectangle2D r = new Rectangle2D.Double(); + + /* + * Collect the combined area of all gpx points plus buffer zones around them. We ignore + * points that lie closer to the previous point than the given buffer size because + * otherwise this operation takes ages. + */ + LatLon previous = null; + if (near == NEAR_TRACK || near == NEAR_BOTH) { + for (GpxTrack trk : data.tracks) { + for (GpxTrackSegment segment : trk.getSegments()) { + for (WayPoint p : segment.getWayPoints()) { + LatLon c = p.getCoor(); + if (previous == null || c.greatCircleDistance(previous) > buffer_dist) { + // we add a buffer around the point. + r.setRect(c.lon() - buffer_x, c.lat() - buffer_y, 2 * buffer_x, 2 * buffer_y); + a.add(new Area(r)); + previous = c; + } + } + } + } + } + if (near == NEAR_WAYPOINTS || near == NEAR_BOTH) { + for (WayPoint p : data.waypoints) { + LatLon c = p.getCoor(); + if (previous == null || c.greatCircleDistance(previous) > buffer_dist) { + // we add a buffer around the point. + r.setRect(c.lon() - buffer_x, c.lat() - buffer_y, 2 * buffer_x, 2 * buffer_y); + a.add(new Area(r)); + previous = c; + } + } + } + + /* + * Area "a" now contains the hull that we would like to download data for. however we + * can only download rectangles, so the following is an attempt at finding a number of + * rectangles to download. + * + * The idea is simply: Start out with the full bounding box. If it is too large, then + * split it in half and repeat recursively for each half until you arrive at something + * small enough to download. The algorithm is improved by always using the intersection + * between the rectangle and the actual desired area. For example, if you have a track + * that goes like this: +----+ | /| | / | | / | |/ | +----+ then we would first look at + * downloading the whole rectangle (assume it's too big), after that we split it in half + * (upper and lower half), but we donot request the full upper and lower rectangle, only + * the part of the upper/lower rectangle that actually has something in it. + */ + + List toDownload = new ArrayList(); + + addToDownload(a, a.getBounds(), toDownload, max_area); + + msg = new JPanel(new GridBagLayout()); + + msg.add(new JLabel( + tr("This action will require {0} individual
" + + "download requests. Do you wish
to continue?", + toDownload.size())), GBC.eol()); + + if (toDownload.size() > 1) { + ret = JOptionPane.showConfirmDialog( + Main.parent, + msg, + tr("Download from OSM along this track"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.PLAIN_MESSAGE + ); + switch(ret) { + case JOptionPane.CANCEL_OPTION: + case JOptionPane.CLOSED_OPTION: + return; + default: + // continue + } + } + final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data")); + final Future future = new DownloadOsmTaskList().download(false, toDownload, monitor); + Main.worker.submit( + new Runnable() { + public void run() { + try { + future.get(); + } catch(Exception e) { + e.printStackTrace(); + return; + } + monitor.close(); + } + } + ); + } + } + + private static void addToDownload(Area a, Rectangle2D r, Collection results, double max_area) { + Area tmp = new Area(r); + // intersect with sought-after area + tmp.intersect(a); + if (tmp.isEmpty()) + return; + Rectangle2D bounds = tmp.getBounds2D(); + if (bounds.getWidth() * bounds.getHeight() > max_area) { + // the rectangle gets too large; split it and make recursive call. + Rectangle2D r1; + Rectangle2D r2; + if (bounds.getWidth() > bounds.getHeight()) { + // rectangles that are wider than high are split into a left and right half, + r1 = new Rectangle2D.Double(bounds.getX(), bounds.getY(), bounds.getWidth() / 2, bounds.getHeight()); + r2 = new Rectangle2D.Double(bounds.getX() + bounds.getWidth() / 2, bounds.getY(), + bounds.getWidth() / 2, bounds.getHeight()); + } else { + // others into a top and bottom half. + r1 = new Rectangle2D.Double(bounds.getX(), bounds.getY(), bounds.getWidth(), bounds.getHeight() / 2); + r2 = new Rectangle2D.Double(bounds.getX(), bounds.getY() + bounds.getHeight() / 2, bounds.getWidth(), + bounds.getHeight() / 2); + } + addToDownload(a, r1, results, max_area); + addToDownload(a, r2, results, max_area); + } else { + results.add(bounds); + } + } + + /** + * Makes a new marker layer derived from this GpxLayer containing at least one audio marker + * which the given audio file is associated with. Markers are derived from the following (a) + * explict waypoints in the GPX layer, or (b) named trackpoints in the GPX layer, or (d) + * timestamp on the wav file (e) (in future) voice recognised markers in the sound recording (f) + * a single marker at the beginning of the track + * @param wavFile : the file to be associated with the markers in the new marker layer + * @param markers : keeps track of warning messages to avoid repeated warnings + */ + private void importAudio(File wavFile, MarkerLayer ml, double firstStartTime, Markers markers) { + String uri = "file:".concat(wavFile.getAbsolutePath()); + Collection waypoints = new ArrayList(); + boolean timedMarkersOmitted = false; + boolean untimedMarkersOmitted = false; + double snapDistance = Main.pref.getDouble("marker.audiofromuntimedwaypoints.distance", 1.0e-3); /* + * about + * 25 + * m + */ + WayPoint wayPointFromTimeStamp = null; + + // determine time of first point in track + double firstTime = -1.0; + if (data.tracks != null && !data.tracks.isEmpty()) { + for (GpxTrack track : data.tracks) { + for (GpxTrackSegment seg : track.getSegments()) { + for (WayPoint w : seg.getWayPoints()) { + firstTime = w.time; + break; + } + if (firstTime >= 0.0) { + break; + } + } + if (firstTime >= 0.0) { + break; + } + } + } + if (firstTime < 0.0) { + JOptionPane.showMessageDialog( + Main.parent, + tr("No GPX track available in layer to associate audio with."), + tr("Error"), + JOptionPane.ERROR_MESSAGE + ); + return; + } + + // (a) try explicit timestamped waypoints - unless suppressed + if (Main.pref.getBoolean("marker.audiofromexplicitwaypoints", true) && data.waypoints != null + && !data.waypoints.isEmpty()) { + for (WayPoint w : data.waypoints) { + if (w.time > firstTime) { + waypoints.add(w); + } else if (w.time > 0.0) { + timedMarkersOmitted = true; + } + } + } + + // (b) try explicit waypoints without timestamps - unless suppressed + if (Main.pref.getBoolean("marker.audiofromuntimedwaypoints", true) && data.waypoints != null + && !data.waypoints.isEmpty()) { + for (WayPoint w : data.waypoints) { + if (waypoints.contains(w)) { + continue; + } + WayPoint wNear = nearestPointOnTrack(w.getEastNorth(), snapDistance); + if (wNear != null) { + WayPoint wc = new WayPoint(w.getCoor()); + wc.time = wNear.time; + if (w.attr.containsKey("name")) { + wc.attr.put("name", w.getString("name")); + } + waypoints.add(wc); + } else { + untimedMarkersOmitted = true; + } + } + } + + // (c) use explicitly named track points, again unless suppressed + if ((Main.pref.getBoolean("marker.audiofromnamedtrackpoints", false)) && data.tracks != null + && !data.tracks.isEmpty()) { + for (GpxTrack track : data.tracks) { + for (GpxTrackSegment seg : track.getSegments()) { + for (WayPoint w : seg.getWayPoints()) { + if (w.attr.containsKey("name") || w.attr.containsKey("desc")) { + waypoints.add(w); + } + } + } + } + } + + // (d) use timestamp of file as location on track + if ((Main.pref.getBoolean("marker.audiofromwavtimestamps", false)) && data.tracks != null + && !data.tracks.isEmpty()) { + double lastModified = wavFile.lastModified() / 1000.0; // lastModified is in + // milliseconds + double duration = AudioUtil.getCalibratedDuration(wavFile); + double startTime = lastModified - duration; + startTime = firstStartTime + (startTime - firstStartTime) + / Main.pref.getDouble("audio.calibration", "1.0" /* default, ratio */); + WayPoint w1 = null; + WayPoint w2 = null; + + for (GpxTrack track : data.tracks) { + for (GpxTrackSegment seg : track.getSegments()) { + for (WayPoint w : seg.getWayPoints()) { + if (startTime < w.time) { + w2 = w; + break; + } + w1 = w; + } + if (w2 != null) { + break; + } + } + } + + if (w1 == null || w2 == null) { + timedMarkersOmitted = true; + } else { + wayPointFromTimeStamp = new WayPoint(w1.getCoor().interpolate(w2.getCoor(), + (startTime - w1.time) / (w2.time - w1.time))); + wayPointFromTimeStamp.time = startTime; + String name = wavFile.getName(); + int dot = name.lastIndexOf("."); + if (dot > 0) { + name = name.substring(0, dot); + } + wayPointFromTimeStamp.attr.put("name", name); + waypoints.add(wayPointFromTimeStamp); + } + } + + // (e) analyse audio for spoken markers here, in due course + + // (f) simply add a single marker at the start of the track + if ((Main.pref.getBoolean("marker.audiofromstart") || waypoints.isEmpty()) && data.tracks != null + && !data.tracks.isEmpty()) { + boolean gotOne = false; + for (GpxTrack track : data.tracks) { + for (GpxTrackSegment seg : track.getSegments()) { + for (WayPoint w : seg.getWayPoints()) { + WayPoint wStart = new WayPoint(w.getCoor()); + wStart.attr.put("name", "start"); + wStart.time = w.time; + waypoints.add(wStart); + gotOne = true; + break; + } + if (gotOne) { + break; + } + } + if (gotOne) { + break; + } + } + } + + /* we must have got at least one waypoint now */ + + Collections.sort((ArrayList) waypoints, new Comparator() { + public int compare(WayPoint a, WayPoint b) { + return a.time <= b.time ? -1 : 1; + } + }); + + firstTime = -1.0; /* this time of the first waypoint, not first trackpoint */ + for (WayPoint w : waypoints) { + if (firstTime < 0.0) { + firstTime = w.time; + } + double offset = w.time - firstTime; + String name; + if (w.attr.containsKey("name")) { + name = w.getString("name"); + } else if (w.attr.containsKey("desc")) { + name = w.getString("desc"); + } else { + name = AudioMarker.inventName(offset); + } + AudioMarker am = AudioMarker.create(w.getCoor(), name, uri, ml, w.time, offset); + /* + * timeFromAudio intended for future use to shift markers of this type on + * synchronization + */ + if (w == wayPointFromTimeStamp) { + am.timeFromAudio = true; + } + ml.data.add(am); + } + + if (timedMarkersOmitted && !markers.timedMarkersOmitted) { + JOptionPane + .showMessageDialog( + Main.parent, + tr("Some waypoints with timestamps from before the start of the track or after the end were omitted or moved to the start.")); + markers.timedMarkersOmitted = timedMarkersOmitted; + } + if (untimedMarkersOmitted && !markers.untimedMarkersOmitted) { + JOptionPane + .showMessageDialog( + Main.parent, + tr("Some waypoints which were too far from the track to sensibly estimate their time were omitted.")); + markers.untimedMarkersOmitted = untimedMarkersOmitted; + } + } + + /** + * Makes a WayPoint at the projection of point P onto the track providing P is less than + * tolerance away from the track + * + * @param P : the point to determine the projection for + * @param tolerance : must be no further than this from the track + * @return the closest point on the track to P, which may be the first or last point if off the + * end of a segment, or may be null if nothing close enough + */ + public WayPoint nearestPointOnTrack(EastNorth P, double tolerance) { + /* + * assume the coordinates of P are xp,yp, and those of a section of track between two + * trackpoints are R=xr,yr and S=xs,ys. Let N be the projected point. + * + * The equation of RS is Ax + By + C = 0 where A = ys - yr B = xr - xs C = - Axr - Byr + * + * Also, note that the distance RS^2 is A^2 + B^2 + * + * If RS^2 == 0.0 ignore the degenerate section of track + * + * PN^2 = (Axp + Byp + C)^2 / RS^2 that is the distance from P to the line + * + * so if PN^2 is less than PNmin^2 (initialized to tolerance) we can reject the line; + * otherwise... determine if the projected poijnt lies within the bounds of the line: PR^2 - + * PN^2 <= RS^2 and PS^2 - PN^2 <= RS^2 + * + * where PR^2 = (xp - xr)^2 + (yp-yr)^2 and PS^2 = (xp - xs)^2 + (yp-ys)^2 + * + * If so, calculate N as xn = xr + (RN/RS) B yn = y1 + (RN/RS) A + * + * where RN = sqrt(PR^2 - PN^2) + */ + + double PNminsq = tolerance * tolerance; + EastNorth bestEN = null; + double bestTime = 0.0; + double px = P.east(); + double py = P.north(); + double rx = 0.0, ry = 0.0, sx, sy, x, y; + if (data.tracks == null) + return null; + for (GpxTrack track : data.tracks) { + for (GpxTrackSegment seg : track.getSegments()) { + WayPoint R = null; + for (WayPoint S : seg.getWayPoints()) { + EastNorth c = S.getEastNorth(); + if (R == null) { + R = S; + rx = c.east(); + ry = c.north(); + x = px - rx; + y = py - ry; + double PRsq = x * x + y * y; + if (PRsq < PNminsq) { + PNminsq = PRsq; + bestEN = c; + bestTime = R.time; + } + } else { + sx = c.east(); + sy = c.north(); + double A = sy - ry; + double B = rx - sx; + double C = -A * rx - B * ry; + double RSsq = A * A + B * B; + if (RSsq == 0.0) { + continue; + } + double PNsq = A * px + B * py + C; + PNsq = PNsq * PNsq / RSsq; + if (PNsq < PNminsq) { + x = px - rx; + y = py - ry; + double PRsq = x * x + y * y; + x = px - sx; + y = py - sy; + double PSsq = x * x + y * y; + if (PRsq - PNsq <= RSsq && PSsq - PNsq <= RSsq) { + double RNoverRS = Math.sqrt((PRsq - PNsq) / RSsq); + double nx = rx - RNoverRS * B; + double ny = ry + RNoverRS * A; + bestEN = new EastNorth(nx, ny); + bestTime = R.time + RNoverRS * (S.time - R.time); + PNminsq = PNsq; + } + } + R = S; + rx = sx; + ry = sy; + } + } + if (R != null) { + EastNorth c = R.getEastNorth(); + /* if there is only one point in the seg, it will do this twice, but no matter */ + rx = c.east(); + ry = c.north(); + x = px - rx; + y = py - ry; + double PRsq = x * x + y * y; + if (PRsq < PNminsq) { + PNminsq = PRsq; + bestEN = c; + bestTime = R.time; + } + } + } + } + if (bestEN == null) + return null; + WayPoint best = new WayPoint(Main.proj.eastNorth2latlon(bestEN)); + best.time = bestTime; + return best; + } + + private class CustomizeLineDrawing extends AbstractAction { + + CustomizeLineDrawing() { + super(tr("Customize line drawing"), ImageProvider.get("mapmode/addsegment")); + } + + public void actionPerformed(ActionEvent e) { + JRadioButton[] r = new JRadioButton[3]; + r[0] = new JRadioButton(tr("Use global settings.")); + r[1] = new JRadioButton(tr("Draw lines between points for this layer.")); + r[2] = new JRadioButton(tr("Do not draw lines between points for this layer.")); + ButtonGroup group = new ButtonGroup(); + Box panel = Box.createVerticalBox(); + for (JRadioButton b : r) { + group.add(b); + panel.add(b); + } + String propName = "draw.rawgps.lines.layer " + getName(); + if (Main.pref.hasKey(propName)) { + group.setSelected(r[Main.pref.getBoolean(propName) ? 1 : 2].getModel(), true); + } else { + group.setSelected(r[0].getModel(), true); + } + int answer = JOptionPane.showConfirmDialog(Main.parent, panel, + tr("Select line drawing options"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); + switch (answer) { + case JOptionPane.CANCEL_OPTION: + case JOptionPane.CLOSED_OPTION: + return; + default: + // continue + } + if (group.getSelection() == r[0].getModel()) { + Main.pref.put(propName, null); + } else { + Main.pref.put(propName, group.getSelection() == r[1].getModel()); + } + Main.map.repaint(); + } + } + + private class CustomizeColor extends AbstractAction { + + public CustomizeColor() { + super(tr("Customize Color"), ImageProvider.get("colorchooser")); + putValue("help", "Action/LayerCustomizeColor"); + } + + public void actionPerformed(ActionEvent e) { + JColorChooser c = new JColorChooser(getColor(getName())); + Object[] options = new Object[] { tr("OK"), tr("Cancel"), tr("Default") }; + int answer = JOptionPane.showOptionDialog( + Main.parent, + c, + tr("Choose a color"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.PLAIN_MESSAGE, + null, + options, options[0] + ); + switch (answer) { + case 0: + Main.pref.putColor("layer " + getName(), c.getColor()); + break; + case 1: + return; + case 2: + Main.pref.putColor("layer " + getName(), null); + break; + } + Main.map.repaint(); + } + + } + + private class MarkersFromNamedPoins extends AbstractAction { + + public MarkersFromNamedPoins() { + super(tr("Markers From Named Points"), ImageProvider.get("addmarkers")); + putValue("help", "Action/MarkersFromNamedPoints"); + } + + public void actionPerformed(ActionEvent e) { + GpxData namedTrackPoints = new GpxData(); + for (GpxTrack track : data.tracks) { + for (GpxTrackSegment seg : track.getSegments()) { + for (WayPoint point : seg.getWayPoints()) + if (point.attr.containsKey("name") || point.attr.containsKey("desc")) { + namedTrackPoints.waypoints.add(point); + } + } + } + + MarkerLayer ml = new MarkerLayer(namedTrackPoints, tr("Named Trackpoints from {0}", getName()), + getAssociatedFile(), null); + if (ml.data.size() > 0) { + Main.main.addLayer(ml); + } + + } + } + + private class ImportAudio extends AbstractAction { + + public ImportAudio() { + super(tr("Import Audio"), ImageProvider.get("importaudio")); + putValue("help", "ImportAudio"); + } + + private void warnCantImportIntoServerLayer(EGpxLayer layer) { + String msg = tr("The data in the GPX layer ''{0}'' has been downloaded from the server.
" + + "Because its way points do not include a timestamp we cannot correlate them with audio data.", + layer.getName() + ); + HelpAwareOptionPane.showOptionDialog( + Main.parent, + msg, + tr("Import not possible"), + JOptionPane.WARNING_MESSAGE, + ht("/Action/ImportImages#CantImportIntoGpxLayerFromServer") + ); + } + + public void actionPerformed(ActionEvent e) { + if (EGpxLayer.this.data.fromServer) { + warnCantImportIntoServerLayer(EGpxLayer.this); + return; + } + String dir = Main.pref.get("markers.lastaudiodirectory"); + JFileChooser fc = new JFileChooser(dir); + fc.setFileSelectionMode(JFileChooser.FILES_ONLY); + fc.setAcceptAllFileFilterUsed(false); + fc.setFileFilter(new FileFilter() { + @Override + public boolean accept(File f) { + return f.isDirectory() || f.getName().toLowerCase().endsWith(".wav"); + } + + @Override + public String getDescription() { + return tr("Wave Audio files (*.wav)"); + } + }); + fc.setMultiSelectionEnabled(true); + if (fc.showOpenDialog(Main.parent) == JFileChooser.APPROVE_OPTION) { + if (!fc.getCurrentDirectory().getAbsolutePath().equals(dir)) { + Main.pref.put("markers.lastaudiodirectory", fc.getCurrentDirectory().getAbsolutePath()); + } + + File sel[] = fc.getSelectedFiles(); + // sort files in increasing order of timestamp (this is the end time, but so + // long as they don't overlap, that's fine) + if (sel.length > 1) { + Arrays.sort(sel, new Comparator() { + public int compare(File a, File b) { + return a.lastModified() <= b.lastModified() ? -1 : 1; + } + }); + } + + String names = null; + for (int i = 0; i < sel.length; i++) { + if (names == null) { + names = " ("; + } else { + names += ", "; + } + names += sel[i].getName(); + } + if (names != null) { + names += ")"; + } else { + names = ""; + } + MarkerLayer ml = new MarkerLayer(new GpxData(), tr("Audio markers from {0}", getName()) + names, + getAssociatedFile(), null); + double firstStartTime = sel[0].lastModified() / 1000.0 /* ms -> seconds */ + - AudioUtil.getCalibratedDuration(sel[0]); + + Markers m = new Markers(); + for (int i = 0; i < sel.length; i++) { + importAudio(sel[i], ml, firstStartTime, m); + } + Main.main.addLayer(ml); + Main.map.repaint(); + } + + } + } + + private class ImportImages extends AbstractAction { + + public ImportImages() { + super(tr("Import images"), ImageProvider.get("dialogs/geoimage")); + putValue("help", ht("/Action/ImportImages")); + } + + private void warnCantImportIntoServerLayer(EGpxLayer layer) { + String msg = tr("The data in the GPX layer ''{0}'' has been downloaded from the server.
" + + "Because its way points do not include a timestamp we cannot correlate them with images.", + layer.getName() + ); + HelpAwareOptionPane.showOptionDialog( + Main.parent, + msg, + tr("Import not possible"), + JOptionPane.WARNING_MESSAGE, + ht("/Action/ImportImages#CantImportIntoGpxLayerFromServer") + ); + } + + private void addRecursiveFiles(LinkedList files, File[] sel) { + for (File f : sel) { + if (f.isDirectory()) { + addRecursiveFiles(files, f.listFiles()); + } else if (f.getName().toLowerCase().endsWith(".jpg")) { + files.add(f); + } + } + } + + public void actionPerformed(ActionEvent e) { + + if (EGpxLayer.this.data.fromServer) { + warnCantImportIntoServerLayer(EGpxLayer.this); + return; + } + String curDir = Main.pref.get("geoimage.lastdirectory", Main.pref.get("lastDirectory")); + if (curDir.equals("")) { + curDir = "."; + } + JFileChooser fc = new JFileChooser(new File(curDir)); + + fc.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); + fc.setMultiSelectionEnabled(true); + fc.setAcceptAllFileFilterUsed(false); + JpgImporter importer = new JpgImporter(); + fc.setFileFilter(importer.filter); + fc.showOpenDialog(Main.parent); + LinkedList files = new LinkedList(); + File[] sel = fc.getSelectedFiles(); + if (sel == null || sel.length == 0) + return; + if (!fc.getCurrentDirectory().getAbsolutePath().equals(curDir)) { + Main.pref.put("geoimage.lastdirectory", fc.getCurrentDirectory().getAbsolutePath()); + } + addRecursiveFiles(files, sel); + importer.importDataHandleExceptions(files, NullProgressMonitor.INSTANCE); + } + + } +} Index: /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java =================================================================== --- /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java (revision 23541) +++ /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java (revision 23541) @@ -0,0 +1,25 @@ +package gpxfilter; + +import static org.openstreetmap.josm.gui.help.HelpUtil.ht; +import static org.openstreetmap.josm.tools.I18n.marktr; + +import java.awt.event.KeyEvent; + +import javax.swing.JMenu; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.MainMenu; +import org.openstreetmap.josm.plugins.Plugin; +import org.openstreetmap.josm.plugins.PluginInformation; + +public class GpxFilterPlugin extends Plugin { + + public GpxFilterPlugin(PluginInformation info) { + super(info); + JMenu historyMenu = Main.main.menu.addMenu(marktr("GPX"), KeyEvent.VK_R, + Main.main.menu.defaultMenuPos,null); + //MainMenu.add(historyMenu, new ObjectsHistoryAction()); + MainMenu.add(historyMenu, new AddEGpxLayerAction()); + } + +} Index: /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxGrabber.java =================================================================== --- /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxGrabber.java (revision 23541) +++ /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxGrabber.java (revision 23541) @@ -0,0 +1,78 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package gpxfilter; + +import java.io.IOException; +import java.io.InputStream; + +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.gpx.GpxData; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.gui.progress.NullProgressMonitor; +import org.openstreetmap.josm.gui.progress.ProgressMonitor; +import org.openstreetmap.josm.io.GpxReader; +import org.openstreetmap.josm.io.OsmServerReader; +import org.openstreetmap.josm.io.OsmTransferException; +import org.xml.sax.SAXException; + +public class GpxGrabber extends OsmServerReader { + /** + * The boundings of the desired map data. + */ + private final double lat1; + private final double lon1; + private final double lat2; + private final double lon2; + + private int page; + + public GpxGrabber(Bounds downloadArea) { + this.lat1 = downloadArea.getMin().lat(); + this.lon1 = downloadArea.getMin().lon(); + this.lat2 = downloadArea.getMax().lat(); + this.lon2 = downloadArea.getMax().lon(); + + page = 0; + } + + /** + * Retrieve raw gps waypoints from the server API. + * @return A list of all primitives retrieved. Currently, the list of lists + * contain only one list, since the server cannot distinguish between + * ways. + */ + public GpxData parseRawGps() throws IOException, SAXException,OsmTransferException { + try { + String url = "trackpoints?bbox="+lon1+","+lat1+","+lon2+","+lat2+"&page="+page; + + InputStream in = getInputStream(url, NullProgressMonitor.INSTANCE); + GpxReader reader = new GpxReader(in); + reader.parse(false); + GpxData result = reader.data; + in.close(); + result.fromServer = true; + page++; + return result; + } catch (IllegalArgumentException e) { + // caused by HttpUrlConnection in case of illegal stuff in the response + if (cancel) + return null; + throw new SAXException("Illegal characters within the HTTP-header response.", e); + } catch (IOException e) { + if (cancel) + return null; + throw e; + } catch (SAXException e) { + throw e; + } catch (OsmTransferException e) { + throw e; + } catch (RuntimeException e) { + if (cancel) + return null; + throw e; + } } + + @Override + public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException { + return null; + } +}