GEOMESA-428 checking for SRS when determining axis order in binary output format

elahrvivaz · anthonyccri · commit d9bf501dd49c · 2014-10-23T10:26:48.000-04:00
* adding default dtg from schema if not specified in request
* ensuring 24 byte encodings all are 24 bytes
diff --git a/geomesa-filter/src/main/scala/org/locationtech/geomesa/filter/function/Convert2ViewerFunction.scala b/geomesa-filter/src/main/scala/org/locationtech/geomesa/filter/function/Convert2ViewerFunction.scala
@@ -41,7 +41,7 @@ class Convert2ViewerFunction
     val id    = getExpression(0).evaluate(obj).asInstanceOf[String]
     val geom  = getExpression(1).evaluate(obj).asInstanceOf[Point]
     val dtg   = dtg2Long(getExpression(2).evaluate(obj))
-    Base64.encodeBytes(encode(EncodedValues(geom.getY.toFloat, geom.getX.toFloat, dtg, None, Some(id))))
+    Base64.encodeBytes(encode(ExtendedValues(geom.getY.toFloat, geom.getX.toFloat, dtg, None, Some(id))))
   }
 
   private def dtg2Long(d: Any): Long = d match {
@@ -69,15 +69,33 @@ object Convert2ViewerFunction {
    * @param values
    * @return
    */
-  def encode(values: EncodedValues): Array[Byte] = {
-    val numBytes = if (values.label.isDefined) 24 else 16
-    val buf = ByteBuffer.allocate(numBytes).order(ByteOrder.LITTLE_ENDIAN)
-    putOption(buf, values.trackId, 4)
-    buf.putInt((values.dtg / 1000).toInt)
-    buf.putFloat(values.lat)
-    buf.putFloat(values.lon)
-    values.label.foreach(_ => putOption(buf, values.label, 8))
-    buf.array()
+  def encode(values: EncodedValues): Array[Byte] =
+    values match {
+      case BasicValues(lat, lon, dtg, trackId) =>
+        val buf = ByteBuffer.allocate(16).order(ByteOrder.LITTLE_ENDIAN)
+        put(buf, lat, lon, dtg, trackId)
+        buf.array()
+      case ExtendedValues(lat, lon, dtg, trackId, label) =>
+        val buf = ByteBuffer.allocate(24).order(ByteOrder.LITTLE_ENDIAN)
+        put(buf, lat, lon, dtg, trackId)
+        putOption(buf, label, 8)
+        buf.array()
+    }
+
+  /**
+   * Fills in the basic values
+   *
+   * @param buffer
+   * @param lat
+   * @param lon
+   * @param dtg
+   * @param trackId
+   */
+  private def put(buffer: ByteBuffer, lat: Float, lon: Float, dtg: Long, trackId: Option[String]): Unit = {
+    putOption(buffer, trackId, 4)
+    buffer.putInt((dtg / 1000).toInt)
+    buffer.putFloat(lat)
+    buffer.putFloat(lon)
   }
 
   /**
@@ -131,13 +149,27 @@ object Convert2ViewerFunction {
     val time = buf.getInt * 1000L
     val lat = buf.getFloat
     val lon = buf.getFloat
-    val label = if (encoded.length > 16) getOption(buf, 8) else None
-    EncodedValues(lat, lon, time, trackId, label)
+    if (encoded.length > 16) {
+      val label = getOption(buf, 8)
+      ExtendedValues(lat, lon, time, trackId, label)
+    } else {
+      BasicValues(lat, lon, time, trackId)
+    }
   }
 }
 
-case class EncodedValues(lat: Float,
-                         lon: Float,
-                         dtg: Long,
-                         trackId: Option[String] = None,
-                         label: Option[String] = None)
+sealed trait EncodedValues {
+  def lat: Float
+  def lon: Float
+  def dtg: Long
+  def trackId: Option[String]
+}
+
+case class BasicValues(lat: Float, lon: Float, dtg: Long, trackId: Option[String] = None)
+    extends EncodedValues
+
+case class ExtendedValues(lat: Float,
+                          lon: Float,
+                          dtg: Long,
+                          trackId: Option[String] = None,
+                          label: Option[String] = None) extends EncodedValues
diff --git a/geomesa-filter/src/test/scala/org/locationtech/geomesa/filter/function/Convert2ViewerFunctionTest.scala b/geomesa-filter/src/test/scala/org/locationtech/geomesa/filter/function/Convert2ViewerFunctionTest.scala
@@ -27,9 +27,7 @@ class Convert2ViewerFunctionTest extends Specification {
   "Convert2ViewerFunction" should {
 
     "encode and decode simple attributes" in {
-      val initial = EncodedValues(45.0f, 49.0f,
-                                  System.currentTimeMillis(),
-                                  Some("1200"))
+      val initial = BasicValues(45.0f, 49.0f, System.currentTimeMillis(), Some("1200"))
       val encoded = Convert2ViewerFunction.encode(initial)
       encoded must haveLength(16)
       val decoded = Convert2ViewerFunction.decode(encoded)
@@ -40,9 +38,7 @@ class Convert2ViewerFunctionTest extends Specification {
     }
 
     "encode and decode optional simple attributes" in {
-      val initial = EncodedValues(45.0f, 49.0f,
-                                  System.currentTimeMillis(),
-                                  None)
+      val initial = BasicValues(45.0f, 49.0f, System.currentTimeMillis(), None)
       val encoded = Convert2ViewerFunction.encode(initial)
       encoded must haveLength(16)
       val decoded = Convert2ViewerFunction.decode(encoded)
@@ -53,32 +49,36 @@ class Convert2ViewerFunctionTest extends Specification {
     }
 
     "encode and decode extended attributes" in {
-      val initial = EncodedValues(45.0f, 49.0f,
-                                  System.currentTimeMillis(),
-                                  Some("1200"),
-                                  Some("label"))
+      val initial = ExtendedValues(45.0f,
+                                   49.0f,
+                                   System.currentTimeMillis(),
+                                   Some("1200"),
+                                   Some("label"))
       val encoded = Convert2ViewerFunction.encode(initial)
       encoded must haveLength(24)
       val decoded = Convert2ViewerFunction.decode(encoded)
+      decoded must beAnInstanceOf[ExtendedValues]
       decoded.lat mustEqual(initial.lat)
       decoded.lon mustEqual(initial.lon)
       Math.abs(decoded.dtg - initial.dtg) must beLessThan(1000L) // dates get truncated to nearest second
       decoded.trackId mustEqual(initial.trackId)
-      decoded.label mustEqual(initial.label)
+      decoded.asInstanceOf[ExtendedValues].label mustEqual(initial.label)
     }
 
     "truncate long labels" in {
-      val initial = EncodedValues(45.0f, 49.0f,
-                                  System.currentTimeMillis(),
-                                  Some("track that is too long"),
-                                  Some("label that is too long"))
+      val initial = ExtendedValues(45.0f,
+                                   49.0f,
+                                   System.currentTimeMillis(),
+                                   Some("track that is too long"),
+                                   Some("label that is too long"))
       val encoded = Convert2ViewerFunction.encode(initial)
       val decoded = Convert2ViewerFunction.decode(encoded)
+      decoded must beAnInstanceOf[ExtendedValues]
       decoded.lat mustEqual(initial.lat)
       decoded.lon mustEqual(initial.lon)
       Math.abs(decoded.dtg - initial.dtg) must beLessThan(1000L) // dates get truncated to nearest second
       decoded.trackId.get mustEqual(initial.trackId.get.substring(0, 4))
-      decoded.label.get mustEqual(initial.label.get.substring(0, 8))
+      decoded.asInstanceOf[ExtendedValues].label.get mustEqual(initial.label.get.substring(0, 8))
     }
   }
 }
diff --git a/geomesa-plugin/pom.xml b/geomesa-plugin/pom.xml
@@ -128,6 +128,12 @@
             <artifactId>gt-process-feature</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.geotools.ogc</groupId>
+            <artifactId>net.opengis.wfs</artifactId>
+            <version>${gt.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.accumulo</groupId>
             <artifactId>accumulo-core</artifactId>
diff --git a/geomesa-plugin/src/main/scala/org/locationtech/geomesa/plugin/wfs/output/BinaryViewerOutputFormat.scala b/geomesa-plugin/src/main/scala/org/locationtech/geomesa/plugin/wfs/output/BinaryViewerOutputFormat.scala
