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

[Thomas Voß]

Clean up CachedRadioCell and CachedWirelessNetwork.
Switch to logging to syslog.

Clean up CachedRadioCell and CachedWirelessNetwork.
Switch to logging to syslog.

[lp:~thomas-voss/location-service/fix-1356814]

95. By Thomas Voß on 2014-08-14

Add missing files.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:95
http://jenkins.qa.ubuntu.com/job/location-service-ci/263/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/170
        deb: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/170

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

review: Approve (continuous-integration)

=== modified file 'src/location_service/com/ubuntu/location/CMakeLists.txt'
--- src/location_service/com/ubuntu/location/CMakeLists.txt	2014-08-08 07:33:49 +0000
+++ src/location_service/com/ubuntu/location/CMakeLists.txt	2014-08-14 20:33:50 +0000
@@ -50,6 +50,8 @@
 
   set_name_for_thread.cpp
 
+  connectivity/cached_radio_cell.cpp
+  connectivity/cached_wireless_network.cpp
   connectivity/manager.cpp
   connectivity/radio_cell.cpp
   connectivity/wireless_network.cpp

=== added file 'src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.cpp'
--- src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.cpp	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.cpp	2014-08-14 20:33:50 +0000
@@ -0,0 +1,474 @@
+/*
+ * Copyright © 2012-2014 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]>
+ */
+
+#include <com/ubuntu/location/connectivity/cached_radio_cell.h>
+
+const std::map<std::string, com::ubuntu::location::connectivity::RadioCell::Type>& detail::CachedRadioCell::type_lut()
+{
+    static const std::map<std::string, com::ubuntu::location::connectivity::RadioCell::Type> lut
+    {
+        {
+            org::Ofono::Manager::Modem::NetworkRegistration::Technology::gsm(),
+            com::ubuntu::location::connectivity::RadioCell::Type::gsm
+        },
+        {
+            org::Ofono::Manager::Modem::NetworkRegistration::Technology::lte(),
+            com::ubuntu::location::connectivity::RadioCell::Type::lte
+        },
+        {
+            org::Ofono::Manager::Modem::NetworkRegistration::Technology::umts(),
+            com::ubuntu::location::connectivity::RadioCell::Type::umts
+        },
+        {
+            org::Ofono::Manager::Modem::NetworkRegistration::Technology::edge(),
+            com::ubuntu::location::connectivity::RadioCell::Type::unknown
+        },
+        {
+            org::Ofono::Manager::Modem::NetworkRegistration::Technology::hspa(),
+            com::ubuntu::location::connectivity::RadioCell::Type::unknown
+        },
+        {std::string(), com::ubuntu::location::connectivity::RadioCell::Type::unknown}
+    };
+
+    return lut;
+}
+
+detail::CachedRadioCell::CachedRadioCell(const org::Ofono::Manager::Modem& modem)
+    : RadioCell(),
+      radio_type(Type::gsm),
+      modem(modem),
+      connections
+      {
+          modem.signals.property_changed->connect([this](const std::tuple<std::string, core::dbus::types::Variant>& tuple)
+          {
+              on_modem_property_changed(tuple);
+          }),
+          modem.network_registration.signals.property_changed->connect([this](const std::tuple<std::string, core::dbus::types::Variant>& tuple)
+          {
+              on_network_registration_property_changed(tuple);
+          })
+      },
+      detail{Gsm()}
+{
+    auto technology =
+            modem.network_registration.get<
+                org::Ofono::Manager::Modem::NetworkRegistration::Technology
+            >();
+
+    auto it = type_lut().find(technology);
+
+    if (it == type_lut().end()) throw std::runtime_error
+    {
+        "Unknown technology for connected cell: " + technology
+    };
+
+    if (it->second == com::ubuntu::location::connectivity::RadioCell::Type::unknown) throw std::runtime_error
+    {
+        "Unknown technology for connected cell: " + technology
+    };
+
+    radio_type = it->second;
+
+    auto lac =
+            modem.network_registration.get<
+                org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode
+            >();
+
+    int cell_id =
+            modem.network_registration.get<
+                org::Ofono::Manager::Modem::NetworkRegistration::CellId
+            >();
+
+    auto strength =
+            modem.network_registration.get<
+                org::Ofono::Manager::Modem::NetworkRegistration::Strength
+            >();
+
+    std::stringstream ssmcc
+    {
+        modem.network_registration.get<
+            org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode
+        >()
+    };
+    int mcc{0}; ssmcc >> mcc;
+    std::stringstream ssmnc
+    {
+        modem.network_registration.get<
+            org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode
+        >()
+    };
+    int mnc{0}; ssmnc >> mnc;
+
+    switch(radio_type)
+    {
+    case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+    {
+        com::ubuntu::location::connectivity::RadioCell::Gsm gsm
+        {
+            com::ubuntu::location::connectivity::RadioCell::Gsm::MCC{mcc},
+            com::ubuntu::location::connectivity::RadioCell::Gsm::MNC{mnc},
+            com::ubuntu::location::connectivity::RadioCell::Gsm::LAC{lac},
+            com::ubuntu::location::connectivity::RadioCell::Gsm::ID{cell_id},
+            com::ubuntu::location::connectivity::RadioCell::Gsm::SignalStrength::from_percent(strength/100.f)
+        };
+        VLOG(1) << gsm;
+        detail.gsm = gsm;
+        break;
+    }
+    case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+    {
+        com::ubuntu::location::connectivity::RadioCell::Lte lte
+        {
+            com::ubuntu::location::connectivity::RadioCell::Lte::MCC{mcc},
+            com::ubuntu::location::connectivity::RadioCell::Lte::MNC{mnc},
+            com::ubuntu::location::connectivity::RadioCell::Lte::TAC{lac},
+            com::ubuntu::location::connectivity::RadioCell::Lte::ID{cell_id},
+            com::ubuntu::location::connectivity::RadioCell::Lte::PID{},
+            com::ubuntu::location::connectivity::RadioCell::Lte::SignalStrength::from_percent(strength/100.f)
+        };
+        VLOG(1) << lte;
+        detail.lte = lte;
+        break;
+    }
+    case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+    {
+        com::ubuntu::location::connectivity::RadioCell::Umts umts
+        {
+            com::ubuntu::location::connectivity::RadioCell::Umts::MCC{mcc},
+            com::ubuntu::location::connectivity::RadioCell::Umts::MNC{mnc},
+            com::ubuntu::location::connectivity::RadioCell::Umts::LAC{lac},
+            com::ubuntu::location::connectivity::RadioCell::Umts::ID{cell_id},
+            com::ubuntu::location::connectivity::RadioCell::Umts::SignalStrength::from_percent(strength/100.f)
+        };
+        VLOG(1) << umts;
+        detail.umts = umts;
+        break;
+    }
+    default:
+        break;
+    }
+}
+
+detail::CachedRadioCell::~CachedRadioCell()
+{
+    modem.signals.property_changed->disconnect(connections.modem_properties_changed);
+    modem.network_registration.signals.property_changed->disconnect(connections.network_registration_properties_changed);
+}
+
+const core::Signal<>& detail::CachedRadioCell::changed() const
+{
+    return on_changed;
+}
+
+com::ubuntu::location::connectivity::RadioCell::Type detail::CachedRadioCell::type() const
+{
+    return radio_type;
+}
+
+const com::ubuntu::location::connectivity::RadioCell::Gsm& detail::CachedRadioCell::gsm() const
+{
+    if (radio_type != com::ubuntu::location::connectivity::RadioCell::Type::gsm)
+        throw std::runtime_error("Bad access to unset network type.");
+
+    return detail.gsm;
+}
+
+const com::ubuntu::location::connectivity::RadioCell::Umts& detail::CachedRadioCell::umts() const
+{
+    if (radio_type != RadioCell::Type::umts)
+        throw std::runtime_error("Bad access to unset network type.");
+
+    return detail.umts;
+}
+
+const com::ubuntu::location::connectivity::RadioCell::Lte& detail::CachedRadioCell::lte() const
+{
+    if (radio_type != RadioCell::Type::lte)
+        throw std::runtime_error("Bad access to unset network type.");
+
+    return detail.lte;
+}
+
+void detail::CachedRadioCell::on_modem_property_changed(const std::tuple<std::string, core::dbus::types::Variant>& tuple)
+{
+    VLOG(10) << "Property on modem " << modem.object->path() << " changed: " << std::get<0>(tuple);
+}
+
+void detail::CachedRadioCell::on_network_registration_property_changed(const std::tuple<std::string, core::dbus::types::Variant>& tuple)
+{
+    VLOG(10) << "Property changed on modem " << modem.object->path() << " for network registration: " << std::get<0>(tuple);
+
+    const auto& key = std::get<0>(tuple);
+    const auto& variant = std::get<1>(tuple);
+
+    if (key == org::Ofono::Manager::Modem::NetworkRegistration::Technology::name())
+    {
+        auto value = variant.as<
+                    org::Ofono::Manager::Modem::NetworkRegistration::Technology::ValueType
+                >();
+
+        auto it = type_lut().find(value);
+
+        if (it == type_lut().end())
+        {
+            VLOG(1) << "Unknown technology for connected cell: " << value;
+            return;
+        }
+
+        if (it->second == com::ubuntu::location::connectivity::RadioCell::Type::unknown)
+        {
+            VLOG(1) << "Unknown technology for connected cell: " + value;
+            return;
+        }
+
+        if (radio_type == it->second)
+            return;
+
+        switch(radio_type)
+        {
+        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+            switch(it->second)
+            {
+            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+                detail.umts.location_area_code = detail.gsm.location_area_code;
+                detail.umts.mobile_network_code = detail.gsm.mobile_network_code;
+                detail.umts.mobile_country_code = detail.gsm.mobile_country_code;
+                detail.umts.strength.reset();
+                detail.umts.id.reset();
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+                detail.lte.tracking_area_code = detail.gsm.location_area_code;
+                detail.lte.mobile_network_code = detail.gsm.mobile_network_code;
+                detail.lte.mobile_country_code = detail.gsm.mobile_country_code;
+                detail.lte.strength.reset();
+                detail.lte.id.reset();
+                break;
+            default:
+                break;
+            }
+            break;
+        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+            switch(it->second)
+            {
+            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+                detail.gsm.location_area_code = detail.umts.location_area_code;
+                detail.gsm.mobile_network_code = detail.umts.mobile_network_code;
+                detail.gsm.mobile_country_code = detail.umts.mobile_country_code;
+                detail.gsm.strength.reset();
+                detail.gsm.id.reset();
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+                detail.lte.tracking_area_code = detail.umts.location_area_code;
+                detail.lte.mobile_network_code = detail.umts.mobile_network_code;
+                detail.lte.mobile_country_code = detail.umts.mobile_country_code;
+                detail.lte.strength.reset();
+                detail.lte.id.reset();
+                break;
+            default:
+                break;
+            }
+            break;
+        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+            switch(it->second)
+            {
+            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+                detail.gsm.location_area_code = detail.lte.tracking_area_code;
+                detail.gsm.mobile_network_code = detail.lte.mobile_network_code;
+                detail.gsm.mobile_country_code = detail.lte.mobile_country_code;
+                detail.gsm.strength.reset();
+                detail.gsm.id.reset();
+                break;
+            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+                detail.umts.location_area_code = detail.lte.tracking_area_code;
+                detail.umts.mobile_network_code = detail.lte.mobile_network_code;
+                detail.umts.mobile_country_code = detail.lte.mobile_country_code;
+                detail.umts.strength.reset();
+                detail.umts.id.reset();
+                break;
+            default:
+                break;
+            }
+        default:
+            break;
+        };
+
+        radio_type = it->second;
+        on_changed();
+    }
+
+    if (key == org::Ofono::Manager::Modem::NetworkRegistration::CellId::name())
+    {
+        auto value = variant.as<
+                    org::Ofono::Manager::Modem::NetworkRegistration::CellId::ValueType
+                >();
+
+        switch(radio_type)
+        {
+        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+            detail.gsm.id.set(value);
+            VLOG(1) << detail.gsm;
+            break;
+        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+            detail.umts.id.set(value);
+            VLOG(1) << detail.umts;
+            break;
+        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+            detail.lte.id.set(value);
+            VLOG(1) << detail.lte;
+            break;
+        default:
+            break;
+        };
+
+        on_changed();
+    }
+
+    if (key == org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode::name())
+    {
+        auto value = variant.as<
+                    org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode::ValueType
+                >();
+        switch(radio_type)
+        {
+        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+            detail.gsm.location_area_code.set(value);
+            VLOG(1) << detail.gsm;
+            break;
+        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+            detail.umts.location_area_code.set(value);
+            VLOG(1) << detail.umts;
+            break;
+        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+            detail.lte.tracking_area_code.set(value);
+            VLOG(1) << detail.lte;
+            break;
+        default:
+            break;
+        };
+
+        on_changed();
+    }
+
+    if (key == org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode::name())
+    {
+        std::stringstream ss
+        {
+            variant.as<
+                org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode::ValueType
+            >()
+        };
+        int value{-1}; ss >> value;
+
+        switch(radio_type)
+        {
+        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+            detail.gsm.mobile_country_code.set(value);
+            VLOG(1) << detail.gsm;
+            break;
+        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+            detail.umts.mobile_country_code.set(value);
+            VLOG(1) << detail.umts;
+            break;
+        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+            detail.lte.mobile_country_code.set(value);
+            VLOG(1) << detail.lte;
+            break;
+        default:
+            break;
+        };
+
+        on_changed();
+    }
+
+    if (key == org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode::name())
+    {
+        std::stringstream ss
+        {
+            variant.as<
+                org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode::ValueType
+            >()
+        };
+        int value{-1}; ss >> value;
+
+        switch(radio_type)
+        {
+        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+            detail.gsm.mobile_network_code.set(value);
+            VLOG(1) << detail.gsm;
+            break;
+        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+            detail.umts.mobile_network_code.set(value);
+            VLOG(1) << detail.umts;
+            break;
+        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+            detail.lte.mobile_network_code.set(value);
+            VLOG(1) << detail.lte;
+            break;
+        default:
+            break;
+        };
+
+        on_changed();
+    }
+
+    if (key == org::Ofono::Manager::Modem::NetworkRegistration::Strength::name())
+    {
+        auto value = variant.as<
+                    org::Ofono::Manager::Modem::NetworkRegistration::Strength::ValueType
+                >();
+
+        switch(radio_type)
+        {
+        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
+            detail.gsm.strength
+                    = com::ubuntu::location::connectivity::RadioCell::Gsm::SignalStrength::from_percent(value/100.f);
+            VLOG(1) << detail.gsm;
+            break;
+        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
+            detail.umts.strength
+                    = com::ubuntu::location::connectivity::RadioCell::Umts::SignalStrength::from_percent(value/100.f);
+            VLOG(1) << detail.umts;
+            break;
+        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
+            detail.lte.strength
+                    = com::ubuntu::location::connectivity::RadioCell::Lte::SignalStrength::from_percent(value/100.f);
+            VLOG(1) << detail.lte;
+            break;
+        default:
+            break;
+        };
+
+        on_changed();
+    }
+}
+
+detail::CachedRadioCell::Detail::Detail() : none(detail::CachedRadioCell::None{})
+{
+}
+
+detail::CachedRadioCell::Detail::Detail(const com::ubuntu::location::connectivity::RadioCell::Gsm& gsm) : gsm(gsm)
+{
+}
+
+detail::CachedRadioCell::Detail::Detail(const com::ubuntu::location::connectivity::RadioCell::Umts& umts) : umts(umts)
+{
+}
+
+detail::CachedRadioCell::Detail::Detail(const com::ubuntu::location::connectivity::RadioCell::Lte& lte) : lte(lte)
+{
+}

