Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/.classpath
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/.classpath (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/.classpath (revision 32048)
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/.project
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/.project (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/.project (revision 32048)
@@ -0,0 +1,23 @@
+
+
+ josmPlugins
+ JavaCC Nature
+
+
+
+
+ sf.eclipse.javacc.javaccbuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+ sf.eclipse.javacc.javaccnature
+
+
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/.settings/org.eclipse.jdt.core.prefs (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/.settings/org.eclipse.jdt.core.prefs (revision 32048)
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/.settings/sf.eclipse.javacc.prefs
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/.settings/sf.eclipse.javacc.prefs (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/.settings/sf.eclipse.javacc.prefs (revision 32048)
@@ -0,0 +1,13 @@
+CLEAR_CONSOLE=true
+JAVACC_OPTIONS=
+JJDOC_OPTIONS=
+JJTREE_OPTIONS=
+JJ_NATURE=true
+JTB_OPTIONS=-ia -jd -tk
+KEEP_DEL_FILES_IN_HISTORY=false
+MARK_GEN_FILES_AS_DERIVED=true
+RUNTIME_JJJAR=
+RUNTIME_JTBJAR=
+RUNTIME_JVMOPTIONS=
+SUPPRESS_WARNINGS=false
+eclipse.preferences.version=1
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/GPL-v2.0.txt
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/GPL-v2.0.txt (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/GPL-v2.0.txt (revision 32048)
@@ -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/CustomizePublicTransportStop/GPL-v3.0.txt
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/GPL-v3.0.txt (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/GPL-v3.0.txt (revision 32048)
@@ -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/CustomizePublicTransportStop/Text/en.txt
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/Text/en.txt (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/Text/en.txt (revision 32048)
@@ -0,0 +1,28 @@
+Customize stop
+Customize stop under osm public transit standard v2
+Stop customizing
+Stop area tag assign
+Name
+Name (en.)
+Network
+Operator
+Network level
+City transport
+Local
+Regional
+Long distance
+High speed
+Bus
+Share taxi
+Trolleybus
+Bus station
+Tram
+Railway station
+Railway stop
+Assign transport type to platform
+Shelder
+Bench
+Cover
+Area
+Save
+Cancel
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/Text/ru.txt
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/Text/ru.txt (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/Text/ru.txt (revision 32048)
@@ -0,0 +1,28 @@
+Íàñòðîéêà îñòàíîâêè
+Íàñòðîéêà îñòàíîâêè â ñîîòâåòñòâèè ñî âòîðîé âåðñèåé ñòàíäàðòà îïèñàíèÿ îáùåñòâåííîãî òðàíñïîðòà
+Íàñòðîéêà îñòàíîâêè
+Íàñòðîéêà îòíîøåíèÿ îñòàíîâêè
+Íàçâàíèå
+Íàçâàíèå (àíãë.)
+Ñåòü
+Îïåðàòîð
+Óðîâåíü ñåòè
+Ãîðîäñêàÿ
+Ïðèãîðîäíàÿ
+Ìåæäóãîðîäíÿÿ
+Äàëüíåãî ñëåäîâàíèÿ
+Âûñîêîñêîðîñòíàÿ
+Àâòîáóñ
+Ìàðøðóòíîå òàêñè
+Òðîëëåéáóñ
+Àâòîñòàíöèÿ
+Òðàìâàé
+Æ/ä ñòàíöèÿ
+Æ/ä ïëàòôîðìà
+Âèäû òðàíñïîðòà â ñâîéñòâàõ ïëàòôîðìû
+Íàâåñ
+Ñêàìåéêà
+Â ïîìåùåíèè
+Ïîëèãîí
+Ñîõðàíèòü
+Îòìåíà
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/build.properties
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/build.properties (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/build.properties (revision 32048)
@@ -0,0 +1,29 @@
+# --------------------------------------------------------------------------
+# build.properties.template - template file for build properties
+#
+# Create a copy, rename it to 'build.properties' and update the settings
+# according to your local environment.
+#
+# --------------------------------------------------------------------------
+
+# the current plugin version. Increment if you create a new build to be rolled out
+# via the OSM subversion repository
+#
+plugin.version=0.1.2
+
+# the lowest JOSM version the curent plugin version is compatible with
+#
+josm.required.version=7171
+
+# the full path to the JOSM jar against which this plugin is built
+#
+josm.jar=../../core/dist/josm-custom.jar
+
+# local path to OSM SVN dist directory
+#
+local.osm.svn.path=../../dist
+
+# the full local path where the plugin shall be installed inorder to test it
+# withing a JOSM instance
+#
+local.install.path=/full/path/to/local/installation/josm/plugins
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/build.xml
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/build.xml (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/build.xml (revision 32048)
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ **
+ ** Property file 'build.properties' doesn't exist.
+ ** Create a copy from 'build.properties.template' and update the properties
+ ** according to your local environment.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Classpath includes ${josm}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Installing the plugin in ${local.osm.svn.path}
+
+
+
+
+
+
+
+
+ Installing the plugin in ${local.install.path}
+
+
+
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CreateNewStopPointOperation.java
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CreateNewStopPointOperation.java (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CreateNewStopPointOperation.java (revision 32048)
@@ -0,0 +1,351 @@
+package ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop;
+
+import java.awt.Point;
+import java.awt.geom.Point2D;
+import java.util.AbstractMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.BBox;
+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.WaySegment;
+import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.tools.Geometry;
+
+import ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop.OSMTags;
+
+/**
+ *
+ * @author Rodion Scherbakov
+ * Operation of creation of new stop point
+ */
+public class CreateNewStopPointOperation extends StopAreaOperationBase
+{
+
+ /**
+ * Constructor of operation object
+ * @param currentDataSet Current Josm data set
+ */
+ public CreateNewStopPointOperation(DataSet currentDataSet)
+ {
+ super(currentDataSet);
+ }
+
+ /**
+ * The *result* does not depend on the current map selection state,
+ * neither does the result *order*.
+ * It solely depends on the distance to point p.
+ *
+ * This code is coped from JOSM code
+ *
+ * @return a sorted map with the keys representing the distance of
+ * their associated nodes to point p.
+ */
+ private Map> getNearestNodesImpl(Point p) {
+ TreeMap> nearestMap = new TreeMap<>();
+ DataSet ds = getCurrentDataSet();
+
+ if (ds != null) {
+ double dist, snapDistanceSq = 200;
+ snapDistanceSq *= snapDistanceSq;
+
+ for (Node n : ds.searchNodes(getBBox(p, 200))) {
+ if ((dist = Main.map.mapView.getPoint2D(n).distanceSq(p)) < snapDistanceSq)
+ {
+ List nlist;
+ if (nearestMap.containsKey(dist)) {
+ nlist = nearestMap.get(dist);
+ } else {
+ nlist = new LinkedList<>();
+ nearestMap.put(dist, nlist);
+ }
+ nlist.add(n);
+ }
+ }
+ }
+
+ return nearestMap;
+ }
+
+ /**
+ * Selection of area for search of roads
+ * @param p Current point
+ * @param snapDistance Distance for search
+ * @return Area
+ */
+ private BBox getBBox(Point p, int snapDistance) {
+ return new BBox(Main.map.mapView.getLatLon(p.x - snapDistance, p.y - snapDistance),
+ Main.map.mapView.getLatLon(p.x + snapDistance, p.y + snapDistance));
+ }
+
+ /**
+ * Search of nearest points on ways
+ * @param platformCoord Platform coordinates
+ * @param stopArea Stop area object
+ * @return Dictionary of founded points and distances from platform
+ */
+ public AbstractMap.SimpleEntry getNearestNode(LatLon platformCoord, StopArea stopArea)
+ {
+ Point p = Main.map.mapView.getPoint(platformCoord);
+ Map> dist_nodes = getNearestNodesImpl(p);
+ Double[] distances = dist_nodes.keySet().toArray(new Double[0]);
+ distances = sort(distances);
+ Integer distanceIndex = -1;
+ Node nearestNode = null;
+ while(++distanceIndex < distances.length && nearestNode == null)
+ {
+ List nodes = dist_nodes.get(distances[distanceIndex]);
+ for(Node node : nodes)
+ {
+ for(Way way : getCurrentDataSet().getWays())
+ {
+ if(way.getNodes().contains(node) && testWay(way, stopArea))
+ {
+ nearestNode = node;
+ break;
+ }
+ }
+ if(nearestNode != null)
+ break;
+ }
+ }
+ if(nearestNode == null)
+ return null;
+ return new AbstractMap.SimpleEntry (distances[--distanceIndex], nearestNode);
+ }
+
+ /**
+ * Sorting of founded points by distance
+ * @param distances Array of distances
+ * @return Sorted array of distances
+ */
+ public Double[] sort(Double[] distances)
+ {
+ for(Integer i = 0; i < distances.length - 1; i++)
+ for(Integer j = i + 1; j < distances.length; j++)
+ {
+ if(distances[i]>distances[j])
+ {
+ Double d = distances[i];
+ distances[i] = distances[j];
+ distances[j] = d;
+ }
+ }
+ return distances;
+ }
+
+ /**
+ * Selection of ways for stop position by type of way and type of stop
+ * @param way The way
+ * @param stopArea Stop area
+ * @return true, if way can contain stop position
+ */
+ public Boolean testWay(Way way, StopArea stopArea)
+ {
+ if(stopArea.isTrainStation || stopArea.isTrainStop)
+ {
+ if(OSMTags.RAIL_TAG_VALUE.equals(way.getKeys().get(OSMTags.RAILWAY_TAG)) && OSMTags.MAIN_TAG_VALUE.equals(way.getKeys().get(OSMTags.USAGE_TAG)))
+ return true;
+ return false;
+ }
+
+ if(stopArea.isTram)
+ {
+ if(OSMTags.TRAM_TAG_VALUE.equals(way.getKeys().get(OSMTags.RAILWAY_TAG)))
+ return true;
+ return false;
+ }
+
+ String[] highwayValues = {OSMTags.TRUNK_TAG_VALUE, OSMTags.PRIMARY_TAG_VALUE, OSMTags.SECONDARY_TAG_VALUE, OSMTags.TERTIARY_TAG_VALUE,
+ OSMTags.UNCLASSIFIED_TAG_VALUE, OSMTags.RESIDENTIAL_TAG_VALUE, OSMTags.SERVICE_TAG_VALUE,
+ OSMTags.BUS_GUIDEWAY_TAG_VALUE, OSMTags.ROAD_TAG_VALUE, OSMTags.TRUNK_LINK_TAG_VALUE,
+ OSMTags.PRIMARY_LINK_TAG_VALUE, OSMTags.SECONDARY_LINK_TAG_VALUE, OSMTags.TERTIARY_LINK_TAG_VALUE };
+ if(stopArea.isBus || stopArea.isTrolleybus || stopArea.isShareTaxi)
+ {
+ String highway = way.getKeys().get(OSMTags.HIGHWAY_TAG);
+ if(highway != null)
+ for(Integer i = 0; i < highwayValues.length; i++)
+ {
+ if(highwayValues[i].equals(highway))
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * The *result* does not depend on the current map selection state,
+ * neither does the result *order*.
+ * It solely depends on the distance to point p.
+ *
+ * This code is coped from JOSM code
+ *
+ * @return a sorted map with the keys representing the perpendicular
+ * distance of their associated way segments to point p.
+ */
+ private Map> getNearestWaySegmentsImpl(Point p) {
+ Map> nearestMap = new TreeMap<>();
+ DataSet ds = getCurrentDataSet();
+
+ if (ds != null) {
+ double snapDistanceSq = Main.pref.getInteger("mappaint.segment.snap-distance", 200);
+ snapDistanceSq *= snapDistanceSq;
+
+ for (Way w : ds.searchWays(getBBox(p, Main.pref.getInteger("mappaint.segment.snap-distance", 200)))) {
+ Node lastN = null;
+ int i = -2;
+ for (Node n : w.getNodes()) {
+ i++;
+ if (n.isDeleted() || n.isIncomplete()) { //FIXME: This shouldn't happen, raise exception?
+ continue;
+ }
+ if (lastN == null) {
+ lastN = n;
+ continue;
+ }
+
+ Point2D A = Main.map.mapView.getPoint2D(lastN);
+ Point2D B = Main.map.mapView.getPoint2D(n);
+ double c = A.distanceSq(B);
+ double a = p.distanceSq(B);
+ double b = p.distanceSq(A);
+
+ /* perpendicular distance squared
+ * loose some precision to account for possible deviations in the calculation above
+ * e.g. if identical (A and B) come about reversed in another way, values may differ
+ * -- zero out least significant 32 dual digits of mantissa..
+ */
+ double perDistSq = Double.longBitsToDouble(
+ Double.doubleToLongBits( a - (a - b + c) * (a - b + c) / 4 / c )
+ >> 32 << 32); // resolution in numbers with large exponent not needed here..
+
+ if (perDistSq < snapDistanceSq && a < c + snapDistanceSq && b < c + snapDistanceSq) {
+ List wslist;
+ if (nearestMap.containsKey(perDistSq)) {
+ wslist = nearestMap.get(perDistSq);
+ } else {
+ wslist = new LinkedList<>();
+ nearestMap.put(perDistSq, wslist);
+ }
+ wslist.add(new WaySegment(w, i));
+ }
+
+ lastN = n;
+ }
+ }
+ }
+
+ return nearestMap;
+ }
+
+ /**
+ * Selection of nearest way for stop position
+ * @param platformCoord Platform coordinates
+ * @param stopArea Stop area
+ * @return Nearest way segment
+ */
+ protected NearestWaySegment getNearestWaySegment(LatLon platformCoord, StopArea stopArea)
+ {
+
+ Point p = Main.map.mapView.getPoint(platformCoord);
+ Map> dist_waySegments = getNearestWaySegmentsImpl(p);
+ for(Map.Entry> entry : dist_waySegments.entrySet())
+ {
+ for(WaySegment waySegment : entry.getValue())
+ {
+ if(testWay(waySegment.way, stopArea))
+ {
+ Node n = waySegment.getFirstNode();
+ Node lastN = waySegment.getSecondNode();
+
+ EastNorth newPosition = Geometry.closestPointToSegment(n.getEastNorth(),
+ lastN.getEastNorth(), Projections.project(platformCoord));
+ LatLon newNodePosition = Projections.inverseProject(newPosition);
+ Point2D lastN2D = Main.map.mapView.getPoint2D(lastN);
+ Point2D n2D = Main.map.mapView.getPoint2D(n);
+ Point2D newNodePosition2D = Main.map.mapView.getPoint2D(newNodePosition);
+ Double distCurrenNodes =lastN2D.distance(n2D);
+ if((newNodePosition2D.distance(lastN2D) < distCurrenNodes) && (newNodePosition2D.distance(n2D) < distCurrenNodes))
+ {
+ return new NearestWaySegment(entry.getKey(), waySegment, new Node(newNodePosition));
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Creation of stop position node on nearest way
+ * @param newStopNode New stop position node
+ * @param waySegment Way segment including stop position node
+ * @return Stop position node
+ */
+ protected Node createNodeOnWay(Node newStopNode, WaySegment waySegment)
+ {
+ Main.main.undoRedo.add(new AddCommand(newStopNode));
+ List wayNodes = waySegment.way.getNodes();
+ wayNodes.add(waySegment.lowerIndex + 1, newStopNode);
+ Way newWay = new Way(waySegment.way);
+ newWay.setNodes(wayNodes);
+ Main.main.undoRedo.add(new ChangeCommand(waySegment.way, newWay));
+ return newStopNode;
+ }
+
+ /**
+ * Creation of stop position
+ * @param stopArea Stop Area
+ */
+ @Override
+ public StopArea performCustomizing(StopArea stopArea)
+ {
+ LatLon platformCoord = null;
+ if(stopArea.selectedObject instanceof Node)
+ {
+ platformCoord = ((Node) stopArea.selectedObject).getCoor();
+ }
+ else
+ platformCoord = getCenterOfWay(stopArea.selectedObject);
+ if(platformCoord == null)
+ return stopArea;
+ AbstractMap.SimpleEntry nearestNode = getNearestNode(platformCoord, stopArea);
+ NearestWaySegment nearestWaySegment = getNearestWaySegment(platformCoord, stopArea);
+ Node newStopPointNode = null;
+ if(nearestNode != null && nearestWaySegment != null)
+ {
+ if(nearestWaySegment.distanceSq < nearestNode.getKey())
+ {
+ newStopPointNode = createNodeOnWay(nearestWaySegment.newNode, nearestWaySegment.waySegment);
+ }
+ else
+ {
+ newStopPointNode = nearestNode.getValue();
+ }
+ }
+ else
+ if(nearestNode != null && nearestWaySegment == null)
+ {
+ newStopPointNode = nearestNode.getValue();
+ }
+ else
+ if(nearestNode == null && nearestWaySegment != null)
+ {
+ newStopPointNode = createNodeOnWay(nearestWaySegment.newNode, nearestWaySegment.waySegment);
+ }
+ if(newStopPointNode != null)
+ {
+ stopArea.stopPoints.add(newStopPointNode);
+ }
+ return stopArea;
+ }
+
+}
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CreateStopAreaFromSelectedObjectOperation.java
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CreateStopAreaFromSelectedObjectOperation.java (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CreateStopAreaFromSelectedObjectOperation.java (revision 32048)
@@ -0,0 +1,177 @@
+package ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+
+/**
+ *
+ * @author Rodion Scherbakov
+ * Operation of constructing of stop area object from selected JOSM object
+ */
+public class CreateStopAreaFromSelectedObjectOperation extends
+ StopAreaOperationBase
+{
+
+ /**
+ * Constructor of operation object
+ * @param currentDataSet Current Josm data set
+ */
+ public CreateStopAreaFromSelectedObjectOperation(DataSet currentDataSet)
+ {
+ super(currentDataSet);
+ }
+
+ /**
+ * Parsing of josm object tags and customizing of stop area object
+ * @param member Josm object
+ */
+ public void parseTags(StopArea stopArea, OsmPrimitive member)
+ {
+ if(stopArea.name == null)
+ stopArea.name = getTagValue(member, OSMTags.NAME_TAG);
+ if(stopArea.nameEn == null)
+ stopArea.nameEn = getTagValue(member, OSMTags.NAME_EN_TAG);
+ if(stopArea.operator == null)
+ stopArea.operator = getTagValue(member, OSMTags.OPERATOR_TAG);
+ if(stopArea.network == null)
+ stopArea.network = getTagValue(member, OSMTags.NETWORK_TAG);
+ if(stopArea.service == null)
+ stopArea.service = getTagValue(member, OSMTags.SERVICE_TAG);
+ if(compareTag(member, OSMTags.BUS_TAG, OSMTags.YES_TAG_VALUE))
+ stopArea.isBus = true;
+ if(compareTag(member, OSMTags.TROLLEYBUS_TAG, OSMTags.YES_TAG_VALUE))
+ stopArea.isTrolleybus = true;
+ if(compareTag(member, OSMTags.SHARE_TAXI_TAG, OSMTags.YES_TAG_VALUE))
+ stopArea.isShareTaxi = true;
+ if(!(stopArea.isBus || stopArea.isShareTaxi || stopArea.isTrolleybus) && compareTag(member, OSMTags.HIGHWAY_TAG, OSMTags.BUS_STOP_TAG_VALUE))
+ stopArea.isBus = true;
+ if(compareTag(member, OSMTags.TRAM_TAG, OSMTags.YES_TAG_VALUE) || compareTag(member, OSMTags.RAILWAY_TAG, OSMTags.TRAM_STOP_TAG_VALUE))
+ stopArea.isTram = true;
+ if(compareTag(member, OSMTags.RAILWAY_TAG, OSMTags.HALT_TAG_VALUE))
+ stopArea.isTrainStop = true;
+ if(compareTag(member, OSMTags.RAILWAY_TAG, OSMTags.STATION_TAG_VALUE))
+ stopArea.isTrainStation = true;
+ if(compareTag(member, OSMTags.AMENITY_TAG, OSMTags.BUS_STATION_TAG_VALUE))
+ {
+ stopArea.isBusStation = true;
+ }
+ if(member == stopArea.selectedObject)
+ {
+ if(compareTag(member, OSMTags.BENCH_TAG, OSMTags.YES_TAG_VALUE))
+ stopArea.isBench = true;
+ if(compareTag(member, OSMTags.SHELTER_TAG, OSMTags.YES_TAG_VALUE))
+ stopArea.isShelter = true;
+ if(compareTag(member, OSMTags.COVERED_TAG, OSMTags.YES_TAG_VALUE))
+ stopArea.isCovered = true;
+ if(compareTag(member, OSMTags.AREA_TAG, OSMTags.YES_TAG_VALUE))
+ stopArea.isArea = true;
+ }
+ }
+
+ /**
+ * Test, are transport types assigned to platforms
+ * @param platform Platform object
+ * @return true, if transport types assigned to this platforms
+ */
+ public boolean testIsTransportTypeAssigned(OsmPrimitive platform)
+ {
+ String[] transportTypes = new String[] { OSMTags.BUS_TAG, OSMTags.TROLLEYBUS_TAG, OSMTags.SHARE_TAXI_TAG, OSMTags.TRAM_TAG, OSMTags.TRAIN_TAG };
+ for(String transportType : transportTypes)
+ {
+ if(compareTag(platform, transportType, OSMTags.YES_TAG_VALUE))
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Setting of stop area from selected josm object
+ * @param selectedObject Selected josm object
+ */
+ public void fromSelectedObject(StopArea stopArea)
+ {
+ Collection selectedObjects = new ArrayList();
+ selectedObjects.add(stopArea.selectedObject);
+ for(Relation rel : OsmPrimitive.getParentRelations(selectedObjects))
+ {
+ if(compareTag(rel, OSMTags.TYPE_TAG, OSMTags.PUBLIC_TRANSPORT_TAG) && compareTag(rel, OSMTags.PUBLIC_TRANSPORT_TAG, OSMTags.STOP_AREA_TAG_VALUE))
+ {
+ stopArea.stopAreaRelation = rel;
+ }
+ if(stopArea.stopAreaRelation != null)
+ break;
+ }
+
+ if(stopArea.stopAreaRelation != null)
+ {
+ parseTags(stopArea, stopArea.stopAreaRelation);
+ parseTags(stopArea, stopArea.selectedObject);
+ for(RelationMember member : stopArea.stopAreaRelation.getMembers())
+ {
+ if(member.getMember() instanceof Node && compareTag(member.getMember(), OSMTags.PUBLIC_TRANSPORT_TAG, OSMTags.STOP_POSITION_TAG_VALUE))
+ {
+ stopArea.isStopPointExists = true;
+ stopArea.stopPoints.add(member.getNode());
+ }
+ else
+ if(compareTag(member.getMember(), OSMTags.PUBLIC_TRANSPORT_TAG, OSMTags.PLATFORM_TAG_VALUE))
+ {
+ stopArea.platforms.add(member.getMember());
+ }
+ else
+ {
+ stopArea.otherMembers.add(member.getMember());
+ }
+ parseTags(stopArea, member.getMember());
+ }
+ if(!stopArea.platforms.contains(stopArea.selectedObject))
+ {
+ parseTags(stopArea, stopArea.selectedObject);
+ stopArea.platforms.add(stopArea.selectedObject);
+ }
+ }
+ else
+ {
+ parseTags(stopArea, stopArea.selectedObject);
+ stopArea.platforms.add(stopArea.selectedObject);
+ }
+ for(OsmPrimitive platform : stopArea.platforms)
+ {
+ if(testIsTransportTypeAssigned(platform))
+ {
+ stopArea.isAssignTransportType = true;
+ break;
+ }
+ }
+ if(!(stopArea.isBus || stopArea.isTrolleybus || stopArea.isShareTaxi) && stopArea.selectedObject != null && (compareTag(stopArea.selectedObject, OSMTags.HIGHWAY_TAG, OSMTags.BUS_STOP_TAG_VALUE) || stopArea.isBusStation))
+ {
+ stopArea.isBus = true;
+ }
+ }
+
+ /**
+ * Construct stop area object from selected JOSM object
+ * @param stopArea Original stop area object
+ * @return Stop area objects with settings of selected JOSM object and included it stop area relation
+ */
+ @Override
+ public StopArea performCustomizing(StopArea stopArea)
+ {
+ if(getCurrentDataSet() == null)
+ return null;
+ OsmPrimitive selectedObject = getCurrentDataSet().getSelectedNodesAndWays().iterator().next();
+ if(selectedObject == null)
+ return null;
+ if(stopArea == null)
+ stopArea = new StopArea(selectedObject);
+ fromSelectedObject(stopArea);
+ return stopArea;
+ }
+
+}
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CustomizePublicTransportStopDialog.java
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CustomizePublicTransportStopDialog.java (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CustomizePublicTransportStopDialog.java (revision 32048)
@@ -0,0 +1,619 @@
+package ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop;
+
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.HashMap;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.Main;
+
+import ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop.MessageBox;
+
+/**
+ *
+ * @author Rodion Scherbakov
+ * Dialog for setting stop area properties
+ */
+public class CustomizePublicTransportStopDialog implements ActionListener, ItemListener
+{
+ private static final String CANCEL_COMMAND = "cancel";
+ private static final String SAVE_COMMAND = "save";
+ private static final String CANCEL_BUTTON_CAPTION = "Cancel";
+ private static final String SAVE_BUTTON_CAPTION = "Save";
+ private static final String AREA_CAPTION = "Area";
+ private static final String COVER_CAPTION = "Cover";
+ private static final String SHELDER_CAPTION = "Shelder";
+ private static final String BENCH_CAPTION = "Bench";
+ private static final String RAILWAY_STOP_CAPTION = "Railway stop";
+ private static final String RAILWAY_STATION_CAPTION = "Railway station";
+ private static final String TRAM_CAPTION = "Tram";
+ private static final String TROLLEYBUS_CAPTION = "Trolleybus";
+ private static final String SHARE_TAXI_CAPTION = "Share taxi";
+ private static final String BUS_CAPTION = "Bus";
+ private static final String BUS_STATION_CAPTION = "Bus station";
+ private static final String ASSIGN_TRANSPORT_TYPE_CAPTION = "Assign transport type to platform";
+ private static final String NETWORK_LEVEL_CAPTION = "Network level";
+ private static final String OPERATOR_CAPTION = "Operator";
+ private static final String NETWORK_CAPTION = "Network";
+ private static final String NAME_EN_CAPTION = "Name (en.)";
+ private static final String NAME_CAPTION = "Name";
+ private static final String STOP_CUSTOMIZING_DIALOG_CAPTION = "Stop customizing";
+ public static final String LONG_DISTANCE_NETWORK_CAPTION = "Long distance";
+ public static final String REGIONAL_NETWORK_CAPTION = "Regional";
+ public static final String LOCAL_NETWORK_CAPTION = "Local";
+ public static final String CITY_NETWORK_CAPTION = "City transport";
+ public static final String HIGH_SPEED_NETWORK_CAPTION = "High speed";
+
+ private String[] serviceCaptionStrings = { CITY_NETWORK_CAPTION, LOCAL_NETWORK_CAPTION, REGIONAL_NETWORK_CAPTION, LONG_DISTANCE_NETWORK_CAPTION, HIGH_SPEED_NETWORK_CAPTION };
+ private String[] serviceStrings = { OSMTags.CITY_NETWORK_TAG_VALUE, OSMTags.LOCAL_NETWORK_TAG_VALUE,
+ OSMTags.REGIONAL_NETWORK_TAG_VALUE, OSMTags.LONG_DISTANCE_NETWORK_TAG_VALUE, OSMTags.HIGH_SPEED_NETWORK_TAG_VALUE };
+
+ private JDialog jDialog = null;
+ private JTextField textFieldName = null;
+ private JTextField textFieldNameEn;
+ private JTextField textFieldNetwork;
+ private JTextField textFieldOperator;
+ private JComboBox comboBoxService;
+ private JCheckBox checkBoxIsBus;
+ private JCheckBox checkBoxIsTrolleybus;
+ private JCheckBox checkBoxIsShareTaxi;
+ private JCheckBox checkBoxIsBusStation;
+ private JCheckBox checkBoxIsAssignTransportType;
+ private JCheckBox checkBoxIsTram;
+ private JCheckBox checkBoxIsTrainStation;
+ private JCheckBox checkBoxIsTrainStop;
+ private JCheckBox checkBoxIsBench;
+ private JCheckBox checkBoxIsShelder;
+ private JCheckBox checkBoxIsCover;
+ private JCheckBox checkBoxIsArea;
+
+ /**
+ * Stop area
+ */
+ private StopArea stopArea;
+ /**
+ * Customize stop action object for callback
+ */
+ private CustomizeStopAction customizeStopAction;
+
+ /**
+ * Map of check boxes
+ */
+ private HashMap checkBoxValues = new HashMap();
+
+ /**
+ * Previous stop name
+ */
+ private static String previousName;
+ /**
+ * Previous english stop name
+ */
+ private static String previousNameEn;
+ /**
+ * Network name at previous call
+ */
+ private static String previousNetwork = null;
+ /**
+ * Operator name at previous call
+ */
+ private static String previousOperator = null;
+
+ /**
+ * Reference to dialog object
+ */
+ private static CustomizePublicTransportStopDialog customizePublicTransportStopDialogInstance;
+
+ /**
+ * Construct dialog and fill controls
+ * @param customizeStopAction Stop area customizing action
+ * @param stopArea Stop area
+ * @return Reference to dialog
+ */
+ public static CustomizePublicTransportStopDialog showCustomizePublicTransportStopDialog(CustomizeStopAction customizeStopAction, StopArea stopArea)
+ {
+ if(customizePublicTransportStopDialogInstance == null)
+ {
+ customizePublicTransportStopDialogInstance = new CustomizePublicTransportStopDialog(customizeStopAction, stopArea);
+ }
+ else
+ {
+ customizePublicTransportStopDialogInstance.setCustomizeStopAction(customizeStopAction);
+ customizePublicTransportStopDialogInstance.setStopArea(stopArea);
+ }
+ customizePublicTransportStopDialogInstance.setVisible(true);
+ return customizePublicTransportStopDialogInstance;
+ }
+
+ /**
+ * Constructor of dialog
+ */
+ public CustomizePublicTransportStopDialog()
+ {
+ Frame frame = JOptionPane.getFrameForComponent(Main.parent);
+ jDialog = new JDialog(frame, tr(STOP_CUSTOMIZING_DIALOG_CAPTION), false);
+ JPanel contentPane = new JPanel();
+ GridBagLayout gridbag = new GridBagLayout();
+ contentPane.setLayout(gridbag);
+ GridBagConstraints layoutCons = new GridBagConstraints();
+ JLabel label = new JLabel(tr(NAME_CAPTION));
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 0;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ textFieldName = new JTextField("", 25);
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 0;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(textFieldName, layoutCons);
+ contentPane.add(textFieldName);
+
+ JLabel labelNameEn = new JLabel(tr(NAME_EN_CAPTION));
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 1;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(labelNameEn, layoutCons);
+ contentPane.add(labelNameEn);
+
+ textFieldNameEn = new JTextField("", 25);
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 1;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(textFieldNameEn, layoutCons);
+ contentPane.add(textFieldNameEn);
+
+ JLabel labelNetwork = new JLabel(tr(NETWORK_CAPTION));
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 2;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(labelNetwork, layoutCons);
+ contentPane.add(labelNetwork);
+
+ textFieldNetwork = new JTextField("", 25);
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 2;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(textFieldNetwork, layoutCons);
+ contentPane.add(textFieldNetwork);
+
+ JLabel labelOperator = new JLabel(tr(OPERATOR_CAPTION));
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 3;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(labelOperator, layoutCons);
+ contentPane.add(labelOperator);
+
+ textFieldOperator = new JTextField("", 25);
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 3;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(textFieldOperator, layoutCons);
+ contentPane.add(textFieldOperator);
+
+ JLabel labelService = new JLabel(tr(NETWORK_LEVEL_CAPTION));
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 4;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(labelService, layoutCons);
+ contentPane.add(labelService);
+
+ String[] serviceTransStrings = new String[serviceCaptionStrings.length];
+ for(int i = 0; i < serviceCaptionStrings.length; i++)
+ serviceTransStrings[i] = tr(serviceCaptionStrings[i]);
+ comboBoxService = new JComboBox(serviceTransStrings);
+ comboBoxService.setSelectedIndex(0);
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 4;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(comboBoxService, layoutCons);
+ contentPane.add(comboBoxService);
+
+ checkBoxIsBus = new JCheckBox(tr(BUS_CAPTION));
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 5;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(checkBoxIsBus, layoutCons);
+ checkBoxIsBus.addItemListener(this);
+ contentPane.add(checkBoxIsBus);
+
+ checkBoxIsShareTaxi = new JCheckBox(tr(SHARE_TAXI_CAPTION));
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 5;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(checkBoxIsShareTaxi, layoutCons);
+ checkBoxIsShareTaxi.addItemListener(this);
+ contentPane.add(checkBoxIsShareTaxi);
+
+ checkBoxIsTrolleybus = new JCheckBox(tr(TROLLEYBUS_CAPTION));
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 6;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(checkBoxIsTrolleybus, layoutCons);
+ checkBoxIsTrolleybus.addItemListener(this);
+ contentPane.add(checkBoxIsTrolleybus);
+
+ checkBoxIsBusStation = new JCheckBox(tr(BUS_STATION_CAPTION));
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 6;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(checkBoxIsBusStation, layoutCons);
+ checkBoxIsBusStation.addItemListener(this);
+ contentPane.add(checkBoxIsBusStation);
+
+ checkBoxIsTram = new JCheckBox(tr(TRAM_CAPTION));
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 7;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(checkBoxIsTram, layoutCons);
+ checkBoxIsTram.addItemListener(this);
+ contentPane.add(checkBoxIsTram);
+
+ checkBoxIsTrainStation = new JCheckBox(tr(RAILWAY_STATION_CAPTION));
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 8;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(checkBoxIsTrainStation, layoutCons);
+ checkBoxIsTrainStation.addItemListener(this);
+ contentPane.add(checkBoxIsTrainStation);
+
+ checkBoxIsTrainStop = new JCheckBox(tr(RAILWAY_STOP_CAPTION));
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 8;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(checkBoxIsTrainStop, layoutCons);
+ checkBoxIsTrainStop.addItemListener(this);
+ contentPane.add(checkBoxIsTrainStop);
+
+ checkBoxIsAssignTransportType = new JCheckBox(tr(ASSIGN_TRANSPORT_TYPE_CAPTION));
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 9;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(checkBoxIsAssignTransportType, layoutCons);
+ checkBoxIsAssignTransportType.addItemListener(this);
+ contentPane.add(checkBoxIsAssignTransportType);
+
+ checkBoxIsBench = new JCheckBox(tr(BENCH_CAPTION));
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 10;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(checkBoxIsBench, layoutCons);
+ checkBoxIsBench.addItemListener(this);
+ contentPane.add(checkBoxIsBench);
+
+ checkBoxIsShelder = new JCheckBox(tr(SHELDER_CAPTION));
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 10;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(checkBoxIsShelder, layoutCons);
+ checkBoxIsShelder.addItemListener(this);
+ contentPane.add(checkBoxIsShelder);
+
+ checkBoxIsCover = new JCheckBox(tr(COVER_CAPTION));
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 11;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(checkBoxIsCover, layoutCons);
+ checkBoxIsCover.addItemListener(this);
+ contentPane.add(checkBoxIsCover);
+
+ checkBoxIsArea = new JCheckBox(tr(AREA_CAPTION));
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 11;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ gridbag.setConstraints(checkBoxIsArea, layoutCons);
+ checkBoxIsArea.addItemListener(this);
+ contentPane.add(checkBoxIsArea);
+
+ JButton buttonSave = new JButton(tr(SAVE_BUTTON_CAPTION));
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 12;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.HORIZONTAL;
+ layoutCons.insets = new Insets(10, 0 , 0, 0);
+ gridbag.setConstraints(buttonSave, layoutCons);
+ buttonSave.setActionCommand(SAVE_COMMAND);
+ buttonSave.addActionListener(this);
+ contentPane.add(buttonSave);
+
+ JButton buttonCancel = new JButton(tr(CANCEL_BUTTON_CAPTION));
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 12;
+ layoutCons.weightx = 0.5;
+ layoutCons.fill = GridBagConstraints.LINE_START;
+ layoutCons.insets = new Insets(10, 0 , 0, 0);
+ gridbag.setConstraints(buttonCancel, layoutCons);
+ buttonCancel.setActionCommand(CANCEL_COMMAND);
+ buttonCancel.addActionListener(this);
+ contentPane.add(buttonCancel);
+
+ jDialog.add(contentPane);
+
+ jDialog.pack();
+ jDialog.setLocationRelativeTo(frame);
+ }
+
+ /**
+ * Constructor of dialog with filling of controls
+ * @param customizeStopAction Stop area customizing action
+ * @param stopArea Stop area
+ */
+ public CustomizePublicTransportStopDialog(CustomizeStopAction customizeStopAction, StopArea stopArea)
+ {
+ this();
+ setValues(stopArea);
+ this.customizeStopAction = customizeStopAction;
+ this.stopArea = stopArea;
+ }
+
+ /**
+ * Return stop area
+ * @return Stop area
+ */
+ public StopArea getStopArea()
+ {
+ return stopArea;
+ }
+
+ /**
+ * Set stop area and fill controls
+ * @param newStopArea Stop area
+ */
+ public void setStopArea(StopArea newStopArea)
+ {
+ setValues(newStopArea);
+ this.stopArea = newStopArea;
+ }
+
+ /**
+ * Returns stop area customizing action
+ * @return Stop area customizing action
+ */
+ public CustomizeStopAction getCustomizeStopAction()
+ {
+ return customizeStopAction;
+ }
+
+ /**
+ * Set stop area customizing action
+ * @param newCustomizeStopAction Stop area customizing action
+ */
+ public void setCustomizeStopAction(CustomizeStopAction newCustomizeStopAction)
+ {
+ customizeStopAction = newCustomizeStopAction;
+ }
+
+ /**
+ * Set value in check boxes map
+ * @param checkBox Check box
+ * @param value Value of check box
+ */
+ public void setCheckBoxValue(JCheckBox checkBox, Boolean value)
+ {
+ checkBoxValues.put(checkBox, value);
+ checkBox.setSelected(value);
+ }
+
+ /**
+ * Returns value of check box
+ * @param checkBox Check box
+ * @return Value of check box
+ */
+ public Boolean getCheckBoxValue(JCheckBox checkBox)
+ {
+ try
+ {
+ if(checkBoxValues.containsKey(checkBox))
+ {
+ return checkBoxValues.get(checkBox);
+ }
+ return false;
+ }
+ catch(Exception ex)
+ {
+ MessageBox.ok(ex.getMessage());
+ }
+ return false;
+ }
+
+ /**
+ * Callback method for check boxes
+ * Set values in check boxes map
+ */
+ @Override
+ public void itemStateChanged(ItemEvent event)
+ {
+ JCheckBox checkBox = (JCheckBox)event.getSource();
+ if(event.getStateChange() == ItemEvent.DESELECTED)
+ {
+ checkBoxValues.put(checkBox, false);
+ }
+ else
+ if(event.getStateChange() == ItemEvent.SELECTED)
+ {
+ checkBoxValues.put(checkBox, true);
+ }
+ }
+
+ /**
+ * Show or hide dialog
+ * @param isVisible Flag of dialog visibility
+ */
+ public void setVisible(Boolean isVisible)
+ {
+ if(jDialog != null)
+ jDialog.setVisible(isVisible);
+ }
+
+ /**
+ * Get index of network level
+ * @param service Network level name
+ * @return Index of network level
+ */
+ private int getServiceIndex(String service)
+ {
+ for(int i = 0; i < serviceStrings.length; i++)
+ {
+ if(serviceStrings[i].equals(service))
+ {
+ return i;
+ }
+ }
+ return 0;
+ }
+
+ /**
+ * Setting values of controls from stop area
+ * @param stopArea Stop area
+ */
+ public void setValues(StopArea stopArea)
+ {
+ if(stopArea == null)
+ return;
+ if(stopArea.name != null)
+ textFieldName.setText(stopArea.name);
+ else
+ if(previousName != null)
+ textFieldName.setText(previousName);
+ if(stopArea.nameEn != null)
+ textFieldNameEn.setText(stopArea.nameEn);
+ else
+ if(previousNameEn != null)
+ textFieldNameEn.setText(previousNameEn);
+ if(stopArea.network != null)
+ textFieldNetwork.setText(stopArea.network);
+ else
+ if(previousNetwork != null)
+ textFieldNetwork.setText(previousNetwork);
+ if(stopArea.operator != null)
+ textFieldOperator.setText(stopArea.operator);
+ else
+ if(previousOperator != null)
+ textFieldOperator.setText(previousOperator);
+ comboBoxService.setSelectedIndex(getServiceIndex(stopArea.service));
+ setCheckBoxValue(checkBoxIsBus, stopArea.isBus);
+ setCheckBoxValue(checkBoxIsShareTaxi, stopArea.isShareTaxi);
+ setCheckBoxValue(checkBoxIsTrolleybus, stopArea.isTrolleybus);
+ setCheckBoxValue(checkBoxIsBusStation, stopArea.isBusStation);
+ setCheckBoxValue(checkBoxIsAssignTransportType, stopArea.isAssignTransportType);
+ setCheckBoxValue(checkBoxIsTram, stopArea.isTram);
+ setCheckBoxValue(checkBoxIsTrainStation, stopArea.isTrainStation);
+ setCheckBoxValue(checkBoxIsTrainStop, stopArea.isTrainStation);
+ setCheckBoxValue(checkBoxIsTrainStop, stopArea.isTrainStop);
+ setCheckBoxValue(checkBoxIsBench, stopArea.isBench);
+ setCheckBoxValue(checkBoxIsShelder, stopArea.isShelter);
+ setCheckBoxValue(checkBoxIsCover, stopArea.isCovered);
+ setCheckBoxValue(checkBoxIsArea, stopArea.isArea);
+ }
+
+ /**
+ * Returns text box value or null
+ * @param textField Text box
+ * @return Text box value or null
+ */
+ public String getTextFromControl(JTextField textField)
+ {
+ if(textField.getText().isEmpty())
+ return null;
+ return textField.getText();
+ }
+
+ /**
+ * Load values from controls and saving in stop area fields
+ * @return Stop area
+ */
+ public StopArea saveValues()
+ {
+ StopArea stopArea = this.stopArea;
+ try
+ {
+ if(stopArea == null)
+ stopArea = new StopArea();
+ stopArea.name = getTextFromControl(textFieldName);
+ previousName = stopArea.name;
+ stopArea.nameEn = getTextFromControl(textFieldNameEn);
+ previousNameEn = stopArea.nameEn;
+ stopArea.network = getTextFromControl(textFieldNetwork);
+ previousNetwork = stopArea.network;
+ stopArea.operator = getTextFromControl(textFieldOperator);
+ previousOperator = stopArea.operator;
+ stopArea.service = serviceStrings[comboBoxService.getSelectedIndex()];
+ stopArea.isBus = getCheckBoxValue(checkBoxIsBus);
+ stopArea.isShareTaxi = getCheckBoxValue(checkBoxIsShareTaxi);
+ stopArea.isTrolleybus = getCheckBoxValue(checkBoxIsTrolleybus);
+ stopArea.isBusStation = getCheckBoxValue(checkBoxIsBusStation);
+ stopArea.isAssignTransportType = getCheckBoxValue(checkBoxIsAssignTransportType);
+ stopArea.isTram = getCheckBoxValue(checkBoxIsTram);
+ stopArea.isTrainStation = getCheckBoxValue(checkBoxIsTrainStation);
+ stopArea.isTrainStop = getCheckBoxValue(checkBoxIsTrainStop);
+ stopArea.isBench = getCheckBoxValue(checkBoxIsBench);
+ stopArea.isShelter = getCheckBoxValue(checkBoxIsShelder);
+ stopArea.isCovered = getCheckBoxValue(checkBoxIsCover);
+ stopArea.isArea = getCheckBoxValue(checkBoxIsArea);
+ }
+ catch(Exception ex)
+ {
+ MessageBox.ok(ex.getMessage());
+ }
+ return stopArea;
+ }
+
+ /**
+ * Callback method for buttons event
+ */
+ public void actionPerformed(ActionEvent event)
+ {
+ if(SAVE_COMMAND.equals(event.getActionCommand()))
+ {
+ setVisible(false);
+ if(customizeStopAction != null)
+ {
+ StopArea stopArea = saveValues();
+ customizeStopAction.performCustomizing(stopArea);
+ }
+ }
+ else
+ {
+ setVisible(false);
+ }
+ }
+
+}
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CustomizePublicTransportStopPlugin.java
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CustomizePublicTransportStopPlugin.java (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CustomizePublicTransportStopPlugin.java (revision 32048)
@@ -0,0 +1,31 @@
+package ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginInformation;
+
+/**
+ *
+ * @author Rodion Scherbakov
+ * Class of plugin of customizing of stop area
+ * Plugin for josm editor
+ */
+public class CustomizePublicTransportStopPlugin extends Plugin
+{
+ /**
+ * Stop area customizing action
+ */
+ private CustomizeStopAction stopAreaCreatorAction;
+
+ /**
+ * Constructor of plug-in object
+ * @param info Plug-in properties
+ */
+ public CustomizePublicTransportStopPlugin(PluginInformation info) {
+ super(info);
+ stopAreaCreatorAction = CustomizeStopAction.createCustomizeStopAction();
+ Main.main.menu.toolsMenu.add(stopAreaCreatorAction);
+ System.out.println(getPluginDir());
+ }
+
+}
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CustomizeStopAction.java
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CustomizeStopAction.java (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CustomizeStopAction.java (revision 32048)
@@ -0,0 +1,98 @@
+package ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop;
+
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.tools.Shortcut;
+
+import ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop.CustomizePublicTransportStopDialog;
+
+/**
+ *
+ * @author Rodion Scherbakov
+ * Class of customizing of stop area
+ * Action for josm editor
+ */
+public class CustomizeStopAction extends JosmAction implements IStopAreaCustomizer
+{
+
+ /**
+ * Menu icon file name
+ */
+ private static final String CUSTOMIZE_STOP_ACTION_ICON_NAME = "bus.png";
+ /**
+ * Menu item tooltip
+ */
+ private static final String CUSTOMIZE_STOP_ACTION_MENU_TOOLTIP = "Customize stop under osm public transit standard v2";
+ /**
+ * Menu item caption
+ */
+ private static final String CUSTOMIZE_STOP_ACTION_MENU_NAME = "Customize stop";
+ /**
+ * Serialization UID
+ */
+ private static final long serialVersionUID = 6769508902749446137L;
+
+ /**
+ * Constructor of stop area customizing action
+ * @param name Name of action in josm menu
+ * @param iconName Name of icon file for josm menu
+ * @param tooltip Tooltip of action in josm menu
+ * @param shortcut Short key of action on josm
+ * @param registerInToolbar Flag of registration in josm menu
+ */
+ protected CustomizeStopAction(String name, String iconName, String tooltip,
+ Shortcut shortcut, boolean registerInToolbar)
+ {
+ super(name, iconName, tooltip, shortcut, registerInToolbar);
+ }
+
+ /**
+ * Constructs a stop area customizing action.
+ * @return the stop area customizing action
+ */
+ public static CustomizeStopAction createCustomizeStopAction()
+ {
+ CustomizeStopAction action = new CustomizeStopAction(
+ tr(CUSTOMIZE_STOP_ACTION_MENU_NAME), CUSTOMIZE_STOP_ACTION_ICON_NAME,
+ tr(CUSTOMIZE_STOP_ACTION_MENU_TOOLTIP),
+ Shortcut.registerShortcut("tools:customizestop", tr("Tool: {0}", tr(CUSTOMIZE_STOP_ACTION_MENU_NAME)),
+ KeyEvent.VK_U, Shortcut.DIRECT), true);
+ action.putValue("help", ht("/Action/CustomizeStopAction"));
+ return action;
+ }
+
+ /**
+ * Realization of action
+ * Construct stop area object from selected object and show settings dialog
+ */
+ @Override
+ public void actionPerformed(ActionEvent arg0)
+ {
+ if (!isEnabled())
+ return;
+ CreateStopAreaFromSelectedObjectOperation createStopAreaFromSelectedObjectOperation = new CreateStopAreaFromSelectedObjectOperation(getCurrentDataSet());
+ StopArea stopArea = createStopAreaFromSelectedObjectOperation.performCustomizing(null);
+ if(stopArea == null)
+ return;
+ CustomizePublicTransportStopDialog dialog = new CustomizePublicTransportStopDialog(this, stopArea);
+ dialog.setVisible(true);
+ }
+
+ /**
+ * Perform stop area customizing under user selection
+ * This method is launched by stop area settings dialog
+ * @param stopArea Stop area object with new settings
+ */
+ @Override
+ public StopArea performCustomizing(StopArea stopArea)
+ {
+ CustomizeStopAreaOperation customizeStopAreaOperation = new CustomizeStopAreaOperation(getCurrentDataSet());
+ return customizeStopAreaOperation.performCustomizing(stopArea);
+ }
+
+}
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CustomizeStopAreaOperation.java
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CustomizeStopAreaOperation.java (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/CustomizeStopAreaOperation.java (revision 32048)
@@ -0,0 +1,616 @@
+package ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
+
+/**
+ * Operation of creation and customizing stop area relation and its members under user selection
+ * @author Rodion Scherbakov
+ */
+public class CustomizeStopAreaOperation extends StopAreaOperationBase
+{
+
+ /**
+ * Operation name in undo list
+ */
+ private static final String TAG_ASSIGN_COMMAND_NAME = "Stop area tag assign";
+
+ /**
+ * Constructor of operation object
+ * @param currentDataSet Current Josm data set
+ */
+ public CustomizeStopAreaOperation(DataSet currentDataSet)
+ {
+ super(currentDataSet);
+ }
+
+ /**
+ * Forming commands for josm for saving name and name:en attributes stop of area members and relation attributes
+ * @param target Stop area member or relation
+ * @param commands List of commands
+ * @param stopArea Stop area object
+ * @return Resulting list of commands
+ */
+ public List nameTagAssign(OsmPrimitive target, List commands, StopArea stopArea)
+ {
+ if(commands == null)
+ commands = new ArrayList();
+
+ commands = assignTag(commands, target, OSMTags.NAME_TAG, "".equals(stopArea.name) ? null : stopArea.name);
+ commands = assignTag(commands, target, OSMTags.NAME_EN_TAG, "".equals(stopArea.nameEn) ? null : stopArea.nameEn);
+ return commands;
+ }
+
+ /**
+ * Assign transport type tags to node
+ * @param target Josm object for tag assigning
+ * @param commands Command list
+ * @param stopArea Stop area object
+ * @param isStopPoint Flag of stop point
+ * @return Resulting list of commands
+ */
+ protected List transportTypeTagAssign(OsmPrimitive target, List commands, StopArea stopArea, Boolean isStopPoint)
+ {
+ if(commands == null)
+ commands = new ArrayList();
+
+ if(isStopPoint)
+ {
+ if(stopArea.isTrainStop || stopArea.isTrainStation)
+ {
+ commands = clearTag(commands, target, OSMTags.BUS_TAG);
+ commands = clearTag(commands, target, OSMTags.SHARE_TAXI_TAG);
+ commands = clearTag(commands, target, OSMTags.TROLLEYBUS_TAG);
+ commands = clearTag(commands, target, OSMTags.TRAM_TAG);
+ commands = assignTag(commands, target, OSMTags.TRAIN_TAG, OSMTags.YES_TAG_VALUE);
+ }
+ else
+ {
+ commands = assignTag(commands, target, OSMTags.BUS_TAG, stopArea.isBus ? OSMTags.YES_TAG_VALUE : null);
+ commands = assignTag(commands, target, OSMTags.SHARE_TAXI_TAG, stopArea.isShareTaxi ? OSMTags.YES_TAG_VALUE : null);
+ commands = assignTag(commands, target, OSMTags.TROLLEYBUS_TAG, stopArea.isTrolleybus ? OSMTags.YES_TAG_VALUE : null);
+ commands = assignTag(commands, target, OSMTags.TRAM_TAG, stopArea.isTram ? OSMTags.YES_TAG_VALUE : null);
+ commands = assignTag(commands, target, OSMTags.TRAIN_TAG, stopArea.isTrainStation || stopArea.isTrainStop ? OSMTags.YES_TAG_VALUE : null);
+ }
+ }
+ else
+ {
+ if(stopArea.isAssignTransportType)
+ {
+ commands = assignTag(commands, target, OSMTags.BUS_TAG, stopArea.isBus ? OSMTags.YES_TAG_VALUE : null);
+ commands = assignTag(commands, target, OSMTags.SHARE_TAXI_TAG, stopArea.isShareTaxi ? OSMTags.YES_TAG_VALUE : null);
+ commands = assignTag(commands, target, OSMTags.TROLLEYBUS_TAG, stopArea.isTrolleybus ? OSMTags.YES_TAG_VALUE : null);
+ commands = assignTag(commands, target, OSMTags.TRAM_TAG, stopArea.isTram ? OSMTags.YES_TAG_VALUE : null);
+ commands = assignTag(commands, target, OSMTags.TRAIN_TAG, stopArea.isTrainStation || stopArea.isTrainStop ? OSMTags.YES_TAG_VALUE : null);
+ }
+ else
+ {
+ commands = clearTag(commands, target, OSMTags.BUS_TAG);
+ commands = clearTag(commands, target, OSMTags.SHARE_TAXI_TAG);
+ commands = clearTag(commands, target, OSMTags.TROLLEYBUS_TAG);
+ commands = clearTag(commands, target, OSMTags.TRAM_TAG);
+ commands = clearTag(commands, target, OSMTags.TRAIN_TAG);
+ }
+ }
+ return commands;
+ }
+
+ /**
+ * Forming commands for josm for saving general attributes of stop area members and relation
+ * @param target Stop area member or relation
+ * @param commands List of commands
+ * @param stopArea Stop area object
+ * @param isStopPoint Flag of stop point
+ * @return Resulting list of commands
+ */
+ public List generalTagAssign(OsmPrimitive target, List commands, StopArea stopArea, Boolean isStopPoint)
+ {
+ if(commands == null)
+ commands = new ArrayList();
+
+ commands = nameTagAssign(target,commands, stopArea);
+ commands = assignTag(commands, target, OSMTags.NETWORK_TAG, "".equals(stopArea.network) ? null : stopArea.network);
+ commands = assignTag(commands, target, OSMTags.OPERATOR_TAG, "".equals(stopArea.operator) ? null : stopArea.operator);
+ commands = assignTag(commands, target, OSMTags.SERVICE_TAG, null == stopArea.service || OSMTags.CITY_NETWORK_TAG_VALUE.equals(stopArea.service) ? null : stopArea.service);
+
+ commands = transportTypeTagAssign(target, commands, stopArea, isStopPoint);
+ return commands;
+ }
+
+
+ /**
+ * Forming commands for josm for saving stop position attributes
+ * @param target Stop position node
+ * @param commands Original command list
+ * @param stopArea Stop area object
+ * @param isFirst true, if target is first stop position in stop area
+ * @return Resulting command list
+ */
+ public List stopPointTagAssign(OsmPrimitive target, List commands, StopArea stopArea, Boolean isFirst)
+ {
+ if(commands == null)
+ commands = new ArrayList();
+
+ commands = generalTagAssign(target, commands, stopArea, true);
+ if(isFirst)
+ {
+ if(stopArea.isTrainStop)
+ {
+ commands = assignTag(commands, target, OSMTags.RAILWAY_TAG, OSMTags.HALT_TAG_VALUE);
+ }
+ else
+ if(stopArea.isTrainStation)
+ {
+ commands = assignTag(commands, target, OSMTags.RAILWAY_TAG, OSMTags.STATION_TAG_VALUE);
+ }
+ else
+ if(stopArea.isTram)
+ commands = assignTag(commands, target, OSMTags.RAILWAY_TAG, OSMTags.TRAM_STOP_TAG_VALUE);
+ else
+ commands = clearTag(commands, target, OSMTags.RAILWAY_TAG);
+ }
+ else
+ {
+ commands = clearTag(commands, target, OSMTags.RAILWAY_TAG);
+ }
+ if(compareTag(target, OSMTags.HIGHWAY_TAG, OSMTags.BUS_STOP_TAG_VALUE))
+ commands = clearTag(commands, target, OSMTags.HIGHWAY_TAG);
+ if(compareTag(target, OSMTags.AMENITY_TAG, OSMTags.BUS_STATION_TAG_VALUE))
+ commands = clearTag(commands, target, OSMTags.AMENITY_TAG);
+ commands = assignTag(commands, target, OSMTags.PUBLIC_TRANSPORT_TAG, OSMTags.STOP_POSITION_TAG_VALUE);
+ return commands;
+ }
+
+ /**
+ * Forming commands for josm for saving platform attributes
+ * @param target Platform node or way
+ * @param commands Original command list
+ * @param stopArea Stop area object
+ * @param isSelected true, if this platform is selected in editor
+ * @param isFirst true, if this platform is first in stop area
+ * @return Resulting command list
+ */
+ public List platformTagAssign(OsmPrimitive target, List commands, StopArea stopArea, Boolean isFirst)
+ {
+ if(commands == null)
+ commands = new ArrayList();
+
+ commands = generalTagAssign(target, commands, stopArea, false);
+
+ if(compareTag(target, OSMTags.RAILWAY_TAG, OSMTags.HALT_TAG_VALUE) || compareTag(target, OSMTags.RAILWAY_TAG, OSMTags.STATION_TAG_VALUE))
+ commands = clearTag(commands, target, OSMTags.RAILWAY_TAG);
+ if(target instanceof Way && (stopArea.isTrainStop || stopArea.isTrainStation || stopArea.isTram))
+ commands = assignTag(commands, target, OSMTags.RAILWAY_TAG, OSMTags.PLATFORM_TAG_VALUE);
+ if(stopArea.isBus || stopArea.isShareTaxi || stopArea.isTrolleybus)
+ {
+ if(target instanceof Way)
+ commands = assignTag(commands, target, OSMTags.HIGHWAY_TAG, OSMTags.PLATFORM_TAG_VALUE);
+ else
+ if(isFirst && !stopArea.isBusStation)
+ commands = assignTag(commands, target, OSMTags.HIGHWAY_TAG, OSMTags.BUS_STOP_TAG_VALUE);
+ }
+ commands = assignTag(commands, target, OSMTags.PUBLIC_TRANSPORT_TAG, OSMTags.PLATFORM_TAG_VALUE);
+ if(target == stopArea.selectedObject)
+ {
+ commands = assignTag(commands, target, OSMTags.BENCH_TAG, stopArea.isBench ? OSMTags.YES_TAG_VALUE : null);
+ commands = assignTag(commands, target, OSMTags.SHELTER_TAG, stopArea.isShelter ? OSMTags.YES_TAG_VALUE : null);
+ commands = assignTag(commands, target, OSMTags.COVERED_TAG, stopArea.isCovered ? OSMTags.YES_TAG_VALUE : null);
+ commands = assignTag(commands, target, OSMTags.AREA_TAG, stopArea.isArea ? OSMTags.YES_TAG_VALUE : null);
+ }
+ return commands;
+ }
+
+ /**
+ * Forming commands for josm for saving attributes of non stop position or platform
+ * @param target Member of stop area relation
+ * @param commands Original command list
+ * @param stopArea Stop area object
+ * @return Resulting command list
+ */
+ public List otherMemberTagAssign(OsmPrimitive target, List commands, StopArea stopArea)
+ {
+ if(commands == null)
+ commands = new ArrayList();
+
+ commands = nameTagAssign(target, commands, stopArea);
+ commands = clearTag(commands, target, OSMTags.NETWORK_TAG);
+ commands = clearTag(commands, target, OSMTags.OPERATOR_TAG);
+ commands = clearTag(commands, target, OSMTags.SERVICE_TAG);
+ if(compareTag(target, OSMTags.RAILWAY_TAG, OSMTags.HALT_TAG_VALUE) || compareTag(target, OSMTags.RAILWAY_TAG, OSMTags.STATION_TAG_VALUE))
+ commands = clearTag(commands, target, OSMTags.RAILWAY_TAG);
+ return commands;
+ }
+
+ /**
+ * Forming commands for josm for saving stop area relation attributes
+ * @param commands Original command list
+ * @param stopArea Stop area object
+ * @return Resulting command list
+ */
+ private List createStopAreaRelation(List commands, StopArea stopArea)
+ {
+ if(commands == null)
+ commands = new ArrayList();
+
+ Relation newRelation = new Relation();
+ for(Node node : stopArea.stopPoints)
+ {
+ newRelation.addMember(new RelationMember(OSMTags.STOP_ROLE, node));
+ }
+ for(OsmPrimitive platform : stopArea.platforms)
+ {
+ newRelation.addMember(new RelationMember(OSMTags.PLATFORM_ROLE, platform));
+ }
+ for(OsmPrimitive otherMember : stopArea.otherMembers)
+ {
+ newRelation.addMember(new RelationMember("", otherMember));
+ }
+ Main.main.undoRedo.add(new AddCommand(newRelation));
+ commands = generalTagAssign(newRelation, commands, stopArea, false);
+ commands = assignTag(commands, newRelation, OSMTags.TYPE_TAG, OSMTags.PUBLIC_TRANSPORT_TAG);
+ commands = assignTag(commands, newRelation, OSMTags.PUBLIC_TRANSPORT_TAG, OSMTags.STOP_AREA_TAG_VALUE);
+ return commands;
+ }
+
+ /**
+ * Adding of new stop area members to relation
+ * @param commands Original command list
+ * @param targetRelation Stop area relation
+ * @param member Stop area relation member
+ * @param roleName Role name
+ * @return Resulting command list
+ */
+ public static List addNewRelationMember(List commands, Relation targetRelation, OsmPrimitive member, String roleName)
+ {
+ if(commands == null)
+ commands = new ArrayList();
+
+ for(RelationMember relationMember : targetRelation.getMembers())
+ {
+ if(relationMember.getMember() == member)
+ {
+ if(relationMember.getRole() == roleName)
+ {
+ return commands;
+ }
+ return commands;
+ }
+ }
+ targetRelation.addMember(new RelationMember(roleName, member));
+ commands.add(new ChangeCommand(targetRelation, targetRelation));
+ return commands;
+ }
+
+ /**
+ * Adding new stop area members to relation
+ * @param commands Original command list
+ * @param stopArea Stop area object
+ * @return Resulting command list
+ */
+ private List addNewRelationMembers(List commands, StopArea stopArea)
+ {
+ if(commands == null)
+ commands = new ArrayList();
+
+ for(OsmPrimitive stopPoint : stopArea.stopPoints)
+ {
+ commands = addNewRelationMember(commands, stopArea.stopAreaRelation, stopPoint, OSMTags.STOP_ROLE);
+ }
+ for(OsmPrimitive platform : stopArea.platforms)
+ {
+ commands = addNewRelationMember(commands, stopArea.stopAreaRelation, platform, OSMTags.PLATFORM_ROLE);
+ }
+ for(OsmPrimitive otherMember : stopArea.otherMembers)
+ {
+ commands = addNewRelationMember(commands, stopArea.stopAreaRelation, otherMember, null);
+ }
+ return commands;
+ }
+
+ /**
+ * Testing, is josm object bus stop node or contains bus stop node, defined by tag and its value
+ * @param member Josm object
+ * @param tag Tag name
+ * @param tagValue Tag value
+ * @return true, if josm object is bus stop node or contains bus stop node
+ */
+ private Node searchBusStop(OsmPrimitive member, String tag, String tagValue)
+ {
+ if(member instanceof Node)
+ {
+ if(compareTag(member, tag, tagValue))
+ {
+ return (Node)member;
+ }
+ }
+ else
+ {
+ Way memberWay = (Way) member;
+ for(Node node : memberWay.getNodes())
+ {
+ if(compareTag(node, tag, tagValue))
+ {
+ return node;
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Testing, do stop area contains bus stop node, defined by tag and its value
+ * @param tag Tag name
+ * @param tagValue Tag value
+ * @return true, if stop area contains bus stop node
+ */
+ public Node searchBusStop(StopArea stopArea, String tag, String tagValue)
+ {
+ for(OsmPrimitive platform : stopArea.platforms)
+ {
+ Node busStopNode = searchBusStop(platform, tag, tagValue);
+ if(busStopNode != null)
+ return busStopNode;
+ }
+ for(OsmPrimitive otherMember : stopArea.otherMembers)
+ {
+ Node busStopNode = searchBusStop(otherMember, tag, tagValue);
+ if(busStopNode != null)
+ return busStopNode;
+ }
+ return null;
+ }
+
+ /**
+ * Testing, must stop area to have separate bus stop node
+ * @param stopArea Stop area object
+ * @param firstPlatform First platform of stop area JOSM object
+ * @return True, stop area must to have separate bus stop node
+ */
+ public boolean needSeparateBusStop(StopArea stopArea, OsmPrimitive firstPlatform)
+ {
+ if(((stopArea.isBus || stopArea.isShareTaxi || stopArea.isTrolleybus) && (firstPlatform instanceof Way)))
+ {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Clear excess tags from JOSM object and its nodes
+ * @param commands Original command list
+ * @param target JOSM object
+ * @param tag Tag name
+ * @param tagValue Tag value
+ * @return Resulting command list
+ */
+ private List clearExcessTags(List commands, OsmPrimitive target, String tag, String tagValue)
+ {
+ if(commands == null)
+ commands = new ArrayList();
+
+ if(compareTag(target, tag, tagValue))
+ {
+ commands = clearTag(commands, target, tag);
+ }
+ if(target instanceof Way)
+ {
+ Way memberWay = (Way) target;
+ for(Node node : memberWay.getNodes())
+ {
+ if(compareTag(node, tag, tagValue))
+ {
+ commands = clearTag(commands, target, tag);
+ }
+ }
+ }
+ return commands;
+ }
+
+ /**
+ * Clear excess tags from JOSM object and its nodes
+ * @param commands Command list
+ * @param stopArea Stop area object
+ * @param tag Tag name
+ * @param tagValue Tag value
+ * @return Resulting command list
+ */
+ public List clearExcessTags(List commands, StopArea stopArea, String tag, String tagValue)
+ {
+ if(commands == null)
+ commands = new ArrayList();
+
+ for(OsmPrimitive stopPoint : stopArea.stopPoints)
+ {
+ clearExcessTags(commands, stopPoint, tag, tagValue);
+ }
+ for(OsmPrimitive platform : stopArea.platforms)
+ {
+ clearExcessTags(commands, platform, tag, tagValue);
+ }
+ for(OsmPrimitive otherMember : stopArea.otherMembers)
+ {
+ clearExcessTags(commands, otherMember, tag, tagValue);
+ }
+ return commands;
+ }
+
+
+ /**
+ * Create separate bus stop node or assign bus stop tag to platform node
+ * @param commands Original command list
+ * @param stopArea Stop area object
+ * @param firstPlatform First platform in stop area relation
+ * @param tag Tag name
+ * @param tagValue Tag value
+ * @return Resulting command list
+ */
+ protected List createSeparateBusStopNode(List commands, StopArea stopArea, OsmPrimitive firstPlatform, String tag, String tagValue)
+ {
+ if(commands == null)
+ commands = new ArrayList();
+
+ LatLon centerOfPlatform = getCenterOfWay(firstPlatform);
+ if(firstPlatform instanceof Way)
+ {
+ if(centerOfPlatform != null)
+ {
+ Node newNode =new Node();
+ newNode.setCoor(centerOfPlatform);
+ Main.main.undoRedo.add(new AddCommand(newNode));
+ Main.main.undoRedo.add(new ChangePropertyCommand(newNode, tag, tagValue));
+ commands = assignTag(commands, newNode, tag, tagValue);
+ stopArea.otherMembers.add(newNode);
+ }
+ }
+ else
+ {
+ commands = assignTag(commands, firstPlatform, tag, tagValue);
+ }
+ return commands;
+ }
+
+ /**
+ * Forming commands for JOSM for saving stop area members and relation attributes
+ * @param stopArea Stop area object
+ * @return Resulting command list
+ */
+ public List customize(StopArea stopArea)
+ {
+ try
+ {
+ List commands = new ArrayList();
+ Node separateBusStopNode = searchBusStop(stopArea, OSMTags.AMENITY_TAG, OSMTags.BUS_STATION_TAG_VALUE);
+ if(separateBusStopNode == null)
+ separateBusStopNode = searchBusStop(stopArea, OSMTags.HIGHWAY_TAG, OSMTags.BUS_STOP_TAG_VALUE);
+ if(stopArea.isBusStation)
+ {
+ commands = clearExcessTags(commands, stopArea, OSMTags.HIGHWAY_TAG, OSMTags.BUS_STOP_TAG_VALUE);
+ }
+ else
+ {
+ commands = clearExcessTags(commands, stopArea, OSMTags.AMENITY_TAG, OSMTags.BUS_STATION_TAG_VALUE);
+ }
+ if(!(stopArea.isBus || stopArea.isShareTaxi || stopArea.isTrolleybus))
+ {
+ commands = clearExcessTags(commands, stopArea, OSMTags.HIGHWAY_TAG, OSMTags.BUS_STOP_TAG_VALUE);
+ }
+ if(stopArea.stopPoints.size() == 0)
+ {
+ CreateNewStopPointOperation createNewStopPointOperation = new CreateNewStopPointOperation(getCurrentDataSet());
+ createNewStopPointOperation.performCustomizing(stopArea);
+ }
+ Boolean isFirst = true;
+ for(Node node : stopArea.stopPoints)
+ {
+ commands = stopPointTagAssign(node, commands, stopArea, isFirst);
+ isFirst = false;
+ }
+ isFirst = true;
+ OsmPrimitive firstPlatform = null;
+ for(OsmPrimitive platform : stopArea.platforms)
+ {
+ commands = platformTagAssign(platform, commands, stopArea, isFirst);
+ if(isFirst)
+ firstPlatform = platform;
+ isFirst = false;
+ }
+ if(needSeparateBusStop(stopArea, firstPlatform))
+ {
+ if(stopArea.isBusStation)
+ {
+ if(separateBusStopNode == null)
+ {
+ commands = createSeparateBusStopNode(commands, stopArea, firstPlatform, OSMTags.AMENITY_TAG, OSMTags.BUS_STATION_TAG_VALUE);
+ }
+ else
+ {
+ commands = assignTag(commands, separateBusStopNode, OSMTags.AMENITY_TAG, OSMTags.BUS_STATION_TAG_VALUE);
+ }
+ }
+ else
+ {
+ if(separateBusStopNode == null)
+ {
+ commands = createSeparateBusStopNode(commands, stopArea, firstPlatform, OSMTags.HIGHWAY_TAG, OSMTags.BUS_STOP_TAG_VALUE);
+ }
+ else
+ {
+ commands = assignTag(commands, separateBusStopNode, OSMTags.HIGHWAY_TAG, OSMTags.BUS_STOP_TAG_VALUE);
+ }
+ }
+ }
+ else
+ {
+ if(stopArea.isBusStation)
+ {
+ commands = assignTag(commands, firstPlatform, OSMTags.AMENITY_TAG, OSMTags.BUS_STATION_TAG_VALUE);
+ }
+ else
+ if(stopArea.isBus || stopArea.isTrolleybus || stopArea.isShareTaxi)
+ {
+ commands = assignTag(commands, firstPlatform, OSMTags.HIGHWAY_TAG, OSMTags.BUS_STOP_TAG_VALUE);
+ }
+ }
+ for(OsmPrimitive otherMember : stopArea.otherMembers)
+ {
+ commands = otherMemberTagAssign(otherMember, commands, stopArea);
+ }
+ if(stopArea.stopAreaRelation == null)
+ {
+ if(stopArea.stopPoints.size() + stopArea.platforms.size() + stopArea.otherMembers.size() > 1)
+ {
+ commands = createStopAreaRelation(commands, stopArea);
+ }
+ }
+ else
+ {
+ commands = generalTagAssign(stopArea.stopAreaRelation, commands, stopArea, false);
+ commands = addNewRelationMembers(commands, stopArea);
+ }
+ return commands;
+ }
+ catch(Exception ex)
+ {
+ MessageBox.ok(ex.getMessage());
+ }
+ return null;
+ }
+
+ /**
+ * Construct and executing command list for customizing of stop area relation and its members
+ * @param stopArea Stop area object
+ * @return Stop area object
+ */
+ @Override
+ public StopArea performCustomizing(StopArea stopArea)
+ {
+ List commands = customize(stopArea);
+ if(commands != null && !commands.isEmpty())
+ try
+ {
+ Main.main.undoRedo.add(new SequenceCommand(tr(TAG_ASSIGN_COMMAND_NAME), commands));
+ return stopArea;
+ }
+ catch(Exception ex)
+ {
+ }
+ return stopArea;
+ }
+
+}
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/IStopAreaCustomizer.java
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/IStopAreaCustomizer.java (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/IStopAreaCustomizer.java (revision 32048)
@@ -0,0 +1,16 @@
+package ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop;
+
+/**
+ *
+ * @author Rodion Scherbakov
+ * Interface of operation of stop area customizing
+ */
+public interface IStopAreaCustomizer
+{
+ /**
+ * Perform operation of customizing of stop area
+ * @param stopArea Stop area
+ * @return Stop area after customizing
+ */
+ public StopArea performCustomizing(StopArea stopArea);
+}
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/MessageBox.java
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/MessageBox.java (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/MessageBox.java (revision 32048)
@@ -0,0 +1,84 @@
+package ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop;
+import javax.swing.JOptionPane;
+import java.awt.Component;
+/**
+ *
+ * @author Moderator
+ * MessageBox static class
+ * It is used for debug
+ * Source: Java forums http://www.java-forums.org/java-tip/6578-messagebox-example.html
+ */
+public class MessageBox {
+ /*
+ These are a list of STATIC MODAL dialogs
+
+ int return codes of button pressed:
+
+ -1 - WINDOW CLOSED - the X PRESSED
+ 0 - YES and OK
+ 1 - NO
+ 2 - CANCEL
+
+ (thanks to flipside for the idea)
+ */
+
+ /**
+ * Show message box with "yes" and "no" buttons
+ * @param theMessage Message for user
+ * @return Code of pressed button
+ */
+ public static int yesno(String theMessage){
+ int result = JOptionPane.showConfirmDialog((Component)
+ null, theMessage, "alert", JOptionPane.YES_NO_OPTION);
+ return result;
+ }
+
+ /**
+ * Show message box with "yes", "no" and "cancel" buttons
+ * @param theMessage Message for user
+ * @return Code of pressed button
+ */
+ public static int yesnocancel(String theMessage){
+ int result = JOptionPane.showConfirmDialog((Component)
+ null, theMessage, "alert", JOptionPane.YES_NO_CANCEL_OPTION);
+ return result;
+ }
+
+ /**
+ * Show message box with "Ok" and "Cancel" buttons
+ * @param theMessage Message for user
+ * @return Code of pressed button
+ */
+ public static int okcancel(String theMessage){
+ int result = JOptionPane.showConfirmDialog((Component)
+ null, theMessage, "alert", JOptionPane.OK_CANCEL_OPTION);
+ return result;
+ }
+
+ /**
+ * Show message box with "ok" button
+ * @param theMessage Message for user
+ * @return Code of pressed button
+ */
+ public static int ok(String theMessage){
+ int result = JOptionPane.showConfirmDialog((Component)
+ null, theMessage, "alert", JOptionPane.DEFAULT_OPTION);
+ return result;
+ }
+
+ /**
+ * Main method for test launch
+ *
+ * @param args Arguments of command line
+ */
+ public static void main(String args[]){
+ int i = MessageBox.yesno("Are your sure ?");
+ System.out.println("ret : " + i );
+ i = MessageBox.yesnocancel("Are your sure ?");
+ System.out.println("ret : " + i );
+ i = MessageBox.okcancel("Are your sure ?");
+ System.out.println("ret : " + i );
+ i = MessageBox.ok("Done.");
+ System.out.println("ret : " + i );
+ }
+}
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/NearestWaySegment.java
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/NearestWaySegment.java (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/NearestWaySegment.java (revision 32048)
@@ -0,0 +1,38 @@
+package ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop;
+
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.WaySegment;
+
+/**
+ *
+ * @author Rodion Scherbakov
+ * Distance from platform to ways
+ */
+public class NearestWaySegment
+{
+ /**
+ * Square of distance
+ */
+ public Double distanceSq = 1000000000.0;
+ /**
+ * Way segment
+ */
+ public WaySegment waySegment;
+ /**
+ * Node
+ */
+ public Node newNode;
+
+ /**
+ * Constructor
+ * @param distanceSq Square of distance
+ * @param waySegment Way segment
+ * @param newNode Node
+ */
+ public NearestWaySegment(Double distanceSq, WaySegment waySegment, Node newNode)
+ {
+ this.distanceSq = distanceSq;
+ this.waySegment = waySegment;
+ this.newNode = newNode;
+ }
+}
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/OSMTags.java
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/OSMTags.java (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/OSMTags.java (revision 32048)
@@ -0,0 +1,66 @@
+package ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop;
+
+/**
+ *
+ * @author Rodion Scherbakov
+ * OSM object tags
+ */
+public class OSMTags
+{
+ public static final String TERTIARY_LINK_TAG_VALUE = "tertiary_link";
+ public static final String SECONDARY_LINK_TAG_VALUE = "secondary_link";
+ public static final String PRIMARY_LINK_TAG_VALUE = "primary_link";
+ public static final String TRUNK_LINK_TAG_VALUE = "trunk_link";
+ public static final String ROAD_TAG_VALUE = "road";
+ public static final String BUS_GUIDEWAY_TAG_VALUE = "bus_guideway";
+ public static final String SERVICE_TAG_VALUE = "service";
+ public static final String RESIDENTIAL_TAG_VALUE = "residential";
+ public static final String UNCLASSIFIED_TAG_VALUE = "unclassified";
+ public static final String TERTIARY_TAG_VALUE = "tertiary";
+ public static final String SECONDARY_TAG_VALUE = "secondary";
+ public static final String PRIMARY_TAG_VALUE = "primary";
+ public static final String TRUNK_TAG_VALUE = "trunk";
+ public static final String TRAM_TAG_VALUE = "tram";
+ public static final String USAGE_TAG = "usage";
+ public static final String MAIN_TAG_VALUE = "main";
+ public static final String RAIL_TAG_VALUE = "rail";
+
+ public static final String AREA_TAG = "area";
+ public static final String COVERED_TAG = "covered";
+ public static final String SHELTER_TAG = "shelter";
+ public static final String BENCH_TAG = "bench";
+ public static final String TRAIN_TAG = "train";
+ public static final String STOP_POSITION_TAG_VALUE = "stop_position";
+ public static final String STATION_TAG_VALUE = "station";
+ public static final String HALT_TAG_VALUE = "halt";
+ public static final String YES_TAG_VALUE = "yes";
+ public static final String RAILWAY_TAG = "railway";
+ public static final String TRAM_STOP_TAG_VALUE = "tram_stop";
+ public static final String TRAM_TAG = "tram";
+ public static final String SHARE_TAXI_TAG = "share_taxi";
+ public static final String TROLLEYBUS_TAG = "trolleybus";
+ public static final String BUS_TAG = "bus";
+ public static final String NETWORK_TAG = "network";
+ public static final String OPERATOR_TAG = "operator";
+ public static final String NAME_EN_TAG = "name:en";
+ public static final String NAME_TAG = "name";
+ public static final String HIGHWAY_TAG = "highway";
+ public static final String AMENITY_TAG = "amenity";
+ public static final String BUS_STATION_TAG_VALUE = "bus_station";
+
+ public static final String BUS_STOP_TAG_VALUE = "bus_stop";
+ public static final String TYPE_TAG = "type";
+ public static final String PUBLIC_TRANSPORT_TAG = "public_transport";
+ public static final String STOP_AREA_TAG_VALUE = "stop_area";
+ public static final String STOP_ROLE = "stop";
+ public static final String PLATFORM_ROLE = "platform";
+ public static final String PLATFORM_TAG_VALUE = "platform";
+ public static final String SERVICE_TAG = "service";
+
+ public static final String CITY_NETWORK_TAG_VALUE = "city";
+ public static final String LOCAL_NETWORK_TAG_VALUE = "local";
+ public static final String REGIONAL_NETWORK_TAG_VALUE = "regional";
+ public static final String LONG_DISTANCE_NETWORK_TAG_VALUE = "long_distance";
+ public static final String HIGH_SPEED_NETWORK_TAG_VALUE = "high_speed";
+
+}
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/StopArea.java
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/StopArea.java (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/StopArea.java (revision 32048)
@@ -0,0 +1,154 @@
+package ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop;
+
+import java.util.ArrayList;
+
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+
+/**
+ *
+ * @author Rodion Scherbakov
+ * Stop area settings
+ */
+public class StopArea {
+
+ /**
+ * Name of stop area
+ */
+ public String name = null;
+ /**
+ * English name of stop area
+ */
+ public String nameEn = null;
+ /**
+ * Operator of stop area
+ */
+ public String operator = null;
+ /**
+ * Network name
+ */
+ public String network = null;
+ /**
+ * Level of network including this stop area
+ */
+ public String service = null;
+ /**
+ * Flag of bus stop area
+ */
+ public Boolean isBus = false;
+ /**
+ * Flag of trolleybus stop area
+ */
+ public Boolean isTrolleybus = false;
+ /**
+ * Flag of share taxi stop area
+ */
+ public Boolean isShareTaxi = false;
+ /**
+ * Flag of bus station stop area
+ */
+ public Boolean isBusStation = false;
+ /**
+ * Flag of tram stop area
+ */
+ public Boolean isTram = false;
+ /**
+ * Flag of railway stop area
+ */
+ public Boolean isTrainStop = false;
+ /**
+ * Flag of railway station
+ */
+ public Boolean isTrainStation = false;
+ /**
+ * Flag of bench on selected platform
+ */
+ public Boolean isAssignTransportType = false;
+ /**
+ * Flag of bench near platform
+ */
+ public Boolean isBench = false;
+ /**
+ * Flag of covered platform
+ */
+ public Boolean isCovered = false;
+ /**
+ * Flag of shelter on selected platform
+ */
+ public Boolean isShelter = false;
+ /**
+ * Relation of stop area
+ */
+ public Relation stopAreaRelation = null;
+ /**
+ * Flag of existing of stop position
+ */
+ public Boolean isStopPointExists = false;
+ /**
+ * Flag of area platform
+ */
+ public Boolean isArea = false;
+ /**
+ * Separate node of bus stop or bus station
+ */
+ public Node separateBusStopNode = null;
+
+ /**
+ * List of nodes of stop positions
+ */
+ public final ArrayList stopPoints = new ArrayList();
+ /**
+ * List of josm objects of platforms
+ */
+ public final ArrayList platforms = new ArrayList();
+ /**
+ * List of non stop positions or platform stop area members
+ */
+ public final ArrayList otherMembers = new ArrayList();
+
+ /**
+ * Selected josm objects. Must be a platform
+ */
+ public OsmPrimitive selectedObject = null;
+
+
+ /**
+ * Constructor of stop area object
+ */
+ public StopArea()
+ { }
+
+ /**
+ * Constructor of stop area object from selected object
+ * @param selectedObject Selected object
+ */
+ public StopArea(OsmPrimitive selectedObject)
+ {
+ this.selectedObject = selectedObject;
+ }
+
+ /**
+ * Get selected in editor node
+ * @return Selected node or null
+ */
+ public Node getSelectedNode()
+ {
+ if(selectedObject instanceof Node)
+ return (Node)selectedObject;
+ return null;
+ }
+
+ /**
+ * Get selected way
+ * @return Selected way or null
+ */
+ public Way getSelectedWay()
+ {
+ if(selectedObject instanceof Way)
+ return (Way)selectedObject;
+ return null;
+ }
+
+}
Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/StopAreaOperationBase.java
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/StopAreaOperationBase.java (revision 32048)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/src/ru/rodsoft/openstreetmap/josm/plugins/customizepublictransportstop/StopAreaOperationBase.java (revision 32048)
@@ -0,0 +1,133 @@
+package ru.rodsoft.openstreetmap.josm.plugins.customizepublictransportstop;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Way;
+
+/**
+ * @author Rodion Scherbakov
+ * Base class of operation of customizing of stop area
+ */
+public abstract class StopAreaOperationBase implements IStopAreaCustomizer
+{
+
+ /**
+ * Current dataset of Josm
+ */
+ private DataSet _CurrentDataSet;
+
+ /**
+ * Constructor of operation of customizing of stop area
+ * @param currentDataSet Current data set of JOSM
+ */
+ public StopAreaOperationBase(DataSet currentDataSet)
+ {
+ _CurrentDataSet = currentDataSet;
+ }
+
+ /**
+ * Get current dataset of Josm
+ * Used for comparability wit previous version
+ * @return Current dataset of Josm
+ */
+ protected DataSet getCurrentDataSet()
+ {
+ return _CurrentDataSet;
+ }
+
+ /**
+ * Perform operation of customizing of stop area
+ * @param stopArea Stop area object
+ * @return stopArea Resulting stop area object
+ */
+ @Override
+ public abstract StopArea performCustomizing(StopArea stopArea);
+
+ /**
+ * Get tag value of JOSM object
+ * @param member JOSM object
+ * @param tagName Tag name
+ * @return Tag value
+ */
+ public static String getTagValue(OsmPrimitive member, String tagName)
+ {
+ return member.getKeys().get(tagName);
+ }
+
+ /**
+ * Comparing of value of tag for josm object
+ * @param osmObject JOSM object
+ * @param tagName Tag name
+ * @param tagValue Tag value
+ * @return true, if tag exists and equals tagValue
+ */
+ public static Boolean compareTag (OsmPrimitive osmObject, String tagName, String tagValue)
+ {
+ String value = osmObject.getKeys().get(tagName);
+ if(value != null)
+ return value.equals(tagValue);
+ return false;
+ }
+
+ /**
+ * Assign tag value to JOSM object
+ * @param commands Command list
+ * @param target Target OSM object
+ * @param tag Tag name
+ * @param tagValue Tag value
+ * @return Resulting command list
+ */
+ public static List assignTag(List commands, OsmPrimitive target, String tag, String tagValue)
+ {
+ if(commands == null)
+ commands = new ArrayList();
+ commands.add(new ChangePropertyCommand(target, tag, tagValue));
+ return commands;
+ }
+
+ /**
+ * Clear tag value of JOSM object
+ * @param commands Command list
+ * @param target Target OSM object
+ * @param tag Tag name
+ * @return Resulting command list
+ */
+ public static List clearTag(List commands, OsmPrimitive target, String tag)
+ {
+ return assignTag(commands, target, tag, null);
+ }
+
+ /**
+ * Calculation of center of platform, if platform is way
+ * @param platform Platform primitive
+ * @return Coordinates of center of platform
+ */
+ public static LatLon getCenterOfWay(OsmPrimitive platform)
+ {
+ if(platform instanceof Way)
+ {
+ //p = mapView.getPoint((Node) stopArea.selectedObject);
+ Double sumLat = 0.0;
+ Double sumLon = 0.0;
+ Integer countNode = 0;
+ for(Node node : ((Way) platform).getNodes())
+ {
+ LatLon coord = node.getCoor();
+ sumLat += coord.getX();
+ sumLon += coord.getY();
+ countNode++;
+ }
+ return new LatLon(sumLon / countNode, sumLat / countNode);
+ }
+ return null;
+ }
+
+
+}