Merge lp:~thomas-voss/location-service/add_controller_and_service_configuration into lp:location-service/trunk

[Thomas Voß]

* Added tests for daemon and cli.
* Unified daemon and cli header and implementation files.
* Add a command-line interface to the service.
* Split up provider selection policy to rely on an interface ProviderEnumerator to ease in testing.
* Trimmed down on types.
* Removed connectivity API draft to prepare for simpler approach.
* Refactored includes.
* Added a configuration option to handle cell and wifi ID reporting.
* Add a mock for a connectivity API exposed to providers and reporters.
* Add units for connectivity api.
* Refactor cell class into namespace radio.

* Added tests for daemon and cli.
* Unified daemon and cli header and implementation files.
* Add a command-line interface to the service.
* Split up provider selection policy to rely on an interface ProviderEnumerator to ease in testing.
* Trimmed down on types.
* Removed connectivity API draft to prepare for simpler approach.
* Refactored includes.
* Added a configuration option to handle cell and wifi ID reporting.
* Add a mock for a connectivity API exposed to providers and reporters.
* Add units for connectivity api.
* Refactor cell class into namespace radio.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/location-service-ci/47/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/47/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:63
http://jenkins.qa.ubuntu.com/job/location-service-ci/48/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/48/rebuild

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Ok after properties-cpp gets approved from trusty NEW queue: https://launchpad.net/ubuntu/trusty/+queue?queue_state=0&queue_text=

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/location-service-ci/49/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/49/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:65
http://jenkins.qa.ubuntu.com/job/location-service-ci/50/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/50/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/location-service-ci/51/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/51/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:69
http://jenkins.qa.ubuntu.com/job/location-service-ci/52/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/52/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/location-service-ci/53/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/7/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/53/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:72
http://jenkins.qa.ubuntu.com/job/location-service-ci/54/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/8/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/54/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:75
http://jenkins.qa.ubuntu.com/job/location-service-ci/55/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/55/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:76
http://jenkins.qa.ubuntu.com/job/location-service-ci/56/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/10/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/56/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:78
http://jenkins.qa.ubuntu.com/job/location-service-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/57/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/location-service-ci/58/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/58/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:80
http://jenkins.qa.ubuntu.com/job/location-service-ci/59/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/13/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/59/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:81
http://jenkins.qa.ubuntu.com/job/location-service-ci/60/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/14/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/60/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:82
http://jenkins.qa.ubuntu.com/job/location-service-ci/61/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/61/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:82
http://jenkins.qa.ubuntu.com/job/location-service-ci/62/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/16/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/62/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:83
http://jenkins.qa.ubuntu.com/job/location-service-ci/65/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/19/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/65/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:84
http://jenkins.qa.ubuntu.com/job/location-service-ci/66/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/20/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/66/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/location-service-ci/67/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/21/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/67/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:86
http://jenkins.qa.ubuntu.com/job/location-service-ci/69/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/23/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/69/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:86
http://jenkins.qa.ubuntu.com/job/location-service-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/26

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/72/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:87
http://jenkins.qa.ubuntu.com/job/location-service-ci/73/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/27

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/73/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/location-service-autolanding/31/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-autolanding/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-autolanding/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-autolanding/2/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Job configuration regressed, reapproving now that it is fixed.

review: Approve

[lp:~thomas-voss/location-service/add_controller_and_service_configuration]

88. By Thomas Voß on 2014-02-03

Merge prerequisite branch.

89. By Thomas Voß on 2014-05-12

Rename visible_radio_cells to connected_radio_cells.
Add function to trigger a scan for visible wifis.
Add missing attributes in WirelessNetwork.

90. By Thomas Voß on 2014-05-19

Split out connectivity API for provider-integration purposes.
Make sure that the invalid value for a bounded integer range is available.

91. By Thomas Voß on 2014-05-19

[ Thomas Voß ]
* Patch version bump reflecting the toolchain switch.
* No change rebuild against boost1.55.
[ thomas-voss ]
* Re-enable onSessionDied().
[ Łukasz 'sil2100' Zemczak ]
* Bump the build-dependency on dbus-cpp due to the ABI change
[ thomas-voss ]
* Backport dummy provider and accompanying tests.
[ thomas-voss ]
* Force compilation against gcc 4.7.
[ thomas-voss ]
* * Fix a race when a session is created while another one ends. *
  Ensure a sensible minimum interval between consecutive location
  updates in the GPS provider. (LP: #1240878)
* Adjust to changes in new dbus-cpp version.

92. By Thomas Voß on 2014-05-19

Add pkgconfig setup for connectivity API.
Adjust acceptance tests to rely on private bus connection without dbus-test-runner.

93. By Thomas Voß on 2014-05-19

Add missing pkgconfig file.

94. By Thomas Voß on 2014-05-19

Adjust radio cell information to reflect information and values available from Android.
Add missing build dependency on process-cpp.

95. By Thomas Voß on 2014-05-19

Add documentation for BoundedInteger::from_percent.

96. By Thomas Voß on 2014-05-19

Add more documentation to RadioCell.h.

97. By Thomas Voß on 2014-05-19

Adjust debian installation setup to account for pkgconfig files now correctly being installed to arch-specific subdirs.

98. By Thomas Voß on 2014-05-19

Fix installation of pkgconfig-file for connectivity API.

99. By Thomas Voß on 2014-05-19

Extract ssid and mode from NetworkManager.
Make sure that a missing ofono instance is handled gracefully.

100. By Thomas Voß on 2014-05-20

Remove dbus-test runner setups as dbus-cpp provides its own fixture now.
Add documentation for space vehicle.
Adjust LTE radio cell to carry an attribute TAC instead of LAC.
Add test-cases for location::connectivity::RadioCell.

101. By Thomas Voß on 2014-05-20

Add standalone example for using the connectivity API.

102. By Thomas Voß on 2014-05-20

Add standalone examples to debian package.

103. By Thomas Voß on 2014-05-22

Remove primary scrambling code from UMTS details.
Make wireless network properties observable.

104. By Thomas Voß on 2014-05-22

Fix test-case.

105. By Thomas Voß on 2014-06-01

Add a reporter sending off harvested location data to the mozilla location service.
Add test-cases for the reporter.
Adjust debian/copyright to include mongoose.

106. By Thomas Voß on 2014-06-02

Add build-dep on jsoncpp.
Make elements based on net-cpp optional for now.
Default to a NullReporter for harvesting.

107. By Thomas Voß on 2014-06-02

Requesting network scans is now async.

108. By Thomas Voß on 2014-06-02

Remove obsolete header from service implementation.

109. By Thomas Voß on 2014-06-02

Conditionally include sources for ichnaea reporter.

110. By Thomas Voß on 2014-06-02

Fix missing link directive for boost program-options.

111. By Thomas Voß on 2014-06-02

Add diagnostic message for boost libraries.

112. By Thomas Voß on 2014-06-02

Fix diagnostic message.

113. By Thomas Voß on 2014-06-02

Remove obsolete dependency on boost threads.

114. By Thomas Voß on 2014-06-02

Add test case for repeatedly querying visible cells.

115. By Thomas Voß on 2014-06-03

Refactor property handling for ofono NetworkRegistration interface.

116. By Thomas Voß on 2014-06-03

Ensure that NetworkRegistration properties are always up to date.

117. By Thomas Voß on 2014-06-03

Add test cases for GPS provider construction.

118. By Thomas Voß on 2014-06-03

Replace std::cout with proper logging.

119. By Thomas Voß on 2014-06-03

Replace std::cerr with LOG(ERROR) in connectivity manager implementation.
Wire up to properties changed signal for Ofono's NetworkRegistration interface.

120. By Thomas Voß on 2014-06-03

Rename signal to account for ofono conventions.

121. By Thomas Voß on 2014-06-03

Adjust argument type for signal PropertyChanged.

122. By Thomas Voß on 2014-06-03

Log property changes on network registration.

123. By Thomas Voß on 2014-06-03

Add signals for wifi's being added and removed to connectivity::Manager.

124. By Thomas Voß on 2014-06-03

Refactor connectivity API for visible wireless networks.

125. By Thomas Voß on 2014-06-03

Adjust standalone connectivity example.

126. By Thomas Voß on 2014-06-04

Refactor location::connectivity::RadioCell to prepare for fine-grained update propagation.

127. By Thomas Voß on 2014-06-04

Refactor implementation and consolidate ofono -> connectivity translation in one place.

128. By Thomas Voß on 2014-06-04

First cut at exposing modem properties for tracking network registrations.

129. By Thomas Voß on 2014-06-04

Wire up to a modem's PropertyChanged signal.

130. By Thomas Voß on 2014-06-04

Further glue for wiring up interface changes on a modem.

131. By Thomas Voß on 2014-06-04

Wire up to property changes on network registrations.

132. By Thomas Voß on 2014-06-04

Add threading stress-tests to standalone example.

133. By Thomas Voß on 2014-06-04

Add missing include <thread> in standalone example.
Keep threads running until cancelled in standalone example.

134. By Thomas Voß on 2014-06-04

Remove noisy std::cout's in query threads.

135. By Thomas Voß on 2014-06-04

Wire up cell added/removed signals.

136. By Thomas Voß on 2014-06-04

Factor out WirelessNetwork and RadioCell implementations into their own header files.

137. By Thomas Voß on 2014-06-05

Clean up Ofono/NM-based connectivity::Manager implementation.

138. By Thomas Voß on 2014-06-05

Factor out Ofono/NetworkManager-based implementation into header and impl. file.

139. By Thomas Voß on 2014-06-05

Split out property updates for wifi's.

140. By Thomas Voß on 2014-06-05

Wire up network registration property updates.

141. By Thomas Voß on 2014-06-05

Make the gps provider more verbose when reporting satellite visibility.

142. By Thomas Voß on 2014-06-05

Replace unguarded .at access to maps with guarded .find().
Add verbose logging line to gps hal for tracking satellite visibility updates.

143. By Thomas Voß on 2014-06-05

Add missing typename.

144. By Thomas Voß on 2014-06-05

Add more debugging output to the gps provider.

145. By Thomas Voß on 2014-06-05

More logging output.

146. By Thomas Voß on 2014-06-05

Add a missing include for logging in the location engine.

147. By Thomas Voß on 2014-06-05

Temporarily disable space vehicle reporting.

148. By Thomas Voß on 2014-06-05

Comment out test case.<

149. By Thomas Voß on 2014-06-05

Disable test cases instead of commenting them out.

150. By Thomas Voß on 2014-06-05

Remove overly-verbose logs for satellite visibility reporting.

151. By Thomas Voß on 2014-06-06

Enable AGPS support in the GPS HAL.

152. By Thomas Voß on 2014-06-06

Make sure to switch assistance mode on in the chipset driver.

153. By Thomas Voß on 2014-06-06

Notify network connectivity to GPS chipset.

154. By Thomas Voß on 2014-06-06

Make sure to announce open data connection on agps status update.

155. By Thomas Voß on 2014-06-06

Add pretty printing for SuplAssistant::Status.

156. By Thomas Voß on 2014-06-06

Add logging for agps status updates in the hardware abstraction layer.

157. By Thomas Voß on 2014-06-06

Add missing include <iosfwd>.

158. By Thomas Voß on 2014-06-06

Make operator<< inline friend to circumvent icl for gcc on arm.

159. By Thomas Voß on 2014-06-06

Entirely remove stream out operator to fix ice for gcc.

160. By Thomas Voß on 2014-06-07

Switch to mobile station based positioning.

161. By Thomas Voß on 2014-06-07

Format IP triplet as ints.

162. By Thomas Voß on 2014-06-07

Add first cut at handling agps status updates.

163. By Thomas Voß on 2014-06-07

Switch to "internet" apn for access to supl servers.

164. By Thomas Voß on 2014-06-07

Remove unneccessary apn reporting.

165. By Thomas Voß on 2014-06-07

Reenable reference location injection.

166. By Thomas Voß on 2014-06-07

Set apn for gps chipset.

167. By Thomas Voß on 2014-06-08

mobile_station_based is the default for assisted GPS.
Relax requirements on time to first fix.

168. By Thomas Voß on 2014-06-08

Make sure to reinitialize all agps flags after dropping adding data in trial setup.

169. By Thomas Voß on 2014-06-08

Ensure to set supl server when data connection is requested.

170. By Thomas Voß on 2014-06-09

Inject reference location.

171. By Thomas Voß on 2014-06-09

Make sure to report APN to gps chipset.

172. By Thomas Voß on 2014-06-09

Add accuracy for reference location.

173. By Thomas Voß on 2014-06-09

Clean up supl test case.

174. By Thomas Voß on 2014-06-10

Correct apn name.

175. By Thomas Voß on 2014-06-10

Allow for reference position injection into gps hal test cases.

176. By Thomas Voß on 2014-06-10

Make sure that we always set a supl server and port.

177. By Thomas Voß on 2014-06-10

Just a test.

178. By Thomas Voß on 2014-06-10

Adding last_seen property to WirelessNetwork.
Adding signal indicating end of wifi scan.

179. By Thomas Voß on 2014-06-10

Print last seen timestamp.

180. By Thomas Voß on 2014-06-10

Make sure that technology changes are wired up correctly.

181. By Thomas Voß on 2014-06-10

Print more verbose cell information on changes.

182. By Thomas Voß on 2014-06-10

Adjust APN for testing purposes.

183. By Thomas Voß on 2014-06-10

Inject ref position on nmea update.

184. By Thomas Voß on 2014-06-11

First cut at support for GPS XTRA data.

185. By Thomas Voß on 2014-06-11

Make sure that the xtra downloader is initialized.

186. By Thomas Voß on 2014-06-11

Make the supl benchmark inject reference position on a thread while positioning is active.

187. By Thomas Voß on 2014-06-11

Put the injector thread to sleep for a second.

188. By Thomas Voß on 2014-06-12

Fix reporting of agps status enum.
Correctly extract last seen timestamp for property updates.

189. By Thomas Voß on 2014-06-12

Report last seen as raw timestamps.

190. By Thomas Voß on 2014-06-12

Subscribe to last seen updates in standalone connectivity example.
Adjust formatting of enumerated wifis in standalone connectivity example.

191. By Thomas Voß on 2014-06-12

network-manager models last seen updates as strength updates, account for that.

192. By Thomas Voß on 2014-06-12

Refactor the android-specific implementation of the HardwareAbstractionLayer interface.

193. By Thomas Voß on 2014-06-12

Remove unneeded implementation file.

194. By Thomas Voß on 2014-06-12

Refactor the harvester to make it usable for reporting in test cases.

195. By Thomas Voß on 2014-06-12

Make the harvester more chatty in logs if verbose logging is enabled.

196. By Thomas Voß on 2014-06-12

Make reporting to ichnaea from gps provider test cases opt-in.

197. By Thomas Voß on 2014-06-12

Make sure that missing last_seen property is not fatal.

198. By Thomas Voß on 2014-06-13

Shrink the directory name for installed tests.

199. By Thomas Voß on 2014-06-13

[ Ubuntu daily release ]
* New rebuild forced
[ Ricardo Mendoza ]
* Platform API V2 rebuild

200. By Thomas Voß on 2014-06-13

Make reference position more readable.

201. By Thomas Voß on 2014-06-16

Refactor setup to make daemon and cli testable.
Add nickname property to ichnaea reporter.

202. By Thomas Voß on 2014-06-16

Address build warning for ichnaea reporter test.
Add net-cpp as build-dependency.

203. By Thomas Voß on 2014-06-16

Fix type in debian/control.

204. By Thomas Voß on 2014-06-16

Adjust install directories.

205. By Thomas Voß on 2014-06-17

Refactor and clean up gps provider test case.

206. By Thomas Voß on 2014-06-17

Refactored command line parsing to take a factory functor for creating connections to the bus (used in testing).

207. By Thomas Voß on 2014-06-20

Add an end-to-end acceptance test exercising the service with hundreds of clients randomly dying away.
Adjust implementation to correctly disconnect from core::Signal's by levering RAII as provided by core::ScopedConnection.

208. By Thomas Voß on 2014-06-20

Factor out GPS Xtra Downloader implementations and add tests around them.

209. By Thomas Voß on 2014-06-20

Disable gps xtra downloader test against external URL as the test fails in CI.

210. By Thomas Voß on 2014-06-23

Refactor skeletons for service and session, getting rid of the pimpl-pattern.
Introduce a dedicated outgoing dbus connection for integrating with other services.
Factor out testing webserver into its own class and adjust test cases.

211. By Thomas Voß on 2014-06-23

Factor out wap-headers for GPS Xtra Data Downloader.
Add checks for header in GpsXtraDownloader test cases.

212. By Thomas Voß on 2014-06-23

Remove UNRELEASED changelog artifact.

213. By Thomas Voß on 2014-06-23

Make sure that the testing web server is up before executing client requests.

214. By Thomas Voß on 2014-06-23

Send reply via the same dbus connection.

215. By Thomas Voß on 2014-06-24

Factor out resolution of client credentials and object path creation into interfaces.

216. By Thomas Voß on 2014-06-24

Make sure that session counter is incremented on access.

217. By Thomas Voß on 2014-06-24

Bump so name to account for api change.

218. By Thomas Voß on 2014-06-24

Make sure to install the versioned include directory.

219. By Thomas Voß on 2014-06-24

Bump major version.

220. By Thomas Voß on 2014-06-24

Add dependency on library package.

221. By Thomas Voß on 2014-06-24

Make sure that the dummy provider thread is correctly joined when stopped.

222. By Thomas Voß on 2014-06-27

Make sure that the daemon logs to /var/log/ubuntu-location-service.
Make sure that the CLI logs to stderr.
Make sure that the client library logs to stderr.

223. By Thomas Voß on 2014-06-27

Remove build dependency on json-cpp and net-cpp.

224. By Thomas Voß on 2014-06-27

Adjust expected type for LastSeen timestamps on wifis.

225. By Thomas Voß on 2014-06-27

Comment out header for GpsXtraDownloader.

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-14 06:11:15 +0000
+++ CMakeLists.txt	2014-02-03 13:52:45 +0000
@@ -25,7 +25,8 @@
 find_package(GFlags)
 pkg_check_modules(DBUS dbus-1 REQUIRED)
 pkg_check_modules(DBUS_CPP dbus-cpp REQUIRED)
-
+pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
+pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED)
 #####################################################################
 # Enable code coverage calculation with gcov/gcovr/lcov
 # Usage:
