Feature/map service

.gitignore

@@ -1,7 +1,5 @@
 target/
-service/logs/**
-logs/**
-**/.DS_Store
+logs/
 
 .idea/
 *.iml

api/pom.xml

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>gov.nsa.datawave.microservice</groupId>
+        <artifactId>datawave-microservice-parent</artifactId>
+        <version>4.0.1-SNAPSHOT</version>
+        <relativePath>../../../microservice-parent/pom.xml</relativePath>
+    </parent>
+    <artifactId>map-api</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <url>https://github.com/NationalSecurityAgency/datawave-map-service</url>
+    <scm>
+        <connection>scm:git:https://github.com/NationalSecurityAgency/datawave-map-service.git</connection>
+        <developerConnection>scm:git:git@github.com:NationalSecurityAgency/datawave-map-service.git</developerConnection>
+        <tag>HEAD</tag>
+        <url>https://github.com/NationalSecurityAgency/datawave-map-service</url>
+    </scm>
+    <properties>
+        <version.datawave>7.8.0-SNAPSHOT</version.datawave>
+        <version.geotools>29.0</version.geotools>
+        <version.jts>1.19.0</version.jts>
+        <version.microservice.metadata-utils>4.0.7-SNAPSHOT</version.microservice.metadata-utils>
+        <version.microservice.type-utils>3.1.2-SNAPSHOT</version.microservice.type-utils>
+        <version.mockito>4.5.1</version.mockito>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>gov.nsa.datawave.core</groupId>
+                <artifactId>datawave-core-geo</artifactId>
+                <version>${version.datawave}</version>
+            </dependency>
+            <dependency>
+                <groupId>gov.nsa.datawave.core</groupId>
+                <artifactId>datawave-core-jexl</artifactId>
+                <version>${version.datawave}</version>
+            </dependency>
+            <dependency>
+                <groupId>gov.nsa.datawave.core</groupId>
+                <artifactId>datawave-core-language</artifactId>
+                <version>${version.datawave}</version>
+            </dependency>
+            <dependency>
+                <groupId>gov.nsa.datawave.microservice</groupId>
+                <artifactId>metadata-utils</artifactId>
+                <version>${version.microservice.metadata-utils}</version>
+            </dependency>
+            <dependency>
+                <groupId>gov.nsa.datawave.microservice</groupId>
+                <artifactId>type-utils</artifactId>
+                <version>${version.microservice.type-utils}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>slf4j-reload4j</artifactId>
+                        <groupId>org.slf4j</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>log4j</artifactId>
+                        <groupId>log4j</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>*</artifactId>
+                        <groupId>org.geotools</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.geotools</groupId>
+                <artifactId>gt-epsg-hsql</artifactId>
+                <version>${version.geotools}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.geotools</groupId>
+                <artifactId>gt-geojson</artifactId>
+                <version>${version.geotools}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.locationtech.jts</groupId>
+                <artifactId>jts-core</artifactId>
+                <version>${version.jts}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-junit-jupiter</artifactId>
+                <version>${version.mockito}</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>gov.nsa.datawave.core</groupId>
+            <artifactId>datawave-core-geo</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>gov.nsa.datawave.core</groupId>
+            <artifactId>datawave-core-jexl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>gov.nsa.datawave.core</groupId>
+            <artifactId>datawave-core-language</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>gov.nsa.datawave.microservice</groupId>
+            <artifactId>metadata-utils</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>gov.nsa.datawave.microservice</groupId>
+            <artifactId>type-utils</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-epsg-hsql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-geojson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.locationtech.jts</groupId>
+            <artifactId>jts-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <repositories>
+        <repository>
+            <!--
+                This repository is a temporary work-around until we can publish artifacts to maven central.
+                This allows us to retrieve released microservice artifacts from our github repository.
+            -->
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <id>datawave-github-mvn-repo</id>
+            <url>https://raw.githubusercontent.com/NationalSecurityAgency/datawave/mvn-repo</url>
+        </repository>
+        <repository>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <id>osgeo-release</id>
+            <name>Open Source Geospatial Foundation Repository</name>
+            <url>https://repo.osgeo.org/repository/release/</url>
+        </repository>
+    </repositories>
+</project>

api/src/main/java/datawave/microservice/map/data/AbstractGeoTerms.java

@@ -0,0 +1,13 @@
+package datawave.microservice.map.data;
+
+public abstract class AbstractGeoTerms {
+    private String type;
+
+    public AbstractGeoTerms(String type) {
+        this.type = type;
+    }
+
+    public String getType() {
+        return type;
+    }
+}

api/src/main/java/datawave/microservice/map/data/GeoFeature.java

@@ -0,0 +1,39 @@
+package datawave.microservice.map.data;
+
+import org.geotools.feature.FeatureCollection;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import datawave.microservice.map.data.serialization.FeatureCollectionDeserializer;
+import datawave.microservice.map.data.serialization.FeatureCollectionSerializer;
+
+public class GeoFeature {
+    private String wkt;
+    @JsonSerialize(using = FeatureCollectionSerializer.class)
+    @JsonDeserialize(using = FeatureCollectionDeserializer.class)
+    private FeatureCollection geoJson;
+
+    public GeoFeature() {}
+
+    public GeoFeature(String wkt, FeatureCollection geoJson) {
+        this.wkt = wkt;
+        this.geoJson = geoJson;
+    }
+
+    public String getWkt() {
+        return wkt;
+    }
+
+    public void setWkt(String wkt) {
+        this.wkt = wkt;
+    }
+
+    public FeatureCollection getGeoJson() {
+        return geoJson;
+    }
+
+    public void setGeoJson(FeatureCollection geoJson) {
+        this.geoJson = geoJson;
+    }
+}

