summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorSanjeev BA <iamsanjeev@gmail.com>2012-03-20 07:37:59 +0000
committerSanjeev BA <iamsanjeev@gmail.com>2012-03-20 07:37:59 +0000
commit97eddff84d7c3ff1dd7b7c747174f60ff6323389 (patch)
treedc159437b88932fe8657ed9f59c66a59230740a3 /src/bin
parent9b53a091505a273f00a59d9352068e13e5c146db (diff)
elm_map - Bug fix and cleanup.
Author : Bluezery <ohpowel@gmail.com> SVN revision: 69519
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/test_map.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/bin/test_map.c b/src/bin/test_map.c
index 9f4302bc8..5a9f96750 100644
--- a/src/bin/test_map.c
+++ b/src/bin/test_map.c
@@ -90,7 +90,7 @@ _map_clicked_double(void *data __UNUSED__, Evas_Object *obj, void *event_info)
90{ 90{
91 printf("clicked,double\n"); 91 printf("clicked,double\n");
92 double lon, lat; 92 double lon, lat;
93 Evas_Event_Mouse_Down *down = (Evas_Event_Mouse_Down *)event_info; 93 Evas_Event_Mouse_Down *down = event_info;
94 if (!down) return; 94 if (!down) return;
95 if (elm_map_zoom_get(obj) < 5) return; 95 if (elm_map_zoom_get(obj) < 5) return;
96 96
@@ -108,6 +108,7 @@ _map_clicked_double(void *data __UNUSED__, Evas_Object *obj, void *event_info)
108 { 108 {
109 elm_map_overlay_del(route_start); 109 elm_map_overlay_del(route_start);
110 elm_map_overlay_del(route_end); 110 elm_map_overlay_del(route_end);
111 elm_map_route_del(route);
111 route_start = NULL; 112 route_start = NULL;
112 route_end = NULL; 113 route_end = NULL;
113 route = NULL; 114 route = NULL;
@@ -298,17 +299,16 @@ _map_name_loaded_fail(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *
298static void 299static void
299map_show_urmatt(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 300map_show_urmatt(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
300{ 301{
301 Eina_Bool b = elm_map_paused_get(data);
302 elm_map_paused_set(data, EINA_TRUE);
303 elm_map_zoom_mode_set(data, ELM_MAP_ZOOM_MODE_MANUAL); 302 elm_map_zoom_mode_set(data, ELM_MAP_ZOOM_MODE_MANUAL);
303 if (elm_map_zoom_get(data) < 12) elm_map_zoom_set(data, 12);
304 elm_map_region_show(data,7.325201, 48.526813); 304 elm_map_region_show(data,7.325201, 48.526813);
305 elm_map_zoom_set(data, 12);
306 elm_map_paused_set(data, b);
307} 305}
308 306
309static void 307static void
310map_bring_seoul(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 308map_bring_seoul(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
311{ 309{
310 elm_map_zoom_mode_set(data, ELM_MAP_ZOOM_MODE_MANUAL);
311 if (elm_map_zoom_get(data) < 12) elm_map_zoom_set(data, 12);
312 elm_map_region_bring_in(data, 126.977969, 37.566535); 312 elm_map_region_bring_in(data, 126.977969, 37.566535);
313} 313}
314 314
@@ -543,7 +543,7 @@ my_map_entry_activated(void *data, Evas_Object *obj, void *event_info __UNUSED__
543{ 543{
544 const char *s = elm_scrolled_entry_entry_get(obj); 544 const char *s = elm_scrolled_entry_entry_get(obj);
545 char *addr = strdup(s); 545 char *addr = strdup(s);
546 name = elm_map_name_geo_request(data, addr); 546 name = elm_map_name_add(data, addr, 0, 0, NULL, NULL);
547 if (addr) free (addr); 547 if (addr) free (addr);
548} 548}
549*/ 549*/