Index: /applications/editors/josm/plugins/geotools/.classpath
===================================================================
--- /applications/editors/josm/plugins/geotools/.classpath	(revision 31598)
+++ /applications/editors/josm/plugins/geotools/.classpath	(revision 31599)
@@ -6,62 +6,62 @@
 	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/gt-api-13.0.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-api-14.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-coverage-13.0.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-coverage-14.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-data-13.0.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-data-14.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-13.0.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-14.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-13.0.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-14.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-geotiff-13.0.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-geotiff-14.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-main-13.0.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-main-14.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-metadata-13.0.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-metadata-14.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-opengis-13.0.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-opengis-14.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-referencing-13.0.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-referencing-14.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-shapefile-13.0.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-shapefile-14.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/hsqldb-2.2.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.1.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-utilities-1.1.10.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/hsqldb-2.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.1.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-utilities-1.1.12.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jai_codec-1.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jai_core-1.1.3.jar"/>
@@ -69,11 +69,10 @@
 	<classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jsr-275-1.0-beta-2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-contour-1.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-rangelookup-1.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-utils-1.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-vectorbinarize-1.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-vectorize-1.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-zonalstats-1.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/vecmath-1.3.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-contour-1.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-rangelookup-1.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-utils-1.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-vectorbinarize-1.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-vectorize-1.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-zonalstats-1.4.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-jts"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/geotools/README
===================================================================
--- /applications/editors/josm/plugins/geotools/README	(revision 31598)
+++ /applications/editors/josm/plugins/geotools/README	(revision 31599)
@@ -4,3 +4,3 @@
     * Licensed under GPL v3 (see LICENSE)
 
-The current embedded version of GeoTools is 13.0.
+The current embedded version of GeoTools is 14.0.
Index: /applications/editors/josm/plugins/geotools/build.xml
===================================================================
--- /applications/editors/josm/plugins/geotools/build.xml	(revision 31598)
+++ /applications/editors/josm/plugins/geotools/build.xml	(revision 31599)
@@ -11,6 +11,4 @@
     <property name="plugin.icon" value="images/compass.png"/>
     <property name="plugin.canloadatruntime" value="true"/>
-    <!--<property name="plugin.link" value="..."/>-->
-    <!--<property name="plugin.early" value="..."/>-->
     <property name="plugin.requires" value="jts"/>
     <property name="plugin.stage" value="20"/>
@@ -36,5 +34,5 @@
             <zipfileset src="${plugin.build.dir}/${ant.project.name}.jar">
                 <include name="META-INF/MANIFEST.MF"/>
-                <include name="META-INF/*.jai"/>
+                <include name="META-INF/javax.media.jai.registryFile.jai"/>
             </zipfileset>
         </jar>
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/registryFile.jai
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/registryFile.jai	(revision 31599)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/registryFile.jai	(revision 31599)
@@ -0,0 +1,22 @@
+#
+# Image operation descriptors :
+#
+descriptor  org.jaitools.media.jai.contour.ContourDescriptor
+descriptor  org.jaitools.media.jai.rangelookup.RangeLookupDescriptor
+descriptor  org.jaitools.media.jai.vectorbinarize.VectorBinarizeDescriptor
+descriptor  org.jaitools.media.jai.vectorize.VectorizeDescriptor
+descriptor  org.jaitools.media.jai.zonalstats.ZonalStatsDescriptor
+descriptor  org.geotools.image.palette.ColorReductionDescriptor
+descriptor  org.geotools.image.palette.ColorInversionDescriptor
+
+
+#
+# "rendered" factory objects
+#
+rendered  org.jaitools.media.jai.contour.ContourRIF  org.jaitools.media.jai  Contour  Contour
+rendered  org.jaitools.media.jai.rangelookup.RangeLookupRIF  org.jaitools.media.jai  RangeLookup  RangeLookup
+rendered  org.jaitools.media.jai.vectorbinarize.VectorBinarizeRIF  org.jaitools.media.jai  VectorBinarize  VectorBinarize
+rendered  org.jaitools.media.jai.vectorize.VectorizeRIF  org.jaitools.media.jai  Vectorize  Vectorize
+rendered  org.jaitools.media.jai.zonalstats.ZonalStatsRIF  org.jaitools.media.jai  ZonalStats  ZonalStats
+rendered  org.geotools.image.palette.ColorReductionCRIF	org.geotools  org.geotools.ColorReduction ColorReduction
+rendered  org.geotools.image.palette.ColorInversionCRIF	org.geotools  org.geotools.ColorInversion ColorInversion
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/java.sql.Driver
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/java.sql.Driver	(revision 31599)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/java.sql.Driver	(revision 31599)
@@ -0,0 +1,1 @@
+org.hsqldb.jdbc.JDBCDriver
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.media.jai.OperationsRegistrySpi
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.media.jai.OperationsRegistrySpi	(revision 31599)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.media.jai.OperationsRegistrySpi	(revision 31599)
@@ -0,0 +1,5 @@
+org.jaitools.media.jai.contour.ContourSpi
+org.jaitools.media.jai.rangelookup.RangeLookupSpi
+org.jaitools.media.jai.vectorbinarize.VectorBinarizeSpi
+org.jaitools.media.jai.vectorize.VectorizeSpi
+org.jaitools.media.jai.zonalstats.ZonalStatsSpi
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.DataStoreFactorySpi
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.DataStoreFactorySpi	(revision 31599)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.DataStoreFactorySpi	(revision 31599)
@@ -0,0 +1,2 @@
+org.geotools.data.shapefile.ShapefileDataStoreFactory
+org.geotools.data.shapefile.ShapefileDirectoryFactory
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.FileDataStoreFactorySpi
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.FileDataStoreFactorySpi	(revision 31599)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.FileDataStoreFactorySpi	(revision 31599)
@@ -0,0 +1,1 @@
+org.geotools.data.shapefile.ShapefileDataStoreFactory
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider	(revision 31598)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider	(revision 31599)
@@ -49,3 +49,7 @@
 org.geotools.referencing.operation.projection.Mollweide$MollweideProvider
 org.geotools.referencing.operation.projection.Mollweide$WagnerIVProvider
