update API, elm_entry, elm_map, elm_genlist

3 files changed, 98 insertions, 147 deletions

diff --git a/lib/efl/native/elm/elm_entry.rb b/lib/efl/native/elm/elm_entry.rb
index 2c0719a..6bdc394 100644
--- a/lib/efl/native/elm/elm_entry.rb
+++ b/lib/efl/native/elm/elm_entry.rb
@@ -59,10 +59,10 @@ module Efl
         typedef :pointer, :elm_entry_filter_accept_set
         #
         # CALLBACKS
+        # typedef Evas_Object * (*Elm_Entry_Item_Provider_Cb) (void *data, Evas_Object * entry, const char *item);
+        callback :elm_entry_item_provider_cb, [ :pointer, :evas_object, :string ], :evas_object
         # typedef void (*Elm_Entry_Filter_Cb) (void *data, Evas_Object *entry, char **text);
         callback :elm_entry_filter_cb, [ :pointer, :evas_object, :pointer ], :void
-        # use in elm_entry_item_provider_* : Evas_Object * (*func)(void *data, Evas_Object * entry, const char *item)
-        callback :elm_entry_item_provider_cb, [ :pointer, :evas_object, :string ], :evas_object
         #
         # FUNCTIONS
         fcts = [
@@ -150,11 +150,11 @@ module Efl
         [ :elm_entry_context_menu_disabled_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool elm_entry_context_menu_disabled_get(const Evas_Object *obj);
         [ :elm_entry_context_menu_disabled_get, [ :evas_object ], :bool ],
-        # EAPI void elm_entry_item_provider_append(Evas_Object *obj, Evas_Object * (*func)(void *data, Evas_Object * entry, const char *item), void *data);
+        # EAPI void elm_entry_item_provider_append(Evas_Object *obj, Elm_Entry_Item_Provider_Cb func, void *data);
         [ :elm_entry_item_provider_append, [ :evas_object, :elm_entry_item_provider_cb, :pointer ], :void ],
-        # EAPI void elm_entry_item_provider_prepend(Evas_Object *obj, Evas_Object * (*func)(void *data, Evas_Object * entry, const char *item), void *data);
+        # EAPI void elm_entry_item_provider_prepend(Evas_Object *obj, Elm_Entry_Item_Provider_Cb func, void *data);
         [ :elm_entry_item_provider_prepend, [ :evas_object, :elm_entry_item_provider_cb, :pointer ], :void ],
-        # EAPI void elm_entry_item_provider_remove(Evas_Object *obj, Evas_Object * (*func)(void *data, Evas_Object * entry, const char *item), void *data);
+        # EAPI void elm_entry_item_provider_remove(Evas_Object *obj, Elm_Entry_Item_Provider_Cb func, void *data);
         [ :elm_entry_item_provider_remove, [ :evas_object, :elm_entry_item_provider_cb, :pointer ], :void ],
         # EAPI void elm_entry_markup_filter_append(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data);
         [ :elm_entry_markup_filter_append, [ :evas_object, :elm_entry_filter_cb, :pointer ], :void ],
diff --git a/lib/efl/native/elm/elm_genlist.rb b/lib/efl/native/elm/elm_genlist.rb
index f87fb62..ac38990 100644
--- a/lib/efl/native/elm/elm_genlist.rb
+++ b/lib/efl/native/elm/elm_genlist.rb
@@ -34,6 +34,9 @@ module Efl
         # typedef enum {...} Elm_Genlist_Item_Scrollto_Type;
         enum :elm_genlist_item_scrollto_type, [ :elm_genlist_item_scrollto_none, 0, :elm_genlist_item_scrollto_in, (1<<0),
             :elm_genlist_item_scrollto_top, (1<<1), :elm_genlist_item_scrollto_middle, (1<<2) ]
+        # typedef enum {...} Elm_Genlist_Item_Move_Effect_Mode;
+        enum :elm_genlist_item_move_effect_mode, [ :elm_genlist_item_move_effect_none, 0, :elm_genlist_item_move_effect_expand, 1,
+            :elm_genlist_item_move_effect_contract, 2 ]
         #
         # TYPEDEFS
         # typedef Elm_Gen_Item_Class Elm_Genlist_Item_Class;
@@ -226,6 +229,10 @@ module Efl
         [ :elm_genlist_item_flip_set, [ :elm_object_item, :bool ], :void ],
         # EAPI Eina_Bool elm_genlist_item_flip_get(const Elm_Object_Item *it);
         [ :elm_genlist_item_flip_get, [ :elm_object_item ], :bool ],
+        # EAPI void elm_genlist_tree_effect_enabled_set(Evas_Object *obj, Eina_Bool enabled);
+        [ :elm_genlist_tree_effect_enabled_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_genlist_tree_effect_enabled_get(const Evas_Object *obj);
+        [ :elm_genlist_tree_effect_enabled_get, [ :evas_object ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_map.rb b/lib/efl/native/elm/elm_map.rb
index 775dbc4..6c14509 100644
--- a/lib/efl/native/elm/elm_map.rb
+++ b/lib/efl/native/elm/elm_map.rb
@@ -25,20 +25,17 @@ module Efl
         # ENUMS
         # typedef enum {...} Elm_Map_Zoom_Mode;
         enum :elm_map_zoom_mode, [ :elm_map_zoom_mode_manual, :elm_map_zoom_mode_auto_fit, :elm_map_zoom_mode_auto_fill, :elm_map_zoom_mode_last ]
-        # typedef enum {...} Elm_Map_Route_Sources;
-        enum :elm_map_route_sources, [ :elm_map_route_source_yours, :elm_map_route_source_monav, :elm_map_route_source_ors, :elm_map_route_source_last
-            ]
-        # typedef enum {...} Elm_Map_Name_Sources;
-        enum :elm_map_name_sources, [ :elm_map_name_source_nominatim, :elm_map_name_source_last ]
+        # typedef enum {...} Elm_Map_Source_Type;
+        enum :elm_map_source_type, [ :elm_map_source_type_tile, :elm_map_source_type_route, :elm_map_source_type_name, :elm_map_source_type_last ]
         # typedef enum {...} Elm_Map_Route_Type;
         enum :elm_map_route_type, [ :elm_map_route_type_motocar, :elm_map_route_type_bicycle, :elm_map_route_type_foot, :elm_map_route_type_last ]
         # typedef enum {...} Elm_Map_Route_Method;
         enum :elm_map_route_method, [ :elm_map_route_method_fastest, :elm_map_route_method_shortest, :elm_map_route_method_last ]
-        # typedef enum _Elm_Map_Overlay_Type {...} Elm_Map_Overlay_Type;
-        enum :elm_map_overlay_type, [ :elm_map_overlay_type_none, 0, :elm_map_overlay_type_default, 1, :elm_map_overlay_type_class, 2,
-            :elm_map_overlay_type_bubble, 3 ]
         # typedef enum {...} Elm_Map_Name_Method;
         enum :elm_map_name_method, [ :elm_map_name_method_search, :elm_map_name_method_reverse, :elm_map_name_method_last ]
+        # typedef enum _Elm_Map_Overlay_Type {...} Elm_Map_Overlay_Type;
+        enum :elm_map_overlay_type, [ :elm_map_overlay_type_none, 0, :elm_map_overlay_type_default, 1, :elm_map_overlay_type_class, 2,
+            :elm_map_overlay_type_bubble, 3, :elm_map_overlay_type_route, 4 ]
         #
         # TYPEDEFS
         # typedef struct _Elm_Map_Marker Elm_Map_Marker;
@@ -63,26 +60,28 @@ module Efl
         callback :elm_map_marker_icon_get_func_cb, [ :evas_object, :elm_map_marker, :pointer ], :evas_object
         # typedef Evas_Object *(*Elm_Map_Group_Icon_Get_Func) (Evas_Object *obj, void *data);
         callback :elm_map_group_icon_get_func_cb, [ :evas_object, :pointer ], :evas_object
-        # typedef void (*Elm_Map_Overlay_Get_Cb) (void *data, Evas_Object *map, Elm_Map_Overlay *overlay);
+        # typedef void (*Elm_Map_Overlay_Get_Cb) (void *data, Evas_Object *map, const Elm_Map_Overlay *overlay);
         callback :elm_map_overlay_get_cb, [ :pointer, :evas_object, :elm_map_overlay ], :void
-        # typedef char *(*Elm_Map_Module_Source_Func) (void);
-        callback :elm_map_module_source_func_cb, [  ], :string
-        # typedef int (*Elm_Map_Module_Zoom_Min_Func) (void);
-        callback :elm_map_module_zoom_min_func_cb, [  ], :int
-        # typedef int (*Elm_Map_Module_Zoom_Max_Func) (void);
-        callback :elm_map_module_zoom_max_func_cb, [  ], :int
-        # typedef char *(*Elm_Map_Module_Url_Func) (Evas_Object *obj, int x, int y, int zoom);
-        callback :elm_map_module_url_func_cb, [ :evas_object, :int, :int, :int ], :string
-        # typedef int (*Elm_Map_Module_Route_Source_Func) (void);
-        callback :elm_map_module_route_source_func_cb, [  ], :int
-        # typedef char *(*Elm_Map_Module_Route_Url_Func) (Evas_Object *obj, char *type_name, int method, double flon, double flat, double tlon, double tlat);
+        # typedef void (*Elm_Map_Name_Cb) (void *data, Evas_Object *map, const Elm_Map_Name *name);
+        callback :elm_map_name_cb, [ :pointer, :evas_object, :elm_map_name ], :void
+        # typedef void (*Elm_Map_Route_Cb) (void *data, Evas_Object *map, const Elm_Map_Route *route);
+        callback :elm_map_route_cb, [ :pointer, :evas_object, :elm_map_route ], :void
+        # typedef char *(*Elm_Map_Module_Source_Name_Func) (void);
+        callback :elm_map_module_source_name_func_cb, [  ], :string
+        # typedef int (*Elm_Map_Module_Tile_Zoom_Min_Func) (void);
+        callback :elm_map_module_tile_zoom_min_func_cb, [  ], :int
+        # typedef int (*Elm_Map_Module_Tile_Zoom_Max_Func) (void);
+        callback :elm_map_module_tile_zoom_max_func_cb, [  ], :int
+        # typedef char *(*Elm_Map_Module_Tile_Url_Func) (Evas_Object *obj, int x, int y, int zoom);
+        callback :elm_map_module_tile_url_func_cb, [ :evas_object, :int, :int, :int ], :string
+        # typedef Eina_Bool (*Elm_Map_Module_Tile_Geo_to_Coord_Func) (const Evas_Object *obj, int zoom, double lon, double lat, int size, int *x, int *y);
+        callback :elm_map_module_tile_geo_to_coord_func_cb, [ :evas_object, :int, :double, :double, :int, :pointer, :pointer ], :bool
+        # typedef Eina_Bool (*Elm_Map_Module_Tile_Coord_to_Geo_Func) (const Evas_Object *obj, int zoom, int x, int y, int size, double *lon, double *lat);
+        callback :elm_map_module_tile_coord_to_geo_func_cb, [ :evas_object, :int, :int, :int, :int, :pointer, :pointer ], :bool
+        # typedef char *(*Elm_Map_Module_Route_Url_Func) (Evas_Object *obj, const char *type_name, int method, double flon, double flat, double tlon, double tlat);
         callback :elm_map_module_route_url_func_cb, [ :evas_object, :string, :int, :double, :double, :double, :double ], :string
-        # typedef char *(*Elm_Map_Module_Name_Url_Func) (Evas_Object *obj, int method, char *name, double lon, double lat);
+        # typedef char *(*Elm_Map_Module_Name_Url_Func) (Evas_Object *obj, int method, const char *name, double lon, double lat);
         callback :elm_map_module_name_url_func_cb, [ :evas_object, :int, :string, :double, :double ], :string
-        # typedef Eina_Bool (*Elm_Map_Module_Geo_Into_Coord_Func) (const Evas_Object *obj, int zoom, double lon, double lat, int size, int *x, int *y);
-        callback :elm_map_module_geo_into_coord_func_cb, [ :evas_object, :int, :double, :double, :int, :pointer, :pointer ], :bool
-        # typedef Eina_Bool (*Elm_Map_Module_Coord_Into_Geo_Func) (const Evas_Object *obj, int zoom, int x, int y, int size, double *lon, double *lat);
-        callback :elm_map_module_coord_into_geo_func_cb, [ :evas_object, :int, :int, :int, :int, :pointer, :pointer ], :bool
         #
         # FUNCTIONS
         fcts = [
@@ -96,118 +95,26 @@ module Efl
         [ :elm_map_zoom_mode_set, [ :evas_object, :elm_map_zoom_mode ], :void ],
         # EAPI Elm_Map_Zoom_Mode elm_map_zoom_mode_get(const Evas_Object *obj);
         [ :elm_map_zoom_mode_get, [ :evas_object ], :elm_map_zoom_mode ],
-        # EAPI void elm_map_geo_region_get(const Evas_Object *obj, double *lon, double *lat);
-        [ :elm_map_geo_region_get, [ :evas_object, :pointer, :pointer ], :void ],
-        # EAPI void elm_map_geo_region_bring_in(Evas_Object *obj, double lon, double lat);
-        [ :elm_map_geo_region_bring_in, [ :evas_object, :double, :double ], :void ],
-        # EAPI void elm_map_geo_region_show(Evas_Object *obj, double lon, double lat);
-        [ :elm_map_geo_region_show, [ :evas_object, :double, :double ], :void ],
+        # EAPI void elm_map_zoom_min_set(Evas_Object *obj, int zoom);
+        [ :elm_map_zoom_min_set, [ :evas_object, :int ], :void ],
+        # EAPI int elm_map_zoom_min_get(const Evas_Object *obj);
+        [ :elm_map_zoom_min_get, [ :evas_object ], :int ],
+        # EAPI void elm_map_zoom_max_set(Evas_Object *obj, int zoom);
+        [ :elm_map_zoom_max_set, [ :evas_object, :int ], :void ],
+        # EAPI int elm_map_zoom_max_get(const Evas_Object *obj);
+        [ :elm_map_zoom_max_get, [ :evas_object ], :int ],
+        # EAPI void elm_map_region_get(const Evas_Object *obj, double *lon, double *lat);
+        [ :elm_map_region_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_map_region_bring_in(Evas_Object *obj, double lon, double lat);
+        [ :elm_map_region_bring_in, [ :evas_object, :double, :double ], :void ],
+        # EAPI void elm_map_region_show(Evas_Object *obj, double lon, double lat);
+        [ :elm_map_region_show, [ :evas_object, :double, :double ], :void ],
+        # EAPI void elm_map_canvas_to_region_convert(const Evas_Object *obj, const Evas_Coord x, const Evas_Coord y, double *lon, double *lat);
+        [ :elm_map_canvas_to_region_convert, [ :evas_object, :int, :int, :pointer, :pointer ], :void ],
         # EAPI void elm_map_paused_set(Evas_Object *obj, Eina_Bool paused);
         [ :elm_map_paused_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool elm_map_paused_get(const Evas_Object *obj);
         [ :elm_map_paused_get, [ :evas_object ], :bool ],
-        # EAPI void elm_map_paused_markers_set(Evas_Object *obj, Eina_Bool paused);
-        [ :elm_map_paused_markers_set, [ :evas_object, :bool ], :void ],
-        # EAPI Eina_Bool elm_map_paused_markers_get(const Evas_Object *obj);
-        [ :elm_map_paused_markers_get, [ :evas_object ], :bool ],
-        # EAPI void elm_map_utils_downloading_status_get(const Evas_Object *obj, int *try_num, int *finish_num);
-        [ :elm_map_utils_downloading_status_get, [ :evas_object, :pointer, :pointer ], :void ],
-        # EAPI void elm_map_utils_convert_coord_into_geo(const Evas_Object *obj, int x, int y, int size, double *lon, double *lat);
-        [ :elm_map_utils_convert_coord_into_geo, [ :evas_object, :int, :int, :int, :pointer, :pointer ], :void ],
-        # EAPI void elm_map_utils_convert_geo_into_coord(const Evas_Object *obj, double lon, double lat, int size, int *x, int *y);
-        [ :elm_map_utils_convert_geo_into_coord, [ :evas_object, :double, :double, :int, :pointer, :pointer ], :void ],
-        # EAPI Elm_Map_Name *elm_map_utils_convert_coord_into_name(const Evas_Object *obj, double lon, double lat);
-        [ :elm_map_utils_convert_coord_into_name, [ :evas_object, :double, :double ], :elm_map_name ],
-        # EAPI Elm_Map_Name *elm_map_utils_convert_name_into_coord(const Evas_Object *obj, char *address);
-        [ :elm_map_utils_convert_name_into_coord, [ :evas_object, :string ], :elm_map_name ],
-        # EAPI void elm_map_canvas_to_geo_convert(const Evas_Object *obj, const Evas_Coord x, const Evas_Coord y, double *lon, double *lat);
-        [ :elm_map_canvas_to_geo_convert, [ :evas_object, :int, :int, :pointer, :pointer ], :void ],
-        # EAPI Elm_Map_Marker *elm_map_marker_add(Evas_Object *obj, double lon, double lat, Elm_Map_Marker_Class *clas, Elm_Map_Group_Class *clas_group, void *data);
-        [ :elm_map_marker_add, [ :evas_object, :double, :double, :elm_map_marker_class, :elm_map_group_class, :pointer ], :elm_map_marker ],
-        # EAPI void elm_map_max_marker_per_group_set(Evas_Object *obj, int max);
-        [ :elm_map_max_marker_per_group_set, [ :evas_object, :int ], :void ],
-        # EAPI void elm_map_marker_remove(Elm_Map_Marker *marker);
-        [ :elm_map_marker_remove, [ :elm_map_marker ], :void ],
-        # EAPI void elm_map_marker_region_get(const Elm_Map_Marker *marker, double *lon, double *lat);
-        [ :elm_map_marker_region_get, [ :elm_map_marker, :pointer, :pointer ], :void ],
-        # EAPI void elm_map_marker_bring_in(Elm_Map_Marker *marker);
-        [ :elm_map_marker_bring_in, [ :elm_map_marker ], :void ],
-        # EAPI void elm_map_marker_show(Elm_Map_Marker *marker);
-        [ :elm_map_marker_show, [ :elm_map_marker ], :void ],
-        # EAPI void elm_map_markers_list_show(Eina_List *markers);
-        [ :elm_map_markers_list_show, [ :eina_list ], :void ],
-        # EAPI Evas_Object *elm_map_marker_object_get(const Elm_Map_Marker *marker);
-        [ :elm_map_marker_object_get, [ :elm_map_marker ], :evas_object ],
-        # EAPI void elm_map_marker_update(Elm_Map_Marker *marker);
-        [ :elm_map_marker_update, [ :elm_map_marker ], :void ],
-        # EAPI void elm_map_bubbles_close(Evas_Object *obj);
-        [ :elm_map_bubbles_close, [ :evas_object ], :void ],
-        # EAPI Elm_Map_Group_Class *elm_map_group_class_new(Evas_Object *obj);
-        [ :elm_map_group_class_new, [ :evas_object ], :elm_map_group_class ],
-        # EAPI void elm_map_group_class_style_set(Elm_Map_Group_Class *clas, const char *style);
-        [ :elm_map_group_class_style_set, [ :elm_map_group_class, :string ], :void ],
-        # EAPI void elm_map_group_class_icon_cb_set(Elm_Map_Group_Class *clas, Elm_Map_Group_Icon_Get_Func icon_get);
-        [ :elm_map_group_class_icon_cb_set, [ :elm_map_group_class, :elm_map_group_icon_get_func_cb ], :void ],
-        # EAPI void elm_map_group_class_data_set(Elm_Map_Group_Class *clas, void *data);
-        [ :elm_map_group_class_data_set, [ :elm_map_group_class, :pointer ], :void ],
-        # EAPI void elm_map_group_class_zoom_displayed_set(Elm_Map_Group_Class *clas, int zoom);
-        [ :elm_map_group_class_zoom_displayed_set, [ :elm_map_group_class, :int ], :void ],
-        # EAPI void elm_map_group_class_zoom_grouped_set(Elm_Map_Group_Class *clas, int zoom);
-        [ :elm_map_group_class_zoom_grouped_set, [ :elm_map_group_class, :int ], :void ],
-        # EAPI void elm_map_group_class_hide_set(Evas_Object *obj, Elm_Map_Group_Class *clas, Eina_Bool hide);
-        [ :elm_map_group_class_hide_set, [ :evas_object, :elm_map_group_class, :bool ], :void ],
-        # EAPI Elm_Map_Marker_Class *elm_map_marker_class_new(Evas_Object *obj);
-        [ :elm_map_marker_class_new, [ :evas_object ], :elm_map_marker_class ],
-        # EAPI void elm_map_marker_class_style_set(Elm_Map_Marker_Class *clas, const char *style);
-        [ :elm_map_marker_class_style_set, [ :elm_map_marker_class, :string ], :void ],
-        # EAPI void elm_map_marker_class_icon_cb_set(Elm_Map_Marker_Class *clas, Elm_Map_Marker_Icon_Get_Func icon_get);
-        [ :elm_map_marker_class_icon_cb_set, [ :elm_map_marker_class, :elm_map_marker_icon_get_func_cb ], :void ],
-        # EAPI void elm_map_marker_class_get_cb_set(Elm_Map_Marker_Class *clas, Elm_Map_Marker_Get_Func get);
-        [ :elm_map_marker_class_get_cb_set, [ :elm_map_marker_class, :elm_map_marker_get_func_cb ], :void ],
-        # EAPI void elm_map_marker_class_del_cb_set(Elm_Map_Marker_Class *clas, Elm_Map_Marker_Del_Func del);
-        [ :elm_map_marker_class_del_cb_set, [ :elm_map_marker_class, :elm_map_marker_del_func_cb ], :void ],
-        # EAPI const char **elm_map_source_names_get(const Evas_Object *obj);
-        [ :elm_map_source_names_get, [ :evas_object ], :pointer ],
-        # EAPI void elm_map_source_name_set(Evas_Object *obj, const char *source_name);
-        [ :elm_map_source_name_set, [ :evas_object, :string ], :void ],
-        # EAPI const char *elm_map_source_name_get(const Evas_Object *obj);
-        [ :elm_map_source_name_get, [ :evas_object ], :string ],
-        # EAPI void elm_map_route_source_set(Evas_Object *obj, Elm_Map_Route_Sources source);
-        [ :elm_map_route_source_set, [ :evas_object, :elm_map_route_sources ], :void ],
-        # EAPI Elm_Map_Route_Sources elm_map_route_source_get(const Evas_Object *obj);
-        [ :elm_map_route_source_get, [ :evas_object ], :elm_map_route_sources ],
-        # EAPI void elm_map_source_zoom_min_set(Evas_Object *obj, int zoom);
-        [ :elm_map_source_zoom_min_set, [ :evas_object, :int ], :void ],
-        # EAPI int elm_map_source_zoom_min_get(const Evas_Object *obj);
-        [ :elm_map_source_zoom_min_get, [ :evas_object ], :int ],
-        # EAPI void elm_map_source_zoom_max_set(Evas_Object *obj, int zoom);
-        [ :elm_map_source_zoom_max_set, [ :evas_object, :int ], :void ],
-        # EAPI int elm_map_source_zoom_max_get(const Evas_Object *obj);
-        [ :elm_map_source_zoom_max_get, [ :evas_object ], :int ],
-        # EAPI void elm_map_user_agent_set(Evas_Object *obj, const char *user_agent);
-        [ :elm_map_user_agent_set, [ :evas_object, :string ], :void ],
-        # EAPI const char *elm_map_user_agent_get(const Evas_Object *obj);
-        [ :elm_map_user_agent_get, [ :evas_object ], :string ],
-        # EAPI Elm_Map_Route *elm_map_route_add(Evas_Object *obj, Elm_Map_Route_Type type, Elm_Map_Route_Method method, double flon, double flat, double tlon, double tlat);
-        [ :elm_map_route_add, [ :evas_object, :elm_map_route_type, :elm_map_route_method, :double, :double, :double, :double ], :elm_map_route ],
-        # EAPI void elm_map_route_remove(Elm_Map_Route *route);
-        [ :elm_map_route_remove, [ :elm_map_route ], :void ],
-        # EAPI void elm_map_route_color_set(Elm_Map_Route *route, int r, int g, int b, int a);
-        [ :elm_map_route_color_set, [ :elm_map_route, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_map_route_color_get(const Elm_Map_Route *route, int *r, int *g, int *b, int *a);
-        [ :elm_map_route_color_get, [ :elm_map_route, :pointer, :pointer, :pointer, :pointer ], :void ],
-        # EAPI double elm_map_route_distance_get(const Elm_Map_Route *route);
-        [ :elm_map_route_distance_get, [ :elm_map_route ], :double ],
-        # EAPI const char *elm_map_route_node_get(const Elm_Map_Route *route);
-        [ :elm_map_route_node_get, [ :elm_map_route ], :string ],
-        # EAPI const char *elm_map_route_waypoint_get(const Elm_Map_Route *route);
-        [ :elm_map_route_waypoint_get, [ :elm_map_route ], :string ],
-        # EAPI const char *elm_map_name_address_get(const Elm_Map_Name *name);
-        [ :elm_map_name_address_get, [ :elm_map_name ], :string ],
-        # EAPI void elm_map_name_region_get(const Elm_Map_Name *name, double *lon, double *lat);
-        [ :elm_map_name_region_get, [ :elm_map_name, :pointer, :pointer ], :void ],
-        # EAPI void elm_map_name_remove(Elm_Map_Name *name);
-        [ :elm_map_name_remove, [ :elm_map_name ], :void ],
         # EAPI void elm_map_rotate_set(Evas_Object *obj, double degree, Evas_Coord cx, Evas_Coord cy);
         [ :elm_map_rotate_set, [ :evas_object, :double, :int, :int ], :void ],
         # EAPI void elm_map_rotate_get(const Evas_Object *obj, double *degree, Evas_Coord *cx, Evas_Coord *cy);
@@ -216,15 +123,15 @@ module Efl
         [ :elm_map_wheel_disabled_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool elm_map_wheel_disabled_get(const Evas_Object *obj);
         [ :elm_map_wheel_disabled_get, [ :evas_object ], :bool ],
-        # EAPI Evas_Object *elm_map_track_add(Evas_Object *obj, EMap_Route *emap);
-        [ :elm_map_track_add, [ :evas_object, :emap_route ], :evas_object ],
-        # EAPI void elm_map_track_remove(Evas_Object *obj, Evas_Object *route);
-        [ :elm_map_track_remove, [ :evas_object, :evas_object ], :void ],
+        # EAPI void elm_map_user_agent_set(Evas_Object *obj, const char *user_agent);
+        [ :elm_map_user_agent_set, [ :evas_object, :string ], :void ],
+        # EAPI const char *elm_map_user_agent_get(const Evas_Object *obj);
+        [ :elm_map_user_agent_get, [ :evas_object ], :string ],
         # EAPI Elm_Map_Overlay * elm_map_overlay_add(Evas_Object *obj, double lon, double lat);
         [ :elm_map_overlay_add, [ :evas_object, :double, :double ], :elm_map_overlay ],
         # EAPI void elm_map_overlay_del(Elm_Map_Overlay *overlay);
         [ :elm_map_overlay_del, [ :elm_map_overlay ], :void ],
-        # EAPI Elm_Map_Overlay_Type elm_map_overlay_type_get(Elm_Map_Overlay *overlay);
+        # EAPI Elm_Map_Overlay_Type elm_map_overlay_type_get(const Elm_Map_Overlay *overlay);
         [ :elm_map_overlay_type_get, [ :elm_map_overlay ], :elm_map_overlay_type ],
         # EAPI void elm_map_overlay_data_set(Elm_Map_Overlay *overlay, void *data);
         [ :elm_map_overlay_data_set, [ :elm_map_overlay, :pointer ], :void ],
@@ -250,10 +157,14 @@ module Efl
         [ :elm_map_overlay_icon_set, [ :elm_map_overlay, :evas_object ], :void ],
         # EAPI const Evas_Object * elm_map_overlay_icon_get(const Elm_Map_Overlay *overlay);
         [ :elm_map_overlay_icon_get, [ :elm_map_overlay ], :evas_object ],
-        # EAPI void elm_map_overlay_geo_set(Elm_Map_Overlay *overlay, double lon, double lat);
-        [ :elm_map_overlay_geo_set, [ :elm_map_overlay, :double, :double ], :void ],
-        # EAPI void elm_map_overlay_geo_get(const Elm_Map_Overlay *overlay, double *lon, double *lat);
-        [ :elm_map_overlay_geo_get, [ :elm_map_overlay, :pointer, :pointer ], :void ],
+        # EAPI void elm_map_overlay_region_set(Elm_Map_Overlay *overlay, double lon, double lat);
+        [ :elm_map_overlay_region_set, [ :elm_map_overlay, :double, :double ], :void ],
+        # EAPI void elm_map_overlay_region_get(const Elm_Map_Overlay *overlay, double *lon, double *lat);
+        [ :elm_map_overlay_region_get, [ :elm_map_overlay, :pointer, :pointer ], :void ],
+        # EAPI void elm_map_overlay_color_set(Elm_Map_Overlay *overlay, int r, int g, int b, int a);
+        [ :elm_map_overlay_color_set, [ :elm_map_overlay, :int, :int, :int, :int ], :void ],
+        # EAPI void elm_map_overlay_color_get(const Elm_Map_Overlay *overlay, int *r, int *g, int *b, int *a);
+        [ :elm_map_overlay_color_get, [ :elm_map_overlay, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_map_overlay_show(Elm_Map_Overlay *overlay);
         [ :elm_map_overlay_show, [ :elm_map_overlay ], :void ],
         # EAPI void elm_map_overlays_show(Eina_List *overlays);
@@ -280,6 +191,39 @@ module Efl
         [ :elm_map_overlay_bubble_content_append, [ :elm_map_overlay, :evas_object ], :void ],
         # EAPI void elm_map_overlay_bubble_content_clear(Elm_Map_Overlay *bubble);
         [ :elm_map_overlay_bubble_content_clear, [ :elm_map_overlay ], :void ],
+        # EAPI Elm_Map_Overlay * elm_map_overlay_route_add(Evas_Object *obj, const Elm_Map_Route *route);
+        [ :elm_map_overlay_route_add, [ :evas_object, :elm_map_route ], :elm_map_overlay ],
+        # EAPI void elm_map_tile_load_status_get(const Evas_Object *obj, int *try_num, int *finish_num);
+        [ :elm_map_tile_load_status_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI const char **elm_map_sources_get(const Evas_Object *obj, Elm_Map_Source_Type type);
+        [ :elm_map_sources_get, [ :evas_object, :elm_map_source_type ], :pointer ],
+        # EAPI void elm_map_source_set(Evas_Object *obj, Elm_Map_Source_Type type, const char *source_name);
+        [ :elm_map_source_set, [ :evas_object, :elm_map_source_type, :string ], :void ],
+        # EAPI const char *elm_map_source_get(const Evas_Object *obj, Elm_Map_Source_Type type);
+        [ :elm_map_source_get, [ :evas_object, :elm_map_source_type ], :string ],
+        # EAPI Elm_Map_Route *elm_map_route_add(Evas_Object *obj, Elm_Map_Route_Type type, Elm_Map_Route_Method method, double flon, double flat, double tlon, double tlat, Elm_Map_Route_Cb route_cb, void *data);
+        [ :elm_map_route_add, [ :evas_object, :elm_map_route_type, :elm_map_route_method, :double, :double, :double, :double, :elm_map_route_cb,
+            :pointer ], :elm_map_route ],
+        # EAPI void elm_map_route_del(Elm_Map_Route *route);
+        [ :elm_map_route_del, [ :elm_map_route ], :void ],
+        # EAPI double elm_map_route_distance_get(const Elm_Map_Route *route);
+        [ :elm_map_route_distance_get, [ :elm_map_route ], :double ],
+        # EAPI const char *elm_map_route_node_get(const Elm_Map_Route *route);
+        [ :elm_map_route_node_get, [ :elm_map_route ], :string ],
+        # EAPI const char *elm_map_route_waypoint_get(const Elm_Map_Route *route);
+        [ :elm_map_route_waypoint_get, [ :elm_map_route ], :string ],
+        # EAPI Elm_Map_Name *elm_map_name_add(const Evas_Object *obj, const char *address, double lon, double lat, Elm_Map_Name_Cb name_cb, void *data);
+        [ :elm_map_name_add, [ :evas_object, :string, :double, :double, :elm_map_name_cb, :pointer ], :elm_map_name ],
+        # EAPI const char *elm_map_name_address_get(const Elm_Map_Name *name);
+        [ :elm_map_name_address_get, [ :elm_map_name ], :string ],
+        # EAPI void elm_map_name_region_get(const Elm_Map_Name *name, double *lon, double *lat);
+        [ :elm_map_name_region_get, [ :elm_map_name, :pointer, :pointer ], :void ],
+        # EAPI void elm_map_name_del(Elm_Map_Name *name);
+        [ :elm_map_name_del, [ :elm_map_name ], :void ],
+        # EAPI Evas_Object *elm_map_track_add(Evas_Object *obj, void *emap);
+        [ :elm_map_track_add, [ :evas_object, :pointer ], :evas_object ],
+        # EAPI void elm_map_track_remove(Evas_Object *obj, Evas_Object *route);
+        [ :elm_map_track_remove, [ :evas_object, :evas_object ], :void ],
         ]
         #
         attach_fcts fcts