=== modified file 'src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.h'
--- src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.h	2014-08-08 07:33:49 +0000
+++ src/location_service/com/ubuntu/location/connectivity/cached_radio_cell.h	2014-08-14 20:33:50 +0000
@@ -25,454 +25,49 @@
 namespace detail
 {
 
-struct CachedRadioCell : public com::ubuntu::location::connectivity::RadioCell
+class CachedRadioCell : public com::ubuntu::location::connectivity::RadioCell
 {
+public:
+    // To save some typing.
     typedef std::shared_ptr<CachedRadioCell> Ptr;
 
-    static const std::map<std::string, com::ubuntu::location::connectivity::RadioCell::Type>& type_lut()
-    {
-        static const std::map<std::string, com::ubuntu::location::connectivity::RadioCell::Type> lut
-        {
-            {
-                org::Ofono::Manager::Modem::NetworkRegistration::Technology::gsm(),
-                com::ubuntu::location::connectivity::RadioCell::Type::gsm
-            },
-            {
-                org::Ofono::Manager::Modem::NetworkRegistration::Technology::lte(),
-                com::ubuntu::location::connectivity::RadioCell::Type::lte
-            },
-            {
-                org::Ofono::Manager::Modem::NetworkRegistration::Technology::umts(),
-                com::ubuntu::location::connectivity::RadioCell::Type::umts
-            },
-            {
-                org::Ofono::Manager::Modem::NetworkRegistration::Technology::edge(),
-                com::ubuntu::location::connectivity::RadioCell::Type::unknown
-            },
-            {
-                org::Ofono::Manager::Modem::NetworkRegistration::Technology::hspa(),
-                com::ubuntu::location::connectivity::RadioCell::Type::unknown
-            },
-            {std::string(), com::ubuntu::location::connectivity::RadioCell::Type::unknown}
-        };
-
-        return lut;
-    };
-
-    CachedRadioCell(const org::Ofono::Manager::Modem& modem)
-        : RadioCell(),
-          radio_type(Type::gsm),
-          modem(modem),
-          connections
-          {
-              modem.signals.property_changed->connect([this](const std::tuple<std::string, core::dbus::types::Variant>& tuple)
-              {
-                  on_modem_property_changed(tuple);
-              }),
-              modem.network_registration.signals.property_changed->connect([this](const std::tuple<std::string, core::dbus::types::Variant>& tuple)
-              {
-                  on_network_registration_property_changed(tuple);
-              })
-          },
-          detail{Gsm()}
-    {
-        auto technology =
-                modem.network_registration.get<
-                    org::Ofono::Manager::Modem::NetworkRegistration::Technology
-                >();
-
-        auto it = type_lut().find(technology);
-
-        if (it == type_lut().end()) throw std::runtime_error
-        {
-            "Unknown technology for connected cell: " + technology
-        };
-
-        if (it->second == com::ubuntu::location::connectivity::RadioCell::Type::unknown) throw std::runtime_error
-        {
-            "Unknown technology for connected cell: " + technology
-        };
-
-        radio_type = it->second;
-
-        auto lac =
-                modem.network_registration.get<
-                    org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode
-                >();
-
-        int cell_id =
-                modem.network_registration.get<
-                    org::Ofono::Manager::Modem::NetworkRegistration::CellId
-                >();
-
-        auto strength =
-                modem.network_registration.get<
-                    org::Ofono::Manager::Modem::NetworkRegistration::Strength
-                >();
-
-        std::stringstream ssmcc
-        {
-            modem.network_registration.get<
-                org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode
-            >()
-        };
-        int mcc{0}; ssmcc >> mcc;
-        std::stringstream ssmnc
-        {
-            modem.network_registration.get<
-                org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode
-            >()
-        };
-        int mnc{0}; ssmnc >> mnc;
-
-        switch(radio_type)
-        {
-        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-        {
-            com::ubuntu::location::connectivity::RadioCell::Gsm gsm
-            {
-                com::ubuntu::location::connectivity::RadioCell::Gsm::MCC{mcc},
-                com::ubuntu::location::connectivity::RadioCell::Gsm::MNC{mnc},
-                com::ubuntu::location::connectivity::RadioCell::Gsm::LAC{lac},
-                com::ubuntu::location::connectivity::RadioCell::Gsm::ID{cell_id},
-                com::ubuntu::location::connectivity::RadioCell::Gsm::SignalStrength::from_percent(strength/100.f)
-            };
-            VLOG(1) << gsm;
-            detail.gsm = gsm;
-            break;
-        }
-        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-        {
-            com::ubuntu::location::connectivity::RadioCell::Lte lte
-            {
-                com::ubuntu::location::connectivity::RadioCell::Lte::MCC{mcc},
-                com::ubuntu::location::connectivity::RadioCell::Lte::MNC{mnc},
-                com::ubuntu::location::connectivity::RadioCell::Lte::TAC{lac},
-                com::ubuntu::location::connectivity::RadioCell::Lte::ID{cell_id},
-                com::ubuntu::location::connectivity::RadioCell::Lte::PID{},
-                com::ubuntu::location::connectivity::RadioCell::Lte::SignalStrength::from_percent(strength/100.f)
-            };
-            VLOG(1) << lte;
-            detail.lte = lte;
-            break;
-        }
-        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-        {
-            com::ubuntu::location::connectivity::RadioCell::Umts umts
-            {
-                com::ubuntu::location::connectivity::RadioCell::Umts::MCC{mcc},
-                com::ubuntu::location::connectivity::RadioCell::Umts::MNC{mnc},
-                com::ubuntu::location::connectivity::RadioCell::Umts::LAC{lac},
-                com::ubuntu::location::connectivity::RadioCell::Umts::ID{cell_id},
-                com::ubuntu::location::connectivity::RadioCell::Umts::SignalStrength::from_percent(strength/100.f)
-            };
-            VLOG(1) << umts;
-            detail.umts = umts;
-            break;
-        }
-        default:
-            break;
-        }
-    }
-
-    ~CachedRadioCell()
-    {
-        modem.signals.property_changed->disconnect(connections.modem_properties_changed);
-        modem.network_registration.signals.property_changed->disconnect(connections.network_registration_properties_changed);
-    }
-
-    const core::Signal<>& changed() const override
-    {
-        return on_changed;
-    }
-
-    com::ubuntu::location::connectivity::RadioCell::Type type() const override
-    {
-        return radio_type;
-    }
-
-    const com::ubuntu::location::connectivity::RadioCell::Gsm& gsm() const override
-    {
-        if (radio_type != com::ubuntu::location::connectivity::RadioCell::Type::gsm)
-            throw std::runtime_error("Bad access to unset network type.");
-
-        return detail.gsm;
-    }
-
-    const com::ubuntu::location::connectivity::RadioCell::Umts& umts() const override
-    {
-        if (radio_type != RadioCell::Type::umts)
-            throw std::runtime_error("Bad access to unset network type.");
-
-        return detail.umts;
-    }
-
-    const com::ubuntu::location::connectivity::RadioCell::Lte& lte() const override
-    {
-        if (radio_type != RadioCell::Type::lte)
-            throw std::runtime_error("Bad access to unset network type.");
-
-        return detail.lte;
-    }
-
-    void on_modem_property_changed(const std::tuple<std::string, core::dbus::types::Variant>& tuple)
-    {
-        VLOG(10) << "Property on modem " << modem.object->path() << " changed: " << std::get<0>(tuple);
-    }
-
-    void on_network_registration_property_changed(const std::tuple<std::string, core::dbus::types::Variant>& tuple)
-    {
-        VLOG(10) << "Property changed on modem " << modem.object->path() << " for network registration: " << std::get<0>(tuple);
-
-        const auto& key = std::get<0>(tuple);
-        const auto& variant = std::get<1>(tuple);
-
-        if (key == org::Ofono::Manager::Modem::NetworkRegistration::Technology::name())
-        {
-            auto value = variant.as<
-                        org::Ofono::Manager::Modem::NetworkRegistration::Technology::ValueType
-                    >();
-
-            auto it = type_lut().find(value);
-
-            if (it == type_lut().end())
-            {
-                LOG(WARNING) << "Unknown technology for connected cell: " << value;
-                return;
-            }
-
-            if (it->second == com::ubuntu::location::connectivity::RadioCell::Type::unknown)
-            {
-                LOG(WARNING) << "Unknown technology for connected cell: " + value;
-                return;
-            }
-
-            if (radio_type == it->second)
-                return;
-
-            switch(radio_type)
-            {
-            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-                switch(it->second)
-                {
-                case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-                    detail.umts.location_area_code = detail.gsm.location_area_code;
-                    detail.umts.mobile_network_code = detail.gsm.mobile_network_code;
-                    detail.umts.mobile_country_code = detail.gsm.mobile_country_code;
-                    detail.umts.strength.reset();
-                    detail.umts.id.reset();
-                    break;
-                case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-                    detail.lte.tracking_area_code = detail.gsm.location_area_code;
-                    detail.lte.mobile_network_code = detail.gsm.mobile_network_code;
-                    detail.lte.mobile_country_code = detail.gsm.mobile_country_code;
-                    detail.lte.strength.reset();
-                    detail.lte.id.reset();
-                    break;
-                default:
-                    break;
-                }
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-                switch(it->second)
-                {
-                case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-                    detail.gsm.location_area_code = detail.umts.location_area_code;
-                    detail.gsm.mobile_network_code = detail.umts.mobile_network_code;
-                    detail.gsm.mobile_country_code = detail.umts.mobile_country_code;
-                    detail.gsm.strength.reset();
-                    detail.gsm.id.reset();
-                    break;
-                case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-                    detail.lte.tracking_area_code = detail.umts.location_area_code;
-                    detail.lte.mobile_network_code = detail.umts.mobile_network_code;
-                    detail.lte.mobile_country_code = detail.umts.mobile_country_code;
-                    detail.lte.strength.reset();
-                    detail.lte.id.reset();
-                    break;
-                default:
-                    break;
-                }
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-                switch(it->second)
-                {
-                case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-                    detail.gsm.location_area_code = detail.lte.tracking_area_code;
-                    detail.gsm.mobile_network_code = detail.lte.mobile_network_code;
-                    detail.gsm.mobile_country_code = detail.lte.mobile_country_code;
-                    detail.gsm.strength.reset();
-                    detail.gsm.id.reset();
-                    break;
-                case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-                    detail.umts.location_area_code = detail.lte.tracking_area_code;
-                    detail.umts.mobile_network_code = detail.lte.mobile_network_code;
-                    detail.umts.mobile_country_code = detail.lte.mobile_country_code;
-                    detail.umts.strength.reset();
-                    detail.umts.id.reset();
-                    break;
-                default:
-                    break;
-                }
-            default:
-                break;
-            };
-
-            radio_type = it->second;
-            on_changed();
-        }
-
-        if (key == org::Ofono::Manager::Modem::NetworkRegistration::CellId::name())
-        {
-            auto value = variant.as<
-                        org::Ofono::Manager::Modem::NetworkRegistration::CellId::ValueType
-                    >();
-
-            switch(radio_type)
-            {
-            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-                detail.gsm.id.set(value);
-                VLOG(1) << detail.gsm;
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-                detail.umts.id.set(value);
-                VLOG(1) << detail.umts;
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-                detail.lte.id.set(value);
-                VLOG(1) << detail.lte;
-                break;
-            default:
-                break;
-            };
-
-            on_changed();
-        }
-
-        if (key == org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode::name())
-        {
-            auto value = variant.as<
-                        org::Ofono::Manager::Modem::NetworkRegistration::LocationAreaCode::ValueType
-                    >();
-            switch(radio_type)
-            {
-            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-                detail.gsm.location_area_code.set(value);
-                VLOG(1) << detail.gsm;
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-                detail.umts.location_area_code.set(value);
-                VLOG(1) << detail.umts;
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-                detail.lte.tracking_area_code.set(value);
-                VLOG(1) << detail.lte;
-                break;
-            default:
-                break;
-            };
-
-            on_changed();
-        }
-
-        if (key == org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode::name())
-        {
-            std::stringstream ss
-            {
-                variant.as<
-                    org::Ofono::Manager::Modem::NetworkRegistration::MobileCountryCode::ValueType
-                >()
-            };
-            int value{-1}; ss >> value;
-
-            switch(radio_type)
-            {
-            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-                detail.gsm.mobile_country_code.set(value);
-                VLOG(1) << detail.gsm;
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-                detail.umts.mobile_country_code.set(value);
-                VLOG(1) << detail.umts;
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-                detail.lte.mobile_country_code.set(value);
-                VLOG(1) << detail.lte;
-                break;
-            default:
-                break;
-            };
-
-            on_changed();
-        }
-
-        if (key == org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode::name())
-        {
-            std::stringstream ss
-            {
-                variant.as<
-                    org::Ofono::Manager::Modem::NetworkRegistration::MobileNetworkCode::ValueType
-                >()
-            };
-            int value{-1}; ss >> value;
-
-            switch(radio_type)
-            {
-            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-                detail.gsm.mobile_network_code.set(value);
-                VLOG(1) << detail.gsm;
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-                detail.umts.mobile_network_code.set(value);
-                VLOG(1) << detail.umts;
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-                detail.lte.mobile_network_code.set(value);
-                VLOG(1) << detail.lte;
-                break;
-            default:
-                break;
-            };
-
-            on_changed();
-        }
-
-        if (key == org::Ofono::Manager::Modem::NetworkRegistration::Strength::name())
-        {
-            auto value = variant.as<
-                        org::Ofono::Manager::Modem::NetworkRegistration::Strength::ValueType
-                    >();
-
-            switch(radio_type)
-            {
-            case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-                detail.gsm.strength
-                        = com::ubuntu::location::connectivity::RadioCell::Gsm::SignalStrength::from_percent(value/100.f);
-                VLOG(1) << detail.gsm;
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-                detail.umts.strength
-                        = com::ubuntu::location::connectivity::RadioCell::Umts::SignalStrength::from_percent(value/100.f);
-                VLOG(1) << detail.umts;
-                break;
-            case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-                detail.lte.strength
-                        = com::ubuntu::location::connectivity::RadioCell::Lte::SignalStrength::from_percent(value/100.f);
-                VLOG(1) << detail.lte;
-                break;
-            default:
-                break;
-            };
-
-            on_changed();
-        }
-    }
-
-    /** @cond */
+    // Translates ofono technologies to radio-cell types.
+    static const std::map<std::string, com::ubuntu::location::connectivity::RadioCell::Type>& type_lut();
+
+    // Creates an instance of a cached radio cell, deduced from the network registration
+    // associated to the modem.
+    CachedRadioCell(const org::Ofono::Manager::Modem& modem);
+
+    // Frees all resources and cuts all event connections.
+    ~CachedRadioCell();
+
+    // Emitted when the cell details change.
+    const core::Signal<>& changed() const override;
+
+    // Returns the type of the radio cell.
+    com::ubuntu::location::connectivity::RadioCell::Type type() const override;
+
+    // Returns GSM-specific details or throws std::runtime_error if this is not a GSM radiocell.
+    const com::ubuntu::location::connectivity::RadioCell::Gsm& gsm() const override;
+
+    // Returns UMTS-specific details or throws std::runtime_error if this is not a UMTS radiocell.
+    const com::ubuntu::location::connectivity::RadioCell::Umts& umts() const override;
+
+    // Returns LTE-specific details or throws std::runtime_error if this is not an LTE radiocell.
+    const com::ubuntu::location::connectivity::RadioCell::Lte& lte() const override;
+
+    // Invoked whenever a modem property changes remotely in ofono.
+    void on_modem_property_changed(const std::tuple<std::string, core::dbus::types::Variant>& tuple);
+
+    // Invoked whenever a property specific to a network registration changes remotely.
+    void on_network_registration_property_changed(const std::tuple<std::string, core::dbus::types::Variant>& tuple);
+
+private:
     core::Signal<> on_changed;
     Type radio_type;
     org::Ofono::Manager::Modem modem;
 
+    // Encapsulates all event connections that have to be cut on destruction.
     struct
     {
         core::dbus::Signal
@@ -488,32 +83,27 @@
         >::SubscriptionToken network_registration_properties_changed;
     } connections;
 
+    // Marks the unset type in a variant.
     struct None {};
 
+    // Our custom variant handling the different known cell identity details.
     union Detail
     {
-        Detail() : none(None{})
-        {
-        }
-
-        Detail(const com::ubuntu::location::connectivity::RadioCell::Gsm& gsm) : gsm(gsm)
-        {
-        }
-
-        Detail(const com::ubuntu::location::connectivity::RadioCell::Umts& umts) : umts(umts)
-        {
-        }
-
-        Detail(const com::ubuntu::location::connectivity::RadioCell::Lte& lte) : lte(lte)
-        {
-        }
-
+        // Constructs an empty instance
+        Detail();
+        // Constructs an instance holding details about a gsm cell.
+        Detail(const com::ubuntu::location::connectivity::RadioCell::Gsm& gsm);
+        // Constructs an instance holding details about a umtscell.
+        Detail(const com::ubuntu::location::connectivity::RadioCell::Umts& umts);
+        // Constructs an instance holding details about an lte cell.
+        Detail(const com::ubuntu::location::connectivity::RadioCell::Lte& lte);
+
+        // Our union members.
         None none;
         Gsm gsm;
         Umts umts;
         Lte lte;
     } detail;
-    /** @endcond */
 };
 }
 

