merge from private

[platform/core/location/location-module.git] / modules / osm / location-osm.c

diff --git a/modules/osm/location-osm.c b/modules/osm/location-osm.c
index 19dac0d..6d836f9 100644 (file)
--- a/modules/osm/location-osm.c
+++ b/modules/osm/location-osm.c
@@ -22,7 +22,10 @@
 #include <glib.h>
 
 #include <location.h>
+#include <location-module.h>
+#include <location-types.h>
 #include <location-map-service.h>
+#include <location-map-pref.h>
 #include "location-osm-geocode.h"
 #include "location-osm-route.h"
 #include "location-osm-poi.h"
@@ -89,13 +92,18 @@ static int
 get_geocode_async (gpointer handle,
        const LocationAddress *addr,
        const LocationMapPref *svc_pref,
+       const LocationGeocodePreference *pref,
        LocationPositionCB callback,
-       gpointer userdata)
+       gpointer userdata,
+       guint *req_id)
 {
        OsmHandle *osm = (OsmHandle *)handle;
        g_return_val_if_fail(osm, LOCATION_ERROR_NOT_AVAILABLE);
        g_return_val_if_fail(addr, LOCATION_ERROR_PARAMETER);
        g_return_val_if_fail(callback, LOCATION_ERROR_PARAMETER);
+       g_return_val_if_fail(pref, LOCATION_ERROR_PARAMETER);
+
+       //TODO: treat req_id to cancel async request.
 
        return osm_get_geocode_async(osm, addr, callback, userdata);
 }
@@ -121,14 +129,18 @@ static int
 get_geocode_freetext_async (gpointer handle,
        const gchar* addr,
        const LocationMapPref *svc_pref,
+       const LocationGeocodePreference *pref,
        LocationPositionCB callback,
-       gpointer userdata)
+       gpointer userdata,
+       guint *req_id)
 {
        OsmHandle *osm = (OsmHandle *)handle;
        g_return_val_if_fail(osm, LOCATION_ERROR_NOT_AVAILABLE);
        g_return_val_if_fail(addr, LOCATION_ERROR_PARAMETER);
        g_return_val_if_fail(callback, LOCATION_ERROR_PARAMETER);
 
+       //TODO: treat GeocodePreference and req_id to cancel async request.
+
        return osm_get_geocode_freetext_async(osm, addr, callback, userdata);
 }
 
@@ -153,12 +165,16 @@ get_reverse_geocode_async (gpointer handle,
        const LocationPosition *pos,
        const LocationMapPref *svc_pref,
        LocationAddressCB callback,
-       gpointer userdata)
+       gpointer userdata,
+       guint *req_id)
 {
        OsmHandle *osm = (OsmHandle *)handle;
        g_return_val_if_fail(osm, LOCATION_ERROR_NOT_AVAILABLE);
        g_return_val_if_fail(pos, LOCATION_ERROR_PARAMETER);
        g_return_val_if_fail(callback, LOCATION_ERROR_PARAMETER);
+       g_return_val_if_fail(req_id, LOCATION_ERROR_PARAMETER);
+
+       //TODO: treat req_id to cancel async request.
 
        return osm_get_reverse_geocode_async(osm, pos, callback, userdata);
 }