X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.geo%2Fsrc%2Forg%2Fargeo%2Fapp%2Fgeo%2FGpxUtils.java;h=dcd205ab39ab33d5f990f860db245e5407b55631;hb=03c171b5d502b461c534816c3c11cae889aef3c1;hp=5b07d1677fe72166ae9329327062812ddf35b37b;hpb=b96d17f3eb275a97109cc160db1cfd3731a01d31;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.geo/src/org/argeo/app/geo/GpxUtils.java b/org.argeo.app.geo/src/org/argeo/app/geo/GpxUtils.java
index 5b07d16..dcd205a 100644
--- a/org.argeo.app.geo/src/org/argeo/app/geo/GpxUtils.java
+++ b/org.argeo.app.geo/src/org/argeo/app/geo/GpxUtils.java
@@ -15,6 +15,8 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import org.geotools.api.feature.simple.SimpleFeature;
+import org.geotools.api.feature.simple.SimpleFeatureType;
 import org.geotools.data.DataUtilities;
 import org.geotools.feature.SchemaException;
 import org.geotools.feature.simple.SimpleFeatureBuilder;
@@ -24,8 +26,6 @@ import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.LineString;
 import org.locationtech.jts.geom.MultiPoint;
 import org.locationtech.jts.geom.Polygon;
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.feature.simple.SimpleFeatureType;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -88,8 +88,12 @@ public class GpxUtils {
 			// multiPoint.normalize();
 			return (T) multiPoint;
 		} else if (Polygon.class.isAssignableFrom(clss)) {
-			// close the line string
-			coordinates.add(coordinates.get(0));
+			Coordinate first = coordinates.get(0);
+			Coordinate last = coordinates.get(coordinates.size() - 1);
+			if (!(first.getX() == last.getX() && first.getY() == last.getY())) {
+				// close the line string
+				coordinates.add(first);
+			}
 			Polygon polygon = geometryFactory.createPolygon(coordinates.toArray(new Coordinate[coordinates.size()]));
 			return (T) polygon;
 		} else if (SimpleFeature.class.isAssignableFrom(clss)) {
@@ -114,7 +118,7 @@ public class GpxUtils {
 		return area;
 	}
 
-	/** Write ODK GepShape as a GPX file. */
+	/** Write ODK GeoShape as a GPX file. */
 	public static void writeGeoShapeAsGpx(String geoShape, OutputStream out) throws IOException {
 		Objects.requireNonNull(geoShape);
 		Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8);