=== added file 'src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp'
--- src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp	2014-08-14 20:33:50 +0000
@@ -0,0 +1,191 @@
+/*
+ * Copyright © 2012-2014 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]>
+ */
+
+#include <com/ubuntu/location/connectivity/cached_wireless_network.h>
+
+namespace connectivity = com::ubuntu::location::connectivity;
+
+namespace
+{
+std::string utf8_ssid_to_string(const org::freedesktop::NetworkManager::AccessPoint::Ssid::ValueType& ssid)
+{
+    return std::string(ssid.begin(), ssid.end());
+}
+
+com::ubuntu::location::connectivity::WirelessNetwork::Mode
+wifi_mode_from_ap_mode(org::freedesktop::NetworkManager::AccessPoint::Mode::ValueType value)
+{
+    com::ubuntu::location::connectivity::WirelessNetwork::Mode mode
+    {
+        com::ubuntu::location::connectivity::WirelessNetwork::Mode::unknown
+    };
+
+    switch (value)
+    {
+    case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::unknown:
+        mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::unknown;
+        break;
+    case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::adhoc:
+        mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::adhoc;
+        break;
+    case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::infra:
+        mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::infrastructure;
+        break;
+    }
+
+    return mode;
+}
+}
+
+const core::Property<std::chrono::system_clock::time_point>& detail::CachedWirelessNetwork::last_seen() const
+{
+    return last_seen_;
+}
+
+const core::Property<std::string>& detail::CachedWirelessNetwork::bssid() const
+{
+    return bssid_;
+}
+
+const core::Property<std::string>& detail::CachedWirelessNetwork::ssid() const
+{
+    return ssid_;
+}
+
+const core::Property<connectivity::WirelessNetwork::Mode>& detail::CachedWirelessNetwork::mode() const
+{
+    return mode_;
+}
+
+const core::Property<connectivity::WirelessNetwork::Frequency>& detail::CachedWirelessNetwork::frequency() const
+{
+    return frequency_;
+}
+
+const core::Property<connectivity::WirelessNetwork::SignalStrength>& detail::CachedWirelessNetwork::signal_strength() const
+{
+    return signal_strength_;
+}
+
+detail::CachedWirelessNetwork::CachedWirelessNetwork(
+        const org::freedesktop::NetworkManager::Device& device,
+        const org::freedesktop::NetworkManager::AccessPoint& ap)
+    : device_(device),
+      access_point_(ap)
+{
+    last_seen_ = std::chrono::system_clock::time_point
+    {
+        std::chrono::system_clock::duration{access_point_.last_seen->get()}
+    };
+
+    bssid_ = access_point_.hw_address->get();
+    ssid_ = utf8_ssid_to_string(access_point_.ssid->get());
+    mode_ = wifi_mode_from_ap_mode(access_point_.mode->get());
+    frequency_ = com::ubuntu::location::connectivity::WirelessNetwork::Frequency
+    {
+        static_cast<int>(access_point_.frequency->get())
+    };
+    signal_strength_ = com::ubuntu::location::connectivity::WirelessNetwork::SignalStrength
+    {
+        static_cast<int>(access_point_.strength->get())
+    };
+
+    // Wire up all the connections
+    access_point_.properties_changed->connect([this](const std::map<std::string, core::dbus::types::Variant>& dict)
+    {
+        on_access_point_properties_changed(dict);
+    });
+}
+
+void detail::CachedWirelessNetwork::on_access_point_properties_changed(const std::map<std::string, core::dbus::types::Variant>& dict)
+{
+    // We route by string
+    static const std::unordered_map<std::string, std::function<void(CachedWirelessNetwork&, const core::dbus::types::Variant&)> > lut
+    {
+        {
+            org::freedesktop::NetworkManager::AccessPoint::HwAddress::name(),
+            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
+            {
+                thiz.bssid_ = value.as<org::freedesktop::NetworkManager::AccessPoint::HwAddress::ValueType>();
+            }
+        },
+        {
+            org::freedesktop::NetworkManager::AccessPoint::Ssid::name(),
+            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
+            {
+                thiz.ssid_ = utf8_ssid_to_string(value.as<org::freedesktop::NetworkManager::AccessPoint::Ssid::ValueType>());
+            }
+        },
+        {
+            org::freedesktop::NetworkManager::AccessPoint::Strength::name(),
+            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
+            {
+                thiz.signal_strength_ = com::ubuntu::location::connectivity::WirelessNetwork::SignalStrength
+                {
+                    value.as<org::freedesktop::NetworkManager::AccessPoint::Strength::ValueType>()
+                };
+            }
+        },
+        {
+            org::freedesktop::NetworkManager::AccessPoint::Frequency::name(),
+            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
+            {
+                thiz.frequency_ = com::ubuntu::location::connectivity::WirelessNetwork::Frequency
+                {
+                    static_cast<int>(value.as<org::freedesktop::NetworkManager::AccessPoint::Frequency::ValueType>())
+                };
+            }
+        },
+        {
+            org::freedesktop::NetworkManager::AccessPoint::Mode::name(),
+            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
+            {
+                thiz.mode_ = wifi_mode_from_ap_mode(value.as<org::freedesktop::NetworkManager::AccessPoint::Mode::ValueType>());
+            }
+        },
+        {
+            org::freedesktop::NetworkManager::AccessPoint::LastSeen::name(),
+            [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
+            {
+                thiz.last_seen_ = std::chrono::system_clock::time_point
+                {
+                    std::chrono::system_clock::duration
+                    {
+                        value.as<org::freedesktop::NetworkManager::AccessPoint::LastSeen::ValueType>()
+                    }
+                };
+            }
+        }
+    };
+
+    for (const auto& pair : dict)
+    {
+        VLOG(1) << "Properties on access point " << ssid_.get() << " changed: \n"
+                << "  " << pair.first;
+
+        // We do not treat failing property updates as fatal but instead just
+        // log the issue for later analysis.
+        try
+        {
+            if (lut.count(pair.first) > 0) lut.at(pair.first)(*this, pair.second);
+        } catch (...)
+        {
+            VLOG(1) << "Exception while updating state for property change: " << pair.first;
+        }
+    }
+}

=== modified file 'src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.h'
--- src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.h	2014-07-29 10:51:48 +0000
+++ src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.h	2014-08-14 20:33:50 +0000
@@ -26,184 +26,45 @@
 
 namespace detail
 {
-std::string utf8_ssid_to_string(const org::freedesktop::NetworkManager::AccessPoint::Ssid::ValueType& ssid)
-{
-    return std::string(ssid.begin(), ssid.end());
-}
-
-com::ubuntu::location::connectivity::WirelessNetwork::Mode
-wifi_mode_from_ap_mode(org::freedesktop::NetworkManager::AccessPoint::Mode::ValueType value)
-{
-    com::ubuntu::location::connectivity::WirelessNetwork::Mode mode
-    {
-        com::ubuntu::location::connectivity::WirelessNetwork::Mode::unknown
-    };
-
-    switch (value)
-    {
-    case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::unknown:
-        mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::unknown;
-        break;
-    case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::adhoc:
-        mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::adhoc;
-        break;
-    case org::freedesktop::NetworkManager::AccessPoint::Mode::Value::infra:
-        mode = com::ubuntu::location::connectivity::WirelessNetwork::Mode::infrastructure;
-        break;
-    }
-
-    return mode;
-}
-
+
+// Implements the WirelessNetwork interface relying on a remote NetworkManager instance,
+// caching all of the interesting properties.
 struct CachedWirelessNetwork : public com::ubuntu::location::connectivity::WirelessNetwork
 {
+    // Just to save some typing.
     typedef std::shared_ptr<CachedWirelessNetwork> Ptr;
 
-    const core::Property<std::chrono::system_clock::time_point>& last_seen() const override
-    {
-        return last_seen_;
-    }
-
-    const core::Property<std::string>& bssid() const override
-    {
-        return bssid_;
-    }
-
-    const core::Property<std::string>& ssid() const override
-    {
-        return ssid_;
-    }
-
-    const core::Property<Mode>& mode() const override
-    {
-        return mode_;
-    }
-
-    const core::Property<Frequency>& frequency() const override
-    {
-        return frequency_;
-    }
-
-    const core::Property<SignalStrength>& signal_strength() const override
-    {
-        return signal_strength_;
-    }
-
+    // Constructs a new instance associated with the ap and the (remote) device
+    // it belongs to. Please note that the caching nature of the class ensures that
+    // ap and device stubs are kept alive.
     CachedWirelessNetwork(
             const org::freedesktop::NetworkManager::Device& device,
-            const org::freedesktop::NetworkManager::AccessPoint& ap)
-        : device_(device),
-          access_point_(ap)
-    {
-        try
-        {
-            last_seen_ = std::chrono::system_clock::time_point
-            {
-                std::chrono::system_clock::duration{access_point_.last_seen->get()}
-            };
-        } catch(const std::exception& e)
-        {
-            LOG(WARNING) << e.what();
-        }
-
-        bssid_ = access_point_.hw_address->get();
-        ssid_ = utf8_ssid_to_string(access_point_.ssid->get());
-        mode_ = wifi_mode_from_ap_mode(access_point_.mode->get());
-        frequency_ = com::ubuntu::location::connectivity::WirelessNetwork::Frequency
-        {
-            static_cast<int>(access_point_.frequency->get())
-        };
-        signal_strength_ = com::ubuntu::location::connectivity::WirelessNetwork::SignalStrength
-        {
-            static_cast<int>(access_point_.strength->get())
-        };
-
-        // Wire up all the connections
-        access_point_.properties_changed->connect([this](const std::map<std::string, core::dbus::types::Variant>& dict)
-        {
-            on_access_point_properties_changed(dict);
-        });
-    }
-
-    void on_access_point_properties_changed(const std::map<std::string, core::dbus::types::Variant>& dict)
-    {
-        // We route by string
-        static const std::unordered_map<std::string, std::function<void(CachedWirelessNetwork&, const core::dbus::types::Variant&)> > lut
-        {
-            {
-                org::freedesktop::NetworkManager::AccessPoint::HwAddress::name(),
-                [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-                {
-                    thiz.bssid_ = value.as<org::freedesktop::NetworkManager::AccessPoint::HwAddress::ValueType>();
-                }
-            },
-            {
-                org::freedesktop::NetworkManager::AccessPoint::Ssid::name(),
-                [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-                {
-                    thiz.ssid_ = utf8_ssid_to_string(value.as<org::freedesktop::NetworkManager::AccessPoint::Ssid::ValueType>());
-                }
-            },
-            {
-                org::freedesktop::NetworkManager::AccessPoint::Strength::name(),
-                [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-                {
-                    thiz.signal_strength_ = com::ubuntu::location::connectivity::WirelessNetwork::SignalStrength
-                    {
-                        value.as<org::freedesktop::NetworkManager::AccessPoint::Strength::ValueType>()
-                    };
-                }
-            },
-            {
-                org::freedesktop::NetworkManager::AccessPoint::Frequency::name(),
-                [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-                {
-                    thiz.frequency_ = com::ubuntu::location::connectivity::WirelessNetwork::Frequency
-                    {
-                        static_cast<int>(value.as<org::freedesktop::NetworkManager::AccessPoint::Frequency::ValueType>())
-                    };
-                }
-            },
-            {
-                org::freedesktop::NetworkManager::AccessPoint::Mode::name(),
-                [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-                {
-                    thiz.mode_ = wifi_mode_from_ap_mode(value.as<org::freedesktop::NetworkManager::AccessPoint::Mode::ValueType>());
-                }
-            },
-            {
-                org::freedesktop::NetworkManager::AccessPoint::LastSeen::name(),
-                [](CachedWirelessNetwork& thiz, const core::dbus::types::Variant& value)
-                {
-                    thiz.last_seen_ = std::chrono::system_clock::time_point
-                    {
-                        std::chrono::system_clock::duration
-                        {
-                            value.as<org::freedesktop::NetworkManager::AccessPoint::LastSeen::ValueType>()
-                        }
-                    };
-                }
-            }
-        };
-
-        for (const auto& pair : dict)
-        {
-            VLOG(1) << "Properties on access point " << ssid_.get() << " changed: \n"
-                    << "  " << pair.first;
-
-            // We do not treat failing property updates as fatal but instead just
-            // log the issue for later analysis.
-            try
-            {
-                if (lut.count(pair.first) > 0) lut.at(pair.first)(*this, pair.second);
-            } catch (const std::exception& e)
-            {
-                LOG(WARNING) << "Exception while updating state for property change: " << pair.first;
-            }
-        }
-    }
-
+            const org::freedesktop::NetworkManager::AccessPoint& ap);
+
+    // Timestamp when the network became visible.
+    const core::Property<std::chrono::system_clock::time_point>& last_seen() const override;
+
+    // Returns the BSSID of the network
+    const core::Property<std::string>& bssid() const override;
+
+    // Returns the SSID of the network.
+    const core::Property<std::string>& ssid() const override;
+
+    // Returns the mode of the network.
+    const core::Property<Mode>& mode() const override;
+
+    // Returns the frequency that the network/AP operates upon.
+    const core::Property<Frequency>& frequency() const override;
+
+    // Returns the signal quality of the network/AP in percent.
+    const core::Property<SignalStrength>& signal_strength() const override;
+
+    // Called whenever a property of an access point changes.
+    void on_access_point_properties_changed(const std::map<std::string, core::dbus::types::Variant>& dict);
+
+    // The cached network manager device associated to the access point.
     org::freedesktop::NetworkManager::Device device_;
+    // The actual access point stub.
     org::freedesktop::NetworkManager::AccessPoint access_point_;
 
     core::Property<std::chrono::system_clock::time_point> last_seen_;

=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono.h'
--- src/location_service/com/ubuntu/location/connectivity/ofono.h	2014-06-05 12:25:22 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono.h	2014-08-14 20:33:50 +0000
@@ -30,6 +30,8 @@
 #include <core/dbus/types/stl/tuple.h>
 #include <core/dbus/types/stl/vector.h>
 
+#include <com/ubuntu/location/logging.h>
+
 namespace org
 {
 struct Ofono
@@ -612,7 +614,7 @@
 
                 if (it == properties.end())
                 {
-                    LOG(WARNING) << "Could not find property for name " << Property::name();
+                    VLOG(1) << "Could not find property for name " << Property::name();
                     return typename Property::ValueType{};
                 }
 

=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp'
--- src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2014-07-31 10:18:42 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2014-08-14 20:33:50 +0000
@@ -138,7 +138,7 @@
     }
     catch (const std::exception& e)
     {
-        LOG(ERROR) << "Error while setting up access to radio and network stack: " << e.what();
+        SYSLOG(ERROR) << "Error while setting up access to radio and network stack: " << e.what();
     }
 }
 
@@ -168,7 +168,7 @@
         }
         catch(const std::runtime_error& e)
         {
-            LOG(WARNING) << "Exception while creating connected radio cell: " << e.what();
+            VLOG(1) << "Exception while creating connected radio cell: " << e.what();
         }
     });
 
@@ -180,7 +180,7 @@
         }
         catch(const std::exception& e)
         {
-            LOG(WARNING) << "Exception while adding modem: " << e.what();
+            VLOG(1) << "Exception while adding modem: " << e.what();
         }
     });
 
