Remove VirtualBlocking test

Change-Id: I558bbc1f16a8514aafaf8c5800d99964b6a286b5
Signed-off-by: kj7.sung <kj7.sung@samsung.com>

diff --git a/lbs-server/src/lbs_server.c b/lbs-server/src/lbs_server.c
index 3f39d6a6e236f230a11cfa27d6b4b3865c6db1a3..9e91f5ed657e7cbada3854985b169027bd5e74a6 100644 (file)
--- a/lbs-server/src/lbs_server.c
+++ b/lbs-server/src/lbs_server.c
@@ -48,8 +48,6 @@
 #define MAX_BATCH_INTERVAL     255
 #define MAX_BATCH_PERIOD       60000
 
-// TODO blocking area test
-#define VIRTUAL_BLOCK_AREA     1
 
 typedef struct {
        /* gps variables */
@@ -106,7 +104,6 @@ typedef struct {
        gint fused_balance_count;
        gboolean is_fused_running;
        gboolean fused_feature;
-       gint fused_test_block;
 } lbs_server_s;
 
 #ifndef TIZEN_DEVICE
@@ -267,12 +264,8 @@ static void nps_update_position(lbs_server_s *lbs_server, NpsManagerPositionExt
         * For fused location
         */
        if (lbs_server->fused_feature) {
-               if (lbs_server->is_fused_running) {
-                       if (lbs_server->fused_test_block == 0)
+               if (lbs_server->is_fused_running)
                        send_wps_position_to_fused_engine(wps.timestamp, wps.latitude, wps.longitude, wps.hor_accuracy);
-                       else
-                               LOG_NPS(DBG_LOW, "[VIRTUAL] WPS disabled temporary");
-               }
        }
 #endif
 
@@ -680,21 +673,6 @@ static gboolean select_location_source(lbs_server_s *lbs_server)
        return FALSE;
 }
 
-#ifdef TIZEN_DEVICE
-#if (VIRTUAL_BLOCK_AREA)
-static void _block_cb(keynode_t *key, void *user_data)
-{
-       LOG_GPS(DBG_LOW, "[VIRTUAL] VCONFKEY_LOCATION_SUPL_VERSION changed");
-       int value = 0;
-
-       setting_get_int(VCONFKEY_LOCATION_SUPL_VERSION, &value);
-
-       lbs_server_s *lbs_server = (lbs_server_s *)user_data;
-       lbs_server->fused_test_block = value;
-}
-#endif
-#endif
-
 static gboolean location_source_selector(lbs_server_s *lbs_server, gint fused_mode)
 {
        LOG_FUSED_FUNC;
@@ -1494,11 +1472,8 @@ static void gps_update_position_cb(pos_data_t *pos, gps_error_t error, void *use
         */
        if (lbs_server->fused_feature) {
                if (lbs_server->is_fused_running) {
-                       if (lbs_server->fused_test_block == 0)
                        send_gps_position_to_fused_engine(pos->timestamp, pos->latitude, pos->longitude, pos->altitude,
                                pos->speed, pos->bearing, pos->hor_accuracy, pos->ver_accuracy);
-                       else
-                               LOG_GPS(DBG_LOW, "[VIRTUAL] GPS disalbed temporary");
                }
        }
 #endif
@@ -1685,10 +1660,6 @@ static void lbs_server_init(lbs_server_s *lbs_server)
        if (lbs_server->fused_feature) {
                lbs_server->fused_interval_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
                location_fused_init(fused_update_position_cb, lbs_server);
-       #if (VIRTUAL_BLOCK_AREA)
-               LOG_GPS(DBG_LOW, "[VIRTUAL] temporary vconf added");
-               vconf_notify_key_changed(VCONFKEY_LOCATION_SUPL_VERSION, _block_cb, lbs_server);
-       #endif
        }
 #endif
 }
@@ -1905,11 +1876,6 @@ int main(int argc, char **argv)
         */
        if (lbs_server->fused_feature) {
                location_fused_deinit();
-
-       #if (VIRTUAL_BLOCK_AREA)
-               LOG_GPS(DBG_LOW, "[VIRTUAL] temporary vconf removed");
-               vconf_ignore_key_changed(VCONFKEY_LOCATION_SUPL_VERSION, _block_cb);
-       #endif
                g_hash_table_destroy(lbs_server->fused_interval_table);
        }
 #endif

diff --git a/packaging/lbs-server.spec b/packaging/lbs-server.spec
index 1c031e66179e67f332c05a78ac674a431f9f6f35..00e361ad0aa7814919d060f4fc47800c3b17ae33 100644 (file)
--- a/packaging/lbs-server.spec
+++ b/packaging/lbs-server.spec
@@ -1,6 +1,6 @@
 Name:    lbs-server
 Summary: LBS Server for Tizen
-Version: 1.3.2
+Version: 1.3.3
 Release: 1
 Group:   Location/Service
 License: Apache-2.0