+org.geotools.referencing.operation.projection.Gnomonic$Provider
 org.geotools.referencing.operation.projection.WorldVanDerGrintenI$Provider
+org.geotools.referencing.operation.projection.Sinusoidal$Provider
+org.geotools.referencing.operation.projection.GeneralOblique$Provider
+org.geotools.referencing.operation.projection.MeteosatSG$Provider
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.util.ConverterFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.util.ConverterFactory	(revision 31598)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.util.ConverterFactory	(revision 31599)
@@ -9,3 +9,7 @@
 org.geotools.util.CharsetConverterFactory
 org.geotools.util.UuidConverterFactory
+org.geotools.util.EnumerationConverterFactory
+org.geotools.util.QNameConverterFactory
+org.geotools.util.MeasureConverterFactory
 org.geotools.temporal.TemporalConverterFactory
+org.geotools.util.NameConverterFactory
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.jaitools.numeric.Processor
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.jaitools.numeric.Processor	(revision 31599)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.jaitools.numeric.Processor	(revision 31599)
@@ -0,0 +1,5 @@
+org.jaitools.numeric.ApproxMedianProcessor
+org.jaitools.numeric.ExactMedianProcessor
+org.jaitools.numeric.ExtremaProcessor
+org.jaitools.numeric.MeanVarianceProcessor
+org.jaitools.numeric.SumProcessor
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.coverage.processing.Operation
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.coverage.processing.Operation	(revision 31598)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.coverage.processing.Operation	(revision 31599)
@@ -2,4 +2,5 @@
 org.geotools.coverage.processing.operation.AddConst
 org.geotools.coverage.processing.operation.Add
+org.geotools.coverage.processing.operation.BandMerge
 org.geotools.coverage.processing.operation.Convolve
 org.geotools.coverage.processing.operation.Crop
@@ -7,5 +8,4 @@
 org.geotools.coverage.processing.operation.Exp
 org.geotools.coverage.processing.operation.FilteredSubsample
-org.geotools.coverage.processing.operation.GradientMagnitude
 org.geotools.coverage.processing.operation.Interpolate
 org.geotools.coverage.processing.operation.Invert
@@ -14,4 +14,5 @@
 org.geotools.coverage.processing.operation.MedianFilter
 org.geotools.coverage.processing.operation.MinFilter
+org.geotools.coverage.processing.operation.Mosaic
 org.geotools.coverage.processing.operation.Multiply
 org.geotools.coverage.processing.operation.MultiplyConst
@@ -26,2 +27,5 @@
 org.geotools.coverage.processing.operation.Histogram
 org.geotools.coverage.processing.operation.ZonalStats