@@ -192,7 +192,7 @@
         }
         catch(const std::exception& e)
         {
-            LOG(WARNING) << "Exception while removing modem: " << e.what();
+            VLOG(1) << "Exception while removing modem: " << e.what();
         }
     });
 }
@@ -262,7 +262,7 @@
     auto itm = cached.modems.find(path);
     if (itm == cached.modems.end())
     {
-        LOG(WARNING) << "Could not find a modem for path " << path.as_string();
+        VLOG(1) << "Could not find a modem for path " << path.as_string();
         return;
     }
 
@@ -319,7 +319,7 @@
                 }
                 catch (const std::exception& e)
                 {
-                    LOG(ERROR) << "Error while creating ap/wifi: " << e.what();
+                    VLOG(1) << "Error while creating ap/wifi: " << e.what();
                 }
             });
 
@@ -336,7 +336,7 @@
                 }
                 catch (const std::exception& e)
                 {
-                    LOG(ERROR) << "Error while creating ap/wifi: " << e.what();
+                    VLOG(1) << "Error while creating ap/wifi: " << e.what();
                 }
             });
 
@@ -348,7 +348,7 @@
                 }
                 catch (const std::exception& e)
                 {
-                    LOG(ERROR) << "Error while removing ap/wifi: " << e.what();
+                    VLOG(1) << "Error while removing ap/wifi: " << e.what();
                 }
             });
         }

