diff --git a/applications/appCatalogAndGazetteerClient/.classpath b/applications/appCatalogAndGazetteerClient/.classpath
index 2b2c072..8ba8137 100644
--- a/applications/appCatalogAndGazetteerClient/.classpath
+++ b/applications/appCatalogAndGazetteerClient/.classpath
@@ -27,14 +27,14 @@
-
-
+
+
diff --git a/applications/appgvSIG/.classpath b/applications/appgvSIG/.classpath
index f058159..f29d526 100644
--- a/applications/appgvSIG/.classpath
+++ b/applications/appgvSIG/.classpath
@@ -31,7 +31,6 @@
-
@@ -39,5 +38,6 @@
+
diff --git a/applications/appgvSIG/config/dependencies.xml b/applications/appgvSIG/config/dependencies.xml
index 5352591..22cfc7c 100644
--- a/applications/appgvSIG/config/dependencies.xml
+++ b/applications/appgvSIG/config/dependencies.xml
@@ -240,8 +240,8 @@
./bin/gvSIG/extensiones/com.iver.cit.gvsig/lib/
- jts-1.7.jar
- jtsio-1.7.jar
+ jts-1.12.jar
+ jtsio-1.12.jar
diff --git a/extensions/extAnnotations/.classpath b/extensions/extAnnotations/.classpath
index 2772ad1..f01dead 100644
--- a/extensions/extAnnotations/.classpath
+++ b/extensions/extAnnotations/.classpath
@@ -17,8 +17,8 @@
-
+
diff --git a/extensions/extArcims/.classpath b/extensions/extArcims/.classpath
index 65d9283..c997a17 100644
--- a/extensions/extArcims/.classpath
+++ b/extensions/extArcims/.classpath
@@ -16,8 +16,8 @@
-
+
diff --git a/extensions/extCAD/.classpath b/extensions/extCAD/.classpath
index d504753..d4aabc7 100644
--- a/extensions/extCAD/.classpath
+++ b/extensions/extCAD/.classpath
@@ -22,9 +22,9 @@
-
+
diff --git a/extensions/extDerivedGeometries/.classpath b/extensions/extDerivedGeometries/.classpath
index e09e43a..8997ed1 100644
--- a/extensions/extDerivedGeometries/.classpath
+++ b/extensions/extDerivedGeometries/.classpath
@@ -1,20 +1,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extensions/extExpressionField/.classpath b/extensions/extExpressionField/.classpath
index 2cf791b..181da6c 100644
--- a/extensions/extExpressionField/.classpath
+++ b/extensions/extExpressionField/.classpath
@@ -15,8 +15,8 @@
-
+
diff --git a/extensions/extGPE-gvSIG/.classpath b/extensions/extGPE-gvSIG/.classpath
index 35b688c..aa69e19 100755
--- a/extensions/extGPE-gvSIG/.classpath
+++ b/extensions/extGPE-gvSIG/.classpath
@@ -14,7 +14,6 @@
-
@@ -27,5 +26,6 @@
+
diff --git a/extensions/extGeoProcessing/.classpath b/extensions/extGeoProcessing/.classpath
index 98c49e7..cd5c9bd 100644
--- a/extensions/extGeoProcessing/.classpath
+++ b/extensions/extGeoProcessing/.classpath
@@ -13,8 +13,8 @@
-
+
diff --git a/extensions/extGeoprocessingExtensions/.classpath b/extensions/extGeoprocessingExtensions/.classpath
index e29b009..3bda99a 100644
--- a/extensions/extGeoprocessingExtensions/.classpath
+++ b/extensions/extGeoprocessingExtensions/.classpath
@@ -13,7 +13,7 @@
-
+
diff --git a/extensions/extJDBC/.classpath b/extensions/extJDBC/.classpath
index 1d78c00..9180f1a 100644
--- a/extensions/extJDBC/.classpath
+++ b/extensions/extJDBC/.classpath
@@ -15,8 +15,8 @@
-
+
diff --git a/extensions/extOracleSpatial/.classpath b/extensions/extOracleSpatial/.classpath
index 0cf1078..be3f1e1 100644
--- a/extensions/extOracleSpatial/.classpath
+++ b/extensions/extOracleSpatial/.classpath
@@ -10,11 +10,11 @@
-
-
+
+
diff --git a/extensions/extQuickInfo/.classpath b/extensions/extQuickInfo/.classpath
index 2dc06c1..a9796b5 100644
--- a/extensions/extQuickInfo/.classpath
+++ b/extensions/extQuickInfo/.classpath
@@ -9,8 +9,6 @@
-
-
@@ -19,5 +17,7 @@
+
+
diff --git a/extensions/extSelectionTools/.classpath b/extensions/extSelectionTools/.classpath
index 981ff3d..e4cbc6d 100644
--- a/extensions/extSelectionTools/.classpath
+++ b/extensions/extSelectionTools/.classpath
@@ -4,7 +4,6 @@
-
@@ -15,5 +14,6 @@
+
diff --git a/extensions/extSymbology/.classpath b/extensions/extSymbology/.classpath
index 34ce931..72d5d68 100644
--- a/extensions/extSymbology/.classpath
+++ b/extensions/extSymbology/.classpath
@@ -30,8 +30,8 @@
-
+
diff --git a/libraries/libFMap/.classpath b/libraries/libFMap/.classpath
index 8b399bb..b5784aa 100644
--- a/libraries/libFMap/.classpath
+++ b/libraries/libFMap/.classpath
@@ -31,10 +31,10 @@
-
-
+
+
diff --git a/libraries/libFMap/build.xml b/libraries/libFMap/build.xml
index 3dc109a..b2ce237 100644
--- a/libraries/libFMap/build.xml
+++ b/libraries/libFMap/build.xml
@@ -142,8 +142,8 @@
-
-
+
+
diff --git a/libraries/libFMap/lib/jts-1.12.jar b/libraries/libFMap/lib/jts-1.12.jar
new file mode 100644
index 0000000..00c27ad
Binary files /dev/null and b/libraries/libFMap/lib/jts-1.12.jar differ
diff --git a/libraries/libFMap/lib/jts-1.9.jar b/libraries/libFMap/lib/jts-1.9.jar
deleted file mode 100644
index 4784857..0000000
Binary files a/libraries/libFMap/lib/jts-1.9.jar and /dev/null differ
diff --git a/libraries/libFMap/lib/jtsio-1.12.jar b/libraries/libFMap/lib/jtsio-1.12.jar
new file mode 100644
index 0000000..b6157b9
Binary files /dev/null and b/libraries/libFMap/lib/jtsio-1.12.jar differ
diff --git a/libraries/libFMap/lib/jtsio-1.8.jar b/libraries/libFMap/lib/jtsio-1.8.jar
deleted file mode 100644
index 70d6c71..0000000
Binary files a/libraries/libFMap/lib/jtsio-1.8.jar and /dev/null differ
diff --git a/libraries/libFMap/src/com/vividsolutions/jts/operation/overlay/SnapPolygonBuilder.java b/libraries/libFMap/src/com/vividsolutions/jts/operation/overlay/SnapPolygonBuilder.java
index 1bb5cbe..55111f0 100644
--- a/libraries/libFMap/src/com/vividsolutions/jts/operation/overlay/SnapPolygonBuilder.java
+++ b/libraries/libFMap/src/com/vividsolutions/jts/operation/overlay/SnapPolygonBuilder.java
@@ -80,17 +80,14 @@ import com.vividsolutions.jts.util.Assert;
public class SnapPolygonBuilder extends PolygonBuilder {
private GeometryFactory geometryFactory;
- private CGAlgorithms cga;
//private List dirEdgeList;
//private NodeMap nodes;
private List shellList = new ArrayList();
- public SnapPolygonBuilder(GeometryFactory geometryFactory,
- CGAlgorithms cga)
+ public SnapPolygonBuilder(GeometryFactory geometryFactory)
{
- super(geometryFactory, cga);
+ super(geometryFactory);
this.geometryFactory = geometryFactory;
- this.cga = cga;
}
/**
@@ -136,7 +133,7 @@ public class SnapPolygonBuilder extends PolygonBuilder {
if (de.isInResult() && de.getLabel().isArea() ) {
// if this edge has not yet been processed
if (de.getEdgeRing() == null) {
- MaximalEdgeRing er = new MaximalEdgeRing(de, geometryFactory, cga);
+ MaximalEdgeRing er = new MaximalEdgeRing(de, geometryFactory);
maxEdgeRings.add(er);
er.setInResult();
// System.out.println("max node degree = " + er.getMaxDegree());
diff --git a/libraries/libFMap/src/com/vividsolutions/jts/operation/overlay/SnappingOverlayOperation.java b/libraries/libFMap/src/com/vividsolutions/jts/operation/overlay/SnappingOverlayOperation.java
index 5409079..f6fd379 100644
--- a/libraries/libFMap/src/com/vividsolutions/jts/operation/overlay/SnappingOverlayOperation.java
+++ b/libraries/libFMap/src/com/vividsolutions/jts/operation/overlay/SnappingOverlayOperation.java
@@ -253,7 +253,7 @@ public class SnappingOverlayOperation extends OverlayOp {
//TODO Todos los builders deberán usar los metodos snap de locator
- SnapPolygonBuilder polyBuilder = new SnapPolygonBuilder(geomFact, cga);
+ SnapPolygonBuilder polyBuilder = new SnapPolygonBuilder(geomFact);
polyBuilder.add(graph);
resultPolyList = polyBuilder.getPolygons();
diff --git a/libraries/libGDBMS/.classpath b/libraries/libGDBMS/.classpath
index 8730db3..bbcba3b 100644
--- a/libraries/libGDBMS/.classpath
+++ b/libraries/libGDBMS/.classpath
@@ -14,8 +14,8 @@
-
+
diff --git a/libraries/libTopology/.classpath b/libraries/libTopology/.classpath
index dcebb4f..25bb50e 100644
--- a/libraries/libTopology/.classpath
+++ b/libraries/libTopology/.classpath
@@ -22,8 +22,8 @@
-
+
diff --git a/libraries/libTopology/src/org/gvsig/jts/JtsUtil.java b/libraries/libTopology/src/org/gvsig/jts/JtsUtil.java
index dabe378..d0181b0 100644
--- a/libraries/libTopology/src/org/gvsig/jts/JtsUtil.java
+++ b/libraries/libTopology/src/org/gvsig/jts/JtsUtil.java
@@ -410,7 +410,7 @@ public class JtsUtil {
//
//
public static LineString reverse(LineString lineString){
- LineString solution = lineString.reverse();
+ LineString solution = (LineString) lineString.reverse();
if(lineString instanceof LinearRing)
solution = toLinearRing(lineString);
return solution;