@@ -43,13 +44,15 @@
 
 option (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS "Disable errors when local typedefs are unused" ON)
 if (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
-	SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-local-typedefs")
+    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-local-typedefs")
 endif (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
 
 include_directories(
   ${Boost_INCLUDE_DIRS}
   ${DBUS_INCLUDE_DIRS}
-  ${DBUS_CPP_INCLUDE_DIRS}/dbus
+  ${DBUS_CPP_INCLUDE_DIRS}
+  ${PROPERTIES_CPP_INCLUDE_DIRS}
+  ${PROCESS_CPP_INCLUDE_DIRS}
   ${GLog_INCLUDE_DIR}
   ${GFlags_INCLUDE_DIR}
   include/location_service

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-22 17:24:31 +0000
+++ debian/changelog	2014-02-03 13:52:45 +0000
@@ -1,3 +1,9 @@
+location-service (0.0.2+13.10.20131016.1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Version bump 
+
+ -- Thomas Voß <[e-mail]>  Mon, 13 Jan 2014 16:18:15 +0100
+
 location-service (0.0.2+13.10.20131016.1-0ubuntu2) trusty; urgency=low
 
   * No change rebuild for Boost 1.54 transition.

=== modified file 'debian/control'
--- debian/control	2013-10-22 17:24:31 +0000
+++ debian/control	2014-02-03 13:52:45 +0000
@@ -7,7 +7,7 @@
 XSBC-Original-Maintainer: Thomas Voß <[e-mail]>
 Build-Depends: cmake,
                curl,
-               dbus-cpp-dev,
+               libdbus-cpp-dev,
                dbus-test-runner,
                debhelper (>= 9),
                doxygen,
@@ -19,11 +19,14 @@
                libboost-program-options-dev,
                libboost-system-dev,
                libdbus-1-dev,
+               libdbus-cpp-dev,
                libgoogle-glog-dev,
                libgtest-dev,
                libiw-dev,
                libplatform-hardware-api-headers,
                libplatform-hardware-api1-dev,
+               libprocess-cpp-dev,
+               libproperties-cpp-dev,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/location-service
 # If you aren't a member of ~phablet-team but need to upload packaging changes,
@@ -57,6 +60,15 @@
  Contains header files required to develop clients talking to the ubuntu
  location service.
 
+Package: ubuntu-location-service-tests
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains all test executables
+
 Package: ubuntu-location-service-bin
 Architecture: any
 Depends: ${misc:Depends},

=== modified file 'debian/rules'
--- debian/rules	2013-08-19 21:48:28 +0000
+++ debian/rules	2014-02-03 13:52:45 +0000
@@ -11,8 +11,8 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-export C=gcc-4.7
-export CXX=g++-4.7
+# export C=gcc-4.7
+# export CXX=g++-4.7
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 

=== modified file 'debian/ubuntu-location-service-bin.install'
--- debian/ubuntu-location-service-bin.install	2013-10-08 14:48:43 +0000
+++ debian/ubuntu-location-service-bin.install	2014-02-03 13:52:45 +0000
@@ -1,4 +1,4 @@
 etc/dbus-1/system.d/
 etc/init/*
 usr/bin/ubuntu-location-serviced
-
+usr/bin/ubuntu-location-serviced-cli

=== added file 'debian/ubuntu-location-service-tests.install'
--- debian/ubuntu-location-service-tests.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-location-service-tests.install	2014-02-03 13:52:45 +0000
@@ -0,0 +1,1 @@
+usr/bin/ubuntu-location-service-tests/*

=== modified file 'doc/Doxyfile.in'
--- doc/Doxyfile.in	2013-08-31 06:23:08 +0000
+++ doc/Doxyfile.in	2014-02-03 13:52:45 +0000
@@ -32,13 +32,13 @@
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = @UBUNTU_LOCATION_SERVICE_VERSION_MAJOR@.@UBUNTU_LOCATION_SERVICE_VERSION_MINOR@.@UBUNTU_LOCATION_SERVICE_VERSION_PATCH@
+PROJECT_NUMBER         = @LOCATION_SERVICE_VERSION_MAJOR@.@LOCATION_SERVICE_VERSION_MINOR@.@LOCATION_SERVICE_VERSION_PATCH@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
 # a quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          =
+PROJECT_BRIEF          = "An aggregating location service providing positioning and geocoding capabilities to applications."
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is
 # included in the documentation. The maximum height of the logo should not
@@ -266,7 +266,7 @@
 # func(std::string) {}). This also makes the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
 
-BUILTIN_STL_SUPPORT    = NO
+BUILTIN_STL_SUPPORT    = YES
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
@@ -365,7 +365,7 @@
 # Private class members and static file members will be hidden unless
 # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
 
-EXTRACT_ALL            = NO
+EXTRACT_ALL            = YES
 
 # If the EXTRACT_PRIVATE tag is set to YES all private members of a class
 # will be included in the documentation.
@@ -380,7 +380,7 @@
 # If the EXTRACT_STATIC tag is set to YES all static members of a file
 # will be included in the documentation.
 
-EXTRACT_STATIC         = NO
+EXTRACT_STATIC         = YES
 
 # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
 # defined locally in source files will be included in the documentation.
@@ -423,7 +423,7 @@
 # If set to NO (the default) these declarations will be included in the
 # documentation.
 
-HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_FRIEND_COMPOUNDS  = YES
 
 # If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
 # documentation blocks found inside the body of a function.
@@ -668,7 +668,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/../include
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@ @CMAKE_CURRENT_SOURCE_DIR@/../include
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -728,7 +728,7 @@
 # directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH           = @CMAKE_CURRENT_SOURCE_DIR@/../examples
+EXAMPLE_PATH           = @CMAKE_CURRENT_SOURCE_DIR@/../tests
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@@ -791,7 +791,7 @@
 # This can be useful if you have a project on for instance GitHub and want reuse
 # the introduction page also for the doxygen output.
 
-USE_MDFILE_AS_MAINPAGE =
+USE_MDFILE_AS_MAINPAGE = @CMAKE_SOURCE_DIR@/README.md
 
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
@@ -807,7 +807,7 @@
 # Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.
 
-INLINE_SOURCES         = YES
+INLINE_SOURCES         = NO
 
 # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
 # doxygen to hide any special comment blocks from generated source code
@@ -929,7 +929,7 @@
 # robust against future updates. Doxygen will copy the style sheet file to
 # the output directory.
 
-HTML_EXTRA_STYLESHEET  =
+HTML_EXTRA_STYLESHEET  = @CMAKE_CURRENT_SOURCE_DIR@/extra.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -975,7 +975,7 @@
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded.
 
-HTML_DYNAMIC_SECTIONS  = NO
+HTML_DYNAMIC_SECTIONS  = YES
 
 # With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
 # entries shown in the various tree structured indices initially; the user
@@ -1145,7 +1145,7 @@
 # navigation tree you can set this option to NO if you already set
 # GENERATE_TREEVIEW to YES.
 
-DISABLE_INDEX          = NO
+DISABLE_INDEX          = YES
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information.
@@ -1157,7 +1157,7 @@
 # Since the tree basically has the same information as the tab index you
 # could consider to set DISABLE_INDEX to NO when enabling this option.
 
-GENERATE_TREEVIEW      = NO
+GENERATE_TREEVIEW      = YES
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
 # (range [0,1..20]) that doxygen will group on one line in the generated HTML
@@ -1234,7 +1234,7 @@
 # typically be disabled. For large projects the javascript based search engine
 # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
 
-SEARCHENGINE           = NO 
+SEARCHENGINE           = NO
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a web server instead of a web client using Javascript.
@@ -1293,7 +1293,7 @@
 # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.
 
-GENERATE_LATEX         = NO
+GENERATE_LATEX         = YES
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
@@ -1319,7 +1319,7 @@
 # LaTeX documents. This may be useful for small projects and may help to
 # save some trees in general.
 
-COMPACT_LATEX          = NO
+COMPACT_LATEX          = YES 
 
 # The PAPER_TYPE tag can be used to set the paper type that is used
 # by the printer. Possible values are: a4, letter, legal and
@@ -1377,7 +1377,7 @@
 # Note that which sources are shown also depends on other settings
 # such as SOURCE_BROWSER.
 
-LATEX_SOURCE_CODE      = NO
+LATEX_SOURCE_CODE      = NO 
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
@@ -1434,7 +1434,7 @@
 # If the GENERATE_MAN tag is set to YES (the default) Doxygen will
 # generate man pages
 
-GENERATE_MAN           = NO
+GENERATE_MAN           = YES
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
@@ -1684,7 +1684,7 @@
 # explicitly to a value larger than 0 to get control over the balance
 # between CPU load and processing speed.
 
-DOT_NUM_THREADS        = 0
+DOT_NUM_THREADS        = 1 
 
 # By default doxygen will use the Helvetica font for all dot files that
 # doxygen generates. When you want a differently looking font you can specify

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2013-05-28 14:20:45 +0000
+++ examples/CMakeLists.txt	2014-02-03 13:52:45 +0000
@@ -1,7 +1,1 @@
 add_subdirectory(service)
-
-
-
-
-
-

=== modified file 'examples/service/CMakeLists.txt'
--- examples/service/CMakeLists.txt	2013-08-29 09:21:07 +0000
+++ examples/service/CMakeLists.txt	2014-02-03 13:52:45 +0000
@@ -2,12 +2,12 @@
 find_package(Boost COMPONENTS system)
 find_package(Threads)
 
-pkg_check_modules(DBUS dbus-1)
-pkg_check_modules(DBUS_CPP dbus-cpp)
+pkg_check_modules(DBUS dbus-1 REQUIRED)
+pkg_check_modules(DBUS_CPP dbus-cpp REQUIRED)
 include_directories(
     ${Boost_INCLUDE_DIRS}
     ${DBUS_INCLUDE_DIRS}
-    ${DBUS_CPP_INCLUDE_DIRS}/dbus
+    ${DBUS_CPP_INCLUDE_DIRS}
 
 )
 
@@ -33,6 +33,7 @@
     ${CMAKE_THREAD_LIBS_INIT}
     ${Boost_LIBRARIES}
     ${DBUS_LIBRARIES}
+    ${DBUS_CPP_LDFLAGS}
 )
 
 target_link_libraries(
@@ -43,6 +44,7 @@
     ${CMAKE_THREAD_LIBS_INIT}
     ${Boost_LIBRARIES}
     ${DBUS_LIBRARIES}
+    ${DBUS_CPP_LDFLAGS}
 )
 
 add_custom_command(

=== modified file 'examples/service/client.cpp'
--- examples/service/client.cpp	2013-05-28 14:41:06 +0000
+++ examples/service/client.cpp	2014-02-03 13:52:45 +0000
@@ -17,16 +17,17 @@
  */
 #include "program_options.h"
 
-#include "com/ubuntu/location/service/stub.h"
+#include <com/ubuntu/location/service/stub.h>
 
-#include <org/freedesktop/dbus/resolver.h>
-#include <org/freedesktop/dbus/asio/executor.h>
+#include <core/dbus/resolver.h>
+#include <core/dbus/asio/executor.h>
 
 #include <thread>
 
 namespace cul = com::ubuntu::location;
 namespace culs = com::ubuntu::location::service;
-namespace dbus = org::freedesktop::dbus;
+namespace culss = com::ubuntu::location::service::session;
+namespace dbus = core::dbus;
 
 int main(int argc, char** argv)
 {
@@ -53,36 +54,34 @@
         {"system", dbus::WellKnownBus::system},
     };
 
-    org::freedesktop::dbus::Bus::Ptr bus
+    dbus::Bus::Ptr bus
     {
-        new org::freedesktop::dbus::Bus{lut.at(options.value_for_key<std::string>("bus"))}
+        new dbus::Bus{lut.at(options.value_for_key<std::string>("bus"))}
     };
-    bus->install_executor(
-        org::freedesktop::dbus::Executor::Ptr(
-            new org::freedesktop::dbus::asio::Executor{bus}));
+    bus->install_executor(dbus::asio::make_executor(bus));
     std::thread t{[bus](){bus->run();}};
     
     auto location_service = 
-            org::freedesktop::dbus::resolve_service_on_bus<culs::Interface, culs::Stub>(bus);
-        
-    auto s1 = location_service->create_session_for_criteria(com::ubuntu::location::Criteria{});
-        
-    s1->install_position_updates_handler(
-        [&](const com::ubuntu::location::Update<com::ubuntu::location::Position>& new_position) {
+            dbus::resolve_service_on_bus<culs::Interface, culs::Stub>(bus);
+        
+    auto s1 = location_service->create_session_for_criteria(cul::Criteria{});
+        
+    s1->updates().position.changed().connect(
+        [&](const cul::Update<cul::Position>& new_position) {
             std::cout << "On position updated: " << new_position << std::endl;
         });
-    s1->install_velocity_updates_handler(
-        [&](const com::ubuntu::location::Update<com::ubuntu::location::Velocity>& new_velocity) {
+    s1->updates().velocity.changed().connect(
+        [&](const cul::Update<cul::Velocity>& new_velocity) {
             std::cout << "On velocity_changed " << new_velocity << std::endl;
         });
-    s1->install_heading_updates_handler(
-        [&](const com::ubuntu::location::Update<com::ubuntu::location::Heading>& new_heading) {
+    s1->updates().heading.changed().connect(
+        [&](const cul::Update<cul::Heading>& new_heading) {
             std::cout << "On heading changed: " << new_heading << std::endl;
         });
         
-    s1->start_position_updates();
-    s1->start_velocity_updates();
-    s1->start_heading_updates();
+    s1->updates().position_status = culss::Interface::Updates::Status::enabled;
+    s1->updates().heading_status = culss::Interface::Updates::Status::enabled;
+    s1->updates().velocity_status = culss::Interface::Updates::Status::enabled;
         
     if (t.joinable())
         t.join();

=== modified file 'examples/service/service.cpp'
--- examples/service/service.cpp	2013-05-29 06:04:02 +0000
+++ examples/service/service.cpp	2014-02-03 13:52:45 +0000
@@ -17,19 +17,19 @@
  */
 #include "program_options.h"
 
-#include "com/ubuntu/location/provider_factory.h"
-
-#include "com/ubuntu/location/service/default_configuration.h"
-#include "com/ubuntu/location/service/implementation.h"
-
-#include <org/freedesktop/dbus/announcer.h>
-#include <org/freedesktop/dbus/asio/executor.h>
+#include <com/ubuntu/location/provider_factory.h>
+
+#include <com/ubuntu/location/service/default_configuration.h>
+#include <com/ubuntu/location/service/implementation.h>
+
+#include <core/dbus/announcer.h>
+#include <core/dbus/asio/executor.h>
 
 #include <thread>
 
 namespace cul = com::ubuntu::location;
 namespace culs = com::ubuntu::location::service;
-namespace dbus = org::freedesktop::dbus;
+namespace dbus = core::dbus;
 
 int main(int argc, char** argv)
 {
@@ -124,9 +124,7 @@
         new dbus::Bus{lut.at(options.value_for_key<std::string>("bus"))}
     };
 
-    bus->install_executor(
-        dbus::Executor::Ptr(
-            new dbus::asio::Executor{bus}));
+    bus->install_executor(dbus::asio::make_executor(bus));
 
     culs::DefaultConfiguration config;
     

=== modified file 'include/CMakeLists.txt'
--- include/CMakeLists.txt	2013-05-28 14:20:45 +0000
+++ include/CMakeLists.txt	2014-02-03 13:52:45 +0000
@@ -1,4 +1,4 @@
 install(
-	DIRECTORY location_service/com
-	DESTINATION include/ubuntu-location-service-${UBUNTU_LOCATION_SERVICE_VERSION_MAJOR}
-)
\ No newline at end of file
+    DIRECTORY location_service/com
+    DESTINATION include/ubuntu-location-service-${UBUNTU_LOCATION_SERVICE_VERSION_MAJOR}
+)

=== removed file 'include/location_service/com/ubuntu/location/channel.h'
--- include/location_service/com/ubuntu/location/channel.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/channel.h	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright © 2012-2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_CHANNEL_H_
-#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_CHANNEL_H_
-
-#include <boost/signals2.hpp>
-
-#include <memory>
-#include <set>
-
-namespace com
-{
-namespace ubuntu
-{
-namespace location
-{
-template<typename T>
-using Channel = boost::signals2::signal<void(const T&)>;
-
-typedef boost::signals2::scoped_connection ScopedChannelConnection;
-typedef boost::signals2::connection ChannelConnection;
-}
-}
-}
-
-#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CHANNEL_H_

=== modified file 'include/location_service/com/ubuntu/location/clock.h'
--- include/location_service/com/ubuntu/location/clock.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/clock.h	2014-02-03 13:52:45 +0000
@@ -26,15 +26,41 @@
 {
 namespace location
 {
+/**
+ * @brief Defines the timebase of the location service.
+ */
 struct Clock
 {
+    /** @brief The underlying clock we are assuming for all time-stamping purposes. */
+    typedef std::chrono::high_resolution_clock Type;
+
+    /**
+     * @brief Duration type of the location service clock.
+     */
     typedef std::chrono::high_resolution_clock::duration Duration;
+
+    /**
+     * @brief Timestamp type of the location service clock.
+     */
     typedef std::chrono::high_resolution_clock::time_point Timestamp;
 
+    /**
+     * @brief Samples a timestamp from the clock.
+     * @return The current time.
+     */
     static inline Timestamp now()
     {
         return std::chrono::high_resolution_clock::now();
     }
+
+    /**
+     * @brief Samples a timestamp from the clock.
+     * @return The minimum point in time representable by this clock.
+     */
+    static inline Timestamp beginning_of_time()
+    {
+        return std::chrono::high_resolution_clock::time_point::min();
+    }
 };
 }
 }

=== modified file 'include/location_service/com/ubuntu/location/codec.h'
--- include/location_service/com/ubuntu/location/codec.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/codec.h	2014-02-03 13:52:45 +0000
@@ -18,22 +18,20 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_CODEC_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_CODEC_H_
 
-#include "com/ubuntu/location/accuracy.h"
-#include "com/ubuntu/location/criteria.h"
-#include "com/ubuntu/location/heading.h"
-#include "com/ubuntu/location/position.h"
-#include "com/ubuntu/location/update.h"
-#include "com/ubuntu/location/velocity.h"
-#include "com/ubuntu/location/units/units.h"
-#include "com/ubuntu/location/wgs84/altitude.h"
-#include "com/ubuntu/location/wgs84/latitude.h"
-#include "com/ubuntu/location/wgs84/longitude.h"
-
-#include <org/freedesktop/dbus/codec.h>
-
-namespace org
-{
-namespace freedesktop
+#include <com/ubuntu/location/criteria.h>
+#include <com/ubuntu/location/heading.h>
+#include <com/ubuntu/location/position.h>
+#include <com/ubuntu/location/space_vehicle.h>
+#include <com/ubuntu/location/update.h>
+#include <com/ubuntu/location/velocity.h>
+#include <com/ubuntu/location/units/units.h>
+#include <com/ubuntu/location/wgs84/altitude.h>
+#include <com/ubuntu/location/wgs84/latitude.h>
+#include <com/ubuntu/location/wgs84/longitude.h>
+
+#include <core/dbus/codec.h>
+
+namespace core
 {
 namespace dbus
 {
@@ -46,6 +44,7 @@
     {
         return ArgumentType::floating_point;
     }
+
     constexpr static bool is_basic_type()
     {
         return true;
@@ -64,319 +63,283 @@
 }
 
 template<typename T>
+struct Codec<com::ubuntu::location::Optional<T>>
+{
+    static void encode_argument(Message::Writer& writer, const com::ubuntu::location::Optional<T>& in)
+    {
+        bool has_value{in};
+        Codec<bool>::encode_argument(writer, has_value);
+        if (has_value)
+            Codec<typename com::ubuntu::location::Optional<T>::value_type>::encode_argument(writer, *in);
+    }
+
+    static void decode_argument(Message::Reader& reader, com::ubuntu::location::Optional<T>& in)
+    {
+        bool has_value{false};
+        Codec<bool>::decode_argument(reader, has_value);
+        if (has_value)
+        {
+            typename com::ubuntu::location::Optional<T>::value_type value;
+            Codec<typename com::ubuntu::location::Optional<T>::value_type>::decode_argument(reader, value);
+            in = value;
+        } else
+        {
+            in.reset();
+        }
+    }
+};
+
+template<typename T>
 struct Codec<com::ubuntu::location::units::Quantity<T>>
 {
-    static void encode_argument(DBusMessageIter* out, const com::ubuntu::location::units::Quantity<T>& in)
+    static void encode_argument(Message::Writer& writer, const com::ubuntu::location::units::Quantity<T>& in)
     {
-        Codec<typename com::ubuntu::location::units::Quantity<T>::value_type>::encode_argument(out, in.value());
+        Codec<typename com::ubuntu::location::units::Quantity<T>::value_type>::encode_argument(writer, in.value());
     }
 
-    static void decode_argument(DBusMessageIter* out, com::ubuntu::location::units::Quantity<T>& in)
+    static void decode_argument(Message::Reader& reader, com::ubuntu::location::units::Quantity<T>& in)
     {
         typename com::ubuntu::location::units::Quantity<T>::value_type value;
-        Codec<typename com::ubuntu::location::units::Quantity<T>::value_type>::decode_argument(out, value);
+        Codec<typename com::ubuntu::location::units::Quantity<T>::value_type>::decode_argument(reader, value);
         in = com::ubuntu::location::units::Quantity<T>::from_value(value);
-        dbus_message_iter_next(out);
-    }    
-};
-
-namespace helper
-{
-template<typename T, typename U>
-struct TypeMapper<com::ubuntu::location::wgs84::Coordinate<T,U>>
-{
-    constexpr static ArgumentType type_value()
-    {
-        return ArgumentType::structure;
-    }
-    constexpr static bool is_basic_type()
-    {
-        return false;
-    }
-    constexpr static bool requires_signature()
-    {
-        return true;
-    }
-
-    static std::string signature()
-    {
-        static const std::string s =
-            DBUS_STRUCT_BEGIN_CHAR_AS_STRING +
-                TypeMapper<com::ubuntu::location::units::Quantity<U>>::signature() +
-            DBUS_STRUCT_END_CHAR_AS_STRING;
-        return s;
-    }
-};
-}
+    }
+};
 
 template<typename T, typename U>
 struct Codec<com::ubuntu::location::wgs84::Coordinate<T,U>>
 {
-    static void encode_argument(DBusMessageIter* out, const com::ubuntu::location::wgs84::Coordinate<T, U>& in)
-    {
-        Codec<com::ubuntu::location::units::Quantity<U>>::encode_argument(out, in.value);
-    }
-
-    static void decode_argument(DBusMessageIter* out, com::ubuntu::location::wgs84::Coordinate<T, U>& in)
-    {
-        Codec<com::ubuntu::location::units::Quantity<U>>::decode_argument(out, in.value);
-    }    
-};
-
-namespace helper
-{
-template<>
-struct TypeMapper<com::ubuntu::location::Position>
-{
-    constexpr static ArgumentType type_value()
-    {
-        return ArgumentType::structure;
-    }
-    constexpr static bool is_basic_type()
-    {
-        return false;
-    }
-    constexpr static bool requires_signature()
-    {
-        return true;
-    }
-
-    static std::string signature()
-    {
-        static const std::string s =
-                TypeMapper<uint64_t>::signature() + 
-                TypeMapper<com::ubuntu::location::wgs84::Latitude>::signature() +
-                TypeMapper<com::ubuntu::location::wgs84::Longitude>::signature() +
-                TypeMapper<com::ubuntu::location::wgs84::Altitude>::signature();
-        return s;
-    }
-};
-}
+    static void encode_argument(Message::Writer& writer, const com::ubuntu::location::wgs84::Coordinate<T, U>& in)
+    {
+        Codec<com::ubuntu::location::units::Quantity<U>>::encode_argument(writer, in.value);
+    }
+
+    static void decode_argument(Message::Reader& reader, com::ubuntu::location::wgs84::Coordinate<T, U>& in)
+    {
+        Codec<com::ubuntu::location::units::Quantity<U>>::decode_argument(reader, in.value);
+    }
+};
 
 template<>
 struct Codec<com::ubuntu::location::Position>
 {
-    static void encode_argument(DBusMessageIter* out, const com::ubuntu::location::Position& in)
-    {
-        Codec<uint64_t>::encode_argument(out, in.flags().to_ulong());
-        if (in.has_latitude())
-            Codec<com::ubuntu::location::wgs84::Latitude>::encode_argument(out, in.latitude());
-        if (in.has_longitude())
-            Codec<com::ubuntu::location::wgs84::Longitude>::encode_argument(out, in.longitude());
-        if (in.has_altitude())
-            Codec<com::ubuntu::location::wgs84::Altitude>::encode_argument(out, in.altitude());
-    }
-
-    static void decode_argument(DBusMessageIter* out, com::ubuntu::location::Position& in)
-    {
-        com::ubuntu::location::wgs84::Latitude lat;
-        com::ubuntu::location::wgs84::Longitude lon;
-        com::ubuntu::location::wgs84::Altitude alt;
-        uint64_t flags_on_wire;
-        Codec<uint64_t>::decode_argument(out, flags_on_wire);
-        dbus_message_iter_next(out);
-
-        com::ubuntu::location::Position::Flags flags{flags_on_wire};
-        if (flags.test(com::ubuntu::location::Position::latitude_flag))
-        {
-            Codec<com::ubuntu::location::wgs84::Latitude>::decode_argument(out, lat);
-            in.latitude(lat);
-        }
-        if (flags.test(com::ubuntu::location::Position::latitude_flag))
-        {
-            Codec<com::ubuntu::location::wgs84::Longitude>::decode_argument(out, lon);
-            in.longitude(lon);
-        }
-        if (flags.test(com::ubuntu::location::Position::altitude_flag))
-        {       
-            Codec<com::ubuntu::location::wgs84::Altitude>::decode_argument(out, alt);
-            in.altitude(alt);
-        }
-    }
-};
-
-namespace helper
-{
-template<>
-struct TypeMapper<com::ubuntu::location::Velocity>
-{
-    constexpr static ArgumentType type_value()
-    {
-        return ArgumentType::structure;
-    }
-    constexpr static bool is_basic_type()
-    {
-        return false;
-    }
-    constexpr static bool requires_signature()
-    {
-        return true;
-    }
-
-    static std::string signature()
-    {
-        static const std::string s =
-            DBUS_STRUCT_BEGIN_CHAR_AS_STRING +
-                TypeMapper<typename com::ubuntu::location::Velocity::Quantity>::signature() +
-            DBUS_STRUCT_END_CHAR_AS_STRING;
-        return s;
-    }
-};
-}
-
-template<>
-struct Codec<com::ubuntu::location::Velocity>
-{
-    static void encode_argument(DBusMessageIter* out, const com::ubuntu::location::Velocity& in)
-    {
-        Codec<typename com::ubuntu::location::Velocity::Quantity>::encode_argument(out, in.value);
-    }
-
-    static void decode_argument(DBusMessageIter* out, com::ubuntu::location::Velocity& in)
-    {
-        Codec<typename com::ubuntu::location::Velocity::Quantity>::decode_argument(out, in.value);
-    }
-};
-
-namespace helper
-{
-template<>
-struct TypeMapper<com::ubuntu::location::Heading>
-{
-    constexpr static ArgumentType type_value()
-    {
-        return ArgumentType::structure;
-    }
-    constexpr static bool is_basic_type()
-    {
-        return false;
-    }
-    constexpr static bool requires_signature()
-    {
-        return true;
-    }
-
-    static std::string signature()
-    {
-        static const std::string s =
-            DBUS_STRUCT_BEGIN_CHAR_AS_STRING +
-                TypeMapper<typename com::ubuntu::location::Heading::Quantity>::signature() +
-            DBUS_STRUCT_END_CHAR_AS_STRING;
-        return s;
-    }
-};
-}
-
-template<>
-struct Codec<com::ubuntu::location::Heading>
-{
-    static void encode_argument(DBusMessageIter* out, const com::ubuntu::location::Heading& in)
-    {
-        Codec<typename com::ubuntu::location::Heading::Quantity>::encode_argument(out, in.value);
-    }
-
-    static void decode_argument(DBusMessageIter* out, com::ubuntu::location::Heading& in)
-    {
-        Codec<typename com::ubuntu::location::Heading::Quantity>::decode_argument(out, in.value);
-    }
-};
-
-namespace helper
-{
-template<typename T>
-struct TypeMapper<com::ubuntu::location::Accuracy<T>>
-{
-    constexpr static ArgumentType type_value()
-    {
-        return ArgumentType::structure;
-    }
-    constexpr static bool is_basic_type()
-    {
-        return false;
-    }
-    constexpr static bool requires_signature()
-    {
-        return true;
-    }
-
-    static std::string signature()
-    {
-        static const std::string s =
-            DBUS_STRUCT_BEGIN_CHAR_AS_STRING +
-            TypeMapper<T>::signature() +
-            DBUS_STRUCT_END_CHAR_AS_STRING;
-        return s;
-    }
-};
-}
-
-template<typename T>
-struct Codec<com::ubuntu::location::Accuracy<T>>
-{
-    static void encode_argument(DBusMessageIter* out, const com::ubuntu::location::Accuracy<T>& in)
-    {
-        Codec<T>::encode_argument(out, in.value);
-    }
-
-    static void decode_argument(DBusMessageIter* out, com::ubuntu::location::Accuracy<T>& in)
-    {
-        Codec<T>::decode_argument(out, in.value);
-    }    
-};
-
-namespace helper
-{
-template<>
-struct TypeMapper<com::ubuntu::location::Criteria>
-{
-    constexpr static ArgumentType type_value()
-    {
-        return ArgumentType::structure;
-    }
-    constexpr static bool is_basic_type()
-    {
-        return false;
-    }
-    constexpr static bool requires_signature()
-    {
-        return true;
-    }
-
-    static std::string signature()
-    {
-        static const std::string s =
-            DBUS_STRUCT_BEGIN_CHAR_AS_STRING +
-                helper::TypeMapper<com::ubuntu::location::Accuracy<com::ubuntu::location::wgs84::Latitude>>::signature() +
-                helper::TypeMapper<com::ubuntu::location::Accuracy<com::ubuntu::location::wgs84::Longitude>>::signature() +
-                helper::TypeMapper<com::ubuntu::location::Accuracy<com::ubuntu::location::wgs84::Altitude>>::signature() +
-                helper::TypeMapper<com::ubuntu::location::Accuracy<com::ubuntu::location::Velocity>>::signature() +
-                helper::TypeMapper<com::ubuntu::location::Accuracy<com::ubuntu::location::Heading>>::signature() +
-            DBUS_STRUCT_END_CHAR_AS_STRING;
-        return s;
-    }
-};
-}
+    typedef com::ubuntu::location::Position::Accuracy::Horizontal HorizontalAccuracy;
+    typedef com::ubuntu::location::Position::Accuracy::Vertical VerticalAccuracy;
+
+    static void encode_argument(Message::Writer& writer, const com::ubuntu::location::Position& in)
+    {
+        Codec<com::ubuntu::location::wgs84::Latitude>::encode_argument(writer, in.latitude);
+        Codec<com::ubuntu::location::wgs84::Longitude>::encode_argument(writer, in.longitude);
+        Codec<com::ubuntu::location::Optional<com::ubuntu::location::wgs84::Altitude>>::encode_argument(writer, in.altitude);
+
+        Codec<com::ubuntu::location::Optional<HorizontalAccuracy>>::encode_argument(writer, in.accuracy.horizontal);
+        Codec<com::ubuntu::location::Optional<VerticalAccuracy>>::encode_argument(writer, in.accuracy.vertical);
+    }
+
+    static void decode_argument(Message::Reader& reader, com::ubuntu::location::Position& in)
+    {
+        Codec<com::ubuntu::location::wgs84::Latitude>::decode_argument(reader, in.latitude);
+        Codec<com::ubuntu::location::wgs84::Longitude>::decode_argument(reader, in.longitude);
+        Codec<com::ubuntu::location::Optional<com::ubuntu::location::wgs84::Altitude>>::decode_argument(reader, in.altitude);
+
+        Codec<com::ubuntu::location::Optional<HorizontalAccuracy>>::decode_argument(reader, in.accuracy.horizontal);
+        Codec<com::ubuntu::location::Optional<VerticalAccuracy>>::decode_argument(reader, in.accuracy.vertical);
+    }
+};
+
+
+namespace helper
+{
+template<>
+struct TypeMapper<com::ubuntu::location::SpaceVehicle::Key>
+{
+    constexpr static ArgumentType type_value()
+    {
+        return ArgumentType::structure;
+    }
+    constexpr static bool is_basic_type()
+    {
+        return false;
+    }
+    constexpr static bool requires_signature()
+    {
+        return true;
+    }
+
+    static std::string signature()
+    {
+        static const std::string s =
+                helper::TypeMapper<std::uint32_t>::signature() +
+                helper::TypeMapper<std::uint32_t>::signature();
+        return s;
+    }
+};
+template<>
+struct TypeMapper<com::ubuntu::location::SpaceVehicle>
+{
+    constexpr static ArgumentType type_value()
+    {
+        return ArgumentType::structure;
+    }
+    constexpr static bool is_basic_type()
+    {
+        return false;
+    }
+    constexpr static bool requires_signature()
+    {
+        return true;
+    }
+
+    inline static std::string signature()
+    {
+        std::string s =
+            DBUS_STRUCT_BEGIN_CHAR_AS_STRING +
+                helper::TypeMapper<com::ubuntu::location::SpaceVehicle::Key>::signature() +
+                helper::TypeMapper<float>::signature() +
+                helper::TypeMapper<bool>::signature() +
+                helper::TypeMapper<bool>::signature() +
+                helper::TypeMapper<bool>::signature() +
+                helper::TypeMapper<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::signature() +
+                helper::TypeMapper<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::signature() +
+            DBUS_STRUCT_END_CHAR_AS_STRING;
+        return s;
+    }
+};
+}
+
+template<>
+struct Codec<com::ubuntu::location::SpaceVehicle::Key>
+{
+    static void encode_argument(Message::Writer& writer, const com::ubuntu::location::SpaceVehicle::Key& in)
+    {
+        writer.push_uint32(static_cast<std::uint32_t>(in.type));
+        writer.push_uint32(in.id);
+    }
+
+    static void decode_argument(Message::Reader& reader, com::ubuntu::location::SpaceVehicle::Key& in)
+    {
+        in.type = static_cast<com::ubuntu::location::SpaceVehicle::Type>(reader.pop_uint32());
+        in.id = reader.pop_uint32();
+    }
+};
+
+template<>
+struct Codec<com::ubuntu::location::SpaceVehicle>
+{
+    inline static void encode_argument(Message::Writer& writer, const com::ubuntu::location::SpaceVehicle& in)
+    {
+        auto sub = writer.open_structure();
+
+        Codec<com::ubuntu::location::SpaceVehicle::Key>::encode_argument(sub, in.key);
+        sub.push_floating_point(in.snr);
+        sub.push_boolean(in.has_almanac_data);
+        sub.push_boolean(in.has_ephimeris_data);
+        sub.push_boolean(in.used_in_fix);
+        Codec<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::encode_argument(sub, in.azimuth);
+        Codec<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::encode_argument(sub, in.elevation);
+
+        writer.close_structure(std::move(sub));
+    }
+
+    inline static void decode_argument(Message::Reader& reader, com::ubuntu::location::SpaceVehicle& in)
+    {
+        auto sub = reader.pop_structure();
+
+        Codec<com::ubuntu::location::SpaceVehicle::Key>::decode_argument(sub, in.key);
+        in.snr = sub.pop_floating_point();
+        in.has_almanac_data = sub.pop_boolean();
+        in.has_ephimeris_data = sub.pop_boolean();
+        in.used_in_fix = sub.pop_boolean();
+        Codec<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::decode_argument(sub, in.azimuth);
+        Codec<com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle>>::decode_argument(sub, in.elevation);
+    }
+};
+
+namespace helper
+{
+template<>
+struct TypeMapper<std::map<com::ubuntu::location::SpaceVehicle::Key, com::ubuntu::location::SpaceVehicle>>
+{
+    constexpr static ArgumentType type_value()
+    {
+        return ArgumentType::array;
+    }
+    constexpr static bool is_basic_type()
+    {
+        return false;
+    }
+    constexpr static bool requires_signature()
+    {
+        return true;
+    }
+
+    static std::string signature()
+    {
+        static const std::string s = DBUS_TYPE_ARRAY_AS_STRING + TypeMapper<com::ubuntu::location::SpaceVehicle>::signature();
+        return s;
+    }
+};
+}
+template<>
+struct Codec<std::map<com::ubuntu::location::SpaceVehicle::Key, com::ubuntu::location::SpaceVehicle>>
+{
+    inline static void encode_argument(Message::Writer& writer, const std::map<com::ubuntu::location::SpaceVehicle::Key, com::ubuntu::location::SpaceVehicle>& arg)
+    {
+        types::Signature signature(helper::TypeMapper<com::ubuntu::location::SpaceVehicle>::signature());
+        auto sub = writer.open_array(signature);
+
+        for(const auto& element : arg)
+        {
+            Codec<com::ubuntu::location::SpaceVehicle>::encode_argument(sub, element.second);
+        }
+
+        writer.close_array(std::move(sub));
+    }
+
+    inline static void decode_argument(Message::Reader& reader, std::map<com::ubuntu::location::SpaceVehicle::Key, com::ubuntu::location::SpaceVehicle>& out)
+    {
+        auto sub = reader.pop_array();
+        while (sub.type() != ArgumentType::invalid)
+        {
+            com::ubuntu::location::SpaceVehicle sv;
+            Codec<com::ubuntu::location::SpaceVehicle>::decode_argument(sub, sv);
+            out.insert(std::make_pair(sv.key, sv));
+        }
+    }
+};
 
 template<>
 struct Codec<com::ubuntu::location::Criteria>
 {
-    static void encode_argument(DBusMessageIter* out, const com::ubuntu::location::Criteria& in)
-    {
-        Codec<com::ubuntu::location::Accuracy<com::ubuntu::location::wgs84::Latitude>>::encode_argument(out, in.latitude_accuracy);
-        Codec<com::ubuntu::location::Accuracy<com::ubuntu::location::wgs84::Longitude>>::encode_argument(out, in.longitude_accuracy);
-        Codec<com::ubuntu::location::Accuracy<com::ubuntu::location::wgs84::Altitude>>::encode_argument(out, in.altitude_accuracy);
-        Codec<com::ubuntu::location::Accuracy<com::ubuntu::location::Velocity>>::encode_argument(out, in.velocity_accuracy);
-        Codec<com::ubuntu::location::Accuracy<com::ubuntu::location::Heading>>::encode_argument(out, in.heading_accuracy);
-    }
-
-    static void decode_argument(DBusMessageIter* out, com::ubuntu::location::Criteria& in)
-    {
-        Codec<com::ubuntu::location::Accuracy<com::ubuntu::location::wgs84::Latitude>>::decode_argument(out, in.latitude_accuracy);
-        Codec<com::ubuntu::location::Accuracy<com::ubuntu::location::wgs84::Longitude>>::decode_argument(out, in.longitude_accuracy);
-        Codec<com::ubuntu::location::Accuracy<com::ubuntu::location::wgs84::Altitude>>::decode_argument(out, in.altitude_accuracy);
-        Codec<com::ubuntu::location::Accuracy<com::ubuntu::location::Velocity>>::decode_argument(out, in.velocity_accuracy);
-        Codec<com::ubuntu::location::Accuracy<com::ubuntu::location::Heading>>::decode_argument(out, in.heading_accuracy);
-    }    
+    typedef com::ubuntu::location::units::Quantity<com::ubuntu::location::units::Length> HorizontalAccuracy;
+    typedef com::ubuntu::location::units::Quantity<com::ubuntu::location::units::Length> VerticalAccuracy;
+    typedef com::ubuntu::location::units::Quantity<com::ubuntu::location::units::Velocity> VelocityAccuracy;
+    typedef com::ubuntu::location::units::Quantity<com::ubuntu::location::units::PlaneAngle> HeadingAccuracy;
+
+    static void encode_argument(Message::Writer& writer, const com::ubuntu::location::Criteria& in)
+    {
+        Codec<bool>::encode_argument(writer, in.requires.position);
+        Codec<bool>::encode_argument(writer, in.requires.altitude);
+        Codec<bool>::encode_argument(writer, in.requires.heading);
+        Codec<bool>::encode_argument(writer, in.requires.velocity);
+
+        Codec<HorizontalAccuracy>::encode_argument(writer, in.accuracy.horizontal);
+        Codec<com::ubuntu::location::Optional<VerticalAccuracy>>::encode_argument(writer, in.accuracy.vertical);
+        Codec<com::ubuntu::location::Optional<VelocityAccuracy>>::encode_argument(writer, in.accuracy.velocity);
+        Codec<com::ubuntu::location::Optional<HeadingAccuracy>>::encode_argument(writer, in.accuracy.heading);
+    }
+
+    static void decode_argument(Message::Reader& reader, com::ubuntu::location::Criteria& in)
+    {
+        Codec<bool>::decode_argument(reader, in.requires.position);
+        Codec<bool>::decode_argument(reader, in.requires.altitude);
+        Codec<bool>::decode_argument(reader, in.requires.heading);
+        Codec<bool>::decode_argument(reader, in.requires.velocity);
+
+        Codec<HorizontalAccuracy>::decode_argument(reader, in.accuracy.horizontal);
+        Codec<com::ubuntu::location::Optional<VerticalAccuracy>>::decode_argument(reader, in.accuracy.vertical);
+        Codec<com::ubuntu::location::Optional<VelocityAccuracy>>::decode_argument(reader, in.accuracy.velocity);
+        Codec<com::ubuntu::location::Optional<HeadingAccuracy>>::decode_argument(reader, in.accuracy.heading);
+    }
 };
 namespace helper
 {
@@ -409,23 +372,19 @@
 template<typename T>
 struct Codec<com::ubuntu::location::Update<T>>
 {
-    static void encode_argument(DBusMessageIter* out, const com::ubuntu::location::Update<T>& in)
+    static void encode_argument(Message::Writer& writer, const com::ubuntu::location::Update<T>& in)
     {
-        Codec<T>::encode_argument(out, in.value);
-        Codec<int64_t>::encode_argument(out, in.when.time_since_epoch().count());
+        Codec<T>::encode_argument(writer, in.value);
+        Codec<int64_t>::encode_argument(writer, in.when.time_since_epoch().count());
     }
 
-    static void decode_argument(DBusMessageIter* out, com::ubuntu::location::Update<T>& in)
+    static void decode_argument(Message::Reader& reader, com::ubuntu::location::Update<T>& in)
     {
-        Codec<T>::decode_argument(out, in.value);
-        int64_t value;
-        Codec<int64_t>::decode_argument(out, value);
-        dbus_message_iter_next(out);
-        in.when = com::ubuntu::location::Clock::Timestamp(com::ubuntu::location::Clock::Duration(value));
+        Codec<T>::decode_argument(reader, in.value);
+        in.when = com::ubuntu::location::Clock::Timestamp(com::ubuntu::location::Clock::Duration(reader.pop_int64()));
     }    
 };
 }
 }
-}
 
 #endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CODEC_H_

=== added directory 'include/location_service/com/ubuntu/location/connectivity'
=== added file 'include/location_service/com/ubuntu/location/connectivity/bounded_integer.h'
--- include/location_service/com/ubuntu/location/connectivity/bounded_integer.h	1970-01-01 00:00:00 +0000
+++ include/location_service/com/ubuntu/location/connectivity/bounded_integer.h	2014-02-03 13:52:45 +0000
@@ -0,0 +1,184 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_BOUNDED_INTEGER_H_
+#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_BOUNDED_INTEGER_H_
+
+#include <iostream>
+#include <stdexcept>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+namespace connectivity
+{
+/**
+ * @brief A helper class to handle bounded integer values, with an optional domain
+ * for tagging domain-specific types.
+ */
+template<int min, int max, int domain = 0>
+class BoundedInteger
+{
+public:
+    static_assert(min < max, "min >= max");
+
+    /**
+     * @brief Access the minimum value of the integer.
+     */
+    inline static int minimum()
+    {
+        return min;
+    }
+
+    /**
+     * @brief Access the maximum value of the integer.
+     */
+    inline static int maximum()
+    {
+        return max;
+    }
+
+    /**
+     * @brief Returns max - min.
+     */
+    inline static int range()
+    {
+        return max - min;
+    }
+
+    /**
+     * @brief Constructs an invalid instance.
+     */
+    BoundedInteger() : value(min-1)
+    {
+    }
+
+    /**
+     * @brief Constructs an instance from a raw value
+     * @param value The raw value.
+     * @throw std::runtime_error if value is not in [min, max].
+     */
+    explicit BoundedInteger(int value) : value(value)
+    {
+        if (value < min || value > max)
+            throw std::runtime_error(
+                    std::to_string(value) + " is not in " + "[" +
+                    std::to_string(min) + ", " + std::to_string(max) + "]");
+    }
+
+    /**
+     * @brief Copy c'tor.
+     * @param rhs The instance to copy from.
+     */
+    BoundedInteger(const BoundedInteger<min, max, domain>& rhs) : value(rhs.value)
+    {
+    }
+
+    /**
+     * @brief Assignment operator.
+     * @param rhs The instance to assign from.
+     * @return A mutable reference to this instance.
+     */
+    BoundedInteger<min, max, domain>& operator=(const BoundedInteger<min, max, domain>& rhs)
+    {
+        value = rhs.value;
+        return *this;
+    }
+
+    /**
+     * @brief Equality comparison operator.
+     * @param rhs The instance to compare to.
+     * @return true iff both instances' value are equal.
+     */
+    bool operator==(const BoundedInteger<min, max, domain>& rhs) const
+    {
+        return value == rhs.value;
+    }
+
+    /**
+     * @brief Implicit casting operator to a raw integer value.
+     * @return The raw integer value.
+     */
+    inline operator int() const
+    {
+        return get();
+    }
+
+    /**
+     * @brief is_valid checks whether the contained value is in [min, max].
+     * @return true iff the contained integer value is in [min, max].
+     */
+    inline bool is_valid() const
+    {
+        return min <= value && value <= max;
+    }
+
+    /**
+     * @brief Returns the raw integer value contained in this instance.
+     * @throw std::runtime_error if is_valid() returns false.
+     */
+    inline int get() const
+    {
+        if (!is_valid())
+            throw std::runtime_error("BoundedInteger::get: Contained value is not valid.");
+
+        return value;
+    }
+
+    /**
+     * @brief Assigns a new raw integer value
+     * @param new_value The new value.
+     * @throw std::runtime_error if new_value is not in [min, max].
+     */
+    inline void set(int new_value)
+    {
+        if (new_value < min || new_value > max)
+            throw std::runtime_error(
+                    std::to_string(new_value) + " is not in " + "[" +
+                    std::to_string(min) + ", " + std::to_string(max) + "]");
+
+        value = new_value;
+    }
+
+    /**
+     * @brief operator << pretty prints an instance of BoundedInteger.
+     * @param out The stream to print to.
+     * @param bi The instance to print.
+     * @return The stream that has been printed to.
+     */
+    inline friend std::ostream& operator<<(std::ostream& out, const BoundedInteger<min, max, domain>& bi)
+    {
+        out << bi.value;
+
+        if (!bi.is_valid())
+            out << " -> invalid";
+
+        return out;
+    }
+
+private:
+    int value;
+};
+}
+}
+}
+}
+
+#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_BOUNDED_INTEGER_H_

=== added file 'include/location_service/com/ubuntu/location/connectivity/manager.h'
--- include/location_service/com/ubuntu/location/connectivity/manager.h	1970-01-01 00:00:00 +0000
+++ include/location_service/com/ubuntu/location/connectivity/manager.h	2014-02-03 13:52:45 +0000
@@ -0,0 +1,93 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_MANAGER_H_
+#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_MANAGER_H_
+
+#include <com/ubuntu/location/connectivity/radio_cell.h>
+#include <com/ubuntu/location/connectivity/wireless_network.h>
+
+#include <core/property.h>
+
+#include <string>
+#include <vector>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+namespace connectivity
+{
+/**
+ * @brief The Manager class encapsulates access to network/radio information
+ */
+class Manager
+{
+public:
+    struct Errors
+    {
+        Errors() = delete;
+        /**
+         * @brief The ConnectivityManagementNotSupported struct is thrown if underlying
+         * platform does not provide support for connectivity mgmt.
+         */
+        struct ConnectivityManagementNotSupported : public std::runtime_error
+        {
+            ConnectivityManagementNotSupported()
+                : std::runtime_error(
+                      "Underlying platform does not provide support for connectivity mgmt.")
+            {
+            }
+        };
+    };
+
+    Manager(const Manager& rhs) = delete;
+    virtual ~Manager() = default;
+
+    Manager& operator=(const Manager& rhs) = delete;
+    bool operator==(const Manager& rhs) const = delete;
+
+    /**
+     * @brief All wireless networks visible to the device.
+     * @return A getable/observable property carrying the visible wireless networks.
+     */
+    virtual const core::Property<std::vector<WirelessNetwork>>& visible_wireless_networks() = 0;
+
+    /**
+     * @brief All radio cells visible to the device.
+     * @return A getable/observable property carrying the visible radio cells.
+     */
+    virtual const core::Property<std::vector<RadioCell>>& visible_radio_cells() = 0;
+
+protected:
+    Manager() = default;
+};
+
+/**
+ * @brief Provides access to a platform-specific implementation/instance of a connectivity manager.
+ * @throw Manager::Errors::ConnectivityManagementNotSupported.
+ * @return An instance of a connectivity manager.
+ */
+const std::shared_ptr<Manager>& platform_default_manager();
+}
+}
+}
+}
+
+#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_MANAGER_H_

