Index: /applications/editors/josm/plugins/FixAddresses/.classpath
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/.classpath (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/.classpath (revision 23931)
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
Index: /applications/editors/josm/plugins/FixAddresses/.externalToolBuilders/JOSM-Ant.launch
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/.externalToolBuilders/JOSM-Ant.launch (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/.externalToolBuilders/JOSM-Ant.launch (revision 23931)
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /applications/editors/josm/plugins/FixAddresses/.project
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/.project (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/.project (revision 23931)
@@ -0,0 +1,27 @@
+
+
+ FixAddresses
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.ui.externaltools.ExternalToolBuilder
+ full,incremental,
+
+
+ LaunchConfigHandle
+ <project>/.externalToolBuilders/JOSM-Ant.launch
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
Index: /applications/editors/josm/plugins/FixAddresses/GPL-v2.0.txt
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/GPL-v2.0.txt (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/GPL-v2.0.txt (revision 23931)
@@ -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/FixAddresses/GPL-v3.0.txt
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/GPL-v3.0.txt (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/GPL-v3.0.txt (revision 23931)
@@ -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/FixAddresses/README
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/README (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/README (revision 23931)
@@ -0,0 +1,6 @@
+README
+======
+
+This plugin offers handy functions to fix addresses.
+
+Author: Oliver Wieland
Index: /applications/editors/josm/plugins/FixAddresses/build.xml
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/build.xml (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/build.xml (revision 23931)
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java (revision 23931)
@@ -0,0 +1,450 @@
+/*
+ * 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 .
+ */
+/**
+ * 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 .
+ */
+
+/* File created on 24.10.2010 */
+package org.openstreetmap.josm.plugins.addressEdit;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Changeset;
+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;
+import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataSetListener;
+import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
+import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
+import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
+import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.data.osm.visitor.Visitor;
+
+/**
+ *
+ * @author Oliver Wieland
+ *
+ */
+
+public class AddressEditContainer implements Visitor, DataSetListener, IAddressEditContainerListener {
+ private HashMap streetDict = new HashMap(100);
+ private List unresolvedAddresses = new ArrayList(100);
+ private List incompleteAddresses = new ArrayList(100);
+ private HashMap addressCache = new HashMap();
+ private HashSet visitedNodes = new HashSet();
+ private HashSet visitedWays = new HashSet();
+ private HashSet tags = new HashSet();
+
+ private List listeners = new ArrayList();
+
+ /**
+ *
+ */
+ public AddressEditContainer() {
+ NodeEntityBase.addChangedListener(this);
+ }
+
+ /**
+ * Adds a change listener.
+ * @param listener
+ */
+ public void addChangedListener(IAddressEditContainerListener listener) {
+ listeners.add(listener);
+ }
+
+ /**
+ * Removes a change listener.
+ * @param listener
+ */
+ public void removeChangedListener(IAddressEditContainerListener listener) {
+ listeners.remove(listener);
+ }
+
+ /**
+ * Notifies clients that the address container changed.
+ */
+ protected void fireContainerChanged() {
+ for (IAddressEditContainerListener listener : listeners) {
+ listener.containerChanged(this);
+ }
+ }
+
+ private void markNodeAsVisited(Node n) {
+ visitedNodes.add(n);
+ }
+
+ private boolean hasBeenVisited(Node n) {
+ return visitedNodes.contains(n);
+ }
+
+ private void markWayAsVisited(Way w) {
+ visitedWays.add(w);
+ }
+
+ private boolean hasBeenVisited(Way w) {
+ return visitedWays.contains(w);
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.data.osm.visitor.Visitor#visit(org.openstreetmap.josm.data.osm.Node)
+ */
+ @Override
+ public void visit(Node n) {
+ if (hasBeenVisited(n)) {
+ return;
+ }
+
+ String aid = "" + n.getId();
+ AddressNode aNode = null;
+ if (!addressCache.containsKey(aid)) {
+ aNode = NodeFactory.createNode(n);
+ if (aNode != null) {
+ addressCache.put(aid, aNode);
+ }
+ } else {
+ aNode = addressCache.get(aid);
+ aNode.setOsmObject(n);
+ }
+
+ if (aNode != null) {
+ if (!assignAddressToStreet(aNode)) {
+ // Assignment failed: Street is not known (yet) -> add to 'unresolved' list
+ unresolvedAddresses.add(aNode);
+ }
+
+ if (!aNode.isComplete()) {
+ incompleteAddresses.add(aNode);
+ }
+ } else {
+ // check, if node is referred by a way
+ for (OsmPrimitive osm : n.getReferrers()) {
+ if (osm instanceof Way) {
+ Way w = (Way) osm;
+ if (!hasBeenVisited(w)) {
+ createNodeFromWay(w);
+ }
+ }
+ }
+
+ }
+ markNodeAsVisited(n);
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.data.osm.visitor.Visitor#visit(org.openstreetmap.josm.data.osm.Way)
+ */
+ @Override
+ public void visit(Way w) {
+ // This doesn't matter, we just need the street name
+ //if (w.isIncomplete()) return;
+
+ createNodeFromWay(w);
+ /*
+ for (Node n : w.getNodes()) {
+
+ }*/
+ }
+
+ private void createNodeFromWay(Way w) {
+ StreetSegmentNode newSegment = NodeFactory.createNodeFromWay(w);
+
+ if (newSegment != null) {
+ String name = newSegment.getName();
+ if (StringUtils.isNullOrEmpty(name)) return;
+
+ StreetNode sNode = null;
+ if (streetDict.containsKey(name)) {
+ sNode = streetDict.get(name);
+ } else {
+ sNode = new StreetNode(w);
+ streetDict.put(name, sNode);
+ }
+
+ if (sNode != null) {
+ // TODO: Check if segment really belongs to the street, even if the
+ // names are the same. Then the streets should be split up...
+ sNode.addStreetSegment(newSegment);
+ } else {
+ throw new RuntimeException("Street node is null!");
+ }
+ }
+
+ markWayAsVisited(w);
+
+ // Look also into nodes for addresses (unlikely, but at least they
+ // get marked as visited).
+ for (Node n : w.getNodes()) {
+ visit(n);
+ }
+
+ for (String key : w.keySet()) {
+ if (!tags.contains(key)) {
+ tags.add(key);
+ }
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.data.osm.visitor.Visitor#visit(org.openstreetmap.josm.data.osm.Relation)
+ */
+ @Override
+ public void visit(Relation e) {
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.data.osm.visitor.Visitor#visit(org.openstreetmap.josm.data.osm.Changeset)
+ */
+ @Override
+ public void visit(Changeset cs) {
+ }
+
+ /**
+ * Gets the dictionary contains the collected streets.
+ * @return
+ */
+ public HashMap getStreetDict() {
+ return streetDict;
+ }
+
+ public List getUnresolvedAddresses() {
+ return unresolvedAddresses;
+ }
+
+ public List getIncompleteAddresses() {
+ return incompleteAddresses;
+ }
+
+ public List getStreetList() {
+
+ ArrayList sortedList = new ArrayList(streetDict.values());
+ Collections.sort(sortedList);
+ return sortedList;
+ }
+
+ public List getUnresolvedItems() {
+ return unresolvedAddresses;
+ }
+
+ public HashSet getTags() {
+ return tags;
+ }
+
+ /**
+ * Gets the number of streets in the container.
+ * @return
+ */
+ public int getNumberOfStreets() {
+ return streetDict != null ? streetDict.size() : 0;
+ }
+
+ /**
+ * Get the number of incomplete addresses.
+ * @return
+ */
+ public int getNumberOfIncompleteAddresses() {
+ return incompleteAddresses != null ? incompleteAddresses.size() : 0;
+ }
+
+ /**
+ * Gets the number of unresolved addresses.
+ * @return
+ */
+ public int getNumberOfUnresolvedAddresses() {
+ return unresolvedAddresses != null ? unresolvedAddresses.size() : 0;
+ }
+
+ /**
+ * Gets the number of guessed tags.
+ * @return
+ */
+ public int getNumberOfGuesses() {
+ int sum = 0;
+
+ for (AddressNode aNode : getAllAddressesToFix()) {
+ if (aNode.hasGuesses()) {
+ sum++;
+ }
+ }
+ return sum;
+ }
+
+ /**
+ * Gets all (incomplete and/or unresolved) address nodes to fix.
+ * @return
+ */
+ public List getAllAddressesToFix() {
+ List all = new ArrayList(incompleteAddresses);
+
+ for (AddressNode aNode : unresolvedAddresses) {
+ if (!all.contains(aNode)) {
+ all.add(aNode);
+ }
+ }
+
+ return all;
+ }
+
+ /**
+ * Tries to assign an address to a street.
+ * @param aNode
+ */
+ private boolean assignAddressToStreet(AddressNode aNode) {
+ String streetName = aNode.getStreet();
+
+ if (streetName != null && streetDict.containsKey(streetName)) {
+ StreetNode sNode = streetDict.get(streetName);
+ sNode.addAddress(aNode);
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Walks through the list of unassigned addresses and tries to assign them to streets.
+ */
+ public void resolveAddresses() {
+ List resolvedAddresses = new ArrayList();
+ for (AddressNode node : unresolvedAddresses) {
+ if (assignAddressToStreet(node)) {
+ resolvedAddresses.add(node);
+ }
+ }
+
+ /* Remove all resolves nodes from unresolved list */
+ for (AddressNode resolved : resolvedAddresses) {
+ unresolvedAddresses.remove(resolved);
+ }
+ }
+
+ /**
+ * Rebuilds the street and address lists.
+ */
+ public void invalidate() {
+ invalidate(Main.main.getCurrentDataSet().allPrimitives());
+ }
+
+ public void invalidate(final Collection osmData) {
+ if (osmData == null || osmData.isEmpty())
+ return;
+
+ clearData();
+ for (OsmPrimitive osmPrimitive : osmData) {
+ osmPrimitive.visit(this);
+ }
+
+ resolveAddresses();
+
+ Collections.sort(incompleteAddresses);
+ Collections.sort(unresolvedAddresses);
+
+ fireContainerChanged();
+ }
+
+ public void clearData() {
+ streetDict.clear();
+ unresolvedAddresses.clear();
+ incompleteAddresses.clear();
+ visitedNodes.clear();
+ visitedWays.clear();
+ }
+
+ /**
+ * Connects the listener to the data set and revisits the data. This method should
+ * be called immediately before an edit session starts.
+ */
+ public void attachToDataSet(Collection dataToExamine) {
+ Main.main.getCurrentDataSet().addDataSetListener(this);
+ if (dataToExamine != null && dataToExamine.size() > 0) {
+ invalidate(dataToExamine); // use given data set (usually the current selection)
+ } else {
+ invalidate(); // use current data set
+ }
+ }
+
+ /**
+ * Disconnects the listener from the data set. This method should
+ * be called immediately after an edit session has ended.
+ */
+ public void detachFromDataSet() {
+ Main.main.getCurrentDataSet().removeDataSetListener(this);
+ }
+
+ @Override
+ public void dataChanged(DataChangedEvent event) {
+ }
+
+ @Override
+ public void nodeMoved(NodeMovedEvent event) {
+
+ }
+
+ @Override
+ public void otherDatasetChange(AbstractDatasetChangedEvent event) {
+ }
+
+ @Override
+ public void primtivesAdded(PrimitivesAddedEvent event) {
+ invalidate();
+ }
+
+ @Override
+ public void primtivesRemoved(PrimitivesRemovedEvent event) {
+ invalidate();
+ }
+
+ @Override
+ public void relationMembersChanged(RelationMembersChangedEvent event) {
+ }
+
+ @Override
+ public void tagsChanged(TagsChangedEvent event) {
+ invalidate();
+ }
+
+ @Override
+ public void wayNodesChanged(WayNodesChangedEvent event) {
+ }
+
+ @Override
+ public void containerChanged(AddressEditContainer container) {
+
+ }
+
+ @Override
+ public void entityChanged(INodeEntity entity) {
+ invalidate();
+ }
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditPlugin.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditPlugin.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditPlugin.java (revision 23931)
@@ -0,0 +1,35 @@
+/**
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.addressEdit;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginInformation;
+
+public class AddressEditPlugin extends Plugin {
+
+ /**
+ * Constructor for the AddressEdit plugin.
+ * @param info Context information of the plugin.
+ */
+ public AddressEditPlugin(PluginInformation info) {
+ super(info);
+
+ // Create action for edit...
+ FixUnresolvedStreetsAction action = new FixUnresolvedStreetsAction();
+ // ... and add it to the tools menu in main
+ Main.main.menu.toolsMenu.add(action);
+ }
+
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/AddressFinderThread.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/AddressFinderThread.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/AddressFinderThread.java (revision 23931)
@@ -0,0 +1,145 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.addressEdit;
+
+import java.util.ConcurrentModificationException;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Changeset;
+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;
+import org.openstreetmap.josm.data.osm.visitor.Visitor;
+
+public class AddressFinderThread implements Runnable, Visitor {
+ private AddressNode addressNode;
+ private double minDist;
+ private Node nearestNode;
+ private Node osmAddressNode;
+ private boolean isRunning = false;
+ private String nearestName = null;
+ private String currentName = null;
+
+ /**
+ * @param addressNode
+ */
+ public AddressFinderThread(AddressNode addressNode) {
+ super();
+ setAddressNode(addressNode);
+ }
+
+ public AddressFinderThread() {
+ this(null);
+ }
+
+ public void setAddressNode(AddressNode addressNode) {
+ if (isRunning) {
+ throw new ConcurrentModificationException();
+ }
+ this.addressNode = addressNode;
+ if (addressNode != null && addressNode.getOsmObject() instanceof Node) {
+ osmAddressNode = (Node) addressNode.getOsmObject();
+ }
+ }
+
+ public AddressNode getAddressNode() {
+ return addressNode;
+ }
+
+ public double getMinDist() {
+ return minDist;
+ }
+
+ public Node getNearestNode() {
+ return nearestNode;
+ }
+
+ /**
+ * @return the nearestName
+ */
+ public String getGuessedName() {
+ return nearestName;
+ }
+
+ /**
+ * @return the isRunning
+ */
+ public boolean isRunning() {
+ return isRunning;
+ }
+
+ @Override
+ public void run() {
+ if (Main.main.getCurrentDataSet() == null || osmAddressNode == null) return;
+
+ isRunning = true;
+ synchronized(this) {
+ try {
+ minDist = Double.MAX_VALUE;
+ for (OsmPrimitive osmPrimitive : Main.main.getCurrentDataSet().getWays()) {
+ osmPrimitive.visit(this);
+ }
+
+ if (nearestName != null) {
+ System.out.println("Picked " + nearestName + " with distance " + minDist + "m");
+ addressNode.setGuessedStreetName(nearestName);
+ }
+ } finally {
+ isRunning = false;
+ }
+ }
+ }
+
+
+ @Override
+ public void visit(Node n) {
+ double dist = osmAddressNode.getCoor().greatCircleDistance(n.getCoor());
+
+ if (dist < minDist) {
+ minDist = dist;
+ nearestNode = n;
+ nearestName = currentName;
+ }
+ }
+
+
+ @Override
+ public void visit(Way w) {
+ // skip non-streets and streets without name
+ if (!TagUtils.hasHighwayTag(w)) return;
+ if (!TagUtils.hasNameTag(w)) return;
+
+ currentName = TagUtils.getNameValue(w);
+ for (Node node : w.getNodes()) {
+ visit(node);
+ }
+
+ }
+
+
+ @Override
+ public void visit(Relation e) {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void visit(Changeset cs) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/AddressNode.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/AddressNode.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/AddressNode.java (revision 23931)
@@ -0,0 +1,268 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.addressEdit;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+public class AddressNode extends NodeEntityBase {
+ public static final String MISSING_TAG = "?";
+
+ private String guessedStreetName;
+
+ public AddressNode(OsmPrimitive osmObject) {
+ super(osmObject);
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.addressEdit.NodeEntityBase#setOsmObject(org.openstreetmap.josm.data.osm.OsmPrimitive)
+ */
+ @Override
+ public void setOsmObject(OsmPrimitive osmObject) {
+ super.setOsmObject(osmObject);
+ }
+
+ /**
+ * Checks if the underlying address node has all tags usually needed to describe an address.
+ * @return
+ */
+ public boolean isComplete() {
+ return TagUtils.hasAddrCityTag(osmObject) && TagUtils.hasAddrCountryTag(osmObject) &&
+ TagUtils.hasAddrHousenumberTag(osmObject) && TagUtils.hasAddrPostcodeTag(osmObject) &&
+ TagUtils.hasAddrStateTag(osmObject) && TagUtils.hasAddrStreetTag(osmObject);
+ }
+
+ /**
+ * Gets the name of the street associated with this address.
+ * @return
+ */
+ public String getStreet() {
+ if (!TagUtils.hasAddrStreetTag(osmObject)) {
+ return MISSING_TAG;
+ }
+ return TagUtils.getAddrStreetValue(osmObject);
+ }
+
+ /**
+ * Returns true, if this address node has a street name.
+ * @return
+ */
+ public boolean hasStreetName() {
+ return TagUtils.hasAddrStreetTag(osmObject);
+ }
+
+ /**
+ * Returns the street name guessed by the nearest-neighbour search.
+ * @return the guessedStreetName
+ */
+ public String getGuessedStreetName() {
+ return guessedStreetName;
+ }
+
+ /**
+ * @param guessedStreetName the guessedStreetName to set
+ */
+ public void setGuessedStreetName(String guessedStreetName) {
+ this.guessedStreetName = guessedStreetName;
+ fireEntityChanged(this);
+ }
+
+ public boolean hasGuessedStreetName() {
+ return !StringUtils.isNullOrEmpty(guessedStreetName);
+ }
+
+ /**
+ * Returns true, if this instance has guesses regarding address tags.
+ * @return
+ */
+ public boolean hasGuesses() {
+ return hasGuessedStreetName(); // to be extended later
+ }
+
+ /**
+ * Applies all guessed tags for this node.
+ */
+ public void applyAllGuesses() {
+ if (hasGuessedStreetName()) applyGuessedStreet();
+ }
+
+ /**
+ * Gets the name of the post code associated with this address.
+ * @return
+ */
+ public String getPostCode() {
+ if (!TagUtils.hasAddrPostcodeTag(osmObject)) {
+ return MISSING_TAG;
+ }
+ return TagUtils.getAddrPostcodeValue(osmObject);
+ }
+
+ /**
+ * Gets the name of the house number associated with this address.
+ * @return
+ */
+ public String getHouseNumber() {
+ if (!TagUtils.hasAddrHousenumberTag(osmObject)) {
+ return MISSING_TAG;
+ }
+ return TagUtils.getAddrHousenumberValue(osmObject);
+ }
+
+ /**
+ * Gets the name of the city associated with this address.
+ * @return
+ */
+ public String getCity() {
+ if (!TagUtils.hasAddrCityTag(osmObject)) {
+ return MISSING_TAG;
+ }
+ return TagUtils.getAddrCityValue(osmObject);
+ }
+
+ /**
+ * Gets the name of the state associated with this address.
+ * @return
+ */
+ public String getState() {
+ if (!TagUtils.hasAddrStateTag(osmObject)) {
+ return MISSING_TAG;
+ }
+ return TagUtils.getAddrStateValue(osmObject);
+ }
+
+ /**
+ * Gets the name of the state associated with this address.
+ * @return
+ */
+ public String getCountry() {
+ if (!TagUtils.hasAddrCountryTag(osmObject)) {
+ return MISSING_TAG;
+ }
+ return TagUtils.getAddrCountryValue(osmObject);
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.addressEdit.NodeEntityBase#compareTo(org.openstreetmap.josm.plugins.addressEdit.INodeEntity)
+ */
+ @Override
+ public int compareTo(INodeEntity o) {
+ if (o == null || !(o instanceof AddressNode)) {
+ return -1;
+ }
+ AddressNode other = (AddressNode) o;
+
+ int cc = 0;
+ cc = this.getCountry().compareTo(other.getCountry());
+ if ( cc == 0) {
+ cc = this.getState().compareTo(other.getState());
+ if (cc == 0) {
+ cc = this.getCity().compareTo(other.getCity());
+ if (cc == 0) {
+ cc = this.getStreet().compareTo(other.getStreet());
+ if (cc == 0) {
+ cc = this.getHouseNumber().compareTo(other.getHouseNumber());
+ }
+ }
+ }
+ }
+
+ return cc;
+ }
+
+ /**
+ * Applies the street name from the specified street node.
+ * @param node
+ */
+ public void assignStreet(StreetNode node) {
+ if (node == null || !node.hasName()) return;
+
+ if (!node.getName().equals(getStreet())) {
+ setStreetName(node.getName());
+ node.addAddress(this);
+ fireEntityChanged(this);
+ }
+ }
+
+ /**
+ * Applies the guessed street name to the addr:street tag value.
+ */
+ public void applyGuessedStreet() {
+ if (hasGuessedStreetName()) {
+ setOSMTag(TagUtils.ADDR_STREET_TAG, guessedStreetName);
+ }
+ }
+
+ /**
+ * Sets the street name of the address node.
+ * @param streetName
+ */
+ public void setStreetName(String streetName) {
+ if (streetName != null && streetName.length() == 0) return;
+
+ setOSMTag(TagUtils.ADDR_STREET_TAG, streetName);
+ }
+
+
+ /**
+ * Sets the state of the address node.
+ * @param state
+ */
+ public void setState(String state) {
+ if (state != null && state.length() == 0) return;
+
+ setOSMTag(TagUtils.ADDR_STATE_TAG, state);
+ }
+
+ /**
+ * Sets the country of the address node.
+ * @param country
+ */
+ public void setCountry(String country) {
+ if (country != null && country.length() == 0) return;
+
+ setOSMTag(TagUtils.ADDR_COUNTRY_TAG, country);
+ }
+
+ /**
+ * Sets the post code of the address node.
+ * @param postCode
+ */
+ public void setPostCode(String postCode) {
+ if (postCode != null && postCode.length() == 0) return;
+
+ setOSMTag(TagUtils.ADDR_POSTCODE_TAG, postCode);
+ }
+
+ @Override
+ public String toString() {
+ return AddressNode.getFormatString(this);
+ }
+
+ public static String getFormatString(AddressNode node) {
+ // TODO: Add further countries here
+ // DE
+ String guessed = node.getGuessedStreetName();
+ String sName = node.getStreet();
+ if (!StringUtils.isNullOrEmpty(guessed) && MISSING_TAG.equals(sName)) {
+ sName = String.format("(%s)", guessed);
+ }
+
+ return String.format("%s %s, %s-%s %s (%s) ",
+ sName,
+ node.getHouseNumber(),
+ node.getCountry(),
+ node.getPostCode(),
+ node.getCity(),
+ node.getState());
+ }
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/FixUnresolvedStreetsAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/FixUnresolvedStreetsAction.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/FixUnresolvedStreetsAction.java (revision 23931)
@@ -0,0 +1,141 @@
+package org.openstreetmap.josm.plugins.addressEdit;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.util.Collection;
+
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.fixAddresses.gui.AddressEditDialog;
+import org.openstreetmap.josm.tools.Shortcut;
+
+/**
+ * Action to find and fix addresses without (valid) streets.
+ * @author Oliver Wieland
+ *
+ */
+
+public class FixUnresolvedStreetsAction extends JosmAction implements SelectionChangedListener {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+ private AddressEditContainer addressEditContainer;
+ private Collection newSelection;
+
+ public FixUnresolvedStreetsAction() {
+ super(tr("Fix street addresses"), "fixstreets_24",
+ tr("Find and fix addresses without (valid) streets."), Shortcut
+ .registerShortcut("tools:AddressEdit", tr("Tool: {0}",
+ tr("Address Edit")), KeyEvent.VK_A,
+ Shortcut.GROUP_MENU, InputEvent.ALT_DOWN_MASK
+ | InputEvent.SHIFT_DOWN_MASK), false);
+ setEnabled(false);
+
+ addressEditContainer = new AddressEditContainer();
+ DataSet.addSelectionListener(this);
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.data.SelectionChangedListener#selectionChanged(java.util.Collection)
+ */
+ @Override
+ public void selectionChanged(Collection newSelection) {
+ /* this changes the dialog contents, so we do nothing here
+ this.newSelection = newSelection;
+ if (addressEditContainer != null) {
+ addressEditContainer.invalidate(newSelection);
+ }*/
+ }
+
+ /* (non-Javadoc)
+ * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ */
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ if (addressEditContainer != null) {
+ addressEditContainer.attachToDataSet(newSelection);
+ try {
+ AddressEditDialog dlg = new AddressEditDialog(addressEditContainer);
+ dlg.setVisible(true);
+ } finally {
+ addressEditContainer.detachFromDataSet();
+ }
+ }
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.actions.JosmAction#updateEnabledState()
+ */
+ @Override
+ protected void updateEnabledState() {
+ setEnabled(getCurrentDataSet() != null);
+ }
+
+ @Override
+ protected void updateEnabledState(
+ Collection selection) {
+ // Enable button if there is either a selection or at least a data set
+ setEnabled( selection != null && !selection.isEmpty() ||
+ (getCurrentDataSet() != null));
+ }
+
+ /* This code is abused to generate tag utility code */
+
+ @SuppressWarnings("unused")
+ private void generateTagCode(AddressEditContainer addrVisitor) {
+
+ for (String tag : addrVisitor.getTags()) {
+ String methodName = createMethodName(tag);
+ System.out
+ .println(String
+ .format(
+ "/** Check if OSM primitive has a tag '%s'.\n * @param osmPrimitive The OSM entity to check.*/\npublic static boolean has%sTag(OsmPrimitive osmPrimitive) {\n return osmPrimitive != null ? osmPrimitive.hasKey(%s_TAG) : false;\n}\n",
+ tag, methodName, tag.toUpperCase()
+ .replaceAll(":", "_")));
+ System.out
+ .println(String
+ .format(
+ "/** Gets the value of tag '%s'.\n * @param osmPrimitive The OSM entity to check.*/\npublic static String get%sValue(OsmPrimitive osmPrimitive) {\n return osmPrimitive != null ? osmPrimitive.get(%s_TAG) : null;\n}\n",
+ tag, methodName, tag.toUpperCase()
+ .replaceAll(":", "_")));
+ }
+
+ for (String tag : addrVisitor.getTags()) {
+ System.out.println(String.format(
+ "public static final String %s_TAG = \"%s\";", tag
+ .toUpperCase().replaceAll(":", "_"), tag));
+ }
+ }
+
+ private String createMethodName(String osmName) {
+ StringBuffer result = new StringBuffer(osmName.length());
+ boolean nextUp = false;
+ for (int i = 0; i < osmName.length(); i++) {
+ char c = osmName.charAt(i);
+ if (i == 0) {
+ result.append(Character.toUpperCase(c));
+ continue;
+ }
+ if (c == '_' || c == ':') {
+ nextUp = true;
+ } else {
+ if (nextUp) {
+ result.append(Character.toUpperCase(c));
+ nextUp = false;
+ } else {
+ result.append(c);
+ }
+ }
+ }
+
+ return result.toString();
+ }
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/IAddressEditContainerListener.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/IAddressEditContainerListener.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/IAddressEditContainerListener.java (revision 23931)
@@ -0,0 +1,28 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.addressEdit;
+
+
+public interface IAddressEditContainerListener {
+ /**
+ * Notifies clients that the container has been changed.
+ * @param container
+ */
+ public void containerChanged(AddressEditContainer container);
+
+ /**
+ * Notifies clients that an entity has been changed.
+ */
+ public void entityChanged(INodeEntity node);
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/INodeEntity.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/INodeEntity.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/INodeEntity.java (revision 23931)
@@ -0,0 +1,44 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.addressEdit;
+
+import java.util.List;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+public interface INodeEntity extends Comparable {
+ /**
+ * Gets the underlying OSM object.
+ * @return
+ */
+ public OsmPrimitive getOsmObject();
+
+ /**
+ * Checks if underlying OSM object has a name.
+ * @return
+ */
+ public boolean hasName();
+
+ /**
+ * Gets the name of the entity node.
+ * @return
+ */
+ public String getName();
+
+ /**
+ * Gets the children of the entity node.
+ * @return
+ */
+ public List getChildren();
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/NodeEntityBase.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/NodeEntityBase.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/NodeEntityBase.java (revision 23931)
@@ -0,0 +1,135 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.addressEdit;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+public class NodeEntityBase implements INodeEntity, Comparable {
+ public static final String ANONYMOUS = tr("No name");
+ private static List listeners = new ArrayList();
+
+ protected OsmPrimitive osmObject;
+
+ /**
+ * @param osmObject
+ */
+ public NodeEntityBase(OsmPrimitive osmObject) {
+ super();
+ this.osmObject = osmObject;
+ }
+
+ /**
+ * @param osmObject the osmObject to set
+ */
+ protected void setOsmObject(OsmPrimitive osmObject) {
+ this.osmObject = osmObject;
+ }
+
+ /**
+ * Adds a change listener.
+ * @param listener
+ */
+ public static void addChangedListener(IAddressEditContainerListener listener) {
+ listeners.add(listener);
+ }
+
+ /**
+ * Removes a change listener.
+ * @param listener
+ */
+ public static void removeChangedListener(IAddressEditContainerListener listener) {
+ listeners.remove(listener);
+ }
+
+ /**
+ * Notifies clients that the address container changed.
+ */
+ protected static void fireEntityChanged(INodeEntity entity) {
+ for (IAddressEditContainerListener listener : listeners) {
+ listener.entityChanged(entity);
+ }
+ }
+
+ public OsmPrimitive getOsmObject() {
+ return osmObject;
+ }
+
+ @Override
+ public List getChildren() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ /**
+ * Gets the name of the street or ANONYMOUS, if street has no name.
+ * @return
+ */
+ public String getName() {
+ if (TagUtils.hasNameTag(osmObject)) {
+ return TagUtils.getNameValue(osmObject);
+ }
+ return "";
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.addressEdit.INodeEntity#hasName()
+ */
+ @Override
+ public boolean hasName() {
+ return TagUtils.hasNameTag(osmObject);
+ }
+
+ /**
+ * Internal helper method which changes the given property and
+ * puts the appropriate command {@link src.org.openstreetmap.josm.command.Command}
+ * into the undo/redo queue.
+ * @param tag The tag to change.
+ * @param newValue The new value for the tag.
+ */
+ protected void setOSMTag(String tag, String newValue) {
+ Node oldNode = (Node)osmObject;
+ OsmPrimitive newNode = new Node(oldNode);
+ newNode.put(tag, newValue);
+ Main.main.undoRedo.add( new ChangeCommand(oldNode, newNode));
+ fireEntityChanged(this);
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ if (hasName()) {
+ return this.getClass().getName() + ": " + getName();
+ }
+ return this.getClass().getName() + ": " + ANONYMOUS;
+ }
+
+ @Override
+ public int compareTo(INodeEntity o) {
+ if (o == null || !(o instanceof NodeEntityBase)) return -1;
+ return this.getName().compareTo(o.getName());
+ }
+
+
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/NodeFactory.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/NodeFactory.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/NodeFactory.java (revision 23931)
@@ -0,0 +1,45 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.addressEdit;
+
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+
+public class NodeFactory {
+ /**
+ * Creates an address node from an OSM node, if possible.
+ * @param osm
+ * @return
+ */
+ public static AddressNode createNode(Node osm) {
+ if (TagUtils.isAddress(osm)) {
+ return new AddressNode(osm);
+ }
+
+ return null;
+ }
+
+ /**
+ * Creates an node entity from an OSM way, if possible.
+ * @param way
+ * @return The new node instance or null; if given way is inappropriate.
+ */
+ public static StreetSegmentNode createNodeFromWay(Way way) {
+ if (TagUtils.hasHighwayTag(way)) {
+ return new StreetSegmentNode(way);
+ }
+
+ return null;
+ }
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/StreetNode.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/StreetNode.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/StreetNode.java (revision 23931)
@@ -0,0 +1,156 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.addressEdit;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * This class is the container for all street segments with the same name. Every street
+ * consists at least of one segment.
+ *
+ * @author Oliver Wieland
+ */
+public class StreetNode extends NodeEntityBase {
+ private List children;
+ private List addresses;
+
+ /**
+ * @param osmPrimitive
+ */
+ public StreetNode(OsmPrimitive osmPrimitive) {
+ super(osmPrimitive);
+ }
+
+ public List getChildren() {
+ return children;
+ }
+
+ /**
+ * Adds a street segment to the street node.
+ * @param segment
+ */
+ public void addStreetSegment(StreetSegmentNode segment) {
+ lazyCreateChildren();
+
+ children.add(segment);
+ Collections.sort(children);
+ }
+
+ private void lazyCreateChildren() {
+ if (children == null) {
+ children = new ArrayList();
+ }
+ }
+
+ public void addAddress(AddressNode aNode) {
+ lazyCreateAddresses();
+ addresses.add(aNode);
+ }
+
+ private void lazyCreateAddresses() {
+ if (addresses == null) {
+ addresses = new ArrayList();
+ }
+ }
+
+ public boolean hasAddresses() {
+ return addresses != null && addresses.size() > 0;
+ }
+
+ public List getAddresses() {
+ return addresses;
+ }
+
+ public void setAddresses(List addresses) {
+ this.addresses = addresses;
+ }
+
+ /**
+ * Gets the number of addresses associated with this street.
+ * @return
+ */
+ public int getNumberOfAddresses() {
+ if (addresses == null) return 0;
+
+ return addresses.size();
+ }
+
+ /**
+ * Gets the number of street segments of this street.
+ * @return
+ */
+ public int getNumberOfSegments() {
+ if (children == null) return 0;
+
+ int sc = 0;
+ for (INodeEntity node : children) {
+ if (node instanceof StreetSegmentNode) {
+ sc++;
+ }
+ }
+ return sc;
+ }
+
+ /**
+ * Gets the road type(s) of this street. If the street has different types,
+ * they are separated by comma.
+ * @return
+ */
+ public String getType() {
+ List types = new ArrayList();
+
+ for (INodeEntity seg : getChildren()) {
+ OsmPrimitive osmPrim = seg.getOsmObject();
+ if (TagUtils.hasHighwayTag(osmPrim)) {
+ String val = osmPrim.get(TagUtils.HIGHWAY_TAG);
+ if (!types.contains(val)) {
+ types.add(val);
+ }
+ }
+ }
+
+ StringBuffer sb = new StringBuffer(20);
+ for (String string : types) {
+ if (sb.length() > 0) {
+ sb.append(", ");
+ }
+ sb.append(string);
+
+ }
+ return sb.toString();
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.addressEdit.NodeEntityBase#toString()
+ */
+ @Override
+ public String toString() {
+ StringBuffer sb = new StringBuffer(getName());
+
+ if (children != null) {
+ sb.append(String.format(", %d segments", children.size()));
+ }
+
+ if (addresses != null) {
+ sb.append(String.format(", %d address entries", addresses.size()));
+ }
+
+ return sb.toString();
+ }
+
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/StreetSegmentNode.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/StreetSegmentNode.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/StreetSegmentNode.java (revision 23931)
@@ -0,0 +1,39 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.addressEdit;
+
+import java.util.List;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Represents a single segment of a street. In many cases a segment may represent the complete street, but
+ * sometimes a street is separated into many segments, e. g. due to different speed limits, bridges, etc..
+ *
+ * @author Oliver Wieland
+ *
+ */
+
+public class StreetSegmentNode extends NodeEntityBase {
+
+ public StreetSegmentNode(OsmPrimitive osmObject) {
+ super(osmObject);
+ }
+
+ @Override
+ public List getChildren() {
+ return null;
+ }
+
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/StringUtils.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/StringUtils.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/StringUtils.java (revision 23931)
@@ -0,0 +1,150 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.addressEdit;
+
+import java.util.List;
+
+public class StringUtils {
+ /**
+ * Checks, if a string is either null or empty.
+ *
+ * @param txt
+ * Text to check
+ * @return True, if string is null or empty; otherwise false
+ */
+ public static boolean isNullOrEmpty(String txt) {
+ return txt == null || txt.length() == 0;
+ }
+
+ /**
+ * Gets the length of the longest common substring of a and b
+ *
+ * @param a
+ * First string
+ * @param b
+ * Second string
+ * @return The length of the longest common substring or 0, if no common
+ * sequence exists or one of the arguments are invalid. For
+ * algorithm details please refer to {@link http
+ * ://www.ics.uci.edu/~eppstein/161/960229.html}
+ */
+ public static int lcsLength(String a, String b) {
+ if (StringUtils.isNullOrEmpty(a))
+ return 0;
+ if (StringUtils.isNullOrEmpty(b))
+ return 0;
+
+ int[][] L = createLCSTable(a, b);
+ return L[0][0];
+ }
+
+ /**
+ * Internal use only
+ */
+ private static int[][] createLCSTable(String a, String b) {
+ if (StringUtils.isNullOrEmpty(a))
+ return null;
+ if (StringUtils.isNullOrEmpty(b))
+ return null;
+
+ int m = a.length();
+ int n = b.length();
+ int[][] l = new int[m + 1][n + 1];
+ for (int i = 0; i < l.length; i++) {
+ l[i] = new int[n + 1];
+ }
+
+ int i, j;
+ for (i = m - 1; i >= 0; i--) {
+ for (j = n - 1; j >= 0; j--) {
+ /*
+ * if (i >= m || j >= n) { l[i][j] = 0; } else
+ */if (a.charAt(i) == b.charAt(j)) {
+ l[i][j] = 1 + l[i + 1][j + 1];
+ } else {
+ l[i][j] = Math.max(l[i + 1][j], l[i][j + 1]);
+ }
+ }
+ }
+ return l;
+ }
+
+ /**
+ * Gets the longest common substring of a and b.
+ *
+ * @param a The first string.
+ * @param b The second string.
+ * @return
+ */
+ public static String getLongestCommonSubstring(String a, String b) {
+ if (StringUtils.isNullOrEmpty(a))
+ return null;
+ if (StringUtils.isNullOrEmpty(b))
+ return null;
+
+ StringBuffer sb = new StringBuffer();
+ int[][] l = createLCSTable(a, b);
+ int m = a.length();
+ int n = b.length();
+ int i = 0;
+ int j = 0;
+ while (i < m && j < n) {
+ char aa = a.charAt(i);
+ char bb = b.charAt(j);
+ if (aa == bb) {
+ sb.append(aa);
+ i++;
+ j++;
+ } else if (l[i + 1][j] >= l[i][j + 1]) {
+ i++;
+ } else {
+ j++;
+ }
+ }
+
+ l = null;
+ return sb.toString();
+ }
+
+ /**
+ * @param needle The string to find the best match for.
+ * @param haystack The list of strings to pick the the best match from.
+ * @return The string of the list with the longest common substring to needle or
+ * null, if either needle or haystack is empty or null.
+ */
+ public static String findBestMatch(String needle, List haystack) {
+ String bestMatch = null;
+ double maxRatio = Double.MIN_VALUE;
+
+ if (StringUtils.isNullOrEmpty(needle)) {
+ return null;
+ }
+ if (haystack == null || haystack.size() == 0) {
+ return null;
+ }
+
+ int lNeedle = needle.length();
+ for (String curString : haystack) {
+ int ll = lcsLength(needle, curString);
+ double ratio = ll / (double)lNeedle;
+ if (ratio > maxRatio) {
+ maxRatio = ratio;
+ bestMatch = curString;
+ }
+
+ }
+
+ return bestMatch;
+ }
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/TagUtils.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/TagUtils.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/addressEdit/TagUtils.java (revision 23931)
@@ -0,0 +1,1946 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.addressEdit;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Contains the tags used within OSM. FIXME: Maybe there is a class or similar
+ * within JOSM which already defines them, but I have not found it so far.
+ *
+ * @author Oliver Wieland
+ *
+ */
+public final class TagUtils {
+ /**
+ * Checks if the given OSM primitive is an address node.
+ * @return
+ */
+ public static boolean isAddress(OsmPrimitive osmObject) {
+ return TagUtils.hasAddrCityTag(osmObject) || TagUtils.hasAddrCountryTag(osmObject) ||
+ TagUtils.hasAddrHousenumberTag(osmObject) || TagUtils.hasAddrPostcodeTag(osmObject) ||
+ TagUtils.hasAddrStateTag(osmObject) || TagUtils.hasAddrStreetTag(osmObject);
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'parking'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasParkingTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(PARKING_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'parking'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getParkingValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(PARKING_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'shop'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasShopTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(SHOP_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'shop'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getShopValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(SHOP_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'craft'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasCraftTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(CRAFT_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'craft'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getCraftValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(CRAFT_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'surface'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasSurfaceTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(SURFACE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'surface'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getSurfaceValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(SURFACE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'cuisine'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasCuisineTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(CUISINE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'cuisine'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getCuisineValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(CUISINE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'wood'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasWoodTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(WOOD_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'wood'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getWoodValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(WOOD_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'foot'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasFootTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(FOOT_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'foot'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getFootValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(FOOT_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'name:de'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasNameDeTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(NAME_DE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'name:de'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getNameDeValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(NAME_DE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'nat_ref'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasNatRefTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(NAT_REF_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'nat_ref'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getNatRefValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(NAT_REF_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'note:de'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasNoteDeTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(NOTE_DE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'note:de'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getNoteDeValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(NOTE_DE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'addr:street'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasAddrStreetTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_STREET_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'addr:street'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getAddrStreetValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(ADDR_STREET_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'type'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasTypeTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(TYPE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'type'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getTypeValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(TYPE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'addr:city'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasAddrCityTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_CITY_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'addr:city'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getAddrCityValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(ADDR_CITY_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'boundary'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasBoundaryTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(BOUNDARY_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'boundary'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getBoundaryValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(BOUNDARY_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'smoothness'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasSmoothnessTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(SMOOTHNESS_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'smoothness'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getSmoothnessValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(SMOOTHNESS_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'opening_hours'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasOpeningHoursTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(OPENING_HOURS_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'opening_hours'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getOpeningHoursValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(OPENING_HOURS_TAG)
+ : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'bicycle'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasBicycleTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(BICYCLE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'bicycle'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getBicycleValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(BICYCLE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'religion'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasReligionTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(RELIGION_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'religion'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getReligionValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(RELIGION_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'barrier'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasBarrierTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(BARRIER_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'barrier'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getBarrierValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(BARRIER_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'power'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasPowerTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(POWER_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'power'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getPowerValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(POWER_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'landuse'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasLanduseTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(LANDUSE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'landuse'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getLanduseValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(LANDUSE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'fireplace'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasFireplaceTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(FIREPLACE_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'fireplace'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getFireplaceValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(FIREPLACE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'int_ref'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasIntRefTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(INT_REF_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'int_ref'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getIntRefValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(INT_REF_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'whitewater:section_grade'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasWhitewaterSectionGradeTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive
+ .hasKey(WHITEWATER_SECTION_GRADE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'whitewater:section_grade'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getWhitewaterSectionGradeValue(
+ OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive
+ .get(WHITEWATER_SECTION_GRADE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'denomination'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasDenominationTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(DENOMINATION_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'denomination'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getDenominationValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(DENOMINATION_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'addr:postcode'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasAddrPostcodeTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_POSTCODE_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'addr:postcode'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getAddrPostcodeValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(ADDR_POSTCODE_TAG)
+ : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'wires'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasWiresTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(WIRES_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'wires'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getWiresValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(WIRES_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'loc_ref'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasLocRefTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(LOC_REF_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'loc_ref'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getLocRefValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(LOC_REF_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'width'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasWidthTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(WIDTH_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'width'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getWidthValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(WIDTH_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'tourism'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasTourismTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(TOURISM_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'tourism'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getTourismValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(TOURISM_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'leisure'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasLeisureTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(LEISURE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'leisure'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getLeisureValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(LEISURE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'electrified'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasElectrifiedTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(ELECTRIFIED_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'electrified'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getElectrifiedValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(ELECTRIFIED_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'junction'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasJunctionTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(JUNCTION_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'junction'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getJunctionValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(JUNCTION_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'railway'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasRailwayTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(RAILWAY_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'railway'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getRailwayValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(RAILWAY_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'voltage'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasVoltageTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(VOLTAGE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'voltage'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getVoltageValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(VOLTAGE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'bridge'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasBridgeTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(BRIDGE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'bridge'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getBridgeValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(BRIDGE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'motor_vehicle'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasMotorVehicleTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(MOTOR_VEHICLE_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'motor_vehicle'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getMotorVehicleValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(MOTOR_VEHICLE_TAG)
+ : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'comment'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasCommentTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(COMMENT_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'comment'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getCommentValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(COMMENT_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'maxspeed'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasMaxspeedTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(MAXSPEED_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'maxspeed'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getMaxspeedValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(MAXSPEED_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'natural'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasNaturalTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(NATURAL_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'natural'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getNaturalValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(NATURAL_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'sac_scale'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasSacScaleTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(SAC_SCALE_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'sac_scale'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getSacScaleValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(SAC_SCALE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'tunnel'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasTunnelTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(TUNNEL_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'tunnel'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getTunnelValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(TUNNEL_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'waterway'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasWaterwayTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(WATERWAY_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'waterway'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getWaterwayValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(WATERWAY_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'trail_visibility'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasTrailVisibilityTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(TRAIL_VISIBILITY_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'trail_visibility'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getTrailVisibilityValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(TRAIL_VISIBILITY_TAG)
+ : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'highway'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasHighwayTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(HIGHWAY_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'highway'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getHighwayValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(HIGHWAY_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'vehicle'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasVehicleTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(VEHICLE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'vehicle'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getVehicleValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(VEHICLE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'horse'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasHorseTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(HORSE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'horse'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getHorseValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(HORSE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'goods'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasGoodsTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(GOODS_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'goods'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getGoodsValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(GOODS_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'frequency'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasFrequencyTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(FREQUENCY_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'frequency'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getFrequencyValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(FREQUENCY_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'man_made'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasManMadeTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(MAN_MADE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'man_made'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getManMadeValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(MAN_MADE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'addr:housenumber'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasAddrHousenumberTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_HOUSENUMBER_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'addr:housenumber'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getAddrHousenumberValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(ADDR_HOUSENUMBER_TAG)
+ : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'area'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasAreaTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(AREA_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'area'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getAreaValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(AREA_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'building:levels'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasBuildingLevelsTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(BUILDING_LEVELS_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'building:levels'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getBuildingLevelsValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(BUILDING_LEVELS_TAG)
+ : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'wheelchair'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasWheelchairTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(WHEELCHAIR_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'wheelchair'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getWheelchairValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(WHEELCHAIR_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'name'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasNameTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(NAME_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'name'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getNameValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(NAME_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'oneway'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasOnewayTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(ONEWAY_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'oneway'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getOnewayValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(ONEWAY_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'FIXME'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasFIXMETag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(FIXME_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'FIXME'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getFIXMEValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(FIXME_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'capacity'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasCapacityTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(CAPACITY_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'capacity'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getCapacityValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(CAPACITY_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'motorcycle'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasMotorcycleTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(MOTORCYCLE_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'motorcycle'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getMotorcycleValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(MOTORCYCLE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'hgv'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasHgvTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(HGV_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'hgv'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getHgvValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(HGV_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'construction'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasConstructionTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(CONSTRUCTION_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'construction'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getConstructionValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(CONSTRUCTION_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'addr:state'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasAddrStateTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_STATE_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'addr:state'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getAddrStateValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(ADDR_STATE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'lanes'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasLanesTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(LANES_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'lanes'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getLanesValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(LANES_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'note'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasNoteTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(NOTE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'note'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getNoteValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(NOTE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'lit'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasLitTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(LIT_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'lit'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getLitValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(LIT_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'building'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasBuildingTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(BUILDING_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'building'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getBuildingValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(BUILDING_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'segregated'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasSegregatedTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(SEGREGATED_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'segregated'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getSegregatedValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(SEGREGATED_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'addr:inclusion'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasAddrInclusionTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_INCLUSION_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'addr:inclusion'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getAddrInclusionValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(ADDR_INCLUSION_TAG)
+ : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'layer'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasLayerTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(LAYER_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'layer'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getLayerValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(LAYER_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'sport'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasSportTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(SPORT_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'sport'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getSportValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(SPORT_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'addr:interpolation'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasAddrInterpolationTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive
+ .hasKey(ADDR_INTERPOLATION_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'addr:interpolation'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getAddrInterpolationValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(ADDR_INTERPOLATION_TAG)
+ : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'cutting'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasCuttingTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(CUTTING_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'cutting'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getCuttingValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(CUTTING_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'amenity'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasAmenityTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(AMENITY_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'amenity'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getAmenityValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(AMENITY_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'access'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasAccessTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(ACCESS_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'access'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getAccessValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(ACCESS_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'agricultural'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasAgriculturalTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(AGRICULTURAL_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'agricultural'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getAgriculturalValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(AGRICULTURAL_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'capacity:disabled'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasCapacityDisabledTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive
+ .hasKey(CAPACITY_DISABLED_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'capacity:disabled'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getCapacityDisabledValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(CAPACITY_DISABLED_TAG)
+ : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'operator'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasOperatorTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(OPERATOR_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'operator'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getOperatorValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(OPERATOR_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'ref'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasRefTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(REF_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'ref'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getRefValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(REF_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'noexit'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasNoexitTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(NOEXIT_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'noexit'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getNoexitValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(NOEXIT_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'admin_level'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasAdminLevelTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(ADMIN_LEVEL_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'admin_level'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getAdminLevelValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(ADMIN_LEVEL_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'source'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasSourceTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(SOURCE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'source'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getSourceValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(SOURCE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'tracktype'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasTracktypeTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(TRACKTYPE_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'tracktype'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getTracktypeValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(TRACKTYPE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'addr:country'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasAddrCountryTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(ADDR_COUNTRY_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'addr:country'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getAddrCountryValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(ADDR_COUNTRY_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'route'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasRouteTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(ROUTE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'route'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getRouteValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(ROUTE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'cables'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasCablesTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(CABLES_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'cables'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getCablesValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(CABLES_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'service'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasServiceTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(SERVICE_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'service'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getServiceValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(SERVICE_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'motorcar'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasMotorcarTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(MOTORCAR_TAG) : false;
+ }
+
+ /**
+ * Gets the value of tag 'motorcar'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getMotorcarValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(MOTORCAR_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'whitewater'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasWhitewaterTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(WHITEWATER_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'whitewater'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getWhitewaterValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(WHITEWATER_TAG) : null;
+ }
+
+ /**
+ * Check if OSM primitive has a tag 'embankment'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static boolean hasEmbankmentTag(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.hasKey(EMBANKMENT_TAG)
+ : false;
+ }
+
+ /**
+ * Gets the value of tag 'embankment'.
+ *
+ * @param osmPrimitive
+ * The OSM entity to check.
+ */
+ public static String getEmbankmentValue(OsmPrimitive osmPrimitive) {
+ return osmPrimitive != null ? osmPrimitive.get(EMBANKMENT_TAG) : null;
+ }
+
+ public static final String PARKING_TAG = "parking";
+ public static final String SHOP_TAG = "shop";
+ public static final String CRAFT_TAG = "craft";
+ public static final String SURFACE_TAG = "surface";
+ public static final String CUISINE_TAG = "cuisine";
+ public static final String WOOD_TAG = "wood";
+ public static final String FOOT_TAG = "foot";
+ public static final String NAME_DE_TAG = "name:de";
+ public static final String NAT_REF_TAG = "nat_ref";
+ public static final String NOTE_DE_TAG = "note:de";
+ public static final String ADDR_STREET_TAG = "addr:street";
+ public static final String TYPE_TAG = "type";
+ public static final String ADDR_CITY_TAG = "addr:city";
+ public static final String BOUNDARY_TAG = "boundary";
+ public static final String SMOOTHNESS_TAG = "smoothness";
+ public static final String OPENING_HOURS_TAG = "opening_hours";
+ public static final String BICYCLE_TAG = "bicycle";
+ public static final String RELIGION_TAG = "religion";
+ public static final String BARRIER_TAG = "barrier";
+ public static final String POWER_TAG = "power";
+ public static final String LANDUSE_TAG = "landuse";
+ public static final String FIREPLACE_TAG = "fireplace";
+ public static final String INT_REF_TAG = "int_ref";
+ public static final String WHITEWATER_SECTION_GRADE_TAG = "whitewater:section_grade";
+ public static final String DENOMINATION_TAG = "denomination";
+ public static final String ADDR_POSTCODE_TAG = "addr:postcode";
+ public static final String WIRES_TAG = "wires";
+ public static final String LOC_REF_TAG = "loc_ref";
+ public static final String WIDTH_TAG = "width";
+ public static final String TOURISM_TAG = "tourism";
+ public static final String LEISURE_TAG = "leisure";
+ public static final String ELECTRIFIED_TAG = "electrified";
+ public static final String JUNCTION_TAG = "junction";
+ public static final String RAILWAY_TAG = "railway";
+ public static final String VOLTAGE_TAG = "voltage";
+ public static final String BRIDGE_TAG = "bridge";
+ public static final String MOTOR_VEHICLE_TAG = "motor_vehicle";
+ public static final String COMMENT_TAG = "comment";
+ public static final String MAXSPEED_TAG = "maxspeed";
+ public static final String NATURAL_TAG = "natural";
+ public static final String BUILDING_HEIGHT_TAG = "building:height";
+ public static final String SAC_SCALE_TAG = "sac_scale";
+ public static final String TUNNEL_TAG = "tunnel";
+ public static final String WATERWAY_TAG = "waterway";
+ public static final String TRAIL_VISIBILITY_TAG = "trail_visibility";
+ public static final String HIGHWAY_TAG = "highway";
+ public static final String VEHICLE_TAG = "vehicle";
+ public static final String HORSE_TAG = "horse";
+ public static final String GOODS_TAG = "goods";
+ public static final String FREQUENCY_TAG = "frequency";
+ public static final String MAN_MADE_TAG = "man_made";
+ public static final String ADDR_HOUSENUMBER_TAG = "addr:housenumber";
+ public static final String AREA_TAG = "area";
+ public static final String BUILDING_LEVELS_TAG = "building:levels";
+ public static final String WHEELCHAIR_TAG = "wheelchair";
+ public static final String NAME_TAG = "name";
+ public static final String ONEWAY_TAG = "oneway";
+ public static final String FIXME_TAG = "FIXME";
+ public static final String CAPACITY_TAG = "capacity";
+ public static final String MOTORCYCLE_TAG = "motorcycle";
+ public static final String HGV_TAG = "hgv";
+ public static final String CONSTRUCTION_TAG = "construction";
+ public static final String ADDR_STATE_TAG = "addr:state";
+ public static final String LANES_TAG = "lanes";
+ public static final String NOTE_TAG = "note";
+ public static final String LIT_TAG = "lit";
+ public static final String BUILDING_TAG = "building";
+ public static final String SEGREGATED_TAG = "segregated";
+ public static final String ADDR_INCLUSION_TAG = "addr:inclusion";
+ public static final String LAYER_TAG = "layer";
+ public static final String SPORT_TAG = "sport";
+ public static final String ADDR_INTERPOLATION_TAG = "addr:interpolation";
+ public static final String CUTTING_TAG = "cutting";
+ public static final String AMENITY_TAG = "amenity";
+ public static final String ACCESS_TAG = "access";
+ public static final String AGRICULTURAL_TAG = "agricultural";
+ public static final String CAPACITY_DISABLED_TAG = "capacity:disabled";
+ public static final String OPERATOR_TAG = "operator";
+ public static final String REF_TAG = "ref";
+ public static final String NOEXIT_TAG = "noexit";
+ public static final String ADMIN_LEVEL_TAG = "admin_level";
+ public static final String SOURCE_TAG = "source";
+ public static final String TRACKTYPE_TAG = "tracktype";
+ public static final String ADDR_COUNTRY_TAG = "addr:country";
+ public static final String ROUTE_TAG = "route";
+ public static final String CABLES_TAG = "cables";
+ public static final String SERVICE_TAG = "service";
+ public static final String MOTORCAR_TAG = "motorcar";
+ public static final String WHITEWATER_TAG = "whitewater";
+ public static final String EMBANKMENT_TAG = "embankment";
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AbstractAddressEditAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AbstractAddressEditAction.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AbstractAddressEditAction.java (revision 23931)
@@ -0,0 +1,146 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import java.awt.event.ActionEvent;
+
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
+
+/**
+ * Base class for all address related action. An action can work as well on all addresses collected by the
+ * container or on the active selection.
+ * By default, the action is disabled and the updateEnabledState(...) have to be implemented by
+ * subclasses. There are also two separate actionPerformedXX methods to do the action on
+ * container or on selection items.
+ * Most actions will work in both cases, so it is recommended to have one single method which
+ * accepts a list of addresses or streets and executes the tasks to be done by this action.
+ * @author Oliver Wieland
+ *
+ */
+
+@SuppressWarnings("serial")
+public abstract class AbstractAddressEditAction extends JosmAction {
+ private AddressEditSelectionEvent event;
+ protected AddressEditContainer container;
+
+ /**
+ * @param name
+ * @param icon
+ */
+ public AbstractAddressEditAction(String name, String iconName, String tooltip) {
+ super(name, iconName, tooltip, null, true);
+
+ setEnabled(false);
+ }
+
+ /**
+ * @param name
+ */
+ public AbstractAddressEditAction(String name) {
+ this(name, null, "");
+ }
+
+ /**
+ * @return the container
+ */
+ public AddressEditContainer getContainer() {
+ return container;
+ }
+
+ /**
+ * @param container the container to set
+ */
+ public void setContainer(AddressEditContainer container) {
+ this.container = container;
+ updateEnabledState();
+ }
+
+ /**
+ * @return the event
+ */
+ protected AddressEditSelectionEvent getEvent() {
+ return event;
+ }
+
+ /**
+ * @param event the event to set
+ */
+ protected void setEvent(AddressEditSelectionEvent event) {
+ this.event = event;
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.actions.JosmAction#updateEnabledState()
+ */
+ @Override
+ protected void updateEnabledState() {
+ if (this.event != null) {
+ updateEnabledState(this.event);
+ } else {
+ if (container != null) {
+ updateEnabledState(container);
+ } else {
+ super.updateEnabledState();
+ }
+ }
+ }
+
+ /**
+ * Updates 'enabled' state depending on the given address container object.
+ * @param container The address container (maybe null).
+ * @return
+ */
+ protected abstract void updateEnabledState(AddressEditContainer container);
+
+ /**
+ * Updates 'enabled' state depending on the given address container object.
+ * @param container The address container (maybe null).
+ * @return
+ */
+ protected abstract void updateEnabledState(AddressEditSelectionEvent event);
+
+ /* (non-Javadoc)
+ * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ */
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ if (event != null) { // use the event acquired previously.
+ addressEditActionPerformed(event);
+ event = null; // consume event
+ } else {
+ if (container != null) {
+ addressEditActionPerformed(container);
+ } else { // call super class hook
+ actionPerformed(arg0);
+ }
+ }
+ }
+
+
+ /**
+ * Redirected action handler for doing actions on a address selection.
+ * @param ev
+ */
+ public abstract void addressEditActionPerformed(AddressEditSelectionEvent ev);
+
+ /**
+ * Redirected action handler for doing actions on an address container.
+ * @param ev
+ */
+ public abstract void addressEditActionPerformed(AddressEditContainer container);
+
+
+
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java (revision 23931)
@@ -0,0 +1,327 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.GridLayout;
+import java.awt.HeadlessException;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Collection;
+import java.util.List;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
+import javax.swing.JSplitPane;
+import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.openstreetmap.gui.jmapviewer.JMapViewer;
+import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel.PresetHandler;
+import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
+import org.openstreetmap.josm.plugins.addressEdit.AddressNode;
+import org.openstreetmap.josm.plugins.addressEdit.IAddressEditContainerListener;
+import org.openstreetmap.josm.plugins.addressEdit.INodeEntity;
+import org.openstreetmap.josm.plugins.addressEdit.StreetNode;
+import org.openstreetmap.josm.plugins.addressEdit.StringUtils;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+@SuppressWarnings("serial")
+public class AddressEditDialog extends JDialog implements ActionListener, ListSelectionListener, IAddressEditContainerListener {
+ private static final String UNRESOLVED_HEADER_FMT = tr("Unresolved Addresses (%d)");
+ private static final String STREET_HEADER_FMT = tr("Streets (%d)");
+ private static final String OK_COMMAND = tr("Close");
+ private static final String SELECT_AND_CLOSE = tr("Select and close");
+
+ private AddressEditContainer editContainer;
+ private JTable unresolvedTable;
+ private JTable streetTable;
+
+ /* Actions */
+ private AssignAddressToStreetAction resolveAction = new AssignAddressToStreetAction();
+ private ApplyAllGuessesAction applyAllGuessesAction = new ApplyAllGuessesAction();
+ private GuessAddressDataAction guessAddressAction = new GuessAddressDataAction();
+ private SelectAddressesInMapAction selectAddressesInMapAction = new SelectAddressesInMapAction();
+
+ private AbstractAddressEditAction[] actions = new AbstractAddressEditAction[] {
+ resolveAction,
+ guessAddressAction,
+ applyAllGuessesAction,
+ selectAddressesInMapAction
+ };
+ private JLabel streetLabel;
+ private JLabel unresolvedAddressesLabel;
+ private JMapViewer mapViewer;
+
+
+ /**
+ * @param arg0
+ * @throws HeadlessException
+ */
+ public AddressEditDialog(AddressEditContainer addressEditContainer) throws HeadlessException {
+ super(JOptionPane.getFrameForComponent(Main.parent), tr("Fix unresolved addresses"), false);
+
+ this.editContainer = addressEditContainer;
+ this.editContainer.addChangedListener(this);
+ setLayout(new BorderLayout());
+ setSize(1024,600);
+ setLocationRelativeTo(null);
+
+ if (addressEditContainer != null) {
+ /* Panel for street table */
+ JPanel streetPanel = new JPanel(new BorderLayout());
+ streetTable = new JTable(new StreetTableModel(editContainer));
+ streetTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ streetTable.getSelectionModel().addListSelectionListener(this);
+
+ JScrollPane scroll1 = new JScrollPane(streetTable);
+ streetPanel.add(scroll1, BorderLayout.CENTER);
+
+ streetLabel = createHeaderLabel(STREET_HEADER_FMT, editContainer.getNumberOfStreets());
+ streetPanel.add(streetLabel, BorderLayout.NORTH);
+ streetPanel.setMinimumSize(new Dimension(350, 300));
+
+ /* Panel for unresolved addresses table */
+ JPanel unresolvedPanel = new JPanel(new BorderLayout());
+ unresolvedTable = new JTable(new UnresolvedAddressesTableModel(editContainer));
+ unresolvedTable.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ unresolvedTable.getSelectionModel().addListSelectionListener(this);
+ unresolvedTable.getSelectionModel().addListSelectionListener(new IncompleteAddressListener());
+ unresolvedTable.addMouseListener(new IncompleteAddressesMouseListener());
+
+ JScrollPane scroll2 = new JScrollPane(unresolvedTable);
+ unresolvedPanel.add(scroll2, BorderLayout.CENTER);
+ unresolvedAddressesLabel = createHeaderLabel(
+ UNRESOLVED_HEADER_FMT, editContainer.getNumberOfUnresolvedAddresses());
+ unresolvedPanel.add(unresolvedAddressesLabel , BorderLayout.NORTH);
+ unresolvedPanel.setMinimumSize(new Dimension(350, 200));
+
+
+ try {
+ JPanel unresolvedButtons = new JPanel(new FlowLayout());
+ SideButton assign = new SideButton(resolveAction);
+ unresolvedButtons.add(assign);
+ SideButton guess = new SideButton(guessAddressAction);
+ unresolvedButtons.add(guess);
+ SideButton applyAllGuesses = new SideButton(applyAllGuessesAction);
+ unresolvedButtons.add(applyAllGuesses);
+
+ unresolvedButtons.add(new JSeparator());
+ SideButton selectInMap = new SideButton(selectAddressesInMapAction);
+ unresolvedButtons.add(selectInMap);
+ unresolvedPanel.add(unresolvedButtons, BorderLayout.SOUTH);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+
+ /* Map Panel */
+ JPanel mapPanel = new JPanel(new BorderLayout());
+ mapViewer = new JMapViewer();
+ mapPanel.add(mapViewer, BorderLayout.CENTER);
+ mapPanel.setMinimumSize(new Dimension(200, 200));
+ mapViewer.setVisible(false);
+
+ /* Combine panels */
+ JSplitPane unresSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, streetPanel, unresolvedPanel);
+ JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, unresSplitPane, mapPanel);
+
+ this.getContentPane().add(pane, BorderLayout.CENTER);
+ //this.getContentPane().add(mapPanel, BorderLayout.SOUTH);
+ } else {
+ this.getContentPane().add(new JLabel(tr("(No data)")), BorderLayout.CENTER);
+ }
+
+ for (int i = 0; i < actions.length; i++) {
+ actions[i].setContainer(addressEditContainer);
+ }
+
+ JPanel buttonPanel = new JPanel(new GridLayout(1,10));
+ JButton ok = new JButton(OK_COMMAND, ImageProvider.getIfAvailable(null, "ok"));
+ ok.addActionListener(this);
+ JButton selectAndClose = new JButton(SELECT_AND_CLOSE);
+ selectAndClose.addActionListener(this);
+
+ // Murks
+ for (int i = 0; i < 8; i++) {
+ buttonPanel.add(new JSeparator());
+ }
+
+ buttonPanel.add(ok);
+
+
+ this.getContentPane().add(buttonPanel, BorderLayout.SOUTH);
+ }
+
+ private JLabel createHeaderLabel(String fmtString, int n) {
+ JLabel label = new JLabel(String.format(fmtString, n));
+ label.setFont(label.getFont().deriveFont(Font.BOLD));
+ return label;
+ }
+
+ private void updateHeaders() {
+ if (editContainer != null) {
+ streetLabel.setText(String.format(STREET_HEADER_FMT, editContainer.getNumberOfStreets()));
+ unresolvedAddressesLabel.setText(String.format(UNRESOLVED_HEADER_FMT, editContainer.getNumberOfUnresolvedAddresses()));
+ } else {
+ streetLabel.setText(String.format(STREET_HEADER_FMT, 0));
+ unresolvedAddressesLabel.setText(String.format(UNRESOLVED_HEADER_FMT, 0));
+ }
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (OK_COMMAND.equals(e.getActionCommand())) {
+ this.setVisible(false);
+ }
+ }
+
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
+
+ AddressEditSelectionEvent ev = new AddressEditSelectionEvent(e.getSource(),
+ streetTable, unresolvedTable, editContainer);
+
+ for (AbstractAddressEditAction action : actions) {
+ action.updateEnabledState(ev);
+ }
+
+ clearMapViewer();
+ StreetNode sNode = ev.getSelectedStreet();
+ if (sNode != null) {
+
+ //mapViewer.addMapRectangle(new BBoxMapRectangle(bb));
+ for (INodeEntity seg : sNode.getChildren()) {
+ Way way = (Way) seg.getOsmObject();
+ //BBox bb = way.getBBox();
+
+ for (Node node : way.getNodes()) {
+ mapViewer.addMapMarker(new MapMarkerDot(Color.GREEN, node.getCoor().lat(), node.getCoor().lon()));
+ }
+ }
+
+ List unrAddresses = ev.getSelectedUnresolvedAddresses();
+ if (unrAddresses != null) {
+ for (AddressNode aNode : unrAddresses) {
+ Node node = (Node) aNode.getOsmObject();
+ mapViewer.addMapMarker(new MapMarkerDot(Color.ORANGE, node.getCoor().lat(), node.getCoor().lon()));
+ }
+ }
+ mapViewer.setDisplayToFitMapMarkers();
+ mapViewer.setVisible(true);
+ }
+ }
+
+ private void clearMapViewer() {
+ mapViewer.setVisible(false);
+ // remove markers and rectangles from map viewer
+ mapViewer.getMapMarkerList().clear();
+ mapViewer.getMapRectangleList().clear();
+ }
+
+ @Override
+ public void containerChanged(AddressEditContainer container) {
+ updateHeaders();
+
+ for (int i = 0; i < actions.length; i++) {
+ actions[i].setContainer(container);
+ }
+ }
+
+ @Override
+ public void entityChanged(INodeEntity entity) {
+ updateHeaders();
+ }
+
+ /**
+ * Special listener to react on selection changes in the incomplete address list.
+ * It searches the street table for the streets which matches best matching to the
+ * street name given in the address.
+ *
+ * @author Oliver Wieland
+ */
+
+ class IncompleteAddressListener implements ListSelectionListener {
+
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
+ if (unresolvedTable.getSelectedRowCount() == 1) {
+ String streetOfAddr = (String) unresolvedTable.
+ getModel().getValueAt(unresolvedTable.getSelectedRow(), 0);
+
+ int maxScore = 0, score = 0, row = -1;
+ for (int i = 0; i < streetTable.getRowCount(); i++) {
+ String streetName = (String) streetTable.getModel().getValueAt(i, 1);
+
+ score = StringUtils.lcsLength(streetOfAddr, streetName);
+ if (score > maxScore) {
+ maxScore = score;
+ row = i;
+ }
+ }
+
+ if (row > 0) {
+ streetTable.getSelectionModel().clearSelection();
+ streetTable.getSelectionModel().addSelectionInterval(row, row);
+ streetTable.scrollRectToVisible(streetTable.getCellRect(row, 0, true));
+ }
+ }
+ }
+
+ }
+
+ class IncompleteAddressPresetHandler implements PresetHandler {
+ private List osmPrimitives;
+
+ /**
+ * @param osmPrimitives
+ */
+ public IncompleteAddressPresetHandler(List osmPrimitives) {
+ super();
+ this.osmPrimitives = osmPrimitives;
+ }
+
+ @Override
+ public Collection getSelection() {
+ // TODO Auto-generated method stub
+ return osmPrimitives;
+ }
+
+ @Override
+ public void updateTags(List tags) {
+
+ }
+
+ }
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java (revision 23931)
@@ -0,0 +1,119 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeNode;
+
+import org.openstreetmap.josm.plugins.addressEdit.AddressNode;
+import org.openstreetmap.josm.plugins.addressEdit.INodeEntity;
+import org.openstreetmap.josm.plugins.addressEdit.StreetNode;
+
+public class AddressEditModel {
+ private List streets;
+ private List unresolvedAddresses;
+ private List incompleteAddresses = new ArrayList();
+ private DefaultMutableTreeNode streetRoot;
+ private DefaultMutableTreeNode unresolvedRoot;
+ private DefaultMutableTreeNode incompleteRoot;
+
+ /**
+ * @param streets
+ * @param unresolvedAddresses
+ */
+ public AddressEditModel(List streets,
+ List unresolvedAddresses) {
+ super();
+ this.streets = streets;
+ this.unresolvedAddresses = unresolvedAddresses;
+ }
+
+ public TreeNode getStreetsTree() {
+ if (streets == null) return new DefaultMutableTreeNode(tr("(No data)"));
+
+ if (streetRoot == null) {
+ streetRoot = new DefaultMutableTreeNode();
+ for (StreetNode sNode : streets) {
+ DefaultMutableTreeNode treeStreetNode = new DefaultMutableTreeNode(sNode);
+
+ DefaultMutableTreeNode segmentsNode = new DefaultMutableTreeNode(tr("Segments"));
+ treeStreetNode.add(segmentsNode);
+
+ // Add street segment(s)
+ for (INodeEntity child : sNode.getChildren()) {
+ segmentsNode.add(new DefaultMutableTreeNode(child));
+ }
+
+ if (sNode.hasAddresses()) {
+ // Add address nodes
+ DefaultMutableTreeNode addressNode = new DefaultMutableTreeNode(tr("Addresses"));
+ treeStreetNode.add(addressNode);
+
+ for (AddressNode addr : sNode.getAddresses()) {
+ addressNode.add(new DefaultMutableTreeNode(addr));
+ if (!addr.isComplete()) {
+ incompleteAddresses.add(addr);
+ }
+ }
+ }
+ streetRoot.add(treeStreetNode);
+ }
+ }
+
+ return streetRoot;
+ }
+
+ /**
+ * Gets the tree node containing all unresolved addresses.
+ * @return
+ */
+ public TreeNode getUnresolvedAddressesTree() {
+ if (unresolvedAddresses == null) return new DefaultMutableTreeNode(tr("(No data)"));
+
+ if (unresolvedRoot == null) {
+ unresolvedRoot = new DefaultMutableTreeNode();
+
+ for (AddressNode addr : unresolvedAddresses) {
+ // Add address nodes
+ unresolvedRoot.add(new DefaultMutableTreeNode(addr));
+ }
+ }
+
+ return unresolvedRoot;
+ }
+
+ /**
+ * Gets the tree node containing all incomplete addresses.
+ * @return
+ */
+ public TreeNode getIncompleteAddressesTree() {
+ if (incompleteAddresses == null) return new DefaultMutableTreeNode(tr("(No data)"));
+
+ if (incompleteRoot == null) {
+ incompleteRoot = new DefaultMutableTreeNode();
+
+ for (AddressNode addr : incompleteAddresses) {
+ // Add address nodes
+ incompleteRoot.add(new DefaultMutableTreeNode(addr));
+ }
+ }
+
+ return incompleteRoot;
+ }
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditSelectionEvent.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditSelectionEvent.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditSelectionEvent.java (revision 23931)
@@ -0,0 +1,108 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JTable;
+
+import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
+import org.openstreetmap.josm.plugins.addressEdit.AddressNode;
+import org.openstreetmap.josm.plugins.addressEdit.StreetNode;
+
+public class AddressEditSelectionEvent extends ActionEvent {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -93034483427803409L;
+ private JTable streetTable;
+ private JTable unresolvedAddressTable;
+ private AddressEditContainer addressContainer;
+
+ /**
+ * Creates a new 'AddressEditSelectionEvent'.
+ * @param source The event source.
+ * @param selStreet The street table component.
+ * @param unresolvedAddr The unresolved addresses table component.
+ * @param incomplete The incomplete addresses table component.
+ * @param container The address container instance holding the entities for streets and addresses.
+ */
+ public AddressEditSelectionEvent(Object source, JTable selStreet, JTable unresolvedAddr, AddressEditContainer container) {
+ super(source, -1, "");
+ this.streetTable = selStreet;
+ this.unresolvedAddressTable = unresolvedAddr;
+ this.addressContainer = container;
+ }
+
+ /**
+ * Gets the street table component.
+ * @return
+ */
+ public JTable getStreetTable() {
+ return streetTable;
+ }
+
+ /**
+ * Gets the 'unresolved addresses' table component.
+ * @return
+ */
+ public JTable getUnresolvedAddressTable() {
+ return unresolvedAddressTable;
+ }
+
+ public AddressEditContainer getAddressContainer() {
+ return addressContainer;
+ }
+
+ /**
+ * Gets the selected street of the street table.
+ * @return
+ */
+ public StreetNode getSelectedStreet() {
+ if (streetTable != null && addressContainer != null && addressContainer.getStreetList() != null) {
+ int selRows = streetTable.getSelectedRow();
+
+ if (selRows < 0 || selRows >= addressContainer.getNumberOfStreets()) {
+ return null;
+ }
+
+ return addressContainer.getStreetList().get(selRows);
+ }
+ return null;
+ }
+
+ /**
+ * Gets the list containing the selected items of the 'unresolved addresses ' table.
+ * @return
+ */
+ public List getSelectedUnresolvedAddresses() {
+ if (unresolvedAddressTable != null &&
+ addressContainer != null &&
+ addressContainer.getUnresolvedAddresses() != null) {
+
+ int[] selRows = unresolvedAddressTable.getSelectedRows();
+
+ List nodes = new ArrayList();
+ for (int i = 0; i < selRows.length; i++) {
+ if (i >= 0 && i < addressContainer.getNumberOfUnresolvedAddresses()) {
+ nodes.add(addressContainer.getUnresolvedAddresses().get(selRows[i]));
+ }
+ }
+ return nodes;
+ }
+ return null;
+ }
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditTableModel.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditTableModel.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditTableModel.java (revision 23931)
@@ -0,0 +1,52 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import javax.swing.table.DefaultTableModel;
+
+import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
+import org.openstreetmap.josm.plugins.addressEdit.IAddressEditContainerListener;
+import org.openstreetmap.josm.plugins.addressEdit.INodeEntity;
+
+public abstract class AddressEditTableModel extends DefaultTableModel implements IAddressEditContainerListener{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 424009321818130586L;
+ protected AddressEditContainer addressContainer;
+
+ public AddressEditTableModel(AddressEditContainer addressContainer) {
+ super();
+ this.addressContainer = addressContainer;
+ addressContainer.addChangedListener(this);
+ }
+
+ @Override
+ public void containerChanged(AddressEditContainer container) {
+ fireTableDataChanged();
+ }
+
+ @Override
+ public void entityChanged(INodeEntity entity) {
+ fireTableDataChanged();
+ }
+
+ /**
+ * Gets the node entity for the given row or null; if row contains no entity.
+ * @param row The row to get the entity object for.
+ * @return
+ */
+ public abstract INodeEntity getEntityOfRow(int row);
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/ApplyAllGuessesAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/ApplyAllGuessesAction.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/ApplyAllGuessesAction.java (revision 23931)
@@ -0,0 +1,64 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
+import org.openstreetmap.josm.plugins.addressEdit.AddressNode;
+
+@SuppressWarnings("serial")
+public class ApplyAllGuessesAction extends AbstractAddressEditAction {
+
+ public ApplyAllGuessesAction() {
+ //super(tr("Apply all guesses"), "applyguesses_24", "Turns all guesses into the corresponding tag values.");
+ super(tr("Apply all guesses"), "applyguesses_24", "Turns all guesses into the corresponding tag values.");
+ }
+
+ @Override
+ public void addressEditActionPerformed(AddressEditSelectionEvent ev) {
+ if (ev == null || ev.getSelectedUnresolvedAddresses() == null) return;
+ // fix SELECTED items only
+ List addrToFix = ev.getSelectedUnresolvedAddresses();
+ applyGuesses(addrToFix);
+ }
+
+ @Override
+ protected void updateEnabledState(AddressEditContainer container) {
+ setEnabled(container != null && container.getNumberOfGuesses() > 0);
+ }
+
+ private void applyGuesses(List addrToFix) {
+ List addrToFixShadow = new ArrayList(addrToFix);
+ for (AddressNode aNode : addrToFixShadow) {
+ aNode.applyAllGuesses();
+ }
+ }
+
+ @Override
+ protected void updateEnabledState(AddressEditSelectionEvent event) {
+ // do nothing here
+ }
+
+ @Override
+ public void addressEditActionPerformed(AddressEditContainer container) {
+ if (container == null || container.getUnresolvedAddresses() == null) return;
+
+ List addrToFix = container.getUnresolvedAddresses();
+ applyGuesses(addrToFix);
+ }
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AssignAddressToStreetAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AssignAddressToStreetAction.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AssignAddressToStreetAction.java (revision 23931)
@@ -0,0 +1,68 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
+import org.openstreetmap.josm.plugins.addressEdit.AddressNode;
+import org.openstreetmap.josm.plugins.addressEdit.StreetNode;
+
+public class AssignAddressToStreetAction extends AbstractAddressEditAction {
+
+ public AssignAddressToStreetAction() {
+ super(tr("Assign address to street"), "assignstreet_24", "Assign the selected address(es) to the selected street.");
+ }
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6180491357232121384L;
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.addressEdit.gui.AbstractAddressEditAction#addressEditActionPerformed(org.openstreetmap.josm.plugins.addressEdit.gui.AddressEditSelectionEvent)
+ */
+ @Override
+ public void addressEditActionPerformed(AddressEditSelectionEvent ev) {
+ StreetNode streetNode = ev.getSelectedStreet();
+
+ if (streetNode != null && ev.getSelectedUnresolvedAddresses() != null) {
+ for (AddressNode addrNode : ev.getSelectedUnresolvedAddresses()) {
+ addrNode.assignStreet(streetNode);
+ System.out.println("Assign " + addrNode + " to " + streetNode);
+ }
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.addressEdit.gui.AbstractAddressEditAction#updateEnabledState(org.openstreetmap.josm.plugins.addressEdit.gui.AddressEditSelectionEvent)
+ */
+ @Override
+ public void updateEnabledState(AddressEditSelectionEvent ev) {
+ setEnabled(ev.getSelectedStreet() != null && ev.getSelectedUnresolvedAddresses() != null);
+ }
+
+ @Override
+ public void updateEnabledState(AddressEditContainer container) {
+ // we only accept a selection here
+ setEnabled(false);
+ }
+
+ @Override
+ public void addressEditActionPerformed(AddressEditContainer container) {
+ // we only accept a selection: nothing to do here
+ }
+
+
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/BBoxMapRectangle.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/BBoxMapRectangle.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/BBoxMapRectangle.java (revision 23931)
@@ -0,0 +1,49 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import java.awt.Graphics;
+import java.awt.Point;
+
+import org.openstreetmap.gui.jmapviewer.Coordinate;
+import org.openstreetmap.gui.jmapviewer.interfaces.MapRectangle;
+import org.openstreetmap.josm.data.osm.BBox;
+
+public class BBoxMapRectangle implements MapRectangle {
+ private BBox bbox;
+
+ /**
+ * @param bbox
+ */
+ public BBoxMapRectangle(BBox bbox) {
+ super();
+ this.bbox = bbox;
+ }
+
+ @Override
+ public Coordinate getBottomRight() {
+ return new Coordinate(bbox.getBottomRight().lat(), bbox.getBottomRight().lon());
+ }
+
+ @Override
+ public Coordinate getTopLeft() {
+ return new Coordinate(bbox.getTopLeft().lat(), bbox.getTopLeft().lon());
+ }
+
+ @Override
+ public void paint(Graphics g, Point topLeft, Point bottomRight) {
+ // do nothing here
+ }
+
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/GuessAddressDataAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/GuessAddressDataAction.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/GuessAddressDataAction.java (revision 23931)
@@ -0,0 +1,107 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
+import org.openstreetmap.josm.plugins.addressEdit.AddressFinderThread;
+import org.openstreetmap.josm.plugins.addressEdit.AddressNode;
+
+/**
+ * Guesses address tags by picking the closest street node with a name. The same is done (some day)
+ * with city, post code, state,...
+ * @author Oliver Wieland
+ *
+ */
+
+@SuppressWarnings("serial")
+public class GuessAddressDataAction extends AbstractAddressEditAction {
+ private static final int THREAD_COUNT = 5;
+ private AddressFinderThread[] threads = new AddressFinderThread[THREAD_COUNT];
+
+ public GuessAddressDataAction() {
+ super(tr("Guess address data"), "guessstreets_24", "Tries to guess the street name by picking the name of the closest way.");
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.addressEdit.gui.AbstractAddressEditAction#updateEnabledState(org.openstreetmap.josm.plugins.addressEdit.gui.AddressEditSelectionEvent)
+ */
+ @Override
+ public void updateEnabledState(AddressEditSelectionEvent ev) {
+ setEnabled(ev != null && ev.getUnresolvedAddressTable() != null);
+ }
+
+ @Override
+ protected void updateEnabledState(AddressEditContainer container) {
+ setEnabled(container != null && container.getNumberOfIncompleteAddresses() > 0);
+ }
+
+ @Override
+ public void addressEditActionPerformed(AddressEditContainer container) {
+ if (container == null) return;
+ if (container.getUnresolvedAddresses() == null) return;
+
+ internalGuessAddresses(container.getIncompleteAddresses());
+ }
+
+ @Override
+ public void addressEditActionPerformed(AddressEditSelectionEvent ev) {
+ if (ev == null || ev.getSelectedUnresolvedAddresses() == null) return;
+
+ // guess tags for selected addresses only
+ internalGuessAddresses(ev.getSelectedUnresolvedAddresses());
+ }
+
+ /**
+ * Internal method to start several threads guessing tag values for the given list of addresses.
+ * @param addrNodes
+ */
+ private void internalGuessAddresses(List nodes) {
+ // setup thread pool
+ for (int i = 0; i < threads.length; i++) {
+ threads[i] = new AddressFinderThread();
+ }
+
+ // work on a shadowed copy
+ List addrNodes = new ArrayList(nodes);
+ for (AddressNode aNode : addrNodes) {
+ if (aNode.hasStreetName()) continue;
+
+ while(!scheduleNode(aNode)) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ return;
+ }
+ }
+ }
+ container.containerChanged(container);
+ }
+
+ private boolean scheduleNode(AddressNode aNode) {
+ for (int i = 0; i < threads.length; i++) {
+ if (!threads[i].isRunning()) {
+ threads[i].setAddressNode(aNode);
+ threads[i].run();
+ return true;
+ }
+ }
+ return false;
+ }
+
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesMouseListener.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesMouseListener.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesMouseListener.java (revision 23931)
@@ -0,0 +1,70 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import java.awt.Point;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+
+import javax.swing.JTable;
+
+import org.openstreetmap.josm.plugins.addressEdit.AddressNode;
+import org.openstreetmap.josm.plugins.addressEdit.INodeEntity;
+
+public class IncompleteAddressesMouseListener implements MouseListener {
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ JTable table = (JTable)e.getSource();
+ Point p = e.getPoint();
+ if(e.getClickCount() == 2) {
+ AddressEditTableModel model = (AddressEditTableModel) table.getModel();
+ if (model != null) {
+ int row = table.rowAtPoint(p);
+ INodeEntity node = model.getEntityOfRow(row);
+ if (node instanceof AddressNode) {
+ AddressNode aNode = (AddressNode) node;
+ if (aNode.hasGuessedStreetName()) {
+ aNode.applyGuessedStreet();
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ public void mouseEntered(MouseEvent arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void mouseExited(MouseEvent arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void mousePressed(MouseEvent arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java (revision 23931)
@@ -0,0 +1,112 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
+import org.openstreetmap.josm.plugins.addressEdit.AddressNode;
+import org.openstreetmap.josm.plugins.addressEdit.INodeEntity;
+import org.openstreetmap.josm.plugins.addressEdit.StringUtils;
+
+public class IncompleteAddressesTableModel extends AddressEditTableModel {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -5951629033395186324L;
+
+ private static final int NUMBER_OF_COLUMNS = 5;
+ private static final String[] COLUMN_NAMES = new String[]{tr("Country"), tr("State"), tr("City"), tr("Post Code"), tr("Street")};
+ private static final Class[] COLUMN_CLASSES = new Class[]{
+ String.class, String.class, String.class, String.class, String.class};
+
+ /**
+ * @param addressContainer
+ */
+ public IncompleteAddressesTableModel(AddressEditContainer addressContainer) {
+ super(addressContainer);
+ }
+
+ @Override
+ public int getColumnCount() {
+ // TODO Auto-generated method stub
+ return NUMBER_OF_COLUMNS;
+ }
+
+ @Override
+ public String getColumnName(int column) {
+ return COLUMN_NAMES[column];
+ }
+
+ @Override
+ public int getRowCount() {
+ if (addressContainer == null || addressContainer.getIncompleteAddresses() == null) {
+ return 0;
+ }
+ return addressContainer.getNumberOfIncompleteAddresses();
+ }
+
+ @Override
+ public Object getValueAt(int row, int column) {
+ AddressNode aNode = (AddressNode) getEntityOfRow(row);
+
+ if (aNode == null) {
+ return null;
+ }
+
+ switch (column) {
+ case 0:
+ return aNode.getCountry();
+ case 1:
+ return aNode.getState();
+ case 2:
+ return aNode.getCity();
+ case 3:
+ return aNode.getPostCode();
+ case 4:
+ if (!StringUtils.isNullOrEmpty(aNode.getGuessedStreetName()) &&
+ AddressNode.MISSING_TAG.equals(aNode.getStreet())) {
+
+ return "(" + aNode.getGuessedStreetName() + ")";
+ } else {
+ return aNode.getStreet();
+ }
+ default:
+ throw new RuntimeException("Invalid column index: " + column);
+ }
+
+ }
+
+ @Override
+ public Class getColumnClass(int arg0) {
+ return COLUMN_CLASSES[arg0];
+ }
+
+ @Override
+ public boolean isCellEditable(int row, int column) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public INodeEntity getEntityOfRow(int row) {
+ if (addressContainer == null || addressContainer.getIncompleteAddresses() == null) {
+ return null;
+ }
+ if (row < 0 || row > addressContainer.getNumberOfIncompleteAddresses()) {
+ return null;
+ }
+ return addressContainer.getIncompleteAddresses().get(row);
+ }
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/SelectAddressesInMapAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/SelectAddressesInMapAction.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/SelectAddressesInMapAction.java (revision 23931)
@@ -0,0 +1,101 @@
+/*
+ * 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 .
+ */
+/**
+ * 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 .
+ */
+
+/* File created on 30.10.2010 */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
+import org.openstreetmap.josm.plugins.addressEdit.AddressNode;
+
+/**
+ *
+ * @author Oliver Wieland
+ *
+ */
+
+@SuppressWarnings("serial")
+public class SelectAddressesInMapAction extends AbstractAddressEditAction {
+
+ public SelectAddressesInMapAction() {
+ // we simply use the existing icon :-|
+ super(tr("Select in map"), "selectall", "Selects selected addresses in the map");
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.addressEdit.gui.AbstractAddressEditAction#addressEditActionPerformed(org.openstreetmap.josm.plugins.addressEdit.gui.AddressEditSelectionEvent)
+ */
+ @Override
+ public void addressEditActionPerformed(AddressEditSelectionEvent ev) {
+ if (ev == null) return;
+
+ internalSelectAddresses(ev.getSelectedUnresolvedAddresses());
+ }
+
+ @Override
+ public void addressEditActionPerformed(AddressEditContainer container) {
+ internalSelectAddresses(container.getUnresolvedAddresses());
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.addressEdit.gui.AbstractAddressEditAction#updateEnabledState(org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer)
+ */
+ @Override
+ protected void updateEnabledState(AddressEditContainer container) {
+ setEnabled(container != null && container.getNumberOfIncompleteAddresses() > 0);
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.addressEdit.gui.AbstractAddressEditAction#updateEnabledState(org.openstreetmap.josm.plugins.addressEdit.gui.AddressEditSelectionEvent)
+ */
+ @Override
+ protected void updateEnabledState(AddressEditSelectionEvent event) {
+ setEnabled(event != null && event.getSelectedUnresolvedAddresses() != null);
+ }
+
+ /**
+ * Internal helper to select the given addresses in the map.
+ * @param addrToSel
+ */
+ private void internalSelectAddresses(List addrToSel) {
+ if (addrToSel == null) return;
+
+ List sel = new ArrayList();
+
+ for (AddressNode aNode : addrToSel) {
+ sel.add(aNode.getOsmObject());
+ }
+
+ getCurrentDataSet().setSelected(sel);
+ }
+
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java (revision 23931)
@@ -0,0 +1,118 @@
+/*
+ * 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 .
+ */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
+import org.openstreetmap.josm.plugins.addressEdit.INodeEntity;
+import org.openstreetmap.josm.plugins.addressEdit.StreetNode;
+
+public class StreetTableModel extends AddressEditTableModel {
+
+ private static final int NUMBER_OF_COLUMNS = 4;
+ private static final String[] COLUMN_NAMES = new String[]{tr("Type"), tr("Name"), tr("Segments"), tr("Addresses")};
+ private static final Class[] COLUMN_CLASSES = new Class[]{String.class, String.class, Integer.class, Integer.class};
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 424009321818130586L;
+
+ /**
+ * @param addressContainer
+ */
+ public StreetTableModel(AddressEditContainer addressContainer) {
+ super(addressContainer);
+ }
+
+ /* (non-Javadoc)
+ * @see javax.swing.table.DefaultTableModel#getColumnCount()
+ */
+ @Override
+ public int getColumnCount() {
+ // TODO Auto-generated method stub
+ return NUMBER_OF_COLUMNS;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.swing.table.DefaultTableModel#getColumnName(int)
+ */
+ @Override
+ public String getColumnName(int column) {
+ return COLUMN_NAMES[column];
+ }
+
+ /* (non-Javadoc)
+ * @see javax.swing.table.AbstractTableModel#getColumnClass(int)
+ */
+ @Override
+ public Class getColumnClass(int columnIndex) {
+ return COLUMN_CLASSES[columnIndex];
+ }
+
+ /* (non-Javadoc)
+ * @see javax.swing.table.DefaultTableModel#getRowCount()
+ */
+ @Override
+ public int getRowCount() {
+ if (addressContainer == null || addressContainer.getStreetList() == null) {
+ return 0;
+ }
+ return addressContainer.getNumberOfStreets();
+ }
+
+ /* (non-Javadoc)
+ * @see javax.swing.table.DefaultTableModel#getValueAt(int, int)
+ */
+ @Override
+ public Object getValueAt(int row, int column) {
+ StreetNode sNode = (StreetNode) getEntityOfRow(row);
+
+ if (sNode == null) {
+ return null;
+ }
+
+ switch (column) {
+ case 0:
+ return sNode.getType();
+ case 1:
+ return sNode.getName();
+ case 2:
+ return sNode.getNumberOfSegments();
+ case 3:
+ return sNode.getNumberOfAddresses();
+ default:
+ throw new RuntimeException("Invalid column index: " + column);
+ }
+
+ }
+
+ @Override
+ public boolean isCellEditable(int row, int column) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public INodeEntity getEntityOfRow(int row) {
+ if (addressContainer == null || addressContainer.getStreetList() == null) {
+ return null;
+ }
+ if (row < 0 || row > addressContainer.getNumberOfStreets()) {
+ return null;
+ }
+ return addressContainer.getStreetList().get(row);
+ }
+}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java (revision 23931)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java (revision 23931)
@@ -0,0 +1,135 @@
+/*
+ * 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 .
+ */
+/**
+ * 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 .
+ */
+
+/* File created on 25.10.2010 */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
+import org.openstreetmap.josm.plugins.addressEdit.AddressNode;
+import org.openstreetmap.josm.plugins.addressEdit.INodeEntity;
+
+/**
+ *
+ * @author Oliver Wieland
+ *
+ */
+
+public class UnresolvedAddressesTableModel extends AddressEditTableModel {
+
+ private static final int NUMBER_OF_COLUMNS = 5;
+ private static final String[] COLUMN_NAMES = new String[]{
+ tr("Street"), tr("Housenumber"), tr("City"), tr("Postcode"), tr("Name")};
+
+ private static final Class[] COLUMN_CLASSES = new Class[]{
+ String.class, String.class, String.class, String.class, String.class};
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 424009321818130586L;
+
+ /**
+ * @param addressContainer
+ */
+ public UnresolvedAddressesTableModel(AddressEditContainer addressContainer) {
+ super(addressContainer);
+ }
+
+ @Override
+ public int getColumnCount() {
+ // TODO Auto-generated method stub
+ return NUMBER_OF_COLUMNS;
+ }
+
+ @Override
+ public String getColumnName(int column) {
+ return COLUMN_NAMES[column];
+ }
+
+ @Override
+ public int getRowCount() {
+ if (addressContainer == null || addressContainer.getUnresolvedAddresses() == null) {
+ return 0;
+ }
+ return addressContainer.getNumberOfUnresolvedAddresses();
+ }
+
+ @Override
+ public Object getValueAt(int row, int column) {
+ AddressNode aNode = (AddressNode) getEntityOfRow(row);
+
+ if (aNode == null) {
+ return null;
+ }
+
+ switch (column) {
+ case 0:
+ String guessed = aNode.getGuessedStreetName();
+ String cur = aNode.getStreet();
+ if (aNode.hasGuessedStreetName() && AddressNode.MISSING_TAG.equals(cur)) {
+ return "*" + guessed;
+ } else {
+ return aNode.getStreet();
+ }
+ case 1:
+ return aNode.getHouseNumber();
+ case 2:
+ return aNode.getCity();
+ case 3:
+ return aNode.getPostCode();
+ case 4:
+ return aNode.getName();
+ default:
+ throw new RuntimeException("Invalid column index: " + column);
+ }
+
+ }
+
+ @Override
+ public Class getColumnClass(int arg0) {
+ return COLUMN_CLASSES[arg0];
+ }
+
+ @Override
+ public boolean isCellEditable(int row, int column) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public INodeEntity getEntityOfRow(int row) {
+ if (addressContainer == null || addressContainer.getUnresolvedAddresses() == null) {
+ return null;
+ }
+ if (row < 0 || row > addressContainer.getNumberOfUnresolvedAddresses()) {
+ return null;
+ }
+ return addressContainer.getUnresolvedAddresses().get(row);
+ }
+}