=== modified file 'src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp'
--- src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp	2014-07-30 08:45:39 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp	2014-08-14 20:33:50 +0000
@@ -154,10 +154,10 @@
             u_hardware_gps_inject_xtra_data(thiz->impl.gps_handle, &xtra_gps_data.front(), xtra_gps_data.size());
     } catch(const std::exception& e)
     {
-        LOG(ERROR) << "Error downloading GPS Xtra data: " << e.what();
+        SYSLOG(ERROR) << "Error downloading GPS Xtra data: " << e.what();
     } catch(...)
     {
-        LOG(ERROR) << "Error downloading GPS Xtra data.";
+        SYSLOG(ERROR) << "Error downloading GPS Xtra data.";
     }
 
 }

=== modified file 'src/location_service/com/ubuntu/location/service/daemon_main.cpp'
--- src/location_service/com/ubuntu/location/service/daemon_main.cpp	2014-07-29 11:33:26 +0000
+++ src/location_service/com/ubuntu/location/service/daemon_main.cpp	2014-08-14 20:33:50 +0000
@@ -43,7 +43,7 @@
     if (ec)
     {
         FLAGS_logtostderr = true;
-        LOG(WARNING) << "Problem creating directory for log files: " << ec << "."
+        VLOG(1) << "Problem creating directory for log files: " << ec << "."
                      << "Falling back to stderr logging.";
     }
 

