X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.geo%2Fsrc%2Forg%2Fargeo%2Fapp%2Fgeo%2FGeoTools.java;h=7571da7a8e03da338c0f04f5783c5366f9a08d28;hb=03c171b5d502b461c534816c3c11cae889aef3c1;hp=166c686a4386089895da398f8b77325d389f59a8;hpb=7877822780b4d4b98e117e403a4c34034807dd54;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.geo/src/org/argeo/app/geo/GeoTools.java b/org.argeo.app.geo/src/org/argeo/app/geo/GeoTools.java
index 166c686..7571da7 100644
--- a/org.argeo.app.geo/src/org/argeo/app/geo/GeoTools.java
+++ b/org.argeo.app.geo/src/org/argeo/app/geo/GeoTools.java
@@ -1,11 +1,9 @@
 package org.argeo.app.geo;
 
 import org.argeo.api.cms.CmsLog;
+import org.geotools.api.filter.FilterFactory;
+import org.geotools.api.style.StyleFactory;
 import org.geotools.factory.CommonFactoryFinder;
-import org.geotools.geometry.jts.JTSFactoryFinder;
-import org.geotools.styling.StyleFactory;
-import org.locationtech.jts.geom.GeometryFactory;
-import org.opengis.filter.FilterFactory2;
 
 /**
  * Factories initialisation and workarounds for the GeoTools library. The idea
@@ -16,15 +14,13 @@ import org.opengis.filter.FilterFactory2;
 public class GeoTools {
 	private final static CmsLog log = CmsLog.getLog(GeoTools.class);
 
-	public final static GeometryFactory GEOMETRY_FACTORY;
 	public final static StyleFactory STYLE_FACTORY;
-	public final static FilterFactory2 FILTER_FACTORY;
+	public final static FilterFactory FILTER_FACTORY;
 
 	static {
 		try {
-			GEOMETRY_FACTORY = JTSFactoryFinder.getGeometryFactory();
 			STYLE_FACTORY = CommonFactoryFinder.getStyleFactory();
-			FILTER_FACTORY = CommonFactoryFinder.getFilterFactory2();
+			FILTER_FACTORY = CommonFactoryFinder.getFilterFactory();
 		} catch (RuntimeException e) {
 			log.error("Basic GeoTools initialisation failed, geographical utilities are probably not available", e);
 			throw e;