From 77788cc1f59451aadd88ec08ccb78f1ab9121cdc Mon Sep 17 00:00:00 2001 From: Kim Kibum Date: Sun, 29 Apr 2012 17:01:32 +0900 Subject: [PATCH] upload tizen1.0 source --- debian/changelog | 68 +++++++++++-------- debian/location-geoclue-nominatim.install.in | 2 +- modules/Makefile.am | 10 +-- modules/geoclue-gpsd.c | 0 modules/geoclue-nominatim.c | 98 +++++++++++++++++++++++++++- packaging/location-module.spec | 17 ++--- 6 files changed, 153 insertions(+), 42 deletions(-) mode change 100755 => 100644 modules/Makefile.am mode change 100755 => 100644 modules/geoclue-gpsd.c diff --git a/debian/changelog b/debian/changelog index b37c2ed..211d97e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,31 @@ +location-module (0.1.18-4) unstable; urgency=low + + * Define Capability API proto. + * Git: pkgs/l/location-module + * 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 + * Git: pkgs/l/location-module + * 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 - * rollback - * Git: slp/pkgs/l/location-module + * Change lib name to libmap-service + * Git: pkgs/l/location-module * Tag: location-module_0.1.18-2 - -- Minjune Kim Thu, 23 Feb 2012 14:25:43 +0900 + -- Genie Kim Fri, 17 Feb 2012 21:36:20 +0900 location-module (0.1.18-1) unstable; urgency=low * remove location-geoclue-gpsd - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.18-1 -- Genie Kim Fri, 10 Feb 2012 16:18:30 +0900 @@ -17,7 +33,7 @@ location-module (0.1.18-1) unstable; urgency=low location-module (0.1.17-1) unstable; urgency=low * Support multiple result of geocode but it is workaround. - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.17-1 -- Minjune Kim Thu, 09 Feb 2012 11:46:50 +0900 @@ -25,7 +41,7 @@ location-module (0.1.17-1) unstable; urgency=low location-module (0.1.16-4) unstable; urgency=low * Modify lib path on postinst - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.16-4 -- Minjune Kim Wed, 01 Feb 2012 14:26:56 +0900 @@ -33,7 +49,7 @@ location-module (0.1.16-4) unstable; urgency=low location-module (0.1.16-3) unstable; urgency=low * Fix bug while using WPS module. - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.16-3 -- Minjune Kim Mon, 19 Dec 2011 18:59:35 +0900 @@ -41,7 +57,7 @@ location-module (0.1.16-3) unstable; urgency=low location-module (0.1.16-2) unstable; urgency=low * generate link file to support wps method on SDK. - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.16-2 -- Minjune Kim Fri, 09 Dec 2011 20:15:04 +0900 @@ -49,7 +65,7 @@ location-module (0.1.16-2) unstable; urgency=low location-module (0.1.16-1) unstable; urgency=low * add geoclue gpsd module - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.16-1 -- Genie Kim Wed, 07 Dec 2011 16:50:31 +0900 @@ -57,7 +73,7 @@ location-module (0.1.16-1) unstable; urgency=low location-module (0.1.15-1) unstable; urgency=low * remove not using packages(hostip/opencellid) - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.15-1 -- Genie Kim Tue, 06 Dec 2011 22:40:14 +0900 @@ -65,7 +81,7 @@ location-module (0.1.15-1) unstable; urgency=low location-module (0.1.14-1) unstable; urgency=low * move gpsd module to geoclue-providers for last knonw position - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.14-1 -- Genie Kim Sat, 26 Nov 2011 12:17:29 +0900 @@ -73,7 +89,7 @@ location-module (0.1.14-1) unstable; urgency=low location-module (0.1.13-1) unstable; urgency=low * use time_t for timestamp - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.13-1 -- Genie Kim Mon, 17 Oct 2011 13:36:42 +0900 @@ -81,7 +97,7 @@ location-module (0.1.13-1) unstable; urgency=low location-module (0.1.12-1) unstable; urgency=low * fixed BS about gmtime_r() - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.12-1 -- Genie Kim Thu, 01 Sep 2011 14:04:33 +0900 @@ -89,7 +105,7 @@ location-module (0.1.12-1) unstable; urgency=low location-module (0.1.11-1) unstable; urgency=low * fixed prevent defect - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.11-1 -- Genie Kim Fri, 26 Aug 2011 13:38:29 +0900 @@ -97,7 +113,7 @@ location-module (0.1.11-1) unstable; urgency=low location-module (0.1.10-2) unstable; urgency=low * change boilerplate - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.10-2 -- Genie Kim Wed, 20 Jul 2011 17:52:15 +0900 @@ -105,7 +121,7 @@ location-module (0.1.10-2) unstable; urgency=low location-module (0.1.10-1) unstable; urgency=low * Package: Release new location-geoclue-nominatim package - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.10-1 -- Tae-Hwan Kim Wed, 01 Jun 2011 21:14:33 +0900 @@ -113,7 +129,7 @@ location-module (0.1.10-1) unstable; urgency=low location-module (0.1.9-1) unstable; urgency=low * Remove callbacks when location stops - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.9-1 -- Tae-Hwan Kim Fri, 13 May 2011 19:28:42 +0900 @@ -121,7 +137,7 @@ location-module (0.1.9-1) unstable; urgency=low location-module (0.1.8-2) unstable; urgency=low * Apply New Location APIs - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.8-2 -- Tae-Hwan Kim Wed, 20 Apr 2011 11:16:12 +0900 @@ -129,7 +145,7 @@ location-module (0.1.8-2) unstable; urgency=low location-module (0.1.7-1) unstable; urgency=low * Fix depends & timestamp - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.7-1 -- Tae-Hwan Kim Wed, 16 Feb 2011 21:02:21 +0900 @@ -137,7 +153,7 @@ location-module (0.1.7-1) unstable; urgency=low location-module (0.1.6-1) unstable; urgency=low * Add geoclue-hostip module & geoclue-opencellid & geoclue-opencellid module - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.6-1 -- Tae-Hwan Kim Wed, 19 Jan 2011 13:32:18 +0900 @@ -145,7 +161,7 @@ location-module (0.1.6-1) unstable; urgency=low location-module (0.1.5-1) unstable; urgency=low * Adapt to plug change again - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.5-1 -- Tae-Hwan Kim Tue, 21 Dec 2010 17:31:07 +0900 @@ -153,7 +169,7 @@ location-module (0.1.5-1) unstable; urgency=low location-module (0.1.4-0) unstable; urgency=low * Adapt to plugin change - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.4-0 -- Tae-Hwan Kim Mon, 13 Dec 2010 10:32:35 +0900 @@ -161,7 +177,7 @@ location-module (0.1.4-0) unstable; urgency=low location-module (0.1.3-0) unstable; urgency=low * Initialize is_started to FALSE - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.3-0 -- Tae-Hwan Kim Thu, 02 Dec 2010 13:36:02 +0900 @@ -169,7 +185,7 @@ location-module (0.1.3-0) unstable; urgency=low location-module (0.1.2-0) unstable; urgency=low * Prevent duplicate start - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.2-0 -- Tae-Hwan Kim Mon, 29 Nov 2010 11:17:46 +0900 @@ -177,7 +193,7 @@ location-module (0.1.2-0) unstable; urgency=low location-module (0.1.1-0) unstable; urgency=low * Add debug pkg & disable geoclue-skyhook - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.1-0 -- Tae-Hwan Kim Wed, 24 Nov 2010 22:21:17 +0900 @@ -185,7 +201,7 @@ location-module (0.1.1-0) unstable; urgency=low location-module (0.1.0-1) unstable; urgency=low * Initial release - * Git: slp/pkgs/l/location-module + * Git: pkgs/l/location-module * Tag: location-module_0.1.0-1 -- Tae-Hwan Kim Tue, 02 Nov 2010 20:10:07 +0900 diff --git a/debian/location-geoclue-nominatim.install.in b/debian/location-geoclue-nominatim.install.in index 2ede3ae..1079b73 100644 --- a/debian/location-geoclue-nominatim.install.in +++ b/debian/location-geoclue-nominatim.install.in @@ -1 +1 @@ -@PREFIX@/lib/location/module/libgeocode0.so* +@PREFIX@/lib/location/module/libmap-service0.so* diff --git a/modules/Makefile.am b/modules/Makefile.am old mode 100755 new mode 100644 index 51beb47..6cd1d91 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -1,10 +1,10 @@ pkgdir = $(libdir)/location/module -pkg_LTLIBRARIES = libgeocode0.la +pkg_LTLIBRARIES = libmap-service0.la -# geoclue nominatim plugin -libgeocode0_la_SOURCES = geoclue-nominatim.c $(utility) -libgeocode0_la_CFLAGS = \ +# map-serivce nominatim plugin +libmap_service0_la_SOURCES = geoclue-nominatim.c $(utility) +libmap_service0_la_CFLAGS = \ -fPIC\ $(MODULE_CFLAGS) -libgeocode0_la_LIBADD = \ +libmap_service0_la_LIBADD = \ $(MODULE_LIBS) diff --git a/modules/geoclue-gpsd.c b/modules/geoclue-gpsd.c old mode 100755 new mode 100644 diff --git a/modules/geoclue-nominatim.c b/modules/geoclue-nominatim.c index 2a10156..dafc6ee 100644 --- a/modules/geoclue-nominatim.c +++ b/modules/geoclue-nominatim.c @@ -226,7 +226,7 @@ static void position_cb (GeoclueGeocode *geocode, data->pos_cb (err, pos_list, acc_list, data->userdata); if (pos_list) g_list_free_full(pos_list, _free_pos_list_item); - if (acc_list) g_list_free_full(pos_list, _free_acc_list_item); + if (acc_list) g_list_free_full(acc_list, _free_acc_list_item); g_free (data); } @@ -447,6 +447,90 @@ get_reverse_geocode_async (gpointer handle, } static int +search_poi (gpointer handle, + const LocationPOIFilter *filter, + const LocationPosition *position, + const LocationPreference *svc_pref, + const LocationPOIPreference *pref, + LocationPOICB cb, const gpointer user_data, guint * req_id) +{ + return LOCATION_ERROR_NOT_SUPPORTED; +} + +static int +search_poi_by_area (gpointer handle, + const LocationPOIFilter *filter, + const LocationBoundary *boundary, + const LocationPreference *svc_pref, + const LocationPOIPreference *pref, + LocationPOICB cb, const gpointer user_data, guint * req_id) +{ + return LOCATION_ERROR_NOT_SUPPORTED; +} + +static int +search_poi_by_address (gpointer handle, + const LocationPOIFilter *filter, + const LocationAddress *address, + const LocationPreference *svc_pref, + const LocationPOIPreference *pref, + LocationPOICB cb, const gpointer user_data, guint * req_id) +{ + return LOCATION_ERROR_NOT_SUPPORTED; +} + +static int +search_poi_by_freeform (gpointer handle, + const LocationPOIFilter * filter, + const gchar *freeform, + const LocationPreference *svc_pref, + const LocationPOIPreference *pref, + LocationPOICB cb, const gpointer user_data, guint *req_id) +{ + return LOCATION_ERROR_NOT_SUPPORTED; +} + +static int +cancel_poi_request (gpointer handle, guint req_id) +{ + return LOCATION_ERROR_NOT_SUPPORTED; +} + +static int +request_route (gpointer handle, + const LocationPosition *origin, + const LocationPosition *destination, + GList *waypoint, + const LocationPreference *svc_pref, + const LocationRoutePreference *pref, + LocationRouteCB cb, const gpointer user_data, guint * req_id) +{ + return LOCATION_ERROR_NOT_SUPPORTED; +} + +static int +cancel_route_request (gpointer handle, guint req_id) +{ + return LOCATION_ERROR_NOT_SUPPORTED; +} + +static gboolean +is_supported_map_provider_capability (gpointer handle, + LocationMapServiceType type) +{ + return FALSE; +} + +static int +get_map_provider_capability_key (gpointer handle, + LocationMapServiceType type, GList **key) +{ + g_return_val_if_fail (key, LOCATION_ERROR_PARAMETER); + *key = NULL; + return LOCATION_ERROR_NOT_SUPPORTED; +} + +static int get_service_name (gpointer handle, gchar **service_name) { @@ -458,7 +542,7 @@ get_service_name (gpointer handle, } LOCATION_MODULE_API gpointer -init (LocModGeoOps* ops) +init (LocModServiceOps* ops) { MOD_LOGD("init"); g_return_val_if_fail(ops, NULL); @@ -475,6 +559,16 @@ init (LocModGeoOps* ops) ops->get_geocode_async = get_geocode_async; ops->get_geocode_freetext_async = get_geocode_freetext_async; ops->get_reverse_geocode_async = get_reverse_geocode_async; + ops->search_poi = search_poi; + ops->search_poi_by_area = search_poi_by_area; + ops->search_poi_by_address = search_poi_by_address; + ops->search_poi_by_freeform = search_poi_by_freeform; + ops->cancel_poi_request = cancel_poi_request; + ops->request_route = request_route; + ops->cancel_route_request = cancel_route_request; + ops->is_supported_map_provider_capability = is_supported_map_provider_capability; + ops->get_map_provider_capability_key = get_map_provider_capability_key; + return (gpointer)handle; } diff --git a/packaging/location-module.spec b/packaging/location-module.spec index 1364a92..ec34a50 100755 --- a/packaging/location-module.spec +++ b/packaging/location-module.spec @@ -1,11 +1,12 @@ Name: location-module Summary: Location module Version: 0.1.18 -Release: 5 +Release: 4 Group: Libraries License: Apache-2.0 Source0: %{name}-%{version}.tar.gz BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(location) BuildRequires: pkgconfig(geoclue) BuildRequires: pkgconfig(vconf) @@ -16,27 +17,27 @@ Location module %package -n location-geoclue-nominatim -Summary: geoclue-nominatim geocode module for location +Summary: geoclue-nominatim map-service module for location Group: TO_BE/FILLED_IN %description -n location-geoclue-nominatim -geoclue-nominatim geocode module for location - +geoclue-nominatim map-service module for location %prep %setup -q %build ./autogen.sh -%configure --prefix=$(PREFIX) --enable-dlog --enable-debug +%configure --prefix=%{_prefix} --enable-dlog --enable-debug make %{?jobs:-j%jobs} %install +rm -rf %{buildroot} %make_install - %files -n location-geoclue-nominatim -%{_libdir}/location/module/libgeocode0.so -%{_libdir}/location/module/libgeocode0.so.* +%defattr(-,root,root,-) +%{_libdir}/location/module/libmap-service0.so +%{_libdir}/location/module/libmap-service0.so.* -- 2.7.4