From 75c9b001580b5cdcf1bd3c59794312b25105ed86 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Wed, 11 Feb 2015 15:22:06 +0000
Subject: [PATCH] Added Quadrant

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@111907 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 ...Execution4GeospatialCreateCoordinates.java | 22 +++++++++++--
 .../user/td/gwtservice/shared/Constants.java  |  2 ++
 .../GeospatialCreateCoordinatesSession.java   | 31 +++++++++++++++++--
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialCreateCoordinates.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialCreateCoordinates.java
index ca714a5..4971d25 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialCreateCoordinates.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeospatialCreateCoordinates.java
@@ -98,11 +98,27 @@ public class OpExecution4GeospatialCreateCoordinates extends OpExecutionBuilder
 				latitudeColumnReference);
 		map.put(Constants.PARAMETER_GEOSPATIAL_CREATE_COORDINATES_LONGITUDE,
 				longitudeColumnReference);
-		map.put(Constants.PARAMETER_GEOSPATIAL_CREATE_COORDINATES_FEATURE,
-				geospatialCreateCoordinatesSession.getType().getId());
+		
 		map.put(Constants.PARAMETER_GEOSPATIAL_CREATE_COORDINATES_USER,
 				aslSession.getUsername());
-
+		switch(geospatialCreateCoordinatesSession.getType()){
+		case C_SQUARE:
+			map.put(Constants.PARAMETER_GEOSPATIAL_CREATE_COORDINATES_FEATURE,
+					geospatialCreateCoordinatesSession.getType().getId());
+			break;
+		case OCEAN_AREA:
+			map.put(Constants.PARAMETER_GEOSPATIAL_CREATE_COORDINATES_FEATURE,
+					geospatialCreateCoordinatesSession.getType().getId());
+			if(geospatialCreateCoordinatesSession.isHasQuadrant()){
+				map.put(Constants.PARAMETER_GEOSPATIAL_CREATE_COORDINATES_QUADRANT,
+						geospatialCreateCoordinatesSession.getQuadrant());
+			} 
+			break;
+		default:
+			break;
+		
+		}
+	
 		invocation = new OperationExecution(
 				operationDefinition.getOperationId(), map);
 
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java
index aa54114..57fa1b2 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java
@@ -115,4 +115,6 @@ public class Constants {
 	public static final String PARAMETER_GEOSPATIAL_CREATE_COORDINATES_LONGITUDE = "longitude";
 	public static final String PARAMETER_GEOSPATIAL_CREATE_COORDINATES_FEATURE = "feature";
 	public static final String PARAMETER_GEOSPATIAL_CREATE_COORDINATES_USER = "user";
+	public static final String PARAMETER_GEOSPATIAL_CREATE_COORDINATES_QUADRANT = "quadrant";
+	
 }
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geospatial/GeospatialCreateCoordinatesSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geospatial/GeospatialCreateCoordinatesSession.java
index f0f2988..4e3017b 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geospatial/GeospatialCreateCoordinatesSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/geospatial/GeospatialCreateCoordinatesSession.java
@@ -19,6 +19,8 @@ public class GeospatialCreateCoordinatesSession implements Serializable {
 	private ColumnData latitude;
 	private ColumnData longitude;
 	private GeospatialCoordinatesType type;
+	private boolean hasQuadrant;
+	private ColumnData quadrant;
 
 	public GeospatialCreateCoordinatesSession() {
 	}
@@ -29,14 +31,18 @@ public class GeospatialCreateCoordinatesSession implements Serializable {
 	 * @param latitude
 	 * @param longitude
 	 * @param type
+	 * @param hasQuadrant TODO
+	 * @param quadrant TODO
 	 */
 	public GeospatialCreateCoordinatesSession(TRId trId, ColumnData latitude,
-			ColumnData longitude, GeospatialCoordinatesType type) {
+			ColumnData longitude, GeospatialCoordinatesType type, boolean hasQuadrant, ColumnData quadrant) {
 		super();
 		this.trId = trId;
 		this.latitude = latitude;
 		this.longitude = longitude;
 		this.type = type;
+		this.hasQuadrant=hasQuadrant;
+		this.quadrant=quadrant;
 	}
 
 	public TRId getTrId() {
@@ -71,14 +77,33 @@ public class GeospatialCreateCoordinatesSession implements Serializable {
 		this.type = type;
 	}
 
+	public boolean isHasQuadrant() {
+		return hasQuadrant;
+	}
+
+	public void setHasQuadrant(boolean hasQuadrant) {
+		this.hasQuadrant = hasQuadrant;
+	}
+
+	public ColumnData getQuadrant() {
+		return quadrant;
+	}
+
+	public void setQuadrant(ColumnData quadrant) {
+		this.quadrant = quadrant;
+	}
+
 	@Override
 	public String toString() {
-		return "CreateGeospatialCoordinatesSession [trId=" + trId
+		return "GeospatialCreateCoordinatesSession [trId=" + trId
 				+ ", latitude=" + latitude + ", longitude=" + longitude
-				+ ", type=" + type + "]";
+				+ ", type=" + type + ", hasQuadrant=" + hasQuadrant
+				+ ", quadrant=" + quadrant + "]";
 	}
 
 	
 
 	
+
+	
 }