From eeb5217a7b5a773d8a706a96354f684ac9a316af Mon Sep 17 00:00:00 2001 From: Marcin Masternak Date: Wed, 1 Jun 2016 20:16:07 +0200 Subject: [PATCH] [my-place][places)detector] Refactor getting location from visit json. Change-Id: Ifad943d5a0c8db5c188b5ff439986026add773a8 Signed-off-by: Marcin Masternak --- src/my-place/user_places/places_detector.cpp | 18 +++++++++++------- src/my-place/user_places/places_detector.h | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/my-place/user_places/places_detector.cpp b/src/my-place/user_places/places_detector.cpp index cb83db9..ff2556c 100644 --- a/src/my-place/user_places/places_detector.cpp +++ b/src/my-place/user_places/places_detector.cpp @@ -138,6 +138,16 @@ ctx::Categs ctx::PlacesDetector::__visitCategsFromJson(Json &row) return categs; } +void ctx::PlacesDetector::__visitLocationFromJson(Json &row, ctx::Visit &visit) +{ + int locationValidInt; + row.get(NULL, VISIT_COLUMN_LOCATION_VALID, &locationValidInt); + visit.locationValid = (bool) locationValidInt; + row.get(NULL, VISIT_COLUMN_LOCATION_LATITUDE, &(visit.location.latitude)); + row.get(NULL, VISIT_COLUMN_LOCATION_LONGITUDE, &(visit.location.longitude)); + row.get(NULL, VISIT_COLUMN_LOCATION_ACCURACY, &(visit.location.accuracy)); +} + ctx::Visit ctx::PlacesDetector::__visitFromJson(Json &row) { int startTime; @@ -157,13 +167,7 @@ ctx::Visit ctx::PlacesDetector::__visitFromJson(Json &row) Visit visit(interval, macSet, categs); - { // location - int locationValidInt; - row.get(NULL, VISIT_COLUMN_LOCATION_VALID, &locationValidInt); - visit.locationValid = (bool) locationValidInt; - row.get(NULL, VISIT_COLUMN_LOCATION_LATITUDE, &(visit.location.latitude)); - row.get(NULL, VISIT_COLUMN_LOCATION_LONGITUDE, &(visit.location.longitude)); - } + __visitLocationFromJson(row, visit); return visit; } diff --git a/src/my-place/user_places/places_detector.h b/src/my-place/user_places/places_detector.h index e67f204..bb4dab1 100644 --- a/src/my-place/user_places/places_detector.h +++ b/src/my-place/user_places/places_detector.h @@ -35,6 +35,7 @@ namespace ctx { double __doubleValueFromJson(Json &row, const char* key); Categs __visitCategsFromJson(Json &row); + void __visitLocationFromJson(Json &row, ctx::Visit &visit); Visit __visitFromJson(Json &row); Visits __visitsFromJsons(std::vector& records); std::shared_ptr __placeFromJson(Json &row); -- 2.34.1