projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapt to changes in GeoTools
[gpl/argeo-suite.git]
/
org.argeo.app.geo
/
src
/
org
/
argeo
/
app
/
geo
/
GeoTools.java
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 166c686a4386089895da398f8b77325d389f59a8..7571da7a8e03da338c0f04f5783c5366f9a08d28 100644
(file)
--- 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;
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.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
/**
* 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 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 StyleFactory STYLE_FACTORY;
- public final static FilterFactory
2
FILTER_FACTORY;
+ public final static FilterFactory FILTER_FACTORY;
static {
try {
static {
try {
- GEOMETRY_FACTORY = JTSFactoryFinder.getGeometryFactory();
STYLE_FACTORY = CommonFactoryFinder.getStyleFactory();
STYLE_FACTORY = CommonFactoryFinder.getStyleFactory();
- FILTER_FACTORY = CommonFactoryFinder.getFilterFactory
2
();
+ FILTER_FACTORY = CommonFactoryFinder.getFilterFactory();
} catch (RuntimeException e) {
log.error("Basic GeoTools initialisation failed, geographical utilities are probably not available", e);
throw e;
} catch (RuntimeException e) {
log.error("Basic GeoTools initialisation failed, geographical utilities are probably not available", e);
throw e;