Changeset 30147 in osm

Timestamp:

2013-12-22T21:35:19+01:00 (11 years ago)

Author:

donvip

Message:

[josm-geotools] upgrade to GeoTools 10.3 (see README for details)

Location:

applications/editors/josm/plugins/geotools

Files:

• .classpath (modified) (2 diffs)
• README (modified) (1 diff)
• lib/gt-api-10.3.jar (added)
• lib/gt-api-9.3.jar (deleted)
• lib/gt-coverage-10.3.jar (added)
• lib/gt-coverage-9.3.jar (deleted)
• lib/gt-data-10.3.jar (added)
• lib/gt-data-9.3.jar (deleted)
• lib/gt-epsg-extension-10.3.jar (added)
• lib/gt-epsg-extension-9.3.jar (deleted)
• lib/gt-epsg-hsql-10.3.jar (added)
• lib/gt-epsg-hsql-9.3.jar (deleted)
• lib/gt-geotiff-10.3.jar (added)
• lib/gt-geotiff-9.3.jar (deleted)
• lib/gt-main-10.3.jar (added)
• lib/gt-main-9.3.jar (deleted)
• lib/gt-metadata-10.3.jar (added)
• lib/gt-metadata-9.3.jar (deleted)
• lib/gt-opengis-10.3.jar (added)
• lib/gt-opengis-9.3.jar (deleted)
• lib/gt-referencing-10.3.jar (added)
• lib/gt-referencing-9.3.jar (deleted)
• lib/gt-shapefile-9.3.jar (deleted)
• lib/gt-shapefile-old-10.3.jar (added)
• lib/jt-contour-1.3.0.jar (deleted)
• lib/jt-contour-1.3.1.jar (added)
• lib/jt-rangelookup-1.3.0.jar (deleted)
• lib/jt-rangelookup-1.3.1.jar (added)
• lib/jt-utils-1.3.0.jar (deleted)
• lib/jt-utils-1.3.1.jar (added)
• lib/jt-vectorbinarize-1.3.0.jar (deleted)
• lib/jt-vectorbinarize-1.3.1.jar (added)
• lib/jt-vectorize-1.3.0.jar (deleted)
• lib/jt-vectorize-1.3.1.jar (added)
• lib/jt-zonalstats-1.3.0.jar (deleted)
• lib/jt-zonalstats-1.3.1.jar (added)

applications/editors/josm/plugins/geotools/.classpath

@@ -6 +6 @@
         <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-9.3.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-coverage-9.3.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-data-9.3.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-9.3.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-9.3.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-geotiff-9.3.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-main-9.3.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-metadata-9.3.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-opengis-9.3.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-referencing-9.3.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-shapefile-9.3.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-api-10.3.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-coverage-10.3.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-data-10.3.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-10.3.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-10.3.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-geotiff-10.3.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-main-10.3.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-metadata-10.3.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-opengis-10.3.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-referencing-10.3.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-shapefile-old-10.3.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/hsqldb-1.8.0.7.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.1.7.jar"/>
@@ -25 +25 @@
         <classpathentry exported="true" kind="lib" path="lib/jdom-1.0.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.0.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/jt-rangelookup-1.3.0.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/jt-utils-1.3.0.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/jt-vectorbinarize-1.3.0.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/jt-vectorize-1.3.0.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/jt-zonalstats-1.3.0.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 combineaccessrules="false" kind="src" path="/JOSM-jts"/>

applications/editors/josm/plugins/geotools/README

@@ -3 +3 @@
 This plugin provides parts of the GeoTools library for JOSM plugins.
     * Licensed under GPL v3 (see LICENSE)
+
+The current embedded version of GeoTools is 10.3.
+
+However, due to major breaking changes in shapefile implementation in 10.x branch,
+gt-shapefile-old-10.3.jar is bundled instead of gt-shapefile-10.3.jar to avoid
+compilation issues in opendata plugin.
+
+The switch shapefile -> shapefile-ng must be made in the same time as opendata.
+
+See http://docs.codehaus.org/display/GEOTOOLS/Migrate+shapefile+to+shapefile-ng