=== modified file 'src/location_service/com/ubuntu/location/service/ichnaea_reporter.cpp'
--- src/location_service/com/ubuntu/location/service/ichnaea_reporter.cpp	2014-07-15 21:31:47 +0000
+++ src/location_service/com/ubuntu/location/service/ichnaea_reporter.cpp	2014-08-14 20:33:50 +0000
@@ -292,13 +292,13 @@
                 .on_response([](const core::net::http::Response& response)
                 {
                     if (response.status != ichnaea::submit::success)
-                        LOG(ERROR) << "Error submitting to ichnaea: " << response.body;
+                        SYSLOG(ERROR) << "Error submitting to ichnaea: " << response.body;
                     else
-                        LOG(INFO) << "Succesfully submitted to ichnaea.";
+                        VLOG(1) << "Succesfully submitted to ichnaea.";
                 })
                 .on_error([](const core::net::Error& e)
                 {
-                    LOG(ERROR) << "Networking error while submitting to ichnaea: " << e.what();
+                    SYSLOG(ERROR) << "Networking error while submitting to ichnaea: " << e.what();
                 }));
 }
 

=== modified file 'src/location_service/com/ubuntu/location/service/session/skeleton.cpp'
--- src/location_service/com/ubuntu/location/service/session/skeleton.cpp	2014-08-05 05:17:17 +0000
+++ src/location_service/com/ubuntu/location/service/session/skeleton.cpp	2014-08-14 20:33:50 +0000
@@ -123,7 +123,7 @@
                     msg,
                     Interface::Errors::ErrorStartingUpdate::name(),
                     "Could not enable position updates");
