Index: applications/editors/josm/plugins/roadsigns/README =================================================================== --- applications/editors/josm/plugins/roadsigns/README (revision 21967) +++ applications/editors/josm/plugins/roadsigns/README (revision 21967) @@ -0,0 +1,36 @@ +Road Signs Plugin +_________________ + +Shows a GUI dialog to tag objects by clicking on road sign symbols. +It tries to generate the corresponding tags for the object. +As tagging schemes are under constant development, the definitions +need to be updated when needed. + +Author: + Sebastian Klein + +License: + GPL v2 or later. + +Attribution: + Inspired by the Verkehrszeichen Tool [1] by Sebastian Hohmann. + Basically, this plugin is a port to Java and the JOSM (plugin) framework. + [1] http://osmtools.de/traffic_signs/ + + Pics have been derived from + http://de.wikipedia.org/wiki/Bildtafel_der_Verkehrszeichen_in_Deutschland (german street sign SVGs) + +JavaCC usage: +------------- + +There is a simple format to insert parameters into strings. E.g. keys, +values and refs in the preset file can contain '$foo' or '${foo}' which +will be replaced by the value of the parameter named foo. +(Textual "$" or "\" is escaped as "\$" or "\\".) + +javacc is used for easier tokenization. All *.java files in the folder +plugins/roadsigns/javacc are auto generated. To create them, execute + + javacc ParamString.jj + +(Provided javacc is installed. Not necessary if that file is not changed.) Index: applications/editors/josm/plugins/roadsigns/build.xml =================================================================== --- applications/editors/josm/plugins/roadsigns/build.xml (revision 21967) +++ applications/editors/josm/plugins/roadsigns/build.xml (revision 21967) @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Building against core revision ${coreversion.info.entry.revision}. + Plugin-Mainversion is set to ${plugin.main.version}. + + + + + + Commiting the plugin source with message '${commit.message}' ... + + + + + + + + + + + Updating plugin source ... + + + + + + Updating ${plugin.jar} ... + + + + + + + + + + + ***** Properties of published ${plugin.jar} ***** + Commit message : '${commit.message}' + Plugin-Mainversion: ${plugin.main.version} + JOSM build version: ${coreversion.info.entry.revision} + Plugin-Version : ${version.entry.commit.revision} + ***** / Properties of published ${plugin.jar} ***** + + Now commiting ${plugin.jar} ... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/data/defaultroadsignpreset.xml =================================================================== --- applications/editors/josm/plugins/roadsigns/data/defaultroadsignpreset.xml (revision 21967) +++ applications/editors/josm/plugins/roadsigns/data/defaultroadsignpreset.xml (revision 21967) @@ -0,0 +1,356 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/gpl-2.0.txt =================================================================== --- applications/editors/josm/plugins/roadsigns/gpl-2.0.txt (revision 21967) +++ applications/editors/josm/plugins/roadsigns/gpl-2.0.txt (revision 21967) @@ -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/roadsigns/gpl-3.0.txt =================================================================== --- applications/editors/josm/plugins/roadsigns/gpl-3.0.txt (revision 21967) +++ applications/editors/josm/plugins/roadsigns/gpl-3.0.txt (revision 21967) @@ -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/roadsigns/images_nodist/roadsigns.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_nodist/roadsigns.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_nodist/roadsigns.svg (revision 21967) @@ -0,0 +1,222 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1000-33.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1000-33.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1000-33.svg (revision 21967) @@ -0,0 +1,100 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1020-12.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1020-12.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1020-12.svg (revision 21967) @@ -0,0 +1,104 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1020-13.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1020-13.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1020-13.svg (revision 21967) @@ -0,0 +1,213 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1020-30.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1020-30.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1020-30.svg (revision 21967) @@ -0,0 +1,24 @@ + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1022-10.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1022-10.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1022-10.svg (revision 21967) @@ -0,0 +1,94 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1022-11.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1022-11.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1022-11.svg (revision 21967) @@ -0,0 +1,94 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1022-12.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1022-12.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1022-12.svg (revision 21967) @@ -0,0 +1,94 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1024-10.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1024-10.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1024-10.svg (revision 21967) @@ -0,0 +1,94 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1024-11.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1024-11.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1024-11.svg (revision 21967) @@ -0,0 +1,108 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1024-12.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1024-12.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1024-12.svg (revision 21967) @@ -0,0 +1,103 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1024-13.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1024-13.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1024-13.svg (revision 21967) @@ -0,0 +1,124 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1024-14.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1024-14.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1024-14.svg (revision 21967) @@ -0,0 +1,110 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1024-15.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1024-15.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1024-15.svg (revision 21967) @@ -0,0 +1,122 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1024-16.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1024-16.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1024-16.svg (revision 21967) @@ -0,0 +1,144 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1024-17.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1024-17.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1024-17.svg (revision 21967) @@ -0,0 +1,90 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1026-30.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1026-30.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1026-30.svg (revision 21967) @@ -0,0 +1,72 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1026-31.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1026-31.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1026-31.svg (revision 21967) @@ -0,0 +1,32 @@ + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1026-32.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1026-32.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1026-32.svg (revision 21967) @@ -0,0 +1,76 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1026-33.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1026-33.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1026-33.svg (revision 21967) @@ -0,0 +1,76 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1026-34.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1026-34.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1026-34.svg (revision 21967) @@ -0,0 +1,76 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1026-35.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1026-35.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1026-35.svg (revision 21967) @@ -0,0 +1,76 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1026-36.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1026-36.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1026-36.svg (revision 21967) @@ -0,0 +1,76 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1026-37.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1026-37.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1026-37.svg (revision 21967) @@ -0,0 +1,76 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1026-38.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1026-38.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1026-38.svg (revision 21967) @@ -0,0 +1,76 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1026-39.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1026-39.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1026-39.svg (revision 21967) @@ -0,0 +1,36 @@ + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1028-30.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1028-30.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1028-30.svg (revision 21967) @@ -0,0 +1,76 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1028-34.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1028-34.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1028-34.svg (revision 21967) @@ -0,0 +1,76 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1040-30.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1040-30.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1040-30.svg (revision 21967) @@ -0,0 +1,36 @@ + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1042-33.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1042-33.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1042-33.svg (revision 21967) @@ -0,0 +1,36 @@ + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1044-10.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1044-10.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1044-10.svg (revision 21967) @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1046-11.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1046-11.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1046-11.svg (revision 21967) @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1046-12.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1046-12.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1046-12.svg (revision 21967) @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1048-10.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1048-10.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1048-10.svg (revision 21967) @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1048-11.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1048-11.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1048-11.svg (revision 21967) @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1048-12.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1048-12.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1048-12.svg (revision 21967) @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1048-13.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1048-13.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1048-13.svg (revision 21967) @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1048-14.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1048-14.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1048-14.svg (revision 21967) @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1048-17.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1048-17.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1048-17.svg (revision 21967) @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1048-19.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1048-19.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1048-19.svg (revision 21967) @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1049-10.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1049-10.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1049-10.svg (revision 21967) @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1049-12.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1049-12.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1049-12.svg (revision 21967) @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1052-35.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1052-35.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1052-35.svg (revision 21967) @@ -0,0 +1,40 @@ + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1052-36.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1052-36.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1052-36.svg (revision 21967) @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_1060-11.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_1060-11.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_1060-11.svg (revision 21967) @@ -0,0 +1,81 @@ + + + + + + + + auch + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_108.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_108.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_108.svg (revision 21967) @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_110.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_110.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_110.svg (revision 21967) @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_206.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_206.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_206.svg (revision 21967) @@ -0,0 +1,35 @@ + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_215.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_215.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_215.svg (revision 21967) @@ -0,0 +1,35 @@ + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_220.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_220.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_220.svg (revision 21967) @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_220;DE_267.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_220;DE_267.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_220;DE_267.svg (revision 21967) @@ -0,0 +1,180 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_237.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_237.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_237.svg (revision 21967) @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_238.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_238.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_238.svg (revision 21967) @@ -0,0 +1,80 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_239.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_239.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_239.svg (revision 21967) @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_240.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_240.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_240.svg (revision 21967) @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_241.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_241.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_241.svg (revision 21967) @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_242.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_242.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_242.svg (revision 21967) @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_244.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_244.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_244.svg (revision 21967) @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_245.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_245.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_245.svg (revision 21967) @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_250.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_250.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_250.svg (revision 21967) @@ -0,0 +1,5 @@ + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_251.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_251.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_251.svg (revision 21967) @@ -0,0 +1,13 @@ + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_253.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_253.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_253.svg (revision 21967) @@ -0,0 +1,12 @@ + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_254.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_254.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_254.svg (revision 21967) @@ -0,0 +1,13 @@ + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_255.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_255.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_255.svg (revision 21967) @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_256.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_256.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_256.svg (revision 21967) @@ -0,0 +1,88 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_258.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_258.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_258.svg (revision 21967) @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_259.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_259.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_259.svg (revision 21967) @@ -0,0 +1,12 @@ + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_260.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_260.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_260.svg (revision 21967) @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_261.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_261.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_261.svg (revision 21967) @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_262.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_262.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_262.svg (revision 21967) @@ -0,0 +1,43 @@ + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_263.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_263.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_263.svg (revision 21967) @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_264.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_264.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_264.svg (revision 21967) @@ -0,0 +1,43 @@ + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_265.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_265.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_265.svg (revision 21967) @@ -0,0 +1,102 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_266.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_266.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_266.svg (revision 21967) @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_267.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_267.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_267.svg (revision 21967) @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + image/svg+xml + + + + MarianSigler; mariansigler@gmail.com + + + + Zeichen 267 + Sign no 267 of German Straßenverkehrsordnung + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_268.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_268.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_268.svg (revision 21967) @@ -0,0 +1,341 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_269.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_269.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_269.svg (revision 21967) @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_270.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_270.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_270.svg (revision 21967) @@ -0,0 +1,31 @@ + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_270_1.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_270_1.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_270_1.svg (revision 21967) @@ -0,0 +1,40 @@ + + + + +]> + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_273.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_273.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_273.svg (revision 21967) @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_274.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_274.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_274.svg (revision 21967) @@ -0,0 +1,35 @@ + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_274_1.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_274_1.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_274_1.svg (revision 21967) @@ -0,0 +1,100 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_275.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_275.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_275.svg (revision 21967) @@ -0,0 +1,33 @@ + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_276.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_276.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_276.svg (revision 21967) @@ -0,0 +1,35 @@ + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_277.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_277.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_277.svg (revision 21967) @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_282.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_282.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_282.svg (revision 21967) @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_283.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_283.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_283.svg (revision 21967) @@ -0,0 +1,56 @@ + + + + + + image/svg+xml + + + + + + image/svg+xml + + + + MarianSigler, mariansigler@gmail.com + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_286.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_286.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_286.svg (revision 21967) @@ -0,0 +1,54 @@ + + + + + + image/svg+xml + + + + + + image/svg+xml + + + + MarianSigler, mariansigler@gmail.com + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_290.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_290.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_290.svg (revision 21967) @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_325.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_325.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_325.svg (revision 21967) @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_327.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_327.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_327.svg (revision 21967) @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/DE_380.svg =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/DE_380.svg (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/DE_380.svg (revision 21967) @@ -0,0 +1,24 @@ + + + + + + + + Index: applications/editors/josm/plugins/roadsigns/images_src/convert.pl =================================================================== --- applications/editors/josm/plugins/roadsigns/images_src/convert.pl (revision 21967) +++ applications/editors/josm/plugins/roadsigns/images_src/convert.pl (revision 21967) @@ -0,0 +1,26 @@ +#!/usr/bin/perl +use strict; +use warnings; + +use Getopt::Std; + +my %val; +getopts('h:', \%val); + +# helper script to convert svg file to png and move them to the right place +# +# usage: +# cd plugins/roadsigns/images_src/ +# ./convert.pl -h 36 foo.svg + +my $h = $val{"h"}; +if (!$h) { + $h = "40"; +} + +foreach my $i (0..$#ARGV) { + my $f = $ARGV[$i]; + my $f2 = $f; + $f2 =~ s/\.svg$/.png/; + system("inkscape", "-f", $f, "-e", "../images/$f2", "-h", "$h"); +} Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/ParametrizedString.java =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/ParametrizedString.java (revision 21967) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/ParametrizedString.java (revision 21967) @@ -0,0 +1,145 @@ +//License: GPL (v2 or later) +package org.openstreetmap.josm.plugins.roadsigns; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.openstreetmap.josm.plugins.roadsigns.javacc.ParamStringScanner; +import org.openstreetmap.josm.plugins.roadsigns.javacc.ParseException; +import org.openstreetmap.josm.plugins.roadsigns.javacc.TokenMgrError; + +/** + * A parametrized string is a string that contains identifiers that can + * be substituted when the values of the parameters are known. + * The syntax is in perl style, e.g. + * "Up to $val% in ${num}th row costs 12 \$.". + * + * This class represent a parsed string (parameters are identified). + * It can be constructed from a String. Given a parameter environment, + * the String value can be determined. + * + */ +public class ParametrizedString { + final List token = new ArrayList(); + + /** + * Describes the union of String and Parameter type. Both + * types have a single String object as their backing data. + */ + public static interface StringOrParameter { + } + + public static class Prm implements StringOrParameter { + public final String ident; + public Prm(String ident) { + this.ident = ident; + } + + @Override + public String toString() { + return ""; + } + } + + public static class Str implements StringOrParameter { + String value; + public Str(String stringValue) { + this.value = stringValue; + } + + @Override + public String toString() { + return ""; + } + } + + protected ParametrizedString(String input) throws ParseException, TokenMgrError { + scan(input); + } + + /** + * Constructor that returns a null value for null value input. + * Once it is created, the list of token is immutable. + */ + public static ParametrizedString create(String input) throws ParseException, TokenMgrError { + if (input == null) + return null; + return new ParametrizedString(input); + } + + /** + * The tokenizer. Creates the list of tokens + * from the input string. + */ + protected void scan(String input) throws ParseException, TokenMgrError { + List tmp = null; + tmp = ParamStringScanner.parseIt(input); + StringBuffer curString = new StringBuffer(); + for (StringOrParameter sp : tmp) { + if (sp instanceof Prm) { + if (curString.length() > 0) { + token.add(new Str(curString.toString())); + curString = new StringBuffer(); + } + token.add(sp); + } else if (sp instanceof Str) { + curString.append(((Str) sp).value); + } + } + if (curString.length() > 0) { + token.add(new Str(curString.toString())); + } + } + + /** + * Evaluates the string value, given an environment of + * parameter mappings. + */ + public String evaluate(Map env) { + StringBuilder sb = new StringBuilder(); + for (StringOrParameter t : token) { + if (t instanceof Str) { + sb.append(((Str) t).value); + } else if (t instanceof Prm) { + String val = env.get(((Prm) t).ident); + if (val == null) { + System.err.println("Warning: Parameter not in environment: "+((Prm) t).ident+" ("+this.toString()+")"); + Thread.dumpStack(); + val = ""; + } + sb.append(val); + } else + throw new AssertionError(); + } + return sb.toString(); + } + + /** + * Converts to a string that could be parsed again to an equal object. + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + for (StringOrParameter t : token) { + if (t instanceof Str) { + sb.append(((Str) t).value); + } else if (t instanceof Prm) { + sb.append("${"+((Prm) t).ident+"}"); + } else + throw new AssertionError(); + } + return sb.toString(); + } + + /** + * Creates a debug string for this object + */ + public String toDebugString() { + StringBuilder res = new StringBuilder(); + for (StringOrParameter sop : token) { + res.append(sop); + } + return res.toString(); + } +} Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java (revision 21967) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java (revision 21967) @@ -0,0 +1,706 @@ +// License: GPL (v2 or later) +package org.openstreetmap.josm.plugins.roadsigns; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.Rectangle; +import java.awt.event.ActionEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +import javax.swing.BorderFactory; +import javax.swing.JComponent; +import javax.swing.JEditorPane; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.Scrollable; +import javax.swing.SwingConstants; +import javax.swing.border.Border; +import javax.swing.border.EtchedBorder; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; +import javax.swing.table.AbstractTableModel; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.ChangePropertyCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.ExtendedDialog; +import org.openstreetmap.josm.gui.MultiSplitLayout; +import org.openstreetmap.josm.gui.MultiSplitPane; +import org.openstreetmap.josm.plugins.roadsigns.Sign.SignParameter; +import org.openstreetmap.josm.plugins.roadsigns.Sign.Tag; +import org.openstreetmap.josm.tools.Pair; + +/** + * Input dialog for road sign. + * + * Allows selection of a combination of road signs. + * It tries to generate the corresponding tags for the object. + * + * As tagging schemes are under constant development, the definitions + * need to be updated when needed. + * + * Often there is more than one way to tag a certain situation. + * So easy configuration is needed (TODO). + * + */ +class RoadSignInputDialog extends ExtendedDialog { + private final SignSelection sel; + private final List signs; + private JTable previewTable; + + private PreviewTableModel previewModel; + private JPanel pnlSignSelection; + private JPanel pnlPossibleSigns; + private JPanel pnlPossibleSupplements; + private JEditorPane info; + + public RoadSignInputDialog(List signs) { + super(Main.parent, tr("Road Sign Plugin"), new String[] {tr("OK"), tr("Cancel")}, false /* modal */); + this.signs = signs; + sel = new SignSelection(); + setButtonIcons(new String[] { "ok.png", "cancel.png" }); + setContent(buildPanel(), false); + } + + @Override + protected void buttonAction(int i, ActionEvent evt) { + if (i == 0) { // OK Button + Collection selPrim = Main.main.getCurrentDataSet().getSelected(); + if (selPrim.size() != 0) { + Command cmd = createCommand(selPrim); + if (cmd != null) { + Main.main.undoRedo.add(cmd); + } + } + } + super.buttonAction(i, evt); + } + + private Command createCommand(Collection selPrim) { + List cmds = new LinkedList(); + for (int i=0; i combos=new LinkedList(); + + public void remove(SignCombination sc) { + int i = findIndex(sc); + combos.remove(i); + previewModel.update(); + updatePanel(pnlSignSelection); + } + + public void remove(SignWrapper sw) { + Pair tmp = findIndex(sw); + int i = tmp.a; + int j = tmp.b; + if (j == 0) { + combos.remove(i); + previewModel.update(); + updateSelectableSignsEnabledState(); + updatePanel(pnlSignSelection); + } else { + combos.get(i).remove(j); + previewModel.update(); + updateSelectableSignsEnabledState(); + updatePanel(pnlSignSelection); + } + } + + public void add(Sign sAdd) { + if (!sAdd.isSupplementing || combos.isEmpty()) { + SignCombination combo = new SignCombination(); + combos.add(combo); + combo.add(sAdd); + + previewModel.update(); + updateSelectableSignsEnabledState(); + updatePanel(pnlSignSelection); + } else { + SignCombination last = combos.getLast(); + last.add(sAdd); + + previewModel.update(); + updatePanel(pnlSignSelection); + } + } + + private int findIndex(SignCombination scFind) { + int i=0; + for (SignCombination sc : combos) { + if (sc == scFind) { + return i; + } + i++; + } + throw new AssertionError("Could not find sign combination."); + } + + private Pair findIndex(SignWrapper swFind) { + int selIdx=0; + int combIdx=0; + for (SignCombination sc : combos) { + combIdx=0; + for (SignWrapper sw : sc.signs) { + if (swFind == sw) { + return new Pair(selIdx, combIdx); + } + combIdx++; + } + selIdx++; + } + throw new AssertionError("Could not find sign"); + } + + public void updatePanel(JPanel panel) { + panel.removeAll(); + panel.setLayout(new GridBagLayout()); + GridBagConstraints gbc = new GridBagConstraints(); + gbc.anchor=GridBagConstraints.NORTHWEST; + gbc.gridx=0; + gbc.gridy=0; + gbc.weightx=0; + gbc.weighty=1.0; + gbc.insets = new Insets(10, 10, 0, 10); + + for (SignCombination sc : combos) { + JPanel pnlCombo = new JPanel(new GridBagLayout()); + sc.updatePanel(pnlCombo); + panel.add(pnlCombo, gbc); + gbc.gridx++; + gbc.insets = new Insets(10, 0, 0, 10); + } + gbc.weightx = 1.0; + panel.add(new JLabel(""), gbc); /* filler */ + panel.revalidate(); + panel.repaint(); + } + } + + /** + * Describes a list of selected signs where the + * first sign is a normal or supplementary sign and the + * rest are all supplementary signs. + * + * It can fill a Panel with the necessary gui elements. + */ + public class SignCombination { + public LinkedList signs; + + public SignCombination() { + signs = new LinkedList(); + } + + public void updatePanel(JPanel panel) { + panel.removeAll(); + panel.setLayout(new GridBagLayout()); + + Border etched = BorderFactory.createEtchedBorder(EtchedBorder.RAISED); + Border empty = BorderFactory.createEmptyBorder(3, 3, 3, 3); + panel.setBorder(BorderFactory.createCompoundBorder(etched, empty)); + + int i=0; + for (SignWrapper sw : signs) { + GridBagConstraints gbc = new GridBagConstraints(); + gbc.gridx = 0; + gbc.gridy = i; + gbc.anchor = GridBagConstraints.NORTH; + panel.add(sw.getSignIcon(), gbc); + + gbc.gridx = 1; + gbc.anchor = GridBagConstraints.WEST; + panel.add(sw.getParamsPanel(), gbc); + + i++; + } + } + + public void remove(int index) { + signs.remove(index); + } + + public void add(final Sign sign) { + if (!signs.isEmpty() && !sign.isSupplementing) + throw new IllegalArgumentException("any sign but the first must be a supplement sign");//FIXME + final SignWrapper signWrp = new SignWrapper(sign); + signs.add(signWrp); + } + } + + /** + * Describes a single selected sign, including the parameters entered by + * the user. + * + * It provides the necessary gui elements. + */ + public class SignWrapper { + Sign sign; + JLabel signIcon; + String signRef; + JPanel paramsPanel; + Map paramValues = new HashMap(); + public SignWrapper(Sign sign) { + this.sign = sign; + for (final SignParameter p : this.sign.params) { + paramValues.put(p.ident, p.getDefault()); + } + } + @Override + public String toString() { + return sign.toString(); + } + + public JLabel getSignIcon() { + if (signIcon != null) + return signIcon; + signIcon = new JLabel(sign.getIcon()); + signIcon.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + sel.remove(SignWrapper.this); + } + }); + return signIcon; + } + + public JPanel getParamsPanel() { + if (paramsPanel != null) + return paramsPanel; + paramsPanel = new JPanel(new GridBagLayout()); + int i=0; + for (final SignParameter p : this.sign.params) { + JPanel pnlInput = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); + switch (p.input) { + case COMBO: // TODO +// create_gui_elements(); +// break; + case TEXTFIELD: + final JTextField tf; + if (p.fieldWidth != null) { + tf = new JTextField(p.getDefault(), p.fieldWidth); + } else { + tf = new JTextField(p.getDefault()); + } + class TFDocumentListener implements DocumentListener { + public void insertUpdate(DocumentEvent e) { + update(); + } + + public void removeUpdate(DocumentEvent e) { + update(); + } + + public void changedUpdate(DocumentEvent e) { + update(); + } + public void update() { + paramValues.put(p.ident, tf.getText()); + previewModel.update(); + } + }; + TFDocumentListener listener = new TFDocumentListener(); + tf.getDocument().addDocumentListener(listener); + JLabel lblPrefix = new JLabel(p.getPrefix()); + JLabel lblSuffix = new JLabel(p.getSuffix()); + pnlInput.add(lblPrefix); + pnlInput.add(tf); + pnlInput.add(lblSuffix); + break; + default: + throw new RuntimeException(); + } + GridBagConstraints gbc = new GridBagConstraints(); + gbc.gridy = i; + gbc.anchor = GridBagConstraints.WEST; + paramsPanel.add(pnlInput,gbc); + i++; + } + if (i>0) { + paramsPanel.setBorder(BorderFactory.createEmptyBorder(0, 3, 0, 0)); + } + return paramsPanel; + } + } + + /** + * Give the user a hint, which supplementary signs fit the current selection. + * Disabled signs can still be clicked. + */ + private void updateSelectableSignsEnabledState() { + if (sel.combos.isEmpty()) { + for (Sign s : signs) { + if (s.isSupplementing) { + // TODO: only those that have no free parameter + s.label.setEnabled(true); + } + } + } else { + Sign main = sel.combos.getLast().signs.getFirst().sign; + for (Sign s : signs) { + if (s.isSupplementing) { + s.label.setEnabled(main.supplements.contains(s)); + } + } + } + } + + public JComponent buildPreviewPanel() { + String[] columnNames = {tr("Key"), tr("Value")}; + String[][] data = {{}}; + previewTable = new JTable(data, columnNames); + previewTable.setFillsViewportHeight(true); + previewTable.setRowSelectionAllowed(false); + previewTable.setColumnSelectionAllowed(false); + + previewModel = new PreviewTableModel(); + previewTable.setModel(previewModel); + + JScrollPane scroll = new JScrollPane(previewTable); + Dimension dim = new Dimension(236, 10); + scroll.setPreferredSize(dim); + scroll.setMinimumSize(dim); /* minimum size is relevant for multisplit layout */ + return scroll; + } + + public class PreviewTableModel extends AbstractTableModel { + private List keys = new ArrayList(); + private List values = new ArrayList(); + + int rows=3; + String[] header = {tr("Key"), tr("Value")}; + + public int getRowCount() { + return keys.size(); + } + + public int getColumnCount() { + return 2; + } + + public Object getValueAt(int rowIndex, int columnIndex) { + if (columnIndex == 0) { + return keys.get(rowIndex); + } else if (columnIndex == 1) { + return values.get(rowIndex); + } else + throw new IllegalArgumentException(); + } + + @Override + public String getColumnName(int col) { + return header[col]; + } + + /** + * Analyse the selection and derive corresponding tags. + */ + public void update() { + final TreeMap map= new TreeMap(); + for (SignCombination sc : sel.combos) { + final Map env = new HashMap(); + + /** + * Keep track of a named tag. It may be changed by + * adding values or conditions. + */ + class TagEvaluater { + String key; + String default_value; + List values = new ArrayList(); + List conditions = new ArrayList(); + String ident; + public TagEvaluater(Tag t) { + key = t.key.evaluate(env); + default_value = t.value.evaluate(env); + ident = t.ident; + } + + public void append_value(String v) { + values.add(v); + } + + public void condition(String c) { + conditions.add(c); + } + + public Map evaluate() { + String value = ""; + if (values.isEmpty()) { + value = default_value; + } else { + String sep = ""; + for (String v : values) { + value += sep+v; + sep=";"; + } + } + + if (conditions.isEmpty()) + return Collections.singletonMap(key, value); + else { + Map result = new HashMap(); + for (String c : conditions) { + result.put(key+":"+c, value); + } + return result; + } + } + } + + Map tags = new LinkedHashMap(); + for (SignWrapper sw : sc.signs) { + for (Map.Entry entry : sw.paramValues.entrySet()) { + env.put(entry.getKey(), entry.getValue()); + } + if (sw.sign.ref != null) { + sw.signRef = sw.sign.ref.evaluate(env); + } + for (Tag t : sw.sign.tags) { + if (t.tag_ref != null) { + if (t.ident != null) { + env.put(t.ident+"_key", t.key.evaluate(env)); + env.put(t.ident+"_value", t.value.evaluate(env)); + } + if (t.append_value != null) { + TagEvaluater te = tags.get(t.tag_ref); + if (te == null) { + System.err.println(String.format("warning: referenced tag with ident '%s' not found for appending tag %s.",t.tag_ref, t.toString())); + } else { + te.append_value(t.append_value.evaluate(env)); + } + } else if (t.condition != null) { + TagEvaluater te = tags.get(t.tag_ref); + if (te == null) { + System.err.println(String.format("warning: referenced tag with ident '%s' not found for condition tag %s.",t.tag_ref, t.toString())); + } else { + te.condition(t.condition.evaluate(env)); + } + } else { + System.err.println(String.format("warning: found tag_ref but neither append_value nor condition for tag %s.", t.toString())); + } + } else if (t.ident != null) { + env.put(t.ident+"_key", t.key.evaluate(env)); + env.put(t.ident+"_value", t.value.evaluate(env)); + + if (tags.get(t.ident) != null) { + System.err.println(String.format("warning: tag identifier %s for %s already in use. ", t.ident, t.toString())); + } + tags.put(t.ident, new TagEvaluater(t)); + } else { + map.put(t.key.evaluate(env), t.value.evaluate(env)); + } + + } + } + for (TagEvaluater te : tags.values()) { + Map result = te.evaluate(); + map.putAll(result); + } + } + + keys.clear(); + values.clear(); + for (Map.Entry entry : map.entrySet()) { + if (!entry.getKey().isEmpty() && !entry.getValue().isEmpty()) { + keys.add(entry.getKey()); + values.add(entry.getValue()); + } + } + fireTableDataChanged(); + } + + + } + + /** + * Mouse events for the possible signs. + * Click selects it. + * MouseOver shows info. + */ + private class SignClickListener extends MouseAdapter { + private Sign sign; + public SignClickListener(Sign sign) { + this.sign = sign; + } + @Override + public void mouseClicked(MouseEvent e) { + sel.add(sign); + } + + @Override + public void mouseEntered(MouseEvent e) { + StringBuilder txt = new StringBuilder(); + txt.append("

