From ea81916937b7425f843806738bd8cbd0ec6265c3 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Sat, 23 Jul 2011 11:44:04 +0200
Subject: [PATCH] [Positioning] Add option position-calibration-requests

This option allows the calibration requests to be positioned as
positioning requests.
---
 owlps-positioning/cfg/owlps-positioning.cfg | 7 +++++++
 owlps-positioning/src/input.cc              | 4 ++++
 owlps-positioning/src/userinterface.cc      | 6 ++++++
 3 files changed, 17 insertions(+)

diff --git a/owlps-positioning/cfg/owlps-positioning.cfg b/owlps-positioning/cfg/owlps-positioning.cfg
index 3bbfcfa..e585c08 100644
--- a/owlps-positioning/cfg/owlps-positioning.cfg
+++ b/owlps-positioning/cfg/owlps-positioning.cfg
@@ -76,6 +76,13 @@ csv-file = /tmp/owlps-positioning.log
 # it is not activated by default for security purposes.
 #accept-new-calibration-requests = false
 
+# If you activate the above option and want the calibration requests
+# to be treated as positioning requests (in addition to the normal
+# treatment of calibration requests), activate this option.
+# The default is false: the first calibration requests' purpose is to
+# serve the positioning process, not to use it.
+#position-calibration-requests = false
+
 # This option allows to create a new AP when a request is captured by an
 # AP which is not currently in the APs' list (i.e. not declared in the
 # APs' configuration file), or when a self-calibration request is sent
diff --git a/owlps-positioning/src/input.cc b/owlps-positioning/src/input.cc
index ba36226..7e452b7 100644
--- a/owlps-positioning/src/input.cc
+++ b/owlps-positioning/src/input.cc
@@ -132,6 +132,10 @@ const Request& Input::get_next_request() const
               if (Configuration::bool_value(
                     "positioning.generate-reference-points"))
                 Stock::regenerate_reference_points() ;
+
+              if (! Configuration::bool_value(
+                    "positioning.position-calibration-requests"))
+                medium->clear_current_request() ;
             }
         }
     }
diff --git a/owlps-positioning/src/userinterface.cc b/owlps-positioning/src/userinterface.cc
index a0be735..e5d7393 100644
--- a/owlps-positioning/src/userinterface.cc
+++ b/owlps-positioning/src/userinterface.cc
@@ -204,6 +204,12 @@ void UserInterface::fill_positioning_options()
    " self-calibration. If unactivated, the calibration requests"
    " are handled as positioning requests (default is unactivated,"
    " for security purposes).")
+  ("positioning.position-calibration-requests",
+   po::value<bool>()->default_value(false),
+   "When accept-new-calibration-requests is activated, allow the"
+   " calibration requests to be positioned as normal requests."
+   " The default is to add them to the calibration requests' list"
+   " without position them.")
   ("positioning.accept-new-aps",
    po::value<bool>()->default_value(false),
    "When receiving requests, add unknown APs (APs which are not"