diff --git a/plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF index 38f4feacfa1aa9db4bca0e03522d458805cf8760..635b4a30dfd36989be9a0a13b26d35dada5146e3 100644 --- a/plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF +++ b/plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Release-Date: 20190520 Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.jkiss.dbeaver.model, org.eclipse.core.runtime, - org.jkiss.bundle.gis + org.jkiss.bundle.gis;visibility:=reexport Bundle-ClassPath: . Export-Package: org.jkiss.dbeaver.data.gis.handlers, org.jkiss.dbeaver.model.gis diff --git a/plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/data/gis/handlers/GISGeometryValueHandler.java b/plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/data/gis/handlers/GISGeometryValueHandler.java index 3b4e6cda0ddfd7ee650f384b1d32727e39b60029..28964e5d3c1fd8323479ba5df0e211f3ef99cff3 100644 --- a/plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/data/gis/handlers/GISGeometryValueHandler.java +++ b/plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/data/gis/handlers/GISGeometryValueHandler.java @@ -103,7 +103,7 @@ public class GISGeometryValueHandler extends JDBCAbstractValueHandler { } else if (object instanceof Geometry) { geometry = new DBGeometry((Geometry)object); } else if (object instanceof byte[]) { - Geometry jtsGeometry = GeometryConverter.getInstance().from((byte[]) object); + Geometry jtsGeometry = getGeometryFromBinaryFormat(session, (byte[]) object); // if (invertCoordinates) { // jtsGeometry.apply(GeometryConverter.INVERT_COORDINATE_FILTER); // } @@ -120,6 +120,10 @@ public class GISGeometryValueHandler extends JDBCAbstractValueHandler { return geometry; } + protected Geometry getGeometryFromBinaryFormat(DBCSession session, byte[] object) throws DBCException { + return GeometryConverter.getInstance().from(object); + } + @NotNull @Override public String getValueDisplayString(@NotNull DBSTypedObject column, Object value, @NotNull DBDDisplayFormat format) {