Merge pull request #812 from cambridge-cares/808-add-pgrouting-dataset-type-to-stack-data-uploader

808 add pgrouting dataset type to stack data uploader

Author: cmclscourtney

Deploy/stacks/dynamic/examples/datasets/inputs/config/routing.json

@@ -0,0 +1,13 @@
+{
+    "database": "postgres",
+    "workspace": "the_world_avatar",
+    "datasetDirectory": "routing",
+    "dataSubsets": [
+        {
+            "type": "OSMRouting",
+            "skip": false,
+            "schema": "public",
+            "name": "routing"
+        }
+    ]
+}

Deploy/stacks/dynamic/examples/datasets/inputs/data/routing/README.md

@@ -0,0 +1 @@
+.osm files can be found on https://www.openstreetmap.org/ and a xml config file can be found on https://github.com/pgRouting/osm2pgrouting/blob/main/mapconfig.xml.

Deploy/stacks/dynamic/stack-clients/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   stack-client:
-    image: ghcr.io/cambridge-cares/stack-client${IMAGE_SUFFIX}:1.15.2
+    image: ghcr.io/cambridge-cares/stack-client${IMAGE_SUFFIX}:1.16.0
     secrets:
       - blazegraph_password
       - postgis_password

Deploy/stacks/dynamic/stack-clients/pom.xml

@@ -7,7 +7,7 @@
 
   <groupId>com.cmclinnovations</groupId>
   <artifactId>stack-clients</artifactId>
-  <version>1.15.2</version>
+  <version>1.16.0</version>
 
   <name>Stack Clients</name>
   <url>https://theworldavatar.io</url>

Deploy/stacks/dynamic/stack-clients/src/main/java/com/cmclinnovations/stack/clients/core/Option.java

@@ -0,0 +1,24 @@
+package com.cmclinnovations.stack.clients.core;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+public class Option {
+    private List<String> optionList;
+
+    @JsonCreator
+    public Option(String option) {
+        this.optionList = Arrays.asList(option);
+    }
+
+    @JsonCreator
+    public Option(List<String> option) {
+        this.optionList = option;
+    }
+
+    public List<String> getOptionList() {
+        return optionList;
+    }
+}

Deploy/stacks/dynamic/stack-clients/src/main/java/com/cmclinnovations/stack/clients/core/Options.java

@@ -0,0 +1,35 @@
+package com.cmclinnovations.stack.clients.core;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class Options {
+    @JsonProperty("options")
+    private final Map<String, Option> argOptions = new HashMap<>();
+    private final List<String> flags = new ArrayList<>();
+
+    public Options() {
+    }
+
+    public List<String> getOptionsList() {
+        List<String> optionsList = new ArrayList<>();
+        optionsList.addAll(flags);
+        argOptions.forEach((key, value) -> {
+            optionsList.add(key);
+            optionsList.addAll(value.getOptionList());
+        });
+        return optionsList;
+    }
+
+    public Map<String, Option> getArgOptions() {
+        return argOptions;
+    }
+
+    public List<String> getFlags() {
+        return flags;
+    }
+}

Deploy/stacks/dynamic/stack-clients/src/main/java/com/cmclinnovations/stack/clients/core/datasets/DataSubset.java

@@ -11,6 +11,7 @@
 @JsonSubTypes({
         @Type(value = Tabular.class, names = { "Tabular", "tabular" }),
         @Type(value = Vector.class, names = { "Vector", "vector" }),
+        @Type(value = OSMRouting.class, names = { "OSMRouting", "osmRouting", "OsmRouting", "osmrouting" }),
         @Type(value = Raster.class, names = { "Raster", "raster" }),
         @Type(value = RDF.class, names = { "Triples", "triples", "RDF", "rdf", "Quads", "quads" }),
         @Type(value = TBoxCSV.class, names = { "TBoxCSV", "TboxCSV", "tboxcsv" }),

Deploy/stacks/dynamic/stack-clients/src/main/java/com/cmclinnovations/stack/clients/core/datasets/GeoServerDataSubset.java

@@ -10,9 +10,9 @@ public boolean usesGeoServer() {
     @Override
     void loadInternal(Dataset parent) {
         super.loadInternal(parent);
-        createLayer(parent.getWorkspaceName(), parent.getDatabase());
+        createLayers(parent.getWorkspaceName(), parent.getDatabase());
     }
 
-    public abstract void createLayer(String workspaceName, String database);
+    public abstract void createLayers(String workspaceName, String database);
 
 }

Deploy/stacks/dynamic/stack-clients/src/main/java/com/cmclinnovations/stack/clients/core/datasets/OSMRouting.java

@@ -0,0 +1,55 @@
+package com.cmclinnovations.stack.clients.core.datasets;
+
+import java.nio.file.Path;
+
+import com.cmclinnovations.stack.clients.core.Options;
+import com.cmclinnovations.stack.clients.geoserver.GeoServerClient;
+import com.cmclinnovations.stack.clients.geoserver.GeoServerVectorSettings;
+import com.cmclinnovations.stack.clients.postgis.PGRoutingClient;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import it.geosolutions.geoserver.rest.encoder.metadata.virtualtable.GSVirtualTableEncoder;
+
+public class OSMRouting extends GeoServerDataSubset {
+    @JsonProperty
+    protected Options osm2PGRoutingOptions = new Options();
+
+    @JsonProperty
+    protected GeoServerVectorSettings waysGeoServerSettings = new GeoServerVectorSettings();
+    @JsonProperty
+    protected GeoServerVectorSettings verticesGeoServerSettings = new GeoServerVectorSettings();
+    @JsonProperty
+    protected GeoServerVectorSettings poiGeoServerSettings = new GeoServerVectorSettings();
+
+    @Override
+    public void loadData(Path dirPath, String database, String baseIRI) {
+        PGRoutingClient.getInstance().uploadRoutingDataDirectoryToPostGIS(database, dirPath.toString(),
+                getTablePrefix(), osm2PGRoutingOptions, false);
+    }
+
+    @Override
+    public void createLayers(String workspaceName, String database) {
+        createLayer(workspaceName, database, prefixTableName("ways"), waysGeoServerSettings);
+        createLayer(workspaceName, database, prefixTableName("ways_vertices_pgr"), verticesGeoServerSettings);
+        createLayer(workspaceName, database, prefixTableName("pointsofinterest"), poiGeoServerSettings);
+    }
+
+    private void createLayer(String workspaceName, String database, String layerName,
+            GeoServerVectorSettings geoServerVectorSettings) {
+        GSVirtualTableEncoder virtualTable = geoServerVectorSettings.getVirtualTable();
+        if (null != virtualTable) {
+            virtualTable.setSql(handleFileValues(virtualTable.getSql()));
+        }
+
+        GeoServerClient.getInstance()
+                .createPostGISLayer(workspaceName, database, layerName, geoServerVectorSettings);
+    }
+
+    private String prefixTableName(String tableName) {
+        return getTablePrefix() + tableName;
+    }
+
+    private String getTablePrefix() {
+        return getName() + "_";
+    }
+}

Deploy/stacks/dynamic/stack-clients/src/main/java/com/cmclinnovations/stack/clients/core/datasets/Raster.java

@@ -25,7 +25,7 @@ public void loadData(Path dirPath, String database, String baseIRI) {
     }
 
     @Override
-    public void createLayer(String workspaceName, String database) {
+    public void createLayers(String workspaceName, String database) {
         GeoServerClient.getInstance()
                 .createGeoTiffLayer(workspaceName, getName(), database, PostGISClient.DEFAULT_SCHEMA_NAME,
                         geoServerSettings);