From e6bd05ef1a9bdd9dfa42ac19eca748e75423ee40 Mon Sep 17 00:00:00 2001 From: jypark Date: Sat, 10 Mar 2012 10:07:27 +0000 Subject: [PATCH] remove code related with ELM_MAP_ROUTE_SOURCE_ elm_map_utils_rotate_coord elm_map_utils_convert_ elm_map_utils_downloading_status_get elm_map_canvas_to_geo_convert elm_map_geo_region_ elm_map_source_zoom_ elm_map_source_name elm_map_route_source elm_map_max_marker_per elm_map_paused_markers elm_map_name_remove which was deprecated git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@69167 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- doc/examples.dox | 2 +- src/bin/test_map.c | 2 +- src/lib/elm_map.c | 200 ----------------------------------------------------- src/lib/elm_map.h | 16 ++--- 4 files changed, 10 insertions(+), 210 deletions(-) diff --git a/doc/examples.dox b/doc/examples.dox index 6fb1b51..05c65bc 100644 --- a/doc/examples.dox +++ b/doc/examples.dox @@ -2096,7 +2096,7 @@ * conversion * util functions, so we could get coordinates for this address. These * functions return an #Elm_Map_Name handle for us. - * Function elm_map_utils_convert_name_into_coord() will do this job for us, + * Function elm_map_name_geo_request() will do this job for us, * but it's an assyncronous function, since it requires this * information from the server. * diff --git a/src/bin/test_map.c b/src/bin/test_map.c index d6c25bd..9f4302b 100644 --- a/src/bin/test_map.c +++ b/src/bin/test_map.c @@ -543,7 +543,7 @@ my_map_entry_activated(void *data, Evas_Object *obj, void *event_info __UNUSED__ { const char *s = elm_scrolled_entry_entry_get(obj); char *addr = strdup(s); - name = elm_map_utils_convert_name_into_coord(data, addr); + name = elm_map_name_geo_request(data, addr); if (addr) free (addr); } */ diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c index 7ce92c0..f466b7a 100644 --- a/src/lib/elm_map.c +++ b/src/lib/elm_map.c @@ -5709,127 +5709,6 @@ elm_map_track_remove(Evas_Object *obj __UNUSED__, Evas_Object *route __UNUSED__) #endif /************************* Belows are deprecated APIs *************************/ -EAPI void -elm_map_source_zoom_max_set(Evas_Object *obj, int zoom) -{ - elm_map_zoom_max_set(obj, zoom); -} - -EAPI int -elm_map_source_zoom_max_get(const Evas_Object *obj) -{ - return elm_map_zoom_max_get(obj); -} - -EAPI void -elm_map_source_zoom_min_set(Evas_Object *obj, int zoom) -{ - elm_map_zoom_min_set(obj, zoom); -} - -EAPI int -elm_map_source_zoom_min_get(const Evas_Object *obj) -{ - return elm_map_zoom_min_get(obj); -} - -EAPI void -elm_map_utils_convert_coord_into_geo(const Evas_Object *obj, int x, int y, int size, double *lon, double *lat) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - EINA_SAFETY_ON_NULL_RETURN(wd); - - _coord_to_region_convert(wd, x, y, size, lon, lat); -#else - (void) obj; - (void) x; - (void) y; - (void) size; - (void) lon; - (void) lat; -#endif -} - -EAPI void -elm_map_utils_convert_geo_into_coord(const Evas_Object *obj, double lon, double lat, int size, int *x, int *y) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - EINA_SAFETY_ON_NULL_RETURN(wd); - - _region_to_coord_convert(wd, lon, lat, size, x, y); -#else - (void) obj; - (void) lon; - (void) lat; - (void) size; - (void) x; - (void) y; -#endif -} - -EAPI void -elm_map_utils_rotate_coord(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord cx, const Evas_Coord cy, double degree, Evas_Coord *xx, Evas_Coord *yy) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - ELM_CHECK_WIDTYPE(obj, widtype); - _coord_rotate(x, y, cx, cy, degree, xx, yy); -#else - (void) x; - (void) y; - (void) cx; - (void) cy; - (void) degree; - (void) xx; - (void) yy; -#endif -} - -EAPI void -elm_map_utils_downloading_status_get(const Evas_Object *obj, int *try_num, int *finish_num) -{ - elm_map_tile_load_status_get(obj, try_num, finish_num); -} - -EAPI void -elm_map_geo_region_bring_in(Evas_Object *obj, double lon, double lat) -{ - elm_map_region_bring_in(obj, lon, lat); -} - -EAPI void -elm_map_geo_region_show(Evas_Object *obj, double lon, double lat) -{ - elm_map_region_show(obj, lon, lat); -} - -EAPI void -elm_map_geo_region_get(const Evas_Object *obj, double *lon, double *lat) -{ - elm_map_region_get(obj, lon, lat); -} - -EAPI Elm_Map_Name * -elm_map_utils_convert_coord_into_name(const Evas_Object *obj, double lon, double lat) -{ - return elm_map_name_add(obj, NULL, lon, lat, NULL, NULL); -} - -EAPI Elm_Map_Name * -elm_map_utils_convert_name_into_coord(const Evas_Object *obj, char *address) -{ - return elm_map_name_add(obj, address, 0, 0, NULL, NULL); -} - -EAPI void -elm_map_canvas_to_geo_convert(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, double *lon, double *lat) -{ - elm_map_canvas_to_region_convert(obj, x, y, lon, lat); -} - EAPI Elm_Map_Marker * elm_map_marker_add(Evas_Object *obj, double lon, double lat, Elm_Map_Marker_Class *clas, Elm_Map_Group_Class *group_clas, void *data) { @@ -5941,52 +5820,6 @@ elm_map_markers_list_show(Eina_List *markers) #endif } -EAPI void -elm_map_paused_markers_set(Evas_Object *obj, Eina_Bool paused) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - EINA_SAFETY_ON_NULL_RETURN(wd); - - if (wd->paused_markers == !!paused) return; - wd->paused_markers = paused; -#else - (void) obj; - (void) paused; -#endif -} - -EAPI Eina_Bool -elm_map_paused_markers_get(const Evas_Object *obj) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(obj); - EINA_SAFETY_ON_NULL_RETURN_VAL(wd, EINA_FALSE); - - return wd->paused_markers; -#else - (void) obj; - return EINA_FALSE; -#endif -} - -EAPI void -elm_map_max_marker_per_group_set(Evas_Object *obj, int max) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - EINA_SAFETY_ON_NULL_RETURN(wd); - - wd->markers_max_num = max; -#else - (void) obj; - (void) max; -#endif -} - EAPI Evas_Object * elm_map_marker_object_get(const Elm_Map_Marker *marker) { @@ -6013,32 +5846,6 @@ elm_map_marker_update(Elm_Map_Marker *marker) #endif } -EAPI void -elm_map_bubbles_close(Evas_Object *obj) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - EINA_SAFETY_ON_NULL_RETURN(wd); - - Eina_List *l; - Elm_Map_Marker *marker; - EINA_LIST_FOREACH(wd->markers, l, marker) - { - if (marker->bubble) _bubble_free(marker->bubble); - marker->bubble = NULL; - - if (marker->group) - { - if (marker->group->bubble) _bubble_free(marker->group->bubble); - marker->group->bubble = NULL; - } - } -#else - (void) obj; -#endif -} - EAPI Elm_Map_Group_Class * elm_map_group_class_new(Evas_Object *obj) { @@ -6224,10 +6031,3 @@ elm_map_route_remove(Elm_Map_Route *route) { elm_map_route_del(route); } - -EAPI void -elm_map_name_remove(Elm_Map_Name *name) -{ - elm_map_name_del(name); -} - diff --git a/src/lib/elm_map.h b/src/lib/elm_map.h index b56c2d8..03e827f 100644 --- a/src/lib/elm_map.h +++ b/src/lib/elm_map.h @@ -1213,7 +1213,7 @@ EAPI const char *elm_map_source_get(const Evas_Object *obj, Elm_Map_So * * A route will be traced by point on coordinates (@p flat, @p flon) * to point on coordinates (@p tlat, @p tlon), using the route service - * set with elm_map_route_source_set(). + * set with elm_map_source_set(). * * It will take @p type on consideration to define the route, * depending if the user will be walking or driving, the route may vary. @@ -1231,7 +1231,7 @@ EAPI const char *elm_map_source_get(const Evas_Object *obj, Elm_Map_So * @see elm_map_route_remove() * @see elm_map_route_color_set() * @see elm_map_route_distance_get() - * @see elm_map_route_source_set() + * @see elm_map_source_set() * * @ingroup Map */ @@ -1313,8 +1313,8 @@ EAPI Elm_Map_Name *elm_map_name_add(const Evas_Object *obj, const char * * This gets the coordinates of the @p name, created with one of the * conversion functions. * - * @see elm_map_utils_convert_name_into_coord() - * @see elm_map_utils_convert_coord_into_name() + * @see elm_map_name_geo_request() + * @see elm_map_name_add() * * @ingroup Map */ @@ -1330,8 +1330,8 @@ EAPI const char *elm_map_name_address_get(const Elm_Map_Name *name); * This gets the coordinates of the @p name, created with one of the * conversion functions. * - * @see elm_map_utils_convert_name_into_coord() - * @see elm_map_utils_convert_coord_into_name() + * @see elm_map_name_geo_request() + * @see elm_map_name_add() * * @ingroup Map */ @@ -1345,8 +1345,8 @@ EAPI void elm_map_name_region_get(const Elm_Map_Name *name, dou * Basically the struct handled by @p name will be freed, so conversions * between address and coordinates will be lost. * - * @see elm_map_utils_convert_name_into_coord() - * @see elm_map_utils_convert_coord_into_name() + * @see elm_map_name_geo_request() + * @see elm_map_name_add() * * @ingroup Map */ -- 2.7.4