From: Marcin Masternak <m.masternak@samsung.com>
Date: Wed, 1 Jun 2016 18:16:07 +0000 (+0200)
Subject: [my-place][places)detector] Refactor getting location from visit json.
X-Git-Tag: submit/tizen/20160622.045445~1^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F72603%2F1;p=platform%2Fcore%2Fcontext%2Fcontext-provider.git

[my-place][places)detector] Refactor getting location from visit json.

Change-Id: Ifad943d5a0c8db5c188b5ff439986026add773a8
Signed-off-by: Marcin Masternak <m.masternak@samsung.com>
---

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<Json>& records);
 		std::shared_ptr<ctx::Place> __placeFromJson(Json &row);