From 6e6d6c5950b4dd5da2d049ea695ff5cb610da601 Mon Sep 17 00:00:00 2001 From: "chanil.byun" Date: Sat, 11 May 2013 17:35:18 +0900 Subject: [PATCH] merge from private Signed-off-by: chanil.byun --- AUTHORS | 2 +- location-module.changes | 246 +++++++++++++++++++++++++++++++++++++ modules/gpsd/geoclue-gpsd.c | 8 +- modules/log.h | 6 +- modules/osm/location-osm-geocode.c | 6 +- modules/osm/location-osm-geocode.h | 6 +- modules/osm/location-osm-poi.c | 6 +- modules/osm/location-osm-poi.h | 6 +- modules/osm/location-osm-route.c | 6 +- modules/osm/location-osm-route.h | 6 +- modules/osm/location-osm.c | 22 +++- modules/osm/location-osm.h | 6 +- modules/osm/osm-http.c | 6 +- modules/osm/osm-http.h | 6 +- modules/osm/osm-route-yours.c | 6 +- modules/osm/osm-route-yours.h | 6 +- packaging/location-module.spec | 4 +- 17 files changed, 308 insertions(+), 46 deletions(-) create mode 100644 location-module.changes diff --git a/AUTHORS b/AUTHORS index cc7be1c..a879250 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,3 @@ Youngae Kang -Yunhan Kim +Minjune Kim Genie Kim diff --git a/location-module.changes b/location-module.changes new file mode 100644 index 0000000..dfc7c86 --- /dev/null +++ b/location-module.changes @@ -0,0 +1,246 @@ +[Version] location-module_0.1.22-1 +[date] 10 May 2013 +[Title] To prevent build break on RSA +[Issue#] NA +[Problem] NA +[Cause] NA +[Solution] To prevent build break on RSA +[Developer] Youngae Kang + +================================================================================ + + +[Version] location-module_0.1.21-1 +[date] 24 Jan 2013 +[Title] change boilerplate +[Issue#] NA +[Problem] NA +[Cause] NA +[Solution] change boilerplate +[Developer] Genie Kim + +================================================================================ + +location-module (0.1.20-5) precise; urgency=low + + * fixed build error for location_address_new() + * Tag: location-module_0.1.20-5 + + -- Genie Kim Wed, 12 Dec 2012 19:52:30 +0900 + +location-module (0.1.20-4) unstable; urgency=low + + * Add LocationMapPref in geocode + * Tag: location-module_0.1.20-4 + + -- Minjune Kim Mon, 20 Aug 2012 11:28:25 +0900 + +location-module (0.1.20-3) unstable; urgency=low + + * Change lib name from libmap-service.so to libmap-service-osm + * Tag: location-module_0.1.20-3 + + -- Minjune Kim Tue, 07 Aug 2012 21:30:04 +0900 + +location-module (0.1.20-2) unstable; urgency=low + + * Seperate map service from location service + * Tag: location-module_0.1.20-2 + + -- Minjune Kim Mon, 23 Jul 2012 17:45:00 +0900 + +location-module (0.1.20-1) unstable; urgency=low + + * Add POI + * Tag: location-module_0.1.20-1 + + -- Minjune Kim Mon, 02 Jul 2012 23:30:51 +0900 + +location-module (0.1.19-1) unstable; urgency=low + + * Add route. + * Tag: location-module_0.1.19-1 + + -- Genie Kim Wed, 30 May 2012 19:56:33 +0900 + +location-module (0.1.18-4) unstable; urgency=low + + * Define Capability API proto. + * Tag: location-module_0.1.18-4 + + -- Minjune Kim Wed, 14 Mar 2012 20:49:29 +0900 + +location-module (0.1.18-3) unstable; urgency=low + + * fix bug : pos -> acc list + * Tag: location-module_0.1.18-3 + + -- Genie Kim Fri, 02 Mar 2012 15:06:50 +0900 + +location-module (0.1.18-2) unstable; urgency=low + + * Change lib name to libmap-service + * Tag: location-module_0.1.18-2 + + -- Genie Kim Fri, 17 Feb 2012 21:36:20 +0900 + +location-module (0.1.18-1) unstable; urgency=low + + * remove location-geoclue-gpsd + * Tag: location-module_0.1.18-1 + + -- Genie Kim Fri, 10 Feb 2012 16:18:30 +0900 + +location-module (0.1.17-1) unstable; urgency=low + + * Support multiple result of geocode but it is workaround. + * Tag: location-module_0.1.17-1 + + -- Minjune Kim Thu, 09 Feb 2012 11:46:50 +0900 + +location-module (0.1.16-4) unstable; urgency=low + + * Modify lib path on postinst + * Tag: location-module_0.1.16-4 + + -- Minjune Kim Wed, 01 Feb 2012 14:26:56 +0900 + +location-module (0.1.16-3) unstable; urgency=low + + * Fix bug while using WPS module. + * Tag: location-module_0.1.16-3 + + -- Minjune Kim Mon, 19 Dec 2011 18:59:35 +0900 + +location-module (0.1.16-2) unstable; urgency=low + + * generate link file to support wps method on SDK. + * Tag: location-module_0.1.16-2 + + -- Minjune Kim Fri, 09 Dec 2011 20:15:04 +0900 + +location-module (0.1.16-1) unstable; urgency=low + + * add geoclue gpsd module + * Tag: location-module_0.1.16-1 + + -- Genie Kim Wed, 07 Dec 2011 16:50:31 +0900 + +location-module (0.1.15-1) unstable; urgency=low + + * remove not using packages(hostip/opencellid) + * Tag: location-module_0.1.15-1 + + -- Genie Kim Tue, 06 Dec 2011 22:40:14 +0900 + +location-module (0.1.14-1) unstable; urgency=low + + * move gpsd module to geoclue-providers for last knonw position + * Tag: location-module_0.1.14-1 + + -- Genie Kim Sat, 26 Nov 2011 12:17:29 +0900 + +location-module (0.1.13-1) unstable; urgency=low + + * use time_t for timestamp + * Tag: location-module_0.1.13-1 + + -- Genie Kim Mon, 17 Oct 2011 13:36:42 +0900 + +location-module (0.1.12-1) unstable; urgency=low + + * fixed BS about gmtime_r() + * Tag: location-module_0.1.12-1 + + -- Genie Kim Thu, 01 Sep 2011 14:04:33 +0900 + +location-module (0.1.11-1) unstable; urgency=low + + * fixed prevent defect + * Tag: location-module_0.1.11-1 + + -- Genie Kim Fri, 26 Aug 2011 13:38:29 +0900 + +location-module (0.1.10-2) unstable; urgency=low + + * change boilerplate + * Tag: location-module_0.1.10-2 + + -- Genie Kim Wed, 20 Jul 2011 17:52:15 +0900 + +location-module (0.1.10-1) unstable; urgency=low + + * Package: Release new location-geoclue-nominatim package + * Tag: location-module_0.1.10-1 + + -- Tae-Hwan Kim Wed, 01 Jun 2011 21:14:33 +0900 + +location-module (0.1.9-1) unstable; urgency=low + + * Remove callbacks when location stops + * Tag: location-module_0.1.9-1 + + -- Tae-Hwan Kim Fri, 13 May 2011 19:28:42 +0900 + +location-module (0.1.8-2) unstable; urgency=low + + * Apply New Location APIs + * Tag: location-module_0.1.8-2 + + -- Tae-Hwan Kim Wed, 20 Apr 2011 11:16:12 +0900 + +location-module (0.1.7-1) unstable; urgency=low + + * Fix depends & timestamp + * Tag: location-module_0.1.7-1 + + -- Tae-Hwan Kim Wed, 16 Feb 2011 21:02:21 +0900 + +location-module (0.1.6-1) unstable; urgency=low + + * Add geoclue-hostip module & geoclue-opencellid & geoclue-opencellid module + * Tag: location-module_0.1.6-1 + + -- Tae-Hwan Kim Wed, 19 Jan 2011 13:32:18 +0900 + +location-module (0.1.5-1) unstable; urgency=low + + * Adapt to plug change again + * Tag: location-module_0.1.5-1 + + -- Tae-Hwan Kim Tue, 21 Dec 2010 17:31:07 +0900 + +location-module (0.1.4-0) unstable; urgency=low + + * Adapt to plugin change + * Tag: location-module_0.1.4-0 + + -- Tae-Hwan Kim Mon, 13 Dec 2010 10:32:35 +0900 + +location-module (0.1.3-0) unstable; urgency=low + + * Initialize is_started to FALSE + * Tag: location-module_0.1.3-0 + + -- Tae-Hwan Kim Thu, 02 Dec 2010 13:36:02 +0900 + +location-module (0.1.2-0) unstable; urgency=low + + * Prevent duplicate start + * Tag: location-module_0.1.2-0 + + -- Tae-Hwan Kim Mon, 29 Nov 2010 11:17:46 +0900 + +location-module (0.1.1-0) unstable; urgency=low + + * Add debug pkg & disable geoclue-skyhook + * Tag: location-module_0.1.1-0 + + -- Tae-Hwan Kim Wed, 24 Nov 2010 22:21:17 +0900 + +location-module (0.1.0-1) unstable; urgency=low + + * Initial release + * Tag: location-module_0.1.0-1 + + -- Tae-Hwan Kim Tue, 02 Nov 2010 20:10:07 +0900 diff --git a/modules/gpsd/geoclue-gpsd.c b/modules/gpsd/geoclue-gpsd.c index fda27e2..107d90c 100644 --- a/modules/gpsd/geoclue-gpsd.c +++ b/modules/gpsd/geoclue-gpsd.c @@ -1,10 +1,10 @@ /* - * location-geoclue-gpsd + * location-module * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2010-2013 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Youngae Kang , Yunhan Kim , - * Genie Kim , Minjune Kim + * Contact: Youngae Kang , Minjune Kim + * Genie Kim * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/log.h b/modules/log.h index 219f062..328552b 100644 --- a/modules/log.h +++ b/modules/log.h @@ -1,10 +1,10 @@ /* * location-module * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2010-2013 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Youngae Kang , Yunhan Kim , - * Genie Kim , Minjune Kim + * Contact: Youngae Kang , Minjune Kim + * Genie Kim * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/osm/location-osm-geocode.c b/modules/osm/location-osm-geocode.c index 795e7b8..c474084 100644 --- a/modules/osm/location-osm-geocode.c +++ b/modules/osm/location-osm-geocode.c @@ -1,10 +1,10 @@ /* * location-module * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2010-2013 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Youngae Kang , Yunhan Kim , - * Genie Kim , Minjune Kim + * Contact: Youngae Kang , Minjune Kim + * Genie Kim * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/osm/location-osm-geocode.h b/modules/osm/location-osm-geocode.h index 8d384bf..e0ac206 100644 --- a/modules/osm/location-osm-geocode.h +++ b/modules/osm/location-osm-geocode.h @@ -1,10 +1,10 @@ /* * location-module * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2010-2013 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Youngae Kang , Yunhan Kim , - * Genie Kim , Minjune Kim + * Contact: Youngae Kang , Minjune Kim + * Genie Kim * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/osm/location-osm-poi.c b/modules/osm/location-osm-poi.c index 8c7e511..349fcb9 100644 --- a/modules/osm/location-osm-poi.c +++ b/modules/osm/location-osm-poi.c @@ -1,10 +1,10 @@ /* * location-module * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2010-2013 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Youngae Kang , Yunhan Kim , - * Genie Kim , Minjune Kim + * Contact: Youngae Kang , Minjune Kim + * Genie Kim * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/osm/location-osm-poi.h b/modules/osm/location-osm-poi.h index 27dfddc..ee74286 100644 --- a/modules/osm/location-osm-poi.h +++ b/modules/osm/location-osm-poi.h @@ -1,10 +1,10 @@ /* * location-module * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2010-2013 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Youngae Kang , Yunhan Kim , - * Genie Kim , Minjune Kim + * Contact: Youngae Kang , Minjune Kim + * Genie Kim * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/osm/location-osm-route.c b/modules/osm/location-osm-route.c index cc57c64..496f99b 100644 --- a/modules/osm/location-osm-route.c +++ b/modules/osm/location-osm-route.c @@ -1,10 +1,10 @@ /* * location-module * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2010-2013 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Youngae Kang , Yunhan Kim , - * Genie Kim , Minjune Kim + * Contact: Youngae Kang , Minjune Kim + * Genie Kim * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/osm/location-osm-route.h b/modules/osm/location-osm-route.h index 944af90..0fa1c22 100644 --- a/modules/osm/location-osm-route.h +++ b/modules/osm/location-osm-route.h @@ -1,10 +1,10 @@ /* * location-module * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2010-2013 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Youngae Kang , Yunhan Kim , - * Genie Kim , Minjune Kim + * Contact: Youngae Kang , Minjune Kim + * Genie Kim * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/osm/location-osm.c b/modules/osm/location-osm.c index 19dac0d..6d836f9 100644 --- a/modules/osm/location-osm.c +++ b/modules/osm/location-osm.c @@ -22,7 +22,10 @@ #include #include +#include +#include #include +#include #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); } diff --git a/modules/osm/location-osm.h b/modules/osm/location-osm.h index 9f66af4..1d55dc1 100644 --- a/modules/osm/location-osm.h +++ b/modules/osm/location-osm.h @@ -1,10 +1,10 @@ /* * location-module * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2010-2013 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Youngae Kang , Yunhan Kim , - * Genie Kim , Minjune Kim + * Contact: Youngae Kang , Minjune Kim + * Genie Kim * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/osm/osm-http.c b/modules/osm/osm-http.c index 40a8c30..b91840a 100644 --- a/modules/osm/osm-http.c +++ b/modules/osm/osm-http.c @@ -1,10 +1,10 @@ /* * location-module * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2010-2013 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Youngae Kang , Yunhan Kim , - * Genie Kim , Minjune Kim + * Contact: Youngae Kang , Minjune Kim + * Genie Kim * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/osm/osm-http.h b/modules/osm/osm-http.h index 6621497..8582488 100644 --- a/modules/osm/osm-http.h +++ b/modules/osm/osm-http.h @@ -1,10 +1,10 @@ /* * location-module * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2010-2013 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Youngae Kang , Yunhan Kim , - * Genie Kim , Minjune Kim + * Contact: Youngae Kang , Minjune Kim + * Genie Kim * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/osm/osm-route-yours.c b/modules/osm/osm-route-yours.c index 13560f6..dfbf3fa 100644 --- a/modules/osm/osm-route-yours.c +++ b/modules/osm/osm-route-yours.c @@ -1,10 +1,10 @@ /* * location-module * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2010-2013 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Youngae Kang , Yunhan Kim , - * Genie Kim , Minjune Kim + * Contact: Youngae Kang , Minjune Kim + * Genie Kim * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/osm/osm-route-yours.h b/modules/osm/osm-route-yours.h index 11c4f69..7b8512d 100644 --- a/modules/osm/osm-route-yours.h +++ b/modules/osm/osm-route-yours.h @@ -1,10 +1,10 @@ /* * location-module * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2010-2013 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Youngae Kang , Yunhan Kim , - * Genie Kim , Minjune Kim + * Contact: Youngae Kang , Minjune Kim + * Genie Kim * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/packaging/location-module.spec b/packaging/location-module.spec index 3189040..687d6e1 100755 --- a/packaging/location-module.spec +++ b/packaging/location-module.spec @@ -1,7 +1,7 @@ Name: location-module Summary: Location module -Version: 0.1.20 -Release: 5 +Version: 0.1.22 +Release: 1 Group: System/Libraries License: Apache Licensc, Version 2.0 Source0: %{name}-%{version}.tar.gz -- 2.7.4