Updated definition to support new obsSetEncoded element (type = xmf) made observ…

…ations now fixed to the wireline format (either java or xmf).  

@@ -92,34 +92,48 @@
             <elem name="typeShape" multiplicity="0..*" type="ShapeType">
                 <comment>
                     Specifies the preferred shape types to provide estimates in. The highest
-                    ranking estimate will be returned in this specified shape types if supported.\n
-If not specified, the set defaults to: Spheroid, Circle.
+                    ranking estimate will be returned in this specified shape types if supported.
+                    If not specified, the set defaults to: Spheroid, Circle.
                 </comment>
             </elem>
 
             <elem name="state" multiplicity="0..1" type="StateInfo" ord="90">
                 <comment>
-                    Specifies the position to initialize the state of the positioning engine.\n
+                    Specifies the position to initialize the state of the positioning engine.
 					At  least one of observations or state is required,
 					otherwise there is insufficient data to process.
                 </comment>
             </elem>
 
-            <elem name="encObs" multiplicity="0..1" type="EncodingFormat" default="0" ord="88">
+            <elem name="obsSetEncodedFmt" multiplicity="0..1" type="EncodingFormat" default="0" ord="88">
                 <comment>
-                    Observation set encoding format. Observations may be passed to the service in
-                    an encoding format different than that outer wire format.
-					By default wire protocol native format is assumed.
+                    Encoded observation set encoding format. Observations may be passed to the service in
+                    an encoding format different than the wire format, encoded in accordance to the 
+                    format defined by the this field.   By default native format (XMF) is specified.
                 </comment>
             </elem>
 
-            <elem name="observations" multiplicity="0..1" type="ObservationSet" encoding ="encObs" ord="89">
+            <elem name="observations" multiplicity="0..1" type="ObservationSet" ord="89">
                 <comment>
-                    Set of observation data encoded in the format specified by encObs.\n
-					At  least one of observations or state is required,
+                    Set of observation data comprising one ore
+					At  least one of observations, obsSetEncoded, or state is required,
 					otherwise there is insufficient data to process.
+                    
                 </comment>
             </elem>
+
+            
+            <elem name="obsSetEncoded" multiplicity="0..1" type="xmf" ord="90">
+            <comment>
+                Encoded observation set encoded in the format specified by "obsSetEncodedFmt". The base, 'native' format is XMF.  
+				At least one of observations, obsSetEncoded, or state is required,	otherwise there is insufficient data to process.
+				Encoded observations have a base format type of xmf, which may be further encoded with the user defined encoding.
+            </comment>
+            <comment>
+                Use this field to pass data in XMF or other encoded formats.  This allows mixed format messages to be supported (e.g. JSON wrapper around XMF observations).  To
+                learn more about obtaining support for custom encoding formats, please contact site administrator for further information.
+            </comment>            
+            </elem>
         </struct>
 
         <!-- Calculate Status-->