"); + txt.append(sign.name); + txt.append(""); + String ref = sign.getDefaultRef(); + if (ref != null) { + txt.append(" ("+ref+")"); + } + txt.append("

"); +// if (sign.long_name != null) { +// txt.append("("+sign.long_name+")"); +// } + info.setText(txt.toString()); + } + + @Override + public void mouseExited(MouseEvent e) { + info.setText(""); + } + } + + /** + * Panel with FlowLayout that can be put inside a JScrollPane. + * (Normally it would not flow, but put all its children + * in a single row. This implementation respects the width of the parent + * component.) + */ + public static class FixedWidthPanel extends JPanel implements Scrollable { + public FixedWidthPanel() { + super(new FlowLayout(FlowLayout.LEFT)); + } + + @Override + public void setBounds(int x, int y, int width, int height) { + super.setBounds(x, y, getParent().getWidth(), height); + } + + @Override + public Dimension getPreferredSize() { + return new Dimension(getWidth(), getPreferredHeight()); + } + + public Dimension getPreferredScrollableViewportSize() { + return super.getPreferredSize(); + } + + public int getScrollableUnitIncrement( Rectangle visibleRect, int orientation, int direction ) { + final int FRAC = 20; + int inc = (orientation == SwingConstants.VERTICAL ? getParent().getHeight() : getParent().getWidth()) / FRAC; + return Math.max(inc, 1); + } + + public int getScrollableBlockIncrement( Rectangle visibleRect, int orientation, int direction ) { + return orientation == SwingConstants.VERTICAL ? getParent().getHeight() : getParent().getWidth(); + } + + public boolean getScrollableTracksViewportWidth() { + return true; + } + + public boolean getScrollableTracksViewportHeight() { + return false; + } + + private int getPreferredHeight() { + int prefH = 0; + int num = getComponentCount(); + for (int i = 0; i < num; ++i) { + Rectangle rect = getComponent(i).getBounds(); + int h = rect.y + rect.height; + if (h > prefH) { + prefH = h; + } + } + prefH += ((FlowLayout) getLayout()).getVgap(); + return prefH; + } + } +} Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java (revision 21967) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java (revision 21967) @@ -0,0 +1,114 @@ +// License: GPL (v2 or later) +package org.openstreetmap.josm.plugins.roadsigns; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JOptionPane; + +import org.xml.sax.SAXException; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.gui.dialogs.properties.PropertiesDialog; +import org.openstreetmap.josm.io.MirroredInputStream; +import org.openstreetmap.josm.plugins.Plugin; +import org.openstreetmap.josm.plugins.PluginInformation; +import org.openstreetmap.josm.tools.Shortcut; + +public class RoadSignsPlugin extends Plugin { + + private static boolean presetsLoaded = false; + public static List signs; + + public RoadSignsPlugin(PluginInformation info) { + super(info); + registerAction(); + } + + private void registerAction() { + JButton btn = new JButton(new RoadSignAction()); + btn.setText(null); + btn.setBorder(BorderFactory.createEmptyBorder()); + btn.setPreferredSize(new Dimension(18,18)); + PropertiesDialog.pluginHook.add(btn); + PropertiesDialog.pluginHook.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0)); + } + + private static class RoadSignAction extends JosmAction { + public RoadSignAction() { + super(tr("Roadsign tagging"), "pref/roadsigns-small", tr("Add tags by clicking on road signs"), + Shortcut.registerShortcut("plugin:roadsigns:dialog", tr("Roadsigns plugin: open dialog"), KeyEvent.VK_R, Shortcut.GROUP_LAYER), false); + } + + public void actionPerformed(ActionEvent e) { + loadSignPresets(); + RoadSignInputDialog input = new RoadSignInputDialog(signs); + input.showDialog(); + } + + } + + protected static void loadSignPresets() { + if (presetsLoaded) + return; + presetsLoaded=true; + List files = new ArrayList( + Main.pref.getCollection("plugin.roadsign.sources", + Collections.singletonList("resource://data/defaultroadsignpreset.xml"))); + for (String source : files) { + try { + InputStream in = getInputStream(source); + RoadSignsReader reader = new RoadSignsReader(in); + signs = reader.parse(); + + } catch (IOException ex) { + ex.printStackTrace(); + JOptionPane.showMessageDialog( + Main.parent, + tr("Could not read tagging preset source: ''{0}''",source), + tr("Error"), + JOptionPane.ERROR_MESSAGE + ); + } catch (SAXException ex) { + ex.printStackTrace(); + JOptionPane.showMessageDialog( + Main.parent, + tr("Error parsing tagging preset from ''{0}'':\n", source)+ex.getMessage(), + tr("Error"), + JOptionPane.ERROR_MESSAGE + ); + } + } + } + + /** + * Returns an inputstream from urls, files and classloaders, depending on the name. + */ + public static InputStream getInputStream(String source) throws IOException { + InputStream in = null; + if (source.startsWith("http://") || source.startsWith("ftp://")) { + in = new MirroredInputStream(source); + } else if (source.startsWith("file:")) { + in = new URL(source).openStream(); + } else if (source.startsWith("resource://")) { + in = RoadSignsPlugin.class.getResourceAsStream(source.substring("resource:/".length())); + } else { + in = new FileInputStream(source); + } + return in; + } +} Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java (revision 21967) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java (revision 21967) @@ -0,0 +1,314 @@ +// License: GPL (v2 or later) +package org.openstreetmap.josm.plugins.roadsigns; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParserFactory; + +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; +import org.xml.sax.helpers.DefaultHandler; + +import org.openstreetmap.josm.io.OsmDataParsingException; +import org.openstreetmap.josm.plugins.roadsigns.Sign.SignParameter; +import org.openstreetmap.josm.plugins.roadsigns.Sign.Tag; +import org.openstreetmap.josm.tools.LanguageInfo; + +import org.openstreetmap.josm.plugins.roadsigns.javacc.ParseException; +import org.openstreetmap.josm.plugins.roadsigns.javacc.TokenMgrError; + +/** + * Parses a road sign preset file. + * + */ +public class RoadSignsReader { + public static final String lang = LanguageInfo.getLanguageCodeXML(); + + private InputSource inputSource; + private final boolean debug = false; + /* counts the nesting level when we step into unknown elements */ + private int unknownLevel; + + public RoadSignsReader(InputStream source) throws IOException { + this.inputSource = new InputSource(new InputStreamReader(source, "UTF-8")); + } + + private class SignParser extends DefaultHandler { + public List allSigns; + public Map> supplementIds; + + String characters = ""; + List folders = new ArrayList(); + Sign curSign; + Tag curTag; + + private Locator locator; + + @Override + public void setDocumentLocator(Locator locator) { + this.locator = locator; + } + + + @Override public void startElement(String ns, String lname, String qname, Attributes atts) throws SAXException { + if (debug) System.err.println("<"+qname+">: "); + + if (unknownLevel > 0) { + unknownLevel++; + } else if (qname.equals("roadsignpreset")) { + + } else if (qname.equals("sign")) { + if (curSign != null) + throwException("found sign inside sign"); + curSign = new Sign(); + supplementIds.put(curSign, new ArrayList()); + try { + curSign.ref = ParametrizedString.create(atts.getValue("ref")); + } catch (ParseException ex) { + throw new SAXException(ex); + } catch (TokenMgrError ex) { + throwException(ex.toString()); + } + curSign.id = atts.getValue("id"); + + if (curSign.id == null) { + if (curSign.ref == null) + throwException("Both id and ref attribute missing."); + curSign.id = curSign.ref.toString(); + } + + curSign.name = getLocalized(atts, "name"); + if (curSign.name == null) + throwException("missing attribute: name"); + + curSign.long_name = getLocalized(atts, "long_name"); + + String iconURL = atts.getValue("icon"); + if (iconURL == null) { + iconURL = curSign.id; + iconURL = iconURL.replace(':', '_'); + iconURL = iconURL.replace('.', '_'); + } + curSign.iconURL = iconURL; + + if ("yes".equals(atts.getValue("supplementary"))) { + curSign.isSupplementing = true; + } + + } else if (curSign != null && qname.equals("tag")) { + if (curSign == null) { + throwException("found tag outside sign"); + } + if (curTag != null) { + throwException("found tag inside tag"); + } + curTag = new Tag(); + curTag.ident = atts.getValue("ident"); + curTag.tag_ref = atts.getValue("tag_ref"); + try { + curTag.key = ParametrizedString.create(atts.getValue("key")); + curTag.value = ParametrizedString.create(atts.getValue("value")); + curTag.append_value = ParametrizedString.create(atts.getValue("append_value")); + curTag.condition = ParametrizedString.create(atts.getValue("condition")); + } catch (ParseException ex) { + throw new SAXException(ex); + } catch (TokenMgrError ex) { + throw new SAXException(ex.toString()); + } + + } else if (curSign != null && qname.equals("supplementary")) { + supplementIds.get(curSign).add(getMandatoryAttribute(atts, "id")); + + } else if (curSign != null && qname.equals("parameter")) { + String inputType = getMandatoryAttribute(atts, "input"); + SignParameter p = new SignParameter(inputType); + p.ident = getMandatoryAttribute(atts, "ident"); + p.deflt = getMandatoryAttribute(atts, "default"); + p.prefix = atts.getValue("prefix"); + p.suffix = atts.getValue("suffix"); + String width = atts.getValue("field_width"); + if (width != null) { + p.fieldWidth = Integer.parseInt(width); + } + curSign.params.add(p); + } else { + warning("unknown element: "+qname); + unknownLevel++; + } + + if (debug) { + for (int i=0; i |"); + if (unknownLevel > 0) { + unknownLevel--; + } else if (qname.equals("sign")) { + allSigns.add(curSign); + curSign = null; + + } else if (qname.equals("tag")) { + curSign.tags.add(curTag); + curTag = null; + } + + characters = characters.trim(); + if (!characters.equals("")) { + if (debug) System.err.print(characters); + characters = ""; + } + if (debug) System.err.println("|"); + } + @Override public void characters(char[] ch, int start, int length) { + String s = new String(ch, start, length); + characters += s; + } + + private String getLocalized(Attributes atts, String ident) { + String result = atts.getValue(lang+ident); + if (result == null) { + result = atts.getValue(ident); + if (result == null) + return null; + result = tr(result); + } + return result; + } + + private String getMandatoryAttribute(Attributes atts, String ident) throws OsmDataParsingException { + String result = atts.getValue(ident); + if (result == null) { + throwException("missing attribute: "+ident); + } + return result; + } + + @Override + public void error(SAXParseException e) throws SAXException { + throwException(e); + } + + @Override + public void fatalError(SAXParseException e) throws SAXException { + throwException(e); + } + + protected void throwException(Exception e) throws ExtendedParsingException { + throw new ExtendedParsingException(e).rememberLocation(locator); + } + protected void throwException(String msg) throws OsmDataParsingException { + throw new OsmDataParsingException(msg).rememberLocation(locator); + } + + private void warning(String s) { + try { + throwException(s); + } catch (OsmDataParsingException ex) { + System.err.println("Warning: "+ex.getMessage()); + } + } + public void wireSupplements() throws OsmDataParsingException { + Map map = new HashMap(); + for (Sign sign : allSigns) { + if (map.get(sign.id) != null) + throwException("Found 2 signs with same ref "+sign.ref); + map.put(sign.id, sign); + } + for (Sign sign : allSigns) { + for (String id : supplementIds.get(sign)) { + Sign supp = map.get(id); + if (supp == null) + throwException("Missing supplement definition "+id+" for sign "+sign.id+"."); + sign.supplements.add(supp); + } + } + } + } + + + public static class ExtendedParsingException extends SAXException { + private int columnNumber; + private int lineNumber; + + public ExtendedParsingException() { + super(); + } + + public ExtendedParsingException(Exception e) { + super(e); + } + + public ExtendedParsingException(String message, Exception e) { + super(message, e); + } + + public ExtendedParsingException(String message) { + super(message); + } + + public ExtendedParsingException rememberLocation(Locator locator) { + if (locator == null) return this; + this.columnNumber = locator.getColumnNumber(); + this.lineNumber = locator.getLineNumber(); + return this; + } + + @Override + public String getMessage() { + String msg = super.getMessage(); + if (lineNumber == 0 && columnNumber == 0) + return msg; + System.err.println("."); + if (msg == null) { + msg = getClass().getName(); + } + msg = msg + " " + tr("(at line {0}, column {1})", lineNumber, columnNumber); + return msg; + } + + public int getColumnNumber() { + return columnNumber; + } + + public int getLineNumber() { + return lineNumber; + } + } + + /** + * + * @return True if file was properly parsed, false if there was error during parsing but some data were parsed anyway + * @throws SAXException + * @throws IOException + */ + public List parse() throws SAXException, IOException { + SignParser parser = new SignParser(); + parser.allSigns = new ArrayList(); + parser.supplementIds = new HashMap>(); + try { + SAXParserFactory factory = SAXParserFactory.newInstance(); + factory.setNamespaceAware(true); + factory.newSAXParser().parse(inputSource, parser); + parser.wireSupplements(); + return parser.allSigns; + } catch (ParserConfigurationException e) { + e.printStackTrace(); // broken SAXException chaining + throw new SAXException(e); + } + } +} Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java (revision 21967) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java (revision 21967) @@ -0,0 +1,123 @@ +// License: GPL (v2 or later) +package org.openstreetmap.josm.plugins.roadsigns; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.swing.ImageIcon; +import javax.swing.JLabel; + +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * Information about one road sign. + * + */ +public class Sign { + public String id; + public ParametrizedString ref; + public String iconURL; + public ImageIcon icon; + public ImageIcon disabledIcon; + public String name; + public String long_name; + public List tags = new ArrayList(); + public List supplements = new ArrayList(); + public List params = new ArrayList(); + public boolean isSupplementing; + + public JLabel label; // FIXME: don't put gui stuff here + + public static class Tag { + public ParametrizedString key; + public ParametrizedString value; + public String ident; + public String tag_ref; + public ParametrizedString append_value; + public ParametrizedString condition; + @Override + public String toString() { + return ""; + } + } + + public static class SignParameter { + public enum Input {TEXTFIELD, COMBO}; + public String ident; + public Input input; + String deflt; + String prefix; + String suffix; + Integer fieldWidth; + + public SignParameter(String inputType) { + if (inputType.equals("textfield")) { + input = Input.TEXTFIELD; + } else if (inputType.equals("combo")) { + input = Input.COMBO; + } else + throw new IllegalArgumentException("unknown input type: "+inputType); + } + + public String getDefault() { + return deflt == null ? "" : deflt; + } + public String getPrefix() { + return prefix == null ? "" : prefix; + } + public String getSuffix() { + return suffix == null ? "" : suffix; + } + } + + public ImageIcon getIcon() { + if (icon == null) { + icon = ImageProvider.get(iconURL); + } + return icon; + } + + /** + * Creates a generic form of the traffic sign ref. + * It strips osm specific syntax so it can be + * used in documentation and help texts. + * @return null if the format is unknown + */ + public String getDefaultRef() { + if (ref == null) + return null; + String r = ref.toString(); + /* strip parameters */ + r = r.replaceAll("\\[.*\\]", ""); + if (r.startsWith("DE:")) { + r=r.replaceFirst("DE:", ""); + /* normal sign: starts with 3 digits, then a non-digit */ + { + Pattern p = Pattern.compile("^\\d{3}(\\D|$)"); + Matcher m = p.matcher(r); + if (m.find()) + return tr("Sign {0}", r); + } + /* supplementary sign: starts with 4 digits, then a non-digit */ + { + Pattern p = Pattern.compile("^\\d{4}(\\D|$)"); + Matcher m = p.matcher(r); + if (m.find()) + return tr("Additional sign {0}", r); + } + return null; + } + return null; + } + + @Override + public String toString() { + return id+" - "+name; + } + +} Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParamString.jj =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParamString.jj (revision 21967) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParamString.jj (revision 21967) @@ -0,0 +1,113 @@ +//License: GPL (v2 or later) + +/* + + This is a source file for javacc. It generates a parser for strings + with parameters (in perl style). It returns a list of + tokens of type String (Str) or Parameter (Prm). Sub-strings of the + form "$ident" or "${ident}" are identified as a parameter. + '$' or '\' signs have to be quoted. + + There can be multiple consecutive string tokens in the output list. + The client most likely wants the merge these, but it is not done + here to keep the parser as simple as possible. + + Examples: + "up to $x%" --> "up to ", , "%" + "$int_val2 \$ and \\ or" --> , " ", "$", " and ", "\", " or" + "In ${num}th row" --> "In ", , "th row" + +*/ + +options { + STATIC = false; +} + +PARSER_BEGIN(ParamStringScanner) +package org.openstreetmap.josm.plugins.roadsigns.javacc; + +import java.util.ArrayList; +import java.util.List; + +import org.openstreetmap.josm.plugins.roadsigns.ParametrizedString.Prm; +import org.openstreetmap.josm.plugins.roadsigns.ParametrizedString.Str; +import org.openstreetmap.josm.plugins.roadsigns.ParametrizedString.StringOrParameter; + +public class ParamStringScanner { + public static List parseIt(String s) throws ParseException { + ParamStringScanner parser = new ParamStringScanner(new java.io.StringReader(s)); + return parser.parse(); + } +} +PARSER_END(ParamStringScanner) + +TOKEN : +{ + < ID: "$" ( ( ["a"-"z","A"-"Z","_"] ( ["a"-"z","A"-"Z","_","0"-"9"] )* ) | ( "{" ["a"-"z","A"-"Z","_"] ( ["a"-"z","A"-"Z","_","0"-"9"] )* "}" ) ) > +| + < ESC : "\\\\" | "\\$" > +| + < REST: ( ~["\\","$"] )+ > +} + + +List parse() : +{ + String val; + Token t; + List lst = new ArrayList(); +} +{ + ( + val=id() + { + lst.add(new Prm(val)); + } +| + val=esc() + { + lst.add(new Str(val)); + } +| + t= + { + lst.add(new Str(t.image)); + } + )* + { + return lst; + } +} + +String id() : +{ + Token t; + String ret; +} +{ + t= + { + ret = t.image; + ret = ret.substring(1); + if (ret.startsWith("{")) { + ret = ret.substring(1, ret.length()-1); + } + return ret; + } +} + +String esc() : +{ + Token t; +} +{ + t= + { + if (t.image.equals("\\\\")) { + return "\\"; + } else if (t.image.equals("\\$")) { + return "$"; + } else + throw new AssertionError(); + } +} Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParamStringScanner.java =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParamStringScanner.java (revision 21967) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParamStringScanner.java (revision 21967) @@ -0,0 +1,249 @@ +/* Generated By:JavaCC: Do not edit this line. ParamStringScanner.java */ +package org.openstreetmap.josm.plugins.roadsigns.javacc; + +import java.util.ArrayList; +import java.util.List; + +import org.openstreetmap.josm.plugins.roadsigns.ParametrizedString.Prm; +import org.openstreetmap.josm.plugins.roadsigns.ParametrizedString.Str; +import org.openstreetmap.josm.plugins.roadsigns.ParametrizedString.StringOrParameter; + +public class ParamStringScanner implements ParamStringScannerConstants { + public static List parseIt(String s) throws ParseException { + ParamStringScanner parser = new ParamStringScanner(new java.io.StringReader(s)); + return parser.parse(); + } + + final public List parse() throws ParseException { + String val; + Token t; + List lst = new ArrayList(); + label_1: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ID: + case ESC: + case REST: + ; + break; + default: + jj_la1[0] = jj_gen; + break label_1; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ID: + val = id(); + lst.add(new Prm(val)); + break; + case ESC: + val = esc(); + lst.add(new Str(val)); + break; + case REST: + t = jj_consume_token(REST); + lst.add(new Str(t.image)); + break; + default: + jj_la1[1] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + {if (true) return lst;} + throw new Error("Missing return statement in function"); + } + + final public String id() throws ParseException { + Token t; + String ret; + t = jj_consume_token(ID); + ret = t.image; + ret = ret.substring(1); + if (ret.startsWith("{")) { + ret = ret.substring(1, ret.length()-1); + } + {if (true) return ret;} + throw new Error("Missing return statement in function"); + } + + final public String esc() throws ParseException { + Token t; + t = jj_consume_token(ESC); + if (t.image.equals("\\\\")) { + {if (true) return "\\";} + } else if (t.image.equals("\\$")) { + {if (true) return "$";} + } else + {if (true) throw new AssertionError();} + throw new Error("Missing return statement in function"); + } + + /** Generated Token Manager. */ + public ParamStringScannerTokenManager token_source; + SimpleCharStream jj_input_stream; + /** Current token. */ + public Token token; + /** Next token. */ + public Token jj_nt; + private int jj_ntk; + private int jj_gen; + final private int[] jj_la1 = new int[2]; + static private int[] jj_la1_0; + static { + jj_la1_init_0(); + } + private static void jj_la1_init_0() { + jj_la1_0 = new int[] {0xe,0xe,}; + } + + /** Constructor with InputStream. */ + public ParamStringScanner(java.io.InputStream stream) { + this(stream, null); + } + /** Constructor with InputStream and supplied encoding */ + public ParamStringScanner(java.io.InputStream stream, String encoding) { + try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); } + token_source = new ParamStringScannerTokenManager(jj_input_stream); + token = new Token(); + jj_ntk = -1; + jj_gen = 0; + for (int i = 0; i < 2; i++) jj_la1[i] = -1; + } + + /** Reinitialise. */ + public void ReInit(java.io.InputStream stream) { + ReInit(stream, null); + } + /** Reinitialise. */ + public void ReInit(java.io.InputStream stream, String encoding) { + try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); } + token_source.ReInit(jj_input_stream); + token = new Token(); + jj_ntk = -1; + jj_gen = 0; + for (int i = 0; i < 2; i++) jj_la1[i] = -1; + } + + /** Constructor. */ + public ParamStringScanner(java.io.Reader stream) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + token_source = new ParamStringScannerTokenManager(jj_input_stream); + token = new Token(); + jj_ntk = -1; + jj_gen = 0; + for (int i = 0; i < 2; i++) jj_la1[i] = -1; + } + + /** Reinitialise. */ + public void ReInit(java.io.Reader stream) { + jj_input_stream.ReInit(stream, 1, 1); + token_source.ReInit(jj_input_stream); + token = new Token(); + jj_ntk = -1; + jj_gen = 0; + for (int i = 0; i < 2; i++) jj_la1[i] = -1; + } + + /** Constructor with generated Token Manager. */ + public ParamStringScanner(ParamStringScannerTokenManager tm) { + token_source = tm; + token = new Token(); + jj_ntk = -1; + jj_gen = 0; + for (int i = 0; i < 2; i++) jj_la1[i] = -1; + } + + /** Reinitialise. */ + public void ReInit(ParamStringScannerTokenManager tm) { + token_source = tm; + token = new Token(); + jj_ntk = -1; + jj_gen = 0; + for (int i = 0; i < 2; i++) jj_la1[i] = -1; + } + + private Token jj_consume_token(int kind) throws ParseException { + Token oldToken; + if ((oldToken = token).next != null) token = token.next; + else token = token.next = token_source.getNextToken(); + jj_ntk = -1; + if (token.kind == kind) { + jj_gen++; + return token; + } + token = oldToken; + jj_kind = kind; + throw generateParseException(); + } + + +/** Get the next Token. */ + final public Token getNextToken() { + if (token.next != null) token = token.next; + else token = token.next = token_source.getNextToken(); + jj_ntk = -1; + jj_gen++; + return token; + } + +/** Get the specific Token. */ + final public Token getToken(int index) { + Token t = token; + for (int i = 0; i < index; i++) { + if (t.next != null) t = t.next; + else t = t.next = token_source.getNextToken(); + } + return t; + } + + private int jj_ntk() { + if ((jj_nt=token.next) == null) + return (jj_ntk = (token.next=token_source.getNextToken()).kind); + else + return (jj_ntk = jj_nt.kind); + } + + private java.util.List jj_expentries = new java.util.ArrayList(); + private int[] jj_expentry; + private int jj_kind = -1; + + /** Generate ParseException. */ + public ParseException generateParseException() { + jj_expentries.clear(); + boolean[] la1tokens = new boolean[4]; + if (jj_kind >= 0) { + la1tokens[jj_kind] = true; + jj_kind = -1; + } + for (int i = 0; i < 2; i++) { + if (jj_la1[i] == jj_gen) { + for (int j = 0; j < 32; j++) { + if ((jj_la1_0[i] & (1<", + "", + "", + "", + }; + +} Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParamStringScannerTokenManager.java =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParamStringScannerTokenManager.java (revision 21967) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParamStringScannerTokenManager.java (revision 21967) @@ -0,0 +1,333 @@ +/* Generated By:JavaCC: Do not edit this line. ParamStringScannerTokenManager.java */ +package org.openstreetmap.josm.plugins.roadsigns.javacc; +import java.util.ArrayList; +import java.util.List; +import org.openstreetmap.josm.plugins.roadsigns.ParametrizedString.Prm; +import org.openstreetmap.josm.plugins.roadsigns.ParametrizedString.Str; +import org.openstreetmap.josm.plugins.roadsigns.ParametrizedString.StringOrParameter; + +/** Token Manager. */ +public class ParamStringScannerTokenManager implements ParamStringScannerConstants +{ + + /** Debug output. */ + public java.io.PrintStream debugStream = System.out; + /** Set debug output. */ + public void setDebugStream(java.io.PrintStream ds) { debugStream = ds; } +private int jjMoveStringLiteralDfa0_0() +{ + return jjMoveNfa_0(0, 0); +} +static final long[] jjbitVec0 = { + 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL +}; +private int jjMoveNfa_0(int startState, int curPos) +{ + int startsAt = 0; + jjnewStateCnt = 11; + int i = 1; + jjstateSet[0] = startState; + int kind = 0x7fffffff; + for (;;) + { + if (++jjround == 0x7fffffff) + ReInitRounds(); + if (curChar < 64) + { + long l = 1L << curChar; + do + { + switch(jjstateSet[--i]) + { + case 0: + if ((0xffffffefffffffffL & l) != 0L) + { + if (kind > 3) + kind = 3; + jjCheckNAdd(7); + } + else if (curChar == 36) + jjAddStates(0, 1); + break; + case 2: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 1) + kind = 1; + jjstateSet[jjnewStateCnt++] = 2; + break; + case 5: + if ((0x3ff000000000000L & l) != 0L) + jjAddStates(2, 3); + break; + case 7: + if ((0xffffffefffffffffL & l) == 0L) + break; + if (kind > 3) + kind = 3; + jjCheckNAdd(7); + break; + case 10: + if (curChar == 36 && kind > 2) + kind = 2; + break; + default : break; + } + } while(i != startsAt); + } + else if (curChar < 128) + { + long l = 1L << (curChar & 077); + do + { + switch(jjstateSet[--i]) + { + case 0: + if ((0xffffffffefffffffL & l) != 0L) + { + if (kind > 3) + kind = 3; + jjCheckNAdd(7); + } + else if (curChar == 92) + jjAddStates(4, 5); + break; + case 1: + case 2: + if ((0x7fffffe87fffffeL & l) == 0L) + break; + if (kind > 1) + kind = 1; + jjCheckNAdd(2); + break; + case 3: + if (curChar == 123) + jjstateSet[jjnewStateCnt++] = 4; + break; + case 4: + case 5: + if ((0x7fffffe87fffffeL & l) != 0L) + jjCheckNAddTwoStates(5, 6); + break; + case 6: + if (curChar == 125 && kind > 1) + kind = 1; + break; + case 7: + if ((0xffffffffefffffffL & l) == 0L) + break; + if (kind > 3) + kind = 3; + jjCheckNAdd(7); + break; + case 8: + if (curChar == 92) + jjAddStates(4, 5); + break; + case 9: + if (curChar == 92 && kind > 2) + kind = 2; + break; + default : break; + } + } while(i != startsAt); + } + else + { + int i2 = (curChar & 0xff) >> 6; + long l2 = 1L << (curChar & 077); + do + { + switch(jjstateSet[--i]) + { + case 0: + case 7: + if ((jjbitVec0[i2] & l2) == 0L) + break; + if (kind > 3) + kind = 3; + jjCheckNAdd(7); + break; + default : break; + } + } while(i != startsAt); + } + if (kind != 0x7fffffff) + { + jjmatchedKind = kind; + jjmatchedPos = curPos; + kind = 0x7fffffff; + } + ++curPos; + if ((i = jjnewStateCnt) == (startsAt = 11 - (jjnewStateCnt = startsAt))) + return curPos; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { return curPos; } + } +} +static final int[] jjnextStates = { + 1, 3, 5, 6, 9, 10, +}; + +/** Token literal values. */ +public static final String[] jjstrLiteralImages = { +"", null, null, null, }; + +/** Lexer state names. */ +public static final String[] lexStateNames = { + "DEFAULT", +}; +protected SimpleCharStream input_stream; +private final int[] jjrounds = new int[11]; +private final int[] jjstateSet = new int[22]; +protected char curChar; +/** Constructor. */ +public ParamStringScannerTokenManager(SimpleCharStream stream){ + if (SimpleCharStream.staticFlag) + throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer."); + input_stream = stream; +} + +/** Constructor. */ +public ParamStringScannerTokenManager(SimpleCharStream stream, int lexState){ + this(stream); + SwitchTo(lexState); +} + +/** Reinitialise parser. */ +public void ReInit(SimpleCharStream stream) +{ + jjmatchedPos = jjnewStateCnt = 0; + curLexState = defaultLexState; + input_stream = stream; + ReInitRounds(); +} +private void ReInitRounds() +{ + int i; + jjround = 0x80000001; + for (i = 11; i-- > 0;) + jjrounds[i] = 0x80000000; +} + +/** Reinitialise parser. */ +public void ReInit(SimpleCharStream stream, int lexState) +{ + ReInit(stream); + SwitchTo(lexState); +} + +/** Switch to specified lex state. */ +public void SwitchTo(int lexState) +{ + if (lexState >= 1 || lexState < 0) + throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE); + else + curLexState = lexState; +} + +protected Token jjFillToken() +{ + final Token t; + final String curTokenImage; + final int beginLine; + final int endLine; + final int beginColumn; + final int endColumn; + String im = jjstrLiteralImages[jjmatchedKind]; + curTokenImage = (im == null) ? input_stream.GetImage() : im; + beginLine = input_stream.getBeginLine(); + beginColumn = input_stream.getBeginColumn(); + endLine = input_stream.getEndLine(); + endColumn = input_stream.getEndColumn(); + t = Token.newToken(jjmatchedKind, curTokenImage); + + t.beginLine = beginLine; + t.endLine = endLine; + t.beginColumn = beginColumn; + t.endColumn = endColumn; + + return t; +} + +int curLexState = 0; +int defaultLexState = 0; +int jjnewStateCnt; +int jjround; +int jjmatchedPos; +int jjmatchedKind; + +/** Get the next Token. */ +public Token getNextToken() +{ + Token matchedToken; + int curPos = 0; + + EOFLoop : + for (;;) + { + try + { + curChar = input_stream.BeginToken(); + } + catch(java.io.IOException e) + { + jjmatchedKind = 0; + matchedToken = jjFillToken(); + return matchedToken; + } + + jjmatchedKind = 0x7fffffff; + jjmatchedPos = 0; + curPos = jjMoveStringLiteralDfa0_0(); + if (jjmatchedKind != 0x7fffffff) + { + if (jjmatchedPos + 1 < curPos) + input_stream.backup(curPos - jjmatchedPos - 1); + matchedToken = jjFillToken(); + return matchedToken; + } + int error_line = input_stream.getEndLine(); + int error_column = input_stream.getEndColumn(); + String error_after = null; + boolean EOFSeen = false; + try { input_stream.readChar(); input_stream.backup(1); } + catch (java.io.IOException e1) { + EOFSeen = true; + error_after = curPos <= 1 ? "" : input_stream.GetImage(); + if (curChar == '\n' || curChar == '\r') { + error_line++; + error_column = 0; + } + else + error_column++; + } + if (!EOFSeen) { + input_stream.backup(1); + error_after = curPos <= 1 ? "" : input_stream.GetImage(); + } + throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR); + } +} + +private void jjCheckNAdd(int state) +{ + if (jjrounds[state] != jjround) + { + jjstateSet[jjnewStateCnt++] = state; + jjrounds[state] = jjround; + } +} +private void jjAddStates(int start, int end) +{ + do { + jjstateSet[jjnewStateCnt++] = jjnextStates[start]; + } while (start++ != end); +} +private void jjCheckNAddTwoStates(int state1, int state2) +{ + jjCheckNAdd(state1); + jjCheckNAdd(state2); +} + +} Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParseException.java =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParseException.java (revision 21967) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParseException.java (revision 21967) @@ -0,0 +1,198 @@ +/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 4.1 */ +/* JavaCCOptions:KEEP_LINE_COL=null */ +package org.openstreetmap.josm.plugins.roadsigns.javacc; + +/** + * This exception is thrown when parse errors are encountered. + * You can explicitly create objects of this exception type by + * calling the method generateParseException in the generated + * parser. + * + * You can modify this class to customize your error reporting + * mechanisms so long as you retain the public fields. + */ +public class ParseException extends Exception { + + /** + * This constructor is used by the method "generateParseException" + * in the generated parser. Calling this constructor generates + * a new object of this type with the fields "currentToken", + * "expectedTokenSequences", and "tokenImage" set. The boolean + * flag "specialConstructor" is also set to true to indicate that + * this constructor was used to create this object. + * This constructor calls its super class with the empty string + * to force the "toString" method of parent class "Throwable" to + * print the error message in the form: + * ParseException: + */ + public ParseException(Token currentTokenVal, + int[][] expectedTokenSequencesVal, + String[] tokenImageVal + ) + { + super(""); + specialConstructor = true; + currentToken = currentTokenVal; + expectedTokenSequences = expectedTokenSequencesVal; + tokenImage = tokenImageVal; + } + + /** + * The following constructors are for use by you for whatever + * purpose you can think of. Constructing the exception in this + * manner makes the exception behave in the normal way - i.e., as + * documented in the class "Throwable". The fields "errorToken", + * "expectedTokenSequences", and "tokenImage" do not contain + * relevant information. The JavaCC generated code does not use + * these constructors. + */ + + public ParseException() { + super(); + specialConstructor = false; + } + + /** Constructor with message. */ + public ParseException(String message) { + super(message); + specialConstructor = false; + } + + /** + * This variable determines which constructor was used to create + * this object and thereby affects the semantics of the + * "getMessage" method (see below). + */ + protected boolean specialConstructor; + + /** + * This is the last token that has been consumed successfully. If + * this object has been created due to a parse error, the token + * followng this token will (therefore) be the first error token. + */ + public Token currentToken; + + /** + * Each entry in this array is an array of integers. Each array + * of integers represents a sequence of tokens (by their ordinal + * values) that is expected at this point of the parse. + */ + public int[][] expectedTokenSequences; + + /** + * This is a reference to the "tokenImage" array of the generated + * parser within which the parse error occurred. This array is + * defined in the generated ...Constants interface. + */ + public String[] tokenImage; + + /** + * This method has the standard behavior when this object has been + * created using the standard constructors. Otherwise, it uses + * "currentToken" and "expectedTokenSequences" to generate a parse + * error message and returns it. If this object has been created + * due to a parse error, and you do not catch it (it gets thrown + * from the parser), then this method is called during the printing + * of the final stack trace, and hence the correct error message + * gets displayed. + */ + public String getMessage() { + if (!specialConstructor) { + return super.getMessage(); + } + StringBuffer expected = new StringBuffer(); + int maxSize = 0; + for (int i = 0; i < expectedTokenSequences.length; i++) { + if (maxSize < expectedTokenSequences[i].length) { + maxSize = expectedTokenSequences[i].length; + } + for (int j = 0; j < expectedTokenSequences[i].length; j++) { + expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' '); + } + if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) { + expected.append("..."); + } + expected.append(eol).append(" "); + } + String retval = "Encountered \""; + Token tok = currentToken.next; + for (int i = 0; i < maxSize; i++) { + if (i != 0) retval += " "; + if (tok.kind == 0) { + retval += tokenImage[0]; + break; + } + retval += " " + tokenImage[tok.kind]; + retval += " \""; + retval += add_escapes(tok.image); + retval += " \""; + tok = tok.next; + } + retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn; + retval += "." + eol; + if (expectedTokenSequences.length == 1) { + retval += "Was expecting:" + eol + " "; + } else { + retval += "Was expecting one of:" + eol + " "; + } + retval += expected.toString(); + return retval; + } + + /** + * The end of line string for this machine. + */ + protected String eol = System.getProperty("line.separator", "\n"); + + /** + * Used to convert raw characters to their escaped version + * when these raw version cannot be used as part of an ASCII + * string literal. + */ + protected String add_escapes(String str) { + StringBuffer retval = new StringBuffer(); + char ch; + for (int i = 0; i < str.length(); i++) { + switch (str.charAt(i)) + { + case 0 : + continue; + case '\b': + retval.append("\\b"); + continue; + case '\t': + retval.append("\\t"); + continue; + case '\n': + retval.append("\\n"); + continue; + case '\f': + retval.append("\\f"); + continue; + case '\r': + retval.append("\\r"); + continue; + case '\"': + retval.append("\\\""); + continue; + case '\'': + retval.append("\\\'"); + continue; + case '\\': + retval.append("\\\\"); + continue; + default: + if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) { + String s = "0000" + Integer.toString(ch, 16); + retval.append("\\u" + s.substring(s.length() - 4, s.length())); + } else { + retval.append(ch); + } + continue; + } + } + return retval.toString(); + } + +} +/* JavaCC - OriginalChecksum=5d829dd89956099ab39643f43523a8ca (do not edit this line) */ Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/SimpleCharStream.java =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/SimpleCharStream.java (revision 21967) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/SimpleCharStream.java (revision 21967) @@ -0,0 +1,472 @@ +/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 4.1 */ +/* JavaCCOptions:STATIC=false */ +package org.openstreetmap.josm.plugins.roadsigns.javacc; + +/** + * An implementation of interface CharStream, where the stream is assumed to + * contain only ASCII characters (without unicode processing). + */ + +public class SimpleCharStream +{ +/** Whether parser is static. */ + public static final boolean staticFlag = false; + int bufsize; + int available; + int tokenBegin; +/** Position in buffer. */ + public int bufpos = -1; + protected int bufline[]; + protected int bufcolumn[]; + + protected int column = 0; + protected int line = 1; + + protected boolean prevCharIsCR = false; + protected boolean prevCharIsLF = false; + + protected java.io.Reader inputStream; + + protected char[] buffer; + protected int maxNextCharInd = 0; + protected int inBuf = 0; + protected int tabSize = 8; + + protected void setTabSize(int i) { tabSize = i; } + protected int getTabSize(int i) { return tabSize; } + + + protected void ExpandBuff(boolean wrapAround) + { + char[] newbuffer = new char[bufsize + 2048]; + int newbufline[] = new int[bufsize + 2048]; + int newbufcolumn[] = new int[bufsize + 2048]; + + try + { + if (wrapAround) + { + System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin); + System.arraycopy(buffer, 0, newbuffer, + bufsize - tokenBegin, bufpos); + buffer = newbuffer; + + System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin); + System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos); + bufline = newbufline; + + System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin); + System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos); + bufcolumn = newbufcolumn; + + maxNextCharInd = (bufpos += (bufsize - tokenBegin)); + } + else + { + System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin); + buffer = newbuffer; + + System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin); + bufline = newbufline; + + System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin); + bufcolumn = newbufcolumn; + + maxNextCharInd = (bufpos -= tokenBegin); + } + } + catch (Throwable t) + { + throw new Error(t.getMessage()); + } + + + bufsize += 2048; + available = bufsize; + tokenBegin = 0; + } + + protected void FillBuff() throws java.io.IOException + { + if (maxNextCharInd == available) + { + if (available == bufsize) + { + if (tokenBegin > 2048) + { + bufpos = maxNextCharInd = 0; + available = tokenBegin; + } + else if (tokenBegin < 0) + bufpos = maxNextCharInd = 0; + else + ExpandBuff(false); + } + else if (available > tokenBegin) + available = bufsize; + else if ((tokenBegin - available) < 2048) + ExpandBuff(true); + else + available = tokenBegin; + } + + int i; + try { + if ((i = inputStream.read(buffer, maxNextCharInd, + available - maxNextCharInd)) == -1) + { + inputStream.close(); + throw new java.io.IOException(); + } + else + maxNextCharInd += i; + return; + } + catch(java.io.IOException e) { + --bufpos; + backup(0); + if (tokenBegin == -1) + tokenBegin = bufpos; + throw e; + } + } + +/** Start. */ + public char BeginToken() throws java.io.IOException + { + tokenBegin = -1; + char c = readChar(); + tokenBegin = bufpos; + + return c; + } + + protected void UpdateLineColumn(char c) + { + column++; + + if (prevCharIsLF) + { + prevCharIsLF = false; + line += (column = 1); + } + else if (prevCharIsCR) + { + prevCharIsCR = false; + if (c == '\n') + { + prevCharIsLF = true; + } + else + line += (column = 1); + } + + switch (c) + { + case '\r' : + prevCharIsCR = true; + break; + case '\n' : + prevCharIsLF = true; + break; + case '\t' : + column--; + column += (tabSize - (column % tabSize)); + break; + default : + break; + } + + bufline[bufpos] = line; + bufcolumn[bufpos] = column; + } + +/** Read a character. */ + public char readChar() throws java.io.IOException + { + if (inBuf > 0) + { + --inBuf; + + if (++bufpos == bufsize) + bufpos = 0; + + return buffer[bufpos]; + } + + if (++bufpos >= maxNextCharInd) + FillBuff(); + + char c = buffer[bufpos]; + + UpdateLineColumn(c); + return c; + } + + /** + * @deprecated + * @see #getEndColumn + */ + + public int getColumn() { + return bufcolumn[bufpos]; + } + + /** + * @deprecated + * @see #getEndLine + */ + + public int getLine() { + return bufline[bufpos]; + } + + /** Get token end column number. */ + public int getEndColumn() { + return bufcolumn[bufpos]; + } + + /** Get token end line number. */ + public int getEndLine() { + return bufline[bufpos]; + } + + /** Get token beginning column number. */ + public int getBeginColumn() { + return bufcolumn[tokenBegin]; + } + + /** Get token beginning line number. */ + public int getBeginLine() { + return bufline[tokenBegin]; + } + +/** Backup a number of characters. */ + public void backup(int amount) { + + inBuf += amount; + if ((bufpos -= amount) < 0) + bufpos += bufsize; + } + + /** Constructor. */ + public SimpleCharStream(java.io.Reader dstream, int startline, + int startcolumn, int buffersize) + { + inputStream = dstream; + line = startline; + column = startcolumn - 1; + + available = bufsize = buffersize; + buffer = new char[buffersize]; + bufline = new int[buffersize]; + bufcolumn = new int[buffersize]; + } + + /** Constructor. */ + public SimpleCharStream(java.io.Reader dstream, int startline, + int startcolumn) + { + this(dstream, startline, startcolumn, 4096); + } + + /** Constructor. */ + public SimpleCharStream(java.io.Reader dstream) + { + this(dstream, 1, 1, 4096); + } + + /** Reinitialise. */ + public void ReInit(java.io.Reader dstream, int startline, + int startcolumn, int buffersize) + { + inputStream = dstream; + line = startline; + column = startcolumn - 1; + + if (buffer == null || buffersize != buffer.length) + { + available = bufsize = buffersize; + buffer = new char[buffersize]; + bufline = new int[buffersize]; + bufcolumn = new int[buffersize]; + } + prevCharIsLF = prevCharIsCR = false; + tokenBegin = inBuf = maxNextCharInd = 0; + bufpos = -1; + } + + /** Reinitialise. */ + public void ReInit(java.io.Reader dstream, int startline, + int startcolumn) + { + ReInit(dstream, startline, startcolumn, 4096); + } + + /** Reinitialise. */ + public void ReInit(java.io.Reader dstream) + { + ReInit(dstream, 1, 1, 4096); + } + /** Constructor. */ + public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline, + int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException + { + this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize); + } + + /** Constructor. */ + public SimpleCharStream(java.io.InputStream dstream, int startline, + int startcolumn, int buffersize) + { + this(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize); + } + + /** Constructor. */ + public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline, + int startcolumn) throws java.io.UnsupportedEncodingException + { + this(dstream, encoding, startline, startcolumn, 4096); + } + + /** Constructor. */ + public SimpleCharStream(java.io.InputStream dstream, int startline, + int startcolumn) + { + this(dstream, startline, startcolumn, 4096); + } + + /** Constructor. */ + public SimpleCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException + { + this(dstream, encoding, 1, 1, 4096); + } + + /** Constructor. */ + public SimpleCharStream(java.io.InputStream dstream) + { + this(dstream, 1, 1, 4096); + } + + /** Reinitialise. */ + public void ReInit(java.io.InputStream dstream, String encoding, int startline, + int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException + { + ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize); + } + + /** Reinitialise. */ + public void ReInit(java.io.InputStream dstream, int startline, + int startcolumn, int buffersize) + { + ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize); + } + + /** Reinitialise. */ + public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException + { + ReInit(dstream, encoding, 1, 1, 4096); + } + + /** Reinitialise. */ + public void ReInit(java.io.InputStream dstream) + { + ReInit(dstream, 1, 1, 4096); + } + /** Reinitialise. */ + public void ReInit(java.io.InputStream dstream, String encoding, int startline, + int startcolumn) throws java.io.UnsupportedEncodingException + { + ReInit(dstream, encoding, startline, startcolumn, 4096); + } + /** Reinitialise. */ + public void ReInit(java.io.InputStream dstream, int startline, + int startcolumn) + { + ReInit(dstream, startline, startcolumn, 4096); + } + /** Get token literal value. */ + public String GetImage() + { + if (bufpos >= tokenBegin) + return new String(buffer, tokenBegin, bufpos - tokenBegin + 1); + else + return new String(buffer, tokenBegin, bufsize - tokenBegin) + + new String(buffer, 0, bufpos + 1); + } + + /** Get the suffix. */ + public char[] GetSuffix(int len) + { + char[] ret = new char[len]; + + if ((bufpos + 1) >= len) + System.arraycopy(buffer, bufpos - len + 1, ret, 0, len); + else + { + System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0, + len - bufpos - 1); + System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1); + } + + return ret; + } + + /** Reset buffer when finished. */ + public void Done() + { + buffer = null; + bufline = null; + bufcolumn = null; + } + + /** + * Method to adjust line and column numbers for the start of a token. + */ + public void adjustBeginLineColumn(int newLine, int newCol) + { + int start = tokenBegin; + int len; + + if (bufpos >= tokenBegin) + { + len = bufpos - tokenBegin + inBuf + 1; + } + else + { + len = bufsize - tokenBegin + bufpos + 1 + inBuf; + } + + int i = 0, j = 0, k = 0; + int nextColDiff = 0, columnDiff = 0; + + while (i < len && + bufline[j = start % bufsize] == bufline[k = ++start % bufsize]) + { + bufline[j] = newLine; + nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j]; + bufcolumn[j] = newCol + columnDiff; + columnDiff = nextColDiff; + i++; + } + + if (i < len) + { + bufline[j] = newLine++; + bufcolumn[j] = newCol + columnDiff; + + while (i++ < len) + { + if (bufline[j = start % bufsize] != bufline[++start % bufsize]) + bufline[j] = newLine++; + else + bufline[j] = newLine; + } + } + + line = bufline[j]; + column = bufcolumn[j]; + } + +} +/* JavaCC - OriginalChecksum=32e760d96f0c150b8b52bb559d21c905 (do not edit this line) */ Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/Token.java =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/Token.java (revision 21967) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/Token.java (revision 21967) @@ -0,0 +1,124 @@ +/* Generated By:JavaCC: Do not edit this line. Token.java Version 4.1 */ +/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null */ +package org.openstreetmap.josm.plugins.roadsigns.javacc; + +/** + * Describes the input token stream. + */ + +public class Token { + + /** + * An integer that describes the kind of this token. This numbering + * system is determined by JavaCCParser, and a table of these numbers is + * stored in the file ...Constants.java. + */ + public int kind; + + /** The line number of the first character of this Token. */ + public int beginLine; + /** The column number of the first character of this Token. */ + public int beginColumn; + /** The line number of the last character of this Token. */ + public int endLine; + /** The column number of the last character of this Token. */ + public int endColumn; + + /** + * The string image of the token. + */ + public String image; + + /** + * A reference to the next regular (non-special) token from the input + * stream. If this is the last token from the input stream, or if the + * token manager has not read tokens beyond this one, this field is + * set to null. This is true only if this token is also a regular + * token. Otherwise, see below for a description of the contents of + * this field. + */ + public Token next; + + /** + * This field is used to access special tokens that occur prior to this + * token, but after the immediately preceding regular (non-special) token. + * If there are no such special tokens, this field is set to null. + * When there are more than one such special token, this field refers + * to the last of these special tokens, which in turn refers to the next + * previous special token through its specialToken field, and so on + * until the first special token (whose specialToken field is null). + * The next fields of special tokens refer to other special tokens that + * immediately follow it (without an intervening regular token). If there + * is no such token, this field is null. + */ + public Token specialToken; + + /** + * An optional attribute value of the Token. + * Tokens which are not used as syntactic sugar will often contain + * meaningful values that will be used later on by the compiler or + * interpreter. This attribute value is often different from the image. + * Any subclass of Token that actually wants to return a non-null value can + * override this method as appropriate. + */ + public Object getValue() { + return null; + } + + /** + * No-argument constructor + */ + public Token() {} + + /** + * Constructs a new token for the specified Image. + */ + public Token(int kind) + { + this(kind, null); + } + + /** + * Constructs a new token for the specified Image and Kind. + */ + public Token(int kind, String image) + { + this.kind = kind; + this.image = image; + } + + /** + * Returns the image. + */ + public String toString() + { + return image; + } + + /** + * Returns a new Token object, by default. However, if you want, you + * can create and return subclass objects based on the value of ofKind. + * Simply add the cases to the switch for all those special cases. + * For example, if you have a subclass of Token called IDToken that + * you want to create if ofKind is ID, simply add something like : + * + * case MyParserConstants.ID : return new IDToken(ofKind, image); + * + * to the following switch statement. Then you can cast matchedToken + * variable to the appropriate type and use sit in your lexical actions. + */ + public static Token newToken(int ofKind, String image) + { + switch(ofKind) + { + default : return new Token(ofKind, image); + } + } + + public static Token newToken(int ofKind) + { + return newToken(ofKind, null); + } + +} +/* JavaCC - OriginalChecksum=021f885cf82ce1cc84671f9a48141523 (do not edit this line) */ Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/TokenMgrError.java =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/TokenMgrError.java (revision 21967) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/TokenMgrError.java (revision 21967) @@ -0,0 +1,140 @@ +/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 4.1 */ +/* JavaCCOptions: */ +package org.openstreetmap.josm.plugins.roadsigns.javacc; + +/** Token Manager Error. */ +public class TokenMgrError extends Error +{ + + /* + * Ordinals for various reasons why an Error of this type can be thrown. + */ + + /** + * Lexical error occurred. + */ + static final int LEXICAL_ERROR = 0; + + /** + * An attempt was made to create a second instance of a static token manager. + */ + static final int STATIC_LEXER_ERROR = 1; + + /** + * Tried to change to an invalid lexical state. + */ + static final int INVALID_LEXICAL_STATE = 2; + + /** + * Detected (and bailed out of) an infinite loop in the token manager. + */ + static final int LOOP_DETECTED = 3; + + /** + * Indicates the reason why the exception is thrown. It will have + * one of the above 4 values. + */ + int errorCode; + + /** + * Replaces unprintable characters by their escaped (or unicode escaped) + * equivalents in the given string + */ + protected static final String addEscapes(String str) { + StringBuffer retval = new StringBuffer(); + char ch; + for (int i = 0; i < str.length(); i++) { + switch (str.charAt(i)) + { + case 0 : + continue; + case '\b': + retval.append("\\b"); + continue; + case '\t': + retval.append("\\t"); + continue; + case '\n': + retval.append("\\n"); + continue; + case '\f': + retval.append("\\f"); + continue; + case '\r': + retval.append("\\r"); + continue; + case '\"': + retval.append("\\\""); + continue; + case '\'': + retval.append("\\\'"); + continue; + case '\\': + retval.append("\\\\"); + continue; + default: + if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) { + String s = "0000" + Integer.toString(ch, 16); + retval.append("\\u" + s.substring(s.length() - 4, s.length())); + } else { + retval.append(ch); + } + continue; + } + } + return retval.toString(); + } + + /** + * Returns a detailed message for the Error when it is thrown by the + * token manager to indicate a lexical error. + * Parameters : + * EOFSeen : indicates if EOF caused the lexical error + * curLexState : lexical state in which this error occurred + * errorLine : line number when the error occurred + * errorColumn : column number when the error occurred + * errorAfter : prefix that was seen before this error occurred + * curchar : the offending character + * Note: You can customize the lexical error message by modifying this method. + */ + protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) { + return("Lexical error at line " + + errorLine + ", column " + + errorColumn + ". Encountered: " + + (EOFSeen ? " " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") + + "after : \"" + addEscapes(errorAfter) + "\""); + } + + /** + * You can also modify the body of this method to customize your error messages. + * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not + * of end-users concern, so you can return something like : + * + * "Internal Error : Please file a bug report .... " + * + * from this method for such cases in the release version of your parser. + */ + public String getMessage() { + return super.getMessage(); + } + + /* + * Constructors of various flavors follow. + */ + + /** No arg constructor. */ + public TokenMgrError() { + } + + /** Constructor with message and reason. */ + public TokenMgrError(String message, int reason) { + super(message); + errorCode = reason; + } + + /** Full Constructor. */ + public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) { + this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); + } +} +/* JavaCC - OriginalChecksum=3b46b91d4b831d370c179f923feba7d9 (do not edit this line) */