Merge branch 'aws-r14' into 'master'

update storage with GeoJson schema

Closes #105

See merge request !411

provider/storage-aws/src/main/resources/application.properties

@@ -3,7 +3,7 @@ LOG_PREFIX=storage
 AUTHORIZE_API=${ENTITLEMENTS_BASE_URL}/api/entitlements/v2
 LEGALTAG_API=${LEGALTAG_BASE_URL}/api/legal/v1
 
-CRS_API=${CRS_CONVERSION_BASE_URL}/api/crs/converter/v2
+CRS_API=${CRS_CONVERSION_BASE_URL}/api/crs/converter/v3
 
 server.servlet.contextPath=/api/storage/v2/
 logging.level.org.springframework.web=${LOG_LEVEL:INFO}

storage-core/pom.xml

@@ -34,7 +34,7 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<springfox-version>2.7.0</springfox-version>
-		<os-core-common.version>0.14.0-rc6</os-core-common.version>
+		<os-core-common.version>0.15.0-SNAPSHOT</os-core-common.version>
 		<!--
 		<springfox-version>2.9.2</springfox-version>
 		-->

storage-core/src/main/java/org/opengroup/osdu/storage/conversion/CrsConversionService.java

@@ -145,6 +145,8 @@ public class CrsConversionService {
                     if (asIngestedCoordinates.has(Constants.TYPE) && (!asIngestedCoordinates.get(Constants.TYPE).isJsonNull())) fc.setType(asIngestedCoordinates.get(Constants.TYPE).getAsString());
                     if (asIngestedCoordinates.has(Constants.PROPERTIES) && (!asIngestedCoordinates.get(Constants.PROPERTIES).isJsonNull())) fc.setProperties(asIngestedCoordinates.getAsJsonObject(Constants.PROPERTIES));
                     if (asIngestedCoordinates.has(Constants.PERSISTABLE_REFERENCE_CRS) && (!asIngestedCoordinates.get(Constants.PERSISTABLE_REFERENCE_CRS).isJsonNull())) fc.setPersistableReferenceCrs(asIngestedCoordinates.get(Constants.PERSISTABLE_REFERENCE_CRS).getAsString());
+                    if (asIngestedCoordinates.has(Constants.COORDINATE_REFERENCE_SYSTEM_ID) && (!asIngestedCoordinates.get(Constants.COORDINATE_REFERENCE_SYSTEM_ID).isJsonNull())) fc.setCoordinateReferenceSystemID(asIngestedCoordinates.get(Constants.COORDINATE_REFERENCE_SYSTEM_ID).getAsString());
+                    if (asIngestedCoordinates.has(Constants.VERTICAL_UNIT_ID) && (!asIngestedCoordinates.get(Constants.VERTICAL_UNIT_ID).isJsonNull())) fc.setVerticalUnitID(asIngestedCoordinates.get(Constants.VERTICAL_UNIT_ID).getAsString());
                     if (asIngestedCoordinates.has(Constants.PERSISTABLE_REFERENCE_UNIT_Z) && (!asIngestedCoordinates.get(Constants.PERSISTABLE_REFERENCE_UNIT_Z).isJsonNull())) fc.setPersistableReferenceUnitZ(asIngestedCoordinates.get(Constants.PERSISTABLE_REFERENCE_UNIT_Z).getAsString());
                     if (asIngestedCoordinates.has(Constants.BBOX) && (!asIngestedCoordinates.get(Constants.BBOX).isJsonNull())) fc.setBbox(this.bboxValues(asIngestedCoordinates.getAsJsonArray(Constants.BBOX)));
 
@@ -166,6 +168,8 @@ public class CrsConversionService {
                         if (statusBuilder.getErrors().isEmpty()) {
                             ConvertGeoJsonResponse response = crsConverterService.convertGeoJson(request);
                             GeoJsonFeatureCollection wgs84Coordinates = response.getFeatureCollection();
+                            wgs84Coordinates.setCoordinateReferenceSystemID(null);
+                            wgs84Coordinates.setVerticalUnitID(null);
                             this.appendObjectInRecord(recordJsonObject, attributeName, wgs84Coordinates);
                         }
                     } catch (CrsConverterException crsEx) {