=== added file 'include/location_service/com/ubuntu/location/connectivity/radio_cell.h'
--- include/location_service/com/ubuntu/location/connectivity/radio_cell.h	1970-01-01 00:00:00 +0000
+++ include/location_service/com/ubuntu/location/connectivity/radio_cell.h	2014-02-03 13:52:45 +0000
@@ -0,0 +1,400 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_RADIO_CELL_H_
+#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_RADIO_CELL_H_
+
+#include <com/ubuntu/location/connectivity/bounded_integer.h>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+namespace connectivity
+{
+class RadioCell
+{
+public:
+    enum class Type
+    {
+        unknown,
+        gsm,
+        umts,
+        cdma,
+        lte
+    };
+
+    enum class Domain
+    {
+        mcc,
+        mnc,
+        lac,
+        id,
+        pid,
+        rss,
+        asu,
+        ta
+    };
+
+    template<int min, int max>
+    using MobileCountryCode = BoundedInteger<min, max, static_cast<int>(Domain::mcc)>;
+    template<int min, int max>
+    using MobileNetworkCode = BoundedInteger<min, max, static_cast<int>(Domain::mnc)>;
+    template<int min, int max>
+    using LocationAreaCode = BoundedInteger<min, max, static_cast<int>(Domain::lac)>;
+    template<int min, int max>
+    using CellId = BoundedInteger<min, max, static_cast<int>(Domain::id)>;
+    template<int min, int max>
+    using PhysicalId = BoundedInteger<min, max, static_cast<int>(Domain::pid)>;
+    template<int min, int max>
+    using ReceivedSignalStrength = BoundedInteger<min, max, static_cast<int>(Domain::rss)>;
+    template<int min, int max>
+    using ArbitraryStrengthUnit = BoundedInteger<min, max, static_cast<int>(Domain::asu)>;
+    template<int min, int max>
+    using TimingAdvance = BoundedInteger<min, max, static_cast<int>(Domain::ta)>;
+
+    struct Gsm
+    {
+        typedef MobileCountryCode<0,999> MCC;
+        typedef MobileNetworkCode<0,999> MNC;
+        typedef LocationAreaCode<0,65535> LAC;
+        typedef CellId<0,65535> ID;
+        typedef ReceivedSignalStrength<-113,-51> RSS;
+        typedef ArbitraryStrengthUnit<0,31> ASU;
+        typedef TimingAdvance<0,63> TA;
+
+        bool operator==(const Gsm& rhs) const
+        {
+            return mobile_country_code == rhs.mobile_country_code &&
+                    mobile_network_code == rhs.mobile_network_code &&
+                    location_area_code == rhs.location_area_code &&
+                    id == rhs.id &&
+                    received_signal_strength == rhs.received_signal_strength &&
+                    arbitrary_strength_unit == rhs.arbitrary_strength_unit &&
+                    timing_advance == rhs.timing_advance;
+        }
+
+        inline friend std::ostream& operator<<(std::ostream& out, const Gsm& gsm)
+        {
+            out << "("
+                << "mcc: " << gsm.mobile_country_code << ", "
+                << "mnc: " << gsm.mobile_network_code << ", "
+                << "lac: " << gsm.location_area_code << ", "
+                << "id: " << gsm.id << ", "
+                << "rss: " << gsm.received_signal_strength << ", "
+                << "asu: " << gsm.arbitrary_strength_unit << ", "
+                << "ta: " << gsm.timing_advance << ")";
+
+            return out;
+        }
+
+        MCC mobile_country_code;
+        MNC mobile_network_code;
+        LAC location_area_code;
+        ID id;
+        RSS received_signal_strength;
+        ASU arbitrary_strength_unit;
+        TA timing_advance;
+    };
+
+    struct Umts
+    {
+        typedef MobileCountryCode<0,999> MCC;
+        typedef MobileNetworkCode<0,999> MNC;
+        typedef LocationAreaCode<0,65535> LAC;
+        typedef CellId<0,268435455> ID;
+        typedef ReceivedSignalStrength<-121,-25> RSS;
+        typedef ArbitraryStrengthUnit<-5,91> ASU;
+
+        bool operator==(const Umts& rhs) const
+        {
+            return mobile_country_code == rhs.mobile_country_code &&
+                    mobile_network_code == rhs.mobile_network_code &&
+                    location_area_code == rhs.location_area_code &&
+                    id == rhs.id &&
+                    received_signal_strength == rhs.received_signal_strength &&
+                    arbitrary_strength_unit == rhs.arbitrary_strength_unit;
+        }
+
+        inline friend std::ostream& operator<<(std::ostream& out, const Umts& umts)
+        {
+            out << "("
+                << "mcc: " << umts.mobile_country_code << ", "
+                << "mnc: " << umts.mobile_network_code << ", "
+                << "lac: " << umts.location_area_code << ", "
+                << "id: " << umts.id << ", "
+                << "rss: " << umts.received_signal_strength << ", "
+                << "asu: " << umts.arbitrary_strength_unit << ")";
+
+            return out;
+        }
+        MCC mobile_country_code;
+        MNC mobile_network_code;
+        LAC location_area_code;
+        ID id;
+        RSS received_signal_strength;
+        ASU arbitrary_strength_unit;
+    };
+
+    struct Cdma
+    {
+        typedef MobileCountryCode<0,999> MCC;
+        typedef MobileNetworkCode<0,32767> MNC;
+        typedef LocationAreaCode<0,65535> LAC;
+        typedef CellId<0,65535> ID;
+        typedef ReceivedSignalStrength<-100,-75> RSS;
+        typedef ArbitraryStrengthUnit<1,16> ASU;
+
+        bool operator==(const Cdma& rhs) const
+        {
+            return mobile_country_code == rhs.mobile_country_code &&
+                    mobile_network_code == rhs.mobile_network_code &&
+                    location_area_code == rhs.location_area_code &&
+                    id == rhs.id &&
+                    received_signal_strength == rhs.received_signal_strength &&
+                    arbitrary_strength_unit == rhs.arbitrary_strength_unit;
+        }
+
+        inline friend std::ostream& operator<<(std::ostream& out, const Cdma& cdma)
+        {
+            out << "("
+                << "mcc: " << cdma.mobile_country_code << ", "
+                << "mnc: " << cdma.mobile_network_code << ", "
+                << "lac: " << cdma.location_area_code << ", "
+                << "id: " << cdma.id << ", "
+                << "rss: " << cdma.received_signal_strength << ", "
+                << "asu: " << cdma.arbitrary_strength_unit << ")";
+
+            return out;
+        }
+
+        MCC mobile_country_code;
+        MNC mobile_network_code;
+        LAC location_area_code;
+        ID id;
+        RSS received_signal_strength;
+        ASU arbitrary_strength_unit;
+    };
+
+    struct Lte
+    {
+        typedef MobileCountryCode<0,999> MCC;
+        typedef MobileNetworkCode<0,32767> MNC;
+        typedef LocationAreaCode<0,65535> LAC;
+        typedef CellId<0,268435455> ID;
+        typedef PhysicalId<0,503> PID;
+        typedef ReceivedSignalStrength<-137,-45> RSS;
+        typedef ArbitraryStrengthUnit<0,95> ASU;
+        typedef TimingAdvance<0,63> TA;
+
+        bool operator==(const Lte& rhs) const
+        {
+            return mobile_country_code == rhs.mobile_country_code &&
+                    mobile_network_code == rhs.mobile_network_code &&
+                    location_area_code == rhs.location_area_code &&
+                    id == rhs.id &&
+                    physical_id == rhs.physical_id &&
+                    received_signal_strength == rhs.received_signal_strength &&
+                    arbitrary_strength_unit == rhs.arbitrary_strength_unit &&
+                    timing_advance == rhs.timing_advance;
+        }
+
+        inline friend std::ostream& operator<<(std::ostream& out, const Lte& lte)
+        {
+            out << "("
+                << "mcc: " << lte.mobile_country_code << ", "
+                << "mnc: " << lte.mobile_network_code << ", "
+                << "lac: " << lte.location_area_code << ", "
+                << "id: " << lte.id << ", "
+                << "id: " << lte.physical_id << ", "
+                << "rss: " << lte.received_signal_strength << ", "
+                << "asu: " << lte.arbitrary_strength_unit << ", "
+                << "ta: " << lte.timing_advance << ")";
+
+            return out;
+        }
+
+        MCC mobile_country_code;
+        MNC mobile_network_code;
+        LAC location_area_code;
+        ID id;
+        PID physical_id;
+        RSS received_signal_strength;
+        ASU arbitrary_strength_unit;
+        TA timing_advance;
+    };
+
+    RadioCell() : radio_type(Type::gsm), detail{Gsm()}
+    {
+    }
+
+    explicit RadioCell(const Gsm& gsm)
+        : radio_type(Type::gsm), detail{gsm}
+    {
+    }
+
+    explicit RadioCell(const Umts& umts)
+        : radio_type(Type::umts), detail{umts}
+    {
+    }
+
+    explicit RadioCell(const Cdma& cdma)
+        : radio_type(Type::cdma), detail{cdma}
+    {
+    }
+
+    explicit RadioCell(const Lte& lte)
+        : radio_type(Type::lte), detail{lte}
+    {
+    }
+
+    RadioCell(const RadioCell& rhs) : radio_type(rhs.radio_type)
+    {
+        switch(radio_type)
+        {
+        case Type::gsm: detail.gsm = rhs.detail.gsm; break;
+        case Type::cdma: detail.cdma = rhs.detail.cdma; break;
+        case Type::umts: detail.umts = rhs.detail.umts; break;
+        case Type::lte: detail.lte = rhs.detail.lte; break;
+        case Type::unknown: break;
+        }
+    }
+
+    RadioCell& operator=(const RadioCell& rhs)
+    {
+        radio_type = rhs.radio_type;
+        switch(radio_type)
+        {
+        case Type::gsm: detail.gsm = rhs.detail.gsm; break;
+        case Type::cdma: detail.cdma = rhs.detail.cdma; break;
+        case Type::umts: detail.umts = rhs.detail.umts; break;
+        case Type::lte: detail.lte = rhs.detail.lte; break;
+        case Type::unknown: break;
+        }
+
+        return *this;
+    }
+
+    bool operator==(const RadioCell& rhs) const
+    {
+        if (radio_type != rhs.radio_type)
+            return false;
+
+        switch(radio_type)
+        {
+        case Type::gsm: return detail.gsm == rhs.detail.gsm;
+        case Type::cdma: return detail.cdma == rhs.detail.cdma;
+        case Type::umts: return detail.umts == rhs.detail.umts;
+        case Type::lte: return detail.lte == rhs.detail.lte;
+        default: return true;
+        }
+
+        return false;
+    }
+
+    Type type() const
+    {
+        return radio_type;
+    }
+
+    const Gsm& gsm() const
+    {
+        if (radio_type != Type::gsm)
+            throw std::runtime_error("Bad access to unset network type.");
+
+        return detail.gsm;
+    }
+
+    const Umts& umts() const
+    {
+        if (radio_type != Type::umts)
+            throw std::runtime_error("Bad access to unset network type.");
+
+        return detail.umts;
+    }
+
+    const Cdma& cdma() const
+    {
+        if (radio_type != Type::cdma)
+            throw std::runtime_error("Bad access to unset network type.");
+
+        return detail.cdma;
+    }
+
+    const Lte& lte() const
+    {
+        if (radio_type != Type::lte)
+            throw std::runtime_error("Bad access to unset network type.");
+
+        return detail.lte;
+    }
+
+    inline friend std::ostream& operator<<(std::ostream& out, const RadioCell& cell)
+    {
+        switch (cell.radio_type)
+        {
+        case RadioCell::Type::gsm: out << cell.detail.gsm; break;
+        case RadioCell::Type::cdma: out << cell.detail.cdma; break;
+        case RadioCell::Type::umts: out << cell.detail.umts; break;
+        case RadioCell::Type::lte: out << cell.detail.lte; break;
+        case RadioCell::Type::unknown: break;
+        }
+
+        return out;
+    }
+
+private:
+    Type radio_type;
+
+    struct None {};
+    union Detail
+    {
+        inline Detail() : none(None{})
+        {
+        }
+
+        inline explicit Detail(const Gsm& gsm) : gsm(gsm)
+        {
+        }
+
+        inline explicit Detail(const Umts& umts) : umts(umts)
+        {
+        }
+
+        inline explicit Detail(const Cdma& cdma) : cdma(cdma)
+        {
+        }
+
+        inline explicit Detail(const Lte& lte) : lte(lte)
+        {
+        }
+        None none;
+        Gsm gsm;
+        Umts umts;
+        Cdma cdma;
+        Lte lte;
+    } detail;
+};
+}
+}
+}
+}
+
+#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_RADIO_CELL_H_
+

