Index: lasspath =================================================================== --- /.classpath (revision 320) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: roject =================================================================== --- /.project (revision 320) +++ (revision ) @@ -1,17 +1,0 @@ - - - JOSM - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - Index: NTRIBUTION =================================================================== --- /CONTRIBUTION (revision 320) +++ (revision ) @@ -1,73 +1,0 @@ -The XML Parser is MinML2 from -http://www.wilson.co.uk/xml/minml2.htm. The license is -attached below. - -The jpeg metadata extraction code is from Drew Noakes -(http://drewnoakes.com/code/exif). - -Most icons are inspired and stolen from gnome-media package -of my local linux installation. The images are licensed -under LGPL but redistributed by me under the terms of GPL -2.0. The world image is from onearth.pl. - -The gettext-commons-0.9.jar is from Felix Berger and Steffen -Pingel (http://xnap-commons.sourceforge.net/gettext-commons/). -The jar-file is licensed under LGPL. - -Some plugins (hosted elsewhere) are from Nick Whitelegg. -Frederik Ramm did some of the actions and the MarkerLayer. -Several smaller patches are contributed by community members -of OSM. - -Internalisation: -German: Sven Anders -French: Frédéric Bonifas -Romanian: Ovidiu Constantin -British: Bruce Cowan - - -All the rest are belong to me. - - -Imi. - - - -All content of MinML2.jar is licensed under: -----------------MinML2 license-------------------- -Copyright (c) 1999, John Wilson (tug@wilson.co.uk). -All rights reserved. -Redistribution and use in source and binary forms, -with or without modification, are permitted provided -that the following conditions are met: - -Redistributions of source code must retain the above -copyright notice, this list of conditions and the -following disclaimer. - -Redistributions in binary form must reproduce the -above copyright notice, this list of conditions and -the following disclaimer in the documentation and/or -other materials provided with the distribution. - -All advertising materials mentioning features or use -of this software must display the following acknowledgement: - -This product includes software developed by John Wilson. -The name of John Wilson may not be used to endorse or promote -products derived from this software without specific prior -written permission. - -THIS SOFTWARE IS PROVIDED BY JOHN WILSON ``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JOHN WILSON -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE --------------------------------------------------- Index: CENSE =================================================================== --- /LICENSE (revision 320) +++ (revision ) @@ -1,354 +1,0 @@ -JOSM and all files included in this archive and the source archive from - -http://www.eigenheimstrasse.de/svn/josm - -except the JDOM files, MinML2 files and parts of UTM.java are -copyrighted 2005-2006 by Immanuel Scholz. -The files are distributed under the terms of the following License: - - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, 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 Library 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 St, 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 Library General -Public License instead of this License. Index: ADME =================================================================== --- /README (revision 320) +++ (revision ) @@ -1,72 +1,0 @@ -This is a readme.txt to the Java OpenStreetMap Editor - - -Install Notes -------------- - -To run JOSM, you need: - -* The jar file (e.g. josm.jar) -* The latest Java Runtime Environment 1.5. - - -How to get Java ---------------- - -You need at least Version 1.5 (called Java5 or "Tiger"). - -Microsoft Windows people should just visit java.sun.com and -download the latest Java5 executable. - -To get Java under linux, I recommend downloading the environment -directly from Sun at http://java.sun.com. There is a linux -binary installer which you have to execute from a console. - -However, if you run Debian or Ubuntu or any other dpkg-based -distribution, you may use unofficial precompiled packages. -You have to add the following line to your /etc/apt/sources.list -(replace "stable" with your installation) - -deb http://ftp.debian-unofficial.org/debian/ stable non-free - -The package is called sun-j2se5.0-jre-binary. - -For MacOS user: There is an installer for Mac OS X 10.4: -http://www.apple.com/support/downloads/java2se50release1.html - -Sorry, there is no Version of Java5 for Mac OS X 10.3 available :-( - - -How to launch -------------- - -Microsoft Windows people launch by double clicking on the jar file. -If this does not help, open a command shell and type -"java -jar josm-latest.jar" in the directory that holds the file. -(Please replace josm-latest.jar with the name of your jar file, if -you don't used the latest version.) - -Under Linux open a shell, go to the file directory and type -"java -jar josm-latest.jar" to launch. If this don't help, try to set -you JAVA_HOME variable to the java location (the root location, not -the bin. "/usr/lib/sun-j2se5.0-jdk" if you used the prebuild -package). - -MacOS people just click on the jar-file. - - -How to get the Source ---------------------- - -Download it directly from the subversion at -http://www.eigenheimstrasse.de/svn/josm. To use the command line -subverion client, type - -svn co http://www.eigenheimstrasse.de/svn/josm - - -And gimme feedback: josm@eigenheimstrasse.de (start your mail subject -with "JOSM", so my spam filter will not eat you) - - -Ciao, Imi. Index: ild.xml =================================================================== --- /build.xml (revision 320) +++ (revision ) @@ -1,51 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: art.html =================================================================== --- /start.html (revision 320) +++ (revision ) @@ -1,8 +1,0 @@ - Index: /trunk/.classpath =================================================================== --- /trunk/.classpath (revision 321) +++ /trunk/.classpath (revision 321) @@ -0,0 +1,13 @@ + + + + + + + + + + + + + Index: /trunk/.project =================================================================== --- /trunk/.project (revision 321) +++ /trunk/.project (revision 321) @@ -0,0 +1,17 @@ + + + JOSM + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + Index: /trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- /trunk/.settings/org.eclipse.jdt.core.prefs (revision 321) +++ /trunk/.settings/org.eclipse.jdt.core.prefs (revision 321) @@ -0,0 +1,302 @@ +#Tue Aug 07 22:54:52 GMT+01:00 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=ignore +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=1 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false +org.eclipse.jdt.core.formatter.comment.format_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true Index: /trunk/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- /trunk/.settings/org.eclipse.jdt.ui.prefs (revision 321) +++ /trunk/.settings/org.eclipse.jdt.ui.prefs (revision 321) @@ -0,0 +1,5 @@ +#Wed Aug 08 13:31:47 GMT+01:00 2007 +eclipse.preferences.version=1 +formatter_profile=_josm +formatter_settings_version=10 +org.eclipse.jdt.ui.text.custom_code_templates= Index: /trunk/CONTRIBUTION =================================================================== --- /trunk/CONTRIBUTION (revision 321) +++ /trunk/CONTRIBUTION (revision 321) @@ -0,0 +1,73 @@ +The XML Parser is MinML2 from +http://www.wilson.co.uk/xml/minml2.htm. The license is +attached below. + +The jpeg metadata extraction code is from Drew Noakes +(http://drewnoakes.com/code/exif). + +Most icons are inspired and stolen from gnome-media package +of my local linux installation. The images are licensed +under LGPL but redistributed by me under the terms of GPL +2.0. The world image is from onearth.pl. + +The gettext-commons-0.9.jar is from Felix Berger and Steffen +Pingel (http://xnap-commons.sourceforge.net/gettext-commons/). +The jar-file is licensed under LGPL. + +Some plugins (hosted elsewhere) are from Nick Whitelegg. +Frederik Ramm did some of the actions and the MarkerLayer. +Several smaller patches are contributed by community members +of OSM. + +Internalisation: +German: Sven Anders +French: Frédéric Bonifas +Romanian: Ovidiu Constantin +British: Bruce Cowan + + +All the rest are belong to me. + + +Imi. + + + +All content of MinML2.jar is licensed under: +----------------MinML2 license-------------------- +Copyright (c) 1999, John Wilson (tug@wilson.co.uk). +All rights reserved. +Redistribution and use in source and binary forms, +with or without modification, are permitted provided +that the following conditions are met: + +Redistributions of source code must retain the above +copyright notice, this list of conditions and the +following disclaimer. + +Redistributions in binary form must reproduce the +above copyright notice, this list of conditions and +the following disclaimer in the documentation and/or +other materials provided with the distribution. + +All advertising materials mentioning features or use +of this software must display the following acknowledgement: + +This product includes software developed by John Wilson. +The name of John Wilson may not be used to endorse or promote +products derived from this software without specific prior +written permission. + +THIS SOFTWARE IS PROVIDED BY JOHN WILSON ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JOHN WILSON +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE +-------------------------------------------------- Index: /trunk/LICENSE =================================================================== --- /trunk/LICENSE (revision 321) +++ /trunk/LICENSE (revision 321) @@ -0,0 +1,354 @@ +JOSM and all files included in this archive and the source archive from + +http://www.eigenheimstrasse.de/svn/josm + +except the JDOM files, MinML2 files and parts of UTM.java are +copyrighted 2005-2006 by Immanuel Scholz. +The files are distributed under the terms of the following License: + + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, 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 Library 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 St, 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 Library General +Public License instead of this License. Index: /trunk/README =================================================================== --- /trunk/README (revision 321) +++ /trunk/README (revision 321) @@ -0,0 +1,72 @@ +This is a readme.txt to the Java OpenStreetMap Editor + + +Install Notes +------------- + +To run JOSM, you need: + +* The jar file (e.g. josm.jar) +* The latest Java Runtime Environment 1.5. + + +How to get Java +--------------- + +You need at least Version 1.5 (called Java5 or "Tiger"). + +Microsoft Windows people should just visit java.sun.com and +download the latest Java5 executable. + +To get Java under linux, I recommend downloading the environment +directly from Sun at http://java.sun.com. There is a linux +binary installer which you have to execute from a console. + +However, if you run Debian or Ubuntu or any other dpkg-based +distribution, you may use unofficial precompiled packages. +You have to add the following line to your /etc/apt/sources.list +(replace "stable" with your installation) + +deb http://ftp.debian-unofficial.org/debian/ stable non-free + +The package is called sun-j2se5.0-jre-binary. + +For MacOS user: There is an installer for Mac OS X 10.4: +http://www.apple.com/support/downloads/java2se50release1.html + +Sorry, there is no Version of Java5 for Mac OS X 10.3 available :-( + + +How to launch +------------- + +Microsoft Windows people launch by double clicking on the jar file. +If this does not help, open a command shell and type +"java -jar josm-latest.jar" in the directory that holds the file. +(Please replace josm-latest.jar with the name of your jar file, if +you don't used the latest version.) + +Under Linux open a shell, go to the file directory and type +"java -jar josm-latest.jar" to launch. If this don't help, try to set +you JAVA_HOME variable to the java location (the root location, not +the bin. "/usr/lib/sun-j2se5.0-jdk" if you used the prebuild +package). + +MacOS people just click on the jar-file. + + +How to get the Source +--------------------- + +Download it directly from the subversion at +http://www.eigenheimstrasse.de/svn/josm. To use the command line +subverion client, type + +svn co http://www.eigenheimstrasse.de/svn/josm + + +And gimme feedback: josm@eigenheimstrasse.de (start your mail subject +with "JOSM", so my spam filter will not eat you) + + +Ciao, Imi. Index: /trunk/build.xml =================================================================== --- /trunk/build.xml (revision 321) +++ /trunk/build.xml (revision 321) @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /trunk/data/csv.style =================================================================== --- /trunk/data/csv.style (revision 321) +++ /trunk/data/csv.style (revision 321) @@ -0,0 +1,8 @@ +FIELD_DELIMITER WHITESPACE +RECORD_DELIMITER NEWLINE +BADCHARS COMMA + +IFIELD LAT_DECIMAL, "", "%f" +IFIELD LON_DECIMAL, "", "%f" +IFIELD ALT_METERS, "", "%f" +IFIELD IGNORE, "", "" Index: /trunk/data/empty.xml =================================================================== --- /trunk/data/empty.xml (revision 321) +++ /trunk/data/empty.xml (revision 321) @@ -0,0 +1,3 @@ + + + Index: /trunk/data/munich.gpx =================================================================== --- /trunk/data/munich.gpx (revision 321) +++ /trunk/data/munich.gpx (revision 321) @@ -0,0 +1,41363 @@ + + + + 86739 + + + + + + 129010 + + + 129011 + + + + + 87588 + + + + + + 129858 + + + 129859 + + + + + 90135 + + + + + + 132314 + + + 132315 + + + + + 105559 + + + + + + 147111 + + + 147112 + + + + + 89994 + + + + + + 132183 + + + 132184 + + + + + 87730 + + + + + + 129985 + + + 129986 + + + + + 86740 + + + + + + 129007 + + + 129008 + + + + + 90136 + + + + + + 132315 + + + 132316 + + + + + 105560 + + + + + + 147112 + + + 147113 + + + + + 89995 + + + + + + 132184 + + + 132185 + + + + + 87731 + + + + + + 129986 + + + 129983 + + + + + 85892 + + + + + + 128215 + + + 128216 + + + + + 86741 + + + + + + 129008 + + + 129013 + + + + + 90137 + + + + + + 132316 + + + 132317 + + + + + 105561 + + + + + + 147113 + + + 147114 + + + + + 89996 + + + + + + 132185 + + + 132186 + + + + + 87732 + + + + + + 129981 + + + 129993 + + + + + 85893 + + + + + + 128216 + + + 128217 + + + + + 86742 + + + + + + 129011 + + + 129012 + + + + + 87591 + + + + + + 129861 + + + 128282 + + + + + 90138 + + + + + + 132317 + + + 132318 + + + + + 105562 + + + + + + 147114 + + + 147115 + + + + + 87733 + + + + + + 129993 + + + 129992 + + + + + 89997 + + + + + + 132186 + + + 132187 + + + + + 105138 + + + + + + 146679 + + + 146687 + + + + + 85894 + + + + + + 128217 + + + 128218 + + + + + 86743 + + + + + + 129012 + + + 129014 + + + + + 90139 + + + + + + 132318 + + + 132319 + + + + + 105563 + + + + + + 147115 + + + 147116 + + + + + 87734 + + + + + + 129992 + + + 129991 + + + + + 89998 + + + + + + 132187 + + + 132188 + + + + + 105139 + + + + + + 146687 + + + 146688 + + + + + 85895 + + + + + + 128218 + + + 128219 + + + + + 86744 + + + + + + 129014 + + + 129015 + + + + + 90140 + + + + + + 132319 + + + 132320 + + + + + 105564 + + + + + + 147116 + + + 147117 + + + + + 87735 + + + + + + 129991 + + + 129990 + + + + + 89999 + + + + + + 132188 + + + 132189 + + + + + 105140 + + + + + + 146688 + + + 146691 + + + + + 85896 + + + + + + 128219 + + + 128220 + + + + + 86745 + + + + + + 129015 + + + 129016 + + + + + 90141 + + + + + + 132320 + + + 132321 + + + + + 105565 + + + + + + 147117 + + + 147119 + + + + + 87736 + + + + + + 129990 + + + 129989 + + + + + 90000 + + + + + + 132189 + + + 132190 + + + + + 105141 + + + + + + 146691 + + + 146694 + + + + + 85897 + + + + + + 128220 + + + 128221 + + + + + 86746 + + + + + + 129016 + + + 129017 + + + + + 87595 + + + + + + 129864 + + + 129865 + + + + + 90142 + + + + + + 132321 + + + 132322 + + + + + 105566 + + + + + + 147119 + + + 147121 + + + + + 87737 + + + + + + 129989 + + + 129984 + + + + + 90001 + + + + + + 132190 + + + 132191 + + + + + 105000 + + + + + + 130114 + + + 146550 + + + + + 105142 + + + + + + 146694 + + + 146697 + + + + + 85898 + + + + + + 128221 + + + 128222 + + + + + 86747 + + + + + + 129013 + + + 129018 + + + + + 90143 + + + + + + 132322 + + + 132323 + + + + + 105567 + + + + + + 147121 + + + 147122 + + + + + 87738 + + + + + + 129994 + + + 129989 + + + + + 90002 + + + + + + 132191 + + + 132192 + + + + + 105001 + + + + + + 146550 + + + 146551 + + + + + 85899 + + + + + + 128222 + + + 128223 + + + + + 86748 + + + + + + 129018 + + + 129019 + + + + + 87597 + + + + + + 129863 + + + 129869 + + + + + 90144 + + + + + + 132323 + + + 132324 + + + + + 105568 + + + + + + 147122 + + + 147123 + + + + + 87739 + + + + + + 129994 + + + 129996 + + + + + 90003 + + + + + + 132192 + + + 132193 + + + + + 85900 + + + + + + 128223 + + + 128224 + + + + + 86749 + + + + + + 129019 + + + 129020 + + + + + 87598 + + + + + + 129869 + + + 129864 + + + + + 90145 + + + + + + 132324 + + + 132325 + + + + + 105569 + + + + + + 147123 + + + 147124 + + + + + 87740 + + + + + + 129996 + + + 129997 + + + + + 90004 + + + + + + 132193 + + + 132194 + + + + + 87882 + + + + + + 130107 + + + 130108 + + + + + 85901 + + + + + + 128224 + + + 128225 + + + + + 86750 + + + + + + 129020 + + + 129021 + + + + + 87599 + + + + + + 129869 + + + 129864 + + + + + 90146 + + + + + + 132325 + + + 132326 + + + + + 105570 + + + + + + 147124 + + + 147125 + + + + + 87741 + + + + + + 129997 + + + 129998 + + + + + 90005 + + + + + + 132194 + + + 132195 + + + + + 105004 + + + + + + 146551 + + + 146552 + + + + + 87883 + + + + + + 130108 + + + 130109 + + + + + 85902 + + + + + + 128225 + + + 128226 + + + + + 86751 + + + + + + 129021 + + + 129022 + + + + + 87600 + + + + + + 128288 + + + 129868 + + + + + 90147 + + + + + + 132326 + + + 132327 + + + + + 105571 + + + + + + 147125 + + + 147126 + + + + + 87742 + + + + + + 129998 + + + 129999 + + + + + 90006 + + + + + + 132195 + + + 132196 + + + + + 87884 + + + + + + 130109 + + + 130110 + + + + + 85903 + + + + + + 128226 + + + 128227 + + + + + 86752 + + + + + + 129022 + + + 129024 + + + + + 87601 + + + + + + 128289 + + + 129868 + + + + + 90148 + + + + + + 132327 + + + 132328 + + + + + 105572 + + + + + + 147126 + + + 147127 + + + + + 87743 + + + + + + 129999 + + + 130000 + + + + + 90007 + + + + + + 132196 + + + 132197 + + + + + 105006 + + + + + + 146552 + + + 146553 + + + + + 87885 + + + + + + 130110 + + + 130111 + + + + + 85904 + + + + + + 128227 + + + 128228 + + + + + 86753 + + + + + + 129024 + + + 129025 + + + + + 87602 + + + + + + 129868 + + + 129869 + + + + + 90149 + + + + + + 132328 + + + 132329 + + + + + 105573 + + + + + + 147127 + + + 147128 + + + + + 87744 + + + + + + 130000 + + + 129988 + + + + + 90008 + + + + + + 132197 + + + 132198 + + + + + 87886 + + + + + + 130111 + + + 130112 + + + + + 85905 + + + + + + 128228 + + + 128229 + + + + + 86754 + + + + + + 129025 + + + 129026 + + + + + 87603 + + + + + + 129868 + + + 129866 + + + + + 90150 + + + + + + 132328 + + + 132330 + + + + + 105574 + + + + + + 147128 + + + 147129 + + + + + 87745 + + + + + + 129994 + + + 129995 + + + + + 90009 + + + + + + 132198 + + + 132199 + + + + + 87887 + + + + + + 130112 + + + 130113 + + + + + 86755 + + + + + + 129017 + + + 129023 + + + + + 90151 + + + + + + 132329 + + + 132330 + + + + + 105575 + + + + + + 147129 + + + 147130 + + + + + 87746 + + + + + + 129995 + + + 129832 + + + + + 90010 + + + + + + 132199 + + + 132200 + + + + + 105009 + + + + + + 146553 + + + 146557 + + + + + 87888 + + + + + + 130113 + + + 130114 + + + + + 86756 + + + + + + 129023 + + + 129027 + + + + + 90152 + + + + + + 132330 + + + 132331 + + + + + 105576 + + + + + + 147130 + + + 147131 + + + + + 87747 + + + + + + 129856 + + + 130001 + + + + + 90011 + + + + + + 132200 + + + 132201 + + + + + 87889 + + + + + + 130114 + + + 130115 + + + + + 85908 + + + + + + 128231 + + + 128232 + + + + + 86757 + + + + + + 129027 + + + 129028 + + + + + 90153 + + + + + + 132331 + + + 132333 + + + + + 105577 + + + + + + 147131 + + + 147132 + + + + + 87748 + + + + + + 130001 + + + 129854 + + + + + 90012 + + + + + + 132201 + + + 132202 + + + + + 105153 + + + + + + 146697 + + + 146704 + + + + + 87890 + + + + + + 130115 + + + 130116 + + + + + 85909 + + + + + + 128232 + + + 128233 + + + + + 86758 + + + + + + 129028 + + + 129029 + + + + + 90154 + + + + + + 132333 + + + 132332 + + + + + 105578 + + + + + + 147132 + + + 147133 + + + + + 87749 + + + + + + 129857 + + + 130002 + + + + + 90013 + + + + + + 132202 + + + 132203 + + + + + 105012 + + + + + + 146557 + + + 146562 + + + + + 87891 + + + + + + 130116 + + + 130117 + + + + + 85910 + + + + + + 128233 + + + 128234 + + + + + 86759 + + + + + + 129026 + + + 129030 + + + + + 90155 + + + + + + 132332 + + + 132334 + + + + + 105579 + + + + + + 147133 + + + 147134 + + + + + 87750 + + + + + + 130002 + + + 130003 + + + + + 90014 + + + + + + 132203 + + + 132204 + + + + + 105013 + + + + + + 146562 + + + 146565 + + + + + 105155 + + + + + + 146704 + + + 146705 + + + + + 87892 + + + + + + 130117 + + + 130118 + + + + + 85911 + + + + + + 128234 + + + 128235 + + + + + 86760 + + + + + + 129030 + + + 129031 + + + + + 90156 + + + + + + 132334 + + + 132333 + + + + + 105580 + + + + + + 147134 + + + 147135 + + + + + 87751 + + + + + + 130003 + + + 130005 + + + + + 90015 + + + + + + 132204 + + + 132205 + + + + + 87893 + + + + + + 130118 + + + 130119 + + + + + 85912 + + + + + + 128235 + + + 128236 + + + + + 86761 + + + + + + 129031 + + + 129032 + + + + + 90157 + + + + + + 132334 + + + 132335 + + + + + 105581 + + + + + + 147135 + + + 147136 + + + + + 87752 + + + + + + 130003 + + + 130004 + + + + + 90016 + + + + + + 132205 + + + 132206 + + + + + 105157 + + + + + + 146705 + + + 146706 + + + + + 87894 + + + + + + 130119 + + + 130120 + + + + + 85913 + + + + + + 128236 + + + 128237 + + + + + 86762 + + + + + + 129032 + + + 129033 + + + + + 90158 + + + + + + 132335 + + + 132336 + + + + + 105582 + + + + + + 147136 + + + 147137 + + + + + 87753 + + + + + + 130004 + + + 130006 + + + + + 90017 + + + + + + 132206 + + + 132207 + + + + + 105158 + + + + + + 146706 + + + 146707 + + + + + 87895 + + + + + + 130120 + + + 130121 + + + + + 85914 + + + + + + 128237 + + + 128238 + + + + + 86763 + + + + + + 129033 + + + 129034 + + + + + 90159 + + + + + + 132336 + + + 132337 + + + + + 105583 + + + + + + 147137 + + + 147138 + + + + + 87754 + + + + + + 130006 + + + 130007 + + + + + 90018 + + + + + + 132207 + + + 132208 + + + + + 85915 + + + + + + 128238 + + + 128239 + + + + + 86764 + + + + + + 129029 + + + 129035 + + + + + 90160 + + + + + + 132337 + + + 132338 + + + + + 105584 + + + + + + 147138 + + + 147139 + + + + + 87755 + + + + + + 130006 + + + 130008 + + + + + 90019 + + + + + + 132208 + + + 132209 + + + + + 105160 + + + + + + 146707 + + + 146710 + + + + + 87897 + + + + + + 129950 + + + 130122 + + + + + 85916 + + + + + + 128239 + + + 128240 + + + + + 86765 + + + + + + 129035 + + + 129036 + + + + + 90161 + + + + + + 132338 + + + 132339 + + + + + 105585 + + + + + + 147139 + + + 147140 + + + + + 87756 + + + + + + 130008 + + + 130017 + + + + + 90020 + + + + + + 132209 + + + 132210 + + + + + 87898 + + + + + + 130122 + + + 129948 + + + + + 85917 + + + + + + 128240 + + + 128241 + + + + + 86766 + + + + + + 129036 + + + 129037 + + + + + 90162 + + + + + + 132339 + + + 132340 + + + + + 105586 + + + + + + 147140 + + + 147141 + + + + + 87757 + + + + + + 130008 + + + 130009 + + + + + 90021 + + + + + + 132210 + + + 132211 + + + + + 87899 + + + + + + 130122 + + + 130123 + + + + + 85918 + + + + + + 128241 + + + 128242 + + + + + 86767 + + + + + + 129037 + + + 129038 + + + + + 90163 + + + + + + 132340 + + + 132341 + + + + + 105587 + + + + + + 147141 + + + 147142 + + + + + 87758 + + + + + + 130009 + + + 130010 + + + + + 90022 + + + + + + 132211 + + + 132212 + + + + + 87900 + + + + + + 130123 + + + 130121 + + + + + 85919 + + + + + + 128238 + + + 128245 + + + + + 86768 + + + + + + 129038 + + + 129039 + + + + + 90164 + + + + + + 132341 + + + 132342 + + + + + 105588 + + + + + + 147142 + + + 147143 + + + + + 87759 + + + + + + 130010 + + + 130011 + + + + + 90023 + + + + + + 132212 + + + 132213 + + + + + 105022 + + + + + + 146565 + + + 146573 + + + + + 85920 + + + + + + 128245 + + + 128244 + + + + + 86769 + + + + + + 129034 + + + 129040 + + + + + 90165 + + + + + + 132342 + + + 132343 + + + + + 87901 + + + + + + 128959 + + + 130126 + + + + + 105589 + + + + + + 147143 + + + 147144 + + + + + 87760 + + + + + + 130011 + + + 130012 + + + + + 90024 + + + + + + 132213 + + + 132214 + + + + + 85921 + + + + + + 128244 + + + 128243 + + + + + 86770 + + + + + + 129040 + + + 129041 + + + + + 90166 + + + + + + 132343 + + + 132344 + + + + + 87902 + + + + + + 130126 + + + 130125 + + + + + 105590 + + + + + + 147144 + + + 147145 + + + + + 87761 + + + + + + 130012 + + + 130013 + + + + + 90025 + + + + + + 132214 + + + 132215 + + + + + 105024 + + + + + + 146573 + + + 146574 + + + + + 85922 + + + + + + 128243 + + + 128242 + + + + + 86771 + + + + + + 129041 + + + 129042 + + + + + 90167 + + + + + + 132344 + + + 132345 + + + + + 87903 + + + + + + 130125 + + + 130124 + + + + + 105591 + + + + + + 147145 + + + 147146 + + + + + 87762 + + + + + + 130013 + + + 130014 + + + + + 90026 + + + + + + 132215 + + + 132216 + + + + + 105167 + + + + + + 146710 + + + 146716 + + + + + 85923 + + + + + + 128242 + + + 128246 + + + + + 86772 + + + + + + 129042 + + + 129043 + + + + + 90168 + + + + + + 132345 + + + 132346 + + + + + 87904 + + + + + + 130124 + + + 128961 + + + + + 105592 + + + + + + 147146 + + + 132140 + + + + + 87763 + + + + + + 130013 + + + 130015 + + + + + 90027 + + + + + + 132216 + + + 132217 + + + + + 105026 + + + + + + 146574 + + + 146578 + + + + + 105168 + + + + + + 146716 + + + 146717 + + + + + 85924 + + + + + + 128246 + + + 128247 + + + + + 86773 + + + + + + 129039 + + + 129044 + + + + + 90169 + + + + + + 132346 + + + 132347 + + + + + 87905 + + + + + + 130125 + + + 128958 + + + + + 87764 + + + + + + 130015 + + + 130010 + + + + + 105169 + + + + + + 146717 + + + 146718 + + + + + 85925 + + + + + + 128247 + + + 128248 + + + + + 86774 + + + + + + 129044 + + + 129045 + + + + + 90170 + + + + + + 132347 + + + 132348 + + + + + 87906 + + + + + + 129837 + + + 130129 + + + + + 87765 + + + + + + 130015 + + + 130016 + + + + + 90029 + + + + + + 132218 + + + 132219 + + + + + 85926 + + + + + + 128248 + + + 128249 + + + + + 86775 + + + + + + 129045 + + + 129046 + + + + + 90171 + + + + + + 132348 + + + 132349 + + + + + 87907 + + + + + + 130129 + + + 130128 + + + + + 87766 + + + + + + 130016 + + + 130023 + + + + + 90030 + + + + + + 132219 + + + 132215 + + + + + 85927 + + + + + + 128249 + + + 128250 + + + + + 86776 + + + + + + 129046 + + + 129047 + + + + + 90172 + + + + + + 132349 + + + 132350 + + + + + 87908 + + + + + + 130128 + + + 130127 + + + + + 87767 + + + + + + 130023 + + + 130024 + + + + + 105030 + + + + + + 146578 + + + 146581 + + + + + 85928 + + + + + + 128250 + + + 128251 + + + + + 86777 + + + + + + 129043 + + + 129048 + + + + + 90173 + + + + + + 132350 + + + 132351 + + + + + 87909 + + + + + + 130127 + + + 129842 + + + + + 87768 + + + + + + 130024 + + + 130025 + + + + + 85929 + + + + + + 128251 + + + 128252 + + + + + 86778 + + + + + + 129048 + + + 129049 + + + + + 90174 + + + + + + 132351 + + + 132352 + + + + + 87769 + + + + + + 130025 + + + 130026 + + + + + 105032 + + + + + + 146581 + + + 146584 + + + + + 85930 + + + + + + 128252 + + + 128253 + + + + + 86779 + + + + + + 129049 + + + 129050 + + + + + 90175 + + + + + + 132352 + + + 132353 + + + + + 86638 + + + + + + 128914 + + + 128913 + + + + + 87770 + + + + + + 130026 + + + 130027 + + + + + 85931 + + + + + + 128253 + + + 128254 + + + + + 86780 + + + + + + 129047 + + + 129051 + + + + + 90176 + + + + + + 132353 + + + 132354 + + + + + 86639 + + + + + + 128913 + + + 128912 + + + + + 87771 + + + + + + 130027 + + + 130028 + + + + + 85932 + + + + + + 128254 + + + 128255 + + + + + 86781 + + + + + + 129051 + + + 129052 + + + + + 90177 + + + + + + 132354 + + + 132364 + + + + + 86640 + + + + + + 128912 + + + 128911 + + + + + 87772 + + + + + + 130028 + + + 130029 + + + + + 105177 + + + + + + 146718 + + + 146726 + + + + + 85933 + + + + + + 128255 + + + 128256 + + + + + 86782 + + + + + + 129052 + + + 129053 + + + + + 90178 + + + + + + 132364 + + + 132363 + + + + + 86641 + + + + + + 128911 + + + 128910 + + + + + 105036 + + + + + + 146584 + + + 146587 + + + + + 87773 + + + + + + 130029 + + + 130030 + + + + + 105178 + + + + + + 146726 + + + 146727 + + + + + 85934 + + + + + + 128256 + + + 128257 + + + + + 86783 + + + + + + 129050 + + + 129054 + + + + + 90179 + + + + + + 132363 + + + 132362 + + + + + 86642 + + + + + + 128910 + + + 128276 + + + + + 105037 + + + + + + 146587 + + + 146586 + + + + + 96830 + + + + + + 132329 + + + 138494 + + + + + 87774 + + + + + + 130030 + + + 130028 + + + + + 105179 + + + + + + 146727 + + + 146729 + + + + + 85935 + + + + + + 128257 + + + 128258 + + + + + 86784 + + + + + + 129054 + + + 129055 + + + + + 90180 + + + + + + 132362 + + + 132361 + + + + + 105038 + + + + + + 146586 + + + 129001 + + + + + 86643 + + + + + + 128267 + + + 128916 + + + + + 87775 + + + + + + 130025 + + + 130020 + + + + + 86785 + + + + + + 129055 + + + 129056 + + + + + 90181 + + + + + + 132361 + + + 132360 + + + + + 85936 + + + + + + 128258 + + + 128259 + + + + + 86644 + + + + + + 128916 + + + 128917 + + + + + 87776 + + + + + + 130020 + + + 130021 + + + + + 86786 + + + + + + 129053 + + + 129057 + + + + + 90182 + + + + + + 132360 + + + 132359 + + + + + 85937 + + + + + + 128259 + + + 128260 + + + + + 86645 + + + + + + 128917 + + + 128265 + + + + + 87777 + + + + + + 130021 + + + 130022 + + + + + 90183 + + + + + + 132359 + + + 132358 + + + + + 85938 + + + + + + 128260 + + + 128261 + + + + + 86787 + + + + + + 129057 + + + 129058 + + + + + 86646 + + + + + + 128267 + + + 128918 + + + + + 96834 + + + + + + 138494 + + + 138495 + + + + + 87778 + + + + + + 130022 + + + 130009 + + + + + 105183 + + + + + + 146732 + + + 146729 + + + + + 90184 + + + + + + 132358 + + + 132357 + + + + + 85939 + + + + + + 128261 + + + 128262 + + + + + 86788 + + + + + + 129058 + + + 129059 + + + + + 86647 + + + + + + 128918 + + + 128916 + + + + + 87779 + + + + + + 130022 + + + 130016 + + + + + 90185 + + + + + + 132357 + + + 132356 + + + + + 85940 + + + + + + 128262 + + + 128263 + + + + + 86789 + + + + + + 129056 + + + 129060 + + + + + 86648 + + + + + + 128918 + + + 128919 + + + + + 96836 + + + + + + 138495 + + + 138500 + + + + + 87780 + + + + + + 130017 + + + 130031 + + + + + 90186 + + + + + + 132356 + + + 132355 + + + + + 85941 + + + + + + 128263 + + + 128264 + + + + + 86790 + + + + + + 129060 + + + 129061 + + + + + 86649 + + + + + + 128919 + + + 128920 + + + + + 96837 + + + + + + 138500 + + + 138503 + + + + + 87781 + + + + + + 130031 + + + 130021 + + + + + 90187 + + + + + + 132355 + + + 132341 + + + + + 85942 + + + + + + 128264 + + + 128265 + + + + + 86791 + + + + + + 129061 + + + 129062 + + + + + 86650 + + + + + + 128920 + + + 128921 + + + + + 87782 + + + + + + 130020 + + + 130019 + + + + + 105187 + + + + + + 146732 + + + 146736 + + + + + 86792 + + + + + + 129062 + + + 129063 + + + + + 86651 + + + + + + 128921 + + + 128922 + + + + + 87783 + + + + + + 130019 + + + 130018 + + + + + 105188 + + + + + + 146736 + + + 146737 + + + + + 86793 + + + + + + 129063 + + + 129064 + + + + + 86652 + + + + + + 128922 + + + 128923 + + + + + 96840 + + + + + + 138503 + + + 138504 + + + + + 87784 + + + + + + 130018 + + + 130004 + + + + + 105189 + + + + + + 146737 + + + 146738 + + + + + 85945 + + + + + + 128267 + + + 128268 + + + + + 86794 + + + + + + 129064 + + + 129065 + + + + + 86653 + + + + + + 128923 + + + 128924 + + + + + 87785 + + + + + + 129861 + + + 130032 + + + + + 105190 + + + + + + 146738 + + + 146739 + + + + + 85946 + + + + + + 128268 + + + 128269 + + + + + 86795 + + + + + + 129065 + + + 129066 + + + + + 86654 + + + + + + 128924 + + + 128925 + + + + + 87786 + + + + + + 130032 + + + 129859 + + + + + 105191 + + + + + + 146739 + + + 146740 + + + + + 85947 + + + + + + 128269 + + + 128270 + + + + + 86796 + + + + + + 129066 + + + 129067 + + + + + 86655 + + + + + + 128925 + + + 128926 + + + + + 87787 + + + + + + 129851 + + + 130039 + + + + + 105192 + + + + + + 146740 + + + 146741 + + + + + 85948 + + + + + + 128270 + + + 128271 + + + + + 86797 + + + + + + 129067 + + + 129068 + + + + + 105051 + + + + + + 146602 + + + 129071 + + + + + 87788 + + + + + + 130039 + + + 129853 + + + + + 86656 + + + + + + 128926 + + + 128927 + + + + + 105193 + + + + + + 146741 + + + 146742 + + + + + 85949 + + + + + + 128271 + + + 128272 + + + + + 86798 + + + + + + 129059 + + + 129069 + + + + + 87647 + + + + + + 129911 + + + 129912 + + + + + 87789 + + + + + + 130039 + + + 130038 + + + + + 86657 + + + + + + 128927 + + + 128928 + + + + + 86799 + + + + + + 129069 + + + 129070 + + + + + 87648 + + + + + + 129912 + + + 129913 + + + + + 87790 + + + + + + 130038 + + + 130037 + + + + + 86658 + + + + + + 128928 + + + 128929 + + + + + 86800 + + + + + + 129070 + + + 129071 + + + + + 87649 + + + + + + 129913 + + + 129914 + + + + + 87791 + + + + + + 130038 + + + 130033 + + + + + 86659 + + + + + + 128929 + + + 128930 + + + + + 85952 + + + + + + 128274 + + + 128275 + + + + + 86801 + + + + + + 129071 + + + 129072 + + + + + 87650 + + + + + + 129914 + + + 129915 + + + + + 96848 + + + + + + 138504 + + + 138515 + + + + + 87792 + + + + + + 130033 + + + 130032 + + + + + 86660 + + + + + + 128930 + + + 128931 + + + + + 85953 + + + + + + 128275 + + + 128276 + + + + + 86802 + + + + + + 129072 + + + 129073 + + + + + 87651 + + + + + + 129915 + + + 129916 + + + + + 96849 + + + + + + 138515 + + + 138516 + + + + + 87793 + + + + + + 130033 + + + 130034 + + + + + 86661 + + + + + + 128931 + + + 128932 + + + + + 105198 + + + + + + 146742 + + + 146754 + + + + + 85954 + + + + + + 128276 + + + 128277 + + + + + 86803 + + + + + + 129073 + + + 129074 + + + + + 87652 + + + + + + 129916 + + + 129917 + + + + + 105057 + + + + + + 146602 + + + 146606 + + + + + 96850 + + + + + + 138516 + + + 138517 + + + + + 87794 + + + + + + 130034 + + + 130035 + + + + + 86662 + + + + + + 128932 + + + 128933 + + + + + 86804 + + + + + + 129068 + + + 129075 + + + + + 87653 + + + + + + 129917 + + + 129918 + + + + + 105058 + + + + + + 146606 + + + 146607 + + + + + 96851 + + + + + + 138517 + + + 138518 + + + + + 87795 + + + + + + 130035 + + + 130036 + + + + + 86663 + + + + + + 128933 + + + 128934 + + + + + 86805 + + + + + + 129075 + + + 129076 + + + + + 87654 + + + + + + 129918 + + + 129919 + + + + + 96852 + + + + + + 138518 + + + 138519 + + + + + 87796 + + + + + + 130036 + + + 130037 + + + + + 86664 + + + + + + 128934 + + + 128935 + + + + + 105201 + + + + + + 146754 + + + 146755 + + + + + 85957 + + + + + + 128279 + + + 128280 + + + + + 86806 + + + + + + 129076 + + + 129077 + + + + + 87655 + + + + + + 129919 + + + 129920 + + + + + 105060 + + + + + + 146607 + + + 146608 + + + + + 87797 + + + + + + 130037 + + + 130040 + + + + + 86665 + + + + + + 128935 + + + 128936 + + + + + 85958 + + + + + + 128280 + + + 128281 + + + + + 86807 + + + + + + 129077 + + + 129078 + + + + + 87656 + + + + + + 129920 + + + 129921 + + + + + 96854 + + + + + + 138519 + + + 138520 + + + + + 87798 + + + + + + 130040 + + + 130041 + + + + + 86666 + + + + + + 128936 + + + 128937 + + + + + 85959 + + + + + + 128281 + + + 128282 + + + + + 86808 + + + + + + 129078 + + + 129079 + + + + + 87657 + + + + + + 129921 + + + 129922 + + + + + 87799 + + + + + + 130041 + + + 130042 + + + + + 86667 + + + + + + 128937 + + + 128938 + + + + + 105487 + + + + + + 147038 + + + 147039 + + + + + 85960 + + + + + + 128282 + + + 128283 + + + + + 86809 + + + + + + 129084 + + + 129083 + + + + + 87658 + + + + + + 129922 + + + 129923 + + + + + 96856 + + + + + + 138520 + + + 138522 + + + + + 87800 + + + + + + 130042 + + + 130043 + + + + + 86668 + + + + + + 128938 + + + 128939 + + + + + 105488 + + + + + + 147039 + + + 147040 + + + + + 85961 + + + + + + 128283 + + + 128284 + + + + + 86810 + + + + + + 129083 + + + 129082 + + + + + 87659 + + + + + + 129923 + + + 129924 + + + + + 87801 + + + + + + 130043 + + + 130044 + + + + + 86669 + + + + + + 128939 + + + 128940 + + + + + 105489 + + + + + + 147040 + + + 147041 + + + + + 105206 + + + + + + 146755 + + + 146756 + + + + + 85962 + + + + + + 128284 + + + 128285 + + + + + 86811 + + + + + + 129082 + + + 129081 + + + + + 87660 + + + + + + 129924 + + + 129925 + + + + + 105065 + + + + + + 146608 + + + 146614 + + + + + 96858 + + + + + + 138522 + + + 138523 + + + + + 87802 + + + + + + 130044 + + + 130045 + + + + + 86670 + + + + + + 128940 + + + 128941 + + + + + 105490 + + + + + + 147041 + + + 147042 + + + + + 105207 + + + + + + 146756 + + + 146757 + + + + + 85963 + + + + + + 128285 + + + 128286 + + + + + 86812 + + + + + + 129081 + + + 129080 + + + + + 87661 + + + + + + 129925 + + + 129926 + + + + + 105066 + + + + + + 146614 + + + 146615 + + + + + 87803 + + + + + + 130045 + + + 130046 + + + + + 86671 + + + + + + 128941 + + + 128942 + + + + + 105491 + + + + + + 147042 + + + 147043 + + + + + 105208 + + + + + + 146757 + + + 146768 + + + + + 85964 + + + + + + 128286 + + + 128287 + + + + + 86813 + + + + + + 129080 + + + 129074 + + + + + 87662 + + + + + + 129926 + + + 129927 + + + + + 105067 + + + + + + 146615 + + + 146616 + + + + + 96860 + + + + + + 138523 + + + 138526 + + + + + 87804 + + + + + + 130046 + + + 130043 + + + + + 86672 + + + + + + 128942 + + + 128943 + + + + + 105492 + + + + + + 147043 + + + 147044 + + + + + 85965 + + + + + + 128287 + + + 128288 + + + + + 86814 + + + + + + 129079 + + + 129085 + + + + + 87663 + + + + + + 129927 + + + 129928 + + + + + 105068 + + + + + + 146616 + + + 146617 + + + + + 96861 + + + + + + 138526 + + + 138528 + + + + + 87805 + + + + + + 130046 + + + 130047 + + + + + 86673 + + + + + + 128943 + + + 128944 + + + + + 105493 + + + + + + 147044 + + + 147045 + + + + + 85966 + + + + + + 128288 + + + 128289 + + + + + 86815 + + + + + + 129085 + + + 129086 + + + + + 87664 + + + + + + 129928 + + + 129929 + + + + + 105069 + + + + + + 146617 + + + 146618 + + + + + 87806 + + + + + + 130047 + + + 130048 + + + + + 86674 + + + + + + 128944 + + + 128945 + + + + + 105494 + + + + + + 147045 + + + 147046 + + + + + 105211 + + + + + + 146768 + + + 146769 + + + + + 85967 + + + + + + 128289 + + + 128286 + + + + + 86816 + + + + + + 129087 + + + 129088 + + + + + 87665 + + + + + + 129929 + + + 129930 + + + + + 105070 + + + + + + 146618 + + + 146619 + + + + + 96863 + + + + + + 138528 + + + 138533 + + + + + 87807 + + + + + + 130048 + + + 128270 + + + + + 86675 + + + + + + 128945 + + + 128946 + + + + + 105495 + + + + + + 147046 + + + 147047 + + + + + 86817 + + + + + + 129088 + + + 129084 + + + + + 87666 + + + + + + 129930 + + + 129931 + + + + + 105071 + + + + + + 146619 + + + 146620 + + + + + 87808 + + + + + + 130045 + + + 129848 + + + + + 86676 + + + + + + 128946 + + + 128947 + + + + + 105496 + + + + + + 147047 + + + 147048 + + + + + 86818 + + + + + + 129086 + + + 129089 + + + + + 87667 + + + + + + 129931 + + + 129932 + + + + + 105072 + + + + + + 146620 + + + 146621 + + + + + 96865 + + + + + + 138533 + + + 138536 + + + + + 87809 + + + + + + 128269 + + + 130049 + + + + + 86677 + + + + + + 128947 + + + 128948 + + + + + 105497 + + + + + + 147048 + + + 147049 + + + + + 86819 + + + + + + 129087 + + + 129090 + + + + + 87668 + + + + + + 129932 + + + 129933 + + + + + 105073 + + + + + + 146621 + + + 146622 + + + + + 87810 + + + + + + 130049 + + + 128270 + + + + + 86678 + + + + + + 128948 + + + 128949 + + + + + 105498 + + + + + + 147049 + + + 147050 + + + + + 86820 + + + + + + 129089 + + + 129091 + + + + + 87669 + + + + + + 129933 + + + 129934 + + + + + 89933 + + + + + + 130070 + + + 132125 + + + + + 105074 + + + + + + 146622 + + + 146623 + + + + + 87811 + + + + + + 130049 + + + 130050 + + + + + 86679 + + + + + + 128949 + + + 128950 + + + + + 105499 + + + + + + 147050 + + + 147051 + + + + + 86821 + + + + + + 129091 + + + 129092 + + + + + 87670 + + + + + + 128965 + + + 129935 + + + + + 89934 + + + + + + 132125 + + + 132126 + + + + + 105075 + + + + + + 146623 + + + 146624 + + + + + 96868 + + + + + + 138536 + + + 138537 + + + + + 87812 + + + + + + 130050 + + + 130051 + + + + + 86680 + + + + + + 128950 + + + 128951 + + + + + 105500 + + + + + + 147051 + + + 147052 + + + + + 86822 + + + + + + 129094 + + + 129093 + + + + + 87671 + + + + + + 129935 + + + 129936 + + + + + 89935 + + + + + + 132126 + + + 132127 + + + + + 105076 + + + + + + 146624 + + + 146626 + + + + + 87813 + + + + + + 128272 + + + 130053 + + + + + 86681 + + + + + + 128951 + + + 128952 + + + + + 105501 + + + + + + 147052 + + + 147053 + + + + + 86823 + + + + + + 129093 + + + 129090 + + + + + 87672 + + + + + + 129936 + + + 129937 + + + + + 89936 + + + + + + 132127 + + + 132128 + + + + + 87814 + + + + + + 130053 + + + 130052 + + + + + 86682 + + + + + + 128952 + + + 128953 + + + + + 105502 + + + + + + 147053 + + + 147054 + + + + + 86824 + + + + + + 129092 + + + 129095 + + + + + 87673 + + + + + + 129937 + + + 128968 + + + + + 89937 + + + + + + 132128 + + + 132129 + + + + + 96871 + + + + + + 138537 + + + 138538 + + + + + 87815 + + + + + + 130053 + + + 130051 + + + + + 86683 + + + + + + 128953 + + + 128954 + + + + + 105503 + + + + + + 147054 + + + 147055 + + + + + 105220 + + + + + + 146769 + + + 146770 + + + + + 86825 + + + + + + 129094 + + + 129096 + + + + + 87674 + + + + + + 129934 + + + 129938 + + + + + 89938 + + + + + + 132129 + + + 132130 + + + + + 96872 + + + + + + 138538 + + + 138539 + + + + + 87816 + + + + + + 130052 + + + 128274 + + + + + 86684 + + + + + + 128954 + + + 128955 + + + + + 105504 + + + + + + 147055 + + + 147056 + + + + + 105221 + + + + + + 146770 + + + 146771 + + + + + 86826 + + + + + + 129095 + + + 129097 + + + + + 87675 + + + + + + 129938 + + + 129939 + + + + + 89939 + + + + + + 132130 + + + 132131 + + + + + 96873 + + + + + + 138539 + + + 138540 + + + + + 87817 + + + + + + 130052 + + + 128914 + + + + + 86685 + + + + + + 128955 + + + 128956 + + + + + 105505 + + + + + + 147056 + + + 147057 + + + + + 105222 + + + + + + 146771 + + + 146772 + + + + + 87676 + + + + + + 129939 + + + 129940 + + + + + 89940 + + + + + + 132131 + + + 132132 + + + + + 87818 + + + + + + 128268 + + + 130054 + + + + + 86686 + + + + + + 128956 + + + 128957 + + + + + 96874 + + + + + + 138540 + + + 138541 + + + + + 105506 + + + + + + 147057 + + + 147058 + + + + + 105223 + + + + + + 146772 + + + 146773 + + + + + 86828 + + + + + + 129099 + + + 129100 + + + + + 87677 + + + + + + 129940 + + + 129941 + + + + + 89941 + + + + + + 132132 + + + 132133 + + + + + 87819 + + + + + + 130054 + + + 130055 + + + + + 86687 + + + + + + 128957 + + + 128958 + + + + + 96875 + + + + + + 138541 + + + 138542 + + + + + 105507 + + + + + + 147058 + + + 147059 + + + + + 105224 + + + + + + 146773 + + + 146774 + + + + + 86829 + + + + + + 129100 + + + 129096 + + + + + 87678 + + + + + + 129941 + + + 129942 + + + + + 89942 + + + + + + 132133 + + + 132134 + + + + + 87820 + + + + + + 130055 + + + 130056 + + + + + 86688 + + + + + + 128958 + + + 128959 + + + + + 96876 + + + + + + 138542 + + + 138543 + + + + + 105508 + + + + + + 147059 + + + 147060 + + + + + 105225 + + + + + + 146774 + + + 146775 + + + + + 87679 + + + + + + 129942 + + + 129935 + + + + + 89943 + + + + + + 132134 + + + 132135 + + + + + 105084 + + + + + + 146626 + + + 146633 + + + + + 87821 + + + + + + 130056 + + + 130050 + + + + + 96877 + + + + + + 138543 + + + 138544 + + + + + 105509 + + + + + + 147060 + + + 147061 + + + + + 105226 + + + + + + 146775 + + + 146776 + + + + + 86831 + + + + + + 129101 + + + 129102 + + + + + 87680 + + + + + + 128964 + + + 129943 + + + + + 89944 + + + + + + 132135 + + + 132136 + + + + + 105085 + + + + + + 146633 + + + 146634 + + + + + 87822 + + + + + + 130056 + + + 130057 + + + + + 96878 + + + + + + 138544 + + + 138545 + + + + + 105510 + + + + + + 147061 + + + 147062 + + + + + 105227 + + + + + + 146776 + + + 146777 + + + + + 86832 + + + + + + 129103 + + + 129104 + + + + + 87681 + + + + + + 129943 + + + 129944 + + + + + 89945 + + + + + + 132136 + + + 132137 + + + + + 105086 + + + + + + 146634 + + + 146635 + + + + + 87823 + + + + + + 130057 + + + 130059 + + + + + 86691 + + + + + + 128957 + + + 128962 + + + + + 96879 + + + + + + 138545 + + + 138546 + + + + + 105511 + + + + + + 147062 + + + 147063 + + + + + 105228 + + + + + + 146777 + + + 146778 + + + + + 86833 + + + + + + 129104 + + + 129099 + + + + + 87682 + + + + + + 129944 + + + 128969 + + + + + 89946 + + + + + + 132137 + + + 132138 + + + + + 87824 + + + + + + 130059 + + + 130058 + + + + + 86692 + + + + + + 128962 + + + 128963 + + + + + 96880 + + + + + + 129097 + + + 138548 + + + + + 105512 + + + + + + 147063 + + + 147064 + + + + + 86834 + + + + + + 129102 + + + 129105 + + + + + 87683 + + + + + + 129944 + + + 129954 + + + + + 89947 + + + + + + 132138 + + + 132139 + + + + + 87825 + + + + + + 130058 + + + 130057 + + + + + 86693 + + + + + + 128963 + + + 128965 + + + + + 96881 + + + + + + 138548 + + + 138547 + + + + + 105513 + + + + + + 147064 + + + 147065 + + + + + 86835 + + + + + + 129105 + + + 129106 + + + + + 87684 + + + + + + 129954 + + + 129953 + + + + + 89948 + + + + + + 132137 + + + 132153 + + + + + 87826 + + + + + + 130058 + + + 128914 + + + + + 86694 + + + + + + 128961 + + + 128964 + + + + + 87543 + + + + + + 128959 + + + 129814 + + + + + 96882 + + + + + + 138547 + + + 129101 + + + + + 105514 + + + + + + 147065 + + + 147066 + + + + + 86836 + + + + + + 129107 + + + 129108 + + + + + 87685 + + + + + + 129953 + + + 129952 + + + + + 89949 + + + + + + 132153 + + + 132152 + + + + + 87827 + + + + + + 128277 + + + 130071 + + + + + 87544 + + + + + + 129814 + + + 129815 + + + + + 96883 + + + + + + 138548 + + + 138550 + + + + + 105515 + + + + + + 147066 + + + 147067 + + + + + 86837 + + + + + + 129108 + + + 129103 + + + + + 87686 + + + + + + 129952 + + + 129951 + + + + + 89950 + + + + + + 132152 + + + 132151 + + + + + 87828 + + + + + + 130071 + + + 130069 + + + + + 87545 + + + + + + 129815 + + + 129816 + + + + + 96884 + + + + + + 138550 + + + 138546 + + + + + 105516 + + + + + + 147067 + + + 147068 + + + + + 86838 + + + + + + 129106 + + + 129109 + + + + + 87687 + + + + + + 129951 + + + 129950 + + + + + 89951 + + + + + + 132151 + + + 132150 + + + + + 87829 + + + + + + 130069 + + + 128277 + + + + + 87546 + + + + + + 129816 + + + 129817 + + + + + 105517 + + + + + + 147068 + + + 147069 + + + + + 89952 + + + + + + 132150 + + + 132149 + + + + + 105093 + + + + + + 146635 + + + 146642 + + + + + 87830 + + + + + + 130071 + + + 130070 + + + + + 87547 + + + + + + 129817 + + + 129818 + + + + + 105518 + + + + + + 147069 + + + 147070 + + + + + 89953 + + + + + + 132149 + + + 132148 + + + + + 105094 + + + + + + 146642 + + + 146643 + + + + + 87831 + + + + + + 130070 + + + 128279 + + + + + 86699 + + + + + + 128968 + + + 128970 + + + + + 87548 + + + + + + 129818 + + + 129819 + + + + + 105519 + + + + + + 147070 + + + 147071 + + + + + 86841 + + + + + + 129112 + + + 129107 + + + + + 87690 + + + + + + 129948 + + + 129947 + + + + + 89954 + + + + + + 132148 + + + 132143 + + + + + 105095 + + + + + + 146643 + + + 146644 + + + + + 87832 + + + + + + 130069 + + + 130068 + + + + + 86700 + + + + + + 128969 + + + 128971 + + + + + 87549 + + + + + + 129819 + + + 129820 + + + + + 105520 + + + + + + 147071 + + + 147072 + + + + + 87691 + + + + + + 129947 + + + 129946 + + + + + 89955 + + + + + + 132143 + + + 132142 + + + + + 87833 + + + + + + 130068 + + + 130067 + + + + + 86701 + + + + + + 128970 + + + 128972 + + + + + 87550 + + + + + + 129820 + + + 129821 + + + + + 105521 + + + + + + 147072 + + + 147073 + + + + + 87692 + + + + + + 129946 + + + 129945 + + + + + 89956 + + + + + + 132142 + + + 132141 + + + + + 87834 + + + + + + 130067 + + + 130066 + + + + + 86702 + + + + + + 128971 + + + 128973 + + + + + 87551 + + + + + + 129821 + + + 129822 + + + + + 105522 + + + + + + 147073 + + + 147074 + + + + + 87693 + + + + + + 129945 + + + 129937 + + + + + 89957 + + + + + + 132141 + + + 132140 + + + + + 86703 + + + + + + 128972 + + + 128974 + + + + + 87552 + + + + + + 129822 + + + 129823 + + + + + 87835 + + + + + + 130066 + + + 130064 + + + + + 105523 + + + + + + 147074 + + + 147075 + + + + + 87694 + + + + + + 129824 + + + 129955 + + + + + 89958 + + + + + + 132140 + + + 132139 + + + + + 105099 + + + + + + 146644 + + + 146652 + + + + + 86704 + + + + + + 128973 + + + 128975 + + + + + 87553 + + + + + + 129823 + + + 129824 + + + + + 87836 + + + + + + 130064 + + + 130063 + + + + + 105524 + + + + + + 147075 + + + 147076 + + + + + 87695 + + + + + + 129955 + + + 129956 + + + + + 89959 + + + + + + 132143 + + + 132144 + + + + + 86705 + + + + + + 128974 + + + 128976 + + + + + 87554 + + + + + + 129824 + + + 129825 + + + + + 87837 + + + + + + 130064 + + + 130065 + + + + + 105525 + + + + + + 147076 + + + 147077 + + + + + 87696 + + + + + + 129956 + + + 129957 + + + + + 89960 + + + + + + 132144 + + + 132145 + + + + + 86706 + + + + + + 128975 + + + 128977 + + + + + 87555 + + + + + + 129825 + + + 129826 + + + + + 87838 + + + + + + 130065 + + + 130061 + + + + + 105526 + + + + + + 147077 + + + 147078 + + + + + 87697 + + + + + + 129957 + + + 129958 + + + + + 89961 + + + + + + 132145 + + + 132146 + + + + + 105102 + + + + + + 146652 + + + 146653 + + + + + 86707 + + + + + + 128976 + + + 128978 + + + + + 87556 + + + + + + 129826 + + + 129827 + + + + + 87839 + + + + + + 130061 + + + 130062 + + + + + 105527 + + + + + + 147078 + + + 147079 + + + + + 87698 + + + + + + 129958 + + + 129959 + + + + + 89962 + + + + + + 132146 + + + 132147 + + + + + 86708 + + + + + + 128977 + + + 128979 + + + + + 87557 + + + + + + 129827 + + + 129828 + + + + + 87840 + + + + + + 130062 + + + 130063 + + + + + 105528 + + + + + + 147079 + + + 147080 + + + + + 87699 + + + + + + 129959 + + + 129960 + + + + + 89963 + + + + + + 128229 + + + 132159 + + + + + 86709 + + + + + + 128978 + + + 128980 + + + + + 87558 + + + + + + 129828 + + + 129829 + + + + + 87841 + + + + + + 130061 + + + 130060 + + + + + 105529 + + + + + + 147080 + + + 147081 + + + + + 87700 + + + + + + 129960 + + + 129961 + + + + + 89964 + + + + + + 132159 + + + 132160 + + + + + 105105 + + + + + + 146653 + + + 146654 + + + + + 86710 + + + + + + 128979 + + + 128981 + + + + + 87559 + + + + + + 129829 + + + 129830 + + + + + 87842 + + + + + + 130060 + + + 130059 + + + + + 105530 + + + + + + 147081 + + + 147082 + + + + + 87701 + + + + + + 129961 + + + 129962 + + + + + 89965 + + + + + + 132160 + + + 128231 + + + + + 105106 + + + + + + 146654 + + + 146657 + + + + + 86711 + + + + + + 128980 + + + 128982 + + + + + 87560 + + + + + + 129830 + + + 129831 + + + + + 105531 + + + + + + 147082 + + + 147083 + + + + + 87702 + + + + + + 129962 + + + 129963 + + + + + 89966 + + + + + + 132159 + + + 132154 + + + + + 86712 + + + + + + 128981 + + + 128983 + + + + + 87561 + + + + + + 129831 + + + 129832 + + + + + 105532 + + + + + + 147083 + + + 147084 + + + + + 87703 + + + + + + 129963 + + + 129964 + + + + + 89967 + + + + + + 132154 + + + 132155 + + + + + 86713 + + + + + + 128982 + + + 128984 + + + + + 87562 + + + + + + 129832 + + + 129833 + + + + + 105533 + + + + + + 147084 + + + 147085 + + + + + 89968 + + + + + + 132155 + + + 132156 + + + + + 87704 + + + + + + 129964 + + + 129965 + + + + + 86714 + + + + + + 128983 + + + 128985 + + + + + 87563 + + + + + + 129833 + + + 129834 + + + + + 105534 + + + + + + 147085 + + + 147086 + + + + + 89969 + + + + + + 132156 + + + 132157 + + + + + 87705 + + + + + + 129965 + + + 129966 + + + + + 86715 + + + + + + 128984 + + + 128986 + + + + + 87564 + + + + + + 129834 + + + 129835 + + + + + 90111 + + + + + + 132290 + + + 132291 + + + + + 105535 + + + + + + 147086 + + + 147087 + + + + + 89970 + + + + + + 132157 + + + 132158 + + + + + 87706 + + + + + + 129966 + + + 129967 + + + + + 86716 + + + + + + 128985 + + + 128987 + + + + + 87565 + + + + + + 129835 + + + 129836 + + + + + 90112 + + + + + + 132291 + + + 132292 + + + + + 105536 + + + + + + 147087 + + + 147088 + + + + + 89971 + + + + + + 132158 + + + 132161 + + + + + 87707 + + + + + + 129967 + + + 129968 + + + + + 86717 + + + + + + 128987 + + + 128988 + + + + + 87566 + + + + + + 129836 + + + 129837 + + + + + 90113 + + + + + + 132292 + + + 132293 + + + + + 105537 + + + + + + 147088 + + + 147089 + + + + + 89972 + + + + + + 132161 + + + 132162 + + + + + 87708 + + + + + + 129968 + + + 129971 + + + + + 86718 + + + + + + 128988 + + + 128989 + + + + + 87567 + + + + + + 129837 + + + 129838 + + + + + 90114 + + + + + + 132293 + + + 132294 + + + + + 105538 + + + + + + 147089 + + + 147090 + + + + + 89973 + + + + + + 132162 + + + 132163 + + + + + 87709 + + + + + + 129971 + + + 129972 + + + + + 105114 + + + + + + 146657 + + + 146663 + + + + + 86719 + + + + + + 128989 + + + 128990 + + + + + 87568 + + + + + + 129838 + + + 129839 + + + + + 90115 + + + + + + 132294 + + + 132295 + + + + + 105539 + + + + + + 147090 + + + 147091 + + + + + 89974 + + + + + + 132163 + + + 132164 + + + + + 87710 + + + + + + 129972 + + + 129973 + + + + + 105115 + + + + + + 146663 + + + 146664 + + + + + 86720 + + + + + + 128986 + + + 128991 + + + + + 87569 + + + + + + 129839 + + + 129840 + + + + + 90116 + + + + + + 132295 + + + 132296 + + + + + 105540 + + + + + + 147091 + + + 147092 + + + + + 89975 + + + + + + 132164 + + + 132165 + + + + + 87711 + + + + + + 129973 + + + 129970 + + + + + 105116 + + + + + + 146664 + + + 146665 + + + + + 86721 + + + + + + 128991 + + + 128992 + + + + + 87570 + + + + + + 129840 + + + 129841 + + + + + 90117 + + + + + + 132296 + + + 132297 + + + + + 105541 + + + + + + 147092 + + + 147093 + + + + + 89976 + + + + + + 132165 + + + 132166 + + + + + 87712 + + + + + + 129970 + + + 129969 + + + + + 87571 + + + + + + 129841 + + + 129842 + + + + + 90118 + + + + + + 132297 + + + 132298 + + + + + 86722 + + + + + + 128992 + + + 128993 + + + + + 105542 + + + + + + 147093 + + + 147094 + + + + + 89977 + + + + + + 132166 + + + 132167 + + + + + 87713 + + + + + + 129969 + + + 129966 + + + + + 87572 + + + + + + 129842 + + + 129843 + + + + + 90119 + + + + + + 132298 + + + 132299 + + + + + 86723 + + + + + + 128990 + + + 128994 + + + + + 105543 + + + + + + 147094 + + + 147095 + + + + + 89978 + + + + + + 132167 + + + 132168 + + + + + 87714 + + + + + + 129969 + + + 129974 + + + + + 90120 + + + + + + 132299 + + + 132300 + + + + + 86724 + + + + + + 128994 + + + 128995 + + + + + 87573 + + + + + + 129843 + + + 129844 + + + + + 105544 + + + + + + 147095 + + + 147096 + + + + + 89979 + + + + + + 132168 + + + 132169 + + + + + 87715 + + + + + + 129974 + + + 129968 + + + + + 105120 + + + + + + 146665 + + + 146675 + + + + + 90121 + + + + + + 132300 + + + 132301 + + + + + 86725 + + + + + + 128995 + + + 128996 + + + + + 87574 + + + + + + 129844 + + + 129845 + + + + + 105545 + + + + + + 147096 + + + 147097 + + + + + 89980 + + + + + + 132169 + + + 132170 + + + + + 87716 + + + + + + 129971 + + + 129975 + + + + + 90122 + + + + + + 132301 + + + 132302 + + + + + 86726 + + + + + + 128996 + + + 128997 + + + + + 87575 + + + + + + 129845 + + + 129846 + + + + + 105546 + + + + + + 147097 + + + 147098 + + + + + 89981 + + + + + + 132170 + + + 132171 + + + + + 87717 + + + + + + 129975 + + + 129976 + + + + + 105122 + + + + + + 146675 + + + 146676 + + + + + 90123 + + + + + + 132302 + + + 132303 + + + + + 86727 + + + + + + 128993 + + + 128998 + + + + + 87576 + + + + + + 129846 + + + 129847 + + + + + 105547 + + + + + + 147098 + + + 147099 + + + + + 89982 + + + + + + 132171 + + + 132172 + + + + + 87718 + + + + + + 129976 + + + 129977 + + + + + 90124 + + + + + + 132303 + + + 132304 + + + + + 86728 + + + + + + 128998 + + + 128999 + + + + + 87577 + + + + + + 129847 + + + 129848 + + + + + 105548 + + + + + + 147099 + + + 147100 + + + + + 89983 + + + + + + 132172 + + + 132173 + + + + + 87719 + + + + + + 129977 + + + 129978 + + + + + 90125 + + + + + + 132304 + + + 132305 + + + + + 86729 + + + + + + 128999 + + + 129000 + + + + + 87578 + + + + + + 129848 + + + 129849 + + + + + 105549 + + + + + + 147100 + + + 147101 + + + + + 89984 + + + + + + 132173 + + + 132174 + + + + + 87720 + + + + + + 129978 + + + 129979 + + + + + 90126 + + + + + + 132305 + + + 132306 + + + + + 86730 + + + + + + 129000 + + + 129001 + + + + + 87579 + + + + + + 129849 + + + 129850 + + + + + 105550 + + + + + + 147101 + + + 147102 + + + + + 89985 + + + + + + 132174 + + + 132175 + + + + + 87721 + + + + + + 129979 + + + 129980 + + + + + 90127 + + + + + + 132306 + + + 132307 + + + + + 86731 + + + + + + 128997 + + + 129002 + + + + + 87580 + + + + + + 129850 + + + 129851 + + + + + 105551 + + + + + + 147102 + + + 147103 + + + + + 89986 + + + + + + 132175 + + + 132176 + + + + + 87722 + + + + + + 129980 + + + 129981 + + + + + 86732 + + + + + + 129002 + + + 129003 + + + + + 90128 + + + + + + 132307 + + + 132308 + + + + + 105552 + + + + + + 147103 + + + 147104 + + + + + 89987 + + + + + + 132176 + + + 132177 + + + + + 87723 + + + + + + 129981 + + + 129982 + + + + + 105128 + + + + + + 146676 + + + 146677 + + + + + 86733 + + + + + + 129001 + + + 129004 + + + + + 90129 + + + + + + 132308 + + + 132309 + + + + + 105553 + + + + + + 147104 + + + 147105 + + + + + 89988 + + + + + + 132177 + + + 132178 + + + + + 87724 + + + + + + 129982 + + + 129983 + + + + + 105129 + + + + + + 146677 + + + 146678 + + + + + 86734 + + + + + + 129004 + + + 129005 + + + + + 87583 + + + + + + 129853 + + + 129854 + + + + + 90130 + + + + + + 132309 + + + 132310 + + + + + 105554 + + + + + + 147106 + + + 147107 + + + + + 89989 + + + + + + 132178 + + + 132179 + + + + + 87725 + + + + + + 129983 + + + 129984 + + + + + 105130 + + + + + + 146678 + + + 146679 + + + + + 86735 + + + + + + 129003 + + + 129006 + + + + + 87584 + + + + + + 129854 + + + 129855 + + + + + 90131 + + + + + + 132310 + + + 132311 + + + + + 105555 + + + + + + 147107 + + + 147108 + + + + + 89990 + + + + + + 132179 + + + 132180 + + + + + 87726 + + + + + + 129984 + + + 129988 + + + + + 86736 + + + + + + 129006 + + + 129007 + + + + + 87585 + + + + + + 129855 + + + 129856 + + + + + 90132 + + + + + + 132311 + + + 132312 + + + + + 105556 + + + + + + 147108 + + + 147109 + + + + + 89991 + + + + + + 132180 + + + 132181 + + + + + 87727 + + + + + + 129988 + + + 129987 + + + + + 86737 + + + + + + 129005 + + + 129009 + + + + + 87586 + + + + + + 129856 + + + 129857 + + + + + 90133 + + + + + + 132312 + + + 132313 + + + + + 105557 + + + + + + 147109 + + + 147110 + + + + + 89992 + + + + + + 132181 + + + 132182 + + + + + 87728 + + + + + + 129987 + + + 129965 + + + + + 86738 + + + + + + 129009 + + + 129010 + + + + + 87587 + + + + + + 129857 + + + 129858 + + + + + 90134 + + + + + + 132313 + + + 132314 + + + + + 105558 + + + + + + 147110 + + + 147111 + + + + + 89993 + + + + + + 132182 + + + 132183 + + + + + 87729 + + + + + + 129987 + + + 129985 + + + + + 105502 + + + + + + 147053 + + + 147054 + + + + + 87788 + + + + + + 130039 + + + 129853 + + + + + 86746 + + + + + + 129016 + + + 129017 + + + + + 90133 + + + + + + 132312 + + + 132313 + + + + + 96906 + + + + + + 138571 + + + 138572 + + + + + 85965 + + + + + + 128287 + + + 128288 + + + + + 105503 + + + + + + 147054 + + + 147055 + + + + + 87789 + + + + + + 130039 + + + 130038 + + + + + 86747 + + + + + + 129013 + + + 129018 + + + + + 90134 + + + + + + 132313 + + + 132314 + + + + + 96907 + + + + + + 138572 + + + 138573 + + + + + 105243 + + + + + + 146797 + + + 146800 + + + + + 85966 + + + + + + 128288 + + + 128289 + + + + + 105504 + + + + + + 147055 + + + 147056 + + + + + 87790 + + + + + + 130038 + + + 130037 + + + + + 86748 + + + + + + 129018 + + + 129019 + + + + + 96908 + + + + + + 138573 + + + 138574 + + + + + 85967 + + + + + + 128289 + + + 128286 + + + + + 90135 + + + + + + 132314 + + + 132315 + + + + + 105505 + + + + + + 147056 + + + 147057 + + + + + 87791 + + + + + + 130038 + + + 130033 + + + + + 86749 + + + + + + 129019 + + + 129020 + + + + + 96909 + + + + + + 138574 + + + 138575 + + + + + 85968 + + + + + + 127357 + + + 128290 + + + + + 90136 + + + + + + 132315 + + + 132316 + + + + + 105506 + + + + + + 147057 + + + 147058 + + + + + 87792 + + + + + + 130033 + + + 130032 + + + + + 86750 + + + + + + 129020 + + + 129021 + + + + + 96910 + + + + + + 138575 + + + 138576 + + + + + 85969 + + + + + + 128290 + + + 128291 + + + + + 90137 + + + + + + 132316 + + + 132317 + + + + + 105507 + + + + + + 147058 + + + 147059 + + + + + 87793 + + + + + + 130033 + + + 130034 + + + + + 86751 + + + + + + 129021 + + + 129022 + + + + + 96911 + + + + + + 138576 + + + 138577 + + + + + 85970 + + + + + + 127358 + + + 128290 + + + + + 90138 + + + + + + 132317 + + + 132318 + + + + + 105508 + + + + + + 147059 + + + 147060 + + + + + 87794 + + + + + + 130034 + + + 130035 + + + + + 86752 + + + + + + 129022 + + + 129024 + + + + + 96912 + + + + + + 138577 + + + 138578 + + + + + 90139 + + + + + + 132318 + + + 132319 + + + + + 105509 + + + + + + 147060 + + + 147061 + + + + + 87795 + + + + + + 130035 + + + 130036 + + + + + 86753 + + + + + + 129024 + + + 129025 + + + + + 96913 + + + + + + 138578 + + + 138579 + + + + + 90140 + + + + + + 132319 + + + 132320 + + + + + 105510 + + + + + + 147061 + + + 147062 + + + + + 87796 + + + + + + 130036 + + + 130037 + + + + + 86754 + + + + + + 129025 + + + 129026 + + + + + 96914 + + + + + + 138579 + + + 138580 + + + + + 85973 + + + + + + 128293 + + + 128294 + + + + + 84931 + + + + + + 127287 + + + 127288 + + + + + 90141 + + + + + + 132320 + + + 132321 + + + + + 105511 + + + + + + 147062 + + + 147063 + + + + + 87797 + + + + + + 130037 + + + 130040 + + + + + 86755 + + + + + + 129017 + + + 129023 + + + + + 96915 + + + + + + 138580 + + + 138581 + + + + + 105251 + + + + + + 146800 + + + 146802 + + + + + 85974 + + + + + + 128294 + + + 128295 + + + + + 84932 + + + + + + 127283 + + + 127288 + + + + + 90142 + + + + + + 132321 + + + 132322 + + + + + 105512 + + + + + + 147063 + + + 147064 + + + + + 87798 + + + + + + 130040 + + + 130041 + + + + + 86756 + + + + + + 129023 + + + 129027 + + + + + 96916 + + + + + + 138581 + + + 138582 + + + + + 105252 + + + + + + 146802 + + + 146803 + + + + + 85975 + + + + + + 128295 + + + 128296 + + + + + 84933 + + + + + + 127283 + + + 127289 + + + + + 90143 + + + + + + 132322 + + + 132323 + + + + + 105513 + + + + + + 147064 + + + 147065 + + + + + 87799 + + + + + + 130041 + + + 130042 + + + + + 86757 + + + + + + 129027 + + + 129028 + + + + + 96917 + + + + + + 138582 + + + 138583 + + + + + 85976 + + + + + + 128296 + + + 128297 + + + + + 84934 + + + + + + 127289 + + + 127287 + + + + + 90144 + + + + + + 132323 + + + 132324 + + + + + 105514 + + + + + + 147065 + + + 147066 + + + + + 87800 + + + + + + 130042 + + + 130043 + + + + + 86758 + + + + + + 129028 + + + 129029 + + + + + 96918 + + + + + + 138583 + + + 138584 + + + + + 85977 + + + + + + 128297 + + + 128298 + + + + + 84935 + + + + + + 127283 + + + 127290 + + + + + 90145 + + + + + + 132324 + + + 132325 + + + + + 105515 + + + + + + 147066 + + + 147067 + + + + + 87801 + + + + + + 130043 + + + 130044 + + + + + 86759 + + + + + + 129026 + + + 129030 + + + + + 96919 + + + + + + 138584 + + + 138585 + + + + + 85978 + + + + + + 128298 + + + 128299 + + + + + 84936 + + + + + + 127290 + + + 127291 + + + + + 90146 + + + + + + 132325 + + + 132326 + + + + + 105516 + + + + + + 147067 + + + 147068 + + + + + 87802 + + + + + + 130044 + + + 130045 + + + + + 86760 + + + + + + 129030 + + + 129031 + + + + + 96920 + + + + + + 138585 + + + 138586 + + + + + 105256 + + + + + + 146803 + + + 146810 + + + + + 85979 + + + + + + 128299 + + + 128300 + + + + + 84937 + + + + + + 127291 + + + 127292 + + + + + 90147 + + + + + + 132326 + + + 132327 + + + + + 105517 + + + + + + 147068 + + + 147069 + + + + + 87803 + + + + + + 130045 + + + 130046 + + + + + 86761 + + + + + + 129031 + + + 129032 + + + + + 96921 + + + + + + 138586 + + + 138587 + + + + + 87543 + + + + + + 128959 + + + 129814 + + + + + 85980 + + + + + + 128300 + + + 128301 + + + + + 90148 + + + + + + 132327 + + + 132328 + + + + + 105518 + + + + + + 147069 + + + 147070 + + + + + 87804 + + + + + + 130046 + + + 130043 + + + + + 86762 + + + + + + 129032 + + + 129033 + + + + + 96922 + + + + + + 138587 + + + 138588 + + + + + 87544 + + + + + + 129814 + + + 129815 + + + + + 85981 + + + + + + 128301 + + + 128302 + + + + + 90149 + + + + + + 132328 + + + 132329 + + + + + 105519 + + + + + + 147070 + + + 147071 + + + + + 87805 + + + + + + 130046 + + + 130047 + + + + + 86763 + + + + + + 129033 + + + 129034 + + + + + 96923 + + + + + + 138588 + + + 138589 + + + + + 105259 + + + + + + 146810 + + + 146811 + + + + + 87545 + + + + + + 129815 + + + 129816 + + + + + 85982 + + + + + + 128302 + + + 128303 + + + + + 90150 + + + + + + 132328 + + + 132330 + + + + + 105520 + + + + + + 147071 + + + 147072 + + + + + 87806 + + + + + + 130047 + + + 130048 + + + + + 86764 + + + + + + 129029 + + + 129035 + + + + + 96924 + + + + + + 138589 + + + 138590 + + + + + 87546 + + + + + + 129816 + + + 129817 + + + + + 85983 + + + + + + 128303 + + + 128304 + + + + + 90151 + + + + + + 132329 + + + 132330 + + + + + 105521 + + + + + + 147072 + + + 147073 + + + + + 87807 + + + + + + 130048 + + + 128270 + + + + + 86765 + + + + + + 129035 + + + 129036 + + + + + 105000 + + + + + + 130114 + + + 146550 + + + + + 96925 + + + + + + 138590 + + + 138591 + + + + + 105261 + + + + + + 146811 + + + 146812 + + + + + 87547 + + + + + + 129817 + + + 129818 + + + + + 85984 + + + + + + 128304 + + + 128305 + + + + + 84942 + + + + + + 127296 + + + 127297 + + + + + 90152 + + + + + + 132330 + + + 132331 + + + + + 105522 + + + + + + 147073 + + + 147074 + + + + + 87808 + + + + + + 130045 + + + 129848 + + + + + 86766 + + + + + + 129036 + + + 129037 + + + + + 105001 + + + + + + 146550 + + + 146551 + + + + + 96926 + + + + + + 138591 + + + 138592 + + + + + 87548 + + + + + + 129818 + + + 129819 + + + + + 85985 + + + + + + 128305 + + + 128306 + + + + + 84943 + + + + + + 127297 + + + 127298 + + + + + 90153 + + + + + + 132331 + + + 132333 + + + + + 105523 + + + + + + 147074 + + + 147075 + + + + + 87809 + + + + + + 128269 + + + 130049 + + + + + 86767 + + + + + + 129037 + + + 129038 + + + + + 87549 + + + + + + 129819 + + + 129820 + + + + + 85986 + + + + + + 128306 + + + 128307 + + + + + 84944 + + + + + + 127298 + + + 127299 + + + + + 90154 + + + + + + 132333 + + + 132332 + + + + + 96927 + + + + + + 138592 + + + 138593 + + + + + 105524 + + + + + + 147075 + + + 147076 + + + + + 87810 + + + + + + 130049 + + + 128270 + + + + + 86768 + + + + + + 129038 + + + 129039 + + + + + 87550 + + + + + + 129820 + + + 129821 + + + + + 84945 + + + + + + 127299 + + + 127300 + + + + + 90155 + + + + + + 132332 + + + 132334 + + + + + 96928 + + + + + + 138593 + + + 138594 + + + + + 105525 + + + + + + 147076 + + + 147077 + + + + + 87811 + + + + + + 130049 + + + 130050 + + + + + 86769 + + + + + + 129034 + + + 129040 + + + + + 105004 + + + + + + 146551 + + + 146552 + + + + + 87551 + + + + + + 129821 + + + 129822 + + + + + 84946 + + + + + + 127300 + + + 127301 + + + + + 90156 + + + + + + 132334 + + + 132333 + + + + + 96929 + + + + + + 138594 + + + 138595 + + + + + 105526 + + + + + + 147077 + + + 147078 + + + + + 87812 + + + + + + 130050 + + + 130051 + + + + + 86770 + + + + + + 129040 + + + 129041 + + + + + 105266 + + + + + + 146812 + + + 146817 + + + + + 87552 + + + + + + 129822 + + + 129823 + + + + + 85989 + + + + + + 128309 + + + 128310 + + + + + 84947 + + + + + + 127301 + + + 127302 + + + + + 90157 + + + + + + 132334 + + + 132335 + + + + + 96930 + + + + + + 138595 + + + 138596 + + + + + 105527 + + + + + + 147078 + + + 147079 + + + + + 87813 + + + + + + 128272 + + + 130053 + + + + + 86771 + + + + + + 129041 + + + 129042 + + + + + 105006 + + + + + + 146552 + + + 146553 + + + + + 105267 + + + + + + 146817 + + + 146818 + + + + + 87553 + + + + + + 129823 + + + 129824 + + + + + 85990 + + + + + + 128310 + + + 128311 + + + + + 84948 + + + + + + 127302 + + + 127303 + + + + + 90158 + + + + + + 132335 + + + 132336 + + + + + 96931 + + + + + + 138596 + + + 138597 + + + + + 105528 + + + + + + 147079 + + + 147080 + + + + + 87814 + + + + + + 130053 + + + 130052 + + + + + 86772 + + + + + + 129042 + + + 129043 + + + + + 87554 + + + + + + 129824 + + + 129825 + + + + + 85991 + + + + + + 128311 + + + 128312 + + + + + 90159 + + + + + + 132336 + + + 132337 + + + + + 96932 + + + + + + 138597 + + + 138598 + + + + + 105529 + + + + + + 147080 + + + 147081 + + + + + 87815 + + + + + + 130053 + + + 130051 + + + + + 86773 + + + + + + 129039 + + + 129044 + + + + + 87555 + + + + + + 129825 + + + 129826 + + + + + 85992 + + + + + + 128312 + + + 128313 + + + + + 90160 + + + + + + 132337 + + + 132338 + + + + + 96933 + + + + + + 138598 + + + 138599 + + + + + 105530 + + + + + + 147081 + + + 147082 + + + + + 87816 + + + + + + 130052 + + + 128274 + + + + + 86774 + + + + + + 129044 + + + 129045 + + + + + 105009 + + + + + + 146553 + + + 146557 + + + + + 87556 + + + + + + 129826 + + + 129827 + + + + + 85993 + + + + + + 128313 + + + 128314 + + + + + 90161 + + + + + + 132338 + + + 132339 + + + + + 96934 + + + + + + 138599 + + + 138600 + + + + + 105531 + + + + + + 147082 + + + 147083 + + + + + 87817 + + + + + + 130052 + + + 128914 + + + + + 86775 + + + + + + 129045 + + + 129046 + + + + + 87557 + + + + + + 129827 + + + 129828 + + + + + 85994 + + + + + + 128314 + + + 128315 + + + + + 96414 + + + + + + 138066 + + + 138096 + + + + + 90162 + + + + + + 132339 + + + 132340 + + + + + 96935 + + + + + + 138600 + + + 138601 + + + + + 105532 + + + + + + 147083 + + + 147084 + + + + + 87818 + + + + + + 128268 + + + 130054 + + + + + 86776 + + + + + + 129046 + + + 129047 + + + + + 87558 + + + + + + 129828 + + + 129829 + + + + + 85995 + + + + + + 128315 + + + 128316 + + + + + 96415 + + + + + + 138096 + + + 138097 + + + + + 90163 + + + + + + 132340 + + + 132341 + + + + + 96936 + + + + + + 138601 + + + 138602 + + + + + 105533 + + + + + + 147084 + + + 147085 + + + + + 87819 + + + + + + 130054 + + + 130055 + + + + + 86777 + + + + + + 129043 + + + 129048 + + + + + 105012 + + + + + + 146557 + + + 146562 + + + + + 87559 + + + + + + 129829 + + + 129830 + + + + + 85996 + + + + + + 128316 + + + 128317 + + + + + 96416 + + + + + + 138097 + + + 138098 + + + + + 90164 + + + + + + 132341 + + + 132342 + + + + + 96937 + + + + + + 138602 + + + 138603 + + + + + 105534 + + + + + + 147085 + + + 147086 + + + + + 87820 + + + + + + 130055 + + + 130056 + + + + + 86778 + + + + + + 129048 + + + 129049 + + + + + 105013 + + + + + + 146562 + + + 146565 + + + + + 87560 + + + + + + 129830 + + + 129831 + + + + + 85997 + + + + + + 128317 + + + 128318 + + + + + 90165 + + + + + + 132342 + + + 132343 + + + + + 96938 + + + + + + 138603 + + + 138597 + + + + + 105535 + + + + + + 147086 + + + 147087 + + + + + 87821 + + + + + + 130056 + + + 130050 + + + + + 86779 + + + + + + 129049 + + + 129050 + + + + + 105275 + + + + + + 146818 + + + 146831 + + + + + 87561 + + + + + + 129831 + + + 129832 + + + + + 96418 + + + + + + 138098 + + + 138099 + + + + + 90166 + + + + + + 132343 + + + 132344 + + + + + 96939 + + + + + + 138600 + + + 138604 + + + + + 105536 + + + + + + 147087 + + + 147088 + + + + + 87822 + + + + + + 130056 + + + 130057 + + + + + 86780 + + + + + + 129047 + + + 129051 + + + + + 87562 + + + + + + 129832 + + + 129833 + + + + + 85999 + + + + + + 128318 + + + 128320 + + + + + 90167 + + + + + + 132344 + + + 132345 + + + + + 96940 + + + + + + 138604 + + + 138601 + + + + + 105537 + + + + + + 147088 + + + 147089 + + + + + 87823 + + + + + + 130057 + + + 130059 + + + + + 86781 + + + + + + 129051 + + + 129052 + + + + + 87563 + + + + + + 129833 + + + 129834 + + + + + 86000 + + + + + + 128320 + + + 128321 + + + + + 90168 + + + + + + 132345 + + + 132346 + + + + + 96941 + + + + + + 138604 + + + 138605 + + + + + 105538 + + + + + + 147089 + + + 147090 + + + + + 87824 + + + + + + 130059 + + + 130058 + + + + + 86782 + + + + + + 129052 + + + 129053 + + + + + 87564 + + + + + + 129834 + + + 129835 + + + + + 86001 + + + + + + 128321 + + + 128322 + + + + + 90169 + + + + + + 132346 + + + 132347 + + + + + 96942 + + + + + + 138605 + + + 138606 + + + + + 105278 + + + + + + 146831 + + + 146832 + + + + + 105539 + + + + + + 147090 + + + 147091 + + + + + 87825 + + + + + + 130058 + + + 130057 + + + + + 86783 + + + + + + 129050 + + + 129054 + + + + + 87565 + + + + + + 129835 + + + 129836 + + + + + 86002 + + + + + + 128322 + + + 128323 + + + + + 90170 + + + + + + 132347 + + + 132348 + + + + + 96943 + + + + + + 138606 + + + 138607 + + + + + 110750 + + + + + + 147160 + + + 152259 + + + + + 105540 + + + + + + 147091 + + + 147092 + + + + + 87826 + + + + + + 130058 + + + 128914 + + + + + 86784 + + + + + + 129054 + + + 129055 + + + + + 87566 + + + + + + 129836 + + + 129837 + + + + + 86003 + + + + + + 128323 + + + 128324 + + + + + 84961 + + + + + + 127313 + + + 127314 + + + + + 90171 + + + + + + 132348 + + + 132349 + + + + + 96944 + + + + + + 138607 + + + 138608 + + + + + 110751 + + + + + + 152259 + + + 152260 + + + + + 105541 + + + + + + 147092 + + + 147093 + + + + + 87827 + + + + + + 128277 + + + 130071 + + + + + 86785 + + + + + + 129055 + + + 129056 + + + + + 87567 + + + + + + 129837 + + + 129838 + + + + + 86004 + + + + + + 128324 + + + 128325 + + + + + 90172 + + + + + + 132349 + + + 132350 + + + + + 96945 + + + + + + 138608 + + + 138609 + + + + + 105281 + + + + + + 146832 + + + 146833 + + + + + 110752 + + + + + + 152261 + + + 152262 + + + + + 105542 + + + + + + 147093 + + + 147094 + + + + + 87828 + + + + + + 130071 + + + 130069 + + + + + 86786 + + + + + + 129053 + + + 129057 + + + + + 87568 + + + + + + 129838 + + + 129839 + + + + + 86005 + + + + + + 128325 + + + 128326 + + + + + 90173 + + + + + + 132350 + + + 132351 + + + + + 96946 + + + + + + 138609 + + + 138610 + + + + + 110753 + + + + + + 152262 + + + 147159 + + + + + 105543 + + + + + + 147094 + + + 147095 + + + + + 87829 + + + + + + 130069 + + + 128277 + + + + + 86787 + + + + + + 129057 + + + 129058 + + + + + 105022 + + + + + + 146565 + + + 146573 + + + + + 87569 + + + + + + 129839 + + + 129840 + + + + + 86006 + + + + + + 128326 + + + 128327 + + + + + 90174 + + + + + + 132351 + + + 132352 + + + + + 96947 + + + + + + 138610 + + + 138611 + + + + + 105544 + + + + + + 147095 + + + 147096 + + + + + 87830 + + + + + + 130071 + + + 130070 + + + + + 86788 + + + + + + 129058 + + + 129059 + + + + + 87570 + + + + + + 129840 + + + 129841 + + + + + 86007 + + + + + + 128327 + + + 128328 + + + + + 90175 + + + + + + 132352 + + + 132353 + + + + + 96948 + + + + + + 138611 + + + 138612 + + + + + 105545 + + + + + + 147096 + + + 147097 + + + + + 87831 + + + + + + 130070 + + + 128279 + + + + + 86789 + + + + + + 129056 + + + 129060 + + + + + 105024 + + + + + + 146573 + + + 146574 + + + + + 87571 + + + + + + 129841 + + + 129842 + + + + + 86008 + + + + + + 128328 + + + 128329 + + + + + 96428 + + + + + + 138099 + + + 138108 + + + + + 90176 + + + + + + 132353 + + + 132354 + + + + + 96949 + + + + + + 138612 + + + 138613 + + + + + 105546 + + + + + + 147097 + + + 147098 + + + + + 87832 + + + + + + 130069 + + + 130068 + + + + + 86790 + + + + + + 129060 + + + 129061 + + + + + 87572 + + + + + + 129842 + + + 129843 + + + + + 86009 + + + + + + 128329 + + + 128330 + + + + + 90177 + + + + + + 132354 + + + 132364 + + + + + 96950 + + + + + + 138613 + + + 138615 + + + + + 105547 + + + + + + 147098 + + + 147099 + + + + + 87833 + + + + + + 130068 + + + 130067 + + + + + 86791 + + + + + + 129061 + + + 129062 + + + + + 105026 + + + + + + 146574 + + + 146578 + + + + + 87573 + + + + + + 129843 + + + 129844 + + + + + 86010 + + + + + + 128330 + + + 128331 + + + + + 96430 + + + + + + 138108 + + + 138109 + + + + + 90178 + + + + + + 132364 + + + 132363 + + + + + 96951 + + + + + + 138615 + + + 138616 + + + + + 105548 + + + + + + 147099 + + + 147100 + + + + + 87834 + + + + + + 130067 + + + 130066 + + + + + 86792 + + + + + + 129062 + + + 129063 + + + + + 87574 + + + + + + 129844 + + + 129845 + + + + + 86011 + + + + + + 128331 + + + 128332 + + + + + 90179 + + + + + + 132363 + + + 132362 + + + + + 96952 + + + + + + 138612 + + + 138614 + + + + + 105288 + + + + + + 146833 + + + 146851 + + + + + 105549 + + + + + + 147100 + + + 147101 + + + + + 87835 + + + + + + 130066 + + + 130064 + + + + + 86793 + + + + + + 129063 + + + 129064 + + + + + 87575 + + + + + + 129845 + + + 129846 + + + + + 86012 + + + + + + 128332 + + + 128333 + + + + + 90180 + + + + + + 132362 + + + 132361 + + + + + 96953 + + + + + + 138614 + + + 138615 + + + + + 105550 + + + + + + 147101 + + + 147102 + + + + + 87836 + + + + + + 130064 + + + 130063 + + + + + 86794 + + + + + + 129064 + + + 129065 + + + + + 87576 + + + + + + 129846 + + + 129847 + + + + + 86013 + + + + + + 128333 + + + 128334 + + + + + 96433 + + + + + + 138109 + + + 138110 + + + + + 90181 + + + + + + 132361 + + + 132360 + + + + + 96954 + + + + + + 138616 + + + 138617 + + + + + 105551 + + + + + + 147102 + + + 147103 + + + + + 87837 + + + + + + 130064 + + + 130065 + + + + + 86795 + + + + + + 129065 + + + 129066 + + + + + 105030 + + + + + + 146578 + + + 146581 + + + + + 87577 + + + + + + 129847 + + + 129848 + + + + + 86014 + + + + + + 128333 + + + 128335 + + + + + 90182 + + + + + + 132360 + + + 132359 + + + + + 96955 + + + + + + 138617 + + + 138618 + + + + + 105291 + + + + + + 146851 + + + 146853 + + + + + 105552 + + + + + + 147103 + + + 147104 + + + + + 87838 + + + + + + 130065 + + + 130061 + + + + + 86796 + + + + + + 129066 + + + 129067 + + + + + 87578 + + + + + + 129848 + + + 129849 + + + + + 86015 + + + + + + 128334 + + + 128336 + + + + + 90183 + + + + + + 132359 + + + 132358 + + + + + 96956 + + + + + + 138561 + + + 138619 + + + + + 105553 + + + + + + 147104 + + + 147105 + + + + + 87839 + + + + + + 130061 + + + 130062 + + + + + 86797 + + + + + + 129067 + + + 129068 + + + + + 105032 + + + + + + 146581 + + + 146584 + + + + + 87579 + + + + + + 129849 + + + 129850 + + + + + 86016 + + + + + + 128336 + + + 128332 + + + + + 96436 + + + + + + 138110 + + + 138111 + + + + + 90184 + + + + + + 132358 + + + 132357 + + + + + 96957 + + + + + + 138619 + + + 138621 + + + + + 105554 + + + + + + 147106 + + + 147107 + + + + + 87840 + + + + + + 130062 + + + 130063 + + + + + 86798 + + + + + + 129059 + + + 129069 + + + + + 87580 + + + + + + 129850 + + + 129851 + + + + + 86017 + + + + + + 128335 + + + 128337 + + + + + 90185 + + + + + + 132357 + + + 132356 + + + + + 96958 + + + + + + 138622 + + + 138620 + + + + + 105555 + + + + + + 147107 + + + 147108 + + + + + 87841 + + + + + + 130061 + + + 130060 + + + + + 86799 + + + + + + 129069 + + + 129070 + + + + + 86018 + + + + + + 128334 + + + 128338 + + + + + 96438 + + + + + + 138111 + + + 138112 + + + + + 90186 + + + + + + 132356 + + + 132355 + + + + + 96959 + + + + + + 138620 + + + 138562 + + + + + 105556 + + + + + + 147108 + + + 147109 + + + + + 87842 + + + + + + 130060 + + + 130059 + + + + + 86800 + + + + + + 129070 + + + 129071 + + + + + 86019 + + + + + + 128338 + + + 128339 + + + + + 96439 + + + + + + 138112 + + + 138116 + + + + + 90187 + + + + + + 132355 + + + 132341 + + + + + 96960 + + + + + + 138621 + + + 138623 + + + + + 105557 + + + + + + 147109 + + + 147110 + + + + + 87843 + + + + + + 128293 + + + 130081 + + + + + 86801 + + + + + + 129071 + + + 129072 + + + + + 105036 + + + + + + 146584 + + + 146587 + + + + + 87583 + + + + + + 129853 + + + 129854 + + + + + 86020 + + + + + + 128339 + + + 128340 + + + + + 96440 + + + + + + 138116 + + + 138120 + + + + + 96961 + + + + + + 138623 + + + 138624 + + + + + 105558 + + + + + + 147110 + + + 147111 + + + + + 87844 + + + + + + 130081 + + + 130082 + + + + + 86802 + + + + + + 129072 + + + 129073 + + + + + 105037 + + + + + + 146587 + + + 146586 + + + + + 87584 + + + + + + 129854 + + + 129855 + + + + + 86021 + + + + + + 128340 + + + 128341 + + + + + 96441 + + + + + + 138120 + + + 138121 + + + + + 96962 + + + + + + 138625 + + + 138626 + + + + + 105559 + + + + + + 147111 + + + 147112 + + + + + 87845 + + + + + + 130082 + + + 128291 + + + + + 86803 + + + + + + 129073 + + + 129074 + + + + + 105038 + + + + + + 146586 + + + 129001 + + + + + 87585 + + + + + + 129855 + + + 129856 + + + + + 86022 + + + + + + 128341 + + + 128342 + + + + + 96442 + + + + + + 138121 + + + 138122 + + + + + 96963 + + + + + + 138626 + + + 138622 + + + + + 105560 + + + + + + 147112 + + + 147113 + + + + + 87846 + + + + + + 127340 + + + 130078 + + + + + 86804 + + + + + + 129068 + + + 129075 + + + + + 87586 + + + + + + 129856 + + + 129857 + + + + + 86023 + + + + + + 128342 + + + 128343 + + + + + 96443 + + + + + + 138122 + + + 138123 + + + + + 96964 + + + + + + 138624 + + + 138627 + + + + + 105561 + + + + + + 147113 + + + 147114 + + + + + 87847 + + + + + + 130078 + + + 130079 + + + + + 86805 + + + + + + 129075 + + + 129076 + + + + + 87587 + + + + + + 129857 + + + 129858 + + + + + 86024 + + + + + + 128343 + + + 128344 + + + + + 96444 + + + + + + 138123 + + + 138124 + + + + + 96965 + + + + + + 138627 + + + 138628 + + + + + 105562 + + + + + + 147114 + + + 147115 + + + + + 87848 + + + + + + 130079 + + + 127333 + + + + + 86806 + + + + + + 129076 + + + 129077 + + + + + 86025 + + + + + + 128344 + + + 128345 + + + + + 96445 + + + + + + 138124 + + + 138125 + + + + + 96966 + + + + + + 138629 + + + 138630 + + + + + 105302 + + + + + + 146853 + + + 146855 + + + + + 87588 + + + + + + 129858 + + + 129859 + + + + + 105563 + + + + + + 147115 + + + 147116 + + + + + 87849 + + + + + + 130081 + + + 130076 + + + + + 89933 + + + + + + 130070 + + + 132125 + + + + + 86807 + + + + + + 129077 + + + 129078 + + + + + 86026 + + + + + + 128345 + + + 128346 + + + + + 96446 + + + + + + 138125 + + + 138126 + + + + + 96967 + + + + + + 138630 + + + 138625 + + + + + 105303 + + + + + + 146855 + + + 146856 + + + + + 105564 + + + + + + 147116 + + + 147117 + + + + + 87850 + + + + + + 130076 + + + 130077 + + + + + 89934 + + + + + + 132125 + + + 132126 + + + + + 86808 + + + + + + 129078 + + + 129079 + + + + + 86027 + + + + + + 128346 + + + 128347 + + + + + 96447 + + + + + + 138126 + + + 138129 + + + + + 96968 + + + + + + 138628 + + + 138631 + + + + + 105565 + + + + + + 147117 + + + 147119 + + + + + 87851 + + + + + + 130077 + + + 130079 + + + + + 89935 + + + + + + 132126 + + + 132127 + + + + + 86809 + + + + + + 129084 + + + 129083 + + + + + 86028 + + + + + + 128347 + + + 128348 + + + + + 96448 + + + + + + 138129 + + + 138131 + + + + + 96969 + + + + + + 138631 + + + 138632 + + + + + 87591 + + + + + + 129861 + + + 128282 + + + + + 105566 + + + + + + 147119 + + + 147121 + + + + + 87852 + + + + + + 130077 + + + 130080 + + + + + 89936 + + + + + + 132127 + + + 132128 + + + + + 86810 + + + + + + 129083 + + + 129082 + + + + + 86029 + + + + + + 128348 + + + 128349 + + + + + 96970 + + + + + + 138633 + + + 138634 + + + + + 105306 + + + + + + 146856 + + + 146864 + + + + + 105567 + + + + + + 147121 + + + 147122 + + + + + 87853 + + + + + + 130080 + + + 130082 + + + + + 89937 + + + + + + 132128 + + + 132129 + + + + + 86811 + + + + + + 129082 + + + 129081 + + + + + 86030 + + + + + + 128349 + + + 128350 + + + + + 96450 + + + + + + 138131 + + + 138136 + + + + + 96971 + + + + + + 138634 + + + 138629 + + + + + 105568 + + + + + + 147122 + + + 147123 + + + + + 87854 + + + + + + 127421 + + + 130083 + + + + + 89938 + + + + + + 132129 + + + 132130 + + + + + 86812 + + + + + + 129081 + + + 129080 + + + + + 86031 + + + + + + 128350 + + + 128351 + + + + + 105308 + + + + + + 146864 + + + 146866 + + + + + 105569 + + + + + + 147123 + + + 147124 + + + + + 87855 + + + + + + 130083 + + + 130084 + + + + + 89939 + + + + + + 132130 + + + 132131 + + + + + 86813 + + + + + + 129080 + + + 129074 + + + + + 87595 + + + + + + 129864 + + + 129865 + + + + + 86032 + + + + + + 128351 + + + 128352 + + + + + 105570 + + + + + + 147124 + + + 147125 + + + + + 87856 + + + + + + 130084 + + + 127441 + + + + + 89940 + + + + + + 132131 + + + 132132 + + + + + 86814 + + + + + + 129079 + + + 129085 + + + + + 86033 + + + + + + 128352 + + + 128353 + + + + + 105571 + + + + + + 147125 + + + 147126 + + + + + 87857 + + + + + + 130084 + + + 130085 + + + + + 89941 + + + + + + 132132 + + + 132133 + + + + + 86815 + + + + + + 129085 + + + 129086 + + + + + 105311 + + + + + + 146866 + + + 146868 + + + + + 87597 + + + + + + 129863 + + + 129869 + + + + + 86034 + + + + + + 128353 + + + 128354 + + + + + 105572 + + + + + + 147126 + + + 147127 + + + + + 87858 + + + + + + 130085 + + + 130086 + + + + + 89942 + + + + + + 132133 + + + 132134 + + + + + 86816 + + + + + + 129087 + + + 129088 + + + + + 105051 + + + + + + 146602 + + + 129071 + + + + + 87598 + + + + + + 129869 + + + 129864 + + + + + 86035 + + + + + + 128354 + + + 128355 + + + + + 105573 + + + + + + 147127 + + + 147128 + + + + + 87859 + + + + + + 130086 + + + 130087 + + + + + 89943 + + + + + + 132134 + + + 132135 + + + + + 86817 + + + + + + 129088 + + + 129084 + + + + + 87599 + + + + + + 129869 + + + 129864 + + + + + 86036 + + + + + + 128355 + + + 128352 + + + + + 105574 + + + + + + 147128 + + + 147129 + + + + + 87860 + + + + + + 130087 + + + 130088 + + + + + 89944 + + + + + + 132135 + + + 132136 + + + + + 86818 + + + + + + 129086 + + + 129089 + + + + + 87600 + + + + + + 128288 + + + 129868 + + + + + 86037 + + + + + + 128354 + + + 128356 + + + + + 105575 + + + + + + 147129 + + + 147130 + + + + + 87861 + + + + + + 130088 + + + 130089 + + + + + 89945 + + + + + + 132136 + + + 132137 + + + + + 86819 + + + + + + 129087 + + + 129090 + + + + + 87601 + + + + + + 128289 + + + 129868 + + + + + 86038 + + + + + + 128356 + + + 128357 + + + + + 105576 + + + + + + 147130 + + + 147131 + + + + + 87862 + + + + + + 130089 + + + 130090 + + + + + 89946 + + + + + + 132137 + + + 132138 + + + + + 86820 + + + + + + 129089 + + + 129091 + + + + + 84997 + + + + + + 127340 + + + 127349 + + + + + 105316 + + + + + + 146868 + + + 146869 + + + + + 87602 + + + + + + 129868 + + + 129869 + + + + + 86039 + + + + + + 128357 + + + 128358 + + + + + 105577 + + + + + + 147131 + + + 147132 + + + + + 87863 + + + + + + 127415 + + + 130091 + + + + + 89947 + + + + + + 132138 + + + 132139 + + + + + 86821 + + + + + + 129091 + + + 129092 + + + + + 105317 + + + + + + 146869 + + + 146870 + + + + + 87603 + + + + + + 129868 + + + 129866 + + + + + 86040 + + + + + + 128358 + + + 128359 + + + + + 105578 + + + + + + 147132 + + + 147133 + + + + + 87864 + + + + + + 130091 + + + 127414 + + + + + 89948 + + + + + + 132137 + + + 132153 + + + + + 86822 + + + + + + 129094 + + + 129093 + + + + + 105057 + + + + + + 146602 + + + 146606 + + + + + 96461 + + + + + + 138136 + + + 138141 + + + + + 105318 + + + + + + 146870 + + + 146871 + + + + + 86041 + + + + + + 128359 + + + 128360 + + + + + 105579 + + + + + + 147133 + + + 147134 + + + + + 87865 + + + + + + 130091 + + + 130092 + + + + + 89949 + + + + + + 132153 + + + 132152 + + + + + 86823 + + + + + + 129093 + + + 129090 + + + + + 105058 + + + + + + 146606 + + + 146607 + + + + + 96462 + + + + + + 138141 + + + 138143 + + + + + 85000 + + + + + + 127349 + + + 127350 + + + + + 86042 + + + + + + 128360 + + + 128361 + + + + + 105580 + + + + + + 147134 + + + 147135 + + + + + 87866 + + + + + + 130092 + + + 130093 + + + + + 89950 + + + + + + 132152 + + + 132151 + + + + + 86824 + + + + + + 129092 + + + 129095 + + + + + 96463 + + + + + + 138143 + + + 138148 + + + + + 86043 + + + + + + 128361 + + + 128362 + + + + + 105581 + + + + + + 147135 + + + 147136 + + + + + 87867 + + + + + + 130093 + + + 130094 + + + + + 89951 + + + + + + 132151 + + + 132150 + + + + + 86825 + + + + + + 129094 + + + 129096 + + + + + 105060 + + + + + + 146607 + + + 146608 + + + + + 96464 + + + + + + 138148 + + + 138149 + + + + + 85002 + + + + + + 127350 + + + 127353 + + + + + 86044 + + + + + + 128362 + + + 128363 + + + + + 105582 + + + + + + 147136 + + + 147137 + + + + + 87868 + + + + + + 130094 + + + 130095 + + + + + 89952 + + + + + + 132150 + + + 132149 + + + + + 86826 + + + + + + 129095 + + + 129097 + + + + + 85003 + + + + + + 127353 + + + 127357 + + + + + 86045 + + + + + + 128363 + + + 128364 + + + + + 105583 + + + + + + 147137 + + + 147138 + + + + + 87869 + + + + + + 130095 + + + 130096 + + + + + 89953 + + + + + + 132149 + + + 132148 + + + + + 86046 + + + + + + 128364 + + + 128365 + + + + + 105584 + + + + + + 147138 + + + 147139 + + + + + 87870 + + + + + + 130096 + + + 129902 + + + + + 89954 + + + + + + 132148 + + + 132143 + + + + + 86828 + + + + + + 129099 + + + 129100 + + + + + 96467 + + + + + + 138149 + + + 138150 + + + + + 86047 + + + + + + 128365 + + + 128366 + + + + + 105585 + + + + + + 147139 + + + 147140 + + + + + 89955 + + + + + + 132143 + + + 132142 + + + + + 86829 + + + + + + 129100 + + + 129096 + + + + + 87871 + + + + + + 129903 + + + 130097 + + + + + 85006 + + + + + + 127357 + + + 127358 + + + + + 86048 + + + + + + 128366 + + + 128367 + + + + + 105586 + + + + + + 147140 + + + 147141 + + + + + 89956 + + + + + + 132142 + + + 132141 + + + + + 105065 + + + + + + 146608 + + + 146614 + + + + + 87872 + + + + + + 130097 + + + 130098 + + + + + 86049 + + + + + + 128367 + + + 128368 + + + + + 105587 + + + + + + 147141 + + + 147142 + + + + + 89957 + + + + + + 132141 + + + 132140 + + + + + 86831 + + + + + + 129101 + + + 129102 + + + + + 105066 + + + + + + 146614 + + + 146615 + + + + + 87873 + + + + + + 130098 + + + 130099 + + + + + 96470 + + + + + + 138150 + + + 138151 + + + + + 105327 + + + + + + 146871 + + + 146880 + + + + + 86050 + + + + + + 128368 + + + 128369 + + + + + 105588 + + + + + + 147142 + + + 147143 + + + + + 89958 + + + + + + 132140 + + + 132139 + + + + + 86832 + + + + + + 129103 + + + 129104 + + + + + 105067 + + + + + + 146615 + + + 146616 + + + + + 87874 + + + + + + 130099 + + + 130100 + + + + + 105328 + + + + + + 146880 + + + 146881 + + + + + 86051 + + + + + + 128369 + + + 128370 + + + + + 105589 + + + + + + 147143 + + + 147144 + + + + + 89959 + + + + + + 132143 + + + 132144 + + + + + 86833 + + + + + + 129104 + + + 129099 + + + + + 105068 + + + + + + 146616 + + + 146617 + + + + + 87875 + + + + + + 130100 + + + 130101 + + + + + 96472 + + + + + + 138151 + + + 138152 + + + + + 105329 + + + + + + 146881 + + + 146882 + + + + + 86052 + + + + + + 128370 + + + 128371 + + + + + 105590 + + + + + + 147144 + + + 147145 + + + + + 89960 + + + + + + 132144 + + + 132145 + + + + + 86834 + + + + + + 129102 + + + 129105 + + + + + 105069 + + + + + + 146617 + + + 146618 + + + + + 87876 + + + + + + 130101 + + + 130102 + + + + + 105330 + + + + + + 146882 + + + 146883 + + + + + 86053 + + + + + + 128371 + + + 128372 + + + + + 105591 + + + + + + 147145 + + + 147146 + + + + + 89961 + + + + + + 132145 + + + 132146 + + + + + 86835 + + + + + + 129105 + + + 129106 + + + + + 105070 + + + + + + 146618 + + + 146619 + + + + + 87877 + + + + + + 130102 + + + 130103 + + + + + 85012 + + + + + + 127358 + + + 127364 + + + + + 105331 + + + + + + 146883 + + + 146884 + + + + + 86054 + + + + + + 128372 + + + 128373 + + + + + 105592 + + + + + + 147146 + + + 132140 + + + + + 89962 + + + + + + 132146 + + + 132147 + + + + + 86836 + + + + + + 129107 + + + 129108 + + + + + 105071 + + + + + + 146619 + + + 146620 + + + + + 87878 + + + + + + 130103 + + + 130104 + + + + + 98038 + + + + + + 127296 + + + 139652 + + + + + 105332 + + + + + + 146884 + + + 146885 + + + + + 86055 + + + + + + 128373 + + + 128374 + + + + + 105593 + + + + + + 146890 + + + 147157 + + + + + 89963 + + + + + + 128229 + + + 132159 + + + + + 86837 + + + + + + 129108 + + + 129103 + + + + + 105072 + + + + + + 146620 + + + 146621 + + + + + 87879 + + + + + + 130104 + + + 130105 + + + + + 98039 + + + + + + 139652 + + + 127294 + + + + + 96476 + + + + + + 138152 + + + 138153 + + + + + 105333 + + + + + + 146885 + + + 146886 + + + + + 86056 + + + + + + 128374 + + + 128375 + + + + + 105594 + + + + + + 147157 + + + 147156 + + + + + 89964 + + + + + + 132159 + + + 132160 + + + + + 86838 + + + + + + 129106 + + + 129109 + + + + + 105073 + + + + + + 146621 + + + 146622 + + + + + 87880 + + + + + + 130105 + + + 130106 + + + + + 98040 + + + + + + 139652 + + + 139653 + + + + + 105334 + + + + + + 146898 + + + 146886 + + + + + 86057 + + + + + + 128375 + + + 128376 + + + + + 105595 + + + + + + 147156 + + + 147155 + + + + + 89965 + + + + + + 132160 + + + 128231 + + + + + 86839 + + + + + + 129109 + + + 129110 + + + + + 105074 + + + + + + 146622 + + + 146623 + + + + + 87881 + + + + + + 130106 + + + 130107 + + + + + 98041 + + + + + + 139653 + + + 139654 + + + + + 105335 + + + + + + 146886 + + + 146887 + + + + + 87621 + + + + + + 127287 + + + 129890 + + + + + 86058 + + + + + + 128376 + + + 128377 + + + + + 105596 + + + + + + 147155 + + + 147154 + + + + + 89966 + + + + + + 132159 + + + 132154 + + + + + 86840 + + + + + + 129111 + + + 129112 + + + + + 105075 + + + + + + 146623 + + + 146624 + + + + + 87882 + + + + + + 130107 + + + 130108 + + + + + 98042 + + + + + + 139654 + + + 139655 + + + + + 105336 + + + + + + 146887 + + + 146888 + + + + + 87622 + + + + + + 129890 + + + 129889 + + + + + 86059 + + + + + + 128377 + + + 128378 + + + + + 105597 + + + + + + 147154 + + + 147153 + + + + + 89967 + + + + + + 132154 + + + 132155 + + + + + 86841 + + + + + + 129112 + + + 129107 + + + + + 105076 + + + + + + 146624 + + + 146626 + + + + + 87883 + + + + + + 130108 + + + 130109 + + + + + 98043 + + + + + + 139655 + + + 139656 + + + + + 96480 + + + + + + 138153 + + + 138157 + + + + + 85018 + + + + + + 127364 + + + 127370 + + + + + 105337 + + + + + + 146888 + + + 146889 + + + + + 87623 + + + + + + 129889 + + + 127458 + + + + + 86060 + + + + + + 128378 + + + 128379 + + + + + 105598 + + + + + + 147153 + + + 147152 + + + + + 89968 + + + + + + 132155 + + + 132156 + + + + + 86842 + + + + + + 129110 + + + 129113 + + + + + 87884 + + + + + + 130109 + + + 130110 + + + + + 98044 + + + + + + 139656 + + + 139657 + + + + + 85019 + + + + + + 127370 + + + 127371 + + + + + 105338 + + + + + + 146889 + + + 146890 + + + + + 86061 + + + + + + 128379 + + + 128380 + + + + + 105599 + + + + + + 147151 + + + 147150 + + + + + 89969 + + + + + + 132156 + + + 132157 + + + + + 86843 + + + + + + 129113 + + + 129114 + + + + + 87885 + + + + + + 130110 + + + 130111 + + + + + 98045 + + + + + + 139657 + + + 139658 + + + + + 105339 + + + + + + 146891 + + + 146892 + + + + + 86062 + + + + + + 128380 + + + 128381 + + + + + 105600 + + + + + + 147150 + + + 147149 + + + + + 89970 + + + + + + 132157 + + + 132158 + + + + + 86844 + + + + + + 129115 + + + 129116 + + + + + 87886 + + + + + + 130111 + + + 130112 + + + + + 98046 + + + + + + 139658 + + + 139659 + + + + + 85021 + + + + + + 127371 + + + 127373 + + + + + 105340 + + + + + + 146892 + + + 146893 + + + + + 86063 + + + + + + 128381 + + + 128382 + + + + + 105601 + + + + + + 147149 + + + 147148 + + + + + 89971 + + + + + + 132158 + + + 132161 + + + + + 86845 + + + + + + 129116 + + + 129111 + + + + + 87887 + + + + + + 130112 + + + 130113 + + + + + 98047 + + + + + + 139659 + + + 139660 + + + + + 96484 + + + + + + 138157 + + + 138162 + + + + + 105341 + + + + + + 146893 + + + 146894 + + + + + 86064 + + + + + + 128382 + + + 128383 + + + + + 105602 + + + + + + 147148 + + + 147147 + + + + + 89972 + + + + + + 132161 + + + 132162 + + + + + 86846 + + + + + + 129114 + + + 129117 + + + + + 87888 + + + + + + 130113 + + + 130114 + + + + + 98048 + + + + + + 139660 + + + 139661 + + + + + 85023 + + + + + + 127373 + + + 127378 + + + + + 105342 + + + + + + 146894 + + + 146895 + + + + + 87628 + + + + + + 129889 + + + 129895 + + + + + 86065 + + + + + + 128383 + + + 128384 + + + + + 105603 + + + + + + 147147 + + + 146891 + + + + + 89973 + + + + + + 132162 + + + 132163 + + + + + 86847 + + + + + + 129117 + + + 129118 + + + + + 87889 + + + + + + 130114 + + + 130115 + + + + + 98049 + + + + + + 139661 + + + 139662 + + + + + 105343 + + + + + + 146895 + + + 146896 + + + + + 86066 + + + + + + 128384 + + + 128385 + + + + + 105604 + + + + + + 147151 + + + 147162 + + + + + 89974 + + + + + + 132163 + + + 132164 + + + + + 86848 + + + + + + 129118 + + + 129119 + + + + + 87890 + + + + + + 130115 + + + 130116 + + + + + 98050 + + + + + + 139662 + + + 139656 + + + + + 96487 + + + + + + 138162 + + + 138165 + + + + + 105344 + + + + + + 146896 + + + 146897 + + + + + 86067 + + + + + + 128385 + + + 128386 + + + + + 105605 + + + + + + 147162 + + + 147161 + + + + + 89975 + + + + + + 132164 + + + 132165 + + + + + 86849 + + + + + + 129120 + + + 129121 + + + + + 105084 + + + + + + 146626 + + + 146633 + + + + + 87891 + + + + + + 130116 + + + 130117 + + + + + 98051 + + + + + + 127294 + + + 139670 + + + + + 96488 + + + + + + 138165 + + + 138168 + + + + + 87631 + + + + + + 127414 + + + 129896 + + + + + 86068 + + + + + + 128386 + + + 128387 + + + + + 105606 + + + + + + 147161 + + + 147160 + + + + + 89976 + + + + + + 132165 + + + 132166 + + + + + 86850 + + + + + + 129121 + + + 129122 + + + + + 105085 + + + + + + 146633 + + + 146634 + + + + + 87892 + + + + + + 130117 + + + 130118 + + + + + 98052 + + + + + + 139670 + + + 127292 + + + + + 96489 + + + + + + 138168 + + + 138171 + + + + + 87632 + + + + + + 129896 + + + 129897 + + + + + 86069 + + + + + + 128387 + + + 128388 + + + + + 105607 + + + + + + 147152 + + + 147158 + + + + + 89977 + + + + + + 132166 + + + 132167 + + + + + 86851 + + + + + + 129122 + + + 129115 + + + + + 105086 + + + + + + 146634 + + + 146635 + + + + + 87893 + + + + + + 130118 + + + 130119 + + + + + 98053 + + + + + + 139658 + + + 139663 + + + + + 87633 + + + + + + 129897 + + + 129898 + + + + + 86070 + + + + + + 128388 + + + 128389 + + + + + 105608 + + + + + + 147158 + + + 147159 + + + + + 89978 + + + + + + 132167 + + + 132168 + + + + + 86852 + + + + + + 129119 + + + 129123 + + + + + 87894 + + + + + + 130119 + + + 130120 + + + + + 98054 + + + + + + 139663 + + + 139664 + + + + + 87634 + + + + + + 129898 + + + 129899 + + + + + 86071 + + + + + + 128389 + + + 128390 + + + + + 89979 + + + + + + 132168 + + + 132169 + + + + + 86853 + + + + + + 129123 + + + 129124 + + + + + 87895 + + + + + + 130120 + + + 130121 + + + + + 98055 + + + + + + 139664 + + + 139665 + + + + + 87635 + + + + + + 129899 + + + 129900 + + + + + 86072 + + + + + + 128390 + + + 128391 + + + + + 89980 + + + + + + 132169 + + + 132170 + + + + + 86854 + + + + + + 129124 + + + 129125 + + + + + 98056 + + + + + + 139665 + + + 139666 + + + + + 96493 + + + + + + 138171 + + + 138172 + + + + + 87636 + + + + + + 129900 + + + 129901 + + + + + 86073 + + + + + + 128391 + + + 128392 + + + + + 89981 + + + + + + 132170 + + + 132171 + + + + + 86855 + + + + + + 129128 + + + 129127 + + + + + 87897 + + + + + + 129950 + + + 130122 + + + + + 98057 + + + + + + 139666 + + + 139667 + + + + + 85032 + + + + + + 127378 + + + 127384 + + + + + 87637 + + + + + + 129901 + + + 129902 + + + + + 86074 + + + + + + 128392 + + + 128393 + + + + + 89982 + + + + + + 132171 + + + 132172 + + + + + 86856 + + + + + + 129127 + + + 129126 + + + + + 87898 + + + + + + 130122 + + + 129948 + + + + + 98058 + + + + + + 139667 + + + 139668 + + + + + 105352 + + + + + + 146897 + + + 146909 + + + + + 87638 + + + + + + 129902 + + + 129903 + + + + + 86075 + + + + + + 128393 + + + 128394 + + + + + 89983 + + + + + + 132172 + + + 132173 + + + + + 86857 + + + + + + 129126 + + + 129120 + + + + + 87899 + + + + + + 130122 + + + 130123 + + + + + 96496 + + + + + + 138172 + + + 138178 + + + + + 85034 + + + + + + 127384 + + + 127386 + + + + + 87639 + + + + + + 129903 + + + 129904 + + + + + 86076 + + + + + + 128394 + + + 128395 + + + + + 98059 + + + + + + 139668 + + + 139669 + + + + + 89984 + + + + + + 132173 + + + 132174 + + + + + 86858 + + + + + + 129125 + + + 129129 + + + + + 105093 + + + + + + 146635 + + + 146642 + + + + + 87900 + + + + + + 130123 + + + 130121 + + + + + 105354 + + + + + + 146909 + + + 146910 + + + + + 87640 + + + + + + 129904 + + + 129905 + + + + + 86077 + + + + + + 128395 + + + 128396 + + + + + 98060 + + + + + + 139669 + + + 139670 + + + + + 89985 + + + + + + 132174 + + + 132175 + + + + + 86859 + + + + + + 129129 + + + 129130 + + + + + 105094 + + + + + + 146642 + + + 146643 + + + + + 87901 + + + + + + 128959 + + + 130126 + + + + + 87641 + + + + + + 129905 + + + 129906 + + + + + 86078 + + + + + + 128396 + + + 128397 + + + + + 89986 + + + + + + 132175 + + + 132176 + + + + + 86860 + + + + + + 129130 + + + 129131 + + + + + 105095 + + + + + + 146643 + + + 146644 + + + + + 87902 + + + + + + 130126 + + + 130125 + + + + + 105356 + + + + + + 146910 + + + 146911 + + + + + 87642 + + + + + + 129906 + + + 129907 + + + + + 86079 + + + + + + 128397 + + + 128398 + + + + + 89987 + + + + + + 132176 + + + 132177 + + + + + 86861 + + + + + + 129134 + + + 129133 + + + + + 87903 + + + + + + 130125 + + + 130124 + + + + + 105357 + + + + + + 146911 + + + 146912 + + + + + 96500 + + + + + + 138178 + + + 138180 + + + + + 87643 + + + + + + 129907 + + + 129908 + + + + + 86080 + + + + + + 128398 + + + 128399 + + + + + 89988 + + + + + + 132177 + + + 132178 + + + + + 86862 + + + + + + 129133 + + + 129132 + + + + + 87904 + + + + + + 130124 + + + 128961 + + + + + 105358 + + + + + + 146913 + + + 146914 + + + + + 87644 + + + + + + 129908 + + + 129909 + + + + + 86081 + + + + + + 128399 + + + 128400 + + + + + 89989 + + + + + + 132178 + + + 132179 + + + + + 86863 + + + + + + 129132 + + + 129128 + + + + + 85821 + + + + + + 127313 + + + 128150 + + + + + 87905 + + + + + + 130125 + + + 128958 + + + + + 105359 + + + + + + 146914 + + + 146915 + + + + + 87645 + + + + + + 129909 + + + 129910 + + + + + 86082 + + + + + + 128400 + + + 128401 + + + + + 89990 + + + + + + 132179 + + + 132180 + + + + + 86864 + + + + + + 129131 + + + 129135 + + + + + 105099 + + + + + + 146644 + + + 146652 + + + + + 85822 + + + + + + 128150 + + + 128149 + + + + + 87906 + + + + + + 129837 + + + 130129 + + + + + 105360 + + + + + + 146915 + + + 146916 + + + + + 87646 + + + + + + 129910 + + + 129911 + + + + + 86083 + + + + + + 128401 + + + 128402 + + + + + 96503 + + + + + + 138180 + + + 138183 + + + + + 85041 + + + + + + 127386 + + + 127393 + + + + + 89991 + + + + + + 132180 + + + 132181 + + + + + 86865 + + + + + + 129135 + + + 129136 + + + + + 85823 + + + + + + 128149 + + + 127303 + + + + + 87907 + + + + + + 130129 + + + 130128 + + + + + 105361 + + + + + + 146916 + + + 146898 + + + + + 87647 + + + + + + 129911 + + + 129912 + + + + + 86084 + + + + + + 128402 + + + 128403 + + + + + 85042 + + + + + + 127393 + + + 127394 + + + + + 89992 + + + + + + 132181 + + + 132182 + + + + + 86866 + + + + + + 129136 + + + 129137 + + + + + 85824 + + + + + + 128149 + + + 128151 + + + + + 87908 + + + + + + 130128 + + + 130127 + + + + + 87648 + + + + + + 129912 + + + 129913 + + + + + 86085 + + + + + + 128403 + + + 128404 + + + + + 96505 + + + + + + 138183 + + + 138185 + + + + + 85043 + + + + + + 127394 + + + 127395 + + + + + 89993 + + + + + + 132182 + + + 132183 + + + + + 86867 + + + + + + 129138 + + + 129139 + + + + + 105102 + + + + + + 146652 + + + 146653 + + + + + 85825 + + + + + + 128151 + + + 128152 + + + + + 87909 + + + + + + 130127 + + + 129842 + + + + + 87649 + + + + + + 129913 + + + 129914 + + + + + 86086 + + + + + + 128404 + + + 128405 + + + + + 86868 + + + + + + 129139 + + + 129140 + + + + + 85826 + + + + + + 128152 + + + 128153 + + + + + 87910 + + + + + + 128307 + + + 130133 + + + + + 89994 + + + + + + 132183 + + + 132184 + + + + + 87650 + + + + + + 129914 + + + 129915 + + + + + 86087 + + + + + + 128405 + + + 128406 + + + + + 86869 + + + + + + 129140 + + + 129134 + + + + + 85827 + + + + + + 128153 + + + 128154 + + + + + 87911 + + + + + + 130133 + + + 130131 + + + + + 89995 + + + + + + 132184 + + + 132185 + + + + + 87651 + + + + + + 129915 + + + 129916 + + + + + 86088 + + + + + + 128406 + + + 128407 + + + + + 86870 + + + + + + 129137 + + + 129141 + + + + + 105105 + + + + + + 146653 + + + 146654 + + + + + 85828 + + + + + + 128154 + + + 128155 + + + + + 87912 + + + + + + 130131 + + + 130132 + + + + + 89996 + + + + + + 132185 + + + 132186 + + + + + 87652 + + + + + + 129916 + + + 129917 + + + + + 86089 + + + + + + 128407 + + + 128408 + + + + + 86871 + + + + + + 129141 + + + 129142 + + + + + 105106 + + + + + + 146654 + + + 146657 + + + + + 85829 + + + + + + 128155 + + + 128156 + + + + + 87913 + + + + + + 130132 + + + 130130 + + + + + 89997 + + + + + + 132186 + + + 132187 + + + + + 87653 + + + + + + 129917 + + + 129918 + + + + + 86090 + + + + + + 128408 + + + 128409 + + + + + 86872 + + + + + + 129143 + + + 129144 + + + + + 85830 + + + + + + 128156 + + + 128157 + + + + + 87914 + + + + + + 130132 + + + 128309 + + + + + 89998 + + + + + + 132187 + + + 132188 + + + + + 87654 + + + + + + 129918 + + + 129919 + + + + + 86091 + + + + + + 128409 + + + 128410 + + + + + 85049 + + + + + + 127395 + + + 127401 + + + + + 86873 + + + + + + 129144 + + + 129138 + + + + + 85831 + + + + + + 128157 + + + 128158 + + + + + 87915 + + + + + + 130133 + + + 130138 + + + + + 89999 + + + + + + 132188 + + + 132189 + + + + + 87655 + + + + + + 129919 + + + 129920 + + + + + 96512 + + + + + + 138185 + + + 138190 + + + + + 86874 + + + + + + 129142 + + + 129145 + + + + + 85832 + + + + + + 128158 + + + 128159 + + + + + 87916 + + + + + + 130138 + + + 130139 + + + + + 90000 + + + + + + 132189 + + + 132190 + + + + + 87656 + + + + + + 129920 + + + 129921 + + + + + 96513 + + + + + + 138190 + + + 138191 + + + + + 86875 + + + + + + 129145 + + + 129146 + + + + + 85833 + + + + + + 128159 + + + 128160 + + + + + 87917 + + + + + + 130139 + + + 130140 + + + + + 90001 + + + + + + 132190 + + + 132191 + + + + + 87657 + + + + + + 129921 + + + 129922 + + + + + 86094 + + + + + + 128412 + + + 128413 + + + + + 96514 + + + + + + 138191 + + + + + + 86876 + + + + + + 129146 + + + 129147 + + + + + 85834 + + + + + + 128160 + + + 128161 + + + + + 87918 + + + + + + 130140 + + + 130141 + + + + + 90002 + + + + + + 132191 + + + 132192 + + + + + 87658 + + + + + + 129922 + + + 129923 + + + + + 86095 + + + + + + 128413 + + + 128414 + + + + + 96515 + + + + + + + 138194 + + + + + 85053 + + + + + + 127401 + + + 127404 + + + + + 86877 + + + + + + 129148 + + + 129149 + + + + + 85835 + + + + + + 128161 + + + 128162 + + + + + 87919 + + + + + + 130141 + + + 130142 + + + + + 90003 + + + + + + 132192 + + + 132193 + + + + + 87659 + + + + + + 129923 + + + 129924 + + + + + 86096 + + + + + + 128414 + + + 127349 + + + + + 96516 + + + + + + 138194 + + + 138195 + + + + + 86878 + + + + + + 129149 + + + 129150 + + + + + 85836 + + + + + + 128162 + + + 128163 + + + + + 87920 + + + + + + 130142 + + + 130143 + + + + + 90004 + + + + + + 132193 + + + 132194 + + + + + 87660 + + + + + + 129924 + + + 129925 + + + + + 96517 + + + + + + 138195 + + + 138196 + + + + + 86879 + + + + + + 129150 + + + 129143 + + + + + 105114 + + + + + + 146657 + + + 146663 + + + + + 85837 + + + + + + 128163 + + + 128164 + + + + + 87921 + + + + + + 130143 + + + 130144 + + + + + 90005 + + + + + + 132194 + + + 132195 + + + + + 105375 + + + + + + 146933 + + + 146932 + + + + + 87661 + + + + + + 129925 + + + 129926 + + + + + 86880 + + + + + + 129147 + + + 129151 + + + + + 105115 + + + + + + 146663 + + + 146664 + + + + + 85838 + + + + + + 128164 + + + 128165 + + + + + 87922 + + + + + + 130144 + + + 130145 + + + + + 90006 + + + + + + 132195 + + + 132196 + + + + + 105376 + + + + + + 146932 + + + 146931 + + + + + 87662 + + + + + + 129926 + + + 129927 + + + + + 105116 + + + + + + 146664 + + + 146665 + + + + + 85839 + + + + + + 128165 + + + 128166 + + + + + 87923 + + + + + + 130145 + + + 130146 + + + + + 90007 + + + + + + 132196 + + + 132197 + + + + + 86881 + + + + + + 129151 + + + 129152 + + + + + 105377 + + + + + + 146931 + + + 146913 + + + + + 87663 + + + + + + 129927 + + + 129928 + + + + + 85840 + + + + + + 128166 + + + 128167 + + + + + 87924 + + + + + + 130146 + + + 130147 + + + + + 90008 + + + + + + 132197 + + + 132198 + + + + + 86882 + + + + + + 129152 + + + 129153 + + + + + 87664 + + + + + + 129928 + + + 129929 + + + + + 85841 + + + + + + 128167 + + + 128168 + + + + + 87925 + + + + + + 130147 + + + 130148 + + + + + 90009 + + + + + + 132198 + + + 132199 + + + + + 86883 + + + + + + 129154 + + + 129155 + + + + + 87665 + + + + + + 129929 + + + 129930 + + + + + 85060 + + + + + + 127404 + + + 127412 + + + + + 87926 + + + + + + 130148 + + + 130149 + + + + + 90010 + + + + + + 132199 + + + 132200 + + + + + 86884 + + + + + + 129155 + + + 129156 + + + + + 87666 + + + + + + 129930 + + + 129931 + + + + + 85061 + + + + + + 127412 + + + 127413 + + + + + 105120 + + + + + + 146665 + + + 146675 + + + + + 87927 + + + + + + 130149 + + + 130150 + + + + + 90011 + + + + + + 132200 + + + 132201 + + + + + 86885 + + + + + + 129156 + + + 129148 + + + + + 87667 + + + + + + 129931 + + + 129932 + + + + + 85844 + + + + + + 128168 + + + 128170 + + + + + 87928 + + + + + + 130130 + + + 130134 + + + + + 90012 + + + + + + 132201 + + + 132202 + + + + + 86886 + + + + + + 129153 + + + 129157 + + + + + 87668 + + + + + + 129932 + + + 129933 + + + + + 105122 + + + + + + 146675 + + + 146676 + + + + + 85845 + + + + + + 128170 + + + 128171 + + + + + 87929 + + + + + + 130134 + + + 130135 + + + + + 90013 + + + + + + 132202 + + + 132203 + + + + + 86887 + + + + + + 129157 + + + 129158 + + + + + 87669 + + + + + + 129933 + + + 129934 + + + + + 85064 + + + + + + 127413 + + + 127414 + + + + + 85846 + + + + + + 128171 + + + 128167 + + + + + 87930 + + + + + + 130135 + + + 130136 + + + + + 90014 + + + + + + 132203 + + + 132204 + + + + + 86888 + + + + + + 129159 + + + 129160 + + + + + 87670 + + + + + + 128965 + + + 129935 + + + + + 85847 + + + + + + 128170 + + + 128172 + + + + + 87931 + + + + + + 130136 + + + 130137 + + + + + 90015 + + + + + + 132204 + + + 132205 + + + + + 86889 + + + + + + 129160 + + + 129154 + + + + + 87671 + + + + + + 129935 + + + 129936 + + + + + 85848 + + + + + + 128172 + + + 128173 + + + + + 87932 + + + + + + 130137 + + + 130151 + + + + + 90016 + + + + + + 132205 + + + 132206 + + + + + 86890 + + + + + + 129158 + + + 129161 + + + + + 87672 + + + + + + 129936 + + + 129937 + + + + + 85849 + + + + + + 128173 + + + 128174 + + + + + 87933 + + + + + + 130151 + + + 130152 + + + + + 90017 + + + + + + 132206 + + + 132207 + + + + + 86891 + + + + + + 129161 + + + 129162 + + + + + 105387 + + + + + + 146933 + + + 146940 + + + + + 87673 + + + + + + 129937 + + + 128968 + + + + + 85850 + + + + + + 128174 + + + 128175 + + + + + 87934 + + + + + + 130152 + + + 130153 + + + + + 90018 + + + + + + 132207 + + + 132208 + + + + + 86892 + + + + + + 129163 + + + 129164 + + + + + 87674 + + + + + + 129934 + + + 129938 + + + + + 85069 + + + + + + 127414 + + + 127415 + + + + + 105128 + + + + + + 146676 + + + 146677 + + + + + 85851 + + + + + + 128175 + + + 128176 + + + + + 87935 + + + + + + 130153 + + + 130154 + + + + + 90019 + + + + + + 132208 + + + 132209 + + + + + 86893 + + + + + + 129164 + + + 129159 + + + + + 105389 + + + + + + 146940 + + + 146941 + + + + + 87675 + + + + + + 129938 + + + 129939 + + + + + 105129 + + + + + + 146677 + + + 146678 + + + + + 87936 + + + + + + 130154 + + + 130155 + + + + + 90020 + + + + + + 132209 + + + 132210 + + + + + 86894 + + + + + + 129162 + + + 129165 + + + + + 87676 + + + + + + 129939 + + + 129940 + + + + + 105130 + + + + + + 146678 + + + 146679 + + + + + 87937 + + + + + + 130155 + + + 130156 + + + + + 90021 + + + + + + 132210 + + + 132211 + + + + + 86895 + + + + + + 129165 + + + 129166 + + + + + 105391 + + + + + + 146941 + + + 146942 + + + + + 87677 + + + + + + 129940 + + + 129941 + + + + + 85854 + + + + + + 128178 + + + 128179 + + + + + 87938 + + + + + + 130156 + + + 130157 + + + + + 90022 + + + + + + 132211 + + + 132212 + + + + + 86896 + + + + + + 129166 + + + 129167 + + + + + 87678 + + + + + + 129941 + + + 129942 + + + + + 85855 + + + + + + 128179 + + + 128180 + + + + + 87939 + + + + + + 130157 + + + 130158 + + + + + 90023 + + + + + + 132212 + + + 132213 + + + + + 86897 + + + + + + 129168 + + + 129169 + + + + + 105393 + + + + + + 146942 + + + 146943 + + + + + 87679 + + + + + + 129942 + + + 129935 + + + + + 85074 + + + + + + 127415 + + + 127416 + + + + + 85856 + + + + + + 128180 + + + 128181 + + + + + 87940 + + + + + + 130158 + + + 130159 + + + + + 90024 + + + + + + 132213 + + + 132214 + + + + + 86898 + + + + + + 129169 + + + 129170 + + + + + 87680 + + + + + + 128964 + + + 129943 + + + + + 86638 + + + + + + 128914 + + + 128913 + + + + + 85075 + + + + + + 127416 + + + 127418 + + + + + 85857 + + + + + + 128181 + + + 128182 + + + + + 87941 + + + + + + 130159 + + + 130160 + + + + + 90025 + + + + + + 132214 + + + 132215 + + + + + 86899 + + + + + + 129170 + + + 129163 + + + + + 105395 + + + + + + 146943 + + + 146944 + + + + + 87681 + + + + + + 129943 + + + 129944 + + + + + 86639 + + + + + + 128913 + + + 128912 + + + + + 85076 + + + + + + 127418 + + + 127421 + + + + + 85858 + + + + + + 128182 + + + 128183 + + + + + 87942 + + + + + + 130160 + + + 130161 + + + + + 90026 + + + + + + 132215 + + + 132216 + + + + + 86900 + + + + + + 129167 + + + 129171 + + + + + 87682 + + + + + + 129944 + + + 128969 + + + + + 86640 + + + + + + 128912 + + + 128911 + + + + + 85859 + + + + + + 128183 + + + 128184 + + + + + 87943 + + + + + + 130161 + + + 130162 + + + + + 90027 + + + + + + 132216 + + + 132217 + + + + + 86901 + + + + + + 129171 + + + 129172 + + + + + 87683 + + + + + + 129944 + + + 129954 + + + + + 86641 + + + + + + 128911 + + + 128910 + + + + + 85860 + + + + + + 128184 + + + 128185 + + + + + 87944 + + + + + + 130162 + + + 130163 + + + + + 90028 + + + + + + 132217 + + + 132218 + + + + + 86902 + + + + + + 129173 + + + 129174 + + + + + 105398 + + + + + + 146944 + + + 146948 + + + + + 87684 + + + + + + 129954 + + + 129953 + + + + + 86642 + + + + + + 128910 + + + 128276 + + + + + 85861 + + + + + + 128185 + + + 128186 + + + + + 87945 + + + + + + 130160 + + + 130164 + + + + + 90029 + + + + + + 132218 + + + 132219 + + + + + 86903 + + + + + + 129174 + + + 129168 + + + + + 105138 + + + + + + 146679 + + + 146687 + + + + + 87685 + + + + + + 129953 + + + 129952 + + + + + 86643 + + + + + + 128267 + + + 128916 + + + + + 96542 + + + + + + 138196 + + + 138219 + + + + + 85862 + + + + + + 128186 + + + 128187 + + + + + 87946 + + + + + + 130164 + + + 130165 + + + + + 90030 + + + + + + 132219 + + + 132215 + + + + + 86904 + + + + + + 129172 + + + 129175 + + + + + 105139 + + + + + + 146687 + + + 146688 + + + + + 105400 + + + + + + 146948 + + + 146952 + + + + + 87686 + + + + + + 129952 + + + 129951 + + + + + 86644 + + + + + + 128916 + + + 128917 + + + + + 96543 + + + + + + 138219 + + + 138220 + + + + + 85863 + + + + + + 128187 + + + 128188 + + + + + 87947 + + + + + + 130165 + + + 130166 + + + + + 90031 + + + + + + 132218 + + + 132220 + + + + + 86905 + + + + + + 129175 + + + 129176 + + + + + 105140 + + + + + + 146688 + + + 146691 + + + + + 87687 + + + + + + 129951 + + + 129950 + + + + + 86645 + + + + + + 128917 + + + 128265 + + + + + 96544 + + + + + + 138220 + + + 138221 + + + + + 85864 + + + + + + 128188 + + + 128189 + + + + + 87948 + + + + + + 130163 + + + 130167 + + + + + 90032 + + + + + + 132220 + + + 132221 + + + + + 86906 + + + + + + 129176 + + + 129177 + + + + + 105141 + + + + + + 146691 + + + 146694 + + + + + 86646 + + + + + + 128267 + + + 128918 + + + + + 96545 + + + + + + 138221 + + + 138222 + + + + + 85865 + + + + + + 128189 + + + 128190 + + + + + 87949 + + + + + + 130167 + + + 130168 + + + + + 90033 + + + + + + 132221 + + + 132222 + + + + + 86907 + + + + + + 129177 + + + 129178 + + + + + 105142 + + + + + + 146694 + + + 146697 + + + + + 105403 + + + + + + 146952 + + + 146957 + + + + + 86647 + + + + + + 128918 + + + 128916 + + + + + 96546 + + + + + + 138222 + + + 138223 + + + + + 85866 + + + + + + 128190 + + + 128191 + + + + + 87950 + + + + + + 130150 + + + 130174 + + + + + 90034 + + + + + + 132222 + + + 132223 + + + + + 86908 + + + + + + 129179 + + + 129180 + + + + + 87690 + + + + + + 129948 + + + 129947 + + + + + 86648 + + + + + + 128918 + + + 128919 + + + + + 85867 + + + + + + 128191 + + + 128192 + + + + + 87951 + + + + + + 130174 + + + 130173 + + + + + 90035 + + + + + + 132223 + + + 132224 + + + + + 86909 + + + + + + 129180 + + + 129181 + + + + + 105405 + + + + + + 146957 + + + 146963 + + + + + 87691 + + + + + + 129947 + + + 129946 + + + + + 86649 + + + + + + 128919 + + + 128920 + + + + + 85868 + + + + + + 128192 + + + 128193 + + + + + 87952 + + + + + + 130173 + + + 130172 + + + + + 90036 + + + + + + 132224 + + + 132225 + + + + + 86910 + + + + + + 129181 + + + 129182 + + + + + 105406 + + + + + + 146963 + + + 146964 + + + + + 87692 + + + + + + 129946 + + + 129945 + + + + + 86650 + + + + + + 128920 + + + 128921 + + + + + 85869 + + + + + + 128193 + + + 128194 + + + + + 87953 + + + + + + 130172 + + + 130171 + + + + + 90037 + + + + + + 132225 + + + 132226 + + + + + 86911 + + + + + + 129182 + + + 129173 + + + + + 87693 + + + + + + 129945 + + + 129937 + + + + + 86651 + + + + + + 128921 + + + 128922 + + + + + 85870 + + + + + + 128194 + + + 128195 + + + + + 87954 + + + + + + 130171 + + + 130170 + + + + + 90038 + + + + + + 132226 + + + 132227 + + + + + 86912 + + + + + + 129178 + + + 129183 + + + + + 105408 + + + + + + 146964 + + + 146965 + + + + + 87694 + + + + + + 129824 + + + 129955 + + + + + 86652 + + + + + + 128922 + + + 128923 + + + + + 85871 + + + + + + 128195 + + + 128196 + + + + + 87955 + + + + + + 130170 + + + 130169 + + + + + 90039 + + + + + + 132227 + + + 132228 + + + + + 86913 + + + + + + 129183 + + + 129184 + + + + + 105409 + + + + + + 146957 + + + 146961 + + + + + 87695 + + + + + + 129955 + + + 129956 + + + + + 86653 + + + + + + 128923 + + + 128924 + + + + + 85090 + + + + + + 127441 + + + 127442 + + + + + 85872 + + + + + + 128196 + + + 128197 + + + + + 87956 + + + + + + 130169 + + + 130168 + + + + + 90040 + + + + + + 132228 + + + 132229 + + + + + 86914 + + + + + + 129184 + + + 129185 + + + + + 87696 + + + + + + 129956 + + + 129957 + + + + + 86654 + + + + + + 128924 + + + 128925 + + + + + 85091 + + + + + + 127442 + + + 127443 + + + + + 85873 + + + + + + 128197 + + + 128198 + + + + + 87957 + + + + + + 130166 + + + 130175 + + + + + 90041 + + + + + + 132229 + + + 132230 + + + + + 86915 + + + + + + 129185 + + + 129186 + + + + + 105411 + + + + + + 146961 + + + 146962 + + + + + 87697 + + + + + + 129957 + + + 129958 + + + + + 86655 + + + + + + 128925 + + + 128926 + + + + + 85874 + + + + + + 128198 + + + 128199 + + + + + 87958 + + + + + + 130175 + + + 130176 + + + + + 90042 + + + + + + 132230 + + + 132231 + + + + + 86916 + + + + + + 129187 + + + 129188 + + + + + 87698 + + + + + + 129958 + + + 129959 + + + + + 86656 + + + + + + 128926 + + + 128927 + + + + + 85875 + + + + + + 128199 + + + 128200 + + + + + 87959 + + + + + + 130176 + + + 130177 + + + + + 90043 + + + + + + 132231 + + + 132232 + + + + + 86917 + + + + + + 129188 + + + 129189 + + + + + 87699 + + + + + + 129959 + + + 129960 + + + + + 86657 + + + + + + 128927 + + + 128928 + + + + + 85876 + + + + + + 128200 + + + 128201 + + + + + 87960 + + + + + + 130177 + + + 128335 + + + + + 90044 + + + + + + 132232 + + + 132233 + + + + + 86918 + + + + + + 129189 + + + 129190 + + + + + 105153 + + + + + + 146697 + + + 146704 + + + + + 105414 + + + + + + 146942 + + + 146969 + + + + + 87700 + + + + + + 129960 + + + 129961 + + + + + 86658 + + + + + + 128928 + + + 128929 + + + + + 96557 + + + + + + 138223 + + + 138239 + + + + + 85877 + + + + + + 128201 + + + 128202 + + + + + 87961 + + + + + + 128337 + + + 130178 + + + + + 90045 + + + + + + 132233 + + + 132234 + + + + + 86919 + + + + + + 129190 + + + 129179 + + + + + 87701 + + + + + + 129961 + + + 129962 + + + + + 86659 + + + + + + 128929 + + + 128930 + + + + + 85878 + + + + + + 128202 + + + 128203 + + + + + 87962 + + + + + + 130178 + + + 130179 + + + + + 90046 + + + + + + 132234 + + + 132235 + + + + + 86920 + + + + + + 129186 + + + 129191 + + + + + 105155 + + + + + + 146704 + + + 146705 + + + + + 87702 + + + + + + 129962 + + + 129963 + + + + + 86660 + + + + + + 128930 + + + 128931 + + + + + 85097 + + + + + + 127443 + + + 127447 + + + + + 85879 + + + + + + 128203 + + + 128168 + + + + + 87963 + + + + + + 130179 + + + 130180 + + + + + 90047 + + + + + + 132235 + + + 132236 + + + + + 86921 + + + + + + 129191 + + + 129192 + + + + + 87703 + + + + + + 129963 + + + 129964 + + + + + 86661 + + + + + + 128931 + + + 128932 + + + + + 85098 + + + + + + 127443 + + + 127448 + + + + + 85880 + + + + + + 128186 + + + 128204 + + + + + 87964 + + + + + + 130180 + + + 130181 + + + + + 90048 + + + + + + 132236 + + + 132237 + + + + + 86922 + + + + + + 129192 + + + 129193 + + + + + 105157 + + + + + + 146705 + + + 146706 + + + + + 105418 + + + + + + 146965 + + + 146975 + + + + + 87704 + + + + + + 129964 + + + 129965 + + + + + 86662 + + + + + + 128932 + + + 128933 + + + + + 96561 + + + + + + 138239 + + + 138240 + + + + + 85099 + + + + + + 127448 + + + 127447 + + + + + 85881 + + + + + + 128204 + + + 128205 + + + + + 87965 + + + + + + 130181 + + + 130182 + + + + + 96301 + + + + + + 130105 + + + 137994 + + + + + 90049 + + + + + + 132237 + + + 132238 + + + + + 86923 + + + + + + 129194 + + + 129195 + + + + + 105158 + + + + + + 146706 + + + 146707 + + + + + 87705 + + + + + + 129965 + + + 129966 + + + + + 86663 + + + + + + 128933 + + + 128934 + + + + + 96562 + + + + + + 138240 + + + 138241 + + + + + 85100 + + + + + + 127448 + + + 127451 + + + + + 85882 + + + + + + 128205 + + + 128206 + + + + + 87966 + + + + + + 130182 + + + 130177 + + + + + 90050 + + + + + + 132238 + + + 132239 + + + + + 86924 + + + + + + 129195 + + + 129196 + + + + + 105420 + + + + + + 146975 + + + 146976 + + + + + 87706 + + + + + + 129966 + + + 129967 + + + + + 86664 + + + + + + 128934 + + + 128935 + + + + + 85883 + + + + + + 128206 + + + 128207 + + + + + 96303 + + + + + + 137994 + + + 138002 + + + + + 90051 + + + + + + 132239 + + + 132240 + + + + + 86925 + + + + + + 129196 + + + 129187 + + + + + 105160 + + + + + + 146707 + + + 146710 + + + + + 105421 + + + + + + 146976 + + + 146977 + + + + + 87707 + + + + + + 129967 + + + 129968 + + + + + 86665 + + + + + + 128935 + + + 128936 + + + + + 85884 + + + + + + 128207 + + + 128208 + + + + + 90052 + + + + + + 132240 + + + 132241 + + + + + 86926 + + + + + + 129193 + + + 129197 + + + + + 87708 + + + + + + 129968 + + + 129971 + + + + + 86666 + + + + + + 128936 + + + 128937 + + + + + 96565 + + + + + + 138241 + + + 138242 + + + + + 85885 + + + + + + 128208 + + + 128209 + + + + + 96305 + + + + + + 138002 + + + 138006 + + + + + 90053 + + + + + + 132241 + + + 132242 + + + + + 86927 + + + + + + 129197 + + + 129198 + + + + + 87709 + + + + + + 129971 + + + 129972 + + + + + 86667 + + + + + + 128937 + + + 128938 + + + + + 85886 + + + + + + 128209 + + + 128210 + + + + + 90054 + + + + + + 132242 + + + 132243 + + + + + 86928 + + + + + + 129198 + + + 129199 + + + + + 87710 + + + + + + 129972 + + + 129973 + + + + + 86668 + + + + + + 128938 + + + 128939 + + + + + 85887 + + + + + + 128210 + + + 128211 + + + + + 90055 + + + + + + 132243 + + + 132244 + + + + + 86929 + + + + + + 129200 + + + 129201 + + + + + 87711 + + + + + + 129973 + + + 129970 + + + + + 86669 + + + + + + 128939 + + + 128940 + + + + + 96568 + + + + + + 138242 + + + 138243 + + + + + 85888 + + + + + + 128211 + + + 128212 + + + + + 90056 + + + + + + 132244 + + + 132246 + + + + + 86930 + + + + + + 129201 + + + 129202 + + + + + 87712 + + + + + + 129970 + + + 129969 + + + + + 86670 + + + + + + 128940 + + + 128941 + + + + + 85107 + + + + + + 127451 + + + 127458 + + + + + 85889 + + + + + + 128212 + + + 128213 + + + + + 96309 + + + + + + 138006 + + + 138009 + + + + + 90057 + + + + + + 128176 + + + 132255 + + + + + 86931 + + + + + + 129202 + + + 129194 + + + + + 96830 + + + + + + 132329 + + + 138494 + + + + + 87713 + + + + + + 129969 + + + 129966 + + + + + 86671 + + + + + + 128941 + + + 128942 + + + + + 96570 + + + + + + 138243 + + + 138244 + + + + + 90058 + + + + + + 132255 + + + 132254 + + + + + 86932 + + + + + + 129199 + + + 129203 + + + + + 105167 + + + + + + 146710 + + + 146716 + + + + + 85890 + + + + + + 128213 + + + 128214 + + + + + 87714 + + + + + + 129969 + + + 129974 + + + + + 86672 + + + + + + 128942 + + + 128943 + + + + + 90059 + + + + + + 132254 + + + 132252 + + + + + 86933 + + + + + + 129203 + + + 129204 + + + + + 105168 + + + + + + 146716 + + + 146717 + + + + + 85891 + + + + + + 128214 + + + 128215 + + + + + 87715 + + + + + + 129974 + + + 129968 + + + + + 86673 + + + + + + 128943 + + + 128944 + + + + + 90060 + + + + + + 132252 + + + 132251 + + + + + 86934 + + + + + + 129204 + + + 129205 + + + + + 105169 + + + + + + 146717 + + + 146718 + + + + + 85892 + + + + + + 128215 + + + 128216 + + + + + 87716 + + + + + + 129971 + + + 129975 + + + + + 86674 + + + + + + 128944 + + + 128945 + + + + + 96573 + + + + + + 138244 + + + 138247 + + + + + 90061 + + + + + + 132251 + + + 132250 + + + + + 86935 + + + + + + 129206 + + + 129207 + + + + + 96834 + + + + + + 138494 + + + 138495 + + + + + 85893 + + + + + + 128216 + + + 128217 + + + + + 87717 + + + + + + 129975 + + + 129976 + + + + + 86675 + + + + + + 128945 + + + 128946 + + + + + 96574 + + + + + + 138247 + + + 138248 + + + + + 90062 + + + + + + 132250 + + + 132249 + + + + + 86936 + + + + + + 129207 + + + 129208 + + + + + 85894 + + + + + + 128217 + + + 128218 + + + + + 87718 + + + + + + 129976 + + + 129977 + + + + + 86676 + + + + + + 128946 + + + 128947 + + + + + 96575 + + + + + + 138248 + + + 138249 + + + + + 90063 + + + + + + 132249 + + + 132253 + + + + + 86937 + + + + + + 129208 + + + 129200 + + + + + 96836 + + + + + + 138495 + + + 138500 + + + + + 85895 + + + + + + 128218 + + + 128219 + + + + + 87719 + + + + + + 129977 + + + 129978 + + + + + 86677 + + + + + + 128947 + + + 128948 + + + + + 96576 + + + + + + 138249 + + + 138250 + + + + + 90064 + + + + + + 132253 + + + 132252 + + + + + 86938 + + + + + + 129205 + + + 129209 + + + + + 96837 + + + + + + 138500 + + + 138503 + + + + + 85896 + + + + + + 128219 + + + 128220 + + + + + 87720 + + + + + + 129978 + + + 129979 + + + + + 86678 + + + + + + 128948 + + + 128949 + + + + + 96577 + + + + + + 138250 + + + 138251 + + + + + 90065 + + + + + + 132250 + + + 132248 + + + + + 86939 + + + + + + 129209 + + + 129210 + + + + + 85897 + + + + + + 128220 + + + 128221 + + + + + 87721 + + + + + + 129979 + + + 129980 + + + + + 86679 + + + + + + 128949 + + + 128950 + + + + + 90066 + + + + + + 132249 + + + 132248 + + + + + 86940 + + + + + + 129211 + + + 129212 + + + + + 85898 + + + + + + 128221 + + + 128222 + + + + + 87722 + + + + + + 129980 + + + 129981 + + + + + 86680 + + + + + + 128950 + + + 128951 + + + + + 90067 + + + + + + 132248 + + + 132247 + + + + + 86941 + + + + + + 129212 + + + 129206 + + + + + 96840 + + + + + + 138503 + + + 138504 + + + + + 85899 + + + + + + 128222 + + + 128223 + + + + + 87723 + + + + + + 129981 + + + 129982 + + + + + 86681 + + + + + + 128951 + + + 128952 + + + + + 96320 + + + + + + 138009 + + + 138012 + + + + + 90068 + + + + + + 132247 + + + 132239 + + + + + 86942 + + + + + + 129210 + + + 129213 + + + + + 105177 + + + + + + 146718 + + + 146726 + + + + + 85900 + + + + + + 128223 + + + 128224 + + + + + 87724 + + + + + + 129982 + + + 129983 + + + + + 86682 + + + + + + 128952 + + + 128953 + + + + + 96321 + + + + + + 138012 + + + 138013 + + + + + 90069 + + + + + + 132255 + + + 128178 + + + + + 86943 + + + + + + 129213 + + + 129214 + + + + + 105178 + + + + + + 146726 + + + 146727 + + + + + 85901 + + + + + + 128224 + + + 128225 + + + + + 87725 + + + + + + 129983 + + + 129984 + + + + + 86683 + + + + + + 128953 + + + 128954 + + + + + 96322 + + + + + + 138013 + + + 138014 + + + + + 90070 + + + + + + 128158 + + + 132256 + + + + + 86944 + + + + + + 129215 + + + 129216 + + + + + 105179 + + + + + + 146727 + + + 146729 + + + + + 85902 + + + + + + 128225 + + + 128226 + + + + + 87726 + + + + + + 129984 + + + 129988 + + + + + 86684 + + + + + + 128954 + + + 128955 + + + + + 96323 + + + + + + 138014 + + + 138019 + + + + + 90071 + + + + + + 132256 + + + 132257 + + + + + 86945 + + + + + + 129216 + + + 129211 + + + + + 85903 + + + + + + 128226 + + + 128227 + + + + + 87727 + + + + + + 129988 + + + 129987 + + + + + 86685 + + + + + + 128955 + + + 128956 + + + + + 90072 + + + + + + 132257 + + + 132258 + + + + + 86946 + + + + + + 129214 + + + 129217 + + + + + 85904 + + + + + + 128227 + + + 128228 + + + + + 87728 + + + + + + 129987 + + + 129965 + + + + + 86686 + + + + + + 128956 + + + 128957 + + + + + 96325 + + + + + + 138019 + + + 138020 + + + + + 90073 + + + + + + 132258 + + + 132259 + + + + + 86947 + + + + + + 129217 + + + 129218 + + + + + 85905 + + + + + + 128228 + + + 128229 + + + + + 87729 + + + + + + 129987 + + + 129985 + + + + + 86687 + + + + + + 128957 + + + 128958 + + + + + 90074 + + + + + + 132259 + + + 132260 + + + + + 86948 + + + + + + 129218 + + + 129219 + + + + + 105183 + + + + + + 146732 + + + 146729 + + + + + 86688 + + + + + + 128958 + + + 128959 + + + + + 96587 + + + + + + 138251 + + + 138261 + + + + + 87730 + + + + + + 129985 + + + 129986 + + + + + 96327 + + + + + + 138020 + + + 138021 + + + + + 86949 + + + + + + 129220 + + + 129221 + + + + + 96848 + + + + + + 138504 + + + 138515 + + + + + 87731 + + + + + + 129986 + + + 129983 + + + + + 90076 + + + + + + 132260 + + + 132261 + + + + + 86950 + + + + + + 129221 + + + 129222 + + + + + 96849 + + + + + + 138515 + + + 138516 + + + + + 85908 + + + + + + 128231 + + + 128232 + + + + + 87732 + + + + + + 129981 + + + 129993 + + + + + 90077 + + + + + + 132261 + + + 127333 + + + + + 86951 + + + + + + 129222 + + + 129215 + + + + + 96850 + + + + + + 138516 + + + 138517 + + + + + 85909 + + + + + + 128232 + + + 128233 + + + + + 86691 + + + + + + 128957 + + + 128962 + + + + + 87733 + + + + + + 129993 + + + 129992 + + + + + 90078 + + + + + + 132261 + + + 127314 + + + + + 86952 + + + + + + 129219 + + + 129223 + + + + + 96851 + + + + + + 138517 + + + 138518 + + + + + 105187 + + + + + + 146732 + + + 146736 + + + + + 85910 + + + + + + 128233 + + + 128234 + + + + + 105448 + + + + + + 146977 + + + 147004 + + + + + 86692 + + + + + + 128962 + + + 128963 + + + + + 87734 + + + + + + 129992 + + + 129991 + + + + + 90079 + + + + + + 128412 + + + 132263 + + + + + 86953 + + + + + + 129223 + + + 129224 + + + + + 96852 + + + + + + 138518 + + + 138519 + + + + + 105188 + + + + + + 146736 + + + 146737 + + + + + 85911 + + + + + + 128234 + + + 128235 + + + + + 105449 + + + + + + 147004 + + + 147005 + + + + + 86693 + + + + + + 128963 + + + 128965 + + + + + 87735 + + + + + + 129991 + + + 129990 + + + + + 90080 + + + + + + 132263 + + + 132262 + + + + + 105189 + + + + + + 146737 + + + 146738 + + + + + 85912 + + + + + + 128235 + + + 128236 + + + + + 105450 + + + + + + 147005 + + + 147006 + + + + + 86694 + + + + + + 128961 + + + 128964 + + + + + 87736 + + + + + + 129990 + + + 129989 + + + + + 90081 + + + + + + 132262 + + + 128410 + + + + + 96854 + + + + + + 138519 + + + 138520 + + + + + 105190 + + + + + + 146738 + + + 146739 + + + + + 85913 + + + + + + 128236 + + + 128237 + + + + + 105451 + + + + + + 147006 + + + 147007 + + + + + 87737 + + + + + + 129989 + + + 129984 + + + + + 90082 + + + + + + 132262 + + + 132264 + + + + + 86956 + + + + + + 129227 + + + 129228 + + + + + 105191 + + + + + + 146739 + + + 146740 + + + + + 85914 + + + + + + 128237 + + + 128238 + + + + + 105452 + + + + + + 147007 + + + 147008 + + + + + 87738 + + + + + + 129994 + + + 129989 + + + + + 90083 + + + + + + 132264 + + + 132265 + + + + + 86957 + + + + + + 129228 + + + 129220 + + + + + 96856 + + + + + + 138520 + + + 138522 + + + + + 105192 + + + + + + 146740 + + + 146741 + + + + + 85915 + + + + + + 128238 + + + 128239 + + + + + 105453 + + + + + + 147008 + + + 147013 + + + + + 87739 + + + + + + 129994 + + + 129996 + + + + + 90084 + + + + + + 132265 + + + 132266 + + + + + 105193 + + + + + + 146741 + + + 146742 + + + + + 85916 + + + + + + 128239 + + + 128240 + + + + + 105454 + + + + + + 147013 + + + 147012 + + + + + 87740 + + + + + + 129996 + + + 129997 + + + + + 90085 + + + + + + 132263 + + + 132264 + + + + + 96858 + + + + + + 138522 + + + 138523 + + + + + 85917 + + + + + + 128240 + + + 128241 + + + + + 105455 + + + + + + 147012 + + + 147011 + + + + + 86699 + + + + + + 128968 + + + 128970 + + + + + 87741 + + + + + + 129997 + + + 129998 + + + + + 90086 + + + + + + 132266 + + + 132267 + + + + + 85918 + + + + + + 128241 + + + 128242 + + + + + 105456 + + + + + + 147011 + + + 147010 + + + + + 86700 + + + + + + 128969 + + + 128971 + + + + + 87742 + + + + + + 129998 + + + 129999 + + + + + 90087 + + + + + + 132267 + + + 132268 + + + + + 96860 + + + + + + 138523 + + + 138526 + + + + + 85919 + + + + + + 128238 + + + 128245 + + + + + 105457 + + + + + + 147010 + + + 147009 + + + + + 86701 + + + + + + 128970 + + + 128972 + + + + + 87743 + + + + + + 129999 + + + 130000 + + + + + 90088 + + + + + + 132268 + + + 132269 + + + + + 96861 + + + + + + 138526 + + + 138528 + + + + + 85920 + + + + + + 128245 + + + 128244 + + + + + 105458 + + + + + + 147009 + + + 147008 + + + + + 86702 + + + + + + 128971 + + + 128973 + + + + + 87744 + + + + + + 130000 + + + 129988 + + + + + 90089 + + + + + + 132269 + + + 132270 + + + + + 105198 + + + + + + 146742 + + + 146754 + + + + + 85921 + + + + + + 128244 + + + 128243 + + + + + 105459 + + + + + + 147009 + + + 147007 + + + + + 86703 + + + + + + 128972 + + + 128974 + + + + + 87745 + + + + + + 129994 + + + 129995 + + + + + 96342 + + + + + + 138021 + + + 138033 + + + + + 90090 + + + + + + 132270 + + + 132271 + + + + + 96863 + + + + + + 138528 + + + 138533 + + + + + 85922 + + + + + + 128243 + + + 128242 + + + + + 105460 + + + + + + 147010 + + + 147014 + + + + + 86704 + + + + + + 128973 + + + 128975 + + + + + 87746 + + + + + + 129995 + + + 129832 + + + + + 90091 + + + + + + 132271 + + + 132272 + + + + + 85923 + + + + + + 128242 + + + 128246 + + + + + 105461 + + + + + + 147011 + + + 147014 + + + + + 86705 + + + + + + 128974 + + + 128976 + + + + + 87747 + + + + + + 129856 + + + 130001 + + + + + 90092 + + + + + + 132272 + + + 132273 + + + + + 96865 + + + + + + 138533 + + + 138536 + + + + + 105201 + + + + + + 146754 + + + 146755 + + + + + 85924 + + + + + + 128246 + + + 128247 + + + + + 105462 + + + + + + 147014 + + + 147015 + + + + + 86706 + + + + + + 128975 + + + 128977 + + + + + 87748 + + + + + + 130001 + + + 129854 + + + + + 90093 + + + + + + 132273 + + + 132274 + + + + + 85925 + + + + + + 128247 + + + 128248 + + + + + 105463 + + + + + + 147015 + + + 147016 + + + + + 86707 + + + + + + 128976 + + + 128978 + + + + + 87749 + + + + + + 129857 + + + 130002 + + + + + 96346 + + + + + + 138033 + + + 138036 + + + + + 90094 + + + + + + 132274 + + + 132275 + + + + + 85926 + + + + + + 128248 + + + 128249 + + + + + 105464 + + + + + + 147016 + + + 147017 + + + + + 86708 + + + + + + 128977 + + + 128979 + + + + + 87750 + + + + + + 130002 + + + 130003 + + + + + 96347 + + + + + + 138036 + + + 138037 + + + + + 90095 + + + + + + 132275 + + + 132276 + + + + + 96868 + + + + + + 138536 + + + 138537 + + + + + 85927 + + + + + + 128249 + + + 128250 + + + + + 105465 + + + + + + 146969 + + + 147018 + + + + + 86709 + + + + + + 128978 + + + 128980 + + + + + 87751 + + + + + + 130003 + + + 130005 + + + + + 96348 + + + + + + 138037 + + + 138038 + + + + + 90096 + + + + + + 132276 + + + 132277 + + + + + 85928 + + + + + + 128250 + + + 128251 + + + + + 105466 + + + + + + 146962 + + + 147018 + + + + + 86710 + + + + + + 128979 + + + 128981 + + + + + 87752 + + + + + + 130003 + + + 130004 + + + + + 96349 + + + + + + 138038 + + + 138054 + + + + + 90097 + + + + + + 132277 + + + 132278 + + + + + 105206 + + + + + + 146755 + + + 146756 + + + + + 85929 + + + + + + 128251 + + + 128252 + + + + + 105467 + + + + + + 147018 + + + 147019 + + + + + 86711 + + + + + + 128980 + + + 128982 + + + + + 87753 + + + + + + 130004 + + + 130006 + + + + + 97652 + + + + + + 138632 + + + 139253 + + + + + 96350 + + + + + + 138054 + + + 138056 + + + + + 90098 + + + + + + 132278 + + + 132279 + + + + + 96871 + + + + + + 138537 + + + 138538 + + + + + 105207 + + + + + + 146756 + + + 146757 + + + + + 85930 + + + + + + 128252 + + + 128253 + + + + + 105468 + + + + + + 147019 + + + 147020 + + + + + 86712 + + + + + + 128981 + + + 128983 + + + + + 87754 + + + + + + 130006 + + + 130007 + + + + + 97653 + + + + + + 139253 + + + 139254 + + + + + 96351 + + + + + + 138056 + + + 138057 + + + + + 90099 + + + + + + 132279 + + + 132280 + + + + + 96872 + + + + + + 138538 + + + 138539 + + + + + 105208 + + + + + + 146757 + + + 146768 + + + + + 85931 + + + + + + 128253 + + + 128254 + + + + + 105469 + + + + + + 147020 + + + 147021 + + + + + 86713 + + + + + + 128982 + + + 128984 + + + + + 87755 + + + + + + 130006 + + + 130008 + + + + + 97654 + + + + + + 139255 + + + 139256 + + + + + 90100 + + + + + + 132280 + + + 132281 + + + + + 96873 + + + + + + 138539 + + + 138540 + + + + + 85932 + + + + + + 128254 + + + 128255 + + + + + 105470 + + + + + + 147021 + + + 147022 + + + + + 86714 + + + + + + 128983 + + + 128985 + + + + + 87756 + + + + + + 130008 + + + 130017 + + + + + 97655 + + + + + + 139256 + + + 138633 + + + + + 90101 + + + + + + 132281 + + + 132282 + + + + + 96874 + + + + + + 138540 + + + 138541 + + + + + 85933 + + + + + + 128255 + + + 128256 + + + + + 105471 + + + + + + 147022 + + + 147023 + + + + + 86715 + + + + + + 128984 + + + 128986 + + + + + 87757 + + + + + + 130008 + + + 130009 + + + + + 97656 + + + + + + 139254 + + + 139257 + + + + + 90102 + + + + + + 132282 + + + 132283 + + + + + 96875 + + + + + + 138541 + + + 138542 + + + + + 105211 + + + + + + 146768 + + + 146769 + + + + + 85934 + + + + + + 128256 + + + 128257 + + + + + 105472 + + + + + + 147023 + + + 147024 + + + + + 86716 + + + + + + 128985 + + + 128987 + + + + + 87758 + + + + + + 130009 + + + 130010 + + + + + 97657 + + + + + + 139257 + + + 139258 + + + + + 90103 + + + + + + 132283 + + + 132284 + + + + + 96876 + + + + + + 138542 + + + 138543 + + + + + 85935 + + + + + + 128257 + + + 128258 + + + + + 105473 + + + + + + 147024 + + + 147025 + + + + + 86717 + + + + + + 128987 + + + 128988 + + + + + 87759 + + + + + + 130010 + + + 130011 + + + + + 97658 + + + + + + 139259 + + + 139260 + + + + + 90104 + + + + + + 132284 + + + 132285 + + + + + 96877 + + + + + + 138543 + + + 138544 + + + + + 85936 + + + + + + 128258 + + + 128259 + + + + + 105474 + + + + + + 147025 + + + 147026 + + + + + 86718 + + + + + + 128988 + + + 128989 + + + + + 87760 + + + + + + 130011 + + + 130012 + + + + + 97659 + + + + + + 139260 + + + 139255 + + + + + 90105 + + + + + + 132285 + + + 132286 + + + + + 96878 + + + + + + 138544 + + + 138545 + + + + + 85937 + + + + + + 128259 + + + 128260 + + + + + 105475 + + + + + + 147026 + + + 147027 + + + + + 86719 + + + + + + 128989 + + + 128990 + + + + + 87761 + + + + + + 130012 + + + 130013 + + + + + 97660 + + + + + + 139258 + + + 139261 + + + + + 90106 + + + + + + 132286 + + + 132287 + + + + + 96879 + + + + + + 138545 + + + 138546 + + + + + 85938 + + + + + + 128260 + + + 128261 + + + + + 105476 + + + + + + 147027 + + + 147028 + + + + + 86720 + + + + + + 128986 + + + 128991 + + + + + 87762 + + + + + + 130013 + + + 130014 + + + + + 97661 + + + + + + 139261 + + + 139262 + + + + + 90107 + + + + + + 132287 + + + 132284 + + + + + 96880 + + + + + + 129097 + + + 138548 + + + + + 85939 + + + + + + 128261 + + + 128262 + + + + + 105477 + + + + + + 147028 + + + 147029 + + + + + 86721 + + + + + + 128991 + + + 128992 + + + + + 87763 + + + + + + 130013 + + + 130015 + + + + + 97662 + + + + + + 139262 + + + 139263 + + + + + 90108 + + + + + + 130100 + + + 132288 + + + + + 96881 + + + + + + 138548 + + + 138547 + + + + + 85940 + + + + + + 128262 + + + 128263 + + + + + 105478 + + + + + + 147029 + + + 147030 + + + + + 86722 + + + + + + 128992 + + + 128993 + + + + + 87764 + + + + + + 130015 + + + 130010 + + + + + 97663 + + + + + + 139264 + + + 139265 + + + + + 90109 + + + + + + 132288 + + + 132289 + + + + + 96882 + + + + + + 138547 + + + 129101 + + + + + 85941 + + + + + + 128263 + + + 128264 + + + + + 105479 + + + + + + 147030 + + + 147031 + + + + + 86723 + + + + + + 128990 + + + 128994 + + + + + 87765 + + + + + + 130015 + + + 130016 + + + + + 97664 + + + + + + 139265 + + + 139266 + + + + + 90110 + + + + + + 132289 + + + 132290 + + + + + 96883 + + + + + + 138548 + + + 138550 + + + + + 85942 + + + + + + 128264 + + + 128265 + + + + + 105480 + + + + + + 147031 + + + 147032 + + + + + 86724 + + + + + + 128994 + + + 128995 + + + + + 87766 + + + + + + 130016 + + + 130023 + + + + + 97665 + + + + + + 139266 + + + 139259 + + + + + 90111 + + + + + + 132290 + + + 132291 + + + + + 96884 + + + + + + 138550 + + + 138546 + + + + + 105220 + + + + + + 146769 + + + 146770 + + + + + 105481 + + + + + + 147032 + + + 147033 + + + + + 86725 + + + + + + 128995 + + + 128996 + + + + + 87767 + + + + + + 130023 + + + 130024 + + + + + 97666 + + + + + + 139263 + + + 139267 + + + + + 90112 + + + + + + 132291 + + + 132292 + + + + + 96885 + + + + + + 129141 + + + 138551 + + + + + 105221 + + + + + + 146770 + + + 146771 + + + + + 105482 + + + + + + 147033 + + + 147034 + + + + + 86726 + + + + + + 128996 + + + 128997 + + + + + 87768 + + + + + + 130024 + + + 130025 + + + + + 97667 + + + + + + 139268 + + + 139264 + + + + + 90113 + + + + + + 132292 + + + 132293 + + + + + 96886 + + + + + + 138551 + + + 138552 + + + + + 105222 + + + + + + 146771 + + + 146772 + + + + + 85945 + + + + + + 128267 + + + 128268 + + + + + 105483 + + + + + + 147034 + + + 147035 + + + + + 86727 + + + + + + 128993 + + + 128998 + + + + + 87769 + + + + + + 130025 + + + 130026 + + + + + 97668 + + + + + + 139267 + + + 139269 + + + + + 90114 + + + + + + 132293 + + + 132294 + + + + + 96887 + + + + + + 138552 + + + 138553 + + + + + 105223 + + + + + + 146772 + + + 146773 + + + + + 85946 + + + + + + 128268 + + + 128269 + + + + + 105484 + + + + + + 147035 + + + 147036 + + + + + 86728 + + + + + + 128998 + + + 128999 + + + + + 87770 + + + + + + 130026 + + + 130027 + + + + + 97669 + + + + + + 139269 + + + 139270 + + + + + 90115 + + + + + + 132294 + + + 132295 + + + + + 96888 + + + + + + 138553 + + + 138554 + + + + + 105224 + + + + + + 146773 + + + 146774 + + + + + 85947 + + + + + + 128269 + + + 128270 + + + + + 105485 + + + + + + 147036 + + + 147037 + + + + + 86729 + + + + + + 128999 + + + 129000 + + + + + 87771 + + + + + + 130027 + + + 130028 + + + + + 97670 + + + + + + 139271 + + + 139272 + + + + + 90116 + + + + + + 132295 + + + 132296 + + + + + 96889 + + + + + + 138554 + + + 138555 + + + + + 105225 + + + + + + 146774 + + + 146775 + + + + + 85948 + + + + + + 128270 + + + 128271 + + + + + 96368 + + + + + + 138057 + + + 138063 + + + + + 105486 + + + + + + 147037 + + + 147038 + + + + + 86730 + + + + + + 129000 + + + 129001 + + + + + 87772 + + + + + + 130028 + + + 130029 + + + + + 97671 + + + + + + 139272 + + + 139268 + + + + + 90117 + + + + + + 132296 + + + 132297 + + + + + 96890 + + + + + + 138555 + + + 138556 + + + + + 105226 + + + + + + 146775 + + + 146776 + + + + + 85949 + + + + + + 128271 + + + 128272 + + + + + 105487 + + + + + + 147038 + + + 147039 + + + + + 86731 + + + + + + 128997 + + + 129002 + + + + + 87773 + + + + + + 130029 + + + 130030 + + + + + 90118 + + + + + + 132297 + + + 132298 + + + + + 96891 + + + + + + 138556 + + + 138557 + + + + + 105227 + + + + + + 146776 + + + 146777 + + + + + 96370 + + + + + + 138063 + + + 138064 + + + + + 105488 + + + + + + 147039 + + + 147040 + + + + + 86732 + + + + + + 129002 + + + 129003 + + + + + 87774 + + + + + + 130030 + + + 130028 + + + + + 90119 + + + + + + 132298 + + + 132299 + + + + + 96892 + + + + + + 138557 + + + 138558 + + + + + 105228 + + + + + + 146777 + + + 146778 + + + + + 96371 + + + + + + 138064 + + + 138065 + + + + + 105489 + + + + + + 147040 + + + 147041 + + + + + 86733 + + + + + + 129001 + + + 129004 + + + + + 87775 + + + + + + 130025 + + + 130020 + + + + + 90120 + + + + + + 132299 + + + 132300 + + + + + 96893 + + + + + + 138558 + + + 138559 + + + + + 105229 + + + + + + 146778 + + + 146783 + + + + + 85952 + + + + + + 128274 + + + 128275 + + + + + 96372 + + + + + + 138065 + + + 138066 + + + + + 105490 + + + + + + 147041 + + + 147042 + + + + + 86734 + + + + + + 129004 + + + 129005 + + + + + 87776 + + + + + + 130020 + + + 130021 + + + + + 90121 + + + + + + 132300 + + + 132301 + + + + + 96894 + + + + + + 138559 + + + 138560 + + + + + 105230 + + + + + + 146783 + + + 146785 + + + + + 85953 + + + + + + 128275 + + + 128276 + + + + + 105491 + + + + + + 147042 + + + 147043 + + + + + 86735 + + + + + + 129003 + + + 129006 + + + + + 87777 + + + + + + 130021 + + + 130022 + + + + + 90122 + + + + + + 132301 + + + 132302 + + + + + 96895 + + + + + + 138560 + + + 138561 + + + + + 85954 + + + + + + 128276 + + + 128277 + + + + + 105492 + + + + + + 147043 + + + 147044 + + + + + 86736 + + + + + + 129006 + + + 129007 + + + + + 87778 + + + + + + 130022 + + + 130009 + + + + + 90123 + + + + + + 132302 + + + 132303 + + + + + 96896 + + + + + + 138562 + + + 138563 + + + + + 105493 + + + + + + 147044 + + + 147045 + + + + + 86737 + + + + + + 129005 + + + 129009 + + + + + 87779 + + + + + + 130022 + + + 130016 + + + + + 90124 + + + + + + 132303 + + + 132304 + + + + + 96897 + + + + + + 138563 + + + 138564 + + + + + 105494 + + + + + + 147045 + + + 147046 + + + + + 86738 + + + + + + 129009 + + + 129010 + + + + + 87780 + + + + + + 130017 + + + 130031 + + + + + 90125 + + + + + + 132304 + + + 132305 + + + + + 96898 + + + + + + 138564 + + + 138565 + + + + + 85957 + + + + + + 128279 + + + 128280 + + + + + 105495 + + + + + + 147046 + + + 147047 + + + + + 87781 + + + + + + 130031 + + + 130021 + + + + + 86739 + + + + + + 129010 + + + 129011 + + + + + 90126 + + + + + + 132305 + + + 132306 + + + + + 96899 + + + + + + 138565 + + + 138566 + + + + + 85958 + + + + + + 128280 + + + 128281 + + + + + 105496 + + + + + + 147047 + + + 147048 + + + + + 87782 + + + + + + 130020 + + + 130019 + + + + + 86740 + + + + + + 129007 + + + 129008 + + + + + 90127 + + + + + + 132306 + + + 132307 + + + + + 96900 + + + + + + 138566 + + + 138567 + + + + + 85959 + + + + + + 128281 + + + 128282 + + + + + 105497 + + + + + + 147048 + + + 147049 + + + + + 87783 + + + + + + 130019 + + + 130018 + + + + + 86741 + + + + + + 129008 + + + 129013 + + + + + 90128 + + + + + + 132307 + + + 132308 + + + + + 96901 + + + + + + 138567 + + + 138568 + + + + + 85960 + + + + + + 128282 + + + 128283 + + + + + 105498 + + + + + + 147049 + + + 147050 + + + + + 87784 + + + + + + 130018 + + + 130004 + + + + + 86742 + + + + + + 129011 + + + 129012 + + + + + 90129 + + + + + + 132308 + + + 132309 + + + + + 96902 + + + + + + 138568 + + + 138553 + + + + + 85961 + + + + + + 128283 + + + 128284 + + + + + 105499 + + + + + + 147050 + + + 147051 + + + + + 87785 + + + + + + 129861 + + + 130032 + + + + + 86743 + + + + + + 129012 + + + 129014 + + + + + 90130 + + + + + + 132309 + + + 132310 + + + + + 96903 + + + + + + 138554 + + + 138569 + + + + + 105239 + + + + + + 146785 + + + 146790 + + + + + 85962 + + + + + + 128284 + + + 128285 + + + + + 105500 + + + + + + 147051 + + + 147052 + + + + + 87786 + + + + + + 130032 + + + 129859 + + + + + 86744 + + + + + + 129014 + + + 129015 + + + + + 90131 + + + + + + 132310 + + + 132311 + + + + + 96904 + + + + + + 138569 + + + 138570 + + + + + 105240 + + + + + + 146790 + + + 146791 + + + + + 85963 + + + + + + 128285 + + + 128286 + + + + + 105501 + + + + + + 147052 + + + 147053 + + + + + 87787 + + + + + + 129851 + + + 130039 + + + + + 86745 + + + + + + 129015 + + + 129016 + + + + + 90132 + + + + + + 132311 + + + 132312 + + + + + 96905 + + + + + + 138570 + + + 138571 + + + + + 105241 + + + + + + 146791 + + + 146797 + + + + + 85964 + + + + + + 128286 + + + 128287 + + + + + + + + + 128957 + + + 129868 + + + 147122 + + + 129054 + + + 130050 + + + 129058 + + + 128970 + + + 129970 + + + 132337 + + + 129006 + + + 129966 + + + 132172 + + + 146755 + + + 147097 + + + 147126 + + + 129036 + + + 132351 + + + 129068 + + + 128973 + + + 147048 + + + 146652 + + + 128980 + + + 129089 + + + 132316 + + + 129842 + + + 132129 + + + 128948 + + + 129023 + + + 128270 + + + 128976 + + + 128951 + + + 128932 + + + 147137 + + + 146697 + + + 129990 + + + 138522 + + + 147042 + + + 129923 + + + 146557 + + + 138495 + + + 128263 + + + 129002 + + + 132152 + + + 130014 + + + 129978 + + + 132326 + + + 129997 + + + 129014 + + + 129857 + + + 147113 + + + 147131 + + + 128244 + + + 132363 + + + 132324 + + + 132145 + + + 132312 + + + 132339 + + + 129841 + + + 129016 + + + 147133 + + + 129077 + + + 129043 + + + 132137 + + + 130008 + + + 128916 + + + 129085 + + + 128224 + + + 129010 + + + 147055 + + + 132138 + + + 147069 + + + 128996 + + + 129093 + + + 147105 + + + 147090 + + + 130018 + + + 129975 + + + 129931 + + + 132125 + + + 129964 + + + 147047 + + + 130128 + + + 132192 + + + 132342 + + + 132198 + + + 129017 + + + 132216 + + + 138542 + + + 129033 + + + 130068 + + + 129947 + + + 132300 + + + 129047 + + + 128955 + + + 129022 + + + 128925 + + + 147139 + + + 147081 + + + 132357 + + + 129853 + + + 129046 + + + 130109 + + + 129969 + + + 138545 + + + 129007 + + + 132204 + + + 132298 + + + 130129 + + + 132361 + + + 129989 + + + 132299 + + + 128929 + + + 146770 + + + 129846 + + + 132358 + + + 128945 + + + 129929 + + + 129921 + + + 146707 + + + 147100 + + + 146643 + + + 129911 + + + 147045 + + + 132350 + + + 128952 + + + 128216 + + + 147050 + + + 128959 + + + 129971 + + + 132184 + + + 146739 + + + 130007 + + + 128946 + + + 147076 + + + 130035 + + + 128922 + + + 128240 + + + 147119 + + + 147099 + + + 146617 + + + 147072 + + + 147135 + + + 128265 + + + 138546 + + + 129932 + + + 129981 + + + 128999 + + + 132343 + + + 129817 + + + 130006 + + + 130015 + + + 130070 + + + 147102 + + + 132303 + + + 129063 + + + + 130041 + + + 130043 + + + 132319 + + + 146706 + + + 129995 + + + 146710 + + + 129991 + + + 130126 + + + 132189 + + + 147134 + + + 147125 + + + 128243 + + + 138528 + + + 129018 + + + 130028 + + + 147051 + + + 132329 + + + 128225 + + + 147109 + + + 132327 + + + 147062 + + + 147079 + + + 132344 + + + 138538 + + + 130002 + + + 129101 + + + 128914 + + + 129049 + + + 128249 + + + 130051 + + + 147070 + + + 146740 + + + 129053 + + + 132150 + + + 129008 + + + 146691 + + + 132322 + + + 129855 + + + 147092 + + + 128246 + + + 130029 + + + 147140 + + + 128958 + + + 128253 + + + 129940 + + + 129826 + + + 128968 + + + 147128 + + + 147084 + + + 146726 + + + 132196 + + + 138533 + + + 132131 + + + 146727 + + + 129973 + + + 129935 + + + 146615 + + + 130025 + + + 146678 + + + 132197 + + + 146635 + + + 129078 + + + 132294 + + + 129994 + + + 132188 + + + 130060 + + + 132338 + + + 129967 + + + 147066 + + + 130059 + + + 132306 + + + 129939 + + + 129051 + + + 132335 + + + 128972 + + + 146729 + + + 138547 + + + 138526 + + + 128219 + + + 129999 + + + 147053 + + + 132181 + + + 130022 + + + 129941 + + + 129040 + + + 129946 + + + 128992 + + + 128918 + + + 146676 + + + 129041 + + + 128911 + + + 129840 + + + 129998 + + + 146581 + + + 132193 + + + 132164 + + + 132163 + + + 129938 + + + 132149 + + + 130116 + + + 132139 + + + 129038 + + + 128991 + + + 132321 + + + 132128 + + + 147129 + + + 128983 + + + 128242 + + + 130125 + + + 128961 + + + 132156 + + + 128250 + + + 132147 + + + 130017 + + + 130052 + + + 147144 + + + 147078 + + + 147143 + + + 128997 + + + 146768 + + + 130118 + + + 147068 + + + 129086 + + + 132148 + + + 146623 + + + 146737 + + + 146620 + + + 128982 + + + 146607 + + + 129924 + + + 128927 + + + 130061 + + + 130038 + + + 129927 + + + 129937 + + + 128231 + + + 130000 + + + 132297 + + + 129032 + + + 130047 + + + 128933 + + + 129105 + + + 128232 + + + 130112 + + + 128981 + + + 147041 + + + 128921 + + + 128217 + + + 128272 + + + 128977 + + + 128964 + + + 130108 + + + 132143 + + + 132334 + + + 130067 + + + 129965 + + + 129091 + + + 129001 + + + 138539 + + + 129025 + + + 147093 + + + 128943 + + + 147044 + + + 147067 + + + 130111 + + + 129982 + + + 132186 + + + 129112 + + + 132135 + + + 128276 + + + 129061 + + + 132207 + + + 128947 + + + 128228 + + + 132315 + + + 128937 + + + 129917 + + + 146562 + + + 147132 + + + 132194 + + + 130034 + + + 128942 + + + 129866 + + + 128974 + + + 129992 + + + 129011 + + + 146664 + + + 129914 + + + 132313 + + + 128979 + + + 147056 + + + 147064 + + + 130054 + + + 129103 + + + 128953 + + + 132180 + + + 132212 + + + 132346 + + + 147077 + + + 147142 + + + 132151 + + + 129021 + + + 128931 + + + 128227 + + + 130019 + + + 128934 + + + 132154 + + + 128289 + + + 138544 + + + 138503 + + + 129031 + + + 129837 + + + 129987 + + + 132173 + + + 132202 + + + 130021 + + + 146578 + + + 147059 + + + 129013 + + + 128223 + + + 128282 + + + 128993 + + + 132308 + + + 147058 + + + 146618 + + + 130066 + + + 130031 + + + 147110 + + + 147145 + + + 132336 + + + 147071 + + + 129030 + + + 129963 + + + 129052 + + + 147104 + + + 147057 + + + 147114 + + + 128274 + + + 132347 + + + 129834 + + + 130058 + + + 128284 + + + 132200 + + + 128938 + + + 132209 + + + 147146 + + + 130016 + + + 129847 + + + 129977 + + + 128941 + + + 146718 + + + 146552 + + + 129062 + + + 128268 + + + 129848 + + + 146633 + + + 129815 + + + 147038 + + + 128963 + + + 129849 + + + 146653 + + + 132353 + + + 128985 + + + 132159 + + + 146654 + + + 129082 + + + 132175 + + + 128920 + + + 128910 + + + 128965 + + + 130001 + + + 129015 + + + 147075 + + + 146716 + + + 129869 + + + 147086 + + + 129919 + + + 128245 + + + 128238 + + + 146756 + + + 129050 + + + 129825 + + + 132211 + + + 132356 + + + 129019 + + + 146624 + + + 129851 + + + 129925 + + + 132199 + + + + 132311 + + + 128271 + + + 132340 + + + 128286 + + + 138515 + + + 147111 + + + 147061 + + + 129985 + + + 132359 + + + 129087 + + + 129945 + + + 129064 + + + 129948 + + + 128259 + + + 128928 + + + 132195 + + + 130012 + + + 128944 + + + 129934 + + + 129088 + + + 128995 + + + 128924 + + + 146608 + + + 129928 + + + 130042 + + + 129067 + + + 128262 + + + 128949 + + + 132168 + + + 130027 + + + 130107 + + + 129819 + + + 146565 + + + 132165 + + + 132362 + + + 132140 + + + 146769 + + + 129918 + + + 146616 + + + 129079 + + + 128285 + + + 129912 + + + 132301 + + + 129920 + + + 129012 + + + 129838 + + + 146574 + + + 129942 + + + 147073 + + + 129829 + + + 130039 + + + 129821 + + + 146621 + + + 132141 + + + 132182 + + + 129048 + + + 130033 + + + 129080 + + + 132290 + + + 129955 + + + 129039 + + + 129822 + + + 129930 + + + 146550 + + + 132203 + + + 129814 + + + 132201 + + + 129094 + + + 128962 + + + 132304 + + + 128236 + + + 130121 + + + 130003 + + + 147039 + + + 130024 + + + 129988 + + + 130009 + + + 147095 + + + 130004 + + + 130040 + + + 129972 + + + 130013 + + + 130063 + + + 129952 + + + 132210 + + + 146754 + + + 132178 + + + 147054 + + + 130119 + + + 130011 + + + 128237 + + + 146732 + + + 146606 + + + 129839 + + + 129960 + + + 138543 + + + 128283 + + + 147087 + + + 129055 + + + 129037 + + + 132166 + + + 147116 + + + 129936 + + + 132136 + + + 129042 + + + 128247 + + + 128281 + + + 129993 + + + 130010 + + + 146642 + + + 129959 + + + 129045 + + + 128277 + + + 132179 + + + 129915 + + + 138550 + + + 128940 + + + 132330 + + + 129004 + + + 129865 + + + 132310 + + + 132291 + + + 128926 + + + 129108 + + + 129858 + + + 128233 + + + 129073 + + + 132217 + + + 129980 + + + 132142 + + + 128988 + + + 146717 + + + 132318 + + + 132314 + + + 132176 + + + 128912 + + + 128280 + + + 147115 + + + 138504 + + + 147121 + + + 147083 + + + 147094 + + + 132331 + + + 146657 + + + 129029 + + + 129830 + + + 128936 + + + 132153 + + + 129003 + + + 146573 + + + 129916 + + + 128288 + + + 132348 + + + 129850 + + + 130046 + + + 129099 + + + 132158 + + + 129859 + + + 128226 + + + 147106 + + + 128990 + + + 132341 + + + 130062 + + + 132146 + + + 129984 + + + 129854 + + + 128269 + + + 132174 + + + 132296 + + + 129109 + + + 132171 + + + 128235 + + + 129962 + + + 128234 + + + 129954 + + + 128975 + + + 132208 + + + 129083 + + + 130048 + + + 146622 + + + 129835 + + + 128261 + + + 132302 + + + 128229 + + + 129104 + + + 129926 + + + 128221 + + + 128989 + + + 147052 + + + 146736 + + + 147141 + + + 128969 + + + 129844 + + + 147130 + + + 129816 + + + 129069 + + + 129820 + + + 129836 + + + 147082 + + + 129833 + + + 128264 + + + 129100 + + + 129075 + + + 128252 + + + 129076 + + + 146777 + + + 128950 + + + 132292 + + + 147091 + + + 147063 + + + 129024 + + + 130064 + + + 146626 + + + 146771 + + + 132219 + + + 129968 + + + 128984 + + + 132130 + + + 138520 + + + 130045 + + + 147103 + + + 147127 + + + 128254 + + + 129090 + + + 128215 + + + 146586 + + + 138494 + + + 129956 + + + 128251 + + + 132205 + + + 130023 + + + 146778 + + + 129034 + + + 128986 + + + 129106 + + + 128935 + + + 129074 + + + 146773 + + + 132187 + + + 128930 + + + 132293 + + + 146742 + + + 128255 + + + 129059 + + + 132190 + + + + 147138 + + + 129020 + + + 128222 + + + 130069 + + + 130044 + + + 130124 + + + 129081 + + + 132213 + + + 130005 + + + 147049 + + + 128994 + + + 129843 + + + 128998 + + + 147089 + + + 130026 + + + 128248 + + + 129071 + + + 129066 + + + 132170 + + + 129863 + + + 138516 + + + 128939 + + + 147136 + + + 146694 + + + 132345 + + + 132332 + + + 129035 + + + 128239 + + + 130065 + + + 128917 + + + 146687 + + + 129845 + + + 147117 + + + 128241 + + + 132191 + + + 132333 + + + 146704 + + + 130115 + + + 132162 + + + 129092 + + + 138540 + + + 147107 + + + 132127 + + + 138519 + + + 146776 + + + 146584 + + + 129828 + + + 128923 + + + 147046 + + + 132325 + + + 132161 + + + 130071 + + + 130120 + + + 132355 + + + 147043 + + + 147060 + + + 128256 + + + 129095 + + + 132144 + + + 129065 + + + 128987 + + + 129823 + + + 132307 + + + 147096 + + + 147108 + + + 128220 + + + 147123 + + + 146619 + + + 132132 + + + 132352 + + + 132320 + + + 147074 + + + 132169 + + + 128260 + + + 132305 + + + 146587 + + + 129832 + + + 146772 + + + 129026 + + + 129818 + + + 146688 + + + 130053 + + + 128275 + + + 132177 + + + 132214 + + + 146634 + + + 130057 + + + 129922 + + + 130020 + + + 146757 + + + 130123 + + + 129983 + + + 132317 + + + 147101 + + + 129056 + + + 129974 + + + 129950 + + + 147112 + + + 130036 + + + 129044 + + + 129933 + + + 132133 + + + 146551 + + + 129070 + + + 146602 + + + 147098 + + + 128913 + + + 138518 + + + 129107 + + + 146644 + + + 132309 + + + 129009 + + + 130127 + + + 130114 + + + 146705 + + + 129864 + + + 130037 + + + 128971 + + + 146675 + + + 128956 + + + 129824 + + + 132323 + + + 132134 + + + 146738 + + + 129096 + + + 146775 + + + 128279 + + + 132328 + + + 129961 + + + 128919 + + + 129986 + + + 130032 + + + 132218 + + + 132183 + + + 138500 + + + 129027 + + + 129996 + + + 129979 + + + 147065 + + + 129057 + + + 130055 + + + 146774 + + + 132167 + + + 130113 + + + 132349 + + + 129957 + + + 132206 + + + 130049 + + + 129856 + + + 130056 + + + 128257 + + + 138541 + + + 132157 + + + 138517 + + + 129953 + + + 130117 + + + 147040 + + + 129097 + + + 129028 + + + 147085 + + + 129060 + + + 147124 + + + 132364 + + + 129943 + + + 129000 + + + 130110 + + + 130122 + + + 146677 + + + 129913 + + + 146614 + + + 138523 + + + 129102 + + + 129827 + + + 128978 + + + 132360 + + + 147080 + + + 147088 + + + 132354 + + + 132160 + + + 128287 + + + 128218 + + + 129976 + + + 129072 + + + 129951 + + + 129084 + + + 132126 + + + 146663 + + + 132215 + + + 130030 + + + 129831 + + + 129861 + + + 129958 + + + 132295 + + + 146679 + + + 138537 + + + 138536 + + + 128267 + + + 146553 + + + 138548 + + + 146741 + + + 146665 + + + 128954 + + + 129005 + + + 132155 + + + 129944 + + + 128258 + + + 132185 + + + Index: /trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- /trunk/src/org/openstreetmap/josm/Main.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/Main.java (revision 321) @@ -0,0 +1,421 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm; +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Rectangle; +import java.awt.Toolkit; +import java.awt.event.KeyEvent; +import java.io.File; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.StringTokenizer; +import java.util.TreeMap; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.KeyStroke; +import javax.swing.UIManager; + +import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask; +import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask; +import org.openstreetmap.josm.actions.mapmode.MapMode; +import org.openstreetmap.josm.actions.search.SearchAction; +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.Preferences; +import org.openstreetmap.josm.data.UndoRedoHandler; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.projection.Epsg4326; +import org.openstreetmap.josm.data.projection.Projection; +import org.openstreetmap.josm.gui.GettingStarted; +import org.openstreetmap.josm.gui.MainMenu; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.gui.PleaseWaitDialog; +import org.openstreetmap.josm.gui.download.BoundingBoxSelection; +import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener; +import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference; +import org.openstreetmap.josm.gui.preferences.ToolbarPreferences; +import org.openstreetmap.josm.plugins.PluginException; +import org.openstreetmap.josm.plugins.PluginInformation; +import org.openstreetmap.josm.plugins.PluginProxy; +import org.openstreetmap.josm.tools.ImageProvider; + +abstract public class Main { + /** + * Global parent component for all dialogs and message boxes + */ + public static Component parent; + /** + * Global application. + */ + public static Main main; + /** + * The worker thread slave. This is for executing all long and intensive + * calculations. The executed runnables are guaranteed to be executed seperatly + * and sequenciel. + */ + public final static Executor worker = Executors.newSingleThreadExecutor(); + /** + * Global application preferences + */ + public static Preferences pref = new Preferences(); + /** + * The global dataset. + */ + public static DataSet ds = new DataSet(); + /** + * The projection method used. + */ + public static Projection proj; + /** + * The MapFrame. Use setMapFrame to set or clear it. + */ + public static MapFrame map; + /** + * All installed and loaded plugins (resp. their main classes) + */ + public final static Collection plugins = new LinkedList(); + /** + * The dialog that gets displayed during background task execution. + */ + public static PleaseWaitDialog pleaseWaitDlg; + + /** + * True, when in applet mode + */ + public static boolean applet = false; + + /** + * The toolbar preference control to register new actions. + */ + public static ToolbarPreferences toolbar = new ToolbarPreferences(); + + + public UndoRedoHandler undoRedo = new UndoRedoHandler(); + + /** + * The main menu bar at top of screen. + */ + public final MainMenu menu; + + + + + /** + * Set or clear (if passed null) the map. + */ + public final void setMapFrame(final MapFrame map) { + MapFrame old = Main.map; + Main.map = map; + panel.setVisible(false); + panel.removeAll(); + if (map != null) + map.fillPanel(panel); + else { + old.destroy(); + panel.add(new GettingStarted(), BorderLayout.CENTER); + } + panel.setVisible(true); + redoUndoListener.commandChanged(0,0); + + for (PluginProxy plugin : plugins) + plugin.mapFrameInitialized(old, map); + } + + /** + * Set the layer menu (changed when active layer changes). + */ + public final void setLayerMenu(Component[] entries) { + if (entries == null || entries.length == 0) + menu.layerMenu.setVisible(false); + else { + menu.layerMenu.removeAll(); + for (Component c : entries) + menu.layerMenu.add(c); + menu.layerMenu.setVisible(true); + } + } + + /** + * Remove the specified layer from the map. If it is the last layer, remove the map as well. + */ + public final void removeLayer(final Layer layer) { + map.mapView.removeLayer(layer); + if (layer instanceof OsmDataLayer) + ds = new DataSet(); + if (map.mapView.getAllLayers().isEmpty()) + setMapFrame(null); + } + + + public Main() { + main = this; + contentPane.add(panel, BorderLayout.CENTER); + panel.add(new GettingStarted(), BorderLayout.CENTER); + menu = new MainMenu(); + + undoRedo.listenerCommands.add(redoUndoListener); + + // creating toolbar + contentPane.add(toolbar.control, BorderLayout.NORTH); + + contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0), "Help"); + contentPane.getActionMap().put("Help", menu.help); + + TaggingPresetPreference.initialize(); + + toolbar.refreshToolbarControl(); + + toolbar.control.updateUI(); + contentPane.updateUI(); + } + + /** + * Load all plugins specified in preferences. If the parameter is true, all + * early plugins are loaded (before constructor). + */ + public static void loadPlugins(boolean early) { + List plugins = new LinkedList(); + if (Main.pref.hasKey("plugins")) + plugins.addAll(Arrays.asList(Main.pref.get("plugins").split(","))); + if (System.getProperty("josm.plugins") != null) + plugins.addAll(Arrays.asList(System.getProperty("josm.plugins").split(","))); + if (plugins.isEmpty()) + return; + SortedMap> p = new TreeMap>(); + for (String pluginName : plugins) { + PluginInformation info = PluginInformation.findPlugin(pluginName); + if (info != null) { + if (info.early != early) + continue; + if (!p.containsKey(info.stage)) + p.put(info.stage, new LinkedList()); + p.get(info.stage).add(info); + } else { + if (early) + System.out.println("Plugin not found: "+pluginName); // do not translate + else + JOptionPane.showMessageDialog(Main.parent, tr("Plugin not found: {0}.", pluginName)); + } + } + + // iterate all plugins and collect all libraries of all plugins: + List allPluginLibraries = new ArrayList(); + for (Collection c : p.values()) + for (PluginInformation info : c) + allPluginLibraries.addAll(info.libraries); + // create a classloader for all plugins: + URL[] jarUrls = new URL[allPluginLibraries.size()]; + jarUrls = allPluginLibraries.toArray(jarUrls); + URLClassLoader pluginClassLoader = new URLClassLoader(jarUrls, Main.class.getClassLoader()); + ImageProvider.sources.add(0, pluginClassLoader); + + for (Collection c : p.values()) { + for (PluginInformation info : c) { + try { + Class klass = info.loadClass(pluginClassLoader); + if (klass != null) { + System.out.println("loading "+info.name); + Main.plugins.add(info.load(klass)); + } + } catch (PluginException e) { + e.printStackTrace(); + if (early) + System.out.println("Could not load plugin: "+info.name); // do not translate + else + JOptionPane.showMessageDialog(Main.parent, tr("Could not load plugin {0}.", info.name)); + } + } + } + } + + /** + * Add a new layer to the map. If no map exist, create one. + */ + public final void addLayer(final Layer layer) { + if (map == null) { + final MapFrame mapFrame = new MapFrame(); + setMapFrame(mapFrame); + mapFrame.selectMapMode((MapMode)mapFrame.getDefaultButtonAction()); + mapFrame.setVisible(true); + mapFrame.setVisibleDialogs(); + } + map.mapView.addLayer(layer); + } + /** + * @return The edit osm layer. If none exist, it will be created. + */ + public final OsmDataLayer editLayer() { + if (map == null || map.mapView.editLayer == null) + menu.newAction.actionPerformed(null); + return map.mapView.editLayer; + } + + + + + /** + * Use this to register shortcuts to + */ + public static final JPanel contentPane = new JPanel(new BorderLayout()); + + + //////////////////////////////////////////////////////////////////////////////////////// + // Implementation part + //////////////////////////////////////////////////////////////////////////////////////// + + public static JPanel panel = new JPanel(new BorderLayout()); + + protected static Rectangle bounds; + + private final CommandQueueListener redoUndoListener = new CommandQueueListener(){ + public void commandChanged(final int queueSize, final int redoSize) { + menu.undo.setEnabled(queueSize > 0); + menu.redo.setEnabled(redoSize > 0); + } + }; + /** + * Should be called before the main constructor to setup some parameter stuff + * @param args The parsed argument list. + */ + public static void preConstructorInit(Map> args) { + try { + Main.proj = (Projection)Class.forName(Main.pref.get("projection")).newInstance(); + } catch (final Exception e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(null, tr("The projection could not be read from preferences. Using EPSG:4263.")); + Main.proj = new Epsg4326(); + } + + try { + UIManager.setLookAndFeel(Main.pref.get("laf")); + contentPane.updateUI(); + panel.updateUI(); + } catch (final Exception e) { + e.printStackTrace(); + } + UIManager.put("OptionPane.okIcon", ImageProvider.get("ok")); + UIManager.put("OptionPane.yesIcon", UIManager.get("OptionPane.okIcon")); + UIManager.put("OptionPane.cancelIcon", ImageProvider.get("cancel")); + UIManager.put("OptionPane.noIcon", UIManager.get("OptionPane.cancelIcon")); + + Dimension screenDimension = Toolkit.getDefaultToolkit().getScreenSize(); + if (args.containsKey("geometry")) { + String geometry = args.get("geometry").iterator().next(); + final Matcher m = Pattern.compile("(\\d+)x(\\d+)(([+-])(\\d+)([+-])(\\d+))?").matcher(geometry); + if (m.matches()) { + int w = Integer.valueOf(m.group(1)); + int h = Integer.valueOf(m.group(2)); + int x = 0, y = 0; + if (m.group(3) != null) { + x = Integer.valueOf(m.group(5)); + y = Integer.valueOf(m.group(7)); + if (m.group(4).equals("-")) + x = screenDimension.width - x - w; + if (m.group(6).equals("-")) + y = screenDimension.height - y - h; + } + bounds = new Rectangle(x,y,w,h); + } else + System.out.println("Ignoring malformed geometry: "+geometry); + } + if (bounds == null) + bounds = !args.containsKey("no-fullscreen") ? new Rectangle(0,0,screenDimension.width,screenDimension.height) : new Rectangle(1000,740); + + // preinitialize a wait dialog for all early downloads (e.g. via command line) + pleaseWaitDlg = new PleaseWaitDialog(null); + } + + public void postConstructorProcessCmdLine(Map> args) { + // initialize the pleaseWaitDialog with the application as parent to handle focus stuff + pleaseWaitDlg = new PleaseWaitDialog(parent); + + if (args.containsKey("download")) + for (String s : args.get("download")) + downloadFromParamString(false, s); + if (args.containsKey("downloadgps")) + for (String s : args.get("downloadgps")) + downloadFromParamString(true, s); + if (args.containsKey("selection")) + for (String s : args.get("selection")) + SearchAction.search(s, SearchAction.SearchMode.add, false); + } + + public static boolean breakBecauseUnsavedChanges() { + if (map != null) { + boolean modified = false; + boolean uploadedModified = false; + for (final Layer l : map.mapView.getAllLayers()) { + if (l instanceof OsmDataLayer && ((OsmDataLayer)l).isModified()) { + modified = true; + uploadedModified = ((OsmDataLayer)l).uploadedModified; + break; + } + } + if (modified) { + final String msg = uploadedModified ? "\n"+tr("Hint: Some changes came from uploading new data to the server.") : ""; + final int answer = JOptionPane.showConfirmDialog( + parent, tr("There are unsaved changes. Discard the changes and continue?")+msg, + tr("Unsaved Changes"), JOptionPane.YES_NO_OPTION); + if (answer != JOptionPane.YES_OPTION) + return true; + } + } + return false; + } + + private static void downloadFromParamString(final boolean rawGps, String s) { + if (s.startsWith("http:")) { + final Bounds b = BoundingBoxSelection.osmurl2bounds(s); + if (b == null) + JOptionPane.showMessageDialog(Main.parent, tr("Ignoring malformed url: \"{0}\"", s)); + else { + //DownloadTask osmTask = main.menu.download.downloadTasks.get(0); + DownloadTask osmTask = new DownloadOsmTask(); + osmTask.download(main.menu.download, b.min.lat(), b.min.lon(), b.max.lat(), b.max.lon()); + } + return; + } + + if (s.startsWith("file:")) { + try { + main.menu.open.openFile(new File(new URI(s))); + } catch (URISyntaxException e) { + JOptionPane.showMessageDialog(Main.parent, tr("Ignoring malformed file url: \"{0}\"", s)); + } + return; + } + + final StringTokenizer st = new StringTokenizer(s, ","); + if (st.countTokens() == 4) { + try { + //DownloadTask task = main.menu.download.downloadTasks.get(rawGps ? 1 : 0); + DownloadTask task = rawGps ? new DownloadGpsTask() : new DownloadOsmTask(); + task.download(main.menu.download, Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken())); + return; + } catch (final NumberFormatException e) { + } + } + + main.menu.open.openFile(new File(s)); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/AboutAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 321) @@ -0,0 +1,179 @@ +//License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Dimension; +import java.awt.Font; +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.Map.Entry; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.swing.AbstractAction; +import javax.swing.BorderFactory; +import javax.swing.Box; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; +import javax.swing.JTextArea; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.plugins.PluginProxy; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.UrlLabel; + +/** + * Nice about screen. I guess every application need one these days.. *sigh* + * + * The REVISION resource is read and if present, it shows the revision + * information of the jar-file. + * + * @author imi + */ +public class AboutAction extends JosmAction { + + public static final String version; + + private final static JTextArea revision; + private static String time; + + static { + revision = loadFile(Main.class.getResource("/REVISION")); + + Pattern versionPattern = Pattern.compile(".*?Revision: ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); + Matcher match = versionPattern.matcher(revision.getText()); + version = match.matches() ? match.group(1) : "UNKNOWN"; + + Pattern timePattern = Pattern.compile(".*?Last Changed Date: ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); + match = timePattern.matcher(revision.getText()); + time = match.matches() ? match.group(1) : "UNKNOWN"; + } + + public AboutAction() { + super(tr("About"), "about",tr("Display the about screen."), KeyEvent.VK_F1, KeyEvent.SHIFT_DOWN_MASK, true); + } + + public void actionPerformed(ActionEvent e) { + JTabbedPane about = new JTabbedPane(); + + JTextArea readme = loadFile(Main.class.getResource("/README")); + JTextArea contribution = loadFile(Main.class.getResource("/CONTRIBUTION")); + + JPanel info = new JPanel(new GridBagLayout()); + info.add(new JLabel(tr("Java OpenStreetMap Editor Version {0}",version)), GBC.eol().fill(GBC.HORIZONTAL)); + info.add(new JLabel(tr("last change at {0}",time)), GBC.eol().fill(GBC.HORIZONTAL)); + info.add(new JLabel(tr("Java Version {0}",System.getProperty("java.version"))), GBC.eol().fill(GBC.HORIZONTAL)); + info.add(GBC.glue(0,10), GBC.eol()); + info.add(new JLabel(tr("Homepage")), GBC.std().insets(0,0,10,0)); + info.add(new UrlLabel("http://josm.openstreetmap.de"), GBC.eol().fill(GBC.HORIZONTAL)); + info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(0,0,10,0)); + info.add(new UrlLabel("http://josm.openstreetmap.de/newticket"), GBC.eol().fill(GBC.HORIZONTAL)); + info.add(new JLabel(tr("News about JOSM")), GBC.std().insets(0,0,10,0)); + info.add(new UrlLabel("http://www.opengeodata.org/?cat=17"), GBC.eol().fill(GBC.HORIZONTAL)); + + about.addTab(tr("Info"), info); + about.addTab(tr("Readme"), createScrollPane(readme)); + about.addTab(tr("Revision"), createScrollPane(revision)); + about.addTab(tr("Contribution"), createScrollPane(contribution)); + + JPanel pluginTab = new JPanel(new GridBagLayout()); + for (final PluginProxy p : Main.plugins) { + String name = p.info.name + (p.info.version != null && !p.info.version.equals("") ? " Version: "+p.info.version : ""); + pluginTab.add(new JLabel(name), GBC.std()); + pluginTab.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL)); + pluginTab.add(new JButton(new AbstractAction(tr("Information")){ + public void actionPerformed(ActionEvent event) { + StringBuilder b = new StringBuilder(); + for (Entry e : p.info.attr.entrySet()) { + b.append(e.getKey()); + b.append(": "); + b.append(e.getValue()); + b.append("\n"); + } + JTextArea a = new JTextArea(10,40); + a.setEditable(false); + a.setText(b.toString()); + JOptionPane.showMessageDialog(Main.parent, new JScrollPane(a)); + } + }), GBC.eol()); + JLabel label = new JLabel(""+(p.info.description==null?tr("no description available"):p.info.description)+""); + label.setBorder(BorderFactory.createEmptyBorder(0,20,0,0)); + label.setMaximumSize(new Dimension(450,1000)); + pluginTab.add(label, GBC.eop().fill(GBC.HORIZONTAL)); + } + about.addTab(tr("Plugins"), pluginTab); + + about.setPreferredSize(new Dimension(500,300)); + + JOptionPane.showMessageDialog(Main.parent, about, tr("About JOSM..."), + JOptionPane.INFORMATION_MESSAGE, ImageProvider.get("logo")); + } + + private JScrollPane createScrollPane(JTextArea area) { + area.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); + area.setOpaque(false); + JScrollPane sp = new JScrollPane(area); + sp.setBorder(null); + sp.setOpaque(false); + return sp; + } + + /** + * Retrieve the latest JOSM version from the JOSM homepage. + * @return An string with the latest version or "UNKNOWN" in case + * of problems (e.g. no internet connection). + */ + public static String checkLatestVersion() { + String latest; + try { + InputStream s = new URL("http://josm.openstreetmap.de/current").openStream(); + latest = new BufferedReader(new InputStreamReader(s)).readLine(); + s.close(); + } catch (IOException x) { + x.printStackTrace(); + return "UNKNOWN"; + } + return latest; + } + + /** + * Load the specified ressource into an TextArea and return it. + * @param resource The resource url to load + * @return An read-only text area with the content of "resource" + */ + private static JTextArea loadFile(URL resource) { + JTextArea area = new JTextArea(tr("File could not be found.")); + area.setEditable(false); + Font font = Font.getFont("monospaced"); + if (font != null) + area.setFont(font); + if (resource == null) + return area; + BufferedReader in; + try { + in = new BufferedReader(new InputStreamReader(resource.openStream())); + StringBuilder sb = new StringBuilder(); + for (String line = in.readLine(); line != null; line = in.readLine()) { + sb.append(line); + sb.append('\n'); + } + area.setText(sb.toString()); + area.setCaretPosition(0); + } catch (IOException e) { + e.printStackTrace(); + } + return area; + } +} Index: /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 321) @@ -0,0 +1,73 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.util.Collection; +import java.util.LinkedList; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.MoveCommand; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; + +/** + * Aligns all selected nodes within a circle. (Usefull for roundabouts) + * + * @author Matthew Newton + */ +public final class AlignInCircleAction extends JosmAction { + + public AlignInCircleAction() { + super(tr("Align Nodes in Circle"), "aligncircle", tr("Move the selected nodes into a circle."), KeyEvent.VK_O, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true); + } + + public void actionPerformed(ActionEvent e) { + Collection sel = Main.ds.getSelected(); + Collection nodes = new LinkedList(); + for (OsmPrimitive osm : sel) + if (osm instanceof Node) + nodes.add((Node)osm); + if (nodes.size() < 4) { + JOptionPane.showMessageDialog(Main.parent, tr("Please select at least four nodes.")); + return; + } + + // Get average position of all nodes + Node avn = new Node(new LatLon(0,0)); + for (Node n : nodes) { + avn.eastNorth = new EastNorth(avn.eastNorth.east()+n.eastNorth.east(), avn.eastNorth.north()+n.eastNorth.north()); + avn.coor = Main.proj.eastNorth2latlon(avn.eastNorth); + } + avn.eastNorth = new EastNorth(avn.eastNorth.east()/nodes.size(), avn.eastNorth.north()/nodes.size()); + avn.coor = Main.proj.eastNorth2latlon(avn.eastNorth); + // Node "avn" now is central to all selected nodes. + + // Now calculate the average distance to each node from the + // centre. + double avdist = 0; + for (Node n : nodes) + avdist += Math.sqrt(avn.eastNorth.distance(n.eastNorth)); + avdist = avdist / nodes.size(); + + Collection cmds = new LinkedList(); + // Move each node to that distance from the centre. + for (Node n : nodes) { + double dx = n.eastNorth.east() - avn.eastNorth.east(); + double dy = n.eastNorth.north() - avn.eastNorth.north(); + double dist = Math.sqrt(avn.eastNorth.distance(n.eastNorth)); + cmds.add(new MoveCommand(n, (dx * (avdist / dist)) - dx, (dy * (avdist / dist)) - dy)); + } + + Main.main.undoRedo.add(new SequenceCommand(tr("Align Nodes in Circle"), cmds)); + Main.map.repaint(); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 321) @@ -0,0 +1,115 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.util.Collection; +import java.util.LinkedList; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.MoveCommand; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; + +/** + * Aligns all selected nodes into a straight line (useful for + * roads that should be straight, but have side roads and + * therefore need multiple nodes) + * + * @author Matthew Newton + */ +public final class AlignInLineAction extends JosmAction { + + public AlignInLineAction() { + super(tr("Align Nodes in Line"), "alignline", tr("Move the selected nodes onto a line."), KeyEvent.VK_L, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true); + } + + /** + * The general algorithm here is to find the two selected nodes + * that are furthest apart, and then to align all other selected + * nodes onto the straight line between these nodes. + */ + public void actionPerformed(ActionEvent e) { + Collection sel = Main.ds.getSelected(); + Collection nodes = new LinkedList(); + Collection itnodes = new LinkedList(); + for (OsmPrimitive osm : sel) + if (osm instanceof Node) { + nodes.add((Node)osm); + itnodes.add((Node)osm); + } + if (nodes.size() < 3) { + JOptionPane.showMessageDialog(Main.parent, tr("Please select at least three nodes.")); + return; + } + + // Find from the selected nodes two that are the furthest apart. + // Let's call them A and B. + double distance = 0; + + Node nodea = null; + Node nodeb = null; + + for (Node n : nodes) { + itnodes.remove(n); + for (Node m : itnodes) { + double dist = Math.sqrt(n.eastNorth.distance(m.eastNorth)); + if (dist > distance) { + nodea = n; + nodeb = m; + distance = dist; + } + } + } + + // Remove the nodes A and B from the list of nodes to move + nodes.remove(nodea); + nodes.remove(nodeb); + + // Find out co-ords of A and B + double ax = nodea.eastNorth.east(); + double ay = nodea.eastNorth.north(); + double bx = nodeb.eastNorth.east(); + double by = nodeb.eastNorth.north(); + + // A list of commands to do + Collection cmds = new LinkedList(); + + // OK, for each node to move, work out where to move it! + for (Node n : nodes) { + // Get existing co-ords of node to move + double nx = n.eastNorth.east(); + double ny = n.eastNorth.north(); + + if (ax == bx) { + // Special case if AB is vertical... + nx = ax; + } else if (ay == by) { + // ...or horizontal + ny = ay; + } else { + // Otherwise calculate position by solving y=mx+c + double m1 = (by - ay) / (bx - ax); + double c1 = ay - (ax * m1); + double m2 = (-1) / m1; + double c2 = n.eastNorth.north() - (n.eastNorth.east() * m2); + + nx = (c2 - c1) / (m1 - m2); + ny = (m1 * nx) + c1; + } + + // Add the command to move the node to its new position. + cmds.add(new MoveCommand(n, nx - n.eastNorth.east(), ny - n.eastNorth.north() )); + } + + // Do it! + Main.main.undoRedo.add(new SequenceCommand(tr("Align Nodes in Line"), cmds)); + Main.map.repaint(); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 321) @@ -0,0 +1,64 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.xnap.commons.i18n.I18n.marktr; + +import java.awt.event.ActionEvent; +import java.util.Collection; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; +import org.openstreetmap.josm.gui.layer.Layer; + +/** + * Toggles the autoScale feature of the mapView + * @author imi + */ +public class AutoScaleAction extends JosmAction { + + public static final String[] modes = { + marktr("data"), + marktr("selection"), + marktr("layer"), + marktr("conflict") + }; + private final String mode; + + public AutoScaleAction(String mode) { + super(tr("Zoom to {0}", mode), "dialogs/autoscale/"+mode, tr("Zoom the view to {0}.", tr(mode)), 0, 0, true); + String modeHelp = Character.toUpperCase(mode.charAt(0))+mode.substring(1); + putValue("help", "Action/AutoScale/"+modeHelp); + this.mode = mode; + } + + public void actionPerformed(ActionEvent e) { + if (Main.map != null) + Main.map.mapView.recalculateCenterScale(getBoundingBox()); + putValue("active", true); + } + + private BoundingXYVisitor getBoundingBox() { + BoundingXYVisitor v = new BoundingXYVisitor(); + if (mode.equals("data")) { + for (Layer l : Main.map.mapView.getAllLayers()) + l.visitBoundingBox(v); + } else if (mode.equals("layer")) + Main.map.mapView.getActiveLayer().visitBoundingBox(v); + else if (mode.equals("selection") || mode.equals("conflict")) { + Collection sel = mode.equals("selection") ? Main.ds.getSelected() : Main.map.conflictDialog.conflicts.keySet(); + for (OsmPrimitive osm : sel) + osm.visit(v); + // special case to zoom nicely to one single node + if (v.min != null && v.max != null && v.min.north() == v.max.north() && v.min.east() == v.max.east()) { + EastNorth en = Main.proj.latlon2eastNorth(new LatLon(0.02, 0.02)); + v.min = new EastNorth(v.min.east()-en.east(), v.min.north()-en.north()); + v.max = new EastNorth(v.max.east()+en.east(), v.max.north()+en.north()); + } + } + return v; + } +} Index: /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 321) @@ -0,0 +1,121 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.Map.Entry; + +import javax.swing.Box; +import javax.swing.JComboBox; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.ChangeCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.DeleteCommand; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.SelectionChangedListener; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.tools.GBC; + +/** + * Combines multiple ways into one. + * + * @author Imi + */ +public class CombineWayAction extends JosmAction implements SelectionChangedListener { + + public CombineWayAction() { + super(tr("Combine Way"), "combineway", tr("Combine several ways into one."), KeyEvent.VK_C, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true); + DataSet.listeners.add(this); + } + + public void actionPerformed(ActionEvent event) { + Collection selection = Main.ds.getSelected(); + LinkedList selectedWays = new LinkedList(); + + for (OsmPrimitive osm : selection) + if (osm instanceof Way) + selectedWays.add((Way)osm); + + if (selectedWays.size() < 2) { + JOptionPane.showMessageDialog(Main.parent, tr("Please select at least two ways to combine.")); + return; + } + + // collect properties for later conflict resolving + Map> props = new TreeMap>(); + for (Way w : selectedWays) { + for (Entry e : w.entrySet()) { + if (!props.containsKey(e.getKey())) + props.put(e.getKey(), new TreeSet()); + props.get(e.getKey()).add(e.getValue()); + } + } + + Way oldWay = selectedWays.poll(); + Way newWay = new Way(oldWay); + LinkedList cmds = new LinkedList(); + + for (Way w : selectedWays) + newWay.segments.addAll(w.segments); + + // display conflict dialog + Map components = new HashMap(); + JPanel p = new JPanel(new GridBagLayout()); + for (Entry> e : props.entrySet()) { + if (e.getValue().size() > 1) { + JComboBox c = new JComboBox(e.getValue().toArray()); + c.setEditable(true); + p.add(new JLabel(e.getKey()), GBC.std()); + p.add(Box.createHorizontalStrut(10), GBC.std()); + p.add(c, GBC.eol()); + components.put(e.getKey(), c); + } else + newWay.put(e.getKey(), e.getValue().iterator().next()); + } + if (!components.isEmpty()) { + int answer = JOptionPane.showConfirmDialog(Main.parent, p, tr("Enter values for all conflicts."), JOptionPane.OK_CANCEL_OPTION); + if (answer != JOptionPane.OK_OPTION) + return; + for (Entry e : components.entrySet()) + newWay.put(e.getKey(), e.getValue().getEditor().getItem().toString()); + } + + cmds.add(new DeleteCommand(selectedWays)); + cmds.add(new ChangeCommand(oldWay, newWay)); + Main.main.undoRedo.add(new SequenceCommand(tr("Combine {0} ways", selectedWays.size()), cmds)); + Main.ds.setSelected(oldWay); + } + + /** + * Enable the "Combine way" menu option if more then one way is selected + */ + public void selectionChanged(Collection newSelection) { + boolean first = false; + for (OsmPrimitive osm : newSelection) { + if (osm instanceof Way) { + if (first) { + setEnabled(true); + return; + } + first = true; + } + } + setEnabled(false); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (revision 321) @@ -0,0 +1,48 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.File; + +import javax.swing.JFileChooser; +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; + +/** + * Helper class for all actions, that access the disk + */ +abstract public class DiskAccessAction extends JosmAction { + + public DiskAccessAction(String name, String iconName, String tooltip, int shortCut, int modifiers) { + super(name, iconName, tooltip, shortCut, modifiers, true); + } + + protected static JFileChooser createAndOpenFileChooser(boolean open, boolean multiple) { + String curDir = Main.pref.get("lastDirectory"); + if (curDir.equals("")) + curDir = "."; + JFileChooser fc = new JFileChooser(new File(curDir)); + fc.setMultiSelectionEnabled(multiple); + for (int i = 0; i < ExtensionFileFilter.filters.length; ++i) + fc.addChoosableFileFilter(ExtensionFileFilter.filters[i]); + fc.setAcceptAllFileFilterUsed(true); + + int answer = open ? fc.showOpenDialog(Main.parent) : fc.showSaveDialog(Main.parent); + if (answer != JFileChooser.APPROVE_OPTION) + return null; + + if (!fc.getCurrentDirectory().getAbsolutePath().equals(curDir)) + Main.pref.put("lastDirectory", fc.getCurrentDirectory().getAbsolutePath()); + + if (!open) { + File file = fc.getSelectedFile(); + if (file == null || (file.exists() && JOptionPane.YES_OPTION != + JOptionPane.showConfirmDialog(Main.parent, tr("File exists. Overwrite?"), tr("Overwrite"), JOptionPane.YES_NO_OPTION))) + return null; + } + + return fc; + } +} Index: /trunk/src/org/openstreetmap/josm/actions/DownloadAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (revision 321) @@ -0,0 +1,69 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; + +import javax.swing.JDialog; +import javax.swing.JOptionPane; +import javax.swing.JPanel; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.download.DownloadDialog; +import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask; +import org.openstreetmap.josm.tools.GBC; + +/** + * Action that opens a connection to the osm server and download map data. + * + * An dialog is displayed asking the user to specify a rectangle to grab. + * The url and account settings from the preferences are used. + * + * @author imi + */ +public class DownloadAction extends JosmAction { + + public DownloadDialog dialog; + + public DownloadAction() { + super(tr("Download from OSM"), "download", tr("Download map data from the OSM server."), KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK, true); + } + + public void actionPerformed(ActionEvent e) { + dialog = new DownloadDialog(); + + JPanel downPanel = new JPanel(new GridBagLayout()); + downPanel.add(dialog, GBC.eol().fill(GBC.BOTH)); + + JOptionPane pane = new JOptionPane(downPanel, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION); + JDialog dlg = pane.createDialog(Main.parent, tr("Download")); + + if (dlg.getWidth() > 1000) + dlg.setSize(1000, dlg.getHeight()); + if (dlg.getHeight() > 600) + dlg.setSize(dlg.getWidth(),600); + + boolean finish = false; + while (!finish) { + dlg.setVisible(true); + Main.pref.put("download.newlayer", dialog.newLayer.isSelected()); + if (pane.getValue() instanceof Integer && (Integer)pane.getValue() == JOptionPane.OK_OPTION) { + Main.pref.put("download.tab", Integer.toString(dialog.getSelectedTab())); + for (DownloadTask task : dialog.downloadTasks) { + Main.pref.put("download."+task.getPreferencesSuffix(), task.getCheckBox().isSelected()); + if (task.getCheckBox().isSelected()) { + task.download(this, dialog.minlat, dialog.minlon, dialog.maxlat, dialog.maxlon); + finish = true; + } + } + } else + finish = true; + if (!finish) + JOptionPane.showMessageDialog(Main.parent, tr("Please select at least one task to download")); + } + } +} Index: /trunk/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java (revision 321) @@ -0,0 +1,80 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; +import java.io.IOException; +import java.util.Collection; +import java.util.HashSet; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.data.osm.visitor.MergeVisitor; +import org.openstreetmap.josm.gui.PleaseWaitRunnable; +import org.openstreetmap.josm.io.IncompleteDownloader; +import org.xml.sax.SAXException; + +/** + * Action that opens a connection to the osm server and download map data. + * + * An dialog is displayed asking the user to specify a rectangle to grab. + * The url and account settings from the preferences are used. + * + * @author imi + */ +public class DownloadIncompleteAction extends JosmAction { + + /** + * Open the download dialog and download the data. + * Run in the worker thread. + */ + private final class DownloadTask extends PleaseWaitRunnable { + private IncompleteDownloader reader; + + private DownloadTask(Collection toDownload) { + super(trn("Downloading {0} way", "Downloading {0} ways", toDownload.size(), toDownload.size())); + reader = new IncompleteDownloader(toDownload); + } + + @Override public void realRun() throws IOException, SAXException { + reader.parse(); + } + + @Override protected void finish() { + MergeVisitor merger = new MergeVisitor(Main.ds, reader.data); + for (OsmPrimitive osm : reader.data.allPrimitives()) + osm.visit(merger); + Main.parent.repaint(); + } + + @Override protected void cancel() { + reader.cancel(); + } + } + + public DownloadIncompleteAction() { + super(tr("Download incomplete objects"), "downloadincomplete", tr("Download all (selected) incomplete ways from the OSM server."), KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK | InputEvent.ALT_DOWN_MASK, true); + } + + public void actionPerformed(ActionEvent e) { + Collection ways = new HashSet(); + for (Way w : Main.ds.ways) + if (w.isIncomplete() && w.selected) + ways.add(w); + if (ways.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, tr("Please select an incomplete way.")); + return; + } + if (JOptionPane.YES_OPTION != JOptionPane.showConfirmDialog(Main.parent, tr("Download {0} incomplete ways?", ways.size()), tr("Download?"), JOptionPane.YES_NO_OPTION)) + return; + PleaseWaitRunnable task = new DownloadTask(ways); + Main.worker.execute(task); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/ExitAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ExitAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/ExitAction.java (revision 321) @@ -0,0 +1,28 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; + +import org.openstreetmap.josm.Main; + +/** + * Exit the application. May ask for permition first (if something has changed). + * + * @author imi + */ +public class ExitAction extends JosmAction { + /** + * Construct the action with "Exit" as label + */ + public ExitAction() { + super(tr("Exit"), "exit", tr("Exit the application."), KeyEvent.VK_Q, KeyEvent.CTRL_DOWN_MASK, true); + } + + public void actionPerformed(ActionEvent e) { + if (!Main.breakBecauseUnsavedChanges()) + System.exit(0); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 321) @@ -0,0 +1,58 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.File; + +import javax.swing.filechooser.FileFilter; + +/** + * A file filter that filters after the extension. Also includes a list of file + * filters used in JOSM. + * + * @author imi + */ +public class ExtensionFileFilter extends FileFilter { + private final String extension; + private final String description; + public final String defaultExtension; + + public static final int OSM = 0; + public static final int GPX = 1; + public static final int CSV = 2; + + public static ExtensionFileFilter[] filters = { + new ExtensionFileFilter("osm,xml", "osm", tr("OSM Server Files (.osm .xml)")), + new ExtensionFileFilter("gpx,gpx.gz", "gpx", tr("GPX Files (.gpx .gpx.gz)")), + new ExtensionFileFilter("csv,txt", "csv", tr("CSV Files (.csv .txt)")), + }; + + /** + * Construct an extension file filter by giving the extension to check after. + * + */ + private ExtensionFileFilter(String extension, String defExt, String description) { + this.extension = extension; + defaultExtension = defExt; + this.description = description; + } + + public boolean acceptName(String filename) { + String name = filename.toLowerCase(); + for (String ext : extension.split(",")) + if (name.endsWith("."+ext)) + return true; + return false; + } + + @Override public boolean accept(File pathname) { + if (pathname.isDirectory()) + return true; + return acceptName(pathname.getName()); + } + + @Override public String getDescription() { + return description; + } +} Index: /trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 321) @@ -0,0 +1,230 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.InputEvent; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Calendar; + +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JFileChooser; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.ListSelectionModel; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.RawGpsLayer; +import org.openstreetmap.josm.io.GpxWriter; +import org.openstreetmap.josm.io.XmlWriter; +import org.openstreetmap.josm.tools.GBC; + +/** + * Exports data to gpx. + */ +public class GpxExportAction extends DiskAccessAction { + + private final static String warningGpl = ""+tr("Note: GPL is not compatible with the OSM license. Do not upload GPL licensed tracks.")+""; + + private final Layer layer; + + public GpxExportAction(Layer layer) { + super(tr("Export to GPX"), "exportgpx", tr("Export the data to GPX file."), KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK); + this.layer = layer; + } + + public void actionPerformed(ActionEvent e) { + if (layer == null && Main.map == null) { + JOptionPane.showMessageDialog(Main.parent, tr("Nothing to export. Get some data first.")); + return; + } + + JFileChooser fc = createAndOpenFileChooser(false, false); + if (fc == null) + return; + File file = fc.getSelectedFile(); + if (file == null) + return; + + exportGpx(file, this.layer == null ? Main.main.editLayer() : this.layer); + } + + public static void exportGpx(File file, Layer layer) { + String fn = file.getPath(); + if (fn.indexOf('.') == -1) { + fn += ".gpx"; + file = new File(fn); + } + + // open the dialog asking for options + JPanel p = new JPanel(new GridBagLayout()); + + p.add(new JLabel(tr("gps track description")), GBC.eol()); + JTextArea desc = new JTextArea(3,40); + desc.setWrapStyleWord(true); + desc.setLineWrap(true); + p.add(new JScrollPane(desc), GBC.eop().fill(GBC.BOTH)); + + JCheckBox author = new JCheckBox(tr("Add author information"), Main.pref.getBoolean("lastAddAuthor", true)); + author.setSelected(true); + p.add(author, GBC.eol()); + JLabel nameLabel = new JLabel(tr("Real name")); + p.add(nameLabel, GBC.std().insets(10,0,5,0)); + JTextField authorName = new JTextField(Main.pref.get("lastAuthorName")); + p.add(authorName, GBC.eol().fill(GBC.HORIZONTAL)); + JLabel emailLabel = new JLabel(tr("Email")); + p.add(emailLabel, GBC.std().insets(10,0,5,0)); + JTextField email = new JTextField(Main.pref.get("osm-server.username")); + p.add(email, GBC.eol().fill(GBC.HORIZONTAL)); + JLabel copyrightLabel = new JLabel(tr("Copyright (URL)")); + p.add(copyrightLabel, GBC.std().insets(10,0,5,0)); + JTextField copyright = new JTextField(); + p.add(copyright, GBC.std().fill(GBC.HORIZONTAL)); + JButton predefined = new JButton(tr("Predefined")); + p.add(predefined, GBC.eol().insets(5,0,0,0)); + JLabel copyrightYearLabel = new JLabel(tr("Copyright year")); + p.add(copyrightYearLabel, GBC.std().insets(10,0,5,5)); + JTextField copyrightYear = new JTextField(""); + p.add(copyrightYear, GBC.eol().fill(GBC.HORIZONTAL)); + JLabel warning = new JLabel("   actions = new ArrayList(); + private int current = -1; + private String shortCutName = ""; + + private PropertyChangeListener forwardActiveListener = new PropertyChangeListener(){ + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getPropertyName().equals("active")) + putValue("active", evt.getNewValue()); + } + }; + + protected void setCurrent(int current) { + if (this.current != -1) + actions.get(this.current).removePropertyChangeListener(forwardActiveListener); + actions.get(current).addPropertyChangeListener(forwardActiveListener); + + this.current = current; + putValue(SMALL_ICON, ImageProvider.overlay((Icon)actions.get(current).getValue(SMALL_ICON), "overlay/right", OverlayPosition.SOUTHEAST)); + Object tooltip = actions.get(current).getValue(SHORT_DESCRIPTION); + putValue(SHORT_DESCRIPTION, ""+tooltip+" "+shortCutName+" "); + } + + public GroupAction(int shortCut, int modifiers) { + String idName = getClass().getName(); + Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(shortCut, modifiers), idName); + Main.contentPane.getActionMap().put(idName, this); + shortCutName = ShortCutLabel.name(shortCut, modifiers); + Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(shortCut, KeyEvent.SHIFT_DOWN_MASK), idName+".cycle"); + Main.contentPane.getActionMap().put(idName+".cycle", new AbstractAction(){ + public void actionPerformed(ActionEvent e) { + setCurrent((current+1)%actions.size()); + actions.get(current).actionPerformed(e); + } + }); + } + + public void actionPerformed(ActionEvent e) { + if (e.getSource() instanceof IconToggleButton && ((IconToggleButton)e.getSource()).groupbutton) { + IconToggleButton b = (IconToggleButton)e.getSource(); + b.setSelected(!b.isSelected()); + openPopup(b); + } else + actions.get(current).actionPerformed(e); + } + + private void openPopup(IconToggleButton b) { + JPopupMenu popup = new JPopupMenu(); + for (int i = 0; i < actions.size(); ++i) { + final int j = i; + JMenuItem item = new JMenuItem(actions.get(i)); + item.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e) { + setCurrent(j); + } + }); + popup.add(item); + } + popup.show(b, b.getWidth(), 0); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/HelpAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/HelpAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/HelpAction.java (revision 321) @@ -0,0 +1,188 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Point; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.IOException; +import java.io.StringReader; + +import javax.swing.AbstractAction; +import javax.swing.AbstractButton; +import javax.swing.Action; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JEditorPane; +import javax.swing.JFrame; +import javax.swing.JMenu; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; +import javax.swing.event.HyperlinkEvent; +import javax.swing.event.HyperlinkListener; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.OpenBrowser; +import org.openstreetmap.josm.tools.WikiReader; + +/** + * Open a help browser and displays lightweight online help. + * + * @author imi + */ +public class HelpAction extends AbstractAction { + + public interface Helpful { + String helpTopic(); + } + + private JFrame helpBrowser = new JFrame("JOSM Online Help"); + private String baseurl = Main.pref.get("help.baseurl", "http://josm.eigenheimstrasse.de"); + private JEditorPane help = new JEditorPane(); + private WikiReader reader = new WikiReader(baseurl); + private String url; + + public HelpAction() { + super(tr("Help"), ImageProvider.get("help")); + help.setEditable(false); + help.addHyperlinkListener(new HyperlinkListener(){ + public void hyperlinkUpdate(HyperlinkEvent e) { + if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED) + return; + if (e.getURL() == null) + help.setText("404 not found"); + else if (e.getURL().toString().startsWith(WikiReader.JOSM_EXTERN)) + OpenBrowser.displayUrl("http://"+e.getURL().toString().substring(WikiReader.JOSM_EXTERN.length())+"?action=edit"); + else + setHelpUrl(e.getURL().toString()); + } + }); + help.setContentType("text/html"); + + JPanel p = new JPanel(new BorderLayout()); + helpBrowser.setContentPane(p); + + p.add(new JScrollPane(help), BorderLayout.CENTER); + String[] bounds = Main.pref.get("help.window.bounds", "0,0,800,600").split(","); + helpBrowser.setBounds( + Integer.parseInt(bounds[0]), + Integer.parseInt(bounds[1]), + Integer.parseInt(bounds[2]), + Integer.parseInt(bounds[3])); + + JPanel buttons = new JPanel(); + p.add(buttons, BorderLayout.SOUTH); + createButton(buttons, "Open in Browser"); + createButton(buttons, "Edit"); + createButton(buttons, "Reload"); + + helpBrowser.addWindowListener(new WindowAdapter(){ + @Override public void windowClosing(WindowEvent e) { + closeHelp(); + } + }); + + help.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "Close"); + help.getActionMap().put("Close", new AbstractAction(){ + public void actionPerformed(ActionEvent e) { + closeHelp(); + } + }); + } + + public void actionPerformed(ActionEvent e) { + if ("Open in Browser".equals(e.getActionCommand())) { + OpenBrowser.displayUrl(url); + } else if ("Edit".equals(e.getActionCommand())) { + if (!url.startsWith(baseurl)) { + JOptionPane.showMessageDialog(Main.parent, tr("Can only edit help pages from JOSM Online Help")); + return; + } + OpenBrowser.displayUrl(url+"?action=edit"); + } else if ("Reload".equals(e.getActionCommand())) { + setHelpUrl(url); + } else if (e.getActionCommand() == null) { + String topic = null; + Point mouse = Main.parent.getMousePosition(); + if (mouse != null) + topic = contextSensitiveHelp(SwingUtilities.getDeepestComponentAt(Main.parent, mouse.x, mouse.y)); + if (topic == null) { + helpBrowser.setVisible(false); + setHelpUrl(baseurl+"/wiki/Help"); + } else + help(topic); + } else { + helpBrowser.setVisible(false); + setHelpUrl(baseurl+"/wiki/Help"); + } + } + + /** + * @return The topic of the help. null for "don't know" + */ + private String contextSensitiveHelp(Object c) { + if (c instanceof Helpful) + return ((Helpful)c).helpTopic(); + if (c instanceof JMenu) + return "Menu/"+((JMenu)c).getText(); + if (c instanceof AbstractButton) { + AbstractButton b = (AbstractButton)c; + if (b.getClientProperty("help") != null) + return (String)b.getClientProperty("help"); + return contextSensitiveHelp(((AbstractButton)c).getAction()); + } + if (c instanceof Action) + return (String)((Action)c).getValue("help"); + if (c instanceof Component) + return contextSensitiveHelp(((Component)c).getParent()); + return null; + } + + /** + * Displays the help (or browse on the already open help) to the online page + * with the given help topic. Use this for larger help descriptions. + */ + public void help(String topic) { + helpBrowser.setVisible(false); + setHelpUrl(baseurl+"/wiki/Help/"+topic); + } + + /** + * Set the content of the help window to a specific text (in html format) + * @param url The url this content is the representation of + */ + public void setHelpUrl(String url) { + this.url = url; + try { + help.read(new StringReader(reader.read(url)), help.getEditorKit().createDefaultDocument()); + } catch (IOException e) { + help.setText("Error while loading page "+url); + } + helpBrowser.setVisible(true); + } + + /** + * Closes the help window + */ + public void closeHelp() { + String bounds = helpBrowser.getX()+","+helpBrowser.getY()+","+helpBrowser.getWidth()+","+helpBrowser.getHeight(); + Main.pref.put("help.window.bounds", bounds); + helpBrowser.setVisible(false); + } + + private void createButton(JPanel buttons, String name) { + JButton b = new JButton(tr(name)); + b.setActionCommand(name); + b.addActionListener(this); + buttons.add(b); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/JosmAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 321) @@ -0,0 +1,60 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + + +import javax.swing.AbstractAction; +import javax.swing.JComponent; +import javax.swing.KeyStroke; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.tools.Destroyable; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.ShortCutLabel; + +/** + * Base class helper for all Actions in JOSM. Just to make the life easier. + * + * destroy() from interface Destroyable is called e.g. for MapModes, when the last layer has + * been removed and so the mapframe will be destroyed. For other JosmActions, destroy() may never + * be called (currently). + * + * @author imi + */ +abstract public class JosmAction extends AbstractAction implements Destroyable { + + private KeyStroke shortCut; + + public JosmAction(String name, String iconName, String tooltip, int shortCut, int modifier, boolean register) { + super(name, ImageProvider.get(iconName)); + setHelpId(); + String scl = ShortCutLabel.name(shortCut, modifier); + putValue(SHORT_DESCRIPTION, ""+tooltip+" "+scl+""+(scl.equals("")?"":" ")+""); + if (shortCut != 0) { + this.shortCut = KeyStroke.getKeyStroke(shortCut, modifier); + Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(this.shortCut, name); + Main.contentPane.getActionMap().put(name, this); + } + putValue("toolbar", iconName); + if (register) + Main.toolbar.register(this); + } + + public void destroy() { + if (shortCut != null) { + Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).remove(shortCut); + Main.contentPane.getActionMap().remove(shortCut); + } + } + + public JosmAction() { + setHelpId(); + } + + + private void setHelpId() { + String helpId = "Action/"+getClass().getName().substring(getClass().getName().lastIndexOf('.')+1); + if (helpId.endsWith("Action")) + helpId = helpId.substring(0, helpId.length()-6); + putValue("help", helpId); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/NewAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/NewAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/NewAction.java (revision 321) @@ -0,0 +1,23 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; + +public class NewAction extends JosmAction { + + public NewAction() { + super(tr("New"), "new", tr("Create a new map."), KeyEvent.VK_N, InputEvent.CTRL_DOWN_MASK, true); + } + + public void actionPerformed(ActionEvent e) { + Main.main.addLayer(new OsmDataLayer(new DataSet(), tr("unnamed"), null)); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/OpenAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/OpenAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/OpenAction.java (revision 321) @@ -0,0 +1,121 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.util.Collection; +import java.util.LinkedList; +import java.util.zip.GZIPInputStream; + +import javax.swing.JFileChooser; +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.gui.layer.RawGpsLayer; +import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint; +import org.openstreetmap.josm.gui.layer.markerlayer.Marker; +import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; +import org.openstreetmap.josm.io.OsmReader; +import org.openstreetmap.josm.io.RawCsvReader; +import org.openstreetmap.josm.io.RawGpsReader; +import org.xml.sax.SAXException; + +/** + * Open a file chooser dialog and select an file to import. Than call the gpx-import + * driver. Finally open an internal frame into the main window with the gpx data shown. + * + * @author imi + */ +public class OpenAction extends DiskAccessAction { + + /** + * Create an open action. The name is "Open a file". + */ + public OpenAction() { + super(tr("Open"), "open", tr("Open a file."), KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK); + } + + public void actionPerformed(ActionEvent e) { + JFileChooser fc = createAndOpenFileChooser(true, true); + if (fc == null) + return; + File[] files = fc.getSelectedFiles(); + for (int i = files.length; i > 0; --i) + openFile(files[i-1]); + } + + /** + * Open the given file. + */ + public void openFile(File file) { + try { + if (asRawData(file.getName())) + openFileAsRawGps(file); + else + openAsData(file); + } catch (SAXException x) { + x.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("Error while parsing {0}",file.getName())+": "+x.getMessage()); + } catch (IOException x) { + x.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("Could not read \"{0}\"",file.getName())+"\n"+x.getMessage()); + } + } + + private void openAsData(File file) throws SAXException, IOException, FileNotFoundException { + String fn = file.getName(); + if (ExtensionFileFilter.filters[ExtensionFileFilter.OSM].acceptName(fn)) { + DataSet dataSet = OsmReader.parseDataSet(new FileInputStream(file), null, Main.pleaseWaitDlg); + OsmDataLayer layer = new OsmDataLayer(dataSet, file.getName(), file); + Main.main.addLayer(layer); + } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(fn)) + JOptionPane.showMessageDialog(Main.parent, fn+": "+tr("CSV Data import for non-GPS data is not implemented yet.")); + else + JOptionPane.showMessageDialog(Main.parent, fn+": "+tr("Unknown file extension: {0}", fn.substring(file.getName().lastIndexOf('.')+1))); + } + + private void openFileAsRawGps(File file) throws SAXException, IOException, FileNotFoundException { + String fn = file.getName(); + Collection> gpsData = null; + Collection markerData = null; + if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn)) { + RawGpsReader r = null; + if (file.getName().endsWith(".gpx.gz")) + r = new RawGpsReader(new GZIPInputStream(new FileInputStream(file)), file.getAbsoluteFile().getParentFile()); + else + r = new RawGpsReader(new FileInputStream(file), file.getAbsoluteFile().getParentFile()); + gpsData = r.trackData; + markerData = r.markerData; + } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(fn)) { + gpsData = new LinkedList>(); + gpsData.add(new RawCsvReader(new FileReader(file)).parse()); + } else + throw new IllegalStateException(); + if (gpsData != null && !gpsData.isEmpty()) + Main.main.addLayer(new RawGpsLayer(false, gpsData, tr("Tracks from {0}", file.getName()), file)); + if (markerData != null && !markerData.isEmpty()) + Main.main.addLayer(new MarkerLayer(markerData, tr ("Markers from {0}", file.getName()), file)); + } + + /** + * @return Return whether the file should be opened as raw gps data. May ask the + * user, if unsure. + */ + private boolean asRawData(String fn) { + if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(fn)) + return true; + if (!ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn)) + return false; + return true; + } +} Index: /trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (revision 321) @@ -0,0 +1,52 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; + +import javax.swing.JDialog; +import javax.swing.JOptionPane; +import javax.swing.JPanel; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.preferences.PreferenceDialog; +import org.openstreetmap.josm.tools.GBC; + +/** + * Open the Preferences dialog. + * + * @author imi + */ +public class PreferencesAction extends JosmAction { + + /** + * Create the preference action with "&Preferences" as label. + */ + public PreferencesAction() { + super(tr("Preferences"), "preference", tr("Open a preferences page for global settings."), KeyEvent.VK_F12, 0, true); + } + + /** + * Launch the preferences dialog. + */ + public void actionPerformed(ActionEvent e) { + PreferenceDialog prefDlg = new PreferenceDialog(); + JPanel prefPanel = new JPanel(new GridBagLayout()); + prefPanel.add(prefDlg, GBC.eol().fill(GBC.BOTH)); + + JOptionPane pane = new JOptionPane(prefPanel, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION); + JDialog dlg = pane.createDialog(Main.parent, tr("Preferences")); + + if (dlg.getWidth() > 600) + dlg.setSize(600, dlg.getHeight()); + if (dlg.getHeight() > 600) + dlg.setSize(dlg.getWidth(),600); + + dlg.setVisible(true); + if (pane.getValue() instanceof Integer && (Integer)pane.getValue() == JOptionPane.OK_OPTION) + prefDlg.ok(); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/RedoAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/RedoAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/RedoAction.java (revision 321) @@ -0,0 +1,34 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; + +import org.openstreetmap.josm.Main; + + +/** + * Redoes the last command. + * + * @author imi + */ +public class RedoAction extends JosmAction { + + /** + * Construct the action with "Undo" as label. + */ + public RedoAction() { + super(tr("Redo"), "redo", tr("Redo the last undone action."), KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK, true); + setEnabled(false); + } + + public void actionPerformed(ActionEvent e) { + if (Main.map == null) + return; + Main.map.repaint(); + Main.main.undoRedo.redo(); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (revision 321) @@ -0,0 +1,94 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.io.File; + +import javax.swing.AbstractAction; +import javax.swing.Box; +import javax.swing.JCheckBox; +import javax.swing.JDialog; +import javax.swing.JOptionPane; +import javax.swing.JTextField; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * Action to rename an specific layer. Provides the option to rename the + * file, this layer was loaded from as well (if it was loaded from a file). + * + * @author Imi + */ +public class RenameLayerAction extends AbstractAction { + + private File file; + private Layer layer; + + /** + * @param file The filen of the original location of this layer. + * If null, no possibility to "rename the file as well" is provided. + */ + public RenameLayerAction(File file, Layer layer) { + super(tr("Rename layer"), ImageProvider.get("dialogs", "edit")); + this.file = file; + this.layer = layer; + } + + public void actionPerformed(ActionEvent e) { + Box panel = Box.createVerticalBox(); + final JTextField name = new JTextField(layer.name); + panel.add(name); + JCheckBox filerename = new JCheckBox(tr("Also rename the file")); + if (Main.applet) { + filerename.setEnabled(false); + filerename.setSelected(false); + } else { + panel.add(filerename); + filerename.setEnabled(file != null); + } + if (filerename.isEnabled()) + filerename.setSelected(Main.pref.getBoolean("layer.rename-file", true)); + + final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION){ + @Override public void selectInitialValue() { + name.requestFocusInWindow(); + name.selectAll(); + } + }; + final JDialog dlg = optionPane.createDialog(Main.parent, tr("Rename layer")); + dlg.setVisible(true); + + Object answer = optionPane.getValue(); + if (answer == null || answer == JOptionPane.UNINITIALIZED_VALUE || + (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION)) { + return; + } + + String nameText = name.getText(); + if (filerename.isEnabled()) { + Main.pref.put("layer.rename-file", filerename.isSelected()); + if (filerename.isSelected()) { + String newname = nameText; + if (newname.indexOf("/") == -1 && newname.indexOf("\\") == -1) + newname = file.getParent() + File.separator + newname; + String oldname = file.getName(); + if (name.getText().indexOf('.') == -1 && oldname.indexOf('.') >= 0) + newname += oldname.substring(oldname.lastIndexOf('.')); + File newFile = new File(newname); + if (file.renameTo(newFile)) { + layer.associatedFile = newFile; + nameText = newFile.getName(); + } else { + JOptionPane.showMessageDialog(Main.parent, tr("Could not rename the file \"{0}\".", file.getPath())); + return; + } + } + } + layer.name = nameText; + Main.parent.repaint(); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/ReorderAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ReorderAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/ReorderAction.java (revision 321) @@ -0,0 +1,252 @@ +//License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.HashMap; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.ChangeCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.data.osm.visitor.NameVisitor; + +public class ReorderAction extends JosmAction { + + public ReorderAction() { + super(tr("Reorder Segments"), "reorder", tr("Try to reorder segments of a way so that they are in a line. May try to flip segments around to match a line."), KeyEvent.VK_R, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK, true); + } + + /** + * This method first sorts all the segments in a way, then makes sure that all + * the segments are facing the same direction as the first one. + */ + public void actionPerformed(ActionEvent e) { + Collection ways = new LinkedList(); + for (OsmPrimitive osm : Main.ds.getSelected()) + if (osm instanceof Way) + ways.add((Way)osm); + + if (ways.size() < 1) { + JOptionPane.showMessageDialog(Main.parent, tr("Please select at least one way.")); + return; + } + + if (ways.size() > 1) { + int answer = JOptionPane.showConfirmDialog(Main.parent, + trn(null, "You selected more than one way. Reorder the segments of {0} ways?", ways.size(), ways.size()), + tr("Reorder segments"), JOptionPane.OK_CANCEL_OPTION); + if (answer != JOptionPane.OK_OPTION) + return; + } + boolean doneSomething = false; + for (Way way : ways) { + if (!way.isIncomplete() && way.segments.size() > 1) + { + doneSomething = true; + Command c = reorderWay(way); + + if( c != null ) + Main.main.undoRedo.add(c); + } + } + if (!doneSomething) { + JOptionPane.showMessageDialog(Main.parent, + trn("The selected way is incomplete or has only one segment.", + "None of the selected ways are complete and have more than one segment.", + ways.size())); + } + Main.map.repaint(); + } + + /** + * This method first sorts all the segments in a way, then makes sure that all + * the segments are facing the same direction as the first one. + * @param way The way to reorder + * @return The command needed to reorder the way + */ + public static Command reorderWay(Way way) { + final LinkedList sel = new LinkedList(sortSegments(new LinkedList(way.segments), false)); + + Collection c = new LinkedList(); + + boolean direction = false; + // work out the "average" direction of the way, we use this to direct the rest of the segments + int dirCounter = 0; + for(int i = 0; i < sel.size() - 1; i++) + { + Segment firstSegment = sel.get(i); + Segment secondSegment = sel.get(i+1); + if ( firstSegment.to == secondSegment.from || firstSegment.to == secondSegment.to ) // direction = true when 'from' is the first node in the Way + dirCounter++; + else + dirCounter--; + } + if ( dirCounter <= 0 ) + direction = false; + else + direction = true; + + Node lastNode = null; + + // we need to calculate what the first node in the way is, we work from there + Segment firstSegment = sel.getFirst(); + Segment secondSegment = sel.get(1); + if (firstSegment.to == secondSegment.from || firstSegment.to == secondSegment.to) + lastNode = firstSegment.from; + else + lastNode = firstSegment.to; + + // go through each segment and flip them if required + for (Segment s : sel) { + Segment snew = new Segment(s); + boolean segDirection = s.from == lastNode; + // segDirection = true when the 'from' node occurs before the 'to' node in the Way + if (direction != segDirection) + { + // reverse the segment's direction + Node n = snew.from; + snew.from = snew.to; + snew.to = n; + c.add(new ChangeCommand(s, snew)); + } + + if (direction) // if its facing forwards, + lastNode = snew.to; // our next node is the 'to' one + else + lastNode = snew.from; // otherwise its the 'from' one + } + + LinkedList segments = new LinkedList(); + + // Now we recreate the segment list, in the correct order of the direction + for (Segment s : sel) + if (!direction) + segments.addFirst(s); + else + segments.addLast(s); + + // Check if the new segment list is actually different from the old one + // before we go and add a change command for it + for(int i = 0; i < segments.size(); i++) + if (way.segments.get(i) != segments.get(i)) + { + Way newWay = new Way(way); + newWay.segments.clear(); + newWay.segments.addAll(segments); + c.add(new ChangeCommand(way, newWay)); + break; + } + + // Check we've got some change commands before we add a sequence command + if (c.size() != 0) { + NameVisitor v = new NameVisitor(); + way.visit(v); + return new SequenceCommand(tr("Reorder segments for way {0}",v.name), c); + } + return null; + } + + /** + * This sort is based on the sort in the old ReorderAction, but it can work + * irresepective of the direction of the segments. This produces a sort + * that can be useful even if the segments are facing the wrong direction. + * + * @param segments list of segments to be sorted + * @param strict true if segment direction should be observed, false if not + */ + public static LinkedList sortSegments(LinkedList segments, boolean strict) { + + LinkedList sortedSegments = new LinkedList(); + + while (!segments.isEmpty()) { + LinkedList pivotList = new LinkedList(); + pivotList.add(firstSegment(segments)); + segments.remove(pivotList.getLast()); + boolean found; + do { + found = false; + //try working forwards first + for (Iterator it = segments.iterator(); it.hasNext();) { + Segment ls = it.next(); + if (ls.incomplete) + continue; // incomplete segments are never added to a new way + if (ls.from == pivotList.getLast().to) { + pivotList.addLast(ls); + it.remove(); + found = true; + } + } + if(!found){ + for (Iterator it = segments.iterator(); it.hasNext();) { + Segment ls = it.next(); + if (ls.incomplete) + continue; // incomplete segments are never added to a new way + if (ls.from == pivotList.getLast().to || (!strict && (ls.to == pivotList.getLast().to || ls.from == pivotList.getLast().from || ls.to == pivotList.getLast().from))) { + pivotList.addLast(ls); + it.remove(); + found = true; + } else if (ls.to == pivotList.getFirst().from || (!strict && (ls.from == pivotList.getFirst().from || ls.to == pivotList.getFirst().to || ls.from == pivotList.getFirst().to))) { + pivotList.addFirst(ls); + it.remove(); + found = true; + } + } + } + } while (found); + sortedSegments.addAll(pivotList); + } + return sortedSegments; + } + + /** + * This method searches for a good segment to start a reorder from. + * In most cases this will be a segment with a start node that occurs only + * once in the way. In cases with loops, this could be any odd number. If no nodes + * are referenced an odd number of times, then any segment is a good start point. + */ + public static Segment firstSegment(Collection segments) { + HashMap refCount = new HashMap(segments.size()*2); + //loop through all segments and count up how many times each node is referenced + for (Segment seg : segments) { + if (!refCount.containsKey(seg.from)) + refCount.put(seg.from, 0); + refCount.put(seg.from,refCount.get(seg.from)+1); + + if (!refCount.containsKey(seg.to)) + refCount.put(seg.to, 0); + refCount.put(seg.to,refCount.get(seg.to)+1); + } + + //now look for start nodes that are referenced only once + for (Segment seg : segments) + if (refCount.get(seg.from) == 1) + return seg; + //now look for start nodes that are referenced only (2n+1) + for (Segment seg : segments) + if (refCount.get(seg.from) % 2 == 1) + return seg; + //now look for end nodes that are referenced only once + for (Segment seg : segments) + if (refCount.get(seg.to) == 1) + return seg; + //now look for end nodes that are referenced only (2n+1) + for (Segment seg : segments) + if (refCount.get(seg.to) % 2 == 1) + return seg; + + return segments.iterator().next(); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java (revision 321) @@ -0,0 +1,59 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +/** + * + */ +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.util.Collection; +import java.util.LinkedList; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.ChangeCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.data.osm.visitor.Visitor; + +public final class ReverseSegmentAction extends JosmAction { + + public ReverseSegmentAction() { + super(tr("Reverse segments"), "segmentflip", tr("Reverse the direction of all selected Segments."), KeyEvent.VK_R, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true); + } + + public void actionPerformed(ActionEvent e) { + final Collection sel = new LinkedList(); + new Visitor(){ + public void visit(Node n) {} + public void visit(Segment s) {sel.add(s);} + public void visit(Way w) {sel.addAll(w.segments);} + public void visitAll() { + for (OsmPrimitive osm : Main.ds.getSelected()) + osm.visit(this); + } + }.visitAll(); + + if (sel.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, tr("Please select at least one segment.")); + return; + } + Collection c = new LinkedList(); + for (Segment s : sel) { + Segment snew = new Segment(s); + Node n = snew.from; + snew.from = snew.to; + snew.to = n; + c.add(new ChangeCommand(s, snew)); + } + Main.main.undoRedo.add(new SequenceCommand(tr("Reverse Segments"), c)); + Main.map.repaint(); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/SaveAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SaveAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/SaveAction.java (revision 321) @@ -0,0 +1,32 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; +import java.io.File; + +import org.openstreetmap.josm.gui.layer.OsmDataLayer; + +/** + * Export the data as OSM intern xml file. + * + * @author imi + */ +public class SaveAction extends SaveActionBase { + + /** + * Construct the action with "Save" as label. + * @param layer Save this layer. + */ + public SaveAction(OsmDataLayer layer) { + super(tr("Save"), "save", tr("Save the current data."), KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK, layer); + } + + @Override public File getFile(OsmDataLayer layer) { + if (layer.associatedFile != null) + return layer.associatedFile; + return openFileDialog(); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 321) @@ -0,0 +1,167 @@ +//License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; + +import javax.swing.JFileChooser; +import javax.swing.JOptionPane; +import javax.swing.filechooser.FileFilter; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.io.OsmWriter; + +public abstract class SaveActionBase extends DiskAccessAction { + + private OsmDataLayer layer; + + public SaveActionBase(String name, String iconName, String tooltip, int shortCut, int modifiers, OsmDataLayer layer) { + super(name, iconName, tooltip, shortCut, modifiers); + this.layer = layer; + } + + public void actionPerformed(ActionEvent e) { + OsmDataLayer layer = this.layer; + if (layer == null && Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) + layer = (OsmDataLayer)Main.map.mapView.getActiveLayer(); + if (layer == null) + layer = Main.main.editLayer(); + + if (!checkSaveConditions(layer)) + return; + + + File file = getFile(layer); + if (file == null) + return; + + save(file, layer); + + layer.name = file.getName(); + layer.associatedFile = file; + Main.parent.repaint(); + } + + protected abstract File getFile(OsmDataLayer layer); + + /** + * Checks whether it is ok to launch a save (whether we have data, + * there is no conflict etc...) + * @return true, if it is save to save. + */ + public boolean checkSaveConditions(OsmDataLayer layer) { + if (Main.map == null) { + JOptionPane.showMessageDialog(Main.parent, tr("No document open so nothing to save.")); + return false; + } + if (isDataSetEmpty(layer) && JOptionPane.NO_OPTION == JOptionPane.showConfirmDialog(Main.parent,tr("The document contains no data. Save anyway?"), tr("Empty document"), JOptionPane.YES_NO_OPTION)) + return false; + if (!Main.map.conflictDialog.conflicts.isEmpty()) { + int answer = JOptionPane.showConfirmDialog(Main.parent, + tr("There are unresolved conflicts. Conflicts will not be saved and handled as if you rejected all. Continue?"),tr("Conflicts"), JOptionPane.YES_NO_OPTION); + if (answer != JOptionPane.YES_OPTION) + return false; + } + return true; + } + + public static File openFileDialog() { + JFileChooser fc = createAndOpenFileChooser(false, false); + if (fc == null) + return null; + + File file = fc.getSelectedFile(); + + String fn = file.getPath(); + if (fn.indexOf('.') == -1) { + FileFilter ff = fc.getFileFilter(); + if (ff instanceof ExtensionFileFilter) + fn = "." + ((ExtensionFileFilter)ff).defaultExtension; + else + fn += ".osm"; + file = new File(fn); + } + return file; + } + + private static void copy(File src, File dst) throws IOException { + FileInputStream srcStream; + FileOutputStream dstStream; + try { + srcStream = new FileInputStream(src); + dstStream = new FileOutputStream(dst); + } catch (FileNotFoundException e) { + JOptionPane.showMessageDialog(Main.parent, tr("Could not back up file.")+"\n"+e.getMessage()); + return; + } + byte buf[] = new byte[1<<16]; + int len; + while ((len = srcStream.read(buf)) != -1) { + dstStream.write(buf, 0, len); + } + srcStream.close(); + dstStream.close(); + } + + public static void save(File file, OsmDataLayer layer) { + File tmpFile = null; + try { + if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(file.getPath())) { + GpxExportAction.exportGpx(file, layer); + } else if (ExtensionFileFilter.filters[ExtensionFileFilter.OSM].acceptName(file.getPath())) { + // use a tmp file because if something errors out in the + // process of writing the file, we might just end up with + // a truncated file. That can destroy lots of work. + if (file.exists()) { + tmpFile = new File(file.getPath() + "~"); + copy(file, tmpFile); + } + OsmWriter.output(new FileOutputStream(file), new OsmWriter.All(layer.data, false)); + if (!Main.pref.getBoolean("save.keepbackup")) + tmpFile.delete(); + } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(file.getPath())) { + JOptionPane.showMessageDialog(Main.parent, tr("CSV output not supported yet.")); + return; + } else { + JOptionPane.showMessageDialog(Main.parent, tr("Unknown file extension.")); + return; + } + layer.cleanData(null, false); + } catch (IOException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while saving.")+"\n"+e.getMessage()); + } + try { + // if the file save failed, then the tempfile will not + // be deleted. So, restore the backup if we made one. + if (tmpFile != null && tmpFile.exists()) { + copy(tmpFile, file); + } + } catch (IOException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while restoring backup file.")+"\n"+e.getMessage()); + } + } + + /** + * Check the data set if it would be empty on save. It is empty, if it contains + * no objects (after all objects that are created and deleted without beeing + * transfered to the server have been removed). + * + * @return true, if a save result in an empty data set. + */ + private boolean isDataSetEmpty(OsmDataLayer layer) { + for (OsmPrimitive osm : layer.data.allNonDeletedPrimitives()) + if (!osm.deleted || osm.id > 0) + return false; + return true; + } +} Index: /trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java (revision 321) @@ -0,0 +1,30 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; +import java.io.File; + +import org.openstreetmap.josm.gui.layer.OsmDataLayer; + +/** + * Export the data as OSM intern xml file. + * + * @author imi + */ +public class SaveAsAction extends SaveActionBase { + + /** + * Construct the action with "Save" as label. + * @param layer Save this layer. + */ + public SaveAsAction(OsmDataLayer layer) { + super(tr("Save as"), "save_as", tr("Save the current data to a new file."), KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK, layer); + } + + @Override protected File getFile(OsmDataLayer layer) { + return openFileDialog(); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java (revision 321) @@ -0,0 +1,20 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; + +import org.openstreetmap.josm.Main; + +public class SelectAllAction extends JosmAction { + + public SelectAllAction() { + super(tr("Select All"),"selectall", tr("Select all undeleted objects in the data layer. This selects incomplete objects too."), KeyEvent.VK_A, KeyEvent.CTRL_DOWN_MASK, true); + } + + public void actionPerformed(ActionEvent e) { + Main.ds.setSelected(Main.ds.allNonDeletedPrimitives()); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 321) @@ -0,0 +1,505 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map.Entry; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.AddCommand; +import org.openstreetmap.josm.command.ChangeCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.SelectionChangedListener; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.data.osm.visitor.NameVisitor; +import org.openstreetmap.josm.data.osm.visitor.Visitor; + +/** + * Splits a way into multiple ways (all identical except the segments + * belonging to the way). + * + * Various split modes are used depending on what is selected. + * + * 1. One or more NODES (and, optionally, also one way) selected: + * + * (All nodes must be part of the same way. If a way is also selected, that way + * must contain all selected nodes.) + * + * Way is split AT the node(s) into contiguous ways. If the original contained + * one or more parts that were not reachable from any of the nodes, they form an + * extra new way. Examples (numbers are unselected nodes, letters are selected + * nodes) + * + * 1---A---2 becomes 1---A and A---2 + * + * 1---A---2---B---3 becomes 1---A and A---2---B and B---3 + * + * 2 + * | + * 1---A---3 becomes 1---A and 2---A and A---3 + * + * 1---A---2 3---4 becomes 1---A and A---2 and 3---4 + * + * If the selected node(s) do not clearly define the way that is to be split, + * then the way must be selected for disambiguation (e.g. you have two ways, + * 1---2---3 and 4---2---5, and select node 2, then you must also select the + * way you want to split). + * + * This function will result in at least two ways, unless the selected node is + * at the end of the way AND the way is contiguous, which will lead to an error + * message. + * + * After executing the operation, the selection will be cleared. + * + * 2. One or more SEGMENTS (and, optionally, also one way) selected: + * + * (All segments must be part of the same way) + * + * The way is split in a fashion that makes a new way from the selected segments, + * i.e. the selected segments are removed from the way to form a new one. + * + * This function will result in exactly two ways. + * + * If splitting the segments out of the way makes a non-contiguous part from + * something that was contiguous before, the action is aborted and an error + * message is shown. + * + * 3. Exactly one WAY selected + * + * If the way is contiguous, you will get an error message. If the way is not + * contiguous it is split it into 2...n contiguous ways. + */ + +public class SplitWayAction extends JosmAction implements SelectionChangedListener { + + private Way selectedWay; + private List selectedNodes; + private List selectedSegments; + + /** + * Create a new SplitWayAction. + */ + public SplitWayAction() { + super(tr("Split Way"), "splitway", tr("Split a way at the selected node."), KeyEvent.VK_P, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true); + DataSet.listeners.add(this); + } + + /** + * Called when the action is executed. + * + * This method performs an expensive check whether the selection clearly defines one + * of the split actions outlined above, and if yes, calls the splitWay method. + */ + public void actionPerformed(ActionEvent e) { + + Collection selection = Main.ds.getSelected(); + + if (!checkSelection(selection)) { + JOptionPane.showMessageDialog(Main.parent, tr("The current selection cannot be used for splitting.")); + return; + } + + selectedWay = null; + selectedNodes = null; + selectedSegments = null; + + Visitor splitVisitor = new Visitor(){ + public void visit(Node n) { + if (selectedNodes == null) + selectedNodes = new LinkedList(); + selectedNodes.add(n); + } + public void visit(Segment s) { + if (selectedSegments == null) + selectedSegments = new LinkedList(); + selectedSegments.add(s); + } + public void visit(Way w) { + selectedWay = w; + } + }; + + for (OsmPrimitive p : selection) + p.visit(splitVisitor); + + // If only nodes are selected, try to guess which way to split. This works if there + // is exactly one way that all nodes are part of. + if (selectedWay == null && selectedNodes != null) { + HashMap wayOccurenceCounter = new HashMap(); + for (Node n : selectedNodes) { + for (Way w : Main.ds.ways) { + for (Segment s : w.segments) { + if (n.equals(s.from) || n.equals(s.to)) { + Integer old = wayOccurenceCounter.get(w); + wayOccurenceCounter.put(w, (old == null) ? 1 : old+1); + break; + } + } + } + } + if (wayOccurenceCounter.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, + trn("The selected node is not part of any way.", + "The selected nodes are not part of any way.", selectedNodes.size())); + return; + } + + for (Entry entry : wayOccurenceCounter.entrySet()) { + if (entry.getValue().equals(selectedNodes.size())) { + if (selectedWay != null) { + JOptionPane.showMessageDialog(Main.parent, tr("There is more than one way using the node(s) you selected. Please select the way also.")); + return; + } + selectedWay = entry.getKey(); + } + } + + if (selectedWay == null) { + JOptionPane.showMessageDialog(Main.parent, tr("The selected nodes do not share the same way.")); + return; + } + + // If a way and nodes are selected, verify that the nodes are part of the way. + } else if (selectedWay != null && selectedNodes != null) { + + HashSet nds = new HashSet(selectedNodes); + for (Segment s : selectedWay.segments) { + nds.remove(s.from); + nds.remove(s.to); + } + if (!nds.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, + trn("The selected way does not contain the selected node.", + "The selected way does not contain all the selected nodes.", selectedNodes.size())); + return; + } + + // If only segments are selected, guess which way to use. + } else if (selectedWay == null && selectedSegments != null) { + + HashMap wayOccurenceCounter = new HashMap(); + for (Segment s : selectedSegments) { + for (Way w : Main.ds.ways) { + if (w.segments.contains(s)) { + Integer old = wayOccurenceCounter.get(w); + wayOccurenceCounter.put(w, (old == null) ? 1 : old+1); + break; + } + } + } + if (wayOccurenceCounter.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, + trn("The selected segment is not part of any way.", + "The selected segments are not part of any way.", selectedSegments.size())); + return; + } + + for (Entry entry : wayOccurenceCounter.entrySet()) { + if (entry.getValue().equals(selectedSegments.size())) { + if (selectedWay != null) { + JOptionPane.showMessageDialog(Main.parent, + trn("There is more than one way using the segment you selected. Please select the way also.", + "There is more than one way using the segments you selected. Please select the way also.", selectedSegments.size())); + return; + } + selectedWay = entry.getKey(); + } + } + + if (selectedWay == null) { + JOptionPane.showMessageDialog(Main.parent, tr("The selected segments do not share the same way.")); + return; + } + + // If a way and segments are selected, verify that the segments are part of the way. + } else if (selectedWay != null && selectedSegments != null) { + + if (!selectedWay.segments.containsAll(selectedSegments)) { + JOptionPane.showMessageDialog(Main.parent, + trn("The selected way does not contain the selected segment.", + "The selected way does not contain all the selected segments.", selectedSegments.size())); + return; + } + } + + // finally check if the selected way is complete. + if (selectedWay.isIncomplete()) { + JOptionPane.showMessageDialog(Main.parent, tr("Warning: This way is incomplete. Try to download it before splitting.")); + return; + } + + // and then do the work. + splitWay(); + } + + /** + * Checks if the selection consists of something we can work with. + * Checks only if the number and type of items selected looks good; + * does not check whether the selected items are really a valid + * input for splitting (this would be too expensive to be carried + * out from the selectionChanged listener). + */ + private boolean checkSelection(Collection selection) { + boolean way = false; + boolean segment = false; + boolean node = false; + for (OsmPrimitive p : selection) { + if (p instanceof Way && !way) + way = true; + else if (p instanceof Node && !segment) + node = true; + else if (p instanceof Segment && !node) + segment = true; + else + return false; + } + return way || segment || node; + } + + /** + * Split a way into two or more parts, starting at a selected node. + * + * @param way the way to split + * @param nodes the node(s) to split the way at; must be part of the way. + */ + private void splitWay() { + + // The basic idea is to first divide all segments forming this way into + // groups, and later form new ways according to the groups. Initally, + // all segments are copied into allSegments, and then gradually removed + // from there as new groups are built. + + LinkedList allSegments = new LinkedList(); + allSegments.addAll(selectedWay.segments); + List> segmentSets = new ArrayList>(); + + if (selectedNodes != null) { + + // This is the "split at node" mode. + + boolean split = true; + Segment splitSeg = null; + while (split) { + split = false; + + // Look for a "split segment". A split segment is any segment + // that touches one of the split nodes and has not yet been + // assigned to one of the segment groups. + for (Segment s : allSegments) { + for (Node node : selectedNodes) { + if (s.from.equals(node) || s.to.equals(node)) { + split = true; + splitSeg = s; + break; + } + } + if (split) + break; + } + + // If a split segment was found, move this segment and all segments + // connected to it into a new segment group, stopping only if we + // reach another split node. Segment moving is done recursively by + // the moveSegments method. + if (split) { + LinkedList subSegments = new LinkedList(); + moveSegments(allSegments, subSegments, splitSeg, selectedNodes); + segmentSets.add(subSegments); + } + + // The loop continues until no more split segments were found. + // Nb. not all segments touching a split node are split segments; + // e.g. + // + // 2 4 + // | | + // 1---A---3---C---5 + // + // This way will be split into 5 ways (1---A,2---A,A---3---C,4---C, + // C---5). Depending on which is processed first, either A---3 becomes + // a split segment and 3---C is moved as a connecting segment, or vice + // versa. The result is, of course, the same but this explains why we + // cannot simply start a new way for each segment connecting to a split + // node. + } + + } else if (selectedSegments != null) { + + // This is the "split segments" mode. It is quite easy as the segments to + // remove are already explicitly selected, but some restrictions have to + // be observed to make sure that no non-contiguous parts are created. + + // first create a "scratch" copy of the full segment list and move all + // segments connected to the first selected segment into a temporary list. + LinkedList copyOfAllSegments = new LinkedList(allSegments); + LinkedList partThatContainsSegments = new LinkedList(); + moveSegments(copyOfAllSegments, partThatContainsSegments, selectedSegments.get(0), null); + + // this list must now contain ALL selected segments; otherwise, segments + // from unconnected parts of the way have been selected and this is not allowed + // as it would create a new non-contiguous way. + if (!partThatContainsSegments.containsAll(selectedSegments)) { + JOptionPane.showMessageDialog(Main.parent, tr("The selected segments are not in the same contiguous part of the way.")); + return; + } + + // if the contiguous part that contains the segments becomes non-contiguous + // after the removal of the segments, that is also an error. + partThatContainsSegments.removeAll(selectedSegments); + if (!partThatContainsSegments.isEmpty()) { + LinkedList contiguousSubpart = new LinkedList(); + moveSegments(partThatContainsSegments, contiguousSubpart, partThatContainsSegments.get(0), null); + // if partThatContainsSegments was contiguous before, it will now be empty as all segments + // connected to the first segment therein have been moved + if (!partThatContainsSegments.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, tr("Removing the selected segments would make a part of the way non-contiguous.")); + return; + } + } + + ArrayList subSegments = new ArrayList(); + subSegments.addAll(selectedSegments); + allSegments.removeAll(selectedSegments); + segmentSets.add(subSegments); + + } else { + + // This is the "split way into contiguous parts" mode. + // We use a similar mechanism to splitting at nodes, but we do not + // select split segments. Instead, we randomly grab a segment out + // of the way and move all connecting segments to a new group. If + // segments remain in the original way, we repeat the procedure. + + while (!allSegments.isEmpty()) { + LinkedList subSegments = new LinkedList(); + moveSegments(allSegments, subSegments, allSegments.get(0), null); + segmentSets.add(subSegments); + } + } + + // We now have a number of segment groups. + + // If segments remain in allSegments, this means that they were not reachable + // from any of the split nodes, and they will be made into an extra way. + if (!allSegments.isEmpty()) { + segmentSets.add(allSegments); + } + + // If we do not have at least two parts, then the way was circular or the node(s) + // were at one end of the way. User error ;-) + if (segmentSets.size() < 2) { + if (selectedNodes != null) { + JOptionPane.showMessageDialog(Main.parent, tr("The way cannot be split at the selected node. (Hint: To split circular ways, select two nodes.)")); + } else { + JOptionPane.showMessageDialog(Main.parent, tr("The way cannot be split because it is contiguous. (Hint: To split at a node, select that node.)")); + } + return; + } + + // sort the list of segment lists according to their number of elements, so that + // the biggest part of the way comes first. That way, we will "change" the largest + // part of the way by removing a few segments, and "add" new, smaller ways; looks + // nicer. + Collections.sort(segmentSets, new Comparator>() { + public int compare(Collection a, Collection b) { + if (a.size() < b.size()) + return 1; + if (b.size() < a.size()) + return -1; + return 0; + } + }); + + // build a list of commands, and also a list of ways + Collection commandList = new ArrayList(segmentSets.size()); + Collection newSelection = new ArrayList(segmentSets.size()); + Iterator> segsIt = segmentSets.iterator(); + + // the first is always a change to the existing way; + Way changedWay = new Way(selectedWay); + changedWay.segments.clear(); + changedWay.segments.addAll(segsIt.next()); + commandList.add(new ChangeCommand(selectedWay, changedWay)); + newSelection.add(selectedWay); + + // and commands 1...n are additions of new ways. + while (segsIt.hasNext()) { + Way wayToAdd = new Way(); + if (selectedWay.keys != null) + wayToAdd.keys = new HashMap(selectedWay.keys); + wayToAdd.segments.clear(); + wayToAdd.segments.addAll(segsIt.next()); + commandList.add(new AddCommand(wayToAdd)); + newSelection.add(wayToAdd); + } + + NameVisitor v = new NameVisitor(); + v.visit(selectedWay); + Main.main.undoRedo.add(new SequenceCommand(tr("Split way {0} into {1} parts",v.name, segmentSets.size()), commandList)); + Main.ds.setSelected(newSelection); + } + + /** + * Enable the "split way" menu option if the selection looks like we could use it. + */ + public void selectionChanged(Collection newSelection) { + setEnabled(checkSelection(newSelection)); + } + + /** + * Move contiguous segments from one collection to another. The given segment is moved first, and + * then the procedure is recursively called for all segments that connect to the first segment at + * either end. + * + * @param source the source collection + * @param destination the destination collection + * @param start the first segment to be moved + * @param stopNodes collection of nodes which should be considered end points for moving (may be null). + */ + private void moveSegments(Collection source, LinkedList destination, Segment start, Collection stopNodes) { + source.remove(start); + if (destination.isEmpty() || destination.iterator().next().from.equals(start.to)) + destination.addFirst(start); + else + destination.addLast(start); + Segment moveSeg = start; + while(moveSeg != null) { + moveSeg = null; + + for (Node node : new Node[] { start.from, start.to }) { + if (stopNodes != null && stopNodes.contains(node)) + continue; + for (Segment sourceSeg : source) { + if (sourceSeg.from.equals(node) || sourceSeg.to.equals(node)) { + moveSeg = sourceSeg; + break; + } + } + if (moveSeg != null) + break; + } + if (moveSeg != null) { + moveSegments(source, destination, moveSeg, stopNodes); + } + } + } +} Index: /trunk/src/org/openstreetmap/josm/actions/UndoAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/UndoAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/UndoAction.java (revision 321) @@ -0,0 +1,34 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; + +import org.openstreetmap.josm.Main; + + +/** + * Undoes the last command. + * + * @author imi + */ +public class UndoAction extends JosmAction { + + /** + * Construct the action with "Undo" as label. + */ + public UndoAction() { + super(tr("Undo"), "undo", tr("Undo the last action."), KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK, true); + setEnabled(false); + } + + public void actionPerformed(ActionEvent e) { + if (Main.map == null) + return; + Main.map.repaint(); + Main.main.undoRedo.undo(); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (revision 321) @@ -0,0 +1,20 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; + +import org.openstreetmap.josm.Main; + +public class UnselectAllAction extends JosmAction { + + public UnselectAllAction() { + super(tr("Unselect All"),"unselectall", tr("Unselect all objects."), KeyEvent.VK_A, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK, true); + } + + public void actionPerformed(ActionEvent e) { + Main.ds.setSelected(); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/UploadAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 321) @@ -0,0 +1,162 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; +import java.util.Collection; +import java.util.LinkedList; + +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.OsmPrimitivRenderer; +import org.openstreetmap.josm.gui.PleaseWaitRunnable; +import org.openstreetmap.josm.io.OsmServerWriter; +import org.openstreetmap.josm.tools.GBC; +import org.xml.sax.SAXException; + +/** + * Action that opens a connection to the osm server and upload all changes. + * + * An dialog is displayed asking the user to specify a rectangle to grab. + * The url and account settings from the preferences are used. + * + * @author imi + */ +public class UploadAction extends JosmAction { + + /** Upload Hook */ + public interface UploadHook { + /** + * Checks the upload. + * @param add The added primitives + * @param update The updated primitives + * @param delete The deleted primitives + * @return true, if the upload can continue + */ + public boolean checkUpload(Collection add, Collection update, Collection delete); + } + + /** + * The list of upload hooks. These hooks will be called one after the other + * when the user wants to upload data. Plugins can insert their own hooks here + * if they want to be able to veto an upload. + * + * Be dafault, the standard upload dialog is the only element in the list. + * Plugins shold normally insert their code before that, so that the upload + * dialog is the last thing shown before upload really starts; on occasion + * however, a plugin might also want to insert something after that. + */ + public final LinkedList uploadHooks = new LinkedList(); + + public UploadAction() { + super(tr("Upload to OSM"), "upload", tr("Upload all changes to the OSM server."), KeyEvent.VK_U, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK, true); + + /** + * Displays a screen where the actions that would be taken are displayed and + * give the user the possibility to cancel the upload. + */ + uploadHooks.add(new UploadHook() { + public boolean checkUpload(Collection add, Collection update, Collection delete) { + + JPanel p = new JPanel(new GridBagLayout()); + + OsmPrimitivRenderer renderer = new OsmPrimitivRenderer(); + + if (!add.isEmpty()) { + p.add(new JLabel(tr("Objects to add:")), GBC.eol()); + JList l = new JList(add.toArray()); + l.setCellRenderer(renderer); + l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10); + p.add(new JScrollPane(l), GBC.eol().fill()); + } + + if (!update.isEmpty()) { + p.add(new JLabel(tr("Objects to modify:")), GBC.eol()); + JList l = new JList(update.toArray()); + l.setCellRenderer(renderer); + l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10); + p.add(new JScrollPane(l), GBC.eol().fill()); + } + + if (!delete.isEmpty()) { + p.add(new JLabel(tr("Objects to delete:")), GBC.eol()); + JList l = new JList(delete.toArray()); + l.setCellRenderer(renderer); + l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10); + p.add(new JScrollPane(l), GBC.eol().fill()); + } + + return JOptionPane.showConfirmDialog(Main.parent, p, tr("Upload these changes?"), + JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION; + } + }); + } + + public void actionPerformed(ActionEvent e) { + if (Main.map == null) { + JOptionPane.showMessageDialog(Main.parent,tr("Nothing to upload. Get some data first.")); + return; + } + + if (!Main.map.conflictDialog.conflicts.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent,tr("There are unresolved conflicts. You have to resolve these first.")); + Main.map.conflictDialog.action.button.setSelected(true); + Main.map.conflictDialog.action.actionPerformed(null); + return; + } + + final LinkedList add = new LinkedList(); + final LinkedList update = new LinkedList(); + final LinkedList delete = new LinkedList(); + for (OsmPrimitive osm : Main.ds.allPrimitives()) { + if (osm.get("josm/ignore") != null) + continue; + if (osm.id == 0 && !osm.deleted) + add.addLast(osm); + else if (osm.modified && !osm.deleted) + update.addLast(osm); + else if (osm.deleted && osm.id != 0) + delete.addFirst(osm); + } + + if (add.isEmpty() && update.isEmpty() && delete.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent,tr("No changes to upload.")); + return; + } + + // Call all upload hooks in sequence. The upload confirmation dialog + // is one of these. + for(UploadHook hook : uploadHooks) + if(!hook.checkUpload(add, update, delete)) + return; + + final OsmServerWriter server = new OsmServerWriter(); + final Collection all = new LinkedList(); + all.addAll(add); + all.addAll(update); + all.addAll(delete); + + PleaseWaitRunnable uploadTask = new PleaseWaitRunnable(tr("Uploading data")){ + @Override protected void realRun() throws SAXException { + server.uploadOsm(all); + } + @Override protected void finish() { + Main.main.editLayer().cleanData(server.processed, !add.isEmpty()); + } + @Override protected void cancel() { + server.cancel(); + } + }; + Main.worker.execute(uploadTask); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 321) @@ -0,0 +1,83 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions.downloadtasks; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.IOException; +import java.util.Collection; + +import javax.swing.JCheckBox; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.DownloadAction; +import org.openstreetmap.josm.gui.PleaseWaitRunnable; +import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.RawGpsLayer; +import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint; +import org.openstreetmap.josm.io.BoundingBoxDownloader; +import org.xml.sax.SAXException; + +public class DownloadGpsTask implements DownloadTask { + + private static class Task extends PleaseWaitRunnable { + private BoundingBoxDownloader reader; + private DownloadAction action; + private Collection> rawData; + private final boolean newLayer; + + public Task(boolean newLayer, BoundingBoxDownloader reader, DownloadAction action) { + super(tr("Downloading GPS data")); + this.reader = reader; + this.action = action; + this.newLayer = newLayer; + } + + @Override public void realRun() throws IOException, SAXException { + rawData = reader.parseRawGps(); + } + + @Override protected void finish() { + if (rawData == null) + return; + String name = action.dialog.minlat + " " + action.dialog.minlon + " x " + action.dialog.maxlat + " " + action.dialog.maxlon; + RawGpsLayer layer = new RawGpsLayer(true, rawData, name, null); + if (newLayer || findMergeLayer() == null) + Main.main.addLayer(layer); + else + findMergeLayer().mergeFrom(layer); + } + + private Layer findMergeLayer() { + if (Main.map == null) + return null; + Layer active = Main.map.mapView.getActiveLayer(); + if (active != null && active instanceof RawGpsLayer) + return active; + for (Layer l : Main.map.mapView.getAllLayers()) + if (l instanceof RawGpsLayer && ((RawGpsLayer)l).fromServer) + return l; + return null; + } + + @Override protected void cancel() { + if (reader != null) + reader.cancel(); + } + } + + private JCheckBox checkBox = new JCheckBox(tr("Raw GPS data")); + + public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) { + Task task = new Task(action.dialog.newLayer.isSelected(), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon), action); + Main.worker.execute(task); + } + + public JCheckBox getCheckBox() { + return checkBox; + } + + public String getPreferencesSuffix() { + return "gps"; + } +} Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (revision 321) @@ -0,0 +1,71 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions.downloadtasks; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.IOException; + +import javax.swing.JCheckBox; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.DownloadAction; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.gui.PleaseWaitRunnable; +import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.io.BoundingBoxDownloader; +import org.xml.sax.SAXException; + +/** + * Open the download dialog and download the data. + * Run in the worker thread. + */ +public class DownloadOsmTask implements DownloadTask { + + private static class Task extends PleaseWaitRunnable { + private BoundingBoxDownloader reader; + private DataSet dataSet; + private boolean newLayer; + + public Task(boolean newLayer, BoundingBoxDownloader reader) { + super(tr("Downloading data")); + this.reader = reader; + this.newLayer = newLayer; + } + + @Override public void realRun() throws IOException, SAXException { + dataSet = reader.parseOsm(); + } + + @Override protected void finish() { + if (dataSet == null) + return; // user cancelled download or error occoured + if (dataSet.allPrimitives().isEmpty()) + errorMessage = tr("No data imported."); + OsmDataLayer layer = new OsmDataLayer(dataSet, tr("Data Layer"), null); + if (newLayer) + Main.main.addLayer(layer); + else + Main.main.editLayer().mergeFrom(layer); + } + + @Override protected void cancel() { + if (reader != null) + reader.cancel(); + } + } + private JCheckBox checkBox = new JCheckBox(tr("OpenStreetMap data")); + + public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) { + Task task = new Task(action.dialog.newLayer.isSelected(), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon)); + Main.worker.execute(task); + } + + public JCheckBox getCheckBox() { + return checkBox; + } + + public String getPreferencesSuffix() { + return "osm"; + } +} Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java (revision 321) @@ -0,0 +1,248 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions.mapmode; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Cursor; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.GroupAction; +import org.openstreetmap.josm.command.AddCommand; +import org.openstreetmap.josm.command.ChangeCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * This mode adds a new node to the dataset. The user clicks on a place to add + * and there is it. Nothing more, nothing less. + * + * Newly created nodes are selected. Shift modifier does not cancel the old + * selection as usual. + * + * @author imi + * + */ +public class AddNodeAction extends MapMode { + + enum Mode {node, nodesegment, autonode} + private final Mode mode; + + public static class AddNodeGroup extends GroupAction { + public AddNodeGroup(MapFrame mf) { + super(KeyEvent.VK_N,0); + putValue("help", "Action/AddNode"); + actions.add(new AddNodeAction(mf,tr("Add node"), Mode.node, tr("Add a new node to the map"))); + actions.add(new AddNodeAction(mf, tr("Add node into segment"), Mode.nodesegment,tr( "Add a node into an existing segment"))); + actions.add(new AddNodeAction(mf, tr("Add node and connect"), Mode.autonode,tr( "Add a node and connect it to the selected node (with CTRL: add node into segment; with SHIFT: re-use existing node)"))); + setCurrent(0); + } + } + + public AddNodeAction(MapFrame mapFrame, String name, Mode mode, String desc) { + super(name, "node/"+mode, desc, mapFrame, getCursor()); + this.mode = mode; + putValue("help", "Action/AddNode/"+Character.toUpperCase(mode.toString().charAt(0))+mode.toString().substring(1)); + } + + private static Cursor getCursor() { + try { + return ImageProvider.getCursor("crosshair", null); + } catch (Exception e) { + } + return Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR); + } + + @Override public void enterMode() { + super.enterMode(); + Main.map.mapView.addMouseListener(this); + } + + @Override public void exitMode() { + super.exitMode(); + Main.map.mapView.removeMouseListener(this); + } + + /** + * If user clicked with the left button, add a node at the current mouse + * position. + * + * If in nodesegment mode, add the node to the line segment by splitting the + * segment. The new created segment will be inserted in every way the segment + * was part of. + */ + @Override public void mouseClicked(MouseEvent e) { + if (e.getButton() != MouseEvent.BUTTON1) + return; + + Node n = new Node(Main.map.mapView.getLatLon(e.getX(), e.getY())); + if (n.coor.isOutSideWorld()) { + JOptionPane.showMessageDialog(Main.parent,tr("Cannot add a node outside of the world.")); + return; + } + + Command c = new AddCommand(n); + if (mode == Mode.nodesegment) { + Segment s = Main.map.mapView.getNearestSegment(e.getPoint()); + if (s == null) + return; + + // see if another segment is also near + Segment other = Main.map.mapView.getNearestSegment(e.getPoint(), Collections.singleton(s)); + + if (other == null && (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) == 0) { + // moving the new point to the perpendicular point + // FIXME: when two segments are split, should move the new point to the + // intersection point! + EastNorth A = s.from.eastNorth; + EastNorth B = s.to.eastNorth; + double ab = A.distance(B); + double nb = n.eastNorth.distance(B); + double na = n.eastNorth.distance(A); + double q = (nb-na+ab)/ab/2; + n.eastNorth = new EastNorth(B.east() + q*(A.east()-B.east()), B.north() + q*(A.north()-B.north())); + n.coor = Main.proj.eastNorth2latlon(n.eastNorth); + } + + Collection cmds = new LinkedList(); + cmds.add(c); + + // split the first segment + splitSegmentAtNode(s, n, cmds); + + // if a second segment was found, split that as well + if (other != null) splitSegmentAtNode(other, n, cmds); + + c = new SequenceCommand(tr((other == null) ? + "Add node into segment" : "Add common node into two segments"), cmds); + } + + // Add a node and connecting segment. + if (mode == Mode.autonode) { + + Segment insertInto = null; + Node reuseNode = null; + + // If CTRL is held, insert the node into a potentially existing segment + if ((e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) != 0) { + insertInto = Main.map.mapView.getNearestSegment(e.getPoint()); + if (insertInto == null) + return; + } + // If ALT is held, instead of creating a new node, re-use an existing + // node (making this action identical to AddSegmentAction with the + // small difference that the node used will then be selected to allow + // continuation of the "add node and connect" stuff) + else if ((e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0) { + OsmPrimitive clicked = Main.map.mapView.getNearest(e.getPoint(), false); + if (clicked == null || !(clicked instanceof Node)) + return; + reuseNode = (Node) clicked; + } + + Collection selection = Main.ds.getSelected(); + if (selection.size() == 1 && selection.iterator().next() instanceof Node) { + Node n1 = (Node)selection.iterator().next(); + Collection cmds = new LinkedList(); + + if (reuseNode != null) { + // in re-use node mode, n1 must not be identical to clicked node + if (n1 == reuseNode) return; + // replace newly created node with existing node + n = reuseNode; + } else { + // only add the node creation command if we're not re-using + cmds.add(c); + } + + Segment s = new Segment(n1, n); + + if (insertInto != null) + splitSegmentAtNode(insertInto, n, cmds); + + cmds.add(new AddCommand(s)); + + Way way = getWayForNode(n1); + if (way != null) { + Way newWay = new Way(way); + if (way.segments.get(0).from == n1) { + Node tmp = s.from; + s.from = s.to; + s.to = tmp; + newWay.segments.add(0, s); + } else + newWay.segments.add(s); + cmds.add(new ChangeCommand(way, newWay)); + } + + c = new SequenceCommand(tr((insertInto == null) ? "Add node and connect" : "Add node into segment and connect"), cmds); + } + } + + Main.main.undoRedo.add(c); + Main.ds.setSelected(n); + Main.map.mapView.repaint(); + } + + /** + * @return If the node is part of exactly one way, return this. + * null otherwise. + */ + private Way getWayForNode(Node n) { + Way way = null; + for (Way w : Main.ds.ways) { + for (Segment s : w.segments) { + if (s.from == n || s.to == n) { + if (way != null) + return null; + if (s.from == s.to) + return null; + way = w; + } + } + } + return way; + } + + private void splitSegmentAtNode(Segment s, Node n, Collection cmds) { + Segment s1 = new Segment(s); + s1.to = n; + Segment s2 = new Segment(s.from, s.to); + s2.from = n; + if (s.keys != null) + s2.keys = new HashMap(s.keys); + + cmds.add(new ChangeCommand(s, s1)); + cmds.add(new AddCommand(s2)); + + // Add the segment to every way + for (Way wold : Main.ds.ways) { + if (wold.segments.contains(s)) { + Way wnew = new Way(wold); + Collection segs = new ArrayList(wnew.segments); + wnew.segments.clear(); + for (Segment waySeg : segs) { + wnew.segments.add(waySeg); + if (waySeg == s) + wnew.segments.add(s2); + } + cmds.add(new ChangeCommand(wold, wnew)); + } + } + } +} Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java (revision 321) @@ -0,0 +1,176 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions.mapmode; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Point; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.util.Collection; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.AddCommand; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * The user can add a new segment between two nodes by pressing on the + * starting node and dragging to the ending node. + * + * No segment can be created if there is already a segment containing + * both nodes. + * + * @author imi + */ +public class AddSegmentAction extends MapMode implements MouseListener { + + /** + * The first node the user pressed the button onto. + */ + private Node first; + /** + * The second node used if the user releases the button. + */ + private Node second; + + /** + * Whether the hint is currently drawn on screen. + */ + private boolean hintDrawn = false; + + /** + * Create a new AddSegmentAction. + * @param mapFrame The MapFrame this action belongs to. + */ + public AddSegmentAction(MapFrame mapFrame) { + super(tr("Add segment"), + "addsegment", + tr("Add a segment between two nodes."), + KeyEvent.VK_G, + mapFrame, + ImageProvider.getCursor("normal", "segment")); + } + + @Override public void enterMode() { + super.enterMode(); + Main.map.mapView.addMouseListener(this); + Main.map.mapView.addMouseMotionListener(this); + } + + @Override public void exitMode() { + super.exitMode(); + Main.map.mapView.removeMouseListener(this); + Main.map.mapView.removeMouseMotionListener(this); + drawHint(false); + } + + + @Override public void actionPerformed(ActionEvent e) { + super.actionPerformed(e); + makeSegment(); + } + + /** + * If user clicked on a node, from the dragging with that node. + */ + @Override public void mousePressed(MouseEvent e) { + if (e.getButton() != MouseEvent.BUTTON1) + return; + + OsmPrimitive clicked = Main.map.mapView.getNearest(e.getPoint(), true); + if (clicked == null || !(clicked instanceof Node)) + return; + + drawHint(false); + first = second = (Node)clicked; + } + + /** + * Draw a hint which nodes will get connected if the user release + * the mouse button now. + */ + @Override public void mouseDragged(MouseEvent e) { + if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 0) + return; + + OsmPrimitive clicked = Main.map.mapView.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0); + if (clicked == null || clicked == second || !(clicked instanceof Node)) + return; + + drawHint(false); + + second = (Node)clicked; + drawHint(true); + } + + /** + * If left button was released, try to create the segment. + */ + @Override public void mouseReleased(MouseEvent e) { + if (e.getButton() == MouseEvent.BUTTON1) { + makeSegment(); + first = null; // release segment drawing + } + } + + /** + * Create the segment if first and second are different and there is + * not already a segment. + */ + private void makeSegment() { + if (first == null || second == null) { + first = null; + second = null; + return; + } + + drawHint(false); + + Node start = first; + Node end = second; + first = second; + second = null; + + if (start != end) { + // try to find a segment + for (Segment ls : Main.ds.segments) + if (!ls.deleted && ((start == ls.from && end == ls.to) || (end == ls.from && start == ls.to))) + return; // already a segment here - be happy, do nothing. + + Segment ls = new Segment(start, end); + Main.main.undoRedo.add(new AddCommand(ls)); + Collection sel = Main.ds.getSelected(); + sel.add(ls); + Main.ds.setSelected(sel); + } + + Main.map.mapView.repaint(); + } + + /** + * Draw or remove the hint line, depending on the parameter. + */ + private void drawHint(boolean draw) { + if (draw == hintDrawn) + return; + if (first == null || second == null) + return; + if (second == first) + return; + + Graphics g = Main.map.mapView.getGraphics(); + g.setColor(Color.BLACK); + g.setXORMode(Color.WHITE); + Point firstDrawn = Main.map.mapView.getPoint(first.eastNorth); + Point secondDrawn = Main.map.mapView.getPoint(second.eastNorth); + g.drawLine(firstDrawn.x, firstDrawn.y, secondDrawn.x, secondDrawn.y); + hintDrawn = !hintDrawn; + } +} Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java (revision 321) @@ -0,0 +1,220 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions.mapmode; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedList; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.ReorderAction; +import org.openstreetmap.josm.command.AddCommand; +import org.openstreetmap.josm.command.ChangeCommand; +import org.openstreetmap.josm.command.DeleteCommand; +import org.openstreetmap.josm.data.SelectionChangedListener; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * Add a new way. The action is split into the first phase, where a new way get + * created or selected and the second, where this way is modified. + * + * Way creation mode: + * If there is a selection when the mode is entered, all segments in this + * selection form a new way. All non-segment objects are deselected. If there + * were ways selected, the user is asked whether to select all segments of these + * ways or not, except there is exactly one way selected, which enter the + * edit ways mode for this way immediatly. + * + * If there is no selection on entering, and the user clicks on an segment, + * the way editing starts the with a new way and this segment. If the user click + * on a way (not holding Alt down), then this way is edited in the way edit mode. + * + * Way editing mode: + * The user can click on subsequent segments. If the segment belonged to the way + * it get removed from the way. Elsewhere it get added to the way. JOSM try to add + * the segment in the correct position. This is done by searching for connections + * to the segment at its 'to' node which are also in the way. The segemnt is + * inserted in the way as predecessor of the found segment (or at last segment, if + * nothing found). + * + * @author imi + */ +public class AddWayAction extends MapMode implements SelectionChangedListener { + private Way way; + + /** + * Create a new AddWayAction. + * @param mapFrame The MapFrame this action belongs to. + * @param followMode The mode to go into when finished creating a way. + */ + public AddWayAction(MapFrame mapFrame) { + super(tr("Add Way"), "addway", tr("Add a new way to the data."), KeyEvent.VK_W, mapFrame, ImageProvider.getCursor("normal", "way")); + DataSet.listeners.add(this); + } + + @Override public void enterMode() { + super.enterMode(); + way = makeWay(); + Main.ds.setSelected(way); + Main.map.mapView.addMouseListener(this); + } + + @Override public void exitMode() { + super.exitMode(); + way = null; + Main.map.mapView.removeMouseListener(this); + } + + @Override public void mouseClicked(MouseEvent e) { + if (e.getButton() != MouseEvent.BUTTON1) + return; + + Segment s = Main.map.mapView.getNearestSegment(e.getPoint()); + if (s == null) + return; + + // special case for initial selecting one way + if (way == null && (e.getModifiers() & MouseEvent.ALT_DOWN_MASK) == 0) { + Way w = Main.map.mapView.getNearestWay(e.getPoint()); + if (w != null) { + way = w; + Main.ds.setSelected(way); + for (Segment seg : way.segments) { + if (seg.incomplete) { + JOptionPane.showMessageDialog(Main.parent,tr("Warning: This way is incomplete. Try to download it before adding segments.")); + return; + } + } + return; + } + } + + if (way != null && way.segments.contains(s)) { + Way copy = new Way(way); + + copy.segments.remove(s); + if (copy.segments.isEmpty()) { + Main.main.undoRedo.add(new DeleteCommand(Arrays.asList(new OsmPrimitive[]{way}))); + way = null; + } else + Main.main.undoRedo.add(new ChangeCommand(way, copy)); + } else { + if (way == null) { + way = new Way(); + way.segments.add(s); + Main.main.undoRedo.add(new AddCommand(way)); + } else { + Way copy = new Way(way); + int i; + for (i = 0; i < way.segments.size(); ++i) + if (way.segments.get(i).from == s.to) + break; + copy.segments.add(i, s); + Main.main.undoRedo.add(new ChangeCommand(way, copy)); + } + } + Main.ds.setSelected(way); + } + + /** + * Form a way, either out of the (one) selected way or by creating a way over the selected + * line segments. + */ + private Way makeWay() { + Collection selection = Main.ds.getSelected(); + if (selection.isEmpty()) + return null; + + if (selection.size() == 1 && selection.iterator().next() instanceof Way) { + Way way = (Way)selection.iterator().next(); + for (Segment seg : way.segments) { + if (seg.incomplete) { + JOptionPane.showMessageDialog(Main.parent, tr("Warning: This way is incomplete. Try to download it before adding segments.")); + break; + } + } + return way; + } + + HashSet segmentSet = new HashSet(); + int numberOfSelectedWays = 0; + for (OsmPrimitive osm : selection) { + if (osm instanceof Way) + numberOfSelectedWays++; + else if (osm instanceof Segment) + segmentSet.add((Segment)osm); + } + + Way wayToAdd = null; + boolean reordered = false; + if (numberOfSelectedWays > 0) { + int answer = JOptionPane.showConfirmDialog(Main.parent,trn("{0} way has been selected.\nDo you wish to select all segments belonging to the way instead?","{0} ways have been selected.\nDo you wish to select all segments belonging to the ways instead?",numberOfSelectedWays,numberOfSelectedWays),tr("Add segments from ways"), JOptionPane.YES_NO_OPTION); + if (answer == JOptionPane.YES_OPTION) { + for (OsmPrimitive osm : selection) + if (osm instanceof Way) + segmentSet.addAll(((Way)osm).segments); + } else if (numberOfSelectedWays == 1) { + answer = JOptionPane.showConfirmDialog(Main.parent,tr("Do you want to add all other selected segments to the one selected way?"),tr("Add segments to way?"), JOptionPane.YES_NO_OPTION); + if (answer == JOptionPane.YES_OPTION) { + for (OsmPrimitive osm : selection) { + if (osm instanceof Way) { + wayToAdd = (Way)osm; + answer = JOptionPane.showConfirmDialog(Main.parent,tr("Reorder all line segments?"), tr("Reorder?"), JOptionPane.YES_NO_CANCEL_OPTION); + if (answer == JOptionPane.CANCEL_OPTION) + return wayToAdd; + if (answer == JOptionPane.YES_OPTION) { + segmentSet.addAll(wayToAdd.segments); + reordered = true; + } else + segmentSet.removeAll(wayToAdd.segments); + break; + } + } + } + } + } + + if (segmentSet.isEmpty()) + return null; + + LinkedList rawSegments = new LinkedList(segmentSet); + LinkedList sortedSegments = ReorderAction.sortSegments(rawSegments, true); + + if (wayToAdd != null) { + Way w = new Way(wayToAdd); + if (reordered) + w.segments.clear(); + w.segments.addAll(sortedSegments); + Main.main.undoRedo.add(new ChangeCommand(wayToAdd, w)); + return wayToAdd; + } + + if (JOptionPane.YES_OPTION != JOptionPane.showConfirmDialog(Main.parent,trn("Create a new way out of {0} segment?","Create a new way out of {0} segments?",sortedSegments.size(),sortedSegments.size()), tr("Create new way"), JOptionPane.YES_NO_OPTION)) + return null; + + Way w = new Way(); + w.segments.addAll(sortedSegments); + Main.main.undoRedo.add(new AddCommand(w)); + return w; + } + + public void selectionChanged(Collection newSelection) { + if (newSelection.size() == 1) { + OsmPrimitive osm = newSelection.iterator().next(); + way = osm instanceof Way ? (Way)osm : null; + } else + way = null; + } +} Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 321) @@ -0,0 +1,218 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions.mapmode; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Map.Entry; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.ChangeCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.DeleteCommand; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * An action that enables the user to delete nodes and other objects. + * + * The user can click on an object, which get deleted if possible. When Ctrl is + * pressed when releasing the button, the objects and all its references are + * deleted. The exact definition of "all its references" are in + * @see #deleteWithReferences(OsmPrimitive) + * + * Pressing Alt will select the way instead of a segment, as usual. + * + * If the user did not press Ctrl and the object has any references, the user + * is informed and nothing is deleted. + * + * If the user enters the mapmode and any object is selected, all selected + * objects that can be deleted will. + * + * @author imi + */ +public class DeleteAction extends MapMode { + + /** + * Construct a new DeleteAction. Mnemonic is the delete - key. + * @param mapFrame The frame this action belongs to. + */ + public DeleteAction(MapFrame mapFrame) { + super(tr("Delete"), + "delete", + tr("Delete nodes, streets or segments."), + KeyEvent.VK_D, + mapFrame, + ImageProvider.getCursor("normal", "delete")); + } + + @Override public void enterMode() { + super.enterMode(); + Main.map.mapView.addMouseListener(this); + } + + @Override public void exitMode() { + super.exitMode(); + Main.map.mapView.removeMouseListener(this); + } + + + @Override public void actionPerformed(ActionEvent e) { + super.actionPerformed(e); + boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; + if (ctrl) + deleteWithReferences(Main.ds.getSelected()); + else + delete(Main.ds.getSelected(), false, false); + Main.map.repaint(); + } + + /** + * If user clicked with the left button, delete the nearest object. + * position. + */ + @Override public void mouseClicked(MouseEvent e) { + if (e.getButton() != MouseEvent.BUTTON1) + return; + + OsmPrimitive sel = Main.map.mapView.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0); + if (sel == null) + return; + + if ((e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) != 0) + deleteWithReferences(Collections.singleton(sel)); + else + delete(Collections.singleton(sel), true, true); + + Main.map.mapView.repaint(); + } + + /** + * Delete the primitives and everything they references. + * + * If a node is deleted, the node and all segments, ways and areas + * the node is part of are deleted as well. + * + * If a segment is deleted, all ways the segment is part of + * are deleted as well. No nodes are deleted. + * + * If a way is deleted, only the way and no segments or nodes are + * deleted. + * + * If an area is deleted, only the area gets deleted. + * + * @param selection The list of all object to be deleted. + */ + private void deleteWithReferences(Collection selection) { + CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(Main.ds); + for (OsmPrimitive osm : selection) + osm.visit(v); + v.data.addAll(selection); + if (!v.data.isEmpty()) + Main.main.undoRedo.add(new DeleteCommand(v.data)); + } + + /** + * Try to delete all given primitives. If a primitive is + * used somewhere and that "somewhere" is not going to be deleted, + * inform the user and do not delete. + * + * If deleting a node which is part of exactly two segments, and both segments + * have no conflicting keys, join them and remove the node. + * If the two segments are part of the same way, remove the deleted segment + * from the way. + * + * @param selection The objects to delete. + * @param msgBox Whether a message box for errors should be shown + */ + private void delete(Collection selection, boolean msgBox, boolean joinIfPossible) { + Collection del = new HashSet(); + for (OsmPrimitive osm : selection) { + CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(Main.ds); + osm.visit(v); + if (!selection.containsAll(v.data)) { + if (osm instanceof Node && joinIfPossible) { + String reason = deleteNodeAndJoinSegment((Node)osm); + if (reason != null && msgBox) { + JOptionPane.showMessageDialog(Main.parent,tr("Cannot delete node.")+" "+reason); + return; + } + } else if (msgBox) { + JOptionPane.showMessageDialog(Main.parent, tr("This object is in use.")); + return; + } + } else { + del.addAll(v.data); + del.add(osm); + } + } + if (!del.isEmpty()) + Main.main.undoRedo.add(new DeleteCommand(del)); + } + + private String deleteNodeAndJoinSegment(Node n) { + ArrayList segs = new ArrayList(2); + for (Segment s : Main.ds.segments) { + if (!s.deleted && (s.from == n || s.to == n)) { + if (segs.size() > 1) + return tr("Used by more than two segments."); + segs.add(s); + } + } + if (segs.size() != 2) + return tr("Used by only one segment."); + Segment seg1 = segs.get(0); + Segment seg2 = segs.get(1); + if (seg1.from == seg2.to) { + Segment s = seg1; + seg1 = seg2; + seg2 = s; + } + if (seg1.from == seg2.from || seg1.to == seg2.to) + return tr("Wrong direction of segments."); + for (Entry e : seg1.entrySet()) + if (seg2.keySet().contains(e.getKey()) && !seg2.get(e.getKey()).equals(e.getValue())) + return tr("Conflicting keys"); + ArrayList ways = new ArrayList(2); + for (Way w : Main.ds.ways) { + if (w.deleted) + continue; + if ((w.segments.contains(seg1) && !w.segments.contains(seg2)) || (w.segments.contains(seg2) && !w.segments.contains(seg1))) + return tr("Segments are part of different ways."); + if (w.segments.contains(seg1) && w.segments.contains(seg2)) + ways.add(w); + } + Segment s = new Segment(seg1); + s.to = seg2.to; + if (s.keys == null) + s.keys = seg2.keys; + else if (seg2.keys != null) + s.keys.putAll(seg2.keys); + Collection cmds = new LinkedList(); + for (Way w : ways) { + Way copy = new Way(w); + copy.segments.remove(seg2); + cmds.add(new ChangeCommand(w, copy)); + } + cmds.add(new ChangeCommand(seg1, s)); + cmds.add(new DeleteCommand(Arrays.asList(new OsmPrimitive[]{n, seg2}))); + Main.main.undoRedo.add(new SequenceCommand(tr("Delete Node"), cmds)); + return null; + } +} Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 321) @@ -0,0 +1,72 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions.mapmode; + +import java.awt.Cursor; +import java.awt.event.ActionEvent; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionListener; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * A class implementing MapMode is able to be selected as an mode for map editing. + * As example scrolling the map is a MapMode, connecting Nodes to new Segments + * is another. + * + * MapModes should register/deregister all necessary listener on the map's view + * control. + */ +abstract public class MapMode extends JosmAction implements MouseListener, MouseMotionListener { + private final Cursor cursor; + private Cursor oldCursor; + + /** + * Constructor for mapmodes without an menu + */ + public MapMode(String name, String iconName, String tooltip, int keystroke, MapFrame mapFrame, Cursor cursor) { + super(name, "mapmode/"+iconName, tooltip, keystroke, 0, false); + this.cursor = cursor; + putValue("active", false); + } + + /** + * Constructor for mapmodes with an menu (no shortcut will be registered) + */ + public MapMode(String name, String iconName, String tooltip, MapFrame mapFrame, Cursor cursor) { + putValue(NAME, name); + putValue(SMALL_ICON, ImageProvider.get("mapmode", iconName)); + putValue(SHORT_DESCRIPTION, tooltip); + this.cursor = cursor; + } + + public void enterMode() { + putValue("active", true); + oldCursor = Main.map.mapView.getCursor(); + Main.map.mapView.setCursor(cursor); + + } + public void exitMode() { + putValue("active", false); + Main.map.mapView.setCursor(oldCursor); + } + + /** + * Call selectMapMode(this) on the parent mapFrame. + */ + public void actionPerformed(ActionEvent e) { + if (Main.map != null) + Main.map.selectMapMode(this); + } + + public void mouseReleased(MouseEvent e) {} + public void mouseExited(MouseEvent e) {} + public void mousePressed(MouseEvent e) {} + public void mouseClicked(MouseEvent e) {} + public void mouseEntered(MouseEvent e) {} + public void mouseMoved(MouseEvent e) {} + public void mouseDragged(MouseEvent e) {} +} Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java (revision 321) @@ -0,0 +1,200 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions.mapmode; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Cursor; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.util.Collection; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.GroupAction; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.MoveCommand; +import org.openstreetmap.josm.command.RotateCommand; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.visitor.AllNodesVisitor; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.gui.SelectionManager; +import org.openstreetmap.josm.gui.SelectionManager.SelectionEnded; +import org.openstreetmap.josm.tools.ImageProvider; +/** + * Move is an action that can move all kind of OsmPrimitives (except Keys for now). + * + * If an selected object is under the mouse when dragging, move all selected objects. + * If an unselected object is under the mouse when dragging, it becomes selected + * and will be moved. + * If no object is under the mouse, move all selected objects (if any) + * + * @author imi + */ +public class MoveAction extends MapMode implements SelectionEnded { + + enum Mode {move, rotate} + private final Mode mode; + + public static class MoveGroup extends GroupAction { + public MoveGroup(MapFrame mf) { + super(KeyEvent.VK_M,0); + putValue("help", "Action/Move"); + actions.add(new MoveAction(mf, tr("Move"), Mode.move, tr("Move around objects that are under the mouse or selected."))); + actions.add(new MoveAction(mf, tr("Rotate"), Mode.rotate, tr("Rotate selected nodes around centre"))); + setCurrent(0); + } + } + + /** + * The old cursor before the user pressed the mouse button. + */ + private Cursor oldCursor; + /** + * The position of the mouse before the user moves a node. + */ + private Point mousePos; + private SelectionManager selectionManager; + private boolean selectionMode = false; + + /** + * Create a new MoveAction + * @param mapFrame The MapFrame, this action belongs to. + */ + public MoveAction(MapFrame mapFrame, String name, Mode mode, String desc) { + super(name, "move/"+mode, desc, mapFrame, getCursor()); + this.mode = mode; + putValue("help", "Action/Move/"+Character.toUpperCase(mode.toString().charAt(0))+mode.toString().substring(1)); + selectionManager = new SelectionManager(this, false, mapFrame.mapView); + } + + private static Cursor getCursor() { + try { + return ImageProvider.getCursor("crosshair", null); + } catch (Exception e) { + } + return Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR); + } + + @Override public void enterMode() { + super.enterMode(); + Main.map.mapView.addMouseListener(this); + Main.map.mapView.addMouseMotionListener(this); + } + + @Override public void exitMode() { + super.exitMode(); + Main.map.mapView.removeMouseListener(this); + Main.map.mapView.removeMouseMotionListener(this); + } + + /** + * If the left mouse button is pressed, move all currently selected + * objects (if one of them is under the mouse) or the current one under the + * mouse (which will become selected). + */ + @Override public void mouseDragged(MouseEvent e) { + if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 0) + return; + + if (selectionMode) + return; + + if (mousePos == null) + mousePos = e.getPoint(); + + EastNorth mouseEN = Main.map.mapView.getEastNorth(e.getX(), e.getY()); + EastNorth mouseStartEN = Main.map.mapView.getEastNorth(mousePos.x, mousePos.y); + double dx = mouseEN.east() - mouseStartEN.east(); + double dy = mouseEN.north() - mouseStartEN.north(); + if (dx == 0 && dy == 0) + return; + + Collection selection = Main.ds.getSelected(); + Collection affectedNodes = AllNodesVisitor.getAllNodes(selection); + + // when rotating, having only one node makes no sense - quit silently + if (mode == Mode.rotate && affectedNodes.size() < 2) + return; + + + // check if any coordinate would be outside the world + for (OsmPrimitive osm : affectedNodes) { + if (osm instanceof Node && ((Node)osm).coor.isOutSideWorld()) { + JOptionPane.showMessageDialog(Main.parent,tr("Cannot move objects outside of the world.")); + return; + } + } + Command c = !Main.main.undoRedo.commands.isEmpty() ? Main.main.undoRedo.commands.getLast() : null; + + if (mode == Mode.move) { + if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).objects)) + ((MoveCommand)c).moveAgain(dx,dy); + else + Main.main.undoRedo.add(new MoveCommand(selection, dx, dy)); + } else if (mode == Mode.rotate) { + if (c instanceof RotateCommand && affectedNodes.equals(((RotateCommand)c).objects)) + ((RotateCommand)c).rotateAgain(mouseStartEN, mouseEN); + else + Main.main.undoRedo.add(new RotateCommand(selection, mouseStartEN, mouseEN)); + } + + Main.map.mapView.repaint(); + mousePos = e.getPoint(); + } + + /** + * Look, whether any object is selected. If not, select the nearest node. + * If there are no nodes in the dataset, do nothing. + * + * If the user did not press the left mouse button, do nothing. + * + * Also remember the starting position of the movement and change the mouse + * cursor to movement. + */ + @Override public void mousePressed(MouseEvent e) { + if (e.getButton() != MouseEvent.BUTTON1) + return; + + Collection sel = Main.ds.getSelected(); + OsmPrimitive osm = Main.map.mapView.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0); + if (osm != null) { + if (!sel.contains(osm)) + Main.ds.setSelected(osm); + oldCursor = Main.map.mapView.getCursor(); + + if (mode == Mode.move) { + Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); + } else { + Main.map.mapView.setCursor(ImageProvider.getCursor("rotate", null)); + } + } else { + selectionMode = true; + selectionManager.register(Main.map.mapView); + } + + Main.map.mapView.repaint(); + + mousePos = e.getPoint(); + } + + /** + * Restore the old mouse cursor. + */ + @Override public void mouseReleased(MouseEvent e) { + if (selectionMode) { + selectionManager.unregister(Main.map.mapView); + selectionMode = false; + } else + Main.map.mapView.setCursor(oldCursor); + } + + + public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl) { + SelectionAction.selectEverythingInRectangle(selectionManager, r, alt, shift, ctrl); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java (revision 321) @@ -0,0 +1,238 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions.mapmode; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Rectangle; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Map; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.GroupAction; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.gui.SelectionManager; +import org.openstreetmap.josm.gui.SelectionManager.SelectionEnded; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * This MapMode enables the user to easy make a selection of different objects. + * + * The selected objects are drawn in a different style. + * + * Holding and dragging the left mouse button draws an selection rectangle. + * When releasing the left mouse button, all objects within the rectangle get + * selected. + * + * When releasing the left mouse button while the right mouse button pressed, + * nothing happens (the selection rectangle will be cleared, however). + * + * When releasing the mouse button and one of the following keys was hold: + * + * If Alt key was hold, select all objects that are touched by the + * selection rectangle. If the Alt key was not hold, select only those objects + * completly within (e.g. for ways mean: only if all nodes of the way are + * within). + * + * If Shift key was hold, the objects are added to the current selection. If + * Shift key wasn't hold, the current selection get replaced. + * + * If Ctrl key was hold, remove all objects under the current rectangle from + * the active selection (if there were any). Nothing is added to the current + * selection. + * + * Alt can be combined with Ctrl or Shift. Ctrl and Shift cannot be combined. + * If both are pressed, nothing happens when releasing the mouse button. + * + * The user can also only click on the map. All total movements of 2 or less + * pixel are considered "only click". If that happens, the nearest Node will + * be selected if there is any within 10 pixel range. If there is no Node within + * 10 pixel, the nearest Segment (or Street, if user hold down the Alt-Key) + * within 10 pixel range is selected. If there is no Segment within 10 pixel + * and the user clicked in or 10 pixel away from an area, this area is selected. + * If there is even no area, nothing is selected. Shift and Ctrl key applies to + * this as usual. For more, @see MapView#getNearest(Point, boolean) + * + * @author imi + */ +public class SelectionAction extends MapMode implements SelectionEnded { + + enum Mode {select, straight} + private final Mode mode; + + public static class Group extends GroupAction { + public Group(MapFrame mf) { + super(KeyEvent.VK_S,0); + putValue("help", "Action/Selection"); + actions.add(new SelectionAction(mf, tr("Selection"), Mode.select, tr("Select objects by dragging or clicking."))); + actions.add(new SelectionAction(mf, tr("Straight line"), Mode.straight, tr("Select objects in a straight line."))); + setCurrent(0); + } + } + + + /** + * The SelectionManager that manages the selection rectangle. + */ + private SelectionManager selectionManager; + + private Node straightStart = null; + private Node lastEnd = null; + private Collection oldSelection = null; + + //TODO: Implement reverse references into data objects and remove this + private final Map> reverseSegmentMap = new HashMap>(); + + /** + * Create a new SelectionAction in the given frame. + * @param mapFrame The frame this action belongs to + */ + public SelectionAction(MapFrame mapFrame, String name, Mode mode, String desc) { + super(name, "selection/"+mode, desc, mapFrame, ImageProvider.getCursor("normal", "selection")); + this.mode = mode; + putValue("help", "Action/Selection/"+Character.toUpperCase(mode.toString().charAt(0))+mode.toString().substring(1)); + this.selectionManager = new SelectionManager(this, false, mapFrame.mapView); + } + + @Override public void enterMode() { + super.enterMode(); + if (mode == Mode.select) + selectionManager.register(Main.map.mapView); + else { + Main.map.mapView.addMouseMotionListener(this); + Main.map.mapView.addMouseListener(this); + for (Segment s : Main.ds.segments) { + addBackReference(s.from, s); + addBackReference(s.to, s); + } + } + } + + private void addBackReference(Node n, Segment s) { + Collection c = reverseSegmentMap.get(n); + if (c == null) { + c = new HashSet(); + reverseSegmentMap.put(n, c); + } + c.add(s); + } + + @Override public void exitMode() { + super.exitMode(); + if (mode == Mode.select) + selectionManager.unregister(Main.map.mapView); + else { + Main.map.mapView.removeMouseMotionListener(this); + Main.map.mapView.removeMouseListener(this); + reverseSegmentMap.clear(); + } + } + + + /** + * Check the state of the keys and buttons and set the selection accordingly. + */ + public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl) { + selectEverythingInRectangle(selectionManager, r, alt, shift, ctrl); + } + + public static void selectEverythingInRectangle(SelectionManager selectionManager, Rectangle r, boolean alt, boolean shift, boolean ctrl) { + if (shift && ctrl) + return; // not allowed together + + Collection curSel; + if (!ctrl && !shift) + curSel = new LinkedList(); // new selection will replace the old. + else + curSel = Main.ds.getSelected(); + + Collection selectionList = selectionManager.getObjectsInRectangle(r,alt); + for (OsmPrimitive osm : selectionList) + if (ctrl) + curSel.remove(osm); + else + curSel.add(osm); + Main.ds.setSelected(curSel); + Main.map.mapView.repaint(); + } + + @Override public void mouseDragged(MouseEvent e) { + Node old = lastEnd; + lastEnd = Main.map.mapView.getNearestNode(e.getPoint()); + if (straightStart == null) + straightStart = lastEnd; + if (straightStart != null && lastEnd != null && straightStart != lastEnd && old != lastEnd) { + Collection path = new HashSet(); + Collection sel = new HashSet(); + path.add(straightStart); + calculateShortestPath(path, straightStart, lastEnd); + if ((e.getModifiers() & MouseEvent.CTRL_MASK) != 0) { + sel.addAll(oldSelection); + sel.removeAll(path); + } else if ((e.getModifiers() & MouseEvent.SHIFT_MASK) != 0) { + sel = path; + sel.addAll(oldSelection); + } else + sel = path; + Main.ds.setSelected(sel); + } + } + + @Override public void mousePressed(MouseEvent e) { + straightStart = Main.map.mapView.getNearestNode(e.getPoint()); + lastEnd = null; + oldSelection = Main.ds.getSelected(); + } + + @Override public void mouseReleased(MouseEvent e) { + straightStart = null; + lastEnd = null; + oldSelection = null; + } + + /** + * Get the shortest path by stepping through the node with a common segment with start + * and nearest to the end (greedy algorithm). + */ + private void calculateShortestPath(Collection path, Node start, Node end) { + for (Node pivot = start; pivot != null;) + pivot = addNearest(path, pivot, end); + } + + private Node addNearest(Collection path, Node start, Node end) { + Collection c = reverseSegmentMap.get(start); + if (c == null) + return null; // start may be a waypoint without segments + double min = Double.MAX_VALUE; + Node next = null; + Segment seg = null; + for (Segment s : c) { + Node other = s.from == start ? s.to : s.from; + if (other == end) { + next = other; + seg = s; + min = 0; + break; + } + double distance = other.eastNorth.distance(end.eastNorth); + if (distance < min) { + min = distance; + next = other; + seg = s; + } + } + if (min < start.eastNorth.distance(end.eastNorth) && next != null) { + path.add(next); + path.add(seg); + return next; + } + return null; + } +} Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (revision 321) @@ -0,0 +1,72 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions.mapmode; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Rectangle; +import java.awt.event.KeyEvent; + +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.gui.MapView; +import org.openstreetmap.josm.gui.SelectionManager; +import org.openstreetmap.josm.gui.SelectionManager.SelectionEnded; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * Enable the zoom mode within the MapFrame. + * + * Holding down the left mouse button select a rectangle with the same aspect + * ratio than the current map view. + * Holding down left and right let the user move the former selected rectangle. + * Releasing the left button zoom to the selection. + * + * Rectangle selections with either height or width smaller than 3 pixels + * are ignored. + * + * @author imi + */ +public class ZoomAction extends MapMode implements SelectionEnded { + + /** + * Shortcut to the mapview. + */ + private final MapView mv; + /** + * Manager that manages the selection rectangle with the aspect ratio of the + * MapView. + */ + private final SelectionManager selectionManager; + + + /** + * Construct a ZoomAction without a label. + * @param mapFrame The MapFrame, whose zoom mode should be enabled. + */ + public ZoomAction(MapFrame mapFrame) { + super(tr("Zoom"), "zoom", tr("Zoom in by dragging. (Ctrl+up,left,down,right,',','.')"), KeyEvent.VK_Z, mapFrame, ImageProvider.getCursor("normal", "zoom")); + mv = mapFrame.mapView; + selectionManager = new SelectionManager(this, true, mv); + } + + /** + * Zoom to the rectangle on the map. + */ + public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl) { + if (r.width >= 3 && r.height >= 3) { + double scale = mv.getScale() * r.getWidth()/mv.getWidth(); + EastNorth newCenter = mv.getEastNorth(r.x+r.width/2, r.y+r.height/2); + mv.zoomTo(newCenter, scale); + } + } + + @Override public void enterMode() { + super.enterMode(); + selectionManager.register(mv); + } + + @Override public void exitMode() { + super.exitMode(); + selectionManager.unregister(mv); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 321) @@ -0,0 +1,102 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions.search; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.util.Collection; + +import javax.swing.ButtonGroup; +import javax.swing.JCheckBox; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JTextField; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.tools.GBC; + +public class SearchAction extends JosmAction { + public static enum SearchMode {replace, add, remove} + + private String lastSearch = ""; + + public SearchAction() { + super(tr("Search"), "dialogs/search", tr("Search for objects."), KeyEvent.VK_F, KeyEvent.CTRL_DOWN_MASK, true); + } + + public void actionPerformed(ActionEvent e) { + if (Main.map == null) { + JOptionPane.showMessageDialog(Main.parent, tr("No data loaded.")); + return; + } + JLabel label = new JLabel(tr("Please enter a search string.")); + final JTextField input = new JTextField(lastSearch); + input.setToolTipText(tr("Fulltext search.
    " + + "
  • Baker Street - 'Baker' and 'Street' in any key or name.
    • " + + "
  • \"Baker Street\" - 'Baker Street' in any key or name.
    • " + + "
  • name:Bak - 'Bak' anywhere in the name.
    • " + + "
  • -name:Bak - not 'Bak' in the name.
    • " + + "
  • foot: - key=foot set to any value." + + "
")); + + JRadioButton replace = new JRadioButton(tr("replace selection"), true); + JRadioButton add = new JRadioButton(tr("add to selection"), false); + JRadioButton remove = new JRadioButton(tr("remove from selection"), false); + ButtonGroup bg = new ButtonGroup(); + bg.add(replace); + bg.add(add); + bg.add(remove); + + JCheckBox caseSensitive = new JCheckBox(tr("case sensitive"), false); + + JPanel p = new JPanel(new GridBagLayout()); + p.add(label, GBC.eop()); + p.add(input, GBC.eop().fill(GBC.HORIZONTAL)); + p.add(replace, GBC.eol()); + p.add(add, GBC.eol()); + p.add(remove, GBC.eop()); + p.add(caseSensitive, GBC.eol()); + JOptionPane pane = new JOptionPane(p, JOptionPane.INFORMATION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null){ + @Override public void selectInitialValue() { + input.requestFocusInWindow(); + input.selectAll(); + } + }; + pane.createDialog(Main.parent,tr("Search")).setVisible(true); + if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue())) + return; + lastSearch = input.getText(); + SearchAction.SearchMode mode = replace.isSelected() ? SearchAction.SearchMode.replace : (add.isSelected() ? SearchAction.SearchMode.add : SearchAction.SearchMode.remove); + search(lastSearch, mode, caseSensitive.isSelected()); + } + + public static void search(String search, SearchMode mode, boolean caseSensitive) { + if (search.startsWith("http://") || search.startsWith("ftp://") || search.startsWith("https://") || search.startsWith("file:/")) { + SelectionWebsiteLoader loader = new SelectionWebsiteLoader(search, mode); + if (loader.url != null) { + Main.worker.execute(loader); + return; + } + } + Collection sel = Main.ds.getSelected(); + SearchCompiler.Match matcher = SearchCompiler.compile(search, caseSensitive); + for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) { + if (mode == SearchMode.replace) { + if (matcher.match(osm)) + sel.add(osm); + else + sel.remove(osm); + } else if (mode == SearchMode.add && !osm.selected && matcher.match(osm)) + sel.add(osm); + else if (mode == SearchMode.remove && osm.selected && matcher.match(osm)) + sel.remove(osm); + } + Main.ds.setSelected(sel); + } +} Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 321) @@ -0,0 +1,299 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.actions.search; + +import java.io.IOException; +import java.io.PushbackReader; +import java.io.StringReader; +import java.util.Map.Entry; + +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Way; + +/** + * Implements a google-like search. + * @author Imi + */ +public class SearchCompiler { + + boolean caseSensitive = false; + + abstract public static class Match { + abstract public boolean match(OsmPrimitive osm); + } + + private static class Always extends Match { + @Override public boolean match(OsmPrimitive osm) { + return true; + } + } + + private static class Not extends Match { + private final Match match; + public Not(Match match) {this.match = match;} + @Override public boolean match(OsmPrimitive osm) { + return !match.match(osm); + } + @Override public String toString() {return "!"+match;} + } + + private static class And extends Match { + private Match lhs; + private Match rhs; + public And(Match lhs, Match rhs) {this.lhs = lhs; this.rhs = rhs;} + @Override public boolean match(OsmPrimitive osm) { + return lhs.match(osm) && rhs.match(osm); + } + @Override public String toString() {return lhs+" && "+rhs;} + } + + private static class Or extends Match { + private Match lhs; + private Match rhs; + public Or(Match lhs, Match rhs) {this.lhs = lhs; this.rhs = rhs;} + @Override public boolean match(OsmPrimitive osm) { + return lhs.match(osm) || rhs.match(osm); + } + @Override public String toString() {return lhs+" || "+rhs;} + } + + private static class Id extends Match { + private long id; + public Id(long id) {this.id = id;} + @Override public boolean match(OsmPrimitive osm) { + return osm.id == id; + } + @Override public String toString() {return "id="+id;} + } + + private class KeyValue extends Match { + private String key; + private String value; + boolean notValue; + public KeyValue(String key, String value, boolean notValue) {this.key = key; this.value = value; this.notValue = notValue;} + @Override public boolean match(OsmPrimitive osm) { + String value = null; + if (key.equals("timestamp")) + value = osm.getTimeStr(); + else + value = osm.get(key); + if (value == null) + return notValue; + String v1 = caseSensitive ? value : value.toLowerCase(); + String v2 = caseSensitive ? this.value : this.value.toLowerCase(); + return (v1.indexOf(v2) != -1) != notValue; + } + @Override public String toString() {return key+"="+(notValue?"!":"")+value;} + } + + private class Any extends Match { + private String s; + public Any(String s) {this.s = s;} + @Override public boolean match(OsmPrimitive osm) { + if (osm.keys == null) + return s.equals(""); + String search = caseSensitive ? s : s.toLowerCase(); + for (Entry e : osm.keys.entrySet()) { + String key = caseSensitive ? e.getKey() : e.getKey().toLowerCase(); + String value = caseSensitive ? e.getValue() : e.getValue().toLowerCase(); + if (key.indexOf(search) != -1 || value.indexOf(search) != -1) + return true; + } + if (osm.user != null) { + String name = osm.user.name; + if (!caseSensitive) + name = name.toLowerCase(); + if (name.indexOf(search) != -1) + return true; + } + return false; + } + @Override public String toString() {return s;} + } + + private static class ExactType extends Match { + private String type; + public ExactType(String type) {this.type = type;} + @Override public boolean match(OsmPrimitive osm) { + if (osm instanceof Node) + return type.equals("node"); + if (osm instanceof Segment) + return type.equals("segment"); + if (osm instanceof Way) + return type.equals("way"); + throw new IllegalStateException("unknown class "+osm.getClass()); + } + @Override public String toString() {return "type="+type;} + } + + private static class Modified extends Match { + @Override public boolean match(OsmPrimitive osm) { + return osm.modified; + } + @Override public String toString() {return "modified";} + } + + private static class Selected extends Match { + @Override public boolean match(OsmPrimitive osm) { + return osm.selected; + } + @Override public String toString() {return "selected";} + } + + private static class Incomplete extends Match { + @Override public boolean match(OsmPrimitive osm) { + return osm instanceof Way && ((Way)osm).isIncomplete(); + } + @Override public String toString() {return "incomplete";} + } + + public static Match compile(String searchStr, boolean caseSensitive) { + SearchCompiler searchCompiler = new SearchCompiler(); + searchCompiler.caseSensitive = caseSensitive; + return searchCompiler.parse(new PushbackReader(new StringReader(searchStr))); + } + + + /** + * The token returned is null or starts with an identifier character: + * - for an '-'. This will be the only character + * : for an key. The value is the next token + * | for "OR" + * ' ' for anything else. + * @return The next token in the stream. + */ + private String nextToken(PushbackReader search) { + try { + int next; + char c = ' '; + while (c == ' ' || c == '\t' || c == '\n') { + next = search.read(); + if (next == -1) + return null; + c = (char)next; + } + StringBuilder s; + switch (c) { + case '-': + return "-"; + case '"': + s = new StringBuilder(" "); + for (int nc = search.read(); nc != -1 && nc != '"'; nc = search.read()) + s.append((char)nc); + int nc = search.read(); + if (nc != -1 && (char)nc == ':') + return ":"+s.toString(); + if (nc != -1) + search.unread(nc); + return s.toString(); + default: + s = new StringBuilder(); + for (;;) { + s.append(c); + next = search.read(); + if (next == -1) { + if (s.toString().equals("OR")) + return "|"; + return " "+s.toString(); + } + c = (char)next; + if (c == ' ' || c == '\t' || c == ':' || c == '"') { + if (c == ':') + return ":"+s.toString(); + search.unread(next); + if (s.toString().equals("OR")) + return "|"; + return " "+s.toString(); + } + } + } + } catch (IOException e) { + throw new RuntimeException(e.getMessage(), e); + } + } + + + private boolean notKey = false; + private boolean notValue = false; + private boolean or = false; + private String key = null; + String token = null; + private Match build() { + String value = token.substring(1); + if (key == null) { + Match c = null; + if (value.equals("modified")) + c = new Modified(); + else if (value.equals("incomplete")) + c = new Incomplete(); + else if (value.equals("selected")) + c = new Selected(); + else + c = new Any(value); + return notValue ? new Not(c) : c; + } + Match c; + if (key.equals("type")) + c = new ExactType(value); + else if (key.equals("property")) { + String realKey = "", realValue = value; + int eqPos = value.indexOf("="); + if (eqPos != -1) { + realKey = value.substring(0,eqPos); + realValue = value.substring(eqPos+1); + } + c = new KeyValue(realKey, realValue, notValue); + } else if (key.equals("id")) { + try { + c = new Id(Long.parseLong(value)); + } catch (NumberFormatException x) { + c = new Id(0); + } + if (notValue) + c = new Not(c); + } else + c = new KeyValue(key, value, notValue); + if (notKey) + return new Not(c); + return c; + } + + private Match parse(PushbackReader search) { + Match result = null; + for (token = nextToken(search); token != null; token = nextToken(search)) { + if (token.equals("-")) + notValue = true; + else if (token.equals("|")) { + if (result == null) + continue; + or = true; + notValue = false; + } else if (token.startsWith(":")) { + if (key == null) { + key = token.substring(1); + notKey = notValue; + notValue = false; + } else + key += token.substring(1); + } else { + Match current = build(); + if (result == null) + result = current; + else + result = or ? new Or(result, current) : new And(result, current); + key = null; + notKey = false; + notValue = false; + or = false; + } + } + // if "key:" was the last search + if (key != null) { + token = " "; + Match current = build(); + result = (result == null) ? current : new And(result, current); + } + return result == null ? new Always() : result; + } +} Index: /trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java (revision 321) @@ -0,0 +1,71 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +/** + * + */ +package org.openstreetmap.josm.actions.search; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; +import java.util.Collection; +import java.util.LinkedList; +import java.util.Map; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.PleaseWaitRunnable; +import org.openstreetmap.josm.io.OsmIdReader; +import org.openstreetmap.josm.io.ProgressInputStream; +import org.xml.sax.SAXException; + +public class SelectionWebsiteLoader extends PleaseWaitRunnable { + public final URL url; + public Collection sel; + private final SearchAction.SearchMode mode; + private OsmIdReader idReader = new OsmIdReader(); + public SelectionWebsiteLoader(String urlStr, SearchAction.SearchMode mode) { + super(tr("Load Selection")); + this.mode = mode; + URL u = null; + try {u = new URL(urlStr);} catch (MalformedURLException e) {} + this.url = u; + } + @Override protected void realRun() { + Main.pleaseWaitDlg.currentAction.setText(tr("Contact {0}...", url.getHost())); + sel = mode != SearchAction.SearchMode.remove ? new LinkedList() : Main.ds.allNonDeletedPrimitives(); + try { + URLConnection con = url.openConnection(); + InputStream in = new ProgressInputStream(con, Main.pleaseWaitDlg); + Main.pleaseWaitDlg.currentAction.setText(tr("Downloading...")); + Map ids = idReader.parseIds(in); + for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) { + if (ids.containsKey(osm.id) && osm.getClass().getName().toLowerCase().endsWith(ids.get(osm.id))) { + if (mode == SearchAction.SearchMode.remove) + sel.remove(osm); + else + sel.add(osm); + } + } + } catch (IOException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("Could not read from url: \"{0}\"",url)); + } catch (SAXException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent,tr("Parsing error in url: \"{0}\"",url)); + } + } + @Override protected void cancel() { + sel = null; + idReader.cancel(); + } + @Override protected void finish() { + if (sel != null) + Main.ds.setSelected(sel); + } +} Index: /trunk/src/org/openstreetmap/josm/command/AddCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/AddCommand.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/command/AddCommand.java (revision 321) @@ -0,0 +1,66 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.util.Collection; + +import javax.swing.JLabel; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.MutableTreeNode; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.visitor.AddVisitor; +import org.openstreetmap.josm.data.osm.visitor.DeleteVisitor; +import org.openstreetmap.josm.data.osm.visitor.NameVisitor; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; + +/** + * A command that adds an osm primitive to a dataset. Keys cannot be added this + * way. Use ChangeKeyValueCommand instead. + * + * @author imi + */ +public class AddCommand extends Command { + + /** + * The primitive to add to the dataset. + */ + private final OsmPrimitive osm; + + private DataSet ds; + + /** + * Create the command and specify the element to add. + */ + public AddCommand(OsmPrimitive osm) { + this.osm = osm; + this.ds = Main.main.editLayer().data; + } + + @Override public void executeCommand() { + osm.visit(new AddVisitor(ds)); + } + + @Override public void undoCommand() { + osm.visit(new DeleteVisitor(ds)); + } + + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + added.add(osm); + } + + // faster implementation + @Override public boolean invalidBecauselayerRemoved(Layer oldLayer) { + return oldLayer instanceof OsmDataLayer && ((OsmDataLayer)oldLayer).data == ds; + } + + @Override public MutableTreeNode description() { + NameVisitor v = new NameVisitor(); + osm.visit(v); + return new DefaultMutableTreeNode(new JLabel(tr("Add")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL)); + } +} Index: /trunk/src/org/openstreetmap/josm/command/ChangeCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/ChangeCommand.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/command/ChangeCommand.java (revision 321) @@ -0,0 +1,40 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.util.Collection; + +import javax.swing.JLabel; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.MutableTreeNode; + +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.visitor.NameVisitor; + +public class ChangeCommand extends Command { + + private final OsmPrimitive osm; + private final OsmPrimitive newOsm; + + public ChangeCommand(OsmPrimitive osm, OsmPrimitive newOsm) { + this.osm = osm; + this.newOsm = newOsm; + } + + @Override public void executeCommand() { + super.executeCommand(); + osm.cloneFrom(newOsm); + osm.modified = true; + } + + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + modified.add(osm); + } + + @Override public MutableTreeNode description() { + NameVisitor v = new NameVisitor(); + osm.visit(v); + return new DefaultMutableTreeNode(new JLabel(tr("Change")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL)); + } +} Index: /trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (revision 321) @@ -0,0 +1,84 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +import javax.swing.JLabel; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.MutableTreeNode; + +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.visitor.NameVisitor; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * Command that manipulate the key/value structure of several objects. Manages deletion, + * adding and modify of values and keys. + * + * @author imi + */ +public class ChangePropertyCommand extends Command { + /** + * All primitives, that are affected with this command. + */ + private final List objects; + /** + * The key that is subject to change. + */ + private final String key; + /** + * The key value. If it is null, delete all key references with the given + * key. Else, change the properties of all objects to the given value or create keys of + * those objects that do not have the key yet. + */ + private final String value; + + public ChangePropertyCommand(Collection objects, String key, String value) { + this.objects = new LinkedList(objects); + this.key = key; + this.value = value; + } + + @Override public void executeCommand() { + super.executeCommand(); // save old + if (value == null) { + for (OsmPrimitive osm : objects) { + osm.modified = true; + osm.remove(key); + } + } else { + for (OsmPrimitive osm : objects) { + osm.modified = true; + osm.put(key, value); + } + } + } + + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + modified.addAll(objects); + } + + @Override public MutableTreeNode description() { + String text = value == null ? tr( "Remove \"{0}\" for", key) : tr("Set {0}={1} for",key,value); + if (objects.size() == 1) { + NameVisitor v = new NameVisitor(); + objects.iterator().next().visit(v); + text += " "+tr(v.className)+" "+v.name; + } else + text += " "+objects.size()+" "+trn("object","objects",objects.size()); + DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel(text, ImageProvider.get("data", "key"), JLabel.HORIZONTAL)); + if (objects.size() == 1) + return root; + NameVisitor v = new NameVisitor(); + for (OsmPrimitive osm : objects) { + osm.visit(v); + root.add(new DefaultMutableTreeNode(v.toLabel())); + } + return root; + } +} Index: /trunk/src/org/openstreetmap/josm/command/Command.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/Command.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/command/Command.java (revision 321) @@ -0,0 +1,108 @@ +//License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.command; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Map.Entry; + +import javax.swing.tree.MutableTreeNode; + +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.data.osm.visitor.Visitor; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; + + +/** + * Classes implementing Command modify a dataset in a specific way. A command is + * one atomic action on a specific dataset, such as move or delete. + * + * Remember, that the command must be executable and undoable, even if the + * Main.ds has changed, so the command must save the dataset it operates on + * if necessary. + * + * @author imi + */ +abstract public class Command { + + private static final class CloneVisitor implements Visitor { + public Map orig = new HashMap(); + + public void visit(Node n) { + orig.put(n, new Node(n)); + } + public void visit(Segment s) { + orig.put(s, new Segment(s)); + } + public void visit(Way w) { + orig.put(w, new Way(w)); + } + } + + private CloneVisitor orig; + + /** + * Executes the command on the dataset. This implementation will remember all + * primitives returned by fillModifiedData for restoring them on undo. + */ + public void executeCommand() { + orig = new CloneVisitor(); + Collection all = new HashSet(); + fillModifiedData(all, all, all); + for (OsmPrimitive osm : all) + osm.visit(orig); + } + + /** + * Undoes the command. + * It can be assumed, that all objects are in the same state they were before. + * It can also be assumed that executeCommand was called exactly once before. + * + * This implementation undoes all objects stored by a former call to executeCommand. + */ + public void undoCommand() { + for (Entry e : orig.orig.entrySet()) + e.getKey().cloneFrom(e.getValue()); + } + + + /** + * Called, when a layer has been removed to have the command remove itself from + * any buffer if it is not longer applicable to the dataset (e.g. it was part of + * the removed layer) + */ + public boolean invalidBecauselayerRemoved(Layer oldLayer) { + if (!(oldLayer instanceof OsmDataLayer)) + return false; + HashSet modified = new HashSet(); + fillModifiedData(modified, modified, modified); + if (modified.isEmpty()) + return false; + + HashSet all = new HashSet(((OsmDataLayer)oldLayer).data.allPrimitives()); + for (OsmPrimitive osm : all) + if (all.contains(osm)) + return true; + + return false; + } + + /** + * Fill in the changed data this command operates on. + * Add to the lists, don't clear them. + * + * @param modified The modified primitives + * @param deleted The deleted primitives + * @param added The added primitives + */ + abstract public void fillModifiedData(Collection modified, + Collection deleted, + Collection added); + + abstract public MutableTreeNode description(); +} Index: /trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (revision 321) @@ -0,0 +1,79 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Map.Entry; + +import javax.swing.JLabel; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.MutableTreeNode; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.conflict.ConflictItem; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.ConflictResolver; +import org.openstreetmap.josm.gui.dialogs.ConflictDialog; +import org.openstreetmap.josm.tools.ImageProvider; + +public class ConflictResolveCommand extends Command { + + private final Collection conflicts; + private final Map resolved; + private Map origAllConflicts; + private final ConflictDialog conflictDialog; + + public ConflictResolveCommand(List conflicts, Map resolved) { + this.conflicts = conflicts; + this.resolved = resolved; + conflictDialog = Main.map.conflictDialog; + } + + @Override public void executeCommand() { + super.executeCommand(); + + origAllConflicts = new HashMap(conflictDialog.conflicts); + + Set completed = new HashSet(resolved.keySet()); + for (ConflictItem ci : conflicts) { + for (Entry e : resolved.entrySet()) { + if (ci.resolution == ConflictResolver.Resolution.THEIR) + ci.apply(e.getKey(), e.getValue()); + else if (ci.resolution == ConflictResolver.Resolution.MY) + ci.apply(e.getValue(), e.getKey()); + else if (ci.hasConflict(e.getKey(), e.getValue())) + completed.remove(e.getKey()); + } + } + if (!completed.isEmpty()) { + for (OsmPrimitive k : completed) + conflictDialog.conflicts.remove(k); + conflictDialog.rebuildList(); + } + } + + @Override public void undoCommand() { + super.undoCommand(); + Main.map.conflictDialog.conflicts.clear(); + Main.map.conflictDialog.conflicts.putAll(origAllConflicts); + Main.map.conflictDialog.rebuildList(); + } + + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + modified.addAll(resolved.keySet()); + } + + @Override public MutableTreeNode description() { + int i = 0; + for (ConflictItem c : conflicts) + if (c.resolution != null) + i++; + return new DefaultMutableTreeNode(new JLabel(tr("Resolve {0} conflicts in {1} objects",i,resolved.size()), ImageProvider.get("data", "object"), JLabel.HORIZONTAL)); + } +} Index: /trunk/src/org/openstreetmap/josm/command/DeleteCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 321) @@ -0,0 +1,66 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.util.Collection; + +import javax.swing.JLabel; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.MutableTreeNode; + +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.visitor.NameVisitor; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * A command to delete a number of primitives from the dataset. + * @author imi + */ +public class DeleteCommand extends Command { + + /** + * The primitive that get deleted. + */ + private final Collection data; + + public DeleteCommand(Collection data) { + this.data = data; + } + + @Override public void executeCommand() { + super.executeCommand(); + for (OsmPrimitive osm : data) + osm.delete(true); + } + + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + deleted.addAll(data); + } + + @Override public MutableTreeNode description() { + NameVisitor v = new NameVisitor(); + + if (data.size() == 1) { + data.iterator().next().visit(v); + return new DefaultMutableTreeNode(new JLabel(tr("Delete")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL)); + } + + String cname = null; + for (OsmPrimitive osm : data) { + osm.visit(v); + if (cname == null) + cname = v.className; + else if (!cname.equals(v.className)) + cname = "object"; + } + DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel( + tr("Delete")+" "+data.size()+" "+trn(cname, cname+"s", data.size()), ImageProvider.get("data", cname), JLabel.HORIZONTAL)); + for (OsmPrimitive osm : data) { + osm.visit(v); + root.add(new DefaultMutableTreeNode(v.toLabel())); + } + return root; + } +} Index: /trunk/src/org/openstreetmap/josm/command/MoveCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/MoveCommand.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/command/MoveCommand.java (revision 321) @@ -0,0 +1,123 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + +import javax.swing.JLabel; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.MutableTreeNode; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.visitor.AllNodesVisitor; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * MoveCommand moves a set of OsmPrimitives along the map. It can be moved again + * to collect several MoveCommands into one command. + * + * @author imi + */ +public class MoveCommand extends Command { + /** + * The objects that should be moved. + */ + public Collection objects = new LinkedList(); + /** + * x difference movement. Coordinates are in northern/eastern + */ + private double x; + /** + * y difference movement. Coordinates are in northern/eastern + */ + private double y; + + /** + * Small helper for holding the interesting part of the old data state of the + * objects. + */ + public static class OldState { + LatLon latlon; + EastNorth eastNorth; + boolean modified; + } + + /** + * List of all old states of the objects. + */ + private List oldState = new LinkedList(); + + + public MoveCommand(OsmPrimitive osm, double x, double y) { + this(Collections.singleton(osm), x, y); + } + /** + * Create a MoveCommand and assign the initial object set and movement vector. + */ + public MoveCommand(Collection objects, double x, double y) { + this.x = x; + this.y = y; + this.objects = AllNodesVisitor.getAllNodes(objects); + for (Node n : this.objects) { + OldState os = new OldState(); + os.eastNorth = n.eastNorth; + os.latlon = n.coor; + os.modified = n.modified; + oldState.add(os); + } + } + + /** + * Move the same set of objects again by the specified vector. The vectors + * are added together and so the resulting will be moved to the previous + * vector plus this one. + * + * The move is immediatly executed and any undo will undo both vectors to + * the original position the objects had before first moving. + */ + public void moveAgain(double x, double y) { + for (Node n : objects) { + n.eastNorth = new EastNorth(n.eastNorth.east()+x, n.eastNorth.north()+y); + n.coor = Main.proj.eastNorth2latlon(n.eastNorth); + } + this.x += x; + this.y += y; + } + + @Override public void executeCommand() { + for (Node n : objects) { + n.eastNorth = new EastNorth(n.eastNorth.east()+x, n.eastNorth.north()+y); + n.coor = Main.proj.eastNorth2latlon(n.eastNorth); + n.modified = true; + } + } + + @Override public void undoCommand() { + Iterator it = oldState.iterator(); + for (Node n : objects) { + OldState os = it.next(); + n.eastNorth = os.eastNorth; + n.coor = os.latlon; + n.modified = os.modified; + } + } + + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + for (OsmPrimitive osm : objects) + modified.add(osm); + } + + @Override public MutableTreeNode description() { + return new DefaultMutableTreeNode(new JLabel(tr("Move")+" "+objects.size()+" "+trn("node","nodes",objects.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL)); + } +} Index: /trunk/src/org/openstreetmap/josm/command/RotateCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/RotateCommand.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/command/RotateCommand.java (revision 321) @@ -0,0 +1,136 @@ +package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; + +import javax.swing.JLabel; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.MutableTreeNode; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.visitor.AllNodesVisitor; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * RotateCommand rotates a number of objects around their centre. + * + * @author Frederik Ramm + */ +public class RotateCommand extends Command { + + /** + * The objects to rotate. + */ + public Collection objects = new LinkedList(); + + /** + * pivot point + */ + private Node pivot; + + /** + * angle of rotation starting click to pivot + */ + private double startAngle; + + /** + * computed rotation angle between starting click and current mouse pos + */ + private double rotationAngle; + + /** + * List of all old states of the objects. + */ + private Map oldState = new HashMap(); + + /** + * Creates a RotateCommand. + * Assign the initial object set, compute pivot point and rotation angle. + * Computation of pivot point is done by the same rules that are used in + * the "align nodes in circle" action. + */ + public RotateCommand(Collection objects, EastNorth start, EastNorth end) { + + this.objects = AllNodesVisitor.getAllNodes(objects); + pivot = new Node(new LatLon(0,0)); + + for (Node n : this.objects) { + MoveCommand.OldState os = new MoveCommand.OldState(); + os.eastNorth = n.eastNorth; + os.latlon = n.coor; + os.modified = n.modified; + oldState.put(n, os); + pivot.eastNorth = new EastNorth(pivot.eastNorth.east()+os.eastNorth.east(), pivot.eastNorth.north()+os.eastNorth.north()); + pivot.coor = Main.proj.eastNorth2latlon(pivot.eastNorth); + } + pivot.eastNorth = new EastNorth(pivot.eastNorth.east()/this.objects.size(), pivot.eastNorth.north()/this.objects.size()); + pivot.coor = Main.proj.eastNorth2latlon(pivot.eastNorth); + + rotationAngle = Math.PI/2; + rotateAgain(start, end); + } + + /** + * Rotate the same set of objects again, by the angle between given + * start and end nodes. Internally this is added to the existing + * rotation so a later undo will undo the whole rotation. + */ + public void rotateAgain(EastNorth start, EastNorth end) { + // compute angle + startAngle = Math.atan2(start.east()-pivot.eastNorth.east(), start.north()-pivot.eastNorth.north()); + double endAngle = Math.atan2(end.east()-pivot.eastNorth.east(), end.north()-pivot.eastNorth.north()); + rotationAngle += startAngle - endAngle; + rotateNodes(false); + } + + /** + * Helper for actually rotationg the nodes. + * @param setModified - true if rotated nodes should be flagged "modified" + */ + private void rotateNodes(boolean setModified) { + for (Node n : objects) { + double cosPhi = Math.cos(rotationAngle); + double sinPhi = Math.sin(rotationAngle); + EastNorth oldEastNorth = oldState.get(n).eastNorth; + double x = oldEastNorth.east() - pivot.eastNorth.east(); + double y = oldEastNorth.north() - pivot.eastNorth.north(); + double nx = sinPhi * x + cosPhi * y + pivot.eastNorth.east(); + double ny = -cosPhi * x + sinPhi * y + pivot.eastNorth.north(); + n.eastNorth = new EastNorth(nx, ny); + n.coor = Main.proj.eastNorth2latlon(n.eastNorth); + if (setModified) + n.modified = true; + } + } + + @Override public void executeCommand() { + rotateNodes(true); + } + + @Override public void undoCommand() { + for (Node n : objects) { + MoveCommand.OldState os = oldState.get(n); + n.eastNorth = os.eastNorth; + n.coor = os.latlon; + n.modified = os.modified; + } + } + + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + for (OsmPrimitive osm : objects) + modified.add(osm); + } + + @Override public MutableTreeNode description() { + return new DefaultMutableTreeNode(new JLabel(tr("Rotate")+" "+objects.size()+" "+trn("node","nodes",objects.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL)); + } +} Index: /trunk/src/org/openstreetmap/josm/command/SequenceCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/SequenceCommand.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/command/SequenceCommand.java (revision 321) @@ -0,0 +1,65 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.util.Arrays; +import java.util.Collection; + +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.MutableTreeNode; + +import org.openstreetmap.josm.data.osm.OsmPrimitive; + +/** + * A command consisting of a sequenz of other commands. Executes the other commands + * and undo them in reverse order. + * @author imi + */ +public class SequenceCommand extends Command { + + /** + * The command sequenz to be executed. + */ + private Command[] sequence; + private final String name; + + /** + * Create the command by specifying the list of commands to execute. + * @param sequenz The sequenz that should be executed. + */ + public SequenceCommand(String name, Collection sequenz) { + this.name = name; + this.sequence = new Command[sequenz.size()]; + this.sequence = sequenz.toArray(this.sequence); + } + + /** + * Convinient constructor, if the commands are known at compile time. + */ + public SequenceCommand(String name, Command... sequenz) { + this(name, Arrays.asList(sequenz)); + } + + @Override public void executeCommand() { + for (Command c : sequence) + c.executeCommand(); + } + + @Override public void undoCommand() { + for (int i = sequence.length-1; i >= 0; --i) + sequence[i].undoCommand(); + } + + @Override public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + for (Command c : sequence) + c.fillModifiedData(modified, deleted, added); + } + + @Override public MutableTreeNode description() { + DefaultMutableTreeNode root = new DefaultMutableTreeNode(tr("Sequence")+": "+name); + for (Command c : sequence) + root.add(c.description()); + return root; + } +} Index: /trunk/src/org/openstreetmap/josm/data/Bounds.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Bounds.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/Bounds.java (revision 321) @@ -0,0 +1,61 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data; + +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.projection.Projection; + +/** + * This is a simple data class for "rectangular" areas of the world, given in + * lat/lon min/max values. + * + * Do not confuse this with "Area", which is an OSM-primitive for a vector of nodes, + * describing some area (like a sea). + * + * @author imi + */ +public class Bounds { + /** + * The minimum and maximum coordinates. + */ + public LatLon min, max; + + /** + * Construct bounds out of two points + */ + public Bounds(LatLon min, LatLon max) { + this.min = min; + this.max = max; + } + + /** + * Construct bounds that span the whole world. + */ + public Bounds() { + min = new LatLon(-Projection.MAX_LAT, -Projection.MAX_LON); + max = new LatLon(Projection.MAX_LAT, Projection.MAX_LON); + } + + @Override public String toString() { + return "Bounds["+min.lat()+","+min.lon()+","+max.lat()+","+max.lon()+"]"; + } + + /** + * @return Center of the bounding box. + */ + public LatLon center() { + // not sure, whether this calculation is right.. maybe there is some + // more complex calculation needed to get a center of a spherical + // dimension? + return new LatLon((min.lat()+max.lat())/2, (min.lon()+max.lon())/2); + } + + /** + * Extend the bounds if necessary to include the given point. + */ + public void extend(LatLon ll) { + if (ll.lat() < min.lat() || ll.lon() < min.lon()) + min = new LatLon(Math.min(ll.lat(), min.lat()), Math.min(ll.lon(), min.lon())); + if (ll.lat() > max.lat() || ll.lon() > max.lon()) + max = new LatLon(Math.max(ll.lat(), max.lat()), Math.max(ll.lon(), max.lon())); + } +} Index: /trunk/src/org/openstreetmap/josm/data/DataSetChecker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/DataSetChecker.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/DataSetChecker.java (revision 321) @@ -0,0 +1,43 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data; + +import java.util.HashSet; +import java.util.Set; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; + +public class DataSetChecker { + + public static void check() { + if (Main.map == null) + return; + + Set s = new HashSet(); + for (Layer l : Main.map.mapView.getAllLayers()) { + if (l instanceof OsmDataLayer) { + for (OsmPrimitive osm : ((OsmDataLayer)l).data.allPrimitives()) { + if (s.contains(osm)) { + JOptionPane.showMessageDialog(Main.parent, "cross references"); + return; + } + s.add(osm); + } + } + } + + if (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) { + OsmDataLayer l = (OsmDataLayer)Main.map.mapView.getActiveLayer(); + if (l.data != Main.ds) { + JOptionPane.showMessageDialog(Main.parent, "Main.ds / active layer mismatch"); + return; + } + } + + JOptionPane.showMessageDialog(Main.parent, "working"); + } +} Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 321) @@ -0,0 +1,221 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.Map; +import java.util.SortedMap; +import java.util.StringTokenizer; +import java.util.TreeMap; +import java.util.Map.Entry; + +import org.openstreetmap.josm.Main; + + +/** + * This class holds all preferences for JOSM. + * + * Other classes can register their beloved properties here. All properties will be + * saved upon set-access. + * + * @author imi + */ +public class Preferences { + + public static interface PreferenceChangedListener { + void preferenceChanged(String key, String newValue); + } + + /** + * Class holding one bookmarkentry. + * @author imi + */ + public static class Bookmark { + public String name; + public double[] latlon = new double[4]; // minlat, minlon, maxlat, maxlon + @Override public String toString() { + return name; + } + } + + public final ArrayList listener = new ArrayList(); + + /** + * Map the property name to the property object. + */ + protected final SortedMap properties = new TreeMap(); + + /** + * Return the location of the user defined preferences file + */ + public String getPreferencesDir() { + if (System.getenv("APPDATA") != null) + return System.getenv("APPDATA")+"/JOSM/"; + return System.getProperty("user.home")+"/.josm/"; + } + + /** + * @return A list of all existing directories, where ressources could be stored. + */ + public Collection getAllPossiblePreferenceDirs() { + LinkedList locations = new LinkedList(); + locations.add(Main.pref.getPreferencesDir()); + String s; + if ((s = System.getenv("JOSM_RESOURCES")) != null) { + if (!s.endsWith("/") && !s.endsWith("\\")) + s = s + "/"; + locations.add(s); + } + if ((s = System.getProperty("josm.resources")) != null) { + if (!s.endsWith("/") && !s.endsWith("\\")) + s = s + "/"; + locations.add(s); + } + String appdata = System.getenv("APPDATA"); + if (System.getenv("ALLUSERSPROFILE") != null && appdata != null && appdata.lastIndexOf("\\") != -1) { + appdata = appdata.substring(appdata.lastIndexOf("\\")); + locations.add(System.getenv("ALLUSERSPROFILE")+appdata+"/JOSM/"); + } + locations.add("/usr/local/share/josm/"); + locations.add("/usr/local/lib/josm/"); + locations.add("/usr/share/josm/"); + locations.add("/usr/lib/josm/"); + return locations; + } + + + synchronized public boolean hasKey(final String key) { + return properties.containsKey(key); + } + synchronized public String get(final String key) { + if (!properties.containsKey(key)) + return ""; + return properties.get(key); + } + synchronized public String get(final String key, final String def) { + final String prop = properties.get(key); + if (prop == null || prop.equals("")) + return def; + return prop; + } + synchronized public Map getAllPrefix(final String prefix) { + final Map all = new TreeMap(); + for (final Entry e : properties.entrySet()) + if (e.getKey().startsWith(prefix)) + all.put(e.getKey(), e.getValue()); + return all; + } + synchronized public boolean getBoolean(final String key) { + return getBoolean(key, false); + } + synchronized public boolean getBoolean(final String key, final boolean def) { + return properties.containsKey(key) ? Boolean.parseBoolean(properties.get(key)) : def; + } + + + synchronized public void put(final String key, final String value) { + if (value == null) + properties.remove(key); + else + properties.put(key, value); + save(); + firePreferenceChanged(key, value); + } + synchronized public void put(final String key, final boolean value) { + properties.put(key, Boolean.toString(value)); + save(); + firePreferenceChanged(key, Boolean.toString(value)); + } + + + private final void firePreferenceChanged(final String key, final String value) { + for (final PreferenceChangedListener l : listener) + l.preferenceChanged(key, value); + } + + /** + * Called after every put. In case of a problem, do nothing but output the error + * in log. + */ + protected void save() { + try { + final PrintWriter out = new PrintWriter(new FileWriter(getPreferencesDir() + "preferences"), false); + for (final Entry e : properties.entrySet()) + if (!e.getValue().equals("")) + out.println(e.getKey() + "=" + e.getValue()); + out.close(); + } catch (final IOException e) { + e.printStackTrace(); + // do not message anything, since this can be called from strange + // places. + } + } + + public void load() throws IOException { + properties.clear(); + final BufferedReader in = new BufferedReader(new FileReader(getPreferencesDir()+"preferences")); + int lineNumber = 0; + for (String line = in.readLine(); line != null; line = in.readLine(), lineNumber++) { + final int i = line.indexOf('='); + if (i == -1 || i == 0) + throw new IOException("Malformed config file at line "+lineNumber); + properties.put(line.substring(0,i), line.substring(i+1)); + } + } + + public final void resetToDefault() { + properties.clear(); + properties.put("laf", "javax.swing.plaf.metal.MetalLookAndFeel"); + properties.put("projection", "org.openstreetmap.josm.data.projection.Epsg4326"); + properties.put("propertiesdialog.visible", "true"); + properties.put("osm-server.url", "http://www.openstreetmap.org/api"); + save(); + } + + public Collection loadBookmarks() throws IOException { + File bookmarkFile = new File(getPreferencesDir()+"bookmarks"); + if (!bookmarkFile.exists()) + bookmarkFile.createNewFile(); + BufferedReader in = new BufferedReader(new FileReader(bookmarkFile)); + + Collection bookmarks = new LinkedList(); + for (String line = in.readLine(); line != null; line = in.readLine()) { + StringTokenizer st = new StringTokenizer(line, ","); + if (st.countTokens() < 5) + continue; + Bookmark b = new Bookmark(); + b.name = st.nextToken(); + try { + for (int i = 0; i < b.latlon.length; ++i) + b.latlon[i] = Double.parseDouble(st.nextToken()); + bookmarks.add(b); + } catch (NumberFormatException x) { + // line not parsed + } + } + in.close(); + return bookmarks; + } + + public void saveBookmarks(Collection bookmarks) throws IOException { + File bookmarkFile = new File(Main.pref.getPreferencesDir()+"bookmarks"); + if (!bookmarkFile.exists()) + bookmarkFile.createNewFile(); + PrintWriter out = new PrintWriter(new FileWriter(bookmarkFile)); + for (Bookmark b : bookmarks) { + b.name.replace(',', '_'); + out.print(b.name+","); + for (int i = 0; i < b.latlon.length; ++i) + out.print(b.latlon[i]+(i newSelection); +} Index: /trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 321) @@ -0,0 +1,186 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.Reader; +import java.io.StringReader; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.StringTokenizer; +import java.util.Map.Entry; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.io.OsmConnection; +import org.openstreetmap.josm.io.XmlWriter; +import org.openstreetmap.josm.tools.Base64; +import org.openstreetmap.josm.tools.XmlObjectParser; + +/** + * This class tweak the Preferences class to provide server side preference settings, as example + * used in the applet version. + * + * @author Imi + */ +public class ServerSidePreferences extends Preferences { + + private final Connection connection; + + private class Connection extends OsmConnection { + URL serverUrl; + public Connection(URL serverUrl) { + this.serverUrl = serverUrl; + } + public String download() { + try { + System.out.println("reading preferenced from "+serverUrl); + HttpURLConnection con = (HttpURLConnection)serverUrl.openConnection(); + addAuth(con); + con.connect(); + BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream())); + StringBuilder b = new StringBuilder(); + for (String line = reader.readLine(); line != null; line = reader.readLine()) { + b.append(line); + b.append("\n"); + } + con.disconnect(); + return b.toString(); + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + public void upload(String s) { + try { + URL u = new URL(getPreferencesDir()); + System.out.println("uplaoding preferences to "+u); + HttpURLConnection con = (HttpURLConnection)u.openConnection(); + con.addRequestProperty("Authorization", "Basic "+Base64.encode(get("osm-server.username")+":"+get("osm-server.password"))); + con.setRequestMethod("POST"); + con.setDoOutput(true); + con.connect(); + PrintWriter out = new PrintWriter(new OutputStreamWriter(con.getOutputStream())); + out.println(s); + out.close(); + con.getInputStream().close(); + con.disconnect(); + JOptionPane.showMessageDialog(Main.parent, tr("Preferences stored on {0}", u.getHost())); + } catch (Exception e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("Could not upload preferences. Reason: {0}", e.getMessage())); + } + } + } + + public ServerSidePreferences(URL serverUrl) { + Connection connection = null; + try { + connection = new Connection(new URL(serverUrl+"user/preferences")); + } catch (MalformedURLException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("Could not load preferences from server.")); + } + this.connection = connection; + } + + @Override public String getPreferencesDir() { + return connection.serverUrl.toString(); + } + + /** + * Do nothing on load. Preferences are loaded with download(). + */ + @Override public void load() { + } + + /** + * Do nothing on save. Preferences are uploaded using upload(). + */ + @Override protected void save() { + } + + public static class Prop { + public String key; + public String value; + } + + public void download(String userName, String password) { + resetToDefault(); + if (!properties.containsKey("osm-server.username") && userName != null) + properties.put("osm-server.username", userName); + if (!properties.containsKey("osm-server.password") && password != null) + properties.put("osm-server.password", password); + Reader in = new StringReader(connection.download()); + try { + XmlObjectParser.Uniform parser = new XmlObjectParser.Uniform(in, "tag", Prop.class); + for (Prop p : parser) + properties.put(p.key, p.value); + } catch (RuntimeException e) { + e.printStackTrace(); + } + } + + /** + * Use this instead of save() for the ServerSidePreferences, since uploads + * are costly while save is called often. + * + * This is triggered by an explicit menu option. + */ + public void upload() { + StringBuilder b = new StringBuilder("\n"); + for (Entry p : properties.entrySet()) { + if (p.getKey().equals("osm-server.password")) + continue; // do not upload password. It would get stored in plain! + b.append("\n"); + } + b.append(""); + connection.upload(b.toString()); + } + + @Override public Collection loadBookmarks() { + try { + Collection bookmarks; + BufferedReader in = new BufferedReader(new InputStreamReader(new URL("http://"+connection.serverUrl.getHost()+"/josm/bookmarks").openStream())); + bookmarks = new LinkedList(); + for (String line = in.readLine(); line != null; line = in.readLine()) { + StringTokenizer st = new StringTokenizer(line, ","); + if (st.countTokens() < 5) + continue; + Bookmark b = new Bookmark(); + b.name = st.nextToken(); + try { + for (int i = 0; i < b.latlon.length; ++i) + b.latlon[i] = Double.parseDouble(st.nextToken()); + bookmarks.add(b); + } catch (NumberFormatException x) { + // line not parsed + } + } + in.close(); + return bookmarks; + } catch (MalformedURLException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return Collections.emptyList(); + } + + @Override public void saveBookmarks(Collection bookmarks) { + } +} Index: /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (revision 321) @@ -0,0 +1,113 @@ +//License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data; + +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Stack; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener; +import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener; + +public class UndoRedoHandler implements LayerChangeListener { + + /** + * All commands that were made on the dataset. Don't write from outside! + */ + public final LinkedList commands = new LinkedList(); + /** + * The stack for redoing commands + */ + private final Stack redoCommands = new Stack(); + + public final LinkedList listenerCommands = new LinkedList(); + + + public UndoRedoHandler() { + Layer.listeners.add(this); + } + + + /** + * Execute the command and add it to the intern command queue. + */ + public void add(final Command c) { + c.executeCommand(); + commands.add(c); + redoCommands.clear(); + if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) { + OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer(); + data.setModified(true); + } + fireCommandsChanged(); + } + + /** + * Undoes the last added command. + */ + public void undo() { + if (commands.isEmpty()) + return; + final Command c = commands.removeLast(); + c.undoCommand(); + redoCommands.push(c); + if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) { + OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer(); + data.setModified(data.uploadedModified || !commands.isEmpty()); + fireCommandsChanged(); + } + Main.ds.setSelected(); + } + + /** + * Redoes the last undoed command. + * TODO: This has to be moved to a central place in order to support multiple layers. + */ + public void redo() { + if (redoCommands.isEmpty()) + return; + final Command c = redoCommands.pop(); + c.executeCommand(); + commands.add(c); + if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) { + OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer(); + data.setModified(true); + fireCommandsChanged(); + } + } + + public void fireCommandsChanged() { + for (final CommandQueueListener l : listenerCommands) + l.commandChanged(commands.size(), redoCommands.size()); + } + + public void clean() { + redoCommands.clear(); + commands.clear(); + fireCommandsChanged(); + } + + public void layerRemoved(Layer oldLayer) { + boolean changed = false; + for (Iterator it = commands.iterator(); it.hasNext();) { + if (it.next().invalidBecauselayerRemoved(oldLayer)) { + it.remove(); + changed = true; + } + } + for (Iterator it = redoCommands.iterator(); it.hasNext();) { + if (it.next().invalidBecauselayerRemoved(oldLayer)) { + it.remove(); + changed = true; + } + } + if (changed) + fireCommandsChanged(); + } + + public void layerAdded(Layer newLayer) {} + public void activeLayerChange(Layer oldLayer, Layer newLayer) {} +} Index: /trunk/src/org/openstreetmap/josm/data/conflict/ConflictItem.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/conflict/ConflictItem.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/conflict/ConflictItem.java (revision 321) @@ -0,0 +1,40 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.conflict; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.util.Collection; +import java.util.Map; + +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.ConflictResolver.Resolution; + +public abstract class ConflictItem { + + public String my, their; + public Resolution resolution = null; + + public final void initialize(Map conflicts) { + my = collectStr(conflicts.keySet()); + their = collectStr(conflicts.values()); + } + + abstract public boolean hasConflict(OsmPrimitive key, OsmPrimitive value); + abstract protected String str(OsmPrimitive osm); + abstract public String key(); + abstract public void apply(OsmPrimitive target, OsmPrimitive other); + + protected final String collectStr(Collection c) { + String value = null; + for (OsmPrimitive osm : c) { + String v = str(osm); + if (value == null) + value = v; + else if (!value.equals(v)) { + value = "<"+tr("different")+">"; + break; + } + } + return value == null ? "" : value; + } +} Index: /trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java (revision 321) @@ -0,0 +1,25 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.conflict; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import org.openstreetmap.josm.data.osm.OsmPrimitive; + +public class DeleteConflict extends ConflictItem { + + @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) { + return key.deleted != value.deleted; + } + + @Override public String key() { + return "deleted|"+tr("deleted"); + } + + @Override protected String str(OsmPrimitive osm) { + return osm.deleted ? tr("true") : tr("false"); + } + + @Override public void apply(OsmPrimitive target, OsmPrimitive other) { + target.deleted = other.deleted; + } +} Index: /trunk/src/org/openstreetmap/josm/data/conflict/FromConflict.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/conflict/FromConflict.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/conflict/FromConflict.java (revision 321) @@ -0,0 +1,27 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.conflict; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; + +public class FromConflict extends ConflictItem { + + @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) { + return key instanceof Segment && !((Segment)key).from.equals(((Segment)value).from); + } + + @Override protected String str(OsmPrimitive osm) { + return osm instanceof Segment ? String.valueOf(((Segment)osm).from.id) : null; + } + + @Override public String key() { + return "segment|"+tr("from"); + } + + @Override public void apply(OsmPrimitive target, OsmPrimitive other) { + if (target instanceof Segment) + ((Segment)target).from = ((Segment)other).from; + } +} Index: /trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java (revision 321) @@ -0,0 +1,29 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.conflict; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; + +public class PositionConflict extends ConflictItem { + + @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) { + return key instanceof Node && !((Node)key).coor.equals(((Node)value).coor); + } + + @Override protected String str(OsmPrimitive osm) { + return osm instanceof Node ? ((Node)osm).coor.lat()+", "+((Node)osm).coor.lon() : null; + } + + @Override public String key() { + return "node|"+tr("position"); + } + + @Override public void apply(OsmPrimitive target, OsmPrimitive other) { + if (target instanceof Node) { + ((Node)target).coor = ((Node)other).coor; + ((Node)target).eastNorth = ((Node)other).eastNorth; + } + } +} Index: /trunk/src/org/openstreetmap/josm/data/conflict/PropertyConflict.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/conflict/PropertyConflict.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/conflict/PropertyConflict.java (revision 321) @@ -0,0 +1,31 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.conflict; + +import org.openstreetmap.josm.data.osm.OsmPrimitive; + +public class PropertyConflict extends ConflictItem { + private String key; + + public PropertyConflict(String key) { + this.key = key; + } + + @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) { + String k = key.get(this.key); + String v = value.get(this.key); + return k == null ? v!=null : !k.equals(v); + } + + @Override protected String str(OsmPrimitive osm) { + String v = osm.get(key); + return v == null ? "" : v; + } + + @Override public String key() { + return "key|"+key; + } + + @Override public void apply(OsmPrimitive target, OsmPrimitive other) { + target.put(key, other.get(key)); + } +} Index: /trunk/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java (revision 321) @@ -0,0 +1,35 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.conflict; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Way; + +public class SegmentConflict extends ConflictItem { + + @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) { + return key instanceof Way && !((Way)key).segments.equals(((Way)value).segments); + } + + @Override protected String str(OsmPrimitive osm) { + if (!(osm instanceof Way)) + return null; + String s = ""; + for (Segment ls : ((Way)osm).segments) + s += ls.id + ","; + return s.equals("") ? "<"+tr("none")+">" : s.substring(0, s.length()-1); + } + + @Override public String key() { + return "way|"+tr("segments"); + } + + @Override public void apply(OsmPrimitive target, OsmPrimitive other) { + if (!(target instanceof Way)) + return; + ((Way)target).segments.clear(); + ((Way)target).segments.addAll(((Way)other).segments); + } +} Index: /trunk/src/org/openstreetmap/josm/data/conflict/ToConflict.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/conflict/ToConflict.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/conflict/ToConflict.java (revision 321) @@ -0,0 +1,27 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.conflict; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; + +public class ToConflict extends ConflictItem { + + @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) { + return key instanceof Segment && !((Segment)key).to.equals(((Segment)value).to); + } + + @Override protected String str(OsmPrimitive osm) { + return osm instanceof Segment ? String.valueOf(((Segment)osm).to.id) : null; + } + + @Override public String key() { + return "segment|"+tr("to"); + } + + @Override public void apply(OsmPrimitive target, OsmPrimitive other) { + if (target instanceof Segment) + ((Segment)target).to = ((Segment)other).to; + } +} Index: /trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java (revision 321) @@ -0,0 +1,60 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.coor; + + + + +/** + * Base class of points of both coordinate system. + * + * The variables are default package protected to allow routines in the data package + * to access them directly. + * + * As the class itself is package protected too, it is not visible outside of the data + * package. Routines there should only use LatLon or EastNorth + * + * @author imi + */ +abstract class Coordinate { + + /** + * Either easting or latitude + */ + final double x; + /** + * Either northing or longitude + */ + final double y; + + /** + * Construct the point with latitude / longitude values. + * The x/y values are left uninitialized. + * + * @param lat Latitude of the point. + * @param lon Longitude of the point. + */ + Coordinate(double x, double y) { + this.x = x; + this.y = y; + } + + /** + * Return the squared distance of the northing/easting values between + * this and the argument. + * + * @param other The other point to calculate the distance to. + * @return The square of the distance between this and the other point, + * regarding to the x/y values. + */ + public double distance(Coordinate other) { + return (x-other.x)*(x-other.x)+(y-other.y)*(y-other.y); + } + + @Override public boolean equals(Object obj) { + return obj instanceof Coordinate ? x == ((Coordinate)obj).x && ((Coordinate)obj).y == y : false; + } + + @Override public int hashCode() { + return (int)(x*65536+y*4096); + } +} Index: /trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java (revision 321) @@ -0,0 +1,28 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.coor; + +/** + * Northern, Easting of the projected coordinates. + * + * This class is immutable. + * + * @author Imi + */ +public class EastNorth extends Coordinate { + + public EastNorth(double east, double north) { + super(east,north); + } + + public double east() { + return x; + } + + public double north() { + return y; + } + + @Override public String toString() { + return "EastNorth[e="+x+", n="+y+"]"; + } +} Index: /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 321) @@ -0,0 +1,68 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.coor; + +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.projection.Projection; +import java.text.NumberFormat; + +/** + * LatLon are unprojected latitude / longitude coordinates. + * + * This class is immutable. + * + * @author Imi + */ +public class LatLon extends Coordinate { + + public LatLon(double lat, double lon) { + super(lon, lat); + } + + public double lat() { + return y; + } + + public double lon() { + return x; + } + + /** + * @return true, if the other point has almost the same lat/lon + * values, only differ by no more than 1/Projection.MAX_SERVER_PRECISION. + */ + public boolean equalsEpsilon(LatLon other) { + final double p = 1/Projection.MAX_SERVER_PRECISION; + return Math.abs(lat()-other.lat()) <= p && Math.abs(lon()-other.lon()) <= p; + } + + /** + * @return true, if the coordinate is outside the world, compared + * by using lat/lon. + */ + public boolean isOutSideWorld() { + return lat() < -Projection.MAX_LAT || lat() > Projection.MAX_LAT || + lon() < -Projection.MAX_LON || lon() > Projection.MAX_LON; + } + + /** + * @return true if this is within the given bounding box. + */ + public boolean isWithin(Bounds b) { + return lat() >= b.min.lat() && lat() <= b.max.lat() && lon() > b.min.lon() && lon() < b.max.lon(); + } + + /** + * Returns this lat/lon pair in human-readable format. + * + * @return String in the format "lat=1.23456°, lon=2.34567°" + */ + public String toDisplayString() { + NumberFormat nf = NumberFormat.getInstance(); + nf.setMaximumFractionDigits(5); + return "lat=" + nf.format(lat()) + "°, lon=" + nf.format(lon()) + "°"; + } + + @Override public String toString() { + return "LatLon[lat="+lat()+",lon="+lon()+"]"; + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 321) @@ -0,0 +1,176 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.osm; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; + +import org.openstreetmap.josm.data.SelectionChangedListener; + +/** + * DataSet is the data behind the application. It can consists of only a few + * points up to the whole osm database. DataSet's can be merged together, + * saved, (up/down/disk)loaded etc. + * + * Note, that DataSet is not an osm-primitive and so has no key association + * but a few members to store some information. + * + * @author imi + */ +public class DataSet implements Cloneable { + + /** + * All nodes goes here, even when included in other data (ways etc). + * This enables the instant conversion of the whole DataSet by iterating over + * this data structure. + */ + public Collection nodes = new LinkedList(); + + /** + * All segments goes here, even when they are in a way. + */ + public Collection segments = new LinkedList(); + + /** + * All ways (Streets etc.) in the DataSet. + * + * The nodes of the way segments of this way must be objects from + * the nodes list, however the way segments are stored only in the + * way list. + */ + public Collection ways = new LinkedList(); + + /** + * All data sources of this DataSet. + */ + public Collection dataSources = new LinkedList(); + + /** + * A list of listeners to selection changed events. The list is static, + * as listeners register themself for any dataset selection changes that + * occour, regardless of the current active dataset. (However, the + * selection does only change in the active layer) + */ + public static Collection listeners = new LinkedList(); + + /** + * @return A collection containing all primitives of the dataset. The + * data is ordered after: first comes nodes, then segments, then ways. + * Ordering in between the categories is not guaranteed. + */ + public List allPrimitives() { + List o = new LinkedList(); + o.addAll(nodes); + o.addAll(segments); + o.addAll(ways); + return o; + } + + /** + * @return A collection containing all not-deleted primitives (except keys). + */ + public Collection allNonDeletedPrimitives() { + Collection o = new LinkedList(); + for (OsmPrimitive osm : allPrimitives()) + if (!osm.deleted) + o.add(osm); + return o; + } + + /** + * Remove the selection of the whole dataset. + * @deprecated Use setSelected() instead. + */ + @Deprecated + public void clearSelection() { + clearSelection(nodes); + clearSelection(segments); + clearSelection(ways); + Collection sel = Collections.emptyList(); + fireSelectionChanged(sel); + } + + /** + * Return a list of all selected objects. Even keys are returned. + * @return List of all selected objects. + */ + public Collection getSelected() { + Collection sel = getSelected(nodes); + sel.addAll(getSelected(segments)); + sel.addAll(getSelected(ways)); + return sel; + } + + public void setSelected(Collection selection) { + clearSelection(nodes); + clearSelection(segments); + clearSelection(ways); + for (OsmPrimitive osm : selection) + osm.selected = true; + fireSelectionChanged(selection); + } + + public void setSelected(OsmPrimitive... osm) { + if (osm.length == 1 && osm[0] == null) { + setSelected(); + return; + } + clearSelection(nodes); + clearSelection(segments); + clearSelection(ways); + for (OsmPrimitive o : osm) + if (o != null) + o.selected = true; + fireSelectionChanged(Arrays.asList(osm)); + } + + /** + * Remove the selection from every value in the collection. + * @param list The collection to remove the selection from. + */ + private void clearSelection(Collection list) { + if (list == null) + return; + for (OsmPrimitive osm : list) + osm.selected = false; + } + + /** + * Return all selected items in the collection. + * @param list The collection from which the selected items are returned. + */ + private Collection getSelected(Collection list) { + Collection sel = new HashSet(); + if (list == null) + return sel; + for (OsmPrimitive osm : list) + if (osm.selected && !osm.deleted) + sel.add(osm); + return sel; + } + + /** + * Remember to fire an selection changed event. A call to this will not fire + * the event immediately. For more, @see SelectionChangedListener + */ + public static void fireSelectionChanged(Collection sel) { + for (SelectionChangedListener l : listeners) + l.selectionChanged(sel); + } + + @Override public DataSet clone() { + DataSet ds = new DataSet(); + for (Node n : nodes) + ds.nodes.add(new Node(n)); + for (Segment s : segments) + ds.segments.add(new Segment(s)); + for (Way w : ways) + ds.ways.add(new Way(w)); + for (DataSource source : dataSources) + ds.dataSources.add(new DataSource(source.bounds, source.origin)); + return ds; + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/DataSource.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/DataSource.java (revision 321) @@ -0,0 +1,18 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.osm; + +import org.openstreetmap.josm.data.Bounds; + +public class DataSource implements Cloneable { + public final Bounds bounds; + public final String origin; + + public DataSource(Bounds bounds, String origin) { + this.bounds = bounds; + this.origin = origin; + } + + @Override protected Object clone() throws CloneNotSupportedException { + return new DataSource(bounds, origin); + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/Node.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 321) @@ -0,0 +1,53 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.osm; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.osm.visitor.Visitor; + + +/** + * One node data, consisting of one world coordinate waypoint. + * + * @author imi + */ +public final class Node extends OsmPrimitive { + + public LatLon coor; + public volatile EastNorth eastNorth; + + /** + * Create an identical clone of the argument (including the id) + */ + public Node(Node clone) { + cloneFrom(clone); + } + + public Node(LatLon latlon) { + this.coor = latlon; + eastNorth = Main.proj.latlon2eastNorth(latlon); + } + + @Override public void visit(Visitor visitor) { + visitor.visit(this); + } + + @Override public void cloneFrom(OsmPrimitive osm) { + super.cloneFrom(osm); + coor = ((Node)osm).coor; + eastNorth = ((Node)osm).eastNorth; + } + + @Override public String toString() { + return "{Node id="+id+",lat="+coor.lat()+",lon="+coor.lon()+"}"; + } + + @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) { + return osm instanceof Node ? super.realEqual(osm, semanticOnly) && coor.equals(((Node)osm).coor) : false; + } + + public int compareTo(OsmPrimitive o) { + return o instanceof Node ? Long.valueOf(id).compareTo(o.id) : 1; + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 321) @@ -0,0 +1,207 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.osm; + +import java.text.SimpleDateFormat; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; + +import org.openstreetmap.josm.data.osm.visitor.Visitor; + + +/** + * An OSM primitive can be associated with a key/value pair. It can be created, deleted + * and updated within the OSM-Server. + * + * Although OsmPrimitive is designed as a base class, it is not to be meant to subclass + * it by any other than from the package org.openstreetmap.josm.data.osm (thus the + * visibility of the constructor). The available primitives are a fixed set that are given + * by the server environment and not an extendible data stuff. + * + * @author imi + */ +abstract public class OsmPrimitive implements Comparable { + + /** + * The key/value list for this primitive. + */ + public Map keys; + + /** + * Unique identifier in OSM. This is used to reidentify objects in the server. + * An id of 0 means an unknown id. The object has not been uploaded yet to + * know what id it will get. + * + * Do not write to this attribute except you know exactly what you are doing. + * More specific, it is not good to set this to 0 and think the object is now + * new to the server! To create a new object, call the default constructor of + * the respective class. + */ + public long id = 0; + + /** + * true, if the object has been modified since it was loaded from + * the server. In this case, on next upload, this object will be updated. + * Deleted objects are deleted from the server. If the objects are added (id=0), + * the modified is ignored and the object is added to the server. + */ + public boolean modified = false; + + /** + * true, if the object has been deleted. + */ + public boolean deleted = false; + + /** + * Visibility status as specified by the server. The visible attribute was + * introduced with the 0.4 API to be able to communicate deleted objects + * (they will have visible=false). Currently JOSM does never deal with + * these, so this is really for future use only. + */ + public boolean visible = true; + + /** + * User that last modified this primitive, as specified by the server. + * Never changed by JOSM. + */ + public User user = null; + + /** + * true, if the object has been shown. This property is not used + * internally by JOSM, but can be used by plugins that take over the object + * rendering. + */ + public volatile boolean shown = false; + + /** + * If set to true, this object is currently selected. + */ + public volatile boolean selected = false; + + /** + * Time of last modification to this object. This is not set by JOSM but + * read from the server and delivered back to the server unmodified. It is + * used to check against edit conflicts. + */ + public Date timestamp = null; + + /** + * Implementation of the visitor scheme. Subclases have to call the correct + * visitor function. + * @param visitor The visitor from which the visit() function must be called. + */ + abstract public void visit(Visitor visitor); + + public final void delete(boolean deleted) { + this.deleted = deleted; + selected = false; + modified = true; + } + + /** + * Equal, if the id (and class) is equal. If both ids are 0, use the super classes + * equal instead. + * + * An primitive is equal to its incomplete counter part. + */ + @Override public final boolean equals(Object obj) { + if (obj == null || getClass() != obj.getClass() || id == 0 || ((OsmPrimitive)obj).id == 0) + return super.equals(obj); + return id == ((OsmPrimitive)obj).id; + } + + /** + * Return the id plus the class type encoded as hashcode or supers hashcode if id is 0. + * + * An primitive has the same hashcode as its incomplete counter part. + */ + @Override public final int hashCode() { + if (id == 0) + return super.hashCode(); + final int[] ret = new int[1]; + Visitor v = new Visitor(){ + public void visit(Node n) { ret[0] = 1; } + public void visit(Segment s) { ret[0] = 2; } + public void visit(Way w) { ret[0] = 3; } + }; + visit(v); + return id == 0 ? super.hashCode() : (int)(id<<3)+ret[0]; + } + + /** + * Set the given value to the given key + * @param key The key, for which the value is to be set. + * @param value The value for the key. + */ + public final void put(String key, String value) { + if (value == null) + remove(key); + else { + if (keys == null) + keys = new HashMap(); + keys.put(key, value); + } + } + /** + * Remove the given key from the list. + */ + public final void remove(String key) { + if (keys != null) { + keys.remove(key); + if (keys.isEmpty()) + keys = null; + } + } + + public final String get(String key) { + return keys == null ? null : keys.get(key); + } + + public final Collection> entrySet() { + if (keys == null) + return Collections.emptyList(); + return keys.entrySet(); + } + + public final Collection keySet() { + if (keys == null) + return Collections.emptyList(); + return keys.keySet(); + } + + /** + * Get and write all attributes from the parameter. Does not fire any listener, so + * use this only in the data initializing phase + */ + public void cloneFrom(OsmPrimitive osm) { + keys = osm.keys == null ? null : new HashMap(osm.keys); + id = osm.id; + modified = osm.modified; + deleted = osm.deleted; + selected = osm.selected; + timestamp = osm.timestamp; + } + + /** + * Perform an equality compare for all non-volatile fields not only for the id + * but for the whole object (for conflict resolving) + * @param semanticOnly if true, modified flag and timestamp are not compared + */ + public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) { + return + id == osm.id && + (semanticOnly || (modified == osm.modified)) && + deleted == osm.deleted && + (semanticOnly || (timestamp == null ? osm.timestamp==null : timestamp.equals(osm.timestamp))) && + (semanticOnly || (user == null ? osm.user==null : user==osm.user)) && + (semanticOnly || (visible == osm.visible)) && + (keys == null ? osm.keys==null : keys.equals(osm.keys)); + } + + public String getTimeStr() { + return timestamp == null ? null : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(timestamp); + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/Segment.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Segment.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/Segment.java (revision 321) @@ -0,0 +1,93 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.osm; + +import org.openstreetmap.josm.data.osm.visitor.Visitor; + + +/** + * One way segment consisting of a pair of nodes (from/to) + * + * @author imi + */ +public final class Segment extends OsmPrimitive { + + /** + * The starting node of the segment + */ + public Node from; + + /** + * The ending node of the segment + */ + public Node to; + + /** + * If set to true, this object is incomplete, which means only the id + * and type is known (type is the objects instance class) + */ + public boolean incomplete; + + /** + * Create an identical clone of the argument (including the id) + */ + public Segment(Segment clone) { + cloneFrom(clone); + } + + /** + * Create an segment from the given starting and ending node + * @param from Starting node of the segment. + * @param to Ending node of the segment. + */ + public Segment(Node from, Node to) { + this.from = from; + this.to = to; + incomplete = false; + } + + public Segment(long id) { + this.id = id; + incomplete = true; + } + + @Override public void visit(Visitor visitor) { + visitor.visit(this); + } + + /** + * @return true, if the ls occupy + * exactly the same place as this. + */ + public boolean equalPlace(Segment ls) { + if (equals(ls)) + return true; + if (incomplete || ls.incomplete) + return incomplete == ls.incomplete; + return ((from.coor.equals(ls.from.coor) && to.coor.equals(ls.to.coor)) || + (from.coor.equals(ls.to.coor) && to.coor.equals(ls.from.coor))); + } + + @Override public void cloneFrom(OsmPrimitive osm) { + super.cloneFrom(osm); + Segment ls = ((Segment)osm); + from = ls.from; + to = ls.to; + incomplete = ls.incomplete; + } + + @Override public String toString() { + return "{Segment id="+id+" from="+from+" to="+to+"}"; + } + + @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) { + if (!(osm instanceof Segment)) + return super.realEqual(osm, semanticOnly); + if (incomplete) + return super.realEqual(osm, semanticOnly) && ((Segment)osm).incomplete; + return super.realEqual(osm, semanticOnly) && from.equals(((Segment)osm).from) && to.equals(((Segment)osm).to); + } + + public int compareTo(OsmPrimitive o) { + return o instanceof Segment ? Long.valueOf(id).compareTo(o.id) : (o instanceof Node ? -1 : 1); + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/User.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 321) @@ -0,0 +1,38 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.osm; + +import java.util.HashMap; + +/** + * A simple class to keep a list of user names. + * + * Instead of storing user names as strings with every OSM primtive, we store + * a reference to an user object, and make sure that for each username there + * is only one user object. + * + * @author fred + * + */ +public class User { + + /** storage for existing User objects. */ + private static HashMap userMap = new HashMap(); + + /** the username. */ + public String name; + + /** private constructor, only called from get method. */ + private User(String name) { + this.name = name; + } + + /** returns a new or existing User object that represents the given name. */ + public static User get(String name) { + User user = userMap.get(name); + if (user == null) { + user = new User(name); + userMap.put(name, user); + } + return user; + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/Way.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 321) @@ -0,0 +1,60 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.osm; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.openstreetmap.josm.data.osm.visitor.Visitor; + +/** + * One full way, consisting of several way segments chained together. + * + * @author imi + */ +public final class Way extends OsmPrimitive { + + /** + * All way segments in this way + */ + public final List segments = new ArrayList(); + + @Override public void visit(Visitor visitor) { + visitor.visit(this); + } + + /** + * Create an identical clone of the argument (including the id) + */ + public Way(Way clone) { + cloneFrom(clone); + } + + public Way() { + } + + @Override public void cloneFrom(OsmPrimitive osm) { + super.cloneFrom(osm); + segments.clear(); + segments.addAll(((Way)osm).segments); + } + + @Override public String toString() { + return "{Way id="+id+" segments="+Arrays.toString(segments.toArray())+"}"; + } + + @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) { + return osm instanceof Way ? super.realEqual(osm, semanticOnly) && segments.equals(((Way)osm).segments) : false; + } + + public int compareTo(OsmPrimitive o) { + return o instanceof Way ? Long.valueOf(id).compareTo(o.id) : -1; + } + + public boolean isIncomplete() { + for (Segment s : segments) + if (s.incomplete) + return true; + return false; + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java (revision 321) @@ -0,0 +1,35 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +/** + */ +package org.openstreetmap.josm.data.osm.visitor; + +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.Way; + +/** + * Visitor, that adds the visited object to the dataset given at constructor. + * + * Is not capable of adding keys. + * + * @author imi + */ +public class AddVisitor implements Visitor { + + protected final DataSet ds; + + public AddVisitor(DataSet ds) { + this.ds = ds; + } + + public void visit(Node n) { + ds.nodes.add(n); + } + public void visit(Segment s) { + ds.segments.add(s); + } + public void visit(Way w) { + ds.ways.add(w); + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java (revision 321) @@ -0,0 +1,58 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.osm.visitor; + +import java.util.Collection; +import java.util.HashSet; + +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Way; + +/** + * Collect all nodes a specific osm primitive has. + * + * @author imi + */ +public class AllNodesVisitor implements Visitor { + + /** + * The resulting nodes collected so far. + */ + public Collection nodes = new HashSet(); + + /** + * Nodes have only itself as nodes. + */ + public void visit(Node n) { + nodes.add(n); + } + + /** + * Line segments have exactly two nodes: from and to. + */ + public void visit(Segment ls) { + if (!ls.incomplete) { + visit(ls.from); + visit(ls.to); + } + } + + /** + * Ways have all nodes from their segments. + */ + public void visit(Way w) { + for (Segment ls : w.segments) + visit(ls); + } + + /** + * @return All nodes the given primitive has. + */ + public static Collection getAllNodes(Collection osms) { + AllNodesVisitor v = new AllNodesVisitor(); + for (OsmPrimitive osm : osms) + osm.visit(v); + return v.nodes; + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (revision 321) @@ -0,0 +1,58 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.osm.visitor; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.Way; + +/** + * Calculates the total bounding rectangle of a serie of OsmPrimitives, using the + * EastNorth values as reference. + * @author imi + */ +public class BoundingXYVisitor implements Visitor { + + public EastNorth min, max; + + public void visit(Node n) { + visit(n.eastNorth); + } + + public void visit(Segment ls) { + if (!ls.incomplete) { + visit(ls.from); + visit(ls.to); + } + } + + public void visit(Way w) { + for (Segment ls : w.segments) + visit(ls); + } + + public void visit(EastNorth eastNorth) { + if (eastNorth != null) { + if (min == null) + min = eastNorth; + else if (eastNorth.east() < min.east() || eastNorth.north() < min.north()) + min = new EastNorth(Math.min(min.east(), eastNorth.east()), Math.min(min.north(), eastNorth.north())); + + if (max == null) + max = eastNorth; + else if (eastNorth.east() > max.east() || eastNorth.north() > max.north()) + max = new EastNorth(Math.max(max.east(), eastNorth.east()), Math.max(max.north(), eastNorth.north())); + } + } + + /** + * @return The bounding box or null if no coordinates have passed + */ + public Bounds getBounds() { + if (min == null || max == null) + return null; + return new Bounds(Main.proj.eastNorth2latlon(min), Main.proj.eastNorth2latlon(max)); + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (revision 321) @@ -0,0 +1,68 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.osm.visitor; + +import java.util.Collection; +import java.util.HashSet; + +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Way; + +/** + * Helper that collect all segments a node is part of, all ways + * a node or segment is part of and all areas a node is part of. + * + * Deleted objects are not collected. + * + * @author imi + */ +public class CollectBackReferencesVisitor implements Visitor { + + private final DataSet ds; + + /** + * The result list of primitives stored here. + */ + public final Collection data = new HashSet(); + + + /** + * Construct a back reference counter. + * @param ds The dataset to operate on. + */ + public CollectBackReferencesVisitor(DataSet ds) { + this.ds = ds; + } + + public void visit(Node n) { + for (Way w : ds.ways) { + if (w.deleted) + continue; + for (Segment ls : w.segments) { + if (ls.incomplete) + continue; + if (ls.from == n || ls.to == n) { + data.add(w); + break; + } + } + } + for (Segment ls : ds.segments) { + if (ls.deleted || ls.incomplete) + continue; + if (ls.from == n || ls.to == n) + data.add(ls); + } + } + public void visit(Segment ls) { + for (Way w : ds.ways) { + if (w.deleted) + continue; + if (w.segments.contains(ls)) + data.add(w); + } + } + public void visit(Way w) {} +} Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java (revision 321) @@ -0,0 +1,35 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +/** + */ +package org.openstreetmap.josm.data.osm.visitor; + +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.Way; + +/** + * Visitor, that adds the visited object to the dataset given at constructor. + * + * Is not capable of adding keys. + * + * @author imi + */ +public class DeleteVisitor implements Visitor { + + private final DataSet ds; + + public DeleteVisitor(DataSet ds) { + this.ds = ds; + } + + public void visit(Node n) { + ds.nodes.remove(n); + } + public void visit(Segment ls) { + ds.segments.remove(ls); + } + public void visit(Way w) { + ds.ways.remove(w); + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (revision 321) @@ -0,0 +1,363 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.osm.visitor; + +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Map; + +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Way; + +/** + * A visitor that get a data set at construction time and merge every visited object + * into it. + * + * @author imi + */ +public class MergeVisitor implements Visitor { + + /** + * Map from primitives in the database to visited primitives. (Attention: The other way + * round than mergedNodes and mergedSegments) + */ + public Map conflicts = new HashMap(); + + private final DataSet ds; + private final DataSet mergeds; + + /** + * A list of all nodes that got replaced with other nodes. + * Key is the node in the other's dataset and the value is the one that is now + * in ds.nodes instead. + */ + private final Map mergedNodes = new HashMap(); + /** + * A list of all segments that got replaced with others. + * Key is the segment in the other's dataset and the value is the one that is now + * in ds.segments. + */ + private final Map mergedSegments = new HashMap(); + + public MergeVisitor(DataSet ds, DataSet mergeds) { + this.ds = ds; + this.mergeds = mergeds; + } + + /** + * Merge the node if the id matches with any of the internal set or if + * either id is zero, merge if lat/lon matches. + */ + public void visit(Node other) { + if (mergeAfterId(mergedNodes, ds.nodes, other)) + return; + + Node my = null; + for (Node n : ds.nodes) { + if (match(n, other) && ((mergeds == null) || (!mergeds.nodes.contains(n)))) { + my = n; + break; + } + } + if (my == null) + ds.nodes.add(other); + else { + mergedNodes.put(other, my); + mergeCommon(my, other); + if (my.modified && !other.modified) + return; + if (!my.coor.equalsEpsilon(other.coor)) { + my.coor = other.coor; + my.eastNorth = other.eastNorth; + my.modified = other.modified; + } + } + } + + /** + * Merge the segment if id matches or if both nodes are the same (and the + * id is zero of either segment). Nodes are the "same" when they @see match + */ + public void visit(Segment other) { + if (mergeAfterId(mergedSegments, ds.segments, other)) + return; + + Segment my = null; + for (Segment ls : ds.segments) { + if (match(other, ls) && ((mergeds == null) || (!mergeds.segments.contains(ls)))) { + my = ls; + break; + } + } + + if (my == null) + ds.segments.add(other); + else if (my.incomplete && !other.incomplete) { + mergedSegments.put(other, my); + my.cloneFrom(other); + } else if (!other.incomplete) { + mergedSegments.put(other, my); + mergeCommon(my, other); + if (my.modified && !other.modified) + return; + if (!match(my.from, other.from)) { + my.from = other.from; + my.modified = other.modified; + } + if (!match(my.to, other.to)) { + my.to = other.to; + my.modified = other.modified; + } + } + } + + private void cloneFromExceptIncomplete(T myOsm, T otherOsm) { + if (!(myOsm instanceof Way)) + myOsm.cloneFrom(otherOsm); + else { + Way my = (Way)myOsm; + Way other = (Way)otherOsm; + HashMap copy = new HashMap(); + for (Segment s : my.segments) + copy.put(s.id, s); + my.cloneFrom(other); + my.segments.clear(); + for (Segment s : other.segments) { + Segment myS = copy.get(s.id); + if (s.incomplete && myS != null && !myS.incomplete) { + mergedSegments.put(s, myS); + my.segments.add(myS); + } else + my.segments.add(s); + } + } + } + + /** + * Merge the way if id matches or if all segments matches and the + * id is zero of either way. + */ + public void visit(Way other) { + if (mergeAfterId(null, ds.ways, other)) + return; + + Way my = null; + for (Way w : ds.ways) { + if (match(other, w) && ((mergeds == null) || (!mergeds.ways.contains(w)))) { + my = w; + break; + } + } + if (my == null) { + // Add the way and replace any incomplete segments that we already have + ds.ways.add(other); + for (Segment s : other.segments) { + if (s.incomplete) { + for (Segment ourSegment : ds.segments) { + if (ourSegment.id == s.id) { + mergedSegments.put(s, ourSegment); + break; + } + } + } + } + } else { + mergeCommon(my, other); + if (my.modified && !other.modified) + return; + boolean same = true; + Iterator it = other.segments.iterator(); + for (Segment ls : my.segments) { + if (!match(ls, it.next())) + same = false; + } + if (!same) { + HashMap copy = new HashMap(); + for (Segment s : my.segments) + copy.put(s.id, s); + my.segments.clear(); + for (Segment s : other.segments) { + Segment myS = copy.get(s.id); + if (s.incomplete && myS != null && !myS.incomplete) { + mergedSegments.put(s, myS); + my.segments.add(myS); + } else + my.segments.add(s); + } + my.modified = other.modified; + } + } + } + + /** + * Postprocess the dataset and fix all merged references to point to the actual + * data. + */ + public void fixReferences() { + for (Segment s : ds.segments) + fixSegment(s); + for (OsmPrimitive osm : conflicts.values()) + if (osm instanceof Segment) + fixSegment((Segment)osm); + for (Way w : ds.ways) + fixWay(w); + for (OsmPrimitive osm : conflicts.values()) + if (osm instanceof Way) + fixWay((Way)osm); + } + + private void fixWay(Way w) { + boolean replacedSomething = false; + LinkedList newSegments = new LinkedList(); + for (Segment ls : w.segments) { + Segment otherLs = mergedSegments.get(ls); + newSegments.add(otherLs == null ? ls : otherLs); + if (otherLs != null) + replacedSomething = true; + } + if (replacedSomething) { + w.segments.clear(); + w.segments.addAll(newSegments); + } + for (Segment ls : w.segments) + fixSegment(ls); + } + + private void fixSegment(Segment ls) { + + if (mergedNodes.containsKey(ls.from)) + ls.from = mergedNodes.get(ls.from); + + if (mergedNodes.containsKey(ls.to)) + ls.to = mergedNodes.get(ls.to); + + } + + /** + * @return Whether the nodes matches (in sense of "be mergable"). + */ + private boolean match(Node n1, Node n2) { + if (n1.id == 0 || n2.id == 0) + return n1.coor.equalsEpsilon(n2.coor); + return n1.id == n2.id; + } + + /** + * @return Whether the segments matches (in sense of "be mergable"). + */ + private boolean match(Segment ls1, Segment ls2) { + if (ls1.id == ls2.id && ls1.id != 0) + return true; + //if (ls1.id != 0 && ls2.id != 0) + // return false; + if (ls1.incomplete || ls2.incomplete) + return false; + return match(ls1.from, ls2.from) && match(ls1.to, ls2.to); + } + + /** + * @return Whether the ways matches (in sense of "be mergable"). + */ + private boolean match(Way w1, Way w2) { + if (w1.id == 0 || w2.id == 0) { + if (w1.segments.size() != w2.segments.size()) + return false; + Iterator it = w1.segments.iterator(); + for (Segment ls : w2.segments) + if (!match(ls, it.next())) + return false; + return true; + } + return w1.id == w2.id; + } + + /** + * Merge the common parts of an osm primitive. + * @param my The object, the information gets merged into + * @param other The object, the information gets merged from + */ + private void mergeCommon(OsmPrimitive my, OsmPrimitive other) { + if (other.deleted) + my.delete(true); + if (my.id == 0 || !my.modified || other.modified) { + if (my.id == 0 && other.id != 0) { + my.id = other.id; + my.modified = other.modified; // match a new node + } else if (my.id != 0 && other.id != 0 && other.modified) + my.modified = true; + } + if (other.keys == null) + return; + if (my.keySet().containsAll(other.keys.keySet())) + return; + if (my.keys == null) + my.keys = other.keys; + else + my.keys.putAll(other.keys); + + my.modified = true; + } + + /** + * @return true, if no merge is needed or merge is performed already. + */ + private

boolean mergeAfterId(Map merged, Collection

primitives, P other) { + for (P my : primitives) { + Date d1 = my.timestamp == null ? new Date(0) : my.timestamp; + Date d2 = other.timestamp == null ? new Date(0) : other.timestamp; + if (my.realEqual(other, false)) { + if (merged != null) + merged.put(other, my); + return true; // no merge needed. + } + if (my.realEqual(other, true)) { + // they differ in modified/timestamp combination only. Auto-resolve it. + if (merged != null) + merged.put(other, my); + if (d1.before(d2)) { + my.modified = other.modified; + my.timestamp = other.timestamp; + } + return true; // merge done. + } + if (my.id == other.id && my.id != 0) { + if (my instanceof Segment && ((Segment)my).incomplete) + return false; // merge always over an incomplete + if (my.modified && other.modified) { + conflicts.put(my, other); + if (merged != null) + merged.put(other, my); + } else if (!my.modified && !other.modified) { + if (d1.before(d2)) { + cloneFromExceptIncomplete(my, other); + if (merged != null) + merged.put(other, my); + } + } else if (other.modified) { + if (d1.after(d2)) { + conflicts.put(my, other); + if (merged != null) + merged.put(other, my); + } else { + cloneFromExceptIncomplete(my, other); + if (merged != null) + merged.put(other, my); + } + } else if (my.modified) { + if (d2.after(d1)) { + conflicts.put(my, other); + if (merged != null) + merged.put(other, my); + } + } + return true; + } + } + return false; + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (revision 321) @@ -0,0 +1,111 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others + +package org.openstreetmap.josm.data.osm.visitor; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.util.HashSet; +import java.util.Set; + +import javax.swing.Icon; +import javax.swing.JLabel; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * Able to create a name and an icon for each data element. + * + * @author imi + */ +public class NameVisitor implements Visitor { + + /** + * The name of the item class + */ + public String className; + /** + * The name of this item. + */ + public String name; + /** + * The icon of this item. + */ + public Icon icon; + + + /** + * If the segment has a key named "name", its value is displayed. + * Otherwise, if it has "id", this is used. If none of these available, + * "(x1,y1) -> (x2,y2)" is displayed with the nodes coordinates. + */ + public void visit(Segment ls) { + name = ls.get("name"); + if (name == null) { + if (ls.incomplete) + name = ls.id == 0 ? tr("new") : ls.id+" ("+tr("unknown")+")"; + else + name = (ls.id==0?"":ls.id+" ")+"("+ls.from.coor.lat()+","+ls.from.coor.lon()+") -> ("+ls.to.coor.lat()+","+ls.to.coor.lon()+")"; + } + addId(ls); + icon = ImageProvider.get("data", "segment"); + trn("segment", "segments", 0); // no marktrn available + className = "segment"; + } + + /** + * If the node has a name-key or id-key, this is displayed. If not, (lat,lon) + * is displayed. + */ + public void visit(Node n) { + name = n.get("name"); + if (name == null) + name = (n.id==0?"":""+n.id)+" ("+n.coor.lat()+","+n.coor.lon()+")"; + addId(n); + icon = ImageProvider.get("data", "node"); + trn("node", "nodes", 0); // no marktrn available + className = "node"; + } + + /** + * If the way has a name-key or id-key, this is displayed. If not, (x nodes) + * is displayed with x being the number of nodes in the way. + */ + public void visit(Way w) { + name = w.get("name"); + if (name == null) name = w.get("ref"); + if (name == null) { + AllNodesVisitor.getAllNodes(w.segments); + Set nodes = new HashSet(); + for (Segment ls : w.segments) { + if (!ls.incomplete) { + nodes.add(ls.from); + nodes.add(ls.to); + } + } + String what = (w.get("highway") != null) ? "highway " : (w.get("railway") != null) ? "railway " : (w.get("waterway") != null) ? "waterway " : ""; + name = what + trn("{0} node", "{0} nodes", nodes.size(), nodes.size()); + } + if (w.isIncomplete()) + name += " ("+tr("incomplete")+")"; + addId(w); + icon = ImageProvider.get("data", "way"); + trn("way", "ways", 0); // no marktrn available + className = "way"; + } + + public JLabel toLabel() { + return new JLabel(name, icon, JLabel.HORIZONTAL); + } + + + private void addId(OsmPrimitive osm) { + if (Main.pref.getBoolean("osm-primitives.showid")) + name += " (id: "+osm.id+")"; + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (revision 321) @@ -0,0 +1,241 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.osm.visitor; + +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.geom.GeneralPath; +import java.awt.geom.Line2D; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.NavigatableComponent; +import org.openstreetmap.josm.tools.ColorHelper; + +/** + * A visitor that paint a simple scheme of every primitive it visits to a + * previous set graphic environment. + * + * @author imi + */ +public class SimplePaintVisitor implements Visitor { + + public final static Color darkerblue = new Color(0,0,96); + public final static Color darkblue = new Color(0,0,128); + public final static Color darkgreen = new Color(0,128,0); + + /** + * The environment to paint to. + */ + protected Graphics g; + /** + * MapView to get screen coordinates. + */ + protected NavigatableComponent nc; + + public boolean inactive; + + protected static final double PHI = Math.toRadians(20); + + /** + * Preferences + */ + protected Color inactiveColor; + protected Color selectedColor; + protected Color nodeColor; + protected Color segmentColor; + protected Color dfltWayColor; + protected Color incompleteColor; + protected Color backgroundColor; + protected boolean showDirectionArrow; + protected boolean showOrderNumber; + + /** + * Draw subsequent segments of same color as one Path + */ + protected Color currentColor = null; + protected GeneralPath currrentPath = new GeneralPath(); + + public void visitAll(DataSet data) { + inactiveColor = getPreferencesColor("inactive", Color.DARK_GRAY); + selectedColor = getPreferencesColor("selected", Color.WHITE); + nodeColor = getPreferencesColor("node", Color.RED); + segmentColor = getPreferencesColor("segment", darkgreen); + dfltWayColor = getPreferencesColor("way", darkblue); + incompleteColor = getPreferencesColor("incomplete way", darkerblue); + backgroundColor = getPreferencesColor("background", Color.BLACK); + showDirectionArrow = Main.pref.getBoolean("draw.segment.direction"); + showOrderNumber = Main.pref.getBoolean("draw.segment.order_number"); + + for (final OsmPrimitive osm : data.segments) + if (!osm.deleted && !osm.selected) + osm.visit(this); + for (final OsmPrimitive osm : data.ways) + if (!osm.deleted && !osm.selected) + osm.visit(this); + displaySegments(null); // Flush segment cache before nodes + for (final OsmPrimitive osm : data.nodes) + if (!osm.deleted && !osm.selected) + osm.visit(this); + for (final OsmPrimitive osm : data.getSelected()) + if (!osm.deleted) + osm.visit(this); + displaySegments(null); + } + + /** + * Draw a small rectangle. + * White if selected (as always) or red otherwise. + * + * @param n The node to draw. + */ + public void visit(Node n) { + Color color = null; + if (inactive) + color = inactiveColor; + else if (n.selected) + color = selectedColor; + else + color = nodeColor; + drawNode(n, color); + } + + /** + * Draw just a line between the points. + * White if selected (as always) or green otherwise. + */ + public void visit(Segment ls) { + Color color; + if (inactive) + color = inactiveColor; + else if (ls.selected) + color = selectedColor; + else + color = segmentColor; + drawSegment(ls, color, showDirectionArrow); + } + + /** + * Draw a darkblue line for all segments. + * @param w The way to draw. + */ + public void visit(Way w) { + Color wayColor; + if (inactive) + wayColor = inactiveColor; + else { + wayColor = dfltWayColor; + for (Segment ls : w.segments) { + if (ls.incomplete) { + wayColor = incompleteColor; + break; + } + } + } + + int orderNumber = 0; + for (Segment ls : w.segments) { + orderNumber++; + if (!ls.selected) // selected already in good color + drawSegment(ls, w.selected && !inactive ? selectedColor : wayColor, showDirectionArrow); + if (!ls.incomplete && showOrderNumber) + drawOrderNumber(ls, orderNumber); + } + } + + /** + * Draw an number of the order of the segment within the parents way + */ + protected void drawOrderNumber(Segment ls, int orderNumber) { + int strlen = (""+orderNumber).length(); + Point p1 = nc.getPoint(ls.from.eastNorth); + Point p2 = nc.getPoint(ls.to.eastNorth); + int x = (p1.x+p2.x)/2 - 4*strlen; + int y = (p1.y+p2.y)/2 + 4; + + Rectangle screen = g.getClipBounds(); + if (screen.contains(x,y)) { + Color c = g.getColor(); + g.setColor(backgroundColor); + g.fillRect(x-1, y-12, 8*strlen+1, 14); + g.setColor(c); + g.drawString(""+orderNumber, x, y); + } + } + + /** + * Draw the node as small rectangle with the given color. + * + * @param n The node to draw. + * @param color The color of the node. + */ + public void drawNode(Node n, Color color) { + Point p = nc.getPoint(n.eastNorth); + g.setColor(color); + Rectangle screen = g.getClipBounds(); + + if ( screen.contains(p.x, p.y) ) + g.drawRect(p.x-1, p.y-1, 2, 2); + } + + /** + * Draw a line with the given color. + */ + protected void drawSegment(Segment ls, Color col, boolean showDirection) { + if (ls.incomplete) + return; + if (col != currentColor) { + displaySegments(col); + } + + Point p1 = nc.getPoint(ls.from.eastNorth); + Point p2 = nc.getPoint(ls.to.eastNorth); + + Rectangle screen = g.getClipBounds(); + Line2D line = new Line2D.Double(p1.x, p1.y, p2.x, p2.y); + if (screen.contains(p1.x, p1.y, p2.x, p2.y) || screen.intersectsLine(line)) + { + currrentPath.moveTo(p1.x, p1.y); + currrentPath.lineTo(p2.x, p2.y); + + if (showDirection) { + double t = Math.atan2(p2.y-p1.y, p2.x-p1.x) + Math.PI; + currrentPath.lineTo((int)(p2.x + 10*Math.cos(t-PHI)), (int)(p2.y + 10*Math.sin(t-PHI))); + currrentPath.moveTo((int)(p2.x + 10*Math.cos(t+PHI)), (int)(p2.y + 10*Math.sin(t+PHI))); + currrentPath.lineTo(p2.x, p2.y); } + } + } + + protected void displaySegments(Color newColor) { + if (currrentPath != null) { + g.setColor(currentColor); + ((Graphics2D) g).draw(currrentPath); + currrentPath = new GeneralPath(); + currentColor = newColor; + } + } + + public static Color getPreferencesColor(String colName, Color def) { + String colStr = Main.pref.get("color."+colName); + if (colStr.equals("")) { + Main.pref.put("color."+colName, ColorHelper.color2html(def)); + return def; + } + return ColorHelper.html2color(colStr); + } + + + public void setGraphics(Graphics g) { + this.g = g; + } + + public void setNavigatableComponent(NavigatableComponent nc) { + this.nc = nc; + } +} Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java (revision 321) @@ -0,0 +1,18 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.osm.visitor; + +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.Segment; +import org.openstreetmap.josm.data.osm.Way; + +/** + * Implementation of the visitor scheme. Every OsmPrimitive can be visited by + * several different visitors. + * + * @author imi + */ +public interface Visitor { + void visit(Node n); + void visit(Segment s); + void visit(Way w); +} Index: /trunk/src/org/openstreetmap/josm/data/projection/Epsg4326.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/Epsg4326.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/projection/Epsg4326.java (revision 321) @@ -0,0 +1,33 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.projection; + +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.coor.EastNorth; + +/** + * Directly use latitude / longitude values as x/y. + * + * @author imi + */ +public class Epsg4326 implements Projection { + + public EastNorth latlon2eastNorth(LatLon p) { + return new EastNorth(p.lon(), p.lat()); + } + + public LatLon eastNorth2latlon(EastNorth p) { + return new LatLon(p.north(), p.east()); + } + + @Override public String toString() { + return "EPSG:4326"; + } + + public String getCacheDirectoryName() { + return "epsg4326"; + } + + public double scaleFactor() { + return 1.0/360; + } +} Index: /trunk/src/org/openstreetmap/josm/data/projection/Mercator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/Mercator.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/projection/Mercator.java (revision 321) @@ -0,0 +1,41 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.projection; + +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.coor.LatLon; + +/** + * Implement Mercator Projection code, coded after documentation + * from wikipedia. + * + * The center of the mercator projection is always the 0 grad + * coordinate. + * + * @author imi + */ +public class Mercator implements Projection { + + public EastNorth latlon2eastNorth(LatLon p) { + return new EastNorth( + p.lon()*Math.PI/180, + Math.log(Math.tan(Math.PI/4+p.lat()*Math.PI/360))); + } + + public LatLon eastNorth2latlon(EastNorth p) { + return new LatLon( + Math.atan(Math.sinh(p.north()))*180/Math.PI, + p.east()*180/Math.PI); + } + + @Override public String toString() { + return "Mercator"; + } + + public String getCacheDirectoryName() { + return "mercator"; + } + + public double scaleFactor() { + return 1/Math.PI/2; + } +} Index: /trunk/src/org/openstreetmap/josm/data/projection/Projection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/Projection.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/data/projection/Projection.java (revision 321) @@ -0,0 +1,56 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.data.projection; + +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.coor.LatLon; + +/** + * Classes subclass this are able to convert lat/lon values to + * planear screen coordinates. + * + * @author imi + */ +public interface Projection { + + public static final double MAX_LAT = 85.05112877980659; // Mercator squares the world + public static final double MAX_LON = 180; + public static final double MAX_SERVER_PRECISION = 1e12; + + /** + * List of all available Projections. + */ + public static Projection[] allProjections = new Projection[]{ + new Epsg4326(), + new Mercator() + }; + + /** + * Convert from lat/lon to northing/easting. + * + * @param p The geo point to convert. x/y members of the point are filled. + */ + EastNorth latlon2eastNorth(LatLon p); + + /** + * Convert from norting/easting to lat/lon. + * + * @param p The geo point to convert. lat/lon members of the point are filled. + */ + LatLon eastNorth2latlon(EastNorth p); + + /** + * Describe the projection converter in one or two words. + */ + String toString(); + + /** + * Get a filename compatible string (for the cache directory) + */ + String getCacheDirectoryName(); + + /** + * The factor to multiply with an easting coordinate to get from "easting + * units per pixel" to "meters per pixel" + */ + double scaleFactor(); +} Index: /trunk/src/org/openstreetmap/josm/gui/BookmarkList.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/BookmarkList.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/gui/BookmarkList.java (revision 321) @@ -0,0 +1,60 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.gui; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.IOException; +import java.util.Collection; +import java.util.LinkedList; + +import javax.swing.DefaultListModel; +import javax.swing.JList; +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.Preferences; + +/** + * List class that read and save its content from the bookmark file. + * @author imi + */ +public class BookmarkList extends JList { + + /** + * Create a bookmark list as well as the Buttons add and remove. + */ + public BookmarkList() { + setModel(new DefaultListModel()); + load(); + setVisibleRowCount(7); + } + + /** + * Loads the bookmarks from file. + */ + public void load() { + DefaultListModel model = (DefaultListModel)getModel(); + model.removeAllElements(); + try { + for (Preferences.Bookmark b : Main.pref.loadBookmarks()) + model.addElement(b); + } catch (IOException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(Main.parent, tr("Could not read bookmarks.")+"\n"+e.getMessage()); + } + } + + /** + * Save all bookmarks to the preferences file + */ + public void save() { + try { + Collection bookmarks = new LinkedList(); + for (Object o : ((DefaultListModel)getModel()).toArray()) + bookmarks.add((Preferences.Bookmark)o); + Main.pref.saveBookmarks(bookmarks); + } catch (IOException e) { + JOptionPane.showMessageDialog(Main.parent,tr("Could not write bookmark.")+"\n"+e.getMessage()); + } + } +} Index: /trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java (revision 321) @@ -0,0 +1,261 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.gui; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.GridBagLayout; +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.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeSet; +import java.util.Map.Entry; + +import javax.swing.AbstractAction; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.ListSelectionModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import javax.swing.event.TableModelListener; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.TableModel; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.conflict.ConflictItem; +import org.openstreetmap.josm.data.conflict.DeleteConflict; +import org.openstreetmap.josm.data.conflict.FromConflict; +import org.openstreetmap.josm.data.conflict.PositionConflict; +import org.openstreetmap.josm.data.conflict.PropertyConflict; +import org.openstreetmap.josm.data.conflict.SegmentConflict; +import org.openstreetmap.josm.data.conflict.ToConflict; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * A panel which implement the conflict resolving of a set of primitive-pairs. There will be + * three tables in the screen, one for each both sides and one resulting table. The user can + * move items from either one of the sides ("my" and "their") to the resulting table. + * + * @author Imi + */ +public class ConflictResolver extends JPanel { + + public static enum Resolution {MY, THEIR} + + private final class ConflictTableModel implements TableModel { + private final Resolution resolution; + public ConflictTableModel(Resolution resolution) { + this.resolution = resolution; + } + + public int getRowCount() { + return conflicts.size(); + } + + public Object getValueAt(int rowIndex, int columnIndex) { + ConflictItem ci = conflicts.get(rowIndex); + if (columnIndex == 0) + return ci.key(); + Resolution r = resolution == null ? ci.resolution : resolution; + if (r == null) + return "???"; + JLabel l = new JLabel(r == Resolution.MY ? ci.my : ci.their); + if (ci.resolution == resolution && resolution != null) + l.setFont(l.getFont().deriveFont(Font.BOLD)); + return l; + } + + public String getColumnName(int columnIndex) {return columnIndex == 0 ? tr("Key") : tr("Value");} + public int getColumnCount() {return 2;} + public boolean isCellEditable(int row, int column) {return false;} + public Class getColumnClass(int columnIndex) {return Object.class;} + + public void addTableModelListener(TableModelListener l) {} + public void removeTableModelListener(TableModelListener l) {} + public void setValueAt(Object aValue, int rowIndex, int columnIndex) {} + } + + private final class DblClickListener extends MouseAdapter { + private final Resolution resolution; + public DblClickListener(Resolution resolution) { + this.resolution = resolution; + } + @Override public void mouseClicked(MouseEvent e) { + if (e.getClickCount() >= 2) { + int sel = ((JTable)e.getSource()).getSelectedRow(); + if (sel == -1) + return; + ConflictResolver.this.conflicts.get(sel).resolution = resolution; + repaint(); + } + } + } + private final class ResolveAction extends AbstractAction { + private final Resolution resolution; + public ResolveAction(String name, Resolution resolution) { + super(null, ImageProvider.get("dialogs", name)); + this.resolution = resolution; + } + public void actionPerformed(ActionEvent e) { + int sel = myTable.getSelectedRow(); + if (sel == -1) + return; + conflicts.get(sel).resolution = resolution; + if (sel == myTable.getRowCount()-1) + myTable.clearSelection(); + else + myTable.getSelectionModel().setSelectionInterval(sel+1, sel+1); + repaint(); + } + } + + public final List conflicts = new ArrayList(); + + private final ConflictTableModel my = new ConflictTableModel(Resolution.MY); + private final JTable myTable; + private final ConflictTableModel their = new ConflictTableModel(Resolution.THEIR); + private final JTable theirTable; + private final ConflictTableModel resolve = new ConflictTableModel(null); + private final JTable resolveTable; + + + public ConflictResolver(Map conflicts) { + super(new GridBagLayout()); + Collection possibleConflicts = new ArrayList(); + possibleConflicts.add(new DeleteConflict()); + possibleConflicts.add(new PositionConflict()); + possibleConflicts.add(new FromConflict()); + possibleConflicts.add(new ToConflict()); + possibleConflicts.add(new SegmentConflict()); + TreeSet allkeys = new TreeSet(); + for (Entry e : conflicts.entrySet()) { + allkeys.addAll(e.getKey().keySet()); + allkeys.addAll(e.getValue().keySet()); + } + for (String s : allkeys) + possibleConflicts.add(new PropertyConflict(s)); + + for (Entry e : conflicts.entrySet()) { + for (Iterator it = possibleConflicts.iterator(); it.hasNext();) { + ConflictItem ci = it.next(); + if (ci.hasConflict(e.getKey(), e.getValue())) { + ci.initialize(conflicts); + this.conflicts.add(ci); + it.remove(); + } + } + } + + if (this.conflicts.isEmpty()) { + JOptionPane.showMessageDialog(Main.parent, + "The ConflictResolver and the Merger disagree about conflicts in your dataset.\n"+ + "Of course, this is a bug.\n"+ + "The bug is very old, but unfortunatly, Imi (programmer) was not able to catch it.\n"+ + "If you know exactly what bounding boxes you downloaded (bookmarks?) and/or what\n"+ + "files you opened (have them ready?) to display this message again, pretty please\n"+ + "inform Imi at josm@eigenheimstrasse.de about the details.\n"+ + "Thanks."); + //throw new RuntimeException("No conflicts but in conflict list:\n"+Arrays.toString(conflicts.entrySet().toArray())); + } + + // have to initialize the JTables here and not in the declaration, because its constructor + // may access this.conflicts (indirectly) + myTable = new JTable(my); + theirTable = new JTable(their); + resolveTable = new JTable(resolve); + + myTable.setPreferredScrollableViewportSize(new Dimension(250,70)); + theirTable.setPreferredScrollableViewportSize(new Dimension(250,70)); + resolveTable.setPreferredScrollableViewportSize(new Dimension(250,70)); + + TableCellRenderer renderer = new DefaultTableCellRenderer(){ + final Font defFont = new JLabel().getFont(); + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + JLabel c = (JLabel)super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + c.setIcon(null); + c.setFont(defFont); + if (value instanceof JLabel) { + JLabel l = (JLabel)value; + String text = l.getText(); + c.setText(text); + c.setFont(l.getFont()); + if (text.startsWith("") && l.getFont().isBold()) + c.setText(""+""+text.substring(6, text.length()-12)); + } else { + String s = value.toString(); + int i = s.indexOf('|'); + if (i != -1) { + c.setIcon(ImageProvider.get("data", s.substring(0,i))); + c.setText(s.substring(i+1)); + } + } + return c; + } + }; + myTable.setDefaultRenderer(Object.class, renderer); + theirTable.setDefaultRenderer(Object.class, renderer); + resolveTable.setDefaultRenderer(Object.class, renderer); + + myTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + theirTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + resolveTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + ListSelectionListener selListener = new ListSelectionListener(){ + public void valueChanged(ListSelectionEvent e) { + if (((ListSelectionModel)e.getSource()).isSelectionEmpty()) { + myTable.clearSelection(); + theirTable.clearSelection(); + resolveTable.clearSelection(); + } else { + int i = ((ListSelectionModel)e.getSource()).getMinSelectionIndex(); + myTable.scrollRectToVisible(myTable.getCellRect(i, 0, true)); + myTable.getSelectionModel().setSelectionInterval(i, i); + theirTable.scrollRectToVisible(theirTable.getCellRect(i, 0, true)); + theirTable.getSelectionModel().setSelectionInterval(i, i); + resolveTable.scrollRectToVisible(resolveTable.getCellRect(i, 0, true)); + resolveTable.getSelectionModel().setSelectionInterval(i, i); + } + } + }; + myTable.getSelectionModel().addListSelectionListener(selListener); + theirTable.getSelectionModel().addListSelectionListener(selListener); + resolveTable.getSelectionModel().addListSelectionListener(selListener); + myTable.getSelectionModel().setSelectionInterval(0,0); + + myTable.addMouseListener(new DblClickListener(Resolution.MY)); + theirTable.addMouseListener(new DblClickListener(Resolution.THEIR)); + resolveTable.addMouseListener(new DblClickListener(null)); + + add(new JLabel(trn("{0} object has conflicts:","{0} objects have conflicts:",conflicts.size(),conflicts.size())), GBC.eol().insets(0,0,0,10)); + + JPanel p = new JPanel(new GridBagLayout()); + p.add(new JLabel(tr("my version:")), GBC.eol()); + p.add(new JScrollPane(myTable), GBC.eol().fill(GBC.BOTH)); + p.add(new JButton(new ResolveAction("down", Resolution.MY)), GBC.eol().anchor(GBC.CENTER).insets(0,5,0,0)); + add(p, GBC.std().insets(0,0,5,0)); + + p = new JPanel(new GridBagLayout()); + p.add(new JLabel(tr("their version:")), GBC.eol()); + p.add(new JScrollPane(theirTable), GBC.eol().fill(GBC.BOTH)); + p.add(new JButton(new ResolveAction("down", Resolution.THEIR)), GBC.eol().anchor(GBC.CENTER).insets(0,5,0,0)); + add(p, GBC.eop().insets(5,0,0,0)); + + add(new JButton(new ResolveAction("up", null)), GBC.eol().anchor(GBC.CENTER)); + add(new JLabel(tr("resolved version:")), GBC.eol().insets(0,5,0,0)); + add(new JScrollPane(resolveTable), GBC.eol().anchor(GBC.CENTER).fill(GBC.BOTH)); + } +} Index: /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 321) @@ -0,0 +1,93 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.gui; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.JButton; +import javax.swing.JEditorPane; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.event.HyperlinkEvent; +import javax.swing.event.HyperlinkListener; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.OpenBrowser; + +public class GettingStarted extends JPanel implements ActionListener { + + private JPanel panel; + + public class LinkLabel extends JEditorPane implements HyperlinkListener { + private String action; + public LinkLabel(String text, String action) { + this.action = action; + String normalized = text.replaceAll("\\[([^\\]]*)\\]", "$1"); + String link = "

"+text.replaceAll("\\[([^\\]]*)\\]", "$1")+"

"; + setContentType("text/html"); + setText(link); + setToolTipText(normalized); + setEditable(false); + setOpaque(false); + addHyperlinkListener(this); + } + public void hyperlinkUpdate(HyperlinkEvent e) { + if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) + actionPerformed(new ActionEvent(e.getSource(), 0, action)); + } + } + + public GettingStarted() { + super(new GridBagLayout()); + + panel = new JPanel(new GridBagLayout()); + + addGettingStarted(); + addGettingHelp(); + + panel.add(GBC.glue(0,140), GBC.eol()); + add(panel); + } + + public void addGettingStarted() { + addCategory(tr("Getting Started")); + addLine("download",tr("[Download] some data from the OSM server")); + } + + public void addGettingHelp() { + addCategory(tr("Getting Help")); + addLine("help",tr("Open the [online help] (english only)")); + addLine("tutorial",tr("Watch some [tutorial videos]")); + addLine("mailinglist",tr("Join the newbie [mailing list]")); + } + + public void addCategory(String category) { + panel.add(new JLabel("

"+category+"

"), GBC.eop().fill(GBC.HORIZONTAL).insets(0,20,0,0)); + } + + public void addLine(String action, String text) { + JButton button = new JButton(ImageProvider.get("getting_started")); + button.setBorder(null); + button.addActionListener(this); + button.setActionCommand(action); + panel.add(button, GBC.std().insets(40,0,15,0)); + panel.add(new LinkLabel(text,action),GBC.eol()); + } + + + public void actionPerformed(ActionEvent e) { + if (e.getActionCommand().equals("download")) + Main.main.menu.download.actionPerformed(e); + else if (e.getActionCommand().equals("help")) + Main.main.menu.help.actionPerformed(e); + else if (e.getActionCommand().equals("tutorial")) + OpenBrowser.displayUrl("http://josm.openstreetmap.de/wiki/TutorialVideos"); + else if (e.getActionCommand().equals("mailinglist")) + OpenBrowser.displayUrl("mailto:newbies-subscribe@openstreetmap.org?subject=subscribe"); + } +} Index: /trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java (revision 321) @@ -0,0 +1,48 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.gui; + +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + +import javax.swing.Action; +import javax.swing.JToggleButton; + +/** + * Just a toggle button, with smaller border and icon only to display in + * MapFrame toolbars. + * + * @author imi + */ +public class IconToggleButton extends JToggleButton implements PropertyChangeListener { + + public boolean groupbutton; + + /** + * Construct the toggle button with the given action. + */ + public IconToggleButton(Action action) { + super(action); + setText(null); + + Object o = action.getValue(Action.SHORT_DESCRIPTION); + if (o != null) + setToolTipText(o.toString()); + + action.addPropertyChangeListener(this); + + addMouseListener(new MouseAdapter(){ + @Override public void mousePressed(MouseEvent e) { + groupbutton = e.getX() > getWidth()/2 && e.getY() > getHeight()/2; + } + }); + } + + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getPropertyName().equals("active")) { + setSelected((Boolean)evt.getNewValue()); + requestFocusInWindow(); + } + } +} Index: /trunk/src/org/openstreetmap/josm/gui/MainApplet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MainApplet.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/gui/MainApplet.java (revision 321) @@ -0,0 +1,120 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.gui; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; + +import javax.swing.JApplet; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JPasswordField; +import javax.swing.JTextField; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.data.ServerSidePreferences; +import org.openstreetmap.josm.tools.GBC; + +public class MainApplet extends JApplet { + + public static final class UploadPreferencesAction extends JosmAction { + public UploadPreferencesAction() { + super(tr("Upload Preferences"), "upload-preferences", tr("Upload the current preferences to the server"), KeyEvent.VK_U, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK, true); + } + public void actionPerformed(ActionEvent e) { + ((ServerSidePreferences)Main.pref).upload(); + } + } + + private final class MainCaller extends Main { + private MainCaller() { + setContentPane(contentPane); + setJMenuBar(menu); + setBounds(bounds); + } + } + + private final static String[][] paramInfo = { + {"username", tr("string"), tr("Name of the user.")}, + {"password", tr("string"), tr("OSM Password.")}, + {"geometry", tr("string"), tr("Resize the applet to the given geometry (format: WIDTHxHEIGHT)")}, + {"download", tr("string;string;..."), tr("Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a filename")}, + {"downloadgps", tr("string;string;..."), tr("Download each as raw gps. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a filename")}, + {"selection", tr("string;string;..."), tr("Add each to the initial selection. Can be a google-like search string or an url which returns osm-xml")}, + {"reset-preferences", tr("any"),tr("If specified, reset the configuration instead of reading it.")} + }; + + private Map> args = new HashMap>(); + private UploadPreferencesAction uploadPreferences = new UploadPreferencesAction(); + + @Override public String[][] getParameterInfo() { + return paramInfo; + } + + @Override public void init() { + for (String[] s : paramInfo) { + Collection p = readParameter(s[0], args.get(s[0])); + if (p != null) + args.put(s[0], p); + } + if (!args.containsKey("geometry") && getParameter("width") != null && getParameter("height") != null) { + args.put("geometry", Arrays.asList(new String[]{getParameter("width")+"x"+getParameter("height")})); + } + } + + @Override public void start() { + String username = args.containsKey("username") ? args.get("username").iterator().next() : null; + String password = args.containsKey("password") ? args.get("password").iterator().next() : null; + if (username == null || password == null) { + JPanel p = new JPanel(new GridBagLayout()); + p.add(new JLabel(tr("Username")), GBC.std().insets(0,0,20,0)); + JTextField user = new JTextField(username == null ? "" : username); + p.add(user, GBC.eol().fill(GBC.HORIZONTAL)); + p.add(new JLabel(tr("Password")), GBC.std().insets(0,0,20,0)); + JPasswordField pass = new JPasswordField(password == null ? "" : password); + p.add(pass, GBC.eol().fill(GBC.HORIZONTAL)); + JOptionPane.showMessageDialog(null, p); + username = user.getText(); + password = new String(pass.getPassword()); + args.put("password", Arrays.asList(new String[]{password})); + } + + Main.applet = true; + Main.pref = new ServerSidePreferences(getCodeBase()); + ((ServerSidePreferences)Main.pref).download(username, password); + + Main.preConstructorInit(args); + Main.parent = this; + new MainCaller().postConstructorProcessCmdLine(args); + + MainMenu m = Main.main.menu; // shortcut + + // remove offending stuff from JOSM (that would break the SecurityManager) + m.remove(m.fileMenu); + m.editMenu.add(uploadPreferences); + m.open.setEnabled(false); + m.exit.setEnabled(false); + m.save.setEnabled(false); + m.saveAs.setEnabled(false); + m.gpxExport.setEnabled(false); + } + + private Collection readParameter(String s, Collection v) { + String param = getParameter(s); + if (param != null) { + if (v == null) + v = new LinkedList(); + v.addAll(Arrays.asList(param.split(";"))); + } + return v; + } +} Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 321) +++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 321) @@ -0,0 +1,163 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +//Licence: GPL +package org.openstreetmap.josm.gui; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.EventQueue; +import java.awt.Toolkit; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.File; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import javax.swing.JFrame; +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.tools.BugReportExceptionHandler; +/** + * Main window class application. + * + * @author imi + */ +public class MainApplication extends Main { + /** + * Construct an main frame, ready sized and operating. Does not + * display the frame. + */ + public MainApplication(JFrame mainFrame) { + mainFrame.setContentPane(contentPane); + mainFrame.setJMenuBar(menu); + mainFrame.setBounds(bounds); + mainFrame.addWindowListener(new WindowAdapter(){ + @Override public void windowClosing(final WindowEvent arg0) { + if (Main.breakBecauseUnsavedChanges()) + return; + System.exit(0); + } + }); + mainFrame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); + } + + /** + * Main application Startup + */ + @SuppressWarnings("deprecation") + public static void main(final String[] argArray) { + ///////////////////////////////////////////////////////////////////////// + // TO ALL TRANSLATORS + ///////////////////////////////////////////////////////////////////////// + // Do not translate the early strings below until the locale is set up. + // (By the eager loaded plugins) + // + // These strings cannot be translated. That's live. Really. Sorry. + // + // Imi. + ///////////////////////////////////////////////////////////////////////// + + Thread.setDefaultUncaughtExceptionHandler(new BugReportExceptionHandler()); + + // construct argument table + List argList = Arrays.asList(argArray); + final Map> args = new HashMap>(); + for (String arg : argArray) { + if (!arg.startsWith("--")) + arg = "--download="+arg; + int i = arg.indexOf('='); + String key = i == -1 ? arg.substring(2) : arg.substring(2,i); + String value = i == -1 ? "" : arg.substring(i+1); + Collection v = args.get(key); + if (v == null) + v = new LinkedList(); + v.add(value); + args.put(key, v); + } + + // get the preferences. + final File prefDir = new File(Main.pref.getPreferencesDir()); + + // check if preferences directory has moved (TODO: Update code. Remove this after some time) + File oldPrefDir = new File(System.getProperty("user.home")+"/.josm"); + if (!prefDir.isDirectory() && oldPrefDir.isDirectory()) { + if (oldPrefDir.renameTo(prefDir)) { + // do not translate this + JOptionPane.showMessageDialog(null, "The preference directory has been moved to "+prefDir); + } else { + JOptionPane.showMessageDialog(null, "The preference directory location has changed. Please move "+oldPrefDir+" to "+prefDir); + } + } + + if (prefDir.exists() && !prefDir.isDirectory()) { + JOptionPane.showMessageDialog(null, "Cannot open preferences directory: "+Main.pref.getPreferencesDir()); + return; + } + if (!prefDir.exists()) + prefDir.mkdirs(); + try { + if (args.containsKey("reset-preferences")) { + Main.pref.resetToDefault(); + } else { + Main.pref.load(); + } + } catch (final IOException e1) { + e1.printStackTrace(); + JOptionPane.showMessageDialog(null, "Preferences could not be loaded. Writing default preference file to "+pref.getPreferencesDir()+"preferences"); + Main.pref.resetToDefault(); + } + + // load the early plugins + Main.loadPlugins(true); + + if (argList.contains("--help") || argList.contains("-?") || argList.contains("-h")) { + System.out.println(tr("Java OpenStreetMap Editor")+"\n\n"+ + tr("usage")+":\n"+ + "\tjava -jar josm.jar