Merge pull request #60 from AO-StreetArt/FrameApi

Frame api
AO-StreetArt · Apr 5, 2018 · e5b9542 · e5b9542
2 parents a887154 + 95430f4
commit e5b9542
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 28 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -143,6 +143,7 @@ services:
     image: aostreetart/adrestia:latest
     container_name: adrestia
     ports:
+      - "5886:5886/udp"
       - "5885:5885"
     logging:
       driver: gelf
@@ -152,4 +153,4 @@ services:
       registry:
         condition: service_healthy
     environment:
-      SPRING_APPLICATION_JSON: '{"logging":{"level":{"org":{"springframework":"INFO","mongodb":"INFO","hibernate":"INFO","apache":{"http":"INFO"}}}},"server":{"port":"5885","mongo":{"host":"document-db","port":"27017"},"zmq":{"redlist":{"duration":"10"},"greylist":{"duration":"10"},"blacklist":{"duration":"10"},"retries":"3","timeout":"10000"}},"management":{"port":"5885","address":"127.0.0.1"},"spring":{"application":{"name":"Adrestia"},"profiles":{"active":"dev"},"cloud":{"consul":{"host":"registry","discovery":{"preferIpAddress":false}}},"http":{"multipart":{"max-file-size":"128MB","max-request-size":"128MB"}}}}'
+      SPRING_APPLICATION_JSON: '{"logging":{"level":{"org":{"springframework":"INFO","mongodb":"INFO","hibernate":"INFO","apache":{"http":"INFO"}}}},"server":{"port":"5885","udp":{"port":"5886"},"mongo":{"host":"document-db","port":"27017"},"zmq":{"redlist":{"duration":"10"},"greylist":{"duration":"10"},"blacklist":{"duration":"10"},"retries":"3","timeout":"10000"}},"management":{"port":"5885","address":"127.0.0.1"},"spring":{"application":{"name":"Adrestia"},"profiles":{"active":"dev"},"cloud":{"consul":{"host":"registry","discovery":{"preferIpAddress":false}}},"http":{"multipart":{"max-file-size":"128MB","max-request-size":"128MB"}}}}'
diff --git a/src/main/java/adrestia/model/obj3/ObjectList.java b/src/main/java/adrestia/model/obj3/ObjectList.java
@@ -200,33 +200,46 @@ public String generateTransformOverwrite() {
     for (int i = 0; i < this.documents.length; i++) {
       returnString = returnString.concat("{\"key\": \"")
           .concat(this.documents[i].getKey())
-          .concat("\", \"translation\": [")
-          .concat(Double.toString(this.documents[i].getTranslation()[0]))
-          .concat(", ")
-          .concat(Double.toString(this.documents[i].getTranslation()[1]))
-          .concat(", ")
-          .concat(Double.toString(this.documents[i].getTranslation()[2]))
-          .concat("], \"euler_rotation\": [")
-          .concat(Double.toString(this.documents[i].getRotationEuler()[0]))
-          .concat(", ")
-          .concat(Double.toString(this.documents[i].getRotationEuler()[1]))
-          .concat(", ")
-          .concat(Double.toString(this.documents[i].getRotationEuler()[2]))
-          .concat("], \"quaternion_rotation\": [")
-          .concat(Double.toString(this.documents[i].getRotationQuaternion()[0]))
-          .concat(", ")
-          .concat(Double.toString(this.documents[i].getRotationQuaternion()[1]))
-          .concat(", ")
-          .concat(Double.toString(this.documents[i].getRotationQuaternion()[2]))
-          .concat(", ")
-          .concat(Double.toString(this.documents[i].getRotationQuaternion()[3]))
-          .concat("], \"scale\": [")
-          .concat(Double.toString(this.documents[i].getScale()[0]))
-          .concat(", ")
-          .concat(Double.toString(this.documents[i].getScale()[1]))
-          .concat(", ")
-          .concat(Double.toString(this.documents[i].getScale()[2]))
-          .concat("]}");
+          .concat("\"");
+      if (this.documents[i].getTranslation().length > 2) {
+        returnString = returnString.concat(", \"translation\": [")
+            .concat(Double.toString(this.documents[i].getTranslation()[0]))
+            .concat(", ")
+            .concat(Double.toString(this.documents[i].getTranslation()[1]))
+            .concat(", ")
+            .concat(Double.toString(this.documents[i].getTranslation()[2]))
+            .concat("]");
+      }
+      if (this.documents[i].getRotationEuler().length > 2) {
+        returnString = returnString.concat(", \"euler_rotation\": [")
+            .concat(Double.toString(this.documents[i].getRotationEuler()[0]))
+            .concat(", ")
+            .concat(Double.toString(this.documents[i].getRotationEuler()[1]))
+            .concat(", ")
+            .concat(Double.toString(this.documents[i].getRotationEuler()[2]))
+            .concat("]");
+      }
+      if (this.documents[i].getRotationQuaternion().length > 3) {
+        returnString = returnString.concat(", \"quaternion_rotation\": [")
+            .concat(Double.toString(this.documents[i].getRotationQuaternion()[0]))
+            .concat(", ")
+            .concat(Double.toString(this.documents[i].getRotationQuaternion()[1]))
+            .concat(", ")
+            .concat(Double.toString(this.documents[i].getRotationQuaternion()[2]))
+            .concat(", ")
+            .concat(Double.toString(this.documents[i].getRotationQuaternion()[3]))
+            .concat("]");
+      }
+      if (this.documents[i].getScale().length > 2) {
+        returnString = returnString.concat(", \"scale\": [")
+            .concat(Double.toString(this.documents[i].getScale()[0]))
+            .concat(", ")
+            .concat(Double.toString(this.documents[i].getScale()[1]))
+            .concat(", ")
+            .concat(Double.toString(this.documents[i].getScale()[2]))
+            .concat("]");
+      }
+      returnString = returnString.concat("}");
       if (i < this.documents.length - 1) {
         returnString = returnString.concat(",");
       }