=== added file 'include/location_service/com/ubuntu/location/connectivity/wireless_network.h'
--- include/location_service/com/ubuntu/location/connectivity/wireless_network.h	1970-01-01 00:00:00 +0000
+++ include/location_service/com/ubuntu/location/connectivity/wireless_network.h	2014-02-03 13:52:45 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_WIRELESS_NETWORK_H_
+#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_WIRELESS_NETWORK_H_
+
+#include <com/ubuntu/location/connectivity/bounded_integer.h>
+
+#include <string>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+namespace connectivity
+{
+struct WirelessNetwork
+{
+    enum class Domain
+    {
+        frequency,
+        channel
+    };
+
+    typedef BoundedInteger<2412, 5825, static_cast<int>(Domain::frequency)> Frequency;
+    typedef BoundedInteger<1, 165, static_cast<int>(Domain::channel)> Channel;
+
+    bool operator==(const WirelessNetwork& rhs) const
+    {
+        return bssid == rhs.bssid &&
+               frequency == rhs.frequency &&
+               channel == rhs.channel &&
+               snr == rhs.snr;
+    }
+
+    friend std::ostream& operator<<(std::ostream& out, const WirelessNetwork& wifi)
+    {
+        return out << "("
+                   << "bssid: " << wifi.bssid << ", "
+                   << "frequency: " << wifi.frequency << ", "
+                   << "channel: " << wifi.channel << ", "
+                   << "snr: " << wifi.snr << ")";
+    }
+
+    std::string bssid; ///< The BSSID of the network.
+    Frequency frequency; ///< Frequency of the network/AP.
+    Channel channel; ///< Channel of the network/AP.
+    float snr; ///< Signal-noise ratio of the specific network.
+};
+}
+}
+}
+}
+
+#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_WIRELESS_NETWORK_H_

=== modified file 'include/location_service/com/ubuntu/location/criteria.h'
--- include/location_service/com/ubuntu/location/criteria.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/criteria.h	2014-02-03 13:52:45 +0000
@@ -18,16 +18,8 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_CRITERIA_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_CRITERIA_H_
 
-#include "com/ubuntu/location/accuracy.h"
-#include "com/ubuntu/location/heading.h"
-#include "com/ubuntu/location/velocity.h"
-#include "com/ubuntu/location/wgs84/altitude.h"
-#include "com/ubuntu/location/wgs84/latitude.h"
-#include "com/ubuntu/location/wgs84/longitude.h"
-
-#include <limits>
-#include <ostream>
-#include <stdexcept>
+#include <com/ubuntu/location/optional.h>
+#include <com/ubuntu/location/units/units.h>
 
 namespace com
 {
@@ -35,22 +27,40 @@
 {
 namespace location
 {
+/**
+ * @brief Summarizes criteria of a client session with respect to functionality
+ * and accuracy for position, velocity and heading measurements.
+ */
 struct Criteria
 {
-    Criteria() : latitude_accuracy(),
-                 longitude_accuracy(),
-                 altitude_accuracy(),
-                 velocity_accuracy(),
-                 heading_accuracy()
-    {
-    }
-    
-    Accuracy<wgs84::Latitude> latitude_accuracy;
-    Accuracy<wgs84::Longitude> longitude_accuracy;
-    Accuracy<wgs84::Altitude> altitude_accuracy;
-    Accuracy<Velocity> velocity_accuracy;
-    Accuracy<Heading> heading_accuracy;
+    /**
+     * @brief satisfies checks whether this instance also satisfies another criteria instance.
+     * @param rhs The other criteria instance
+     * @return true iff this instance also satisfies the other instance, else false.
+     */
+    bool satisfies(const Criteria& rhs) const;
+
+    struct Requires
+    {
+        bool position = true; ///< The client needs position measurements.
+        bool altitude = false; ///< The client needs altitude measurements.
+        bool velocity = false; ///< The client needs velocity measurments.
+        bool heading = false; ///< The client needs heading measurements.
+    } requires = Requires{};
+
+    struct Accuracy
+    {
+        units::Quantity<units::Length> horizontal = 3000 * units::Meters; ///< The client requires measurements of at least this horizontal accuracy.
+        Optional<units::Quantity<units::Length>> vertical; ///< The client requires measurements of at least this vertical accuracy.
+        Optional<units::Quantity<units::Velocity>> velocity; ///< The client requires measurements of at least this velocity accuracy.
+        Optional<units::Quantity<units::PlaneAngle>> heading; ///< The client requires measurements of at least this heading accuracy.
+    } accuracy = Accuracy{};
 };
+
+/**
+ * @brief operator + merges lhs and rhs such that satisfying the new criteria satisfies lhs and rhs.
+ */
+Criteria operator+(const Criteria& lhs, const Criteria& rhs);
 }
 }
 }

=== modified file 'include/location_service/com/ubuntu/location/default_provider_selection_policy.h'
--- include/location_service/com/ubuntu/location/default_provider_selection_policy.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/default_provider_selection_policy.h	2014-02-03 13:52:45 +0000
@@ -18,7 +18,7 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_DEFAULT_PROVIDER_SELECTION_POLICY_H_
 #define LOCATION_SERVICE_COM_UBUNTU_DEFAULT_PROVIDER_SELECTION_POLICY_H_
 