-        LOG(ERROR) << e.what();
+        SYSLOG(ERROR) << e.what();
     }
 
     try
@@ -131,7 +131,7 @@
         configuration.local.bus->send(reply);
     } catch(const std::exception& e)
     {
-        LOG(ERROR) << e.what();
+        SYSLOG(ERROR) << e.what();
     }
 }
 
@@ -152,7 +152,7 @@
                     msg,
                     Interface::Errors::ErrorStartingUpdate::name(),
                     "Could not disable position updates");
-        LOG(ERROR) << e.what();
+        SYSLOG(ERROR) << e.what();
     }
 
     try
@@ -160,7 +160,7 @@
         configuration.local.bus->send(reply);
     } catch(const std::exception& e)
     {
-        LOG(ERROR) << e.what();
+        SYSLOG(ERROR) << e.what();
     }
 }
 
@@ -181,7 +181,7 @@
                     msg,
                     Interface::Errors::ErrorStartingUpdate::name(),
                     "Could not enable position updates");
-        LOG(ERROR) << e.what();
+        SYSLOG(ERROR) << e.what();
     }
 
     try
@@ -189,7 +189,7 @@
         configuration.local.bus->send(reply);
     } catch(const std::exception& e)
     {
-        LOG(ERROR) << e.what();
+        SYSLOG(ERROR) << e.what();
     }
 }
 
