From 764fe79ef6f7343621fa805ea4308b0f7924d40a Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Thu, 16 May 2019 13:00:51 +0300
Subject: [PATCH] SQL Server geometry handler

---
 plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF     | 2 +-
 .../dbeaver/data/gis/handlers/GISGeometryValueHandler.java  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

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 38f4feacfa..635b4a30df 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 3b4e6cda0d..28964e5d3c 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) {
-- 
GitLab