-#include "com/ubuntu/location/provider_selection_policy.h"
+#include <com/ubuntu/location/provider_selection_policy.h>
 
 namespace com
 {
@@ -32,21 +32,21 @@
     DefaultProviderSelectionPolicy();
     ~DefaultProviderSelectionPolicy() noexcept;
     
-    ProviderSelection determine_provider_selection_from_set_for_criteria(
+    ProviderSelection determine_provider_selection_for_criteria(
         const Criteria& criteria,
-        const std::set<Provider::Ptr>& providers);
+        const ProviderEnumerator& enumerator);
 
     Provider::Ptr determine_position_updates_provider(
         const Criteria& criteria,
-        const std::set<Provider::Ptr>& providers);
+        const ProviderEnumerator& enumerator);
 
     Provider::Ptr determine_heading_updates_provider(
         const Criteria& criteria,
-        const std::set<Provider::Ptr>& providers);
+        const ProviderEnumerator& enumerator);
 
     Provider::Ptr determine_velocity_updates_provider(
         const Criteria& criteria,
-        const std::set<Provider::Ptr>& providers);
+        const ProviderEnumerator& enumerator);
 };
 }
 }

=== modified file 'include/location_service/com/ubuntu/location/engine.h'
--- include/location_service/com/ubuntu/location/engine.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/engine.h	2014-02-03 13:52:45 +0000
@@ -18,10 +18,16 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_ENGINE_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_ENGINE_H_
 
-#include "com/ubuntu/location/criteria.h"
-#include "com/ubuntu/location/provider.h"
-#include "com/ubuntu/location/provider_selection_policy.h"
-
+#include <com/ubuntu/location/provider.h>
+#include <com/ubuntu/location/provider_enumerator.h>
+#include <com/ubuntu/location/provider_selection.h>
+#include <com/ubuntu/location/satellite_based_positioning_state.h>
+#include <com/ubuntu/location/space_vehicle.h>
+#include <com/ubuntu/location/wifi_and_cell_reporting_state.h>
+
+#include <core/property.h>
+
+#include <mutex>
 #include <set>
 
 namespace com
@@ -30,26 +36,116 @@
 {
 namespace location
 {
-class Engine
+struct Criteria;
+class ProviderSelectionPolicy;
+/**
+ * @brief The Engine class encapsulates a positioning engine, relying on a set
+ * of providers and reporters to acquire and publish location information.
+ */
+class Engine : public ProviderEnumerator
 {
 public:
     typedef std::shared_ptr<Engine> Ptr;
 
-    Engine(const std::set<Provider::Ptr>& initial_providers,
-           const ProviderSelectionPolicy::Ptr& provider_selection_policy);
+    /**
+     * @brief The State enum models the current state of the engine
+     */
+    enum class Status
+    {
+        off, ///< The engine is currently offline.
+        on, ///< The engine and providers are powered on but not navigating.
+        active ///< The engine and providers are powered on and navigating.
+    };
+
+    /**
+     * @brief The Configuration struct summarizes the state of the engine.
+     */
+    struct Configuration
+    {
+        /** Setable/getable/observable property for the satellite based positioning state. */
+        core::Property<SatelliteBasedPositioningState> satellite_based_positioning_state
+        {
+            SatelliteBasedPositioningState::on
+        };
+        /** Setable/getable/observable property for the satellite based positioning state. */
+        core::Property<WifiAndCellIdReportingState> wifi_and_cell_id_reporting_state
+        {
+            WifiAndCellIdReportingState::off
+        };
+        /** Setable/getable/observable property for the overall engine state. */
+        core::Property<Engine::Status> engine_state
+        {
+            Engine::Status::on
+        };
+    };
+
+    struct Updates
+    {
+        /** The current best known reference location */
+        core::Property<Update<Position>> reference_location{};
+        /** The current best known velocity estimate. */
+        core::Property<Update<Velocity>> reference_velocity{};
+        /** The current best known heading estimate. */
+        core::Property<Update<Heading>> reference_heading{};
+        /** The current set of visible SpaceVehicles. */
+        core::Property<std::map<SpaceVehicle::Key, SpaceVehicle>> visible_space_vehicles{};
+    };
+
+    Engine(const std::shared_ptr<ProviderSelectionPolicy>& provider_selection_policy);
     Engine(const Engine&) = delete;
     Engine& operator=(const Engine&) = delete;
     virtual ~Engine() = default;
 
+    /**
+     * @brief Calculates a set of providers that satisfies the given criteria.
+     * @param [in] criteria The criteria to be satisfied by the returned provider selection.
+     * @return A provider selection that satisfies the given criteria.
+     */
     virtual ProviderSelection determine_provider_selection_for_criteria(const Criteria& criteria);
 
+    /**
+     * @brief Checks if the engine knows about a specific provider.
+     * @return True iff the engine knows about the provider.
+     */
     virtual bool has_provider(const Provider::Ptr& provider) noexcept;
+
+    /**
+     * @brief Makes a provider known to the engine.
+     * @param provider The new provider.
+     */
     virtual void add_provider(const Provider::Ptr& provider);
+
+    /**
+     * @brief Removes a provider from the engine.
+     * @param provider The provider to be removed.
+     */
     virtual void remove_provider(const Provider::Ptr& provider) noexcept;
 
+    /**
+     * @brief Iterates all known providers and invokes the provided enumerator for each of them.
+     * @param enumerator The functor to be invoked for each provider.
+     */
+    virtual void for_each_provider(const std::function<void(const Provider::Ptr&)>& enumerator) const noexcept;
+
+    /** The engine's configuration. */
+    Configuration configuration;
+
+    /** All updates distributed via the engine. */
+    Updates updates;
+
 private:
-    std::set<Provider::Ptr> providers;
-    ProviderSelectionPolicy::Ptr provider_selection_policy;
+    struct ProviderConnections
+    {
+        core::ScopedConnection reference_location_updates;
+        core::ScopedConnection reference_velocity_updates;
+        core::ScopedConnection reference_heading_updates;
+        core::ScopedConnection wifi_and_cell_id_reporting_state_updates;
+        core::ScopedConnection space_vehicle_visibility_updates;
+    };
+
+    mutable std::mutex guard;
+    std::map<Provider::Ptr, ProviderConnections> providers;
+    std::shared_ptr<ProviderSelectionPolicy> provider_selection_policy;
 };
 }
 }

=== modified file 'include/location_service/com/ubuntu/location/heading.h'
--- include/location_service/com/ubuntu/location/heading.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/heading.h	2014-02-03 13:52:45 +0000
@@ -18,12 +18,7 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_HEADING_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_HEADING_H_
 
-#include "com/ubuntu/location/accuracy.h"
-#include "com/ubuntu/location/units/units.h"
-
-#include <limits>
-#include <ostream>
-#include <stdexcept>
+#include <com/ubuntu/location/units/units.h>
 
 namespace com
 {
@@ -31,74 +26,8 @@
 {
 namespace location
 {
-struct Heading
-{
-    typedef units::PlaneAngle Unit;
-    typedef units::Quantity<Unit> Quantity;
-
-    static const Quantity& min()
-    {
-        static const auto instance = Heading::Quantity::from_value(0.);
-        return instance;
-    }
-    static const Quantity& max()
-    {
-        static const auto instance = Heading::Quantity::from_value(360.);
-        return instance;
-    }
-
-    Heading(const Quantity& value = Quantity()) : value(value)
-    {
-        if (value < min())
-            throw std::out_of_range("");
-        if (value > max())
-            throw std::out_of_range("");
-    }
-
-    bool operator==(const Heading& rhs) const
-    {
-        return value == rhs.value;
-    }
-
-    bool operator!=(const Heading& rhs) const
-    {
-        return value != rhs.value;
-    }
-
-    Quantity value;
-};
-
-inline std::ostream& operator<<(std::ostream& out, const Heading& heading)
-{
-    out << "Heading(" << heading.value << ")";
-    return out;
-}
-
-template<>
-struct AccuracyTraits<Heading>
-{
-    static AccuracyLevel classify(const Heading& h)
-    {
-        static const auto half = 0.5 * Heading::max();
-        if(h.value > half)
-            return AccuracyLevel::worst;
-
-        if(h.value < half)
-            return AccuracyLevel::best;
-
-        return AccuracyLevel::worst;
-    }
-
-    static Accuracy<Heading> best()
-    {
-        return Accuracy<Heading>{Heading{Heading::min()}};
-    }
-
-    static Accuracy<Heading> worst()
-    {
-        return Accuracy<Heading>{Heading{Heading::max()}};
-    }
-};
+/** Heading is measured in ° deviation from true north. */
+typedef units::Quantity<units::PlaneAngle> Heading;
 }
 }
 }

=== added file 'include/location_service/com/ubuntu/location/optional.h'
--- include/location_service/com/ubuntu/location/optional.h	1970-01-01 00:00:00 +0000
+++ include/location_service/com/ubuntu/location/optional.h	2014-02-03 13:52:45 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_OPTIONAL_H_
+#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_OPTIONAL_H_
+
+#include <boost/optional.hpp>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+template<typename T>
+using Optional = boost::optional<T>;
+}
+}
+}
+
+#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_OPTIONAL_H_

=== modified file 'include/location_service/com/ubuntu/location/position.h'
--- include/location_service/com/ubuntu/location/position.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/position.h	2014-02-03 13:52:45 +0000
@@ -18,9 +18,11 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_POSITION_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_POSITION_H_
 
-#include "com/ubuntu/location/wgs84/altitude.h"
-#include "com/ubuntu/location/wgs84/latitude.h"
-#include "com/ubuntu/location/wgs84/longitude.h"
+#include <com/ubuntu/location/wgs84/altitude.h>
+#include <com/ubuntu/location/wgs84/latitude.h>
+#include <com/ubuntu/location/wgs84/longitude.h>
+
+#include <com/ubuntu/location/optional.h>
 
 #include <bitset>
 #include <ostream>
@@ -31,54 +33,30 @@
 {
 namespace location
 {
-class Position
+/**
+ * @brief The Position struct models a position in the wgs84 coordinate system.
+ */
+struct Position
 {
-  public:
-    enum Flag
-    {
-        latitude_flag = 0,
-        longitude_flag = 1,
-        altitude_flag = 2
-    };
-
-    typedef std::bitset<3> Flags;
-
-    Position();    
-    Position(
-        const wgs84::Latitude& latitude,
-        const wgs84::Longitude& longitude);
-    Position(
-        const wgs84::Latitude& latitude,
-        const wgs84::Longitude& longitude,
-        const wgs84::Altitude& altitude);
+    Position() = default;
+    Position(const wgs84::Latitude&, const wgs84::Longitude&);
+    Position(const wgs84::Latitude&, const wgs84::Longitude&, const wgs84::Altitude&);
 
     bool operator==(const Position& rhs) const;
     bool operator!=(const Position& rhs) const;
 
-    const Flags& flags() const;
-
-    bool has_latitude() const;
-    Position& latitude(const wgs84::Latitude& lat);
-    const wgs84::Latitude& latitude() const;
-
-    bool has_longitude() const;
-    Position& longitude(const wgs84::Longitude& lon);
-    const wgs84::Longitude& longitude() const;
-
-    bool has_altitude() const;
-    Position& altitude(const wgs84::Altitude& alt);
-    const wgs84::Altitude& altitude() const;
-
-  private:
-    template<typename> friend struct Codec;
-    
-    struct
+    wgs84::Latitude latitude = wgs84::Latitude{};
+    wgs84::Longitude longitude = wgs84::Longitude{};
+    Optional<wgs84::Altitude> altitude = Optional<wgs84::Altitude>{};
+
+    struct Accuracy
     {
-        Flags flags;
-        wgs84::Latitude latitude;
-        wgs84::Longitude longitude;
-        wgs84::Altitude altitude;
-    } fields;
+        typedef units::Quantity<units::Length> Horizontal;
+        typedef units::Quantity<units::Length> Vertical;
+
+        Optional<Horizontal> horizontal = Horizontal{};
+        Optional<Vertical> vertical = Optional<Vertical>{};
+    } accuracy = Accuracy{};
 };
 
 std::ostream& operator<<(std::ostream& out, const Position& position);

=== modified file 'include/location_service/com/ubuntu/location/provider.h'
--- include/location_service/com/ubuntu/location/provider.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/provider.h	2014-02-03 13:52:45 +0000
@@ -18,12 +18,16 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDER_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDER_H_
 
-#include "com/ubuntu/location/channel.h"
-#include "com/ubuntu/location/criteria.h"
-#include "com/ubuntu/location/heading.h"
-#include "com/ubuntu/location/position.h"
-#include "com/ubuntu/location/update.h"
-#include "com/ubuntu/location/velocity.h"
+#include <com/ubuntu/location/criteria.h>
+#include <com/ubuntu/location/heading.h>
+#include <com/ubuntu/location/position.h>
+#include <com/ubuntu/location/space_vehicle.h>
+#include <com/ubuntu/location/update.h>
+#include <com/ubuntu/location/velocity.h>
+#include <com/ubuntu/location/wifi_and_cell_reporting_state.h>
+
+#include <core/property.h>
+#include <core/signal.h>
 
 #include <atomic>
 #include <bitset>
@@ -35,97 +39,125 @@
 {
 namespace location
 {
+/**
+ * @brief The Provider class is the abstract base of all positioning providers.
+ */
 class Provider
 {
 public:
     typedef std::shared_ptr<Provider> Ptr;
 
-    enum class Feature : std::size_t
-    {
-        position,
-        velocity,
-        heading
-    };
-
-    typedef std::bitset<3> FeatureFlags;
-
-    enum class Requirement : std::size_t
-    {
-        satellites,
-        cell_network,
-        data_network,
-        monetary_spending
-    };
-
-    typedef std::bitset<4> RequirementFlags;
-
+    /**
+     * @brief Enumerates the known features that can be supported by providers.
+     */
+    enum class Features : std::size_t
+    {
+        none = 0, ///< The provider does not support any feature.
+        position = 1 << 0, ///< The provider features position updates.
+        velocity = 1 << 1, ///< The provider features velocity updates.
+        heading = 1 << 2 ///< The provider features heading updates.
+    };    
+
+    /**
+     * @brief Enumerates the requirements of a provider implementation.
+     */
+    enum class Requirements : std::size_t
+    {
+        none = 0, ///< The provider does not require anything.
+        satellites = 1 << 0, ///< The provider requires satellites to be visible.
+        cell_network = 1 << 1, ///< The provider requires a cell-network to work correctly.
+        data_network = 1 << 2, ///< The provider requires a data-network to work correctly.
+        monetary_spending = 1 << 3 ///< Using the provider results in monetary cost.
+    };
+
+    /**
+     * @brief Facade for controlling the state of position/heading/velocity updates.
+     *
+     * Multiple observers can request state changes for updates. This class ensures
+     * that the specific updates are started and stopped if at least one observer
+     * requests them and stopped when the last observer issues a stop request.
+     */
     class Controller
     {
     public:
         typedef std::shared_ptr<Controller> Ptr;
 
-        template<typename T> 
-        class Cache
-        {
-          public:
-            Cache() : d{ T{}, false }
-            {
-            }
-            const T& value() const { return d.value; }
-            void update(const T& new_value) { d.value = new_value; d.is_valid = true; }
-            bool is_valid() const { return d.is_valid; }
-            void invalidate() { d.is_valid = false; }
-
-          private:
-            struct
-            {
-                T value;
-                bool is_valid;
-            } d;
-        };
-
         virtual ~Controller() = default;
         Controller(const Controller&) = delete;
         Controller& operator=(const Controller&) = delete;
 
+        /**
+         * @brief Request to start position updates if not already running.
+         */
         virtual void start_position_updates();
+
+        /**
+         * @brief Request to stop position updates. Only stops the provider when the last observer calls this function.
+         */
         virtual void stop_position_updates();
+
+        /**
+         * @brief Checks if position updates are currently running.
+         * @return true iff position updates are currently running.
+         */
         bool are_position_updates_running() const;
 
+        /**
+         * @brief Request to start heading updates if not already running.
+         */
         virtual void start_heading_updates();
+
+        /**
+         * @brief Request to stop heading updates. Only stops the provider when the last observer calls this function.
+         */
         virtual void stop_heading_updates();
+
+        /**
+         * @brief Checks if position updates are currently running.
+         * @return true iff position updates are currently running.
+         */
         bool are_heading_updates_running() const;
 
+        /**
+         * @brief Request to start velocity updates if not already running.
+         */
         virtual void start_velocity_updates();
+
+        /**
+         * @brief Request to stop velocity updates. Only stops the provider when the last observer calls this function.
+         */
         virtual void stop_velocity_updates();
+
+        /**
+         * @brief Checks if velocity updates are currently running.
+         * @return true iff velocity updates are currently running.
+         */
         bool are_velocity_updates_running() const;
 
-        const Cache<Update<Position>>& cached_position_update() const;
-        const Cache<Update<Heading>>& cached_heading_update() const;
-        const Cache<Update<Velocity>>& cached_velocity_update() const;
-
     protected:
         friend class Provider;
         explicit Controller(Provider& instance);
 
     private:
-        void on_position_updated(const Update<Position>& position);
-        void on_velocity_updated(const Update<Velocity>& velocity);
-        void on_heading_updated(const Update<Heading>& heading);
-
         Provider& instance;
         std::atomic<int> position_updates_counter;
         std::atomic<int> heading_updates_counter;
         std::atomic<int> velocity_updates_counter;
-        ScopedChannelConnection position_update_connection;
-        ScopedChannelConnection velocity_update_connection;
-        ScopedChannelConnection heading_update_connection;
-        struct
-        {
-            Cache<Update<Position>> position;
-            Cache<Update<Velocity>> velocity;
-            Cache<Update<Heading>> heading;            
-        } cached;
+    };
+
+    /**
+     * @brief Wraps all updates that can be delivered by a provider.
+     */
+    struct Updates
+    {
+        /** Position updates. */
+        core::Signal<Update<Position>> position;
+        /** Heading updates. */
+        core::Signal<Update<Heading>> heading;
+        /** Velocity updates. */
+        core::Signal<Update<Velocity>> velocity;
+        /** Space vehicle visibility updates. */
+        core::Signal<Update<std::set<SpaceVehicle>>> svs;
     };
 
     virtual ~Provider() = default;
@@ -133,43 +165,114 @@
     Provider(const Provider&) = delete;
     Provider& operator=(const Provider&) = delete;
 
+    /**
+     * @brief Provides non-mutable access to this provider's updates.
+     * @return A non-mutable reference to the updates.
+     */
+    virtual const Updates& updates() const;
+
+    /**
+     * @brief Access to the controller facade of this provider instance.
+     */
     virtual const Controller::Ptr& state_controller() const;
 
-    virtual ChannelConnection subscribe_to_position_updates(std::function<void(const Update<Position>&)> f);
-    virtual ChannelConnection subscribe_to_heading_updates(std::function<void(const Update<Heading>&)> f);
-    virtual ChannelConnection subscribe_to_velocity_updates(std::function<void(const Update<Velocity>&)> f);
-
-    virtual bool supports(const Feature& f) const;
-    virtual bool requires(const Requirement& r) const;
-
-    virtual bool matches_criteria(const Criteria&);
-    
+    /**
+     * @brief Checks if the provider supports a specific feature.
+     * @param f Feature to test for
+     * @return true iff the provider supports the feature.
+     */
+    virtual bool supports(const Features& f) const;
+
+    /**
+     * @brief Checks if the provider has got a specific requirement.
+     * @param r Requirement to test for.
+     * @return true iff the provider has the specific requirement.
+     */
+    virtual bool requires(const Requirements& r) const;
+
+    /**
+     * @brief Checks if a provider satisfies a set of accuracy criteria.
+     * @param [in] criteria The criteria to check.
+     * @return true iff the provider satisfies the given criteria.
+     */
+    virtual bool matches_criteria(const Criteria& criteria);
+
+    /**
+     * @brief Called by the engine whenever the wifi and cell ID reporting state changes.
+     * @param state The new state.
+     */
+    virtual void on_wifi_and_cell_reporting_state_changed(WifiAndCellIdReportingState state);
+
+    /**
+     * @brief Called by the engine whenever the reference location changed.
+     * @param position The new reference location.
+     */
+    virtual void on_reference_location_updated(const Update<Position>& position);
+
+    /**
+     * @brief Called by the engine whenever the reference velocity changed.
+     * @param velocity The new reference velocity.
+     */
+    virtual void on_reference_velocity_updated(const Update<Velocity>& velocity);
+
+    /**
+     * @brief Called by the engine whenever the reference heading changed.
+     * @param heading The new reference heading.
+     */
+    virtual void on_reference_heading_updated(const Update<Heading>& heading);
+
 protected:
     explicit Provider(
-        const FeatureFlags& feature_flags = FeatureFlags(),
-        const RequirementFlags& requirement_flags = RequirementFlags());
+        const Features& features = Features::none,
+        const Requirements& requirements = Requirements::none);
 
-    void deliver_position_updates(const Update<Position>& update);
-    void deliver_heading_updates(const Update<Heading>& update);
-    void deliver_velocity_updates(const Update<Velocity>& update);
+    virtual Updates& mutable_updates();
     
+    /**
+     * @brief Implementation-specific, empty by default.
+     */
     virtual void start_position_updates();
+
+    /**
+     * @brief Implementation-specific, empty by default.
+     */
     virtual void stop_position_updates();
 
+    /**
+     * @brief Implementation-specific, empty by default.
+     */
     virtual void start_heading_updates();
+
+    /**
+     * @brief Implementation-specific, empty by default.
+     */
     virtual void stop_heading_updates();
 
+    /**
+     * @brief Implementation-specific, empty by default.
+     */
     virtual void start_velocity_updates();
+
+    /**
+     * @brief Implementation-specific, empty by default.
+     */
     virtual void stop_velocity_updates();
 
 private:
-    FeatureFlags feature_flags;
-    RequirementFlags requirement_flags;
-    Channel<Update<Position>> position_updates_channel;
-    Channel<Update<Heading>> heading_updates_channel;
-    Channel<Update<Velocity>> velocity_updates_channel;
-    Controller::Ptr controller;
+    struct
+    {
+        Features features = Features::none;
+        Requirements requirements = Requirements::none;
+        Updates updates;
+        Controller::Ptr controller = Controller::Ptr{};
+    } d;
 };
+
+Provider::Features operator|(Provider::Features lhs, Provider::Features rhs);
+Provider::Features operator&(Provider::Features lhs, Provider::Features rhs);
+
+Provider::Requirements operator|(Provider::Requirements lhs, Provider::Requirements rhs);
+Provider::Requirements operator&(Provider::Requirements lhs, Provider::Requirements rhs);
 }
 }
 }

