Fix conflicts: Map, Hover, Hoversel, Menu, Web
[framework/uifw/elementary.git] / src / bin / test_map.c
index da1c7d1..d6c25bd 100644 (file)
@@ -8,17 +8,10 @@
 #define MARKER_MAX 1000
 #define NAME_ENTRY_TEXT "Enter freeform address"
 
-<<<<<<< HEAD
-typedef struct Marker_Data
-{
-   const char *file;
-} Marker_Data;
-=======
 typedef struct Overlay_Data
 {
    const char *file;
 } Overlay_Data;
->>>>>>> remotes/origin/upstream
 
 typedef struct Map_Source
 {
@@ -26,15 +19,6 @@ typedef struct Map_Source
    char *source_name;
 } Map_Source;
 
-<<<<<<< HEAD
-static Elm_Map_Marker_Class *itc1, *itc2, *itc_parking;
-static Elm_Map_Group_Class *itc_group1, *itc_group2, *itc_group_parking;
-
-static Evas_Object *rect, *menu, *fs_win;
-static int nb_elts;
-/*static Elm_Map_Marker *markers[MARKER_MAX];*/
-static Elm_Map_Marker *route_from, *route_to;
-=======
 Overlay_Data data1 = {PACKAGE_DATA_DIR"/images/logo.png"};
 Overlay_Data data2 = {PACKAGE_DATA_DIR"/images/logo_small.png"};
 Overlay_Data data3 = {PACKAGE_DATA_DIR"/images/panel_01.jpg"};
@@ -55,7 +39,6 @@ static Elm_Map_Overlay *bubble_parking;
 static Elm_Map_Overlay *route_ovl;
 
 static Evas_Object *menu, *fs_win;
->>>>>>> remotes/origin/upstream
 static Elm_Map_Route *route;
 static Elm_Map_Name *name;
 static Evas_Object *track;
@@ -64,26 +47,6 @@ static Evas_Coord old_x, old_y;
 static Evas_Coord old_d;
 static Map_Source ms[SOURCE_MAX];
 
-<<<<<<< HEAD
-Marker_Data data1 = {PACKAGE_DATA_DIR"/images/logo.png"};
-Marker_Data data2 = {PACKAGE_DATA_DIR"/images/logo_small.png"};
-Marker_Data data3 = {PACKAGE_DATA_DIR"/images/panel_01.jpg"};
-Marker_Data data4 = {PACKAGE_DATA_DIR"/images/plant_01.jpg"};
-Marker_Data data5 = {PACKAGE_DATA_DIR"/images/rock_01.jpg"};
-Marker_Data data6 = {PACKAGE_DATA_DIR"/images/rock_02.jpg"};
-Marker_Data data7 = {PACKAGE_DATA_DIR"/images/sky_01.jpg"};
-Marker_Data data8 = {PACKAGE_DATA_DIR"/images/sky_02.jpg"};
-Marker_Data data9 = {PACKAGE_DATA_DIR"/images/sky_03.jpg"};
-Marker_Data data10 = {PACKAGE_DATA_DIR"/images/sky_03.jpg"};
-Marker_Data data11= {PACKAGE_DATA_DIR"/images/wood_01.jpg"};
-
-Marker_Data data_parking= {PACKAGE_DATA_DIR"/images/parking.png"};
-
-static Evas_Object * _marker_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data);
-static Evas_Object * _group_icon_get(Evas_Object *obj, void *data);
-
-=======
->>>>>>> remotes/origin/upstream
 static void
 #ifdef ELM_EMAP
 my_map_gpx_fileselector_done(void *data, Evas_Object *obj __UNUSED__, void *event_info)
@@ -106,40 +69,6 @@ my_map_gpx_fileselector_done(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
    evas_object_del(fs_win);
 }
 