+org.geotools.coverage.processing.operation.ZonalStatistics
+org.geotools.coverage.processing.operation.Warp
+org.geotools.coverage.processing.operation.Affine
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function	(revision 31598)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function	(revision 31599)
@@ -13,7 +13,9 @@
 org.geotools.filter.function.Collection_MedianFunction
 org.geotools.filter.function.Collection_MaxFunction
+org.geotools.filter.function.Collection_NearestFunction
 org.geotools.filter.function.Collection_SumFunction
 org.geotools.filter.function.Collection_UniqueFunction
 org.geotools.filter.function.EnvFunction
+org.geotools.filter.function.StringTemplateFunction
 org.geotools.filter.function.FilterFunction_contains
 org.geotools.filter.function.FilterFunction_isEmpty
@@ -107,4 +109,5 @@
 org.geotools.filter.function.FilterFunction_between
 org.geotools.filter.function.FilterFunction_not
+org.geotools.filter.function.InFunction
 org.geotools.filter.function.FilterFunction_in2
 org.geotools.filter.function.FilterFunction_in3
@@ -125,4 +128,9 @@
 org.geotools.filter.function.FilterFunction_isometric
 org.geotools.filter.function.FilterFunction_property
+org.geotools.filter.function.FilterFunction_distance3D
+org.geotools.filter.function.FilterFunction_isWithinDistance3D
+org.geotools.filter.function.FilterFunction_intersects3D
+org.geotools.filter.function.FilterFunction_disjoint3D
+org.geotools.filter.function.GeometryFunction
 org.geotools.filter.function.IDFunction
 org.geotools.filter.function.InterpolateFunction
@@ -164,2 +172,5 @@
 org.geotools.filter.function.string.ConcatenateFunction
 org.geotools.filter.function.JenksNaturalBreaksFunction
+org.geotools.filter.function.FilterFunction_list
+org.geotools.styling.visitor.RescaleToPixelsFunction
+org.geotools.resources.coverage.FilterFunction_isCoverage
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory	(revision 31598)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory	(revision 31599)
@@ -1,4 +1,4 @@
 #############################
-# FROM gt-referencing-8.3.jar
+# FROM gt-referencing-14.0.jar
 #############################
 org.geotools.referencing.factory.epsg.DefaultFactory
@@ -15,5 +15,5 @@
 
 ###########################
-# FROM gt-epsg-hsql-8.3.jar
+# FROM gt-epsg-hsql-14.0.jar
 ###########################
 org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
@@ -22,5 +22,5 @@
 
 ################################
-# FROM gt-epsg-extension-8.3.jar
+# FROM gt-epsg-extension-14.0.jar
 ################################
 org.geotools.referencing.factory.epsg.UnnamedExtension
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.cs.CSAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.cs.CSAuthorityFactory	(revision 31598)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.cs.CSAuthorityFactory	(revision 31599)
@@ -1,4 +1,4 @@
 #############################
-# FROM gt-referencing-8.3.jar
+# FROM gt-referencing-14.0.jar
 #############################
 org.geotools.referencing.factory.epsg.DefaultFactory
@@ -11,5 +11,5 @@
 
 ###########################
-# FROM gt-epsg-hsql-8.3.jar
+# FROM gt-epsg-hsql-14.0.jar
 ###########################
 org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.datum.DatumAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.datum.DatumAuthorityFactory	(revision 31598)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.datum.DatumAuthorityFactory	(revision 31599)
@@ -1,4 +1,4 @@
 #############################
-# FROM gt-referencing-8.3.jar
+# FROM gt-referencing-14.0.jar
 #############################
 org.geotools.referencing.factory.epsg.DefaultFactory
@@ -11,5 +11,5 @@
 
 ###########################
-# FROM gt-epsg-hsql-8.3.jar
+# FROM gt-epsg-hsql-14.0.jar
 ###########################
 org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.operation.CoordinateOperationAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.operation.CoordinateOperationAuthorityFactory	(revision 31598)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.operation.CoordinateOperationAuthorityFactory	(revision 31599)
@@ -1,4 +1,4 @@
 #############################
-# FROM gt-referencing-8.3.jar
+# FROM gt-referencing-14.0.jar
 #############################
 org.geotools.referencing.factory.epsg.CoordinateOperationFactoryUsingWKT
@@ -12,5 +12,5 @@
 
 ###########################
-# FROM gt-epsg-hsql-8.3.jar
+# FROM gt-epsg-hsql-14.0.jar
 ###########################
 org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory