minor change

3dcitydb · Jul 4, 2024 · 976ccfc · 976ccfc
1 parent 63c9572
commit 976ccfc
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 11 deletions.
diff --git a/citydb-database-postgres/src/main/java/org/citydb/database/postgres/SchemaAdapter.java b/citydb-database-postgres/src/main/java/org/citydb/database/postgres/SchemaAdapter.java
@@ -73,7 +73,22 @@ public int getMaximumNumberOfItemsForInOperator() {
     @Override
     public String getFeatureHierarchyQuery() {
         try {
-            return featureHierarchyQuery.get();
+            return PlainText.of(featureHierarchyQuery.get(),
+                    PlainText.of("F.ENVELOPE"),
+                    PlainText.of("G.GEOMETRY"),
+                    PlainText.of("A.MULTI_POINT")).toString();
+        } catch (Exception e) {
+            throw new IllegalStateException("Failed to create feature hierarchy query.", e);
+        }
+    }
+
+    @Override
+    public String getFeatureHierarchyQuery(int targetSRID) {
+        try {
+            return PlainText.of(featureHierarchyQuery.get(),
+                    PlainText.of(getTransformOperator("F.ENVELOPE", targetSRID)),
+                    PlainText.of(getTransformOperator("G.GEOMETRY", targetSRID)),
+                    PlainText.of(getTransformOperator("A.MULTI_POINT", targetSRID))).toString();
         } catch (Exception e) {
             throw new IllegalStateException("Failed to create feature hierarchy query.", e);
         }
@@ -155,7 +170,7 @@ private String readFeatureHierarchyQuery() throws IOException {
         }
     }
 
-    public String readRecursiveImplicitGeometryQuery() throws IOException {
+    private String readRecursiveImplicitGeometryQuery() throws IOException {
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(Objects.requireNonNull(
                 SchemaAdapter.class.getResourceAsStream("/org/citydb/database/postgres/query_recursive_implicit_geometry.sql"))))) {
             return reader.lines()

diff --git a/citydb-database/src/main/java/org/citydb/database/adapter/SchemaAdapter.java b/citydb-database/src/main/java/org/citydb/database/adapter/SchemaAdapter.java
@@ -28,6 +28,7 @@
 import org.citydb.database.util.SqlHelper;
 import org.citydb.sqlbuilder.common.SqlObject;
 import org.citydb.sqlbuilder.query.Select;
+import org.citydb.sqlbuilder.util.PlainText;
 
 public abstract class SchemaAdapter {
     protected final DatabaseAdapter adapter;
@@ -51,6 +52,8 @@ protected SchemaAdapter(DatabaseAdapter adapter) {
 
     public abstract String getFeatureHierarchyQuery();
 
+    public abstract String getFeatureHierarchyQuery(int targetSRID);
+
     public abstract SqlObject getRecursiveImplicitGeometryQuery(Select featureQuery);
 
     public abstract String getCreateIndex(Index index);
@@ -84,4 +87,10 @@ public SqlHelper getSqlHelper() {
     public IndexHelper getIndexHelper() {
         return indexHelper;
     }
+
+    public String getTransformOperator(String column, int targetSRID) {
+        return adapter.getGeometryAdapter().getSpatialOperationHelper()
+                .transform(PlainText.of(column), targetSRID)
+                .toString();
+    }
 }
diff --git a/citydb-operation/src/main/java/org/citydb/operation/exporter/ExportHelper.java b/citydb-operation/src/main/java/org/citydb/operation/exporter/ExportHelper.java
@@ -175,9 +175,7 @@ public String getInOperator(String column, Set<Long> values) {
     public String getTransformOperator(String column) {
         return adapter.getDatabaseMetadata().getSpatialReference().getSRID() == getSRID() ?
                 column :
-                adapter.getGeometryAdapter().getSpatialOperationHelper()
-                        .transform(PlainText.of(column), getSRID())
-                        .toString();
+                adapter.getSchemaAdapter().getTransformOperator(column, getSRID());
     }
 
     Feature exportFeature(long id, long sequenceId) throws ExportException {

diff --git a/citydb-operation/src/main/java/org/citydb/operation/exporter/feature/FeatureExporter.java b/citydb-operation/src/main/java/org/citydb/operation/exporter/feature/FeatureExporter.java
@@ -28,7 +28,6 @@
 import org.citydb.operation.exporter.ExportHelper;
 import org.citydb.operation.exporter.common.DatabaseExporter;
 import org.citydb.operation.exporter.hierarchy.HierarchyBuilder;
-import org.citydb.sqlbuilder.util.PlainText;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -42,11 +41,9 @@ public FeatureExporter(ExportHelper helper) throws SQLException {
     }
 
     private String getQuery() {
-        return PlainText.of(adapter.getSchemaAdapter().getFeatureHierarchyQuery(),
-                        PlainText.of(helper.getTransformOperator("F.ENVELOPE")),
-                        PlainText.of(helper.getTransformOperator("G.GEOMETRY")),
-                        PlainText.of(helper.getTransformOperator("A.MULTI_POINT"))
-                ).toString();
+        return adapter.getDatabaseMetadata().getSpatialReference().getSRID() == helper.getSRID() ?
+                adapter.getSchemaAdapter().getFeatureHierarchyQuery() :
+                adapter.getSchemaAdapter().getFeatureHierarchyQuery(helper.getSRID());
     }
 
     public Feature doExport(long id) throws ExportException, SQLException {