Index: /applications/editors/josm/plugins/imagery-xml-bounds/.classpath
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/.classpath	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/.classpath	(revision 26776)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_27"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: /applications/editors/josm/plugins/imagery-xml-bounds/.project
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/.project	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/.project	(revision 26776)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>JOSM-Imagery-XML-Bounds</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
Index: /applications/editors/josm/plugins/imagery-xml-bounds/LICENSE-2.0.txt
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/LICENSE-2.0.txt	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/LICENSE-2.0.txt	(revision 26776)
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
Index: /applications/editors/josm/plugins/imagery-xml-bounds/README
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/README	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/README	(revision 26776)
@@ -0,0 +1,17 @@
+README 
+======
+
+Readme for imagery-xml-bounds JOSM plugin
+
+    * Author: Don-vip
+    * License: GPL v3 (see gpl-3.0.txt)
+    
+This plugin allows to generate textual Imagery boundaries in XML format from a multipolygon, compatible with JOSM Maps wiki page.
+
+See http://josm.openstreetmap.de/wiki/Maps
+
+The icon has been created by schollidesign, is licensed under "GPL, CC sa nc, LGPL and many more (copiable and for non commercial use)" and comes from:
+http://schollidesign.deviantart.com/art/Human-O2-Iconset-105344123
+
+The Java sources in net.boplicity.xmleditor have been created by Kees de Kooter, are licensed under Apache License 2.0 (see LICENSE-2.0.txt) and come from:
+http://code.google.com/p/xml-text-editor/ 
Index: /applications/editors/josm/plugins/imagery-xml-bounds/build.xml
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/build.xml	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/build.xml	(revision 26776)
@@ -0,0 +1,237 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<!--
+** This is a template build file for the imagery-xml-bounds plugin.
+**
+** Maintaining versions
+** ====================
+** see README.template
+**
+** Usage
+** =====
+** To build it run
+**
+**    > ant  dist
+**
+** To install the generated plugin locally (in you default plugin directory) run
+**
+**    > ant  install
+**
+** The generated plugin jar is not automatically available in JOSMs plugin configuration
+** dialog. You have to check it in first.
+**
+** Use the ant target 'publish' to check in the plugin and make it available to other
+** JOSM users:
+**    set the properties commit.message and plugin.main.version
+** and run
+**    > ant  publish
+**
+**
+-->
+<project name="imagery-xml-bounds" default="dist" basedir=".">
+    <!-- enter the SVN commit message -->
+    <property name="commit.message" value="Commit message"/>
+    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
+    <property name="plugin.main.version" value="4488"/>
+    <!-- should not be necessary to change the following properties -->
+    <property name="josm" location="../../core/dist/josm-custom.jar"/>
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.src.dir" value="src"/>
+    <!-- this is the directory where the plugin jar is copied to -->
+    <property name="plugin.dist.dir" value="../../dist"/>
+    <property name="ant.build.javac.source" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.6"/>
+    <property name="plugin.dist.dir" value="../../dist"/>
+    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+    <!--
+    **********************************************************
+    ** init - initializes the build
+    **********************************************************
+    -->
+    <target name="init">
+        <mkdir dir="${plugin.build.dir}"/>
+    </target>
+    <!--
+    **********************************************************
+    ** compile - complies the source tree
+    **********************************************************
+    -->
+    <target name="compile" depends="init">
+        <echo message="compiling sources for  ${plugin.jar} ... "/>
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false">
+            <compilerarg value="-Xlint:deprecation"/>
+            <compilerarg value="-Xlint:unchecked"/>
+        </javac>
+    </target>
+    <!--
+    **********************************************************
+    ** dist - creates the plugin jar
+    **********************************************************
+    -->
+    <target name="dist" depends="compile,revision">
+        <echo message="creating ${ant.project.name}.jar ... "/>
+        <copy todir="${plugin.build.dir}/resources">
+            <fileset dir="resources"/>
+        </copy>
+        <copy todir="${plugin.build.dir}/images">
+            <fileset dir="images"/>
+        </copy>
+        <copy todir="${plugin.build.dir}/data">
+            <fileset dir="data"/>
+        </copy>
+        <copy todir="${plugin.build.dir}">
+            <fileset dir=".">
+                <include name="README"/>
+                <include name="LICENSE-2.0.txt"/>
+                <include name="gpl-3.0.txt"/>
+            </fileset>
+        </copy>
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <!--
+            ************************************************
+            ** configure these properties. Most of them will be copied to the plugins
+            ** manifest file. Property values will also show up in the list available
+            ** plugins: http://josm.openstreetmap.de/wiki/Plugins.
+            **
+            ************************************************
+            -->
+            <manifest>
+                <attribute name="Author" value="Don-vip"/>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.imageryxmlbounds.ImageryXmlBoundsPlugin"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Description" value="Generate Imagery XML bounds from a multipolygon"/>
+                <attribute name="fr_Plugin-Description" value="Genere les limites au format XML d'une source d'imagerie a partir d'un multipolygone"/>
+                <attribute name="Plugin-Early" value="false"/>
+                <attribute name="Plugin-Icon" value="images/xml_24.png"/>
+                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugin/Imagery-XML-Bounds"/>
+                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+            </manifest>
+        </jar>
+    </target>
+    <!--
+    **********************************************************
+    ** revision - extracts the current revision number for the
+    **    file build.number and stores it in the XML property
+    **    version.*
+    **********************************************************
+    -->
+    <target name="revision">
+        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION"/>
+    </target>
+    <!--
+    **********************************************************
+    ** clean - clean up the build environment
+    **********************************************************
+    -->
+    <target name="clean">
+        <delete dir="${plugin.build.dir}"/>
+        <delete file="${plugin.jar}"/>
+    </target>
+    <!--
+    **********************************************************
+    ** install - install the plugin in your local JOSM installation
+    **********************************************************
+    -->
+    <target name="install" depends="dist">
+        <property environment="env"/>
+        <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+            <and>
+                <os family="windows"/>
+            </and>
+        </condition>
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+    </target>
+    <!--
+    ************************** Publishing the plugin *********************************** 
+    -->
+    <!--
+    ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+    ** property ${coreversion.info.entry.revision}
+    -->
+    <target name="core-info">
+        <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="../../core"/>
+        </exec>
+        <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+        <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
+        <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+        <delete file="core.info.xml"/>
+    </target>
+    <!-- commits the source tree for this plugin -->
+    <target name="commit-current">
+        <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="commit"/>
+            <arg value="-m '${commit.message}'"/>
+            <arg value="."/>
+        </exec>
+    </target>
+    <!-- updates (svn up) the source tree for this plugin -->
+    <target name="update-current">
+        <echo>Updating plugin source ...</echo>
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="up"/>
+            <arg value="."/>
+        </exec>
+        <echo>Updating ${plugin.jar} ...</echo>
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="up"/>
+            <arg value="../dist/${plugin.jar}"/>
+        </exec>
+    </target>
+    <!-- commits the plugin.jar -->
+    <target name="commit-dist">
+        <echo>
+    ***** Properties of published ${plugin.jar} *****
+    Commit message    : '${commit.message}'                    
+    Plugin-Mainversion: ${plugin.main.version}
+    JOSM build version: ${coreversion.info.entry.revision}
+    Plugin-Version    : ${version.entry.commit.revision}
+    ***** / Properties of published ${plugin.jar} *****                    
+                        
+    Now commiting ${plugin.jar} ...
+    </echo>
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="-m '${commit.message}'"/>
+            <arg value="commit"/>
+            <arg value="${plugin.jar}"/>
+        </exec>
+    </target>
+    <!-- make sure svn is present as a command line tool -->
+    <target name="ensure-svn-present">
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
+            <env key="LANG" value="C"/>
+            <arg value="--version"/>
+        </exec>
+        <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
+            <!-- return code not set at all? Most likely svn isn't installed -->
+            <condition>
+                <not>
+                    <isset property="svn.exit.code"/>
+                </not>
+            </condition>
+        </fail>
+        <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
+            <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
+            <condition>
+                <isfailure code="${svn.exit.code}"/>
+            </condition>
+        </fail>
+    </target>
+    <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
+    </target>
+</project>
Index: /applications/editors/josm/plugins/imagery-xml-bounds/gpl-3.0.txt
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/gpl-3.0.txt	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/gpl-3.0.txt	(revision 26776)
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/net/boplicity/xmleditor/XmlEditorKit.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/net/boplicity/xmleditor/XmlEditorKit.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/net/boplicity/xmleditor/XmlEditorKit.java	(revision 26776)
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2006-2008 Kees de Kooter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.boplicity.xmleditor;
+
+import javax.swing.text.StyledEditorKit;
+import javax.swing.text.ViewFactory;
+
+
+/**
+ * @author kees
+ * @date 12-jan-2006
+ *
+ */
+public class XmlEditorKit extends StyledEditorKit {
+
+    private static final long serialVersionUID = 2969169649596107757L;
+    private ViewFactory xmlViewFactory;
+
+    public XmlEditorKit() {
+        xmlViewFactory = new XmlViewFactory();
+    }
+    
+    @Override
+    public ViewFactory getViewFactory() {
+        return xmlViewFactory;
+    }
+
+    @Override
+    public String getContentType() {
+        return "text/xml";
+    }
+
+    
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/net/boplicity/xmleditor/XmlTextPane.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/net/boplicity/xmleditor/XmlTextPane.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/net/boplicity/xmleditor/XmlTextPane.java	(revision 26776)
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2006-2008 Kees de Kooter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.boplicity.xmleditor;
+
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.swing.JTextPane;
+import javax.swing.text.BadLocationException;
+
+import net.boplicity.xmleditor.XmlEditorKit;
+
+
+/**
+ * JTextPane implementation that can handle xml text. The IndentKeyListener
+ * implements smart indenting.
+ *  
+ * @author kees
+ * @date 27-jan-2006
+ *
+ */
+public class XmlTextPane extends JTextPane {
+
+    private static final long serialVersionUID = 6270183148379328084L;
+    private Logger logger = Logger.getLogger(getClass().getName());
+
+    public XmlTextPane() {
+        
+        // Set editor kit
+        this.setEditorKitForContentType("text/xml", new XmlEditorKit());
+        this.setContentType("text/xml");
+        
+        addKeyListener(new IndentKeyListener());
+    }
+    
+	private class IndentKeyListener implements KeyListener {
+
+		private boolean enterFlag;
+		private final Character NEW_LINE = '\n';
+
+		public void keyPressed(KeyEvent event) {
+			enterFlag = false;
+			if ((event.getKeyCode() == KeyEvent.VK_ENTER)
+					&& (event.getModifiers() == 0)) {
+				if (getSelectionStart() == getSelectionEnd()) {
+					enterFlag = true;
+					event.consume();
+				}
+			}
+		}
+
+		public void keyReleased(KeyEvent event) {
+			if ((event.getKeyCode() == KeyEvent.VK_ENTER)
+					&& (event.getModifiers() == 0)) {
+				if (enterFlag) {
+					event.consume();
+
+					int start, end;
+					String text = getText();
+
+					int caretPosition = getCaretPosition();
+					try {
+						if (text.charAt(caretPosition) == NEW_LINE) {
+							caretPosition--;
+						}
+					} catch (IndexOutOfBoundsException e) {
+					}
+
+					start = text.lastIndexOf(NEW_LINE, caretPosition) + 1;
+					end = start;
+					try {
+						if (text.charAt(start) != NEW_LINE) {
+							while ((end < text.length())
+									&& (Character
+											.isWhitespace(text.charAt(end)))
+									&& (text.charAt(end) != NEW_LINE)) {
+								end++;
+							}
+							if (end > start) {
+								getDocument()
+										.insertString(
+												getCaretPosition(),
+												NEW_LINE
+														+ text.substring(start,
+																end), null);
+							} else {
+								getDocument().insertString(getCaretPosition(),
+										NEW_LINE.toString(), null);
+							}
+						} else {
+							getDocument().insertString(getCaretPosition(),
+									NEW_LINE.toString(), null);
+						}
+					} catch (IndexOutOfBoundsException e) {
+						try {
+							getDocument().insertString(getCaretPosition(),
+									NEW_LINE.toString(), null);
+						} catch (BadLocationException e1) {
+							logger.log(Level.WARNING, e1.toString());
+						}
+					} catch (BadLocationException e) {
+						logger.log(Level.WARNING, e.toString());
+					}
+				}
+			}
+		}
+
+		public void keyTyped(KeyEvent e) {
+		}
+	}
+    
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/net/boplicity/xmleditor/XmlView.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/net/boplicity/xmleditor/XmlView.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/net/boplicity/xmleditor/XmlView.java	(revision 26776)
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2006-2008 Kees de Kooter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.boplicity.xmleditor;
+
+import java.awt.Color;
+import java.awt.Graphics;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
+import javax.swing.text.Element;
+import javax.swing.text.PlainDocument;
+import javax.swing.text.PlainView;
+import javax.swing.text.Segment;
+import javax.swing.text.Utilities;
+
+/**
+ * Thanks: http://groups.google.com/group/de.comp.lang.java/msg/2bbeb016abad270
+ *
+ * IMPORTANT NOTE: regex should contain 1 group.
+ *
+ * Using PlainView here because we don't want line wrapping to occur.
+ *
+ * @author kees
+ * @date 13-jan-2006
+ *
+ */
+public class XmlView extends PlainView {
+
+    private static HashMap<Pattern, Color> patternColors;
+    private static String GENERIC_XML_NAME = "[A-Za-z]+[A-Za-z0-9\\-_]*(:[A-Za-z]+[A-Za-z0-9\\-_]+)?";
+    private static String TAG_PATTERN = "(</?" + GENERIC_XML_NAME + ")";
+    private static String TAG_END_PATTERN = "(>|/>)";
+    private static String TAG_ATTRIBUTE_PATTERN = "(" + GENERIC_XML_NAME + ")\\w*\\=";
+    private static String TAG_ATTRIBUTE_VALUE = "\\w*\\=\\w*(\"[^\"]*\")";
+    private static String TAG_COMMENT = "(<\\!--[\\w ]*-->)";
+    private static String TAG_CDATA = "(<\\!\\[CDATA\\[.*\\]\\]>)";
+
+    static {
+        // NOTE: the order is important!
+        patternColors = new LinkedHashMap<Pattern, Color>();
+        patternColors
+                .put(Pattern.compile(TAG_PATTERN), new Color(63, 127, 127));
+        patternColors.put(Pattern.compile(TAG_CDATA), Color.GRAY);
+        patternColors.put(Pattern.compile(TAG_ATTRIBUTE_PATTERN), new Color(
+                127, 0, 127));
+        patternColors.put(Pattern.compile(TAG_END_PATTERN), new Color(63, 127,
+                127));
+        patternColors.put(Pattern.compile(TAG_ATTRIBUTE_VALUE), new Color(42,
+                0, 255));
+        patternColors.put(Pattern.compile(TAG_COMMENT), Color.BLUE);
+    }
+
+    public XmlView(Element element) {
+
+        super(element);
+
+        // Set tabsize to 4 (instead of the default 8)
+        getDocument().putProperty(PlainDocument.tabSizeAttribute, 4);
+    }
+
+    @Override
+    protected int drawUnselectedText(Graphics graphics, int x, int y, int p0,
+            int p1) throws BadLocationException {
+
+        Document doc = getDocument();
+        String text = doc.getText(p0, p1 - p0);
+
+        Segment segment = getLineBuffer();
+
+        SortedMap<Integer, Integer> startMap = new TreeMap<Integer, Integer>();
+        SortedMap<Integer, Color> colorMap = new TreeMap<Integer, Color>();
+
+        // Match all regexes on this snippet, store positions
+        for (Map.Entry<Pattern, Color> entry : patternColors.entrySet()) {
+
+            Matcher matcher = entry.getKey().matcher(text);
+
+            while (matcher.find()) {
+                startMap.put(matcher.start(1), matcher.end());
+                colorMap.put(matcher.start(1), entry.getValue());
+            }
+        }
+
+        // TODO: check the map for overlapping parts
+
+        int i = 0;
+
+        // Colour the parts
+        for (Map.Entry<Integer, Integer> entry : startMap.entrySet()) {
+            int start = entry.getKey();
+            int end = entry.getValue();
+
+            if (i < start) {
+                graphics.setColor(Color.black);
+                doc.getText(p0 + i, start - i, segment);
+                x = Utilities.drawTabbedText(segment, x, y, graphics, this, i);
+            }
+
+            graphics.setColor(colorMap.get(start));
+            i = end;
+            doc.getText(p0 + start, i - start, segment);
+            x = Utilities.drawTabbedText(segment, x, y, graphics, this, start);
+        }
+
+        // Paint possible remaining text black
+        if (i < text.length()) {
+            graphics.setColor(Color.black);
+            doc.getText(p0 + i, text.length() - i, segment);
+            x = Utilities.drawTabbedText(segment, x, y, graphics, this, i);
+        }
+
+        return x;
+    }
+
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/net/boplicity/xmleditor/XmlViewFactory.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/net/boplicity/xmleditor/XmlViewFactory.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/net/boplicity/xmleditor/XmlViewFactory.java	(revision 26776)
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2006-2008 Kees de Kooter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.boplicity.xmleditor;
+
+import javax.swing.text.Element;
+import javax.swing.text.View;
+import javax.swing.text.ViewFactory;
+
+
+/**
+ * @author kees
+ * @date 13-jan-2006
+ *
+ */
+public class XmlViewFactory extends Object implements ViewFactory {
+
+    /**
+     * @see javax.swing.text.ViewFactory#create(javax.swing.text.Element)
+     */
+    public View create(Element element) {
+
+        return new XmlView(element);
+    }
+
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/ImageryXmlBoundsPlugin.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/ImageryXmlBoundsPlugin.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/ImageryXmlBoundsPlugin.java	(revision 26776)
@@ -0,0 +1,87 @@
+//    JOSM Imagery XML Bounds plugin.
+//    Copyright (C) 2011 Don-vip
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+package org.openstreetmap.josm.plugins.imageryxmlbounds;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.ShowBoundsListAction;
+import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.ShowBoundsPropertiesAction;
+import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.ShowBoundsSelectionAction;
+
+/**
+ * Main class of Imagery XLM bounds plugin.
+ * @author Don-vip
+ * @version 1.0
+ * History:
+ * 2.0 03-Oct-2011 first version
+ */
+public class ImageryXmlBoundsPlugin extends Plugin {
+
+    /**
+     * Action showing bounds of the selected closed ways in Selection dialog 
+     */
+	private final ShowBoundsListAction selectionListAction = new ShowBoundsListAction();
+
+    /**
+     * Action showing bounds of the selected multipolygons in Properties dialog 
+     */
+    private final ShowBoundsPropertiesAction propertiesListAction = new ShowBoundsPropertiesAction();
+    
+	/**
+     * Action showing bounds of the selected multipolygons in Relations dialog
+     */
+	private final ShowBoundsListAction relationListAction = new ShowBoundsListAction();
+
+    /**
+     * Action showing bounds of the current selection
+     */
+	private final ShowBoundsSelectionAction selectionAction = new ShowBoundsSelectionAction();
+	
+	/**
+	 * Initializes the plugin.
+	 * @param info
+	 */
+	public ImageryXmlBoundsPlugin(PluginInformation info) {
+		super(info);
+		// Allow JOSM to import *.imagery.xml files
+		ExtensionFileFilter.importers.add(0, new XmlBoundsImporter());
+        // Allow JOSM to export *.imagery.xml files
+		ExtensionFileFilter.exporters.add(0, new XmlBoundsExporter());
+        // Initialize the selection action
+		DataSet.addSelectionListener(selectionAction);
+		Main.toolbar.register(selectionAction);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openstreetmap.josm.plugins.Plugin#mapFrameInitialized(org.openstreetmap.josm.gui.MapFrame, org.openstreetmap.josm.gui.MapFrame)
+	 */
+	@Override
+	public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+		if (newFrame != null) {
+		    // Initialize dialogs actions only after the main frame is created 
+            newFrame.selectionListDialog.addPopupMenuSeparator();
+            newFrame.selectionListDialog.addPopupMenuAction(selectionListAction);
+            newFrame.propertiesDialog.addMembershipPopupMenuSeparator();
+            newFrame.propertiesDialog.addMembershipPopupMenuAction(propertiesListAction);
+			newFrame.relationListDialog.addPopupMenuSeparator();
+			newFrame.relationListDialog.addPopupMenuAction(relationListAction);
+		}
+	}
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/ValidatingImageryReader.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/ValidatingImageryReader.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/ValidatingImageryReader.java	(revision 26776)
@@ -0,0 +1,40 @@
+/**
+ * 
+ */
+package org.openstreetmap.josm.plugins.imageryxmlbounds;
+
+import java.io.IOException;
+
+import javax.xml.XMLConstants;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+
+import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.io.imagery.ImageryReader;
+import org.xml.sax.SAXException;
+
+/**
+ * An extended Imagery Reader able to validate input against the JOSM Maps XSD.
+ * @author Don-vip
+ *
+ */
+public class ValidatingImageryReader extends ImageryReader implements XmlBoundsConstants {
+
+	public ValidatingImageryReader(String source) throws SAXException, IOException {
+		this(source, true);
+	}
+
+	public ValidatingImageryReader(String source, boolean validateFirst) throws SAXException, IOException {
+		super(source);
+		if (validateFirst) {
+			validate(source);
+		}
+	}
+
+	public static void validate(String source) throws SAXException, IOException {
+        SchemaFactory factory =  SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+        Schema schema = factory.newSchema(new StreamSource(new MirroredInputStream(XML_SCHEMA)));
+        schema.newValidator().validate(new StreamSource(source));
+	}
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsConstants.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsConstants.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsConstants.java	(revision 26776)
@@ -0,0 +1,88 @@
+//    JOSM Imagery XML Bounds plugin.
+//    Copyright (C) 2011 Don-vip
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+package org.openstreetmap.josm.plugins.imageryxmlbounds;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import javax.swing.ImageIcon;
+
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * Main constants of JOSM Imagery XML Bounds plugin.
+ * @author Don-vip
+ *
+ */
+public interface XmlBoundsConstants {
+
+	/**
+	 * Plugin version.
+	 */
+	public static final String PLUGIN_VERSION = "1.0";
+	
+	/**
+	 * XML namespace for JOSM Imagery schema.
+	 */
+	public static final String XML_NAMESPACE = "http://josm.openstreetmap.de/maps-1.0";
+	
+	/**
+	 * XML Schema
+	 */
+	public static final String XML_SCHEMA = "resource://data/maps.xsd";
+	
+	/**
+	 * Prefix used in front of OSM keys.
+	 */
+	public static final String PREFIX = "imagery:";
+	
+	/**
+	 * OSM keys, equivalent to those used in XML schema, but prefixed (except for name).
+	 */
+	public static final String KEY_NAME = "name";
+	public static final String KEY_TYPE = PREFIX + "type";
+	public static final String KEY_URL = PREFIX + "url";
+	public static final String KEY_DEFAULT = PREFIX + "default";
+	public static final String KEY_EULA = PREFIX + "eula";
+	public static final String KEY_ATTR_TEXT = PREFIX + "attribution-text";
+	public static final String KEY_ATTR_URL = PREFIX + "attribution-url";
+	public static final String KEY_TERMS_URL = PREFIX + "terms-of-use-url";
+	public static final String KEY_PROJECTIONS = PREFIX + "projections";
+	public static final String KEY_MAX_ZOOM = PREFIX + "max-zoom";
+	public static final String KEY_MIN_ZOOM = PREFIX + "min-zoom";
+	public static final String KEY_COUNTRY_CODE = PREFIX + "country-code";
+	
+	/**
+	 * File extension.
+	 */
+	public static final String EXTENSION = "imagery.xml";
+	
+	/**
+	 * File encoding.
+	 */
+	public static final String ENCODING = "UTF-8";
+	
+	/**
+	 * File filter used in import/export dialogs.
+	 */
+	public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(EXTENSION, EXTENSION, tr("Imagery XML Files") + " (*."+EXTENSION+")");
+
+	/**
+	 * Plugin icons.
+	 */
+	public static ImageIcon XML_ICON_16 = ImageProvider.get("xml_16.png");
+	public static ImageIcon XML_ICON_24 = ImageProvider.get("xml_24.png");
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsExporter.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsExporter.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsExporter.java	(revision 26776)
@@ -0,0 +1,54 @@
+//    JOSM Imagery XML Bounds plugin.
+//    Copyright (C) 2011 Don-vip
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+package org.openstreetmap.josm.plugins.imageryxmlbounds;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.io.FileExporter;
+import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.ComputeBoundsAction;
+
+/**
+ * @author Don-vip
+ *
+ */
+public class XmlBoundsExporter extends FileExporter implements XmlBoundsConstants {
+
+	public XmlBoundsExporter() {
+		super(FILE_FILTER);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openstreetmap.josm.io.FileExporter#exportData(java.io.File, org.openstreetmap.josm.gui.layer.Layer)
+	 */
+	@Override
+	public void exportData(File file, Layer layer) throws IOException {
+		if (layer instanceof OsmDataLayer) {
+			Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), ENCODING));
+			try {
+				writer.write(new ComputeBoundsAction((OsmDataLayer) layer).getXml());
+			} finally {
+				writer.close();
+			}
+		}
+	}
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsImporter.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsImporter.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsImporter.java	(revision 26776)
@@ -0,0 +1,223 @@
+//    JOSM Imagery XML Bounds plugin.
+//    Copyright (C) 2011 Don-vip
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+package org.openstreetmap.josm.plugins.imageryxmlbounds;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+
+import org.openstreetmap.gui.jmapviewer.Coordinate;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
+import org.openstreetmap.josm.data.imagery.Shape;
+import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.FileImporter;
+import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.io.imagery.ImageryReader;
+import org.xml.sax.SAXException;
+
+/**
+ * @author Don-vip
+ *
+ */
+public class XmlBoundsImporter extends FileImporter implements XmlBoundsConstants {
+
+	public XmlBoundsImporter() {
+		super(FILE_FILTER);
+	}
+
+	public DataSet convertImageryEntries(List<ImageryInfo> entries) {
+		DataSet dataSet = new DataSet();
+		
+		for (ImageryInfo imagery : entries) {
+			if (!imagery.isBlacklisted()) {
+				ImageryBounds bounds = imagery.getBounds();
+				if (bounds != null) {
+					dataSet.addPrimitive(convertImagery(imagery, bounds, dataSet));
+				}
+			}
+		}
+		return dataSet;
+	}
+	
+	private void safePut(OsmPrimitive p, String key, Object value) {
+		if (value != null) {
+			if (value instanceof Collection) {
+				String s = "";
+				for (Object elt : (Collection<?>)value) {
+					if (elt != null && elt.toString() != null && !elt.toString().isEmpty()) {
+						if (!s.isEmpty()) {
+							s += ";";
+						}
+						s += elt.toString();
+					}
+				}
+				if (!s.isEmpty()) {
+					p.put(key, s);
+				}
+			} else if (!value.equals(0) && value.toString() != null && !value.toString().isEmpty()) {
+				p.put(key, value.toString());
+			}
+		}
+	}
+	
+    private Node getNode(LatLon latlon, DataSet dataSet) {
+        List<Node> nodes = dataSet.searchNodes(new BBox(latlon, latlon));
+        if (!nodes.isEmpty()) {
+            return nodes.get(0);
+        } else {
+            Node node = new Node(latlon);
+            dataSet.addPrimitive(node);
+            return node;
+        }
+    }
+
+	private Node getNode(double lat, double lon, DataSet dataSet) {
+	    return getNode(new LatLon(lat, lon), dataSet);
+	}
+	
+	private void ensureWayIsClosed(Way way) {
+	    if (!way.getNode(0).equals(way.getNode(way.getNodesCount()-1))) {
+	        way.addNode(way.getNode(0));
+	    }
+	}
+	
+	private OsmPrimitive convertImagery(ImageryInfo imagery, ImageryBounds bounds, DataSet dataSet) {
+		OsmPrimitive osmImagery = null;
+		if (bounds.getShapes().isEmpty()) {
+			LatLon bottomLeft = bounds.getMin();
+			LatLon topRight = bounds.getMax();
+			LatLon topLeft = new LatLon(topRight.lat(), bottomLeft.lon());
+			LatLon bottomRight = new LatLon(bottomLeft.lat(), topRight.lon());
+			
+			Way way = new Way();
+			for (LatLon ll : new LatLon[]{bottomLeft, topLeft, topRight, bottomRight}) {
+				way.addNode(getNode(ll, dataSet));
+			}
+			ensureWayIsClosed(way);
+			osmImagery = way;
+			
+		} else {
+			Relation relation = new Relation();
+			relation.put("type", "multipolygon");
+			for (Shape shape : bounds.getShapes()) {
+				Way way = new Way();
+				for (Coordinate coor : shape.getPoints()) {
+					way.addNode(getNode(coor.getLat(), coor.getLon(), dataSet));
+				}
+				ensureWayIsClosed(way);
+				dataSet.addPrimitive(way);
+				relation.addMember(new RelationMember("outer", way));
+			}
+			osmImagery = relation;
+		}
+		
+		safePut(osmImagery, KEY_NAME, imagery.getName());
+		safePut(osmImagery, KEY_TYPE, imagery.getImageryType().getUrlString());
+		safePut(osmImagery, KEY_DEFAULT, imagery.isDefaultEntry());
+		safePut(osmImagery, KEY_URL, imagery.getUrl());
+		safePut(osmImagery, KEY_PROJECTIONS, imagery.getServerProjections());
+		safePut(osmImagery, KEY_EULA, imagery.getEulaAcceptanceRequired());
+		safePut(osmImagery, KEY_ATTR_TEXT, imagery.getAttributionText());
+		safePut(osmImagery, KEY_ATTR_URL, imagery.getAttributionLinkURL());
+		safePut(osmImagery, KEY_TERMS_URL, imagery.getTermsOfUseURL());
+		safePut(osmImagery, KEY_COUNTRY_CODE, imagery.getCountryCode());
+
+		if (imagery.getImageryType().equals(ImageryType.TMS)) {
+			safePut(osmImagery, KEY_MAX_ZOOM, imagery.getMaxZoom());
+			safePut(osmImagery, KEY_MIN_ZOOM, imagery.getMinZoom());
+		}
+		
+		return osmImagery;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openstreetmap.josm.io.FileImporter#importData(java.io.File, org.openstreetmap.josm.gui.progress.ProgressMonitor)
+	 */
+	@Override
+	public void importData(final File file, ProgressMonitor progressMonitor)
+			throws IOException, IllegalDataException {
+		try {
+			ImageryReader reader = null;
+			
+			try {
+				reader = new ValidatingImageryReader(file.getAbsolutePath());
+			} catch (SAXException e)  {
+                if (JOptionPane.showConfirmDialog(
+                        Main.parent,
+                        tr("Validating error in file {0}:\n{1}\nDo you want to continue without validating the file ?", file.getPath(), e.getLocalizedMessage()),
+                        tr("Open Imagery XML file"),
+                        JOptionPane.YES_NO_CANCEL_OPTION) != JOptionPane.YES_OPTION) {
+                	return;
+                }
+
+				reader = new ImageryReader(file.getAbsolutePath());
+			}
+			
+			final DataSet dataSet = convertImageryEntries(reader.parse());
+			        
+	        final XmlBoundsLayer layer = new XmlBoundsLayer(dataSet, file.getName(), file);
+	        Runnable uiStuff = new Runnable() {
+	            @Override
+	            public void run() {
+	                if (dataSet.allPrimitives().isEmpty()) {
+	                    JOptionPane.showMessageDialog(
+	                            Main.parent,
+	                            tr("No data found in file {0}.", file.getPath()),
+	                            tr("Open Imagery XML file"),
+	                            JOptionPane.INFORMATION_MESSAGE);
+	                }
+	                Main.main.addLayer(layer);
+	                layer.onPostLoadFromFile();
+	            }
+	        };
+	        if (SwingUtilities.isEventDispatchThread()) {
+	            uiStuff.run();
+	        } else {
+	            SwingUtilities.invokeLater(uiStuff);
+	        }
+		} catch (SAXException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openstreetmap.josm.io.FileImporter#importData(java.util.List, org.openstreetmap.josm.gui.progress.ProgressMonitor)
+	 */
+	@Override
+	public void importData(List<File> files, ProgressMonitor progressMonitor)
+			throws IOException, IllegalDataException {
+		for (File file : files) {
+			importData(file, progressMonitor);
+		}
+	}
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsLayer.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsLayer.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsLayer.java	(revision 26776)
@@ -0,0 +1,137 @@
+//    JOSM Imagery XML Bounds plugin.
+//    Copyright (C) 2011 Don-vip
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+package org.openstreetmap.josm.plugins.imageryxmlbounds;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.Action;
+import javax.swing.Icon;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.BoundsLayerSaveAction;
+import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.BoundsLayerSaveAsAction;
+import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.ShowBoundsAction;
+
+/**
+ * An "OSM data" layer that cannot be uploaded, merged, and in which real OSM data cannot be imported.
+ * Its sole purpose is to allow "classic" OSM edition tools to edit Imagery bounds (as XML files) without compromising OSM database integrity. 
+ * 
+ * @author Don-vip
+ */
+public class XmlBoundsLayer extends OsmDataLayer implements LayerChangeListener, XmlBoundsConstants {
+
+	/* (non-Javadoc)
+	 * @see org.openstreetmap.josm.gui.layer.OsmDataLayer#getMenuEntries()
+	 */
+	@Override
+	public Action[] getMenuEntries() {
+		List<Action> result = new ArrayList<Action>();
+		for (Action action : super.getMenuEntries()) {
+			if (action instanceof LayerSaveAction) {
+				result.add(new BoundsLayerSaveAction(this));
+
+			} else if (action instanceof LayerSaveAsAction) {
+				result.add(new BoundsLayerSaveAsAction(this));
+				
+			} else if (!(action instanceof LayerGpxExportAction) && !(action instanceof ConvertToGpxLayerAction)) {
+				// Add everything else, expect GPX-related action
+				result.add(action);
+			}
+		}
+		result.add(new ShowBoundsAction(this));
+		return result.toArray(new Action[0]);
+	}
+
+	private static final JosmAction[] actionsToDisable = new JosmAction[] {
+		Main.main.menu.download,
+		Main.main.menu.downloadPrimitive,
+		Main.main.menu.downloadReferrers,
+		Main.main.menu.upload,
+		Main.main.menu.uploadSelection,
+		Main.main.menu.update,
+		Main.main.menu.updateModified,
+		Main.main.menu.updateSelection,
+		Main.main.menu.openLocation
+	};
+	
+	private static final Map<JosmAction, Boolean> actionsStates = new HashMap<JosmAction, Boolean>();
+	
+	public XmlBoundsLayer(DataSet data, String name, File associatedFile) {
+		super(data, name, associatedFile);
+		MapView.addLayerChangeListener(this);
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openstreetmap.josm.gui.layer.OsmDataLayer#isMergable(org.openstreetmap.josm.gui.layer.Layer)
+	 */
+	@Override
+	public boolean isMergable(Layer other) {
+		return other instanceof XmlBoundsLayer;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openstreetmap.josm.gui.layer.OsmDataLayer#getIcon()
+	 */
+	@Override
+	public Icon getIcon() {
+		return XML_ICON_16;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openstreetmap.josm.gui.layer.OsmDataLayer#requiresUploadToServer()
+	 */
+	@Override
+	public boolean requiresUploadToServer() {
+		return false; // Never !
+	}
+
+	@Override
+	public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+		if (newLayer == this && !(oldLayer instanceof XmlBoundsLayer)) {
+			for (JosmAction action : actionsToDisable) {
+				actionsStates.put(action, action.isEnabled());
+				action.setEnabled(false);
+			}
+		} else if (oldLayer == this && !(newLayer instanceof XmlBoundsLayer)) {
+			for (JosmAction action : actionsToDisable) {
+				action.setEnabled(actionsStates.get(action));
+			}
+		}
+	}
+
+	@Override
+	public void layerAdded(Layer newLayer) {
+	}
+
+	@Override
+	public void layerRemoved(Layer oldLayer) {
+	    if (Main.main.getEditLayer() instanceof XmlBoundsLayer) {
+	        for (JosmAction action : actionsToDisable) {
+                action.setEnabled(false);
+            }
+	    }
+	}
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/BoundsLayerSaveAction.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/BoundsLayerSaveAction.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/BoundsLayerSaveAction.java	(revision 26776)
@@ -0,0 +1,53 @@
+//    JOSM Imagery XML Bounds plugin.
+//    Copyright (C) 2011 Don-vip
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+package org.openstreetmap.josm.plugins.imageryxmlbounds.actions;
+
+import java.awt.event.ActionEvent;
+import java.io.File;
+
+import org.openstreetmap.josm.actions.SaveAction;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerSaveAction;
+import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsLayer;
+
+/**
+ * 
+ * @author Don-vip
+ *
+ */
+public class BoundsLayerSaveAction extends LayerSaveAction {
+
+	public static class SaveBoundsAction extends SaveAction {
+		
+		@Override public File getFile(Layer layer) {
+	        File f = layer.getAssociatedFile();
+	        if (f != null && ! f.exists()) {
+	            f = null;
+	        }
+	        return f == null ? BoundsLayerSaveAsAction.SaveBoundsAsAction.openFileDialog(layer) : f;
+	    }
+	}
+
+	protected XmlBoundsLayer layer;
+	
+	public BoundsLayerSaveAction(XmlBoundsLayer layer) {
+		super(layer);
+	}
+
+    public void actionPerformed(ActionEvent e) {
+        new SaveBoundsAction().doSave(layer);
+    }
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/BoundsLayerSaveAsAction.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/BoundsLayerSaveAsAction.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/BoundsLayerSaveAsAction.java	(revision 26776)
@@ -0,0 +1,66 @@
+//    JOSM Imagery XML Bounds plugin.
+//    Copyright (C) 2011 Don-vip
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+package org.openstreetmap.josm.plugins.imageryxmlbounds.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.io.File;
+
+import org.openstreetmap.josm.actions.SaveActionBase;
+import org.openstreetmap.josm.actions.SaveAsAction;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerSaveAsAction;
+import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsConstants;
+import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsLayer;
+
+/**
+ * 
+ * @author Don-vip
+ *
+ */
+public class BoundsLayerSaveAsAction extends LayerSaveAsAction {
+
+	public static class SaveBoundsAsAction extends SaveAsAction {
+
+		@Override public File getFile(Layer layer) {
+	        return openFileDialog(layer);
+	    }
+		
+	    public static File openFileDialog(Layer layer) {
+	    	if (layer instanceof XmlBoundsLayer) {
+	    		return createAndOpenSaveFileChooser(tr("Save Imagery XML file"), XmlBoundsConstants.EXTENSION);
+	    	} else {
+	    		return SaveActionBase.openFileDialog(layer);
+	    	}
+	    }
+	}
+	
+	protected XmlBoundsLayer layer;
+	
+	public BoundsLayerSaveAsAction(XmlBoundsLayer layer) {
+		super(layer);
+		this.layer = layer;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openstreetmap.josm.gui.layer.Layer.LayerSaveAsAction#actionPerformed(java.awt.event.ActionEvent)
+	 */
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		new SaveBoundsAsAction().doSave(layer);
+	}
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ComputeBoundsAction.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ComputeBoundsAction.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ComputeBoundsAction.java	(revision 26776)
@@ -0,0 +1,293 @@
+//    JOSM Imagery XML Bounds plugin.
+//    Copyright (C) 2011 Don-vip
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+package org.openstreetmap.josm.plugins.imageryxmlbounds.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import javax.swing.AbstractAction;
+
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsConstants;
+
+/**
+ * 
+ * @author Don-vip
+ *
+ */
+public class ComputeBoundsAction extends AbstractAction implements XmlBoundsConstants {
+
+	protected static final DecimalFormat df = new DecimalFormat("#0.0000000", new DecimalFormatSymbols(Locale.UK));
+
+	protected static final String ACTION_NAME = tr("XML Imagery Bounds");
+	
+	private final Set<Relation> multipolygons;
+	private final Set<Way> closedWays;
+	
+	public ComputeBoundsAction() {
+		this(null);
+	}
+	
+	public ComputeBoundsAction(OsmDataLayer layer) {
+		this.multipolygons = new HashSet<Relation>();
+		this.closedWays = new HashSet<Way>();
+		
+        putValue(SHORT_DESCRIPTION, tr("Generate Imagery XML bounds for the selection"));
+        putValue(NAME, ACTION_NAME);
+        try {
+        	putValue(SMALL_ICON, XML_ICON_24);
+        } catch (Exception e) {
+        	e.printStackTrace();
+        }
+    	setEnabled(false);
+    	
+		if (layer != null) {
+			List<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
+			primitives.addAll(layer.data.getRelations());
+			primitives.addAll(layer.data.getWays());
+			updateOsmPrimitives(primitives);
+		}
+	}
+	
+	protected void updateOsmPrimitives(Collection<? extends OsmPrimitive> primitives) {
+		multipolygons.clear();
+		closedWays.clear();
+		// Store selected multipolygons and closed ways
+		for (OsmPrimitive value : primitives) {
+			if (value instanceof Relation) {
+				Relation r = (Relation) value;
+				if (r.isMultipolygon()) {
+					multipolygons.add(r);
+				}
+			} else if (value instanceof Way) {
+				Way w = (Way) value;
+				if (w.isClosed()) {
+					closedWays.add(w);
+				}
+			}
+		}
+		// Remove closed ways already inside a selected multipolygon
+		for (Iterator<Way> it = closedWays.iterator(); it.hasNext(); ) {
+			Way way = it.next();
+			for (Relation mp : multipolygons) {
+				for (RelationMember mb : mp.getMembers()) {
+					if (mb.getMember().equals(way)) {
+						it.remove();
+					}
+				}
+			}
+		}
+		// Enable the action if at least one area is found
+		setEnabled(!multipolygons.isEmpty() || !closedWays.isEmpty());
+	}
+
+	public final String getXml() {
+		List<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
+		primitives.addAll(multipolygons);
+		primitives.addAll(closedWays);
+		return getXml(primitives.toArray(new OsmPrimitive[0]));
+	}
+	
+	protected static final String getXml(OsmPrimitive ... primitives) {
+		List<String> entries = new ArrayList<String>();
+		for (OsmPrimitive p : primitives) {
+			if (p instanceof Relation) {
+				entries.add(getEntry(p, getMultiPolygonBounds((Relation) p)));
+			} else if (p instanceof Way) {
+				entries.add(getEntry(p, getClosedWayBounds((Way) p)));
+			}
+		}
+		return getImagery(entries.toArray(new String[0]));
+	}
+
+	protected static final String getImagery(String ... entries) {
+		String result = "<?xml version=\"1.0\" encoding=\""+ENCODING+"\" ?>\n";
+		result += "<!-- Generated with JOSM Imagery XML Plugin version "+PLUGIN_VERSION+" -->\n";
+		result += "<imagery xmlns=\""+XML_NAMESPACE+"\">\n";
+		for (String entry : entries) {
+			result += entry+"\n";
+		}
+	    result += "</imagery>";
+	    return result;
+	}
+	
+	protected static final String getEntry(OsmPrimitive p, String bounds) {
+		return getEntry(p.get(KEY_NAME), p.get(KEY_TYPE), p.get(KEY_URL), bounds, p.get(KEY_PROJECTIONS), p.get(KEY_EULA), p.get(KEY_ATTR_TEXT), p.get(KEY_ATTR_URL), p.get(KEY_COUNTRY_CODE));
+	}
+	
+	protected static final String getEntry(String name, String type, String url, String bounds, String projections, String eula, String attributionText, String attributionUrl, String countryCode) {
+		String result =
+	    "    <entry>\n"+
+	    "        <name>"+ (name != null ? name : "") +"</name>\n"+
+	    "        <type>"+ (type != null ? type : "wms") +"</type>\n"+
+	    "        <url>" + (url != null ? encodeUrl(url) : "") +"</url>\n"+
+	             bounds+"\n";
+		if (projections != null && !projections.isEmpty()) {
+			result += "        <projections>\n";
+			int i = 0;
+			String[] codes = projections.split(";");
+			for (String code : codes) {
+				if (i%6 == 0) {
+					result += "            ";
+				}
+				result += "<code>"+code.trim()+"</code>";
+				if (i%6 == 5 || i == codes.length-1 ) {
+					result += "\n";
+				}
+				i++;
+			}
+			result += "        </projections>\n";
+		}
+		if (eula != null && !eula.isEmpty()) {
+			result += "        <eula mandatory='true'>"+encodeUrl(eula)+"></eula>\n";
+		}
+		if (attributionText != null && !attributionText.isEmpty()) {
+			result += "        <attribution-text mandatory='true'>"+attributionText+"</attribution-text>\n";
+		}
+		if (attributionUrl != null && !attributionUrl.isEmpty()) {
+			result += "        <attribution-url>"+encodeUrl(attributionUrl)+"</attribution-url>\n";
+		}
+		if (countryCode != null && !countryCode.isEmpty()) {
+			result += "        <country-code>"+countryCode+"</country-code>\n";
+		}
+	    result += "    </entry>";
+	    return result;
+	}
+	
+	protected static final String encodeUrl(String url) {
+	    return "<![CDATA["+url+"]]>";
+	}
+	
+	protected static final String getBounds(OsmPrimitive p, boolean closeTag) {
+		BBox bbox = p.getBBox();
+		String result = "        <bounds ";
+		result += "min-lat='"+df.format(bbox.getBottomRight().lat())+"' "; 
+		result += "min-lon='"+df.format(bbox.getTopLeft().lon())+"' "; 
+		result += "max-lat='"+df.format(bbox.getTopLeft().lat())+"' "; 
+		result += "max-lon='"+df.format(bbox.getBottomRight().lon())+"'";
+		result += closeTag ? " />" : ">\n";
+		return result;
+	}
+	
+	protected static final boolean isValidOuterMember(RelationMember mb) {
+		return (mb.getRole() == null || mb.getRole().isEmpty() || mb.getRole().equals("outer")) 
+				&& mb.getMember() instanceof Way && ((Way) mb.getMember()).isClosed();
+	}
+	
+	protected static final String getMultiPolygonBounds(Relation mp) {
+		List<Way> outerClosedWays = new ArrayList<Way>();
+		for (RelationMember mb : mp.getMembers()) {
+			if (isValidOuterMember(mb)) {
+				outerClosedWays.add((Way) mb.getMember());
+			}
+		}
+		
+		if (outerClosedWays.isEmpty() || (outerClosedWays.size() == 1 && areClosedWayAndBboxEqual(outerClosedWays.get(0), mp.getBBox()))) {
+			return getBounds(mp, true);
+		} else {
+			String result = getBounds(mp, false);
+			for (Way way : outerClosedWays) {
+				result += getClosedWayShape(way);
+			}
+			result += "        </bounds>";
+			return result;
+		}
+	}
+	
+	protected static final boolean areClosedWayAndBboxEqual(Way way, BBox bBox) {
+		if (way.getNodesCount() == 5) {
+			Map<Double, List<Integer>> latMap = new HashMap<Double, List<Integer>>();
+			Map<Double, List<Integer>> lonMap = new HashMap<Double, List<Integer>>();
+
+			for (int i=0; i<4; i++) {
+				LatLon c = way.getNode(i).getCoor();
+				if (i > 1) {
+					LatLon b = way.getNode(i-1).getCoor();
+					if (b.lat() != c.lat() && b.lon() !=  c.lon()) {
+						return false;
+					}
+				}
+				List<Integer> latList = latMap.get(c.lat());
+				if (latList == null) {
+					latList = new ArrayList<Integer>();
+					latMap.put(c.lat(), latList);
+				}
+				latList.add(i);
+				List<Integer> lonList = lonMap.get(c.lon());
+				if (lonList == null) {
+					lonList = new ArrayList<Integer>();
+					lonMap.put(c.lon(), lonList);
+				}
+				lonList.add(i);
+			}
+			
+			boolean result = latMap.size() == 2 && lonMap.size() == 2 
+					&& latMap.containsKey(bBox.getBottomRight().lat()) && latMap.containsKey(bBox.getTopLeft().lat())
+					&& lonMap.containsKey(bBox.getBottomRight().lon()) && lonMap.containsKey(bBox.getTopLeft().lon());
+			System.out.println(result);
+			return result;
+		}
+		return false;
+	}
+
+	protected static final String getClosedWayBounds(Way cw) {
+		if (areClosedWayAndBboxEqual(cw, cw.getBBox())) {
+			return getBounds(cw, true);
+		} else {
+			return getBounds(cw, false) + getClosedWayShape(cw) + "        </bounds>";
+		}
+	}
+
+	protected static final String getClosedWayShape(Way cw) {
+		String result = "            <shape>\n";
+		for (int i=0; i<cw.getNodesCount()-1; i++) {
+			if (i%3 == 0) {
+				result += "                ";
+			}
+			result += "<point ";
+			result += "lat='" + df.format(cw.getNode(i).getCoor().lat()) + "' ";
+			result += "lon='" + df.format(cw.getNode(i).getCoor().lon()) + "'/>";
+			if (i%3 == 2 || i == cw.getNodesCount()-2 ) {
+				result += "\n";
+			}
+		}
+		result += "            </shape>\n";
+		return result;
+	}
+
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		System.out.println(getXml());
+	}
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsAction.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsAction.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsAction.java	(revision 26776)
@@ -0,0 +1,61 @@
+//    JOSM Imagery XML Bounds plugin.
+//    Copyright (C) 2011 Don-vip
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+package org.openstreetmap.josm.plugins.imageryxmlbounds.actions;
+
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+
+import javax.swing.Box;
+import javax.swing.JOptionPane;
+import javax.swing.JScrollPane;
+
+import net.boplicity.xmleditor.XmlTextPane;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsLayer;
+
+/**
+ * @author Don-vip
+ *
+ */
+public class ShowBoundsAction extends ComputeBoundsAction {
+
+	private static final long serialVersionUID = 6636454148615649794L;
+
+	public ShowBoundsAction() {
+	}
+	
+	public ShowBoundsAction(XmlBoundsLayer xmlBoundsLayer) {
+		super(xmlBoundsLayer);
+	}
+
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		XmlTextPane pane = new XmlTextPane();
+		Font courierNew = Font.getFont("Courier New"); 
+		if (courierNew != null) {
+			pane.setFont(courierNew);
+		}
+		pane.setText(getXml());
+		pane.setEditable(false);
+		Box box = Box.createVerticalBox();
+		JScrollPane scrollPane = new JScrollPane(pane);
+        scrollPane.setPreferredSize(new Dimension(1024, 600));
+        box.add(scrollPane);
+        JOptionPane.showMessageDialog(Main.parent, box, ACTION_NAME, JOptionPane.PLAIN_MESSAGE);
+	}
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsListAction.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsListAction.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsListAction.java	(revision 26776)
@@ -0,0 +1,49 @@
+//    JOSM Imagery XML Bounds plugin.
+//    Copyright (C) 2011 Don-vip
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+package org.openstreetmap.josm.plugins.imageryxmlbounds.actions;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JList;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * 
+ * @author Don-vip
+ *
+ */
+public class ShowBoundsListAction extends ShowBoundsAction implements ListSelectionListener {
+
+	@Override
+	public void valueChanged(ListSelectionEvent e) {
+		if (!e.getValueIsAdjusting()) {
+			JList list = (JList) e.getSource();
+			if (list.getModel().getSize() > list.getSelectionModel().getMaxSelectionIndex()) {
+				List<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
+				for (Object value : list.getSelectedValues()) {
+					if (value instanceof OsmPrimitive) {
+						primitives.add((OsmPrimitive) value);
+					}
+				}
+				updateOsmPrimitives(primitives);
+			}
+		}
+	}
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsPropertiesAction.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsPropertiesAction.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsPropertiesAction.java	(revision 26776)
@@ -0,0 +1,37 @@
+//    JOSM Imagery XML Bounds plugin.
+//    Copyright (C) 2011 Don-vip
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+package org.openstreetmap.josm.plugins.imageryxmlbounds.actions;
+
+import java.util.Collections;
+
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.dialogs.properties.PropertiesDialog.RelationRelated;
+
+public class ShowBoundsPropertiesAction extends ShowBoundsAction implements RelationRelated {
+
+    protected Relation relation;
+    
+    @Override
+    public Relation getRelation() {
+        return relation;
+    }
+
+    @Override
+    public void setRelation(Relation relation) {
+        this.relation = relation;
+        updateOsmPrimitives(Collections.singleton(relation));
+    }
+}
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsSelectionAction.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsSelectionAction.java	(revision 26776)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsSelectionAction.java	(revision 26776)
@@ -0,0 +1,38 @@
+//    JOSM Imagery XML Bounds plugin.
+//    Copyright (C) 2011 Don-vip
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+package org.openstreetmap.josm.plugins.imageryxmlbounds.actions;
+
+import java.util.Collection;
+
+import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * 
+ * @author Don-vip
+ *
+ */
+public class ShowBoundsSelectionAction extends ShowBoundsAction implements SelectionChangedListener {
+
+	public ShowBoundsSelectionAction() {
+		putValue("toolbar", "xml-imagery-bounds");
+	}
+
+	@Override
+	public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+		updateOsmPrimitives(newSelection);
+	}
+}