=== added file 'include/location_service/com/ubuntu/location/provider_enumerator.h'
--- include/location_service/com/ubuntu/location/provider_enumerator.h	1970-01-01 00:00:00 +0000
+++ include/location_service/com/ubuntu/location/provider_enumerator.h	2014-02-03 13:52:45 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_COM_UBUNTU_PROVIDER_ENUMERATOR_H_
+#define LOCATION_SERVICE_COM_UBUNTU_PROVIDER_ENUMERATOR_H_
+
+#include <functional>
+#include <memory>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+class Provider;
+class ProviderEnumerator
+{
+public:
+    ProviderEnumerator(const ProviderEnumerator&) = delete;
+    virtual ~ProviderEnumerator() = default;
+
+    ProviderEnumerator& operator=(const ProviderEnumerator&) = delete;
+    bool operator==(const ProviderEnumerator&) const = delete;
+
+    virtual void for_each_provider(const std::function<void(const std::shared_ptr<Provider>&)>&) const = 0;
+
+protected:
+    ProviderEnumerator() = default;
+};
+}
+}
+}
+
+#endif // LOCATION_SERVICE_COM_UBUNTU_PROVIDER_ENUMERATOR_H_

=== modified file 'include/location_service/com/ubuntu/location/provider_factory.h'
--- include/location_service/com/ubuntu/location/provider_factory.h	2013-05-29 06:04:02 +0000
+++ include/location_service/com/ubuntu/location/provider_factory.h	2014-02-03 13:52:45 +0000
@@ -18,8 +18,8 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDER_FACTORY_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDER_FACTORY_H_
 
-#include "com/ubuntu/location/configuration.h"
-#include "com/ubuntu/location/provider.h"
+#include <com/ubuntu/location/configuration.h>
+#include <com/ubuntu/location/provider.h>
 
 #include <functional>
 #include <map>
@@ -57,7 +57,7 @@
     ProviderFactory& operator=(const ProviderFactory&) = delete;
 
     std::mutex guard;
-    std::map<std::string, Factory> factory_store;    
+    std::map<std::string, Factory> factory_store;
 };
 }
 }

=== added file 'include/location_service/com/ubuntu/location/provider_selection.h'
--- include/location_service/com/ubuntu/location/provider_selection.h	1970-01-01 00:00:00 +0000
+++ include/location_service/com/ubuntu/location/provider_selection.h	2014-02-03 13:52:45 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_COM_UBUNTU_PROVIDER_SELECTION_H_
+#define LOCATION_SERVICE_COM_UBUNTU_PROVIDER_SELECTION_H_
+
+#include <com/ubuntu/location/provider.h>
+
+#include <memory>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+struct ProviderSelection
+{
+    inline Provider::Features to_feature_flags() const
+    {
+        Provider::Features flags = Provider::Features::none;
+
+        if (position_updates_provider)
+            flags = flags | Provider::Features::position;
+        if (heading_updates_provider)
+            flags = flags | Provider::Features::heading;
+        if(velocity_updates_provider)
+            flags = flags | Provider::Features::velocity;
+
+        return flags;
+    }
+
+    std::shared_ptr<Provider> position_updates_provider;
+    std::shared_ptr<Provider> heading_updates_provider;
+    std::shared_ptr<Provider> velocity_updates_provider;
+};
+
+inline bool operator==(const ProviderSelection& lhs, const ProviderSelection& rhs)
+{
+    return lhs.position_updates_provider == rhs.position_updates_provider &&
+            lhs.heading_updates_provider == rhs.heading_updates_provider &&
+            lhs.velocity_updates_provider == rhs.velocity_updates_provider;
+}
+}
+}
+}
+
+#endif // LOCATION_SERVICE_COM_UBUNTU_PROVIDER_SELECTION_H_

=== modified file 'include/location_service/com/ubuntu/location/provider_selection_policy.h'
--- include/location_service/com/ubuntu/location/provider_selection_policy.h	2013-06-10 11:10:00 +0000
+++ include/location_service/com/ubuntu/location/provider_selection_policy.h	2014-02-03 13:52:45 +0000
@@ -18,7 +18,8 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_PROVIDER_SELECTION_POLICY_H_
 #define LOCATION_SERVICE_COM_UBUNTU_PROVIDER_SELECTION_POLICY_H_
 
-#include "com/ubuntu/location/provider.h"
+#include <com/ubuntu/location/provider_enumerator.h>
+#include <com/ubuntu/location/provider_selection.h>
 
 #include <memory>
 
@@ -29,52 +30,23 @@
 namespace location
 {
 struct Criteria;
-
-struct ProviderSelection
-{
-    ProviderSelection(const Provider::Ptr position = Provider::Ptr{},
-                      const Provider::Ptr heading = Provider::Ptr{},
-                      const Provider::Ptr velocity = Provider::Ptr{}) : position_updates_provider(position),
-                                                      heading_updates_provider(heading),
-                                                      velocity_updates_provider(velocity)
-    {
-    }
-    
-    Provider::FeatureFlags to_feature_flags() const
-    {
-        Provider::FeatureFlags flags;
-        flags.set(static_cast<std::size_t>(Provider::Feature::position), static_cast<bool>(position_updates_provider));
-        flags.set(static_cast<std::size_t>(Provider::Feature::heading), static_cast<bool>(heading_updates_provider));
-        flags.set(static_cast<std::size_t>(Provider::Feature::velocity), static_cast<bool>(velocity_updates_provider));
-
-        return flags;
-    }
-
-    Provider::Ptr position_updates_provider;
-    Provider::Ptr heading_updates_provider;
-    Provider::Ptr velocity_updates_provider;
-};
-
-inline bool operator==(const ProviderSelection& lhs, const ProviderSelection& rhs)
-{
-    return lhs.position_updates_provider == rhs.position_updates_provider &&
-            lhs.heading_updates_provider == rhs.heading_updates_provider &&
-            lhs.velocity_updates_provider == rhs.velocity_updates_provider;
-}
+class Engine;
 
 class ProviderSelectionPolicy
 {
 public:
     typedef std::shared_ptr<ProviderSelectionPolicy> Ptr;
 
+    ProviderSelectionPolicy(const ProviderSelectionPolicy&) = delete;
+    ProviderSelectionPolicy& operator=(const ProviderSelectionPolicy&) = delete;
     virtual ~ProviderSelectionPolicy() = default;
 
-    virtual ProviderSelection determine_provider_selection_from_set_for_criteria(const Criteria& criteria, const std::set<Provider::Ptr>& providers) = 0;
+    virtual ProviderSelection determine_provider_selection_for_criteria(
+            const Criteria& criteria,
+            const ProviderEnumerator& enumerator) = 0;
+
 protected:
     ProviderSelectionPolicy() = default;
-private:
-    ProviderSelectionPolicy(const ProviderSelectionPolicy&) = delete;
-    ProviderSelectionPolicy& operator=(const ProviderSelectionPolicy&) = delete;
 };
 }
 }

=== modified file 'include/location_service/com/ubuntu/location/providers/geoclue/geoclue.h'
--- include/location_service/com/ubuntu/location/providers/geoclue/geoclue.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/providers/geoclue/geoclue.h	2014-02-03 13:52:45 +0000
@@ -18,14 +18,14 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GEOCLUE_GEOCLUE_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GEOCLUE_GEOCLUE_H_
 
-#include "org/freedesktop/dbus/service.h"
-#include "org/freedesktop/dbus/traits/service.h"
-#include "org/freedesktop/dbus/types/struct.h"
-#include "org/freedesktop/dbus/types/stl/tuple.h"
+#include <core/dbus/service.h>
+#include <core/dbus/traits/service.h>
+#include <core/dbus/types/struct.h>
+#include <core/dbus/types/stl/tuple.h>
 
 #include <string>
 
-namespace dbus = org::freedesktop::dbus;
+namespace dbus = core::dbus;
 
 namespace org
 {
@@ -43,13 +43,13 @@
 
     friend std::ostream& operator<<(std::ostream& out, const Status& status)
     {
-        static std::map<Status, std::string> lut = 
-		{
-                    {Status::error, "error"},
-                    {Status::unavailable, "unavailable"},
-                    {Status::acquiring, "acquiring"},
-                    {Status::available, "available"}
-		};
+        static std::map<Status, std::string> lut =
+        {
+            {Status::error, "error"},
+            {Status::unavailable, "unavailable"},
+            {Status::acquiring, "acquiring"},
+            {Status::available, "available"}
+        };
 
         return out << lut[status];
     }
@@ -59,7 +59,7 @@
         inline static std::string name()
         {
             return "GetProviderInfo";
-        } 
+        }
         typedef Geoclue Interface;
         typedef std::tuple<std::string, std::string> ResultType;
         inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
@@ -70,7 +70,7 @@
         inline static std::string name()
         {
             return "GetStatus";
-        } 
+        }
         typedef Geoclue Interface;
         typedef int32_t ResultType;
         inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
@@ -81,7 +81,7 @@
         inline static std::string name()
         {
             return "AddReference";
-        } 
+        }
         typedef Geoclue Interface;
         typedef void ResultType;
         inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
@@ -92,7 +92,7 @@
         inline static std::string name()
         {
             return "RemoveReference";
-        } 
+        }
         typedef Geoclue Interface;
         typedef void ResultType;
         inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
@@ -105,7 +105,7 @@
             inline static std::string name()
             {
                 return "GetAddress";
-            } 
+            }
             typedef Address Interface;
             typedef std::tuple<int32_t, std::map<std::string, std::string>, dbus::types::Struct<std::tuple<int32_t, double, double>>> ResultType;
             inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
@@ -127,24 +127,24 @@
 
     struct Position
     {
-    	struct Field
-    	{
+        struct Field
+        {
             Field() = delete;
 
             static const int none = 0;
             static const int latitude = 1;
             static const int longitude = 2;
             static const int altitude = 3;
-    	};
+        };
 
-    	typedef std::bitset<4> FieldFlags;
+        typedef std::bitset<4> FieldFlags;
 
         struct GetPosition
         {
             inline static std::string name()
             {
                 return "GetPosition";
-            } 
+            }
             typedef Position Interface;
             typedef std::tuple<int32_t, int32_t, double, double, double, dbus::types::Struct<std::tuple<int32_t, double, double>>> ResultType;
             inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
@@ -166,24 +166,24 @@
 
     struct Velocity
     {
-    	struct Field
-    	{
+        struct Field
+        {
             Field() = delete;
 
             static const int none = 0;
             static const int speed = 1;
             static const int direction = 2;
             static const int climb = 3;
-    	};
+        };
 
-    	typedef std::bitset<4> FieldFlags;
+        typedef std::bitset<4> FieldFlags;
 
         struct GetVelocity
         {
             inline static std::string name()
             {
                 return "GetVelocity";
-            } 
+            }
             typedef Velocity Interface;
             typedef std::tuple<int32_t, int32_t, double, double, double> ResultType;
             inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
@@ -205,9 +205,7 @@
 }
 }
 
-namespace org
-{
-namespace freedesktop
+namespace core
 {
 namespace dbus
 {
@@ -255,6 +253,5 @@
 }
 }
 }
-}
 
 #endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GEOCLUE_GEOCLUE_H_

=== modified file 'include/location_service/com/ubuntu/location/providers/geoclue/provider.h'
--- include/location_service/com/ubuntu/location/providers/geoclue/provider.h	2013-05-29 06:04:02 +0000
+++ include/location_service/com/ubuntu/location/providers/geoclue/provider.h	2014-02-03 13:52:45 +0000
@@ -18,8 +18,8 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GEOCLUE_PROVIDER_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GEOCLUE_PROVIDER_H_
 
-#include "com/ubuntu/location/provider.h"
-#include "com/ubuntu/location/provider_factory.h"
+#include <com/ubuntu/location/provider.h>
+#include <com/ubuntu/location/provider_factory.h>
 
 namespace com
 {
@@ -36,9 +36,6 @@
   public:
     static Provider::Ptr create_instance(const ProviderFactory::Configuration&);
 
-    static const Provider::FeatureFlags& default_feature_flags();
-    static const Provider::RequirementFlags& default_requirement_flags();
-
     struct Configuration
     {
         static std::string key_name() { return "name"; }
@@ -46,8 +43,8 @@
         std::string name;
         std::string path;
 
-        Provider::FeatureFlags features;
-        Provider::RequirementFlags requirements;
+        Provider::Features features = Provider::Features::none;
+        Provider::Requirements requirements = Provider::Requirements::none;
     };
 
     Provider(const Configuration& config);

=== removed directory 'include/location_service/com/ubuntu/location/providers/gps'
=== modified file 'include/location_service/com/ubuntu/location/providers/skyhook/provider.h'
--- include/location_service/com/ubuntu/location/providers/skyhook/provider.h	2013-05-29 06:04:02 +0000
+++ include/location_service/com/ubuntu/location/providers/skyhook/provider.h	2014-02-03 13:52:45 +0000
@@ -18,8 +18,8 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_SKYHOOK_PROVIDER_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_SKYHOOK_PROVIDER_H_
 
-#include "com/ubuntu/location/provider.h"
-#include "com/ubuntu/location/provider_factory.h"
+#include <com/ubuntu/location/provider.h>
+#include <com/ubuntu/location/provider_factory.h>
 
 #include <memory>
 

=== modified file 'include/location_service/com/ubuntu/location/proxy_provider.h'
--- include/location_service/com/ubuntu/location/proxy_provider.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/proxy_provider.h	2014-02-03 13:52:45 +0000
@@ -18,8 +18,8 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROXY_PROVIDER_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROXY_PROVIDER_H_
 
-#include "com/ubuntu/location/provider.h"
-#include "com/ubuntu/location/provider_selection_policy.h"
+#include <com/ubuntu/location/provider.h>
+#include <com/ubuntu/location/provider_selection_policy.h>
 
 #include <bitset>
 #include <memory>
@@ -38,10 +38,6 @@
     ProxyProvider(const ProviderSelection& selection);
     ~ProxyProvider() noexcept;
 
-    ChannelConnection subscribe_to_position_updates(std::function<void(const Update<Position>&)> f);
-    ChannelConnection subscribe_to_heading_updates(std::function<void(const Update<Heading>&)> f);
-    ChannelConnection subscribe_to_velocity_updates(std::function<void(const Update<Velocity>&)> f);
-
     virtual void start_position_updates();
     virtual void stop_position_updates();
 

=== added file 'include/location_service/com/ubuntu/location/satellite_based_positioning_state.h'
--- include/location_service/com/ubuntu/location/satellite_based_positioning_state.h	1970-01-01 00:00:00 +0000
+++ include/location_service/com/ubuntu/location/satellite_based_positioning_state.h	2014-02-03 13:52:45 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_SATELLITE_BASED_POSITIONING_STATE_H_
+#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SATELLITE_BASED_POSITIONING_STATE_H_
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+/**
+ * @brief The SatelliteBasedPositioningState enum describes whether satellite
+ * assisted positioning is enabled or disabled.
+ */
+enum class SatelliteBasedPositioningState
+{
+    on, ///< Satellite assisted positioning is on.
+    off ///< Satellite assisted positioning is off.
+};
+}
+}
+}
+
+#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SATELLITE_BASED_POSITIONING_STATE_H_

=== modified file 'include/location_service/com/ubuntu/location/service/configuration.h'
--- include/location_service/com/ubuntu/location/service/configuration.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/service/configuration.h	2014-02-03 13:52:45 +0000
@@ -18,11 +18,11 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_CONFIGURATION_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_CONFIGURATION_H_
 
-#include "com/ubuntu/location/service/permission_manager.h"
+#include <com/ubuntu/location/service/permission_manager.h>
 
-#include "com/ubuntu/location/engine.h"
-#include "com/ubuntu/location/provider.h"
-#include "com/ubuntu/location/provider_selection_policy.h"
+#include <com/ubuntu/location/engine.h>
+#include <com/ubuntu/location/provider.h>
+#include <com/ubuntu/location/provider_selection_policy.h>
 
 #include <set>
 

=== modified file 'include/location_service/com/ubuntu/location/service/default_configuration.h'
--- include/location_service/com/ubuntu/location/service/default_configuration.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/service/default_configuration.h	2014-02-03 13:52:45 +0000
@@ -18,7 +18,7 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_DEFAULT_CONFIGURATION_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_DEFAULT_CONFIGURATION_H_
 
-#include "com/ubuntu/location/service/configuration.h"
+#include <com/ubuntu/location/service/configuration.h>
 
 #include <set>
 

=== modified file 'include/location_service/com/ubuntu/location/service/default_permission_manager.h'
--- include/location_service/com/ubuntu/location/service/default_permission_manager.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/service/default_permission_manager.h	2014-02-03 13:52:45 +0000
@@ -18,7 +18,7 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_DEFAULT_PERMISSION_MANAGER_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_DEFAULT_PERMISSION_MANAGER_H_
 
-#include "com/ubuntu/location/service/permission_manager.h"
+#include <com/ubuntu/location/service/permission_manager.h>
 
 #include <sys/types.h>
 #include <unistd.h>

=== modified file 'include/location_service/com/ubuntu/location/service/implementation.h'
--- include/location_service/com/ubuntu/location/service/implementation.h	2013-06-10 11:10:00 +0000
+++ include/location_service/com/ubuntu/location/service/implementation.h	2014-02-03 13:52:45 +0000
@@ -18,12 +18,12 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_IMPLEMENTATION_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_IMPLEMENTATION_H_
 
-#include "com/ubuntu/location/engine.h"
-#include "com/ubuntu/location/service/skeleton.h"
+#include <com/ubuntu/location/engine.h>
+#include <com/ubuntu/location/service/skeleton.h>
 
 #include <memory>
 
