Merge commit 'origin/master' into subscriber-old-prot-removal

4 files changed, 33 insertions, 19 deletions

diff --git a/libcontextprovider/customer-tests/tests.xml b/libcontextprovider/customer-tests/tests.xml
index 020a453d..5d608172 100644
--- a/libcontextprovider/customer-tests/tests.xml
+++ b/libcontextprovider/customer-tests/tests.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <testdefinition version="0.1">
-  <suite name="libcontextprovider-tests">
-    <set name="libcontextprovider suite" description="libcontextprovider tests">
+  <suite name="libcontextprovider-tests" domain="Application Framework">
+    <set name="libcontextprovider-suite" description="libcontextprovider tests">
       <pre_steps>
         <step expected_result="0">/usr/share/libcontextprovider-tests/waitforsilence</step>
       </pre_steps>
diff --git a/libcontextsubscriber/customer-tests/tests.xml b/libcontextsubscriber/customer-tests/tests.xml
index 5174e218..d5b8cb9d 100644
--- a/libcontextsubscriber/customer-tests/tests.xml
+++ b/libcontextsubscriber/customer-tests/tests.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <testdefinition version="0.1">
   <!-- Test suite, name mandatory - the same as test package name -->
-  <suite name="libcontextsubscriber-tests">
+  <suite name="libcontextsubscriber-tests" domain="Application Framework">
     <!-- At least one set per suite, name and description mandatory -->
-    <set name="libcontextsubscriber suite" description="libcontextsubscriber tests">
+    <set name="libcontextsubscriber-suite" description="libcontextsubscriber tests">
       <!-- Possibly some pre-steps to execute before running the test cases -->
       <pre_steps>
         <step expected_result="0">/usr/share/libcontextsubscriber-tests/waitforsilence</step>
diff --git a/spec/core.context b/spec/core.context
index 52f36283..0b639d85 100644
--- a/spec/core.context
+++ b/spec/core.context
@@ -52,10 +52,11 @@ Location
 Best effort location information. If any of the keys are not
 appliciable to the current location, they will be unavailable.
   </doc>
-  <key name="Location.CurrentSource"
-       type="location-source">
+  <key name="Location.SatPositioningOn"
+       type="bool">
     <doc>
-      The current source of location information as an enumeration of strings.
+      A boolean indicating whether or not the location information is provided by
+      satellite positioning system e.g. GPS.
     </doc>
   </key>
   <key name="Location.ActiveSources">
@@ -66,6 +67,12 @@ appliciable to the current location, they will be unavailable.
       List of active sources of location information.
     </doc>
   </key>
+  <key name="Location.Accuracy"
+       type="distance">
+    <doc>
+      Accuracy of the location information, in meters.
+    </doc>
+  </key>
   <key name="Location.Coordinates">
     <type>
       <list type="number"/>
diff --git a/spec/core.types b/spec/core.types
index 1ebdaa5b..1a72b3c7 100644
--- a/spec/core.types
+++ b/spec/core.types
@@ -15,7 +15,7 @@ Fundamental types
       Any representable value.
     </doc>
   </type>
-  
+
   <type name="bool" base="value">
     <doc>
       A boolean.
@@ -33,7 +33,7 @@ Fundamental types
       "int32", "uint32", "int64", "uint64", or "double".
     </doc>
   </type>
-  
+
   <type name="integer" base="number">
     <params>
       <min doc="Lower bound" type="number"/>
@@ -46,13 +46,13 @@ Fundamental types
       the range of the integer.
     </doc>
   </type>
-  
+
   <type name="string" base="value">
     <doc>
       A string.
     </doc>
   </type>
-  
+
   <type name="list" base="value">
     <params>
       <min  doc="Minimum length" type="integer"/>
@@ -68,7 +68,7 @@ Fundamental types
       "value".
     </doc>
   </type>
-  
+
   <type name="map" base="value">
     <params>
       <rest doc="The allowed keys"/>
@@ -88,7 +88,7 @@ Fundamental types
       When no parameters are given, all keys are allowed.
     </doc>
   </type>
-  
+
   <doc>
 Generic types
 -------------
@@ -182,28 +182,28 @@ Specific types
       of the association tree are the parameters.
     </doc>
   </type>
-  
+
   <type name="temperature"
         doc="A temperature in Kelvin.">
     <base>
       <number min="0"/>
     </base>
   </type>
-  
+
   <type name="energy"
         base="number">
     <doc>
       An amount of energy, in Joule.
     </doc>
   </type>
-  
+
   <type name="power"
         base="number">
     <doc>
       A power, in Watt.
     </doc>
   </type>
-  
+
   <type name="time"
         base="integer">
     <doc>
@@ -211,14 +211,21 @@ Specific types
       00:00 January 1, 1970, UTC.
     </doc>
   </type>
-  
+
+  <type name="distance"
+        base="integer">
+    <doc>
+      A physical length between two points, in meters.
+    </doc>
+  </type>
+
   <type name="duration"
         base="integer">
     <doc>
       A time duration, in nano-seconds.
     </doc>
   </type>
-  
+
   <type name="percentage">
     <base>
       <integer min="0" max="100"/>