From d16ac863a883a3bdcd181d1e5d46fd7647d7298b Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Sun, 19 May 2019 16:38:42 +0300
Subject: [PATCH] #5936 Default SRID handling fix

---
 .../src/org/jkiss/dbeaver/ui/gis/panel/GISLeafletViewer.java    | 2 +-
 .../src/org/jkiss/dbeaver/ui/gis/panel/SelectCRSAction.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/panel/GISLeafletViewer.java b/plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/panel/GISLeafletViewer.java
index bd38562307..1ce1d25e44 100644
--- a/plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/panel/GISLeafletViewer.java
+++ b/plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/panel/GISLeafletViewer.java
@@ -223,7 +223,7 @@ public class GISLeafletViewer implements IGeometryValueEditor {
             if (srid == 0) {
                 srid = GeometryDataUtils.getDefaultSRID();
             }
-            if (srid == GeometryDataUtils.getDefaultSRID()) {
+            if (srid == GisConstants.DEFAULT_SRID) {
                 showMap = true;
                 actualSourceSRID = srid;
             } else {
diff --git a/plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/panel/SelectCRSAction.java b/plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/panel/SelectCRSAction.java
index be0a01f024..23d7ed0fff 100644
--- a/plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/panel/SelectCRSAction.java
+++ b/plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/panel/SelectCRSAction.java
@@ -72,7 +72,7 @@ class SelectCRSAction extends Action implements IMenuCreator {
             menuManager = new MenuManager();
             menuManager.setRemoveAllWhenShown(true);
             menuManager.addMenuListener(manager -> {
-                menuManager.add(new SetCRSAction(valueEditor, GeometryDataUtils.getDefaultSRID()));
+                menuManager.add(new SetCRSAction(valueEditor, GisConstants.DEFAULT_SRID));
                 menuManager.add(new SetCRSAction(valueEditor, GisConstants.DEFAULT_OSM_SRID));
                 menuManager.add(new Separator());
                 List<Integer> recentSRIDs = GISEditorUtils.getRecentSRIDs();
-- 
GitLab