support multiple face coordinates in upload and explicit. optionaly use Coordinates as a wrapper of multiple rectangles

itaibenari · itaibenari · commit b7336526f786 · 2014-01-03T00:28:42.000+02:00
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Coordinates.java b/cloudinary-core/src/main/java/com/cloudinary/Coordinates.java
@@ -0,0 +1,36 @@
+package com.cloudinary;
+
+import java.util.Collection;
+import java.util.ArrayList;
+import org.apache.commons.lang.StringUtils;
+import java.awt.Rectangle;
+public class Coordinates {
+
+	Collection<Rectangle> coordinates = new ArrayList<Rectangle>();
+	
+	public Coordinates() {
+	}
+
+	public Coordinates(Collection<Rectangle> coordinates) {
+		this.coordinates = coordinates;
+	}
+
+	public void addRect(Rectangle rect) {
+		this.coordinates.add(rect);
+	}
+
+	
+	public Collection<Rectangle> underlaying() {
+		return this.coordinates;
+	}
+
+	@Override
+	public String toString() {
+		ArrayList<String> rects = new ArrayList<String>();
+		for (Rectangle rect : this.coordinates) {
+			rects.add(rect.x + "," + rect.y + "," + rect.width + "," + rect.height);
+		}
+		return StringUtils.join(rects, "|");
+	}
+
+}
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Uploader.java b/cloudinary-core/src/main/java/com/cloudinary/Uploader.java
@@ -63,7 +63,9 @@ public Map<String, Object> buildUploadParams(Map options) {
 		params.put("proxy", (String) options.get("proxy"));
 		params.put("folder", (String) options.get("folder"));
 		params.put("tags", StringUtils.join(Cloudinary.asArray(options.get("tags")), ","));
-		params.put("face_coordinates", StringUtils.join(Cloudinary.asArray(options.get("face_coordinates")), ","));
+		if (options.get("face_coordinates") != null) {
+			params.put("face_coordinates", options.get("face_coordinates").toString());
+		}
 		params.put("allowed_formats", StringUtils.join(Cloudinary.asArray(options.get("allowed_formats")), ","));
 		Map<String,String> inputContext = null;
 		if (options.get("context") != null && options.get("context") instanceof Map) {
diff --git a/cloudinary-core/src/test/java/com/cloudinary/test/UploaderTest.java b/cloudinary-core/src/test/java/com/cloudinary/test/UploaderTest.java
@@ -11,11 +11,14 @@
 import java.util.List;
 import java.util.Map;
 
+import java.awt.Rectangle;
+
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.cloudinary.Cloudinary;
+import com.cloudinary.Coordinates;
 import com.cloudinary.Transformation;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
@@ -216,27 +219,44 @@ public void testAllowedFormatsWithFormat() throws Exception {
     @Test
     public void testFaceCoordinates() throws Exception {
     	//should allow sending face coordinates
-    	Long[] coordinates = new Long[]{120L,30L,109L,150L};
+    	Coordinates coordinates = new Coordinates();
+    	Rectangle rect1 = new Rectangle(121,31,110,151);
+    	Rectangle rect2 = new Rectangle(120,30,109,150);
+    	coordinates.addRect(rect1);
+    	coordinates.addRect(rect2);
     	Map result = cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap("face_coordinates", coordinates, "faces", true));
     	org.json.simple.JSONArray resultFaces = (org.json.simple.JSONArray) result.get("faces");
-    	assertEquals(1, resultFaces.size());
+    	assertEquals(2, resultFaces.size());
+    	
     	Object[] resultCoordinates = ((org.json.simple.JSONArray) resultFaces.get(0)).toArray();
-    	assertEquals(4, resultCoordinates.length);
-    	for (int i=0; i < resultCoordinates.length; i++) {
-    		assertEquals(coordinates[i], resultCoordinates[i]);
-    	}
     	
-    	Long[] differentCoordinates = new Long[]{121L,31L,110L,151L};
+    	assertEquals((long)rect1.x, resultCoordinates[0]);
+    	assertEquals((long)rect1.y, resultCoordinates[1]);
+    	assertEquals((long)rect1.width, resultCoordinates[2]);
+    	assertEquals((long)rect1.height, resultCoordinates[3]);
+    	
+    	resultCoordinates = ((org.json.simple.JSONArray) resultFaces.get(1)).toArray();
+    	
+    	assertEquals((long)rect2.x, resultCoordinates[0]);
+    	assertEquals((long)rect2.y, resultCoordinates[1]);
+    	assertEquals((long)rect2.width, resultCoordinates[2]);
+    	assertEquals((long)rect2.height, resultCoordinates[3]);
+    	
+    	Coordinates differentCoordinates = new Coordinates();
+    	Rectangle rect3 = new Rectangle(122,32,111,152);
+    	differentCoordinates.addRect(rect3);
     	cloudinary.uploader().explicit((String) result.get("public_id"), Cloudinary.asMap("face_coordinates", differentCoordinates, "faces", true, "type", "upload"));
     	Map info = cloudinary.api().resource((String) result.get("public_id"), Cloudinary.asMap("faces", true));
     	
     	resultFaces = (org.json.simple.JSONArray) info.get("faces");
     	assertEquals(1, resultFaces.size());
     	resultCoordinates = ((org.json.simple.JSONArray) resultFaces.get(0)).toArray();
-    	assertEquals(4, resultCoordinates.length);
-    	for (int i=0; i < resultCoordinates.length; i++) {
-    		assertEquals(differentCoordinates[i], resultCoordinates[i]);
-    	}
+
+    	assertEquals((long)rect3.x, resultCoordinates[0]);
+    	assertEquals((long)rect3.y, resultCoordinates[1]);
+    	assertEquals((long)rect3.width, resultCoordinates[2]);
+    	assertEquals((long)rect3.height, resultCoordinates[3]);
+    	
     }
     
     @Test