api/src/main/java/datawave/microservice/map/data/GeoFeatures.java

@@ -0,0 +1,24 @@
+package datawave.microservice.map.data;
+
+public class GeoFeatures {
+
+    private GeoFeature geometry;
+
+    private AbstractGeoTerms queryRanges;
+
+    public GeoFeature getGeometry() {
+        return geometry;
+    }
+
+    public void setGeometry(GeoFeature geometry) {
+        this.geometry = geometry;
+    }
+
+    public AbstractGeoTerms getQueryRanges() {
+        return queryRanges;
+    }
+
+    public void setQueryRanges(AbstractGeoTerms queryRanges) {
+        this.queryRanges = queryRanges;
+    }
+}

api/src/main/java/datawave/microservice/map/data/GeoFunctionFeature.java

@@ -0,0 +1,51 @@
+package datawave.microservice.map.data;
+
+import java.util.Set;
+
+import org.opengis.feature.simple.SimpleFeature;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import datawave.microservice.map.data.serialization.FeatureDeserializer;
+import datawave.microservice.map.data.serialization.FeatureSerializer;
+
+public class GeoFunctionFeature {
+    private String function;
+    private Set<String> fields;
+    @JsonSerialize(using = FeatureSerializer.class)
+    @JsonDeserialize(using = FeatureDeserializer.class)
+    private SimpleFeature geoJson;
+
+    public GeoFunctionFeature() {}
+
+    public GeoFunctionFeature(String function, Set<String> fields, SimpleFeature geoJson) {
+        this.function = function;
+        this.fields = fields;
+        this.geoJson = geoJson;
+    }
+
+    public String getFunction() {
+        return function;
+    }
+
+    public void setFunction(String function) {
+        this.function = function;
+    }
+
+    public Set<String> getFields() {
+        return fields;
+    }
+
+    public void setFields(Set<String> fields) {
+        this.fields = fields;
+    }
+
+    public SimpleFeature getGeoJson() {
+        return geoJson;
+    }
+
+    public void setGeoJson(SimpleFeature geoJson) {
+        this.geoJson = geoJson;
+    }
+}

api/src/main/java/datawave/microservice/map/data/GeoQueryFeatures.java

@@ -0,0 +1,37 @@
+package datawave.microservice.map.data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class GeoQueryFeatures {
+    private List<GeoFunctionFeature> geoFunctions;
+    private Map<String,AbstractGeoTerms> geoByField;
+
+    public GeoQueryFeatures() {
+        geoFunctions = new ArrayList<>();
+        geoByField = new HashMap<>();
+    }
+
+    public GeoQueryFeatures(List<GeoFunctionFeature> geoFunctions, Map<String,AbstractGeoTerms> geoByField) {
+        this.geoFunctions = geoFunctions;
+        this.geoByField = geoByField;
+    }
+
+    public List<GeoFunctionFeature> getFunctions() {
+        return geoFunctions;
+    }
+
+    public void setFunctions(List<GeoFunctionFeature> geoFunctions) {
+        this.geoFunctions = geoFunctions;
+    }
+
+    public Map<String,AbstractGeoTerms> getGeoByField() {
+        return geoByField;
+    }
+
+    public void setGeoByField(Map<String,AbstractGeoTerms> geoByField) {
+        this.geoByField = geoByField;
+    }
+}

api/src/main/java/datawave/microservice/map/data/geo/GeoPointTerms.java

@@ -0,0 +1,26 @@
+package datawave.microservice.map.data.geo;
+
+import datawave.microservice.map.data.AbstractGeoTerms;
+import datawave.microservice.map.data.GeoFeature;
+
+public class GeoPointTerms extends AbstractGeoTerms {
+    // terms and ranges are encoded as features in the geojson
+    private GeoFeature geo;
+
+    public GeoPointTerms(String type) {
+        super(type);
+    }
+
+    public GeoPointTerms(GeoFeature geo) {
+        super("Geo Point");
+        this.geo = geo;
+    }
+
+    public GeoFeature getGeo() {
+        return geo;
+    }
+
+    public void setGeo(GeoFeature geo) {
+        this.geo = geo;
+    }
+}

api/src/main/java/datawave/microservice/map/data/geowave/GeoWaveGeometryTerms.java

@@ -0,0 +1,28 @@
+package datawave.microservice.map.data.geowave;
+
+import java.util.Map;
+
+import datawave.microservice.map.data.AbstractGeoTerms;
+import datawave.microservice.map.data.GeoFeature;
+
+public class GeoWaveGeometryTerms extends AbstractGeoTerms {
+    // terms and ranges are encoded as features in the geojson
+    private Map<Integer,GeoFeature> geoByTier;
+
+    public GeoWaveGeometryTerms(String type) {
+        super(type);
+    }
+
+    public GeoWaveGeometryTerms(Map<Integer,GeoFeature> geoByTier) {
+        super("GeoWave Geometry");
+        this.geoByTier = geoByTier;
+    }
+
+    public Map<Integer,GeoFeature> getGeoByTier() {
+        return geoByTier;
+    }
+
+    public void setGeoByTier(Map<Integer,GeoFeature> geoByTier) {
+        this.geoByTier = geoByTier;
+    }
+}