-<<<<<<< HEAD
-static void
-my_map_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   printf("clicked\n");
-}
-
-static void
-my_map_press(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   printf("press\n");
-}
-
-static void
-my_map_longpressed(void *data __UNUSED__, Evas_Object *obj, void *event_info)
-{
-   printf("longpressed\n");
-   double lon, lat;
-   Evas_Event_Mouse_Down *down = (Evas_Event_Mouse_Down *)event_info;
-   if (!down) return;
-   if (elm_map_zoom_get(obj) < 5) return;
-
-   elm_map_canvas_to_geo_convert(obj, down->canvas.x, down->canvas.y, &lon, &lat);
-   printf("x:%d, y:%d, lon:%lf, lat:%lf\n", down->canvas.x, down->canvas.y, lon, lat);
-   name = elm_map_utils_convert_coord_into_name(obj, lon, lat);
-}
-
-static void
-my_map_clicked_double(void *data __UNUSED__, Evas_Object *obj, void *event_info)
-{
-   printf("clicked,double\n");
-   double lon, lat;
-   double flon, flat, tlon, tlat;
-=======
 static Evas_Object *
 _route_icon_get(Evas_Object *obj)
 {
@@ -161,43 +90,10 @@ _map_clicked_double(void *data __UNUSED__, Evas_Object *obj, void *event_info)
 {
    printf("clicked,double\n");
    double lon, lat;
->>>>>>> remotes/origin/upstream
    Evas_Event_Mouse_Down *down = (Evas_Event_Mouse_Down *)event_info;
    if (!down) return;
    if (elm_map_zoom_get(obj) < 5) return;
 
-<<<<<<< HEAD
-   elm_map_canvas_to_geo_convert(obj, down->canvas.x, down->canvas.y, &lon, &lat);
-   printf("x:%d, y:%d, lon:%lf, lat:%lf\n", down->canvas.x, down->canvas.y, lon, lat);
-   itc1 = elm_map_marker_class_new(obj);
-
-   elm_map_marker_class_del_cb_set(itc1, NULL);
-
-   itc_group1 = elm_map_group_class_new(obj);
-   elm_map_group_class_icon_cb_set(itc_group1, _group_icon_get);
-   elm_map_group_class_data_set(itc_group1, (void *)PACKAGE_DATA_DIR"/images/bubble.png");
-   elm_map_group_class_style_set(itc_group1, "empty");
-   elm_map_group_class_zoom_displayed_set(itc_group1, 5);
-
-   if (route_from && route_to)
-     {
-        elm_map_marker_remove(route_from);
-        route_from = NULL;
-        elm_map_marker_remove(route_to);
-        route_to = NULL;
-        elm_map_route_remove(route);
-     }
-
-   if (!route_from) route_from = elm_map_marker_add(obj, lon, lat, itc1, itc_group1, NULL);
-   else route_to = elm_map_marker_add(obj, lon, lat, itc1, itc_group1, NULL);
-
-   if (route_from && route_to)
-     {
-        elm_map_marker_region_get(route_from, &flon, &flat);
-        elm_map_marker_region_get(route_to, &tlon, &tlat);
-        route = elm_map_route_add(obj, ELM_MAP_ROUTE_TYPE_MOTOCAR, ELM_MAP_ROUTE_METHOD_FASTEST, flon, flat, tlon, tlat);
-        elm_map_route_color_set(route, 255, 0, 0, 255);
-=======
    elm_map_canvas_to_region_convert(obj, down->canvas.x, down->canvas.y, &lon, &lat);
    printf("x:%d, y:%d, lon:%lf, lat:%lf\n", down->canvas.x, down->canvas.y, lon, lat);
 
@@ -231,44 +127,10 @@ _map_clicked_double(void *data __UNUSED__, Evas_Object *obj, void *event_info)
                                      ELM_MAP_ROUTE_METHOD_FASTEST,
                                      start_lon, start_lat, end_lon, end_lat,
                                      NULL, NULL);
->>>>>>> remotes/origin/upstream
      }
 }
 
 static void
-<<<<<<< HEAD
-my_map_load_detail(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   printf("load,detail\n");
-}
-
-static void
-my_map_loaded_detail(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   printf("loaded,detail\n");
-}
-
-static void
-my_map_zoom_start(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   printf("zoom,start\n");
-}
-
-static void
-my_map_zoom_stop(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   printf("zoom,stop\n");
-}
-
-static void
-my_map_zoom_change(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   printf("zoom,change\n");
-}
-
-static void
-my_map_anim_start(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-=======
 _map_press(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    printf("press\n");
@@ -312,56 +174,17 @@ _map_drag_stop(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSE
 
 static void
 _map_anim_start(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
->>>>>>> remotes/origin/upstream
 {
    printf("scroll,anim,start\n");
 }
 
 static void
-<<<<<<< HEAD
-my_map_anim_stop(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-=======
 _map_anim_stop(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
->>>>>>> remotes/origin/upstream
 {
    printf("scroll,anim,stop\n");
 }
 
 static void
-<<<<<<< HEAD
-my_map_drag_start(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   printf("scroll,drag,start\n");
-   evas_object_smart_callback_del(data, "longpressed", my_map_longpressed);
-}
-
-static void
-my_map_drag_stop(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   printf("scroll,drag,stop\n");
-   evas_object_smart_callback_add(data, "longpressed", my_map_longpressed, data);
-}
-
-static void
-my_map_scroll(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
-{
-   printf("scroll\n");
-   double lon, lat;
-   elm_map_geo_region_get(obj, &lon, &lat);
-   printf("scroll longitude : %f latitude : %f\n", lon, lat);
-}
-
-static void
-my_map_downloaded(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   int try_num, finish_num;
-   elm_map_utils_downloading_status_get(data, &try_num, &finish_num);
-   printf("downloaded : %d / %d\n", finish_num, try_num);
-}
-
-static void
-my_map_route_load(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-=======
 _map_zoom_start(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    printf("zoom,start\n");
@@ -403,25 +226,17 @@ _map_tile_loaded_fail(void *data, Evas_Object *obj __UNUSED__, void *event_info
 
 static void
 _map_route_load(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
->>>>>>> remotes/origin/upstream
 {
    printf("route,load\n");
 }
 
 static void
-<<<<<<< HEAD
-my_map_route_loaded(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-=======
 _map_route_loaded(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
->>>>>>> remotes/origin/upstream
 {
    printf("route,loaded\n");
    double d;
    const char *w, *n;
-<<<<<<< HEAD
-=======
 
->>>>>>> remotes/origin/upstream
    d = elm_map_route_distance_get(route);
    printf("route distance = %lf km\n", d);
 
@@ -430,12 +245,6 @@ _map_route_loaded(void *data __UNUSED__, Evas_Object *obj, void *event_info __UN
 
    n = elm_map_route_node_get(route);
    if (n) printf("[nodes]\n%s\n", n);
-<<<<<<< HEAD
-}
-
-static void
-my_map_name_load(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-=======
 
    if (route_ovl) elm_map_overlay_del(route_ovl);
    route_ovl = elm_map_overlay_route_add(obj, route);
@@ -450,17 +259,12 @@ _map_route_loaded_fail(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void
 
 static void
 _map_name_load(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
->>>>>>> remotes/origin/upstream
 {
    printf("name,load\n");
 }
 
 static void
-<<<<<<< HEAD
-my_map_name_loaded(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-=======
 _map_name_loaded(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
->>>>>>> remotes/origin/upstream
 {
    printf("name,loaded\n");
    if (!name) return;
@@ -475,14 +279,6 @@ _map_name_loaded(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU
              Eina_Bool b = elm_map_paused_get(data);
              elm_map_paused_set(data, EINA_TRUE);
              elm_map_zoom_mode_set(data, ELM_MAP_ZOOM_MODE_MANUAL);
-<<<<<<< HEAD
-             elm_map_geo_region_show(data, lon, lat);
-             elm_map_zoom_set(data, elm_map_source_zoom_max_get(data));
-             elm_map_paused_set(data, b);
-          }
-     }
-   elm_map_name_remove(name);
-=======
              elm_map_zoom_set(data, elm_map_zoom_max_get(data));
              elm_map_region_show(data, lon, lat);
              elm_map_paused_set(data, b);
@@ -497,7 +293,6 @@ static void
 _map_name_loaded_fail(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    printf("name,loaded,fail\n");
->>>>>>> remotes/origin/upstream
 }
 
 static void
@@ -506,11 +301,7 @@ map_show_urmatt(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUS
    Eina_Bool b = elm_map_paused_get(data);
    elm_map_paused_set(data, EINA_TRUE);
    elm_map_zoom_mode_set(data, ELM_MAP_ZOOM_MODE_MANUAL);
-<<<<<<< HEAD
-   elm_map_geo_region_show(data,7.325201, 48.526813);
-=======
    elm_map_region_show(data,7.325201, 48.526813);
->>>>>>> remotes/origin/upstream
    elm_map_zoom_set(data, 12);
    elm_map_paused_set(data, b);
 }
@@ -518,11 +309,7 @@ map_show_urmatt(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUS
 static void
 map_bring_seoul(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-<<<<<<< HEAD
-   elm_map_geo_region_bring_in(data, 126.977969, 37.566535);
-=======
    elm_map_region_bring_in(data, 126.977969, 37.566535);
->>>>>>> remotes/origin/upstream
 }
 
 static void
@@ -670,21 +457,13 @@ map_rotate_reset(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU
 static void
 map_zoom_min_set(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-<<<<<<< HEAD
-   elm_map_source_zoom_min_set(data, 1);
-=======
    elm_map_zoom_min_set(data, 1);
->>>>>>> remotes/origin/upstream
 }
 
 static void
 map_zoom_max_set(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-<<<<<<< HEAD
-   elm_map_source_zoom_max_set(data, 10);
-=======
    elm_map_zoom_max_set(data, 10);
->>>>>>> remotes/origin/upstream
 }
 
 static void
@@ -693,11 +472,7 @@ map_source(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    Map_Source *s = data;
 
    if (!s) return;
-<<<<<<< HEAD
-   elm_map_source_name_set(s->map, s->source_name);
-=======
    elm_map_source_set(s->map, ELM_MAP_SOURCE_TYPE_TILE, s->source_name);
->>>>>>> remotes/origin/upstream
 }
 
 /*
@@ -707,11 +482,7 @@ map_marker_add(void *data)
    int i;
    Elm_Map_Group_Class *g_clas;
    Elm_Map_Marker_Class *m_clas;
-<<<<<<< HEAD
-   Marker_Data *d = &data7;
-=======
    Overlay_Data *d = &data7;
->>>>>>> remotes/origin/upstream
 
    if (*markers) return;
    for (i =0; i<MARKER_MAX; i++)
@@ -732,11 +503,7 @@ map_marker_add(void *data)
         else
           {
              m_clas = itc_parking;
-<<<<<<< HEAD
-             d = &data_parking;
-=======
              d = &parking;
->>>>>>> remotes/origin/upstream
           }
 
         style = rand() % 2;
@@ -782,41 +549,6 @@ my_map_entry_activated(void *data, Evas_Object *obj, void *event_info __UNUSED__
 */
 
 static Evas_Object *
-<<<<<<< HEAD
-_marker_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data)
-{
-   Marker_Data *d = data;
-
-   Evas_Object *bx = elm_box_add(obj);
-   evas_object_show(bx);
-
-   if (d == &data3)
-     {
-        Evas_Object *icon = elm_icon_add(obj);
-        elm_icon_file_set(icon, d->file, NULL);
-        evas_object_show(icon);
-
-        Evas_Object *o = elm_button_add(obj);
-        elm_object_part_content_set(o, "icon", icon);
-        evas_object_show(o);
-        elm_box_pack_end(bx, o);
-     }
-   else
-     {
-        Evas_Object *o = evas_object_image_add(evas_object_evas_get(obj));
-        evas_object_image_file_set(o, d->file, NULL);
-        evas_object_image_filled_set(o, EINA_TRUE);
-        evas_object_size_hint_min_set(o, 64, 64);
-        evas_object_show(o);
-        elm_box_pack_end(bx, o);
-
-        Evas_Object *lbl = elm_label_add(obj);
-        elm_object_text_set(lbl, "Wolves Go !");
-        evas_object_show(lbl);
-        elm_box_pack_end(bx, lbl);
-     }
-
-=======
 _box_get(Evas_Object *obj, Overlay_Data *data)
 {
    Evas_Object *bx, *img, *label;
@@ -834,55 +566,20 @@ _box_get(Evas_Object *obj, Overlay_Data *data)
    elm_object_text_set(label, "Wolves go!!");
    evas_object_show(label);
    elm_box_pack_end(bx, label);
->>>>>>> remotes/origin/upstream
    return bx;
 }
 
 static Evas_Object *
-<<<<<<< HEAD
-_icon_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data)
-{
-   Marker_Data *d = data;
-
-   Evas_Object *icon = elm_icon_add(obj);
-   elm_icon_file_set(icon, d->file, NULL);
-   evas_object_show(icon);
-
-   return icon;
-}
-
-static Evas_Object *
-_group_icon_get(Evas_Object *obj, void *data)
-{
-   char *file = data;
-
-   Evas_Object *icon = elm_icon_add(obj);
-   elm_icon_file_set(icon, file, NULL);
-=======
 _icon_get(Evas_Object *obj, Overlay_Data *data)
 {
    Evas_Object *icon = elm_icon_add(obj);
    elm_icon_file_set(icon, data->file, NULL);
->>>>>>> remotes/origin/upstream
    evas_object_show(icon);
 
    return icon;
 }
 
 static void
-<<<<<<< HEAD
-_map_move_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   int x,y,w,h;
-
-   evas_object_geometry_get(data,&x,&y,&w,&h);
-   evas_object_resize(rect,w,h);
-   evas_object_move(rect,x,y);
-}
-
-static void
-=======
->>>>>>> remotes/origin/upstream
 _populate(void *data, Elm_Object_Item *menu_it)
 {
    int idx;
@@ -989,8 +686,6 @@ _map_mouse_up(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj __U
      }
 }
 
-<<<<<<< HEAD
-=======
 static void
 _overlay_cb(void *data __UNUSED__, Evas_Object *map, void *ev)
 {
@@ -1072,7 +767,6 @@ _del_map(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
    name = NULL;
 }
 
->>>>>>> remotes/origin/upstream
 void
 test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
@@ -1091,15 +785,6 @@ test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
    map = elm_map_add(win);
    if (map)
      {
-<<<<<<< HEAD
-        srand(time(NULL));
-
-        source_names = elm_map_source_names_get(map);
-
-        if (!source_names) return;
-        printf("map sources [ ");
-        for (idx = 0; source_names[idx] ; idx++) printf("%s ", source_names[idx]);
-=======
         Elm_Map_Overlay *ovl_1, *ovl_2, *ovl_3, *ovl_4, *ovl_5, *ovl6;
         Elm_Map_Overlay *ovl_7, *ovl_8, *ovl_9, *ovl_10, *ovl_11;
         Elm_Map_Overlay *parking1, *parking2, *parking3, *parking4, *parking5;
@@ -1114,58 +799,12 @@ test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
         if (!source_names) return;
         printf("map sources [ ");
         for (idx = 0; source_names[idx] ; idx++) printf("%s, ", source_names[idx]);
->>>>>>> remotes/origin/upstream
         printf("]\n");
 
         evas_object_size_hint_weight_set(map, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
         elm_win_resize_object_add(win, map);
         evas_object_data_set(map, "window", win);
 
-<<<<<<< HEAD
-        //
-        itc1 = elm_map_marker_class_new(map);
-        elm_map_marker_class_get_cb_set(itc1, _marker_get);
-        elm_map_marker_class_del_cb_set(itc1, NULL);
-
-        itc2 = elm_map_marker_class_new(map);
-        elm_map_marker_class_get_cb_set(itc2, _marker_get);
-        elm_map_marker_class_del_cb_set(itc2, NULL);
-        elm_map_marker_class_style_set(itc2, "radio2");
-
-        itc_parking = elm_map_marker_class_new(map);
-        elm_map_marker_class_get_cb_set(itc_parking, _marker_get);
-        elm_map_marker_class_del_cb_set(itc_parking, NULL);
-        elm_map_marker_class_icon_cb_set(itc_parking, _icon_get);
-        elm_map_marker_class_style_set(itc_parking, "empty");
-        //
-
-        //
-        itc_group1 = elm_map_group_class_new(map);
-        elm_map_group_class_data_set(itc_group1, (void *)PACKAGE_DATA_DIR"/images/plant_01.jpg");
-
-        itc_group2 = elm_map_group_class_new(map);
-        elm_map_group_class_style_set(itc_group2, "radio2");
-        elm_map_group_class_zoom_displayed_set(itc_group1, 3);
-
-        itc_group_parking = elm_map_group_class_new(map);
-        elm_map_group_class_icon_cb_set(itc_group_parking, _group_icon_get);
-        elm_map_group_class_data_set(itc_group_parking, (void *)PACKAGE_DATA_DIR"/images/parking.png");
-        elm_map_group_class_style_set(itc_group_parking, "empty");
-        elm_map_group_class_zoom_displayed_set(itc_group_parking, 5);
-        //
-
-        rect = evas_object_rectangle_add(evas_object_evas_get(win));
-        evas_object_color_set(rect, 0, 0, 0, 0);
-        evas_object_repeat_events_set(rect,1);
-        evas_object_show(rect);
-        evas_object_raise(rect);
-
-        evas_object_event_callback_add(map, EVAS_CALLBACK_RESIZE,
-                                       _map_move_resize_cb, map);
-        evas_object_event_callback_add(map, EVAS_CALLBACK_MOVE,
-                                       _map_move_resize_cb, map);
-=======
->>>>>>> remotes/origin/upstream
         evas_object_event_callback_add(map, EVAS_CALLBACK_MOUSE_DOWN,
                                        _map_mouse_down, map);
         evas_object_event_callback_add(map, EVAS_CALLBACK_MOUSE_MOVE,
@@ -1173,44 +812,6 @@ test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
         evas_object_event_callback_add(map, EVAS_CALLBACK_MOUSE_UP,
                                        _map_mouse_up, map);
 
-<<<<<<< HEAD
-        elm_map_marker_add(map, 2.352, 48.857, itc1, itc_group1, &data1);
-        elm_map_marker_add(map, 2.355, 48.857, itc1, itc_group1, &data3);
-        elm_map_marker_add(map, 3, 48.857, itc2, itc_group1, &data2);
-        elm_map_marker_add(map, 2.352, 49, itc2, itc_group1, &data1);
-
-        elm_map_marker_add(map, 7.31451, 48.857127, itc1, itc_group1, &data10);
-        elm_map_marker_add(map, 7.314704, 48.857119, itc1, itc_group1, &data4);
-        elm_map_marker_add(map, 7.314704, 48.857119, itc2, itc_group1, &data5);
-        elm_map_marker_add(map, 7.31432, 48.856785, itc2, itc_group1, &data6);
-        elm_map_marker_add(map, 7.3148, 48.85725, itc1, itc_group2, &data7);
-        elm_map_marker_add(map, 7.316445, 48.8572210000694, itc1, itc_group1, &data8);
-        elm_map_marker_add(map, 7.316527000125, 48.85609, itc2, itc_group2, &data9);
-        elm_map_marker_add(map, 7.3165409990833, 48.856078, itc2, itc_group1, &data11);
-        elm_map_marker_add(map, 7.319812, 48.856561, itc2, itc_group2, &data10);
-
-        nb_elts = 13;
-
-        evas_object_smart_callback_add(map, "clicked", my_map_clicked, map);
-        evas_object_smart_callback_add(map, "press", my_map_press, map);
-        evas_object_smart_callback_add(map, "longpressed", my_map_longpressed, map);
-        evas_object_smart_callback_add(map, "clicked,double", my_map_clicked_double, map);
-        evas_object_smart_callback_add(map, "load,detail", my_map_load_detail, map);
-        evas_object_smart_callback_add(map, "loaded,detail", my_map_loaded_detail, map);
-        evas_object_smart_callback_add(map, "zoom,start", my_map_zoom_start, map);
-        evas_object_smart_callback_add(map, "zoom,stop", my_map_zoom_stop, map);
-        evas_object_smart_callback_add(map, "zoom,change", my_map_zoom_change, map);
-        evas_object_smart_callback_add(map, "scroll,anim,start", my_map_anim_start, map);
-        evas_object_smart_callback_add(map, "scroll,anim,stop", my_map_anim_stop, map);
-        evas_object_smart_callback_add(map, "scroll,drag,start", my_map_drag_start, map);
-        evas_object_smart_callback_add(map, "scroll,drag,stop", my_map_drag_stop, map);
-        evas_object_smart_callback_add(map, "scroll", my_map_scroll, map);
-        evas_object_smart_callback_add(map, "downloaded", my_map_downloaded, map);
-        evas_object_smart_callback_add(map, "route,load", my_map_route_load, map);
-        evas_object_smart_callback_add(map, "route,loaded", my_map_route_loaded, map);
-        evas_object_smart_callback_add(map, "name,load", my_map_name_load, map);
-        evas_object_smart_callback_add(map, "name,loaded", my_map_name_loaded, map);
-=======
         evas_object_smart_callback_add(map, "clicked", _map_clicked, map);
         evas_object_smart_callback_add(map, "clicked,double", _map_clicked_double, map);
         evas_object_smart_callback_add(map, "press", _map_press, map);
@@ -1298,7 +899,6 @@ test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
         elm_map_overlay_class_append(grp_parking, parking3);
         elm_map_overlay_class_append(grp_parking, parking4);
         elm_map_overlay_class_append(grp_parking, parking5);
->>>>>>> remotes/origin/upstream
 
         evas_object_show(map);
      }