-namespace dbus = org::freedesktop::dbus;
+namespace dbus = core::dbus;
 
 namespace com
 {
@@ -39,14 +39,14 @@
     typedef std::shared_ptr<Implementation> Ptr;
 
     Implementation(
-        const org::freedesktop::dbus::Bus::Ptr& bus,
+        const core::dbus::Bus::Ptr& bus,
         const Engine::Ptr& engine,
         const PermissionManager::Ptr& permission_manager);
     Implementation(const Implementation&) = delete;
     virtual ~Implementation() noexcept;
     Implementation& operator=(const Implementation&) = delete;
 
-    virtual session::Interface::Ptr create_session_for_criteria(const Criteria& criteria);
+    session::Interface::Ptr create_session_for_criteria(const Criteria& criteria);
 
   private:
     struct Private;

=== modified file 'include/location_service/com/ubuntu/location/service/interface.h'
--- include/location_service/com/ubuntu/location/service/interface.h	2013-06-10 11:10:00 +0000
+++ include/location_service/com/ubuntu/location/service/interface.h	2014-02-03 13:52:45 +0000
@@ -18,16 +18,18 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_INTERFACE_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_INTERFACE_H_
 
-#include "com/ubuntu/location/service/session/interface.h"
-
-#include <org/freedesktop/dbus/service.h>
-#include <org/freedesktop/dbus/traits/service.h>
-#include <org/freedesktop/dbus/types/object_path.h>
+#include <com/ubuntu/location/service/session/interface.h>
+
+#include <com/ubuntu/location/space_vehicle.h>
+
+#include <core/dbus/service.h>
+#include <core/dbus/traits/service.h>
+#include <core/dbus/types/object_path.h>
 
 #include <chrono>
 #include <functional>
 
-namespace dbus = org::freedesktop::dbus;
+namespace dbus = core::dbus;
 
 namespace com
 {
@@ -35,18 +37,31 @@
 {
 namespace location
 {
-
 struct Criteria;
-
 namespace service
 {
+/**
+ * @brief The Interface class models the primary interface to the location service.
+ */
 class Interface
 {
   protected:
     struct Errors
     {
-        struct InsufficientPermissions { inline static std::string name() { return "com.ubuntu.location.Service.Error.InsufficientPermissions"; } };
-        struct CreatingSession { inline static std::string name() { return "com.ubuntu.location.Service.Error.CreatingSession"; } };
+        struct InsufficientPermissions
+        {
+            inline static std::string name()
+            {
+                return "com.ubuntu.location.Service.Error.InsufficientPermissions";
+            }
+        };
+        struct CreatingSession
+        {
+            inline static std::string name()
+            {
+                return "com.ubuntu.location.Service.Error.CreatingSession";
+            }
+        };
     };
 
     struct CreateSessionForCriteria
@@ -64,7 +79,82 @@
 
         typedef dbus::types::ObjectPath ResultType;
 
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
+        inline static const std::chrono::milliseconds default_timeout()
+        {
+            return std::chrono::seconds{1};
+        }
+    };
+
+    struct Properties
+    {
+        struct DoesSatelliteBasedPositioning
+        {
+            inline static const std::string& name()
+            {
+                static const std::string s
+                {
+                    "DoesSatelliteBasedPositioning"
+                };
+                return s;
+            }
+
+            typedef com::ubuntu::location::service::Interface Interface;
+            typedef bool ValueType;
+            static const bool readable = true;
+            static const bool writable = true;
+        };
+
+        struct DoesReportCellAndWifiIds
+        {
+            inline static const std::string& name()
+            {
+                static const std::string s
+                {
+                    "DoesReportCellAndWifiIds"
+                };
+                return s;
+            }
+
+            typedef com::ubuntu::location::service::Interface Interface;
+            typedef bool ValueType;
+            static const bool readable = true;
+            static const bool writable = true;
+        };
+
+        struct IsOnline
+        {
+            inline static const std::string& name()
+            {
+                static const std::string s
+                {
+                    "IsOnline"
+                };
+                return s;
+            }
+
+            typedef com::ubuntu::location::service::Interface Interface;
+            typedef bool ValueType;
+            static const bool readable = true;
+            static const bool writable = true;
+        };
+
+        struct VisibleSpaceVehicles
+        {
+            inline static const std::string& name()
+            {
+                static const std::string s
+                {
+                    "VisibleSpaceVehicles"
+                };
+                return s;
+            }
+
+            typedef com::ubuntu::location::service::Interface Interface;
+            typedef std::map<com::ubuntu::location::SpaceVehicle::Key, com::ubuntu::location::SpaceVehicle> ValueType;
+
+            static const bool readable = true;
+            static const bool writable = false;
+        };
     };
 
     Interface() = default;
@@ -72,6 +162,9 @@
   public:
     typedef std::shared_ptr<Interface> Ptr;
 
+    /**
+     * @brief Queries the path that this object is known under.
+     */
     inline static const std::string& path()
     {
         static const std::string s{"/com/ubuntu/location/Service"};
@@ -82,6 +175,40 @@
     Interface& operator=(const Interface&) = delete;
     virtual ~Interface() = default;
 
+    /**
+     * @brief Whether the service uses satellite-based positioning.
+     * @return  A setable/getable/observable property.
+     */
+    virtual core::Property<bool>& does_satellite_based_positioning() = 0;
+
+    /**
+     * @brief Whether the overall service and its positioning engine is online or not.
+     * @return  A setable/getable/observable property.
+     */
+    virtual core::Property<bool>& is_online() = 0;
+
+    /**
+     * @brief Whether the engine and its providers/reporters do call home to
+     * report reference locations together with wifi and cell ids.
+     *
+     * We consider this feature privacy sensitive and it defaults to false. The
+     * user has to explicitly opt-in into this feature.
+     *
+     * @return A setable/getable/observable property.
+     */
+    virtual core::Property<bool>& does_report_cell_and_wifi_ids() = 0;
+
+    /**
+      * @brief All space vehicles currently visible.
+      */
+    virtual core::Property<std::map<SpaceVehicle::Key, SpaceVehicle>>& visible_space_vehicles() = 0;
+
+    /**
+     * @brief Starts a new session for the given criteria
+     * @throw std::runtime_error in case of errors.
+     * @param criteria The client's requirements in terms of accuraccy and functionality
+     * @return A session instance.
+     */
     virtual session::Interface::Ptr create_session_for_criteria(const Criteria& criteria) = 0;
 };
 }
@@ -89,9 +216,7 @@
 }
 }
 
-namespace org
-{
-namespace freedesktop
+namespace core
 {
 namespace dbus
 {
@@ -112,8 +237,7 @@
 }
 }
 }
-}
 
-#include "com/ubuntu/location/codec.h"
+#include <com/ubuntu/location/codec.h>
 
 #endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_INTERFACE_H_

=== modified file 'include/location_service/com/ubuntu/location/service/permission_manager.h'
--- include/location_service/com/ubuntu/location/service/permission_manager.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/service/permission_manager.h	2014-02-03 13:52:45 +0000
@@ -18,10 +18,7 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_PERMISSION_MANAGER_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_PERMISSION_MANAGER_H_
 
-#include "com/ubuntu/location/channel.h"
-#include "com/ubuntu/location/provider_selection_policy.h"
-
-#include <functional>
+#include <memory>
 
 namespace com
 {
@@ -29,29 +26,48 @@
 {
 namespace location
 {
+struct Criteria;
 namespace service
 {
+/**
+ * @brief Credentials of a remote session.
+ */
 struct Credentials
 {
+    /** The process id of the remote peer. */
     pid_t pid;
+    /** The user id the remote peer runs under. */
     uid_t uid;
 };
 
+/**
+ * @brief The PermissionManager class is an interface to check whether an application is allowed to access the location services.
+ */
 class PermissionManager
 {
 public:
+    /** Manager pointer type. */
     typedef std::shared_ptr<PermissionManager> Ptr;
 
+    /**
+     * @brief The Result enum summarizes the results of a query for permissions.
+     */
     enum class Result
     {
-        granted,
-        rejected
+        granted, ///< The app is allowed to access the location service.
+        rejected ///< The app is not allowed to access the location service.
     };
 
     virtual ~PermissionManager() = default;
     PermissionManager(const PermissionManager&) = delete;
     PermissionManager& operator=(const PermissionManager&) = delete;
 
+    /**
+     * @brief Checks whether the app with the given credentials is allowed to access the service for the given criteria.
+     * @param criteria The requirements of the remote peer.
+     * @param credentials The credentials identifying the remote peer.
+     * @return Result::granted if the remote peer is allowed to access the location service, Result::rejected otherwise.
+     */
     virtual Result check_permission_for_credentials(
         const Criteria& criteria,
         const Credentials& credentials) = 0;

=== modified file 'include/location_service/com/ubuntu/location/service/session/implementation.h'
--- include/location_service/com/ubuntu/location/service/session/implementation.h	2013-06-10 11:10:00 +0000
+++ include/location_service/com/ubuntu/location/service/session/implementation.h	2014-02-03 13:52:45 +0000
@@ -18,9 +18,9 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_IMPLEMENTATION_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_IMPLEMENTATION_H_
 
-#include "com/ubuntu/location/service/session/skeleton.h"
+#include <com/ubuntu/location/service/session/skeleton.h>
 
-#include "com/ubuntu/location/provider.h"
+#include <com/ubuntu/location/provider.h>
 
 #include <memory>
 
@@ -34,13 +34,10 @@
 {
 namespace session
 {
-class Implementation : public Skeleton
+class Implementation : public Interface
 {
   public:
-    Implementation(
-        const org::freedesktop::dbus::Bus::Ptr& bus,
-        const org::freedesktop::dbus::types::ObjectPath& session_path,
-        const Provider::Ptr& provider);
+    Implementation(const Provider::Ptr& provider);
     Implementation(const Implementation&) = delete;
     virtual ~Implementation() noexcept;
     Implementation& operator=(const Implementation&) = delete;

=== modified file 'include/location_service/com/ubuntu/location/service/session/interface.h'
--- include/location_service/com/ubuntu/location/service/session/interface.h	2013-06-10 11:10:00 +0000
+++ include/location_service/com/ubuntu/location/service/session/interface.h	2014-02-03 13:52:45 +0000
@@ -18,16 +18,13 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_INTERFACE_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_INTERFACE_H_
 
-#include "com/ubuntu/location/channel.h"
-#include "com/ubuntu/location/heading.h"
-#include "com/ubuntu/location/position.h"
-#include "com/ubuntu/location/provider.h"
-#include "com/ubuntu/location/update.h"
-#include "com/ubuntu/location/velocity.h"
+#include <com/ubuntu/location/heading.h>
+#include <com/ubuntu/location/position.h>
+#include <com/ubuntu/location/provider.h>
+#include <com/ubuntu/location/update.h>
+#include <com/ubuntu/location/velocity.h>
 
-#include <org/freedesktop/dbus/codec.h>
-#include <org/freedesktop/dbus/traits/service.h>
-#include <org/freedesktop/dbus/types/object_path.h>
+#include <core/property.h>
 
 namespace com
 {
@@ -39,175 +36,70 @@
 {
 namespace session
 {
+/**
+ * @brief Models a session with the location service.
+ */
 class Interface
 {
 public:
-    struct UpdatePosition
-    {
-        typedef com::ubuntu::location::service::session::Interface Interface;
-
-        inline static const std::string& name()
-        {
-            static const std::string s
-            {
-                "UpdatePosition"
-            };
-            return s;
-        }
-
-        typedef void ResultType;
-
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
-    };
-
-    struct UpdateVelocity
-    {
-        typedef com::ubuntu::location::service::session::Interface Interface;
-
-        inline static const std::string& name()
-        {
-            static const std::string s
-            {
-                "UpdateVelocity"
-            };
-            return s;
-        }
-
-        typedef void ResultType;
-
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
-    };
-
-    struct UpdateHeading
-    {
-        typedef com::ubuntu::location::service::session::Interface Interface;
-
-        inline static const std::string& name()
-        {
-            static const std::string s
-            {
-                "UpdateHeading"
-            };
-            return s;
-        }
-
-        typedef void ResultType;
-
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
-    };
-
-    struct StartPositionUpdates
-    {
-        typedef com::ubuntu::location::service::session::Interface Interface;
-
-        inline static const std::string& name()
-        {
-            static const std::string s
-            {
-                "StartPositionUpdates"
-            };
-            return s;
-        }
-
-        typedef void ResultType;
-
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
-    };
-
-    struct StopPositionUpdates
-    {
-        typedef com::ubuntu::location::service::session::Interface Interface;
-
-        inline static const std::string& name()
-        {
-            static const std::string s
-            {
-                "StopPositionUpdates"
-            };
-            return s;
-        }
-
-        typedef void ResultType;
-
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
-    };
-
-    struct StartVelocityUpdates
-    {
-        typedef com::ubuntu::location::service::session::Interface Interface;
-
-        inline static const std::string& name()
-        {
-            static const std::string s
-            {
-                "StartVelocityUpdates"
-            };
-            return s;
-        }
-
-        typedef void ResultType;
-
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
-    };
-
-    struct StopVelocityUpdates
-    {
-        typedef com::ubuntu::location::service::session::Interface Interface;
-
-        inline static const std::string& name()
-        {
-            static const std::string s
-            {
-                "StopVelocityUpdates"
-            };
-            return s;
-        }
-
-        typedef void ResultType;
-
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
-    };
-
-    struct StartHeadingUpdates
-    {
-        typedef com::ubuntu::location::service::session::Interface Interface;
-
-        inline static const std::string& name()
-        {
-            static const std::string s
-            {
-                "StartHeadingUpdates"
-            };
-            return s;
-        }
-
-        typedef void ResultType;
-
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
-    };
-
-    struct StopHeadingUpdates
-    {
-        typedef com::ubuntu::location::service::session::Interface Interface;
-
-        inline static const std::string& name()
-        {
-            static const std::string s
-            {
-                "StopHeadingUpdates"
-            };
-            return s;
-        }
-
-        typedef void ResultType;
-
-        inline static const std::chrono::milliseconds default_timeout() { return std::chrono::seconds{1}; }
-    };
+    struct UpdatePosition;
+    struct UpdateVelocity;
+    struct UpdateHeading;
+
+    struct StartPositionUpdates;
+    struct StopPositionUpdates;
+
+    struct StartVelocityUpdates;
+    struct StopVelocityUpdates;
+
+    struct StartHeadingUpdates;
+    struct StopHeadingUpdates;
 
     struct Errors
     {
-        struct ErrorParsingUpdate { inline static std::string name() { return "com.ubuntu.location.Service.Session.ErrorParsingUpdate"; } };
-        struct ErrorStartingUpdate { inline static std::string name() { return "com.ubuntu.location.Service.Session.ErrorStartingUpdate"; } };
+        struct ErrorParsingUpdate;
+        struct ErrorStartingUpdate;
+    };
+    /**
+     * @brief Encapsulates updates provided for this session, and the ability to enable/disable updates.
+     */
+    struct Updates
+    {
+        /**
+         * @brief The Status enum models the possible states of updates.
+         */
+        enum class Status
+        {
+            enabled, ///< Updates are enabled and delivered to this session.
+            disabled ///< Updates are disabled and not delivered to this session.
+        };
+
+        /**
+         * @brief Updates for position measurements.
+         */
+        core::Property<Update<Position>> position{};
+        /**
+         * @brief Status of position updates, mutable.
+         */
+        core::Property<Status> position_status{Status::disabled};
+
+        /**
+         * @brief Updates for the heading measurements.
+         */
+        core::Property<Update<Heading>> heading{};
+        /**
+         * @brief Status of position updates, mutable.
+         */
+        core::Property<Status> heading_status{Status::disabled};
+
+        /**
+         * @brief Updates for velocity measurements.
+         */
+        core::Property<Update<Velocity>> velocity{};
+        /**
+         * @brief Status of velocity updates, mutable.
+         */
+        core::Property<Status> velocity_status{Status::disabled};
     };
 
     typedef std::shared_ptr<Interface> Ptr;
@@ -216,60 +108,23 @@
     virtual ~Interface() noexcept;
     Interface& operator=(const Interface&) = delete;
 
-    virtual const org::freedesktop::dbus::types::ObjectPath& path() const = 0;
-
-    ChannelConnection install_position_updates_handler(std::function<void(const Update<Position>&)> handler);
-    ChannelConnection install_velocity_updates_handler(std::function<void(const Update<Velocity>&)> handler);
-    ChannelConnection install_heading_updates_handler(std::function<void(const Update<Heading>&)> handler);
-
-    virtual void start_position_updates() = 0;
-    virtual void stop_position_updates() noexcept = 0;
-    virtual void start_velocity_updates() = 0;
-    virtual void stop_velocity_updates() noexcept = 0;
-    virtual void start_heading_updates() = 0;
-    virtual void stop_heading_updates() noexcept = 0;
-
-protected:
+    /**
+     * @brief Provides access to the updates delivered for this session.
+     * @return A mutable reference to updates.
+     */
+    virtual Updates& updates();
+
+protected:    
     Interface();
 
-    Channel<Update<Position>>& access_position_updates_channel();
-    Channel<Update<Heading>>& access_heading_updates_channel();
-    Channel<Update<Velocity>>& access_velocity_updates_channel();
-
 private:
     struct Private;
-    std::unique_ptr<Private> d;
-};
-}
-}
-}
-}
-}
-namespace org
-{
-namespace freedesktop
-{
-namespace dbus
-{
-namespace traits
-{
-template<>
-struct Service<com::ubuntu::location::service::session::Interface>
-{
-    static const std::string& interface_name()
-    {
-        static const std::string s
-        {
-            "com.ubuntu.location.Service.Session"
-        };
-        return s;
-    }
-};
-}
-}
-}
-}
-
-#include "com/ubuntu/location/codec.h"
+    std::shared_ptr<Private> d;
+};
+}
+}
+}
+}
+}
 
 #endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_INTERFACE_H_

=== modified file 'include/location_service/com/ubuntu/location/service/session/skeleton.h'
--- include/location_service/com/ubuntu/location/service/session/skeleton.h	2013-06-10 11:10:00 +0000
+++ include/location_service/com/ubuntu/location/service/session/skeleton.h	2014-02-03 13:52:45 +0000
@@ -18,19 +18,19 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_SKELETON_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_SKELETON_H_
 
-#include "com/ubuntu/location/service/session/interface.h"
-
-#include "com/ubuntu/location/channel.h"
-#include "com/ubuntu/location/heading.h"
-#include "com/ubuntu/location/position.h"
-#include "com/ubuntu/location/provider.h"
-#include "com/ubuntu/location/update.h"
-#include "com/ubuntu/location/velocity.h"
-
-#include <org/freedesktop/dbus/message.h>
-#include <org/freedesktop/dbus/skeleton.h>
-
-#include <functional>
+#include <com/ubuntu/location/service/session/interface.h>
+
+#include <com/ubuntu/location/heading.h>
+#include <com/ubuntu/location/position.h>
+#include <com/ubuntu/location/provider.h>
+#include <com/ubuntu/location/update.h>
+#include <com/ubuntu/location/velocity.h>
+
+#include <core/dbus/message.h>
+#include <core/dbus/object.h>
+#include <core/dbus/skeleton.h>
+
+#include <memory>
 
 namespace com
 {
@@ -42,21 +42,23 @@
 {
 namespace session
 {
-class Skeleton : public org::freedesktop::dbus::Skeleton<Interface>
+class Skeleton : public core::dbus::Skeleton<Interface>
 {
   public:
-    Skeleton(
-        const org::freedesktop::dbus::Bus::Ptr& bus,
-        const org::freedesktop::dbus::types::ObjectPath& session_path);
+    Skeleton(const Interface::Ptr& instance,
+             const core::dbus::Bus::Ptr& bus,
+             const core::dbus::Service::Ptr& service,
+             const core::dbus::Object::Ptr& session,
+             const core::dbus::types::ObjectPath& session_path);
     Skeleton(const Skeleton&) = delete;
     virtual ~Skeleton() noexcept;
     Skeleton& operator=(const Skeleton&) = delete;
 
-    virtual const org::freedesktop::dbus::types::ObjectPath& path() const;
+    virtual const core::dbus::types::ObjectPath& path() const;
 
   private:
     struct Private;
-    std::unique_ptr<Private> d;
+    std::shared_ptr<Private> d;
 };
 }
 }

=== modified file 'include/location_service/com/ubuntu/location/service/session/stub.h'
--- include/location_service/com/ubuntu/location/service/session/stub.h	2013-06-10 11:10:00 +0000
+++ include/location_service/com/ubuntu/location/service/session/stub.h	2014-02-03 13:52:45 +0000
@@ -18,16 +18,15 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SESSION_STUB_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SESSION_SESSION_STUB_H_
 
-#include "com/ubuntu/location/service/session/interface.h"
-
-#include "com/ubuntu/location/channel.h"
-#include "com/ubuntu/location/heading.h"
-#include "com/ubuntu/location/position.h"
-#include "com/ubuntu/location/provider.h"
-#include "com/ubuntu/location/update.h"
-#include "com/ubuntu/location/velocity.h"
-
-#include <org/freedesktop/dbus/stub.h>
+#include <com/ubuntu/location/service/session/interface.h>
+
+#include <com/ubuntu/location/heading.h>
+#include <com/ubuntu/location/position.h>
+#include <com/ubuntu/location/provider.h>
+#include <com/ubuntu/location/update.h>
+#include <com/ubuntu/location/velocity.h>
+
+#include <core/dbus/stub.h>
 
 #include <memory>
 
@@ -41,17 +40,17 @@
 {
 namespace session
 {
-class Stub : public org::freedesktop::dbus::Stub<Interface>
+class Stub : public core::dbus::Stub<Interface>
 {
   public:
     Stub(
-        const org::freedesktop::dbus::Bus::Ptr& bus,
-        const org::freedesktop::dbus::types::ObjectPath& session_path);
+        const core::dbus::Bus::Ptr& bus,
+        const core::dbus::types::ObjectPath& session_path);
     Stub(const Stub&) = delete;
     virtual ~Stub() noexcept;
     Stub& operator=(const Stub&) = delete;
 
-    virtual const org::freedesktop::dbus::types::ObjectPath& path() const;
+    virtual const core::dbus::types::ObjectPath& path() const;
 
     virtual void start_position_updates();
     virtual void stop_position_updates() noexcept;

=== modified file 'include/location_service/com/ubuntu/location/service/skeleton.h'
--- include/location_service/com/ubuntu/location/service/skeleton.h	2013-06-10 11:10:00 +0000
+++ include/location_service/com/ubuntu/location/service/skeleton.h	2014-02-03 13:52:45 +0000
@@ -18,11 +18,11 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SKELETON_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_SKELETON_H_
 
-#include "com/ubuntu/location/service/interface.h"
-#include "com/ubuntu/location/service/permission_manager.h"
-#include "com/ubuntu/location/service/session/interface.h"
+#include <com/ubuntu/location/service/interface.h>
+#include <com/ubuntu/location/service/permission_manager.h>
+#include <com/ubuntu/location/service/session/interface.h>
 
-#include <org/freedesktop/dbus/skeleton.h>
+#include <core/dbus/skeleton.h>
 
 namespace com
 {
@@ -32,7 +32,7 @@
 {
 namespace service
 {
-class Skeleton : public org::freedesktop::dbus::Skeleton<com::ubuntu::location::service::Interface>,
+class Skeleton : public core::dbus::Skeleton<com::ubuntu::location::service::Interface>,
                  public std::enable_shared_from_this<Skeleton>
 {
   public:
@@ -43,6 +43,11 @@
     Skeleton& operator=(const Skeleton&) = delete;
     ~Skeleton() noexcept;
 
+    core::Property<bool>& does_satellite_based_positioning();
+    core::Property<bool>& does_report_cell_and_wifi_ids();
+    core::Property<bool>& is_online();
+    core::Property<std::map<SpaceVehicle::Key, SpaceVehicle>>& visible_space_vehicles();
+
   private:
     struct Private;
     std::shared_ptr<Private> d;

=== modified file 'include/location_service/com/ubuntu/location/service/stub.h'
--- include/location_service/com/ubuntu/location/service/stub.h	2013-06-10 11:10:00 +0000
+++ include/location_service/com/ubuntu/location/service/stub.h	2014-02-03 13:52:45 +0000
@@ -18,10 +18,10 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_STUB_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_STUB_H_
 
-#include "com/ubuntu/location/service/interface.h"
-#include "com/ubuntu/location/service/session/interface.h"
+#include <com/ubuntu/location/service/interface.h>
+#include <com/ubuntu/location/service/session/interface.h>
 
-#include <org/freedesktop/dbus/stub.h>
+#include <core/dbus/stub.h>
 
 namespace com
 {
@@ -31,7 +31,7 @@
 {
 namespace service
 {
-class Stub : public org::freedesktop::dbus::Stub<Interface>
+class Stub : public core::dbus::Stub<Interface>
 {
   public:
     Stub(const dbus::Bus::Ptr& connection);
@@ -40,6 +40,10 @@
     ~Stub() noexcept;
 
     session::Interface::Ptr create_session_for_criteria(const Criteria& criteria);
+    core::Property<bool>& does_satellite_based_positioning();
+    core::Property<bool>& does_report_cell_and_wifi_ids();
+    core::Property<bool>& is_online();    
+    core::Property<std::map<SpaceVehicle::Key, SpaceVehicle>>& visible_space_vehicles();
 
   private:
     struct Private;

=== added file 'include/location_service/com/ubuntu/location/space_vehicle.h'
--- include/location_service/com/ubuntu/location/space_vehicle.h	1970-01-01 00:00:00 +0000
+++ include/location_service/com/ubuntu/location/space_vehicle.h	2014-02-03 13:52:45 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_SPACE_VEHICLE_H_
+#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SPACE_VEHICLE_H_
+
+#include <com/ubuntu/location/units/units.h>
+
+#include <iostream>
+#include <map>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+/** @brief A space-vehicle as visible to providers. */
+struct SpaceVehicle
+{
+    /** @brief Numeric Id of an individual SpaceVehicle. */
+    typedef std::uint32_t Id;
+
+    enum class Type
+    {
+        unknown, ///< Unknown (and thus invalid) type.
+        beidou, ///< People's Republic of China's regional system, currently limited to Asia and the West Pacific
+        galileo, ///< A global system being developed by the European Union and other partner countries, planned to be operational by 2014 (and fully deployed by 2019).
+        glonass, ///< Russia's global navigation system. Fully operational worldwide.
+        gps, ///< Fully operational worldwide.
+        compass, ///< People's Republic of China's global system, planned to be operational by 2020.
+        irnss, ///< India's regional navigation system, planned to be operational by 2014, covering India and Northern Indian Ocean.
+        qzss ///< Japanese regional system covering Asia and Oceania.
+    };    
+
+    struct Key
+    {
+        Type type = Type::unknown; ///< The positioning system this vehicle belongs to.
+        Id id = 0; ///< Unique id of the space vehicle.
+
+        inline bool operator==(const SpaceVehicle::Key& rhs) const
+        {
+            return type == rhs.type && id == rhs.id;
+        }
+
+        inline bool operator<(const SpaceVehicle::Key& rhs) const
+        {
+            if (type != rhs.type)
+                return type < rhs.type;
+
+            return id < rhs.id;
+        }
+    };
+
+    inline bool operator==(const SpaceVehicle& rhs) const
+    {
+        return key == rhs.key &&
+                has_almanac_data == rhs.has_almanac_data &&
+                has_ephimeris_data == rhs.has_ephimeris_data &&
+                used_in_fix == rhs.used_in_fix &&
+                units::roughly_equals(azimuth, rhs.azimuth) &&
+                units::roughly_equals(elevation, rhs.elevation);
+    }
+
+    inline bool operator<(const SpaceVehicle& rhs) const
+    {
+        return key < rhs.key;
+    }
+
+    Key key; ///< Unique key identifying an instance.
+    float snr = -std::numeric_limits<float>::max(); ///< Signal to noise ratio;
+    bool has_almanac_data = false; ///< Almanac data available for this vehicle.
+    bool has_ephimeris_data = false; ///< Ephimeris data is available for this vehicle.
+    bool used_in_fix = false;  ///< This vehicle has been used to obtain a fix.
+    units::Quantity<units::PlaneAngle> azimuth; ///< Azimuth of SV.
+    units::Quantity<units::PlaneAngle> elevation; ///< Elevation of SV.
+};
+
+inline std::ostream& operator<<(std::ostream& out, const SpaceVehicle& sv)
+{
+    static const std::map<SpaceVehicle::Type, std::string> lut =
+    {
+        {SpaceVehicle::Type::unknown, "unknown"},
+        {SpaceVehicle::Type::beidou, "beidou"},
+        {SpaceVehicle::Type::galileo, "galileo"},
+        {SpaceVehicle::Type::glonass, "glonass"},
+        {SpaceVehicle::Type::gps, "gps"},
+        {SpaceVehicle::Type::compass, "compass"},
+        {SpaceVehicle::Type::irnss, "irnss"},
+        {SpaceVehicle::Type::qzss, "qzss" }
+    };
+    return out << "("
+               << "type: " << lut.at(sv.key.type) << ", "
+               << "prn: " << sv.key.id << ", "
+               << "snr: " << sv.snr << ", "
+               << "has_almanac_data: " << sv.has_almanac_data << ", "
+               << "has_ephimeris_data: " << sv.has_ephimeris_data << ", "
+               << "used_in_fix: " << sv.used_in_fix << ", "
+               << "azimuth: " << sv.azimuth << ", "
+               << "elevation: " << sv.elevation
+               << ")";
+}
+}
+}
+}
+
+#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_SPACE_VEHICLE_H_

=== modified file 'include/location_service/com/ubuntu/location/units/units.h'
--- include/location_service/com/ubuntu/location/units/units.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/units/units.h	2014-02-03 13:52:45 +0000
@@ -57,6 +57,12 @@
 using boost::units::sin;
 using boost::units::cos;
 using boost::units::atan2;
+
+template<typename Unit>
+inline bool roughly_equals(const Quantity<Unit>& lhs, const Quantity<Unit>& rhs)
+{
+    return std::fabs(lhs.value()-rhs.value()) <= std::numeric_limits<double>::epsilon();
+}
 }
 }
 }

=== modified file 'include/location_service/com/ubuntu/location/update.h'
--- include/location_service/com/ubuntu/location/update.h	2013-05-29 06:04:02 +0000
+++ include/location_service/com/ubuntu/location/update.h	2014-02-03 13:52:45 +0000
@@ -18,7 +18,7 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_UPDATE_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_UPDATE_H_
 
-#include "com/ubuntu/location/clock.h"
+#include <com/ubuntu/location/clock.h>
 
 #include <ostream>
 
@@ -28,27 +28,56 @@
 {
 namespace location
 {
+/**
+ * @brief Templated class that wraps a value and timestamp.
+ * @tparam T The contained value.
+ */
 template<typename T>
 struct Update
 {
-    Update(const T& value = T{}, const Clock::Timestamp& when = Clock::Timestamp{}) : value{value}, when{when}
+    /**
+      * @brief Constructs a valid update with the given value and timestamp.
+      * @param [in] value The value delivered with this update.
+      * @param [in] when The timestamp when the value was measured.
+      */
+    inline Update(const T& value = T{},
+           const Clock::Timestamp& when = Clock::now())
+        : value{value}, when{when}
     {
     }
 
-    bool operator==(const Update<T>& rhs) const
+    /**
+     * @brief operator == checks if two updates are equal.
+     * @param [in] rhs The update to check against.
+     * @return true iff this instance equals rhs.
+     */
+    inline bool operator==(const Update<T>& rhs) const
     {
         return value == rhs.value && when == rhs.when;
     }
 
-    bool operator!=(const Update<T>& rhs) const
+    /**
+     * @brief operator != checks if two updates are unequal.
+     * @param [in] rhs The update to check against.
+     * @return true iff this instance does not equal rhs.
+     */
+    inline bool operator!=(const Update<T>& rhs) const
     {
         return !(value == rhs.value && when == rhs.when);
     }
 
+    /** The value delivered with this update. */
     T value;
-    Clock::Timestamp when;
+
+    /** Time when the updated value was measured. */
+    Clock::Timestamp when = Clock::beginning_of_time();
 };
 
+/**
+ * @brief Pretty-prints the update to the provided output stream.
+ * @param out The stream to write to.
+ * @param update The value to be printed.
+ */
 template<typename T>
 inline std::ostream& operator<<(std::ostream& out, const Update<T>& update)
 {

=== modified file 'include/location_service/com/ubuntu/location/velocity.h'
--- include/location_service/com/ubuntu/location/velocity.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/velocity.h	2014-02-03 13:52:45 +0000
@@ -18,12 +18,7 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_VELOCITY_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_VELOCITY_H_
 
-#include "com/ubuntu/location/accuracy.h"
-#include "com/ubuntu/location/units/units.h"
-
-#include <limits>
-#include <ostream>
-#include <stdexcept>
+#include <com/ubuntu/location/units/units.h>
 
 namespace com
 {
@@ -31,74 +26,8 @@
 {
 namespace location
 {
-struct Velocity
-{
-    typedef units::Velocity Unit;
-    typedef units::Quantity<Unit> Quantity;
-
-    static inline const Quantity& min()
-    {
-        static const Quantity instance = Quantity::from_value(0.);
-        return instance;
-    }
-
-    static inline const Quantity max()
-    {
-        static const Quantity instance = Quantity::from_value(std::numeric_limits<double>::max());
-        return instance;
-    }
-
-    Velocity(const Quantity& value = Quantity()) : value(value)
-    {
-        if (value < Velocity::min())
-            throw std::out_of_range("");
-        if (value > Velocity::max())
-            throw std::out_of_range("");
-    }
-
-    inline bool operator==(const Velocity& rhs) const
-    {
-        return value == rhs.value;
-    }
-
-    inline bool operator!=(const Velocity& rhs) const
-    {
-        return value != rhs.value;
-    }
-
-    Quantity value;
-};
-
-inline std::ostream& operator<<(std::ostream& out, const Velocity& velocity)
-{
-    out << "Velocity(" << velocity.value << ")";
-    return out;
-}
-
-template<>
-struct AccuracyTraits<Velocity>
-{
-    static AccuracyLevel classify(const Velocity& h)
-    {
-        if (h.value > (1.f * units::MetersPerSecond))
-            return AccuracyLevel::worst;
-        
-        if (h.value <= (1.f * units::MetersPerSecond))
-            return AccuracyLevel::best;
-
-        return AccuracyLevel::worst;
-    }
-
-    static Accuracy<Velocity> best()
-    {
-        return Accuracy<Velocity>{Velocity{Velocity::min()}};
-    }
-
-    static Accuracy<Velocity> worst()
-    {
-        return Accuracy<Velocity>{Velocity{2*units::MetersPerSecond}};
-    }
-};
+/** Velocity is measured in m/s. */
+typedef units::Quantity<units::Velocity> Velocity;
 }
 }
 }

=== modified file 'include/location_service/com/ubuntu/location/wgs84/altitude.h'
--- include/location_service/com/ubuntu/location/wgs84/altitude.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/wgs84/altitude.h	2014-02-03 13:52:45 +0000
@@ -18,8 +18,8 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_ALTITUDE_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_ALTITUDE_H_
 
-#include "com/ubuntu/location/units/units.h"
-#include "com/ubuntu/location/wgs84/coordinate.h"
+#include <com/ubuntu/location/units/units.h>
+#include <com/ubuntu/location/wgs84/coordinate.h>
 
 namespace com
 {

=== modified file 'include/location_service/com/ubuntu/location/wgs84/coordinate.h'
--- include/location_service/com/ubuntu/location/wgs84/coordinate.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/wgs84/coordinate.h	2014-02-03 13:52:45 +0000
@@ -18,7 +18,7 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_COORDINATE_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_COORDINATE_H_
 
-#include "com/ubuntu/location/units/units.h"
+#include <com/ubuntu/location/units/units.h>
 
 #include <ostream>
 
@@ -39,12 +39,14 @@
 };
 
 template<typename Tag, typename UnitType>
-struct Coordinate
+class Coordinate
 {
+public:
     typedef UnitType Unit;
     typedef units::Quantity<Unit> Quantity;
 
-    explicit Coordinate(const Quantity& value = Quantity()) : value(value)
+    explicit Coordinate(const Quantity& value = Quantity())
+        : value(value)
     {
         CoordinateTraits<Coordinate<Tag,UnitType>>::check_and_throw_if_invalid(value);
     }

=== modified file 'include/location_service/com/ubuntu/location/wgs84/latitude.h'
--- include/location_service/com/ubuntu/location/wgs84/latitude.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/wgs84/latitude.h	2014-02-03 13:52:45 +0000
@@ -18,8 +18,8 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_LATITUDE_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_LATITUDE_H_
 
-#include "com/ubuntu/location/units/units.h"
-#include "com/ubuntu/location/wgs84/coordinate.h"
+#include <com/ubuntu/location/units/units.h>
+#include <com/ubuntu/location/wgs84/coordinate.h>
 
 #include <stdexcept>
 

=== modified file 'include/location_service/com/ubuntu/location/wgs84/longitude.h'
--- include/location_service/com/ubuntu/location/wgs84/longitude.h	2013-05-28 14:41:06 +0000
+++ include/location_service/com/ubuntu/location/wgs84/longitude.h	2014-02-03 13:52:45 +0000
@@ -18,8 +18,8 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_LONGITUDE_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_WGS84_LONGITUDE_H_
 
-#include "com/ubuntu/location/units/units.h"
-#include "com/ubuntu/location/wgs84/coordinate.h"
+#include <com/ubuntu/location/units/units.h>
+#include <com/ubuntu/location/wgs84/coordinate.h>
 
 #include <stdexcept>
 

=== added file 'include/location_service/com/ubuntu/location/wifi_and_cell_reporting_state.h'
--- include/location_service/com/ubuntu/location/wifi_and_cell_reporting_state.h	1970-01-01 00:00:00 +0000
+++ include/location_service/com/ubuntu/location/wifi_and_cell_reporting_state.h	2014-02-03 13:52:45 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_WIFI_AND_CELL_REPORTING_STATE_H_
+#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_WIFI_AND_CELL_REPORTING_STATE_H_
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+enum class WifiAndCellIdReportingState
+{
+    on, ///< Wifi and Cell Ids might be reported to online location services.
+    off ///< Wifi and Cell Ids are _not_ reported. This is the default value.
+};
+}
+}
+}
+
+#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_WIFI_AND_CELL_REPORTING_STATE_H_

=== modified file 'src/location_service/com/ubuntu/location/CMakeLists.txt'
--- src/location_service/com/ubuntu/location/CMakeLists.txt	2013-10-08 14:48:43 +0000
+++ src/location_service/com/ubuntu/location/CMakeLists.txt	2014-02-03 13:52:45 +0000
@@ -5,12 +5,16 @@
 
   default_provider_selection_policy.cpp
   
+  criteria.cpp
   engine.cpp
   init_and_shutdown.cpp
   position.cpp
   provider.cpp
   provider_factory.cpp
   proxy_provider.cpp
+  set_name_for_thread.cpp
+
+  connectivity/ofono_nm_connectivity_manager.cpp
 
   service/default_configuration.cpp
   service/default_permission_manager.cpp
@@ -43,6 +47,7 @@
 
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${DBUS_CPP_LDFLAGS}
   ${GLog_LIBRARY}
   ${GFlags_LIBRARY}
 )
@@ -52,21 +57,54 @@
   DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
+add_library(
+  ubuntu-location-service-daemon
+
+  service/daemon
+)
+
 add_executable(
   ubuntu-location-serviced
 
-  service/main.cpp
+  service/daemon_main.cpp
+)
+
+add_executable(
+  ubuntu-location-serviced-cli
+
+  service/daemon_cli_main.cpp
 )
 
 target_link_libraries(
-  ubuntu-location-serviced
+  ubuntu-location-service-daemon
 
   ubuntu-location-service
-
-  ${ENABLED_PROVIDER_TARGETS}
-
-  ${Boost_LIBRARIES}
-  ${DBUS_LIBRARIES}
+)
+
+target_link_libraries(
+  ubuntu-location-serviced
+
+  ubuntu-location-service-daemon
+
+  ${ENABLED_PROVIDER_TARGETS}
+
+  ${Boost_LIBRARIES}
+  ${DBUS_LIBRARIES}
+  ${DBUS_CPP_LIBRARIES}
+  ${GLog_LIBRARY}
+  ${GFlags_LIBRARY}
+)
+
+target_link_libraries(
+  ubuntu-location-serviced-cli
+
+  ubuntu-location-service-daemon
+
+  ${ENABLED_PROVIDER_TARGETS}
+
+  ${Boost_LIBRARIES}
+  ${DBUS_LIBRARIES}
+  ${DBUS_CPP_LIBRARIES}
   ${GLog_LIBRARY}
   ${GFlags_LIBRARY}
 )
@@ -76,3 +114,8 @@
   DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
+install(
+  TARGETS ubuntu-location-serviced-cli
+  DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+

=== added directory 'src/location_service/com/ubuntu/location/connectivity'
=== added file 'src/location_service/com/ubuntu/location/connectivity/nm.h'
--- src/location_service/com/ubuntu/location/connectivity/nm.h	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/connectivity/nm.h	2014-02-03 13:52:45 +0000
@@ -0,0 +1,255 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_NM_H
+#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_CONNECTIVITY_NM_H
+
+#include <core/dbus/bus.h>
+#include <core/dbus/object.h>
+#include <core/dbus/property.h>
+#include <core/dbus/service.h>
+#include <core/dbus/types/object_path.h>
+#include <core/dbus/types/struct.h>
+#include <core/dbus/types/stl/map.h>
+#include <core/dbus/types/stl/string.h>
+#include <core/dbus/types/stl/tuple.h>
+#include <core/dbus/types/stl/vector.h>
+
+namespace org
+{
+namespace freedesktop
+{
+struct NetworkManager
+{
+    struct AccessPoint
+    {
+        static const std::string& name()
+        {
+            static const std::string s{"org.freedesktop.NetworkManager.AccessPoint"};
+            return s;
+        }
+
+        struct Frequency
+        {
+            static const std::string& name()
+            {
+                static const std::string s{"Frequency"};
+                return s;
+            }
+
+            typedef AccessPoint Interface;
+            typedef std::uint32_t ValueType;
+            static const bool readable = true;
+            static const bool writable = false;
+        };
+
+        struct HwAddress
+        {
+            static const std::string& name()
+            {
+                static const std::string s{"HwAddress"};
+                return s;
+            }
+
+            typedef AccessPoint Interface;
+            typedef std::string ValueType;
+            static const bool readable = true;
+            static const bool writable = false;
+        };
+
+        struct Strength
+        {
+            static const std::string& name()
+            {
+                static const std::string s{"Strength"};
+                return s;
+            }
+
+            typedef AccessPoint Interface;
+            typedef std::int8_t ValueType;
+            static const bool readable = true;
+            static const bool writable = false;
+        };
+
+        AccessPoint(const std::shared_ptr<core::dbus::Object>& object)
+            : frequency(object->get_property<Frequency>()),
+              hw_address(object->get_property<HwAddress>()),
+              strength(object->get_property<Strength>())
+        {
+        }
+
+        std::shared_ptr<core::dbus::Property<Frequency>> frequency;
+        std::shared_ptr<core::dbus::Property<HwAddress>> hw_address;
+        std::shared_ptr<core::dbus::Property<Strength>> strength;
+    };
+
+    struct Device
+    {
+        static const std::string& name()
+        {
+            static const std::string s{"org.freedesktop.NetworkManager.Device"};
+            return s;
+        }
+
+        enum class Type
+        {
+            unknown = 0,
+            ethernet = 1,
+            wifi = 2,
+            unused_1 = 3,
+            unused_2 = 4,
+            bluetooth = 5,
+            olpc_mesh = 6,
+            wimax = 7,
+            modem = 8,
+            infiniband = 9,
+            bond = 10,
+            vlan = 11,
+            adsl = 12,
+            bridge = 13
+        };
+
+        struct Wireless
+        {
+            static const std::string& name()
+            {
+                static const std::string s{"org.freedesktop.NetworkManager.Device.Wireless"};
+                return s;
+            }
+
+            struct GetAccessPoints
+            {
+                static const std::string& name()
+                {
+                    static const std::string s{"GetAccessPoints"};
+                    return s;
+                }
+
+                typedef Wireless Interface;
+
+                static std::chrono::milliseconds default_timeout()
+                {
+                    return std::chrono::seconds{1};
+                }
+            };
+        };
+
+        struct DeviceType
+        {
+            static const std::string& name()
+            {
+                static const std::string s{"DeviceType"};
+                return s;
+            }
+
+            typedef Device Interface;
+            typedef std::uint32_t ValueType;
+            static const bool readable = true;
+            static const bool writable = false;
+        };
+
+        Device(const std::shared_ptr<core::dbus::Service>& service,
+               const std::shared_ptr<core::dbus::Object>& object)
+            : service(service),
+              object(object),
+              device_type(object->get_property<DeviceType>())
+        {
+        }
+
+        Type type() const
+        {
+            return static_cast<Type>(device_type->get());
+        }
+
+        std::vector<AccessPoint> get_access_points() const
+        {
+            typedef std::vector<core::dbus::types::ObjectPath> ResultType;
+            auto result = object->invoke_method_synchronously<Wireless::GetAccessPoints, ResultType>();
+