@@ -209,7 +209,7 @@
                     msg,
                     Interface::Errors::ErrorStartingUpdate::name(),
                     "Could not enable position updates");
-        LOG(ERROR) << e.what();
+        SYSLOG(ERROR) << e.what();
     }
 
     try
@@ -217,7 +217,7 @@
         configuration.local.bus->send(reply);
     } catch(const std::exception& e)
     {
-        LOG(ERROR) << e.what();
+        SYSLOG(ERROR) << e.what();
     }
 }
 
@@ -237,7 +237,7 @@
                     msg,
                     Interface::Errors::ErrorStartingUpdate::name(),
                     "Could not enable position updates");
-        LOG(ERROR) << e.what();
+        SYSLOG(ERROR) << e.what();
     }
 
     try
@@ -245,7 +245,7 @@
         configuration.local.bus->send(reply);
     } catch(const std::exception& e)
     {
-        LOG(ERROR) << e.what();
+        SYSLOG(ERROR) << e.what();
     }
 }
 
@@ -265,7 +265,7 @@
                     msg,
                     Interface::Errors::ErrorStartingUpdate::name(),
                     "Could not enable position updates");
-        LOG(ERROR) << e.what();
+        SYSLOG(ERROR) << e.what();
     }
 
     try
@@ -273,7 +273,7 @@
         configuration.local.bus->send(reply);
     } catch(const std::exception& e)
     {
-        LOG(ERROR) << e.what();
+        SYSLOG(ERROR) << e.what();
     }
 }
 

=== modified file 'src/location_service/com/ubuntu/location/service/session/stub.cpp'
--- src/location_service/com/ubuntu/location/service/session/stub.cpp	2014-06-20 07:40:34 +0000
+++ src/location_service/com/ubuntu/location/service/session/stub.cpp	2014-08-14 20:33:50 +0000
@@ -154,7 +154,7 @@
         }
     } catch(const std::runtime_error& e)
     {
-        LOG(WARNING) << e.what();
+        VLOG(1) << e.what();
     }
 }
 
@@ -185,7 +185,7 @@
         }
     } catch(const std::runtime_error& e)
     {
-        LOG(WARNING) << e.what();
+        VLOG(1) << e.what();
     }
 }
 
@@ -216,7 +216,7 @@
         }
     } catch(const std::runtime_error& e)
     {
-        LOG(WARNING) << e.what();
+        VLOG(1) << e.what();
     }
 }
 

=== modified file 'src/location_service/com/ubuntu/location/service/skeleton.cpp'
--- src/location_service/com/ubuntu/location/service/skeleton.cpp	2014-08-11 10:21:08 +0000
+++ src/location_service/com/ubuntu/location/service/skeleton.cpp	2014-08-14 20:33:50 +0000
@@ -174,7 +174,7 @@
                     culs::Interface::Errors::CreatingSession::name(),
                     "Error creating session");
         // We log the error for debugging purposes.
-        LOG(ERROR) << "Error creating session: " << e.what();
+        SYSLOG(ERROR) << "Error creating session: " << e.what();
     }
 
     // We are done processing the request and try to send out the result to the client.
@@ -184,7 +184,7 @@
     } catch(const std::exception& e)
     {
         // We log the error for debugging purposes.
-        LOG(ERROR) << "Error sending reply to session creation request: " << e.what();
+        SYSLOG(ERROR) << "Error sending reply to session creation request: " << e.what();
     }
 }
 

=== modified file 'src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp'
--- src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp	2014-08-08 08:49:39 +0000
+++ src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp	2014-08-14 20:33:50 +0000
@@ -125,11 +125,11 @@
         profile = app_armor_profile_resolver(core::trust::Pid{credentials.pid});
     } catch(const std::exception& e)
     {
-        LOG(ERROR) << "Could not resolve PID " << credentials.pid << " to apparmor profile: " << e.what();
+        SYSLOG(ERROR) << "Could not resolve PID " << credentials.pid << " to apparmor profile: " << e.what();
         return service::PermissionManager::Result::rejected;
     } catch(...)
     {
-        LOG(ERROR) << "Could not resolve PID " << credentials.pid << " to apparmor profile.";
+        SYSLOG(ERROR) << "Could not resolve PID " << credentials.pid << " to apparmor profile.";
         return service::PermissionManager::Result::rejected;
     }