Merge remote-tracking branch 'remotes/origin/upstream'
[framework/uifw/elementary.git] / src / lib / elm_map.c
index 85fa44d..dae8319 100644 (file)
@@ -6,55 +6,71 @@
 #include "elm_priv.h"
 #include "els_scroller.h"
 
+#define OVERLAY_CLASS_ZOOM_MAX 255
+
 #ifdef HAVE_ELEMENTARY_ECORE_CON
 
 typedef struct _Widget_Data Widget_Data;
+typedef struct _Path Path;
+typedef struct _Color Color;
+typedef struct _Region Region;
 typedef struct _Pan Pan;
 typedef struct _Grid Grid;
 typedef struct _Grid_Item Grid_Item;
 typedef struct _Overlay_Default Overlay_Default;
-typedef struct _Overlay_Group Overlay_Group;
 typedef struct _Overlay_Class Overlay_Class;
+typedef struct _Overlay_Group Overlay_Group;
 typedef struct _Overlay_Bubble Overlay_Bubble;
-typedef struct _Marker_Group Marker_Group;
-typedef struct _Marker_Bubble Marker_Bubble;
+typedef struct _Overlay_Route Overlay_Route;
+typedef struct _Overlay_Line Overlay_Line;
+typedef struct _Overlay_Polygon Overlay_Polygon;
+typedef struct _Overlay_Circle Overlay_Circle;
+typedef struct _Overlay_Scale Overlay_Scale;
 typedef struct _Path_Node Path_Node;
 typedef struct _Path_Waypoint Path_Waypoint;
-typedef struct _Url_Data Url_Data;
 typedef struct _Route_Dump Route_Dump;
 typedef struct _Name_Dump Name_Dump;
 typedef struct _Delayed_Data Delayed_Data;
-typedef struct _Map_Sources_Tab Map_Sources_Tab;
-
-#define ROUND(z) (((z) < 0) ? (int)ceil((z) - 0.005) : (int)floor((z) + 0.005))
-#define EVAS_MAP_POINT 4
-#define DEFAULT_TILE_SIZE 256
+typedef struct _Source_Tile Source_Tile;
+typedef struct _Source_Route Source_Route;
+typedef struct _Source_Name Source_Name;
+
+typedef char                      *(*Elm_Map_Module_Source_Name_Func)(void);
+typedef int                        (*Elm_Map_Module_Tile_Zoom_Min_Func)(void);
+typedef int                        (*Elm_Map_Module_Tile_Zoom_Max_Func)(void);
+typedef char                      *(*Elm_Map_Module_Tile_Url_Func)(const Evas_Object *obj, int x, int y, int zoom);
+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);
+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);
+typedef double                     (*Elm_Map_Module_Tile_Scale_Func)(const Evas_Object *obj, double lon, double lat, int zoom);
+typedef char                      *(*Elm_Map_Module_Route_Url_Func)(const Evas_Object *obj, const char *type_name, int method, double flon, double flat, double tlon, double tlat);
+typedef char                      *(*Elm_Map_Module_Name_Url_Func)(const Evas_Object *obj, int method, const char *name, double lon, double lat);
+
+#define ROUND(z)                (((z) < 0) ? (int)ceil((z) - 0.005) : (int)floor((z) + 0.005))
+#define EVAS_MAP_POINT          4
+#define DEFAULT_TILE_SIZE       256
 #define MAX_CONCURRENT_DOWNLOAD 10
+#define MARER_MAX_NUMBER        30
+#define OVERLAY_GROUPING_SCALE 2
 
-#define MARER_MAX_NUMBER 30
-
-#define CACHE_ROOT_PATH   "/tmp/elm_map"
-#define CACHE_PATH        CACHE_ROOT_PATH"/%d/%d/%d"
-#define CACHE_FILE_PATH   "%s/%d.png"
-#define DEST_ROUTE_XML_FILE "/tmp/elm_map-route-XXXXXX"
-#define DEST_NAME_XML_FILE "/tmp/elm_map-name-XXXXXX"
+#define CACHE_ROOT          "/tmp/elm_map"
+#define CACHE_TILE_ROOT     CACHE_ROOT"/%d/%d/%d"
+#define CACHE_TILE_PATH     "%s/%d.png"
+#define CACHE_ROUTE_ROOT    CACHE_ROOT"/route"
+#define CACHE_NAME_ROOT     CACHE_ROOT"/name"
 
-#define ROUTE_YOURS_URL "http://www.yournavigation.org/api/dev/route.php"
+#define ROUTE_YOURS_URL     "http://www.yournavigation.org/api/dev/route.php"
 #define ROUTE_TYPE_MOTORCAR "motocar"
-#define ROUTE_TYPE_BICYCLE "bicycle"
-#define ROUTE_TYPE_FOOT "foot"
-#define YOURS_DISTANCE "distance"
-#define YOURS_DESCRIPTION "description"
-#define YOURS_COORDINATES "coordinates"
-
-#define NAME_NOMINATIM_URL "http://nominatim.openstreetmap.org"
-#define NOMINATIM_RESULT "result"
-#define NOMINATIM_PLACE "place"
-#define NOMINATIM_ATTR_LON "lon"
-#define NOMINATIM_ATTR_LAT "lat"
-
-#define OVERLAY_CLASS_ZOOM_MAX 255
-#define OVERLAY_GROUPING_SCALE 2
+#define ROUTE_TYPE_BICYCLE  "bicycle"
+#define ROUTE_TYPE_FOOT     "foot"
+#define YOURS_DISTANCE      "distance"
+#define YOURS_DESCRIPTION   "description"
+#define YOURS_COORDINATES   "coordinates"
+
+#define NAME_NOMINATIM_URL  "http://nominatim.openstreetmap.org"
+#define NOMINATIM_RESULT    "result"
+#define NOMINATIM_PLACE     "place"
+#define NOMINATIM_ATTR_LON  "lon"
+#define NOMINATIM_ATTR_LAT  "lat"
 
 enum _Route_Xml_Attribute
 {
@@ -81,6 +97,16 @@ enum _Track_Xml_Attribute
    TRACK_XML_LAST
 } Track_Xml_Attibute;
 
+struct _Path
+{
+   Evas_Coord x, y;
+};
+
+struct _Region
+{
+   double lon, lat;
+};
+
 struct _Delayed_Data
 {
    void (*func)(void *data);
@@ -88,70 +114,77 @@ struct _Delayed_Data
    Elm_Map_Zoom_Mode mode;
    int zoom;
    double lon, lat;
-   Eina_List *markers;
    Eina_List *overlays;
 };
 
-// Map sources
-// Currently the size of a tile must be 256*256
-// and the size of the map must be pow(2.0, z)*tile_size
-struct _Map_Sources_Tab
+// FIXME: Currently tile size must be 256*256
+// and the map size is pow(2.0, z) * (tile size)
+struct _Source_Tile
 {
    const char *name;
    int zoom_min;
    int zoom_max;
-   Elm_Map_Module_Url_Func url_cb;
-   Elm_Map_Route_Sources route_source;
-   Elm_Map_Module_Route_Url_Func route_url_cb;
-   Elm_Map_Module_Name_Url_Func name_url_cb;
-   Elm_Map_Module_Geo_Into_Coord_Func geo_into_coord;
-   Elm_Map_Module_Coord_Into_Geo_Func coord_into_geo;
+   Elm_Map_Module_Tile_Url_Func url_cb;
+   Elm_Map_Module_Tile_Geo_to_Coord_Func geo_to_coord;
+   Elm_Map_Module_Tile_Coord_to_Geo_Func coord_to_geo;
+   Elm_Map_Module_Tile_Scale_Func scale_cb;
 };
 
-struct _Url_Data
+struct _Source_Route
 {
-   Ecore_Con_Url *con_url;
+   const char *name;
+   Elm_Map_Module_Route_Url_Func url_cb;
+};
 
-   FILE *fd;
-   char *fname;
+struct _Source_Name
+{
+   const char *name;
+   Elm_Map_Module_Name_Url_Func url_cb;
 };
 
-struct _Overlay_Default
+struct _Color
 {
-   Evas_Coord w, h;
+  int r, g, b, a;
+};
 
-   // Display priority is obj > icon > clas_obj > clas_icon > layout
-   Evas_Object *obj;
-   Evas_Object *icon;
+struct _Overlay_Group
+{
+   Widget_Data *wd;
+   double lon, lat;
+   Elm_Map_Overlay *overlay; // virtual group type overlay
+   Elm_Map_Overlay *clas;    // class overlay for this virtual group
+   Overlay_Default *ovl;     // rendered overlay
+   Eina_List *members;
+   Eina_Bool in : 1;
+   Eina_Bool boss : 1;
+};
 
-   // if obj or icon exists, do not inherit from class
-   Evas_Object *clas_obj;      // Duplicated from class icon
-   Evas_Object *clas_obj_ref;  // Checking fro class icon is changed
-   Evas_Object *clas_icon;     // Duplicated from class icon
-   Evas_Object *clas_icon_ref; // Checking for class icon is changed
+struct _Overlay_Default
+{
+   Widget_Data *wd;
+   Evas_Coord w, h;
 
-   char *style;
-   Evas_Object *layout;
    double lon, lat;
    Evas_Coord x, y;
-};
 
-struct _Overlay_Group
-{
-   Overlay_Default *ovl;
-   Evas_Object *clas_icon;
-   Elm_Map_Overlay *clas;
-   Eina_List *members;
+   // Display priority is content > icon > clas_obj > clas_icon > layout
+   Evas_Object *content;
+   Evas_Object *icon;
+
+   Color c;
+   // if clas_content or icon exists, do not inherit from class
+   Evas_Object *clas_content;      // Duplicated from class content
+   Evas_Object *clas_icon;         // Duplicated from class icon
+   Evas_Object *layout;
 };
 
 struct _Overlay_Class
 {
-   Elm_Map_Overlay *clas;
-   Evas_Object *obj;
-   char *style;
-   Evas_Object *icon;
+   Widget_Data *wd;
    Eina_List *members;
    int zoom_max;
+   Evas_Object *content;
+   Evas_Object *icon;
 };
 
 struct _Overlay_Bubble
@@ -163,111 +196,82 @@ struct _Overlay_Bubble
    Evas_Coord x, y, w, h;
 };
 
-struct _Elm_Map_Overlay
+struct _Overlay_Route
 {
    Widget_Data *wd;
 
-   Eina_Bool paused : 1;
-   Eina_Bool hide : 1;
-   Evas_Coord zoom_min;
-
-    void *data;               // user set data
-
-   Elm_Map_Overlay_Type type;
-   void *ovl;                 // Overlay Data for each type
-
-   // These are not used if overlay type is class
-   Eina_Bool grp_in : 1;
-   Eina_Bool grp_boss : 1;
-   Overlay_Group *grp;
-
-   Elm_Map_Overlay_Get_Cb cb;
-   void *cb_data;
+   Evas_Object *obj;
+   Eina_List *paths;
+   Eina_List *nodes;
 };
 
-struct _Elm_Map_Marker_Class
+struct _Overlay_Line
 {
-   const char *style;
-   struct _Elm_Map_Marker_Class_Func
-     {
-        Elm_Map_Marker_Get_Func get;
-        Elm_Map_Marker_Del_Func del; //if NULL the object will be destroyed with evas_object_del()
-        Elm_Map_Marker_Icon_Get_Func icon_get;
-     } func;
+   Widget_Data *wd;
+   double flon, flat, tlon, tlat;
+   Evas_Object *obj;
 };
 
-struct _Elm_Map_Group_Class
+struct _Overlay_Polygon
 {
    Widget_Data *wd;
-
-   Eina_List *markers;
-   int zoom_displayed; // display the group if the zoom is >= to zoom_display
-   int zoom_grouped;   // group the markers only if the zoom is <= to zoom_groups
-   const char *style;
-   void *data;
-   struct
-     {
-        Elm_Map_Group_Icon_Get_Func icon_get;
-     } func;
-
-   Eina_Bool hide : 1;
+   Eina_List *regions;  // list of Regions
+   Evas_Object *obj;
 };
 
-struct _Marker_Bubble
+struct _Overlay_Circle
 {
    Widget_Data *wd;
-   Evas_Object *pobj;
-   Evas_Object *obj, *sc, *bx;
+   double lon, lat;
+   double radius;    // Intial pixel in intial view
+   double ratio;    // initial-radius/map-size
+   Evas_Object *obj;
 };
 
-struct _Elm_Map_Marker
+struct _Overlay_Scale
 {
    Widget_Data *wd;
-   Elm_Map_Marker_Class *clas;
-   Elm_Map_Group_Class *group_clas;
-   double longitude, latitude;
+   Evas_Coord x, y;
    Evas_Coord w, h;
    Evas_Object *obj;
+ };
 
-   Evas_Coord x, y;
-   Eina_Bool grouped : 1;
-   Eina_Bool leader : 1; // if marker is group leader
-   Marker_Group *group;
-
-   Marker_Bubble *bubble;
-   Evas_Object *content;
-   void *data;
-};
-
-struct _Marker_Group
+struct _Elm_Map_Overlay
 {
    Widget_Data *wd;
-   Elm_Map_Group_Class *clas;
-   Evas_Coord w, h;
-   Evas_Object *obj;
 
-   Evas_Coord x, y;
-   Eina_List *markers;
+   Eina_Bool visible : 1;
+   Eina_Bool paused : 1;
+   Eina_Bool hide : 1;
+   Evas_Coord zoom_min;
+   Color c;
+   void *data;               // user set data
+
+   Elm_Map_Overlay_Type type;
+   void *ovl;                 // Overlay Data for each type
+
+   Elm_Map_Overlay_Get_Cb cb;
+   void *cb_data;
 
-   Marker_Bubble *bubble;
+   // These are not used if overlay type is class or group
+   Overlay_Group *grp;
 };
 
 struct _Elm_Map_Route
 {
    Widget_Data *wd;
 
-   Path_Node *n;
-   Path_Waypoint *w;
-   Ecore_Con_Url *con_url;
-
-   int type;
-   int method;
-   int x, y;
+   char *fname;
+   Elm_Map_Route_Type type;
+   Elm_Map_Route_Method method;
    double flon, flat, tlon, tlat;
+   Elm_Map_Route_Cb cb;
+   void *data;
+   Ecore_File_Download_Job *job;
 
-   Eina_List *nodes, *path;
-   Eina_List *waypoint;
 
+   Eina_List *nodes;
+   Eina_List *waypoint;
    struct
      {
         int node_count;
@@ -277,18 +281,8 @@ struct _Elm_Map_Route
         double distance; /* unit : km */
      } info;
 
-   Eina_List *handlers;
-   Url_Data ud;
-
-   struct
-     {
-        int r;
-        int g;
-        int b;
-        int a;
-     } color;
-
-   Eina_Bool inbound : 1;
+   Path_Node *n;
+   Path_Waypoint *w;
 };
 
 struct _Path_Node
@@ -314,12 +308,14 @@ struct _Elm_Map_Name
 {
    Widget_Data *wd;
 
-   Ecore_Con_Url *con_url;
    int method;
    char *address;
    double lon, lat;
-   Url_Data ud;
-   Ecore_Event_Handler *handler;
+
+   char *fname;
+   Ecore_File_Download_Job *job;
+   Elm_Map_Name_Cb cb;
+   void *data;
 };
 
 struct _Route_Dump
@@ -346,7 +342,7 @@ struct _Grid_Item
    Widget_Data *wd;
    Evas_Object *img;
    const char *file;
-   const char *source;
+   const char *url;
    int x, y;  // Tile coordinate
    Eina_Bool file_have : 1;
 
@@ -373,12 +369,24 @@ struct _Widget_Data
    Evas_Object *scr;
    Evas_Object *ges;
    Evas_Object *pan_smart;
-   Evas_Object *sep_maps_markers; // Tiles are below this and overlays are on top
+   Evas_Object *sep_maps_overlays; // Tiles are below this and overlays are on top
    Evas_Map *map;
 
-   Map_Sources_Tab *src;
-   Eina_List *srcs;
-   const char **src_names;
+   Eina_Array *src_tile_mods;
+   Source_Tile *src_tile;
+   Eina_List *src_tiles;
+   const char **src_tile_names;
+
+   Eina_Array *src_route_mods;
+   Source_Route *src_route;
+   Eina_List *src_routes;
+   const char **src_route_names;
+
+   Eina_Array *src_name_mods;
+   Source_Name *src_name;
+   Eina_List *src_names;
+   const char **src_name_names;
+
    int zoom_min, zoom_max;
    int tsize;
 
@@ -387,8 +395,6 @@ struct _Widget_Data
 
    int zoom;
    double zoom_detail;
-   double prev_lon, prev_lat;
-   Evas_Coord ox, oy;
    struct
      {
         int w, h;  // Current pixel width, heigth of a grid
@@ -430,39 +436,63 @@ struct _Widget_Data
 
    Eina_Bool wheel_disabled : 1;
 
-   unsigned int markers_max_num;
-   Eina_Bool paused_markers : 1;
-   Eina_List *group_classes;
-   Eina_List *marker_classes;
-   Eina_List *markers;
-
-   Elm_Map_Route_Sources route_source;
-   Eina_List *route;
+   Eina_List *routes;
    Eina_List *track;
    Eina_List *names;
 
    Eina_List *overlays;
+   Eina_List *group_overlays;
+   Eina_List *all_overlays;
 };
 
-static char *_mapnik_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
-static char *_osmarender_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
-static char *_cyclemap_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
-static char *_mapquest_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
-static char *_mapquest_aerial_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
-static char *_yours_url_cb(Evas_Object *obj __UNUSED__, char *type_name, int method, double flon, double flat, double tlon, double tlat);
-static char *_nominatim_url_cb(Evas_Object *obj, int method, char *name, double lon, double lat);
+static char *_mapnik_url_cb(const Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+static char *_osmarender_url_cb(const Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+static char *_cyclemap_url_cb(const Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+static char *_mapquest_url_cb(const Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+static char *_mapquest_aerial_url_cb(const Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+static char *_yours_url_cb(const Evas_Object *obj __UNUSED__, const char *type_name, int method, double flon, double flat, double tlon, double tlat);
+static char *_nominatim_url_cb(const Evas_Object *obj, int method, const char *name, double lon, double lat);
 /*
 static char *_monav_url_cb(Evas_Object *obj __UNUSED__, char *type_name, int method, double flon, double flat, double tlon, double tlat)
 static char *_ors_url_cb(Evas_Object *obj __UNUSED__, char *type_name, int method, double flon, double flat, double tlon, double tlat);
 */
+static double _scale_cb(const Evas_Object *obj __UNUSED__, double lon __UNUSED__, double lat, int zoom);
+
+const Source_Tile src_tiles[] =
+{
+   {"Mapnik", 0, 18, _mapnik_url_cb, NULL, NULL, _scale_cb},
+   {"Osmarender", 0, 17, _osmarender_url_cb, NULL, NULL, _scale_cb},
+   {"CycleMap", 0, 16, _cyclemap_url_cb, NULL, NULL, _scale_cb},
+   {"MapQuest", 0, 18, _mapquest_url_cb, NULL, NULL, _scale_cb},
+   {"MapQuest Open Aerial", 0, 11, _mapquest_aerial_url_cb, NULL, NULL, _scale_cb}
+};
 
-static Map_Sources_Tab default_map_sources_tab[] =
+// FIXME: Fix more open sources
+const Source_Route src_routes[] =
 {
-     {"Mapnik", 0, 18, _mapnik_url_cb, ELM_MAP_ROUTE_SOURCE_YOURS, _yours_url_cb, _nominatim_url_cb, NULL, NULL},
-     {"Osmarender", 0, 17, _osmarender_url_cb, ELM_MAP_ROUTE_SOURCE_YOURS, _yours_url_cb, _nominatim_url_cb, NULL, NULL},
-     {"CycleMap", 0, 16, _cyclemap_url_cb, ELM_MAP_ROUTE_SOURCE_YOURS, _yours_url_cb, _nominatim_url_cb, NULL, NULL},
-     {"MapQuest", 0, 18, _mapquest_url_cb, ELM_MAP_ROUTE_SOURCE_YOURS, _yours_url_cb, _nominatim_url_cb, NULL, NULL},
-     {"MapQuest Open Aerial", 0, 11, _mapquest_aerial_url_cb, ELM_MAP_ROUTE_SOURCE_YOURS, _yours_url_cb, _nominatim_url_cb, NULL, NULL},
+   {"Yours", _yours_url_cb}    // http://www.yournavigation.org/
+   //{"Monav", _monav_url_cb},
+   //{"ORS", _ors_url_cb},     // http://www.openrouteservice.org
+};
+
+// Refer : http://wiki.openstreetmap.org/wiki/FAQ
+// meters per pixel when latitude is 0 (equator)
+// meters per pixel  = _osm_scale_meter[zoom] * cos (latitude)
+const double _osm_scale_meter[] =
+{78206, 39135.758482, 19567.879241, 9783.939621, 4891.969810,
+ 2445.984905, 1222.992453, 611.496226, 305.748113, 152.874057, 76.437028,
+ 38.218514, 19.109257, 9.554629, 4.777314, 2.388657, 1.194329, 0.597164,
+ 0.29858};
+
+// Scale in meters
+const double _scale_tb[] =
+{10000000, 5000000, 2000000, 1000000, 500000, 200000, 100000, 50000,
+ 20000, 10000, 5000, 2000, 1000, 500, 500, 200, 100, 50, 20, 10, 5, 2, 1};
+
+// FIXME: Add more open sources
+const Source_Name src_names[] =
+{
+   {"Nominatim", _nominatim_url_cb}
 };
 
 static const char *widtype = NULL;
@@ -471,156 +501,58 @@ static Evas_Smart_Class sc;
 static Evas_Smart *smart;
 static int idnum = 1;
 
-static const char SIG_CHANGED[] = "changed";
-static const char SIG_CLICKED[] = "clicked";
-static const char SIG_CLICKED_DOUBLE[] = "clicked,double";
-static const char SIG_LOADED_DETAIL[] = "loaded,detail";
-static const char SIG_LOAD_DETAIL[] = "load,detail";
-static const char SIG_LONGPRESSED[] = "longpressed";
-static const char SIG_PRESS[] = "press";
-static const char SIG_SCROLL[] = "scroll";
-static const char SIG_SCROLL_DRAG_START[] = "scroll,drag,start";
-static const char SIG_SCROLL_DRAG_STOP[] = "scroll,drag,stop";
-static const char SIG_SCROLL_ANIM_START[] = "scroll,anim,start";
-static const char SIG_SCROLL_ANIM_STOP[] = "scroll,anim,stop";
-static const char SIG_ZOOM_CHANGE[] = "zoom,change";
-static const char SIG_ZOOM_START[] = "zoom,start";
-static const char SIG_ZOOM_STOP[] = "zoom,stop";
-static const char SIG_DOWNLOADED[] = "downloaded";
-static const char SIG_ROUTE_LOAD[] = "route,load";
-static const char SIG_ROUTE_LOADED[] = "route,loaded";
-static const char SIG_NAME_LOAD[] = "name,load";
-static const char SIG_NAME_LOADED[] = "name,loaded";
-static const char SIG_OVERLAY_CLICKED[] = "overlay,clicked";
+static const char SIG_CLICKED[] =            "clicked";
+static const char SIG_CLICKED_DOUBLE[] =     "clicked,double";
+static const char SIG_PRESS[] =              "press";
+static const char SIG_LONGPRESSED[] =        "longpressed";
+static const char SIG_SCROLL[] =             "scroll";
+static const char SIG_SCROLL_DRAG_START[] =  "scroll,drag,start";
+static const char SIG_SCROLL_DRAG_STOP[] =   "scroll,drag,stop";
+static const char SIG_SCROLL_ANIM_START[] =  "scroll,anim,start";
+static const char SIG_SCROLL_ANIM_STOP[] =   "scroll,anim,stop";
+static const char SIG_ZOOM_START[] =         "zoom,start";
+static const char SIG_ZOOM_STOP[] =          "zoom,stop";
+static const char SIG_ZOOM_CHANGE[] =        "zoom,change";
+static const char SIG_LOADED[] =               "loaded";
+static const char SIG_TILE_LOAD[] =          "tile,load";
+static const char SIG_TILE_LOADED[] =        "tile,loaded";
+static const char SIG_TILE_LOADED_FAIL[] =   "tile,loaded,fail";
+static const char SIG_ROUTE_LOAD[] =         "route,load";
+static const char SIG_ROUTE_LOADED[] =       "route,loaded";
+static const char SIG_ROUTE_LOADED_FAIL[] =  "route,loaded,fail";
+static const char SIG_NAME_LOAD[] =          "name,load";
+static const char SIG_NAME_LOADED[] =        "name,loaded";
+static const char SIG_NAME_LOADED_FAIL[] =   "name,loaded,fail";
+static const char SIG_OVERLAY_CLICKED[] =    "overlay,clicked";
 static const Evas_Smart_Cb_Description _signals[] = {
-       {SIG_CHANGED, ""},
        {SIG_CLICKED, ""},
        {SIG_CLICKED_DOUBLE, ""},
-       {SIG_LOADED_DETAIL, ""},
-       {SIG_LOAD_DETAIL, ""},
-       {SIG_LONGPRESSED, ""},
        {SIG_PRESS, ""},
+       {SIG_LONGPRESSED, ""},
        {SIG_SCROLL, ""},
        {SIG_SCROLL_DRAG_START, ""},
        {SIG_SCROLL_DRAG_STOP, ""},
        {SIG_SCROLL_ANIM_START, ""},
        {SIG_SCROLL_ANIM_STOP, ""},
-       {SIG_ZOOM_CHANGE, ""},
        {SIG_ZOOM_START, ""},
        {SIG_ZOOM_STOP, ""},
-       {SIG_DOWNLOADED, ""},
+       {SIG_ZOOM_CHANGE, ""},
+       {SIG_LOADED, ""},
+       {SIG_TILE_LOAD, ""},
+       {SIG_TILE_LOADED, ""},
+       {SIG_TILE_LOADED_FAIL, ""},
        {SIG_ROUTE_LOAD, ""},
        {SIG_ROUTE_LOADED, ""},
+       {SIG_ROUTE_LOADED_FAIL, ""},
        {SIG_NAME_LOAD, ""},
        {SIG_NAME_LOADED, ""},
+       {SIG_NAME_LOADED_FAIL, ""},
        {SIG_OVERLAY_CLICKED, ""},
        {NULL, NULL}
 };
 
-static Eina_Bool
-module_list_cb(Eina_Module *m, void *data)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(data,EINA_FALSE);
-   Widget_Data *wd = data;
-
-   Map_Sources_Tab *s;
-   Elm_Map_Module_Source_Func source;
-   Elm_Map_Module_Zoom_Min_Func zoom_min;
-   Elm_Map_Module_Zoom_Max_Func zoom_max;
-   Elm_Map_Module_Url_Func url;
-   Elm_Map_Module_Route_Source_Func route_source;
-   Elm_Map_Module_Route_Url_Func route_url;
-   Elm_Map_Module_Name_Url_Func name_url;
-   Elm_Map_Module_Geo_Into_Coord_Func geo_into_coord;
-   Elm_Map_Module_Coord_Into_Geo_Func coord_into_geo;
-   const char *file;
-
-   file = eina_module_file_get(m);
-   if (!eina_module_load(m))
-     {
-        ERR("could not load module \"%s\": %s", file,
-            eina_error_msg_get(eina_error_get()));
-        return EINA_FALSE;
-     }
-
-   source = eina_module_symbol_get(m, "map_module_source_get");
-   zoom_min = eina_module_symbol_get(m, "map_module_zoom_min_get");
-   zoom_max = eina_module_symbol_get(m, "map_module_zoom_max_get");
-   url = eina_module_symbol_get(m, "map_module_url_get");
-   route_source = eina_module_symbol_get(m, "map_module_route_source_get");
-   route_url = eina_module_symbol_get(m, "map_module_route_url_get");
-   name_url = eina_module_symbol_get(m, "map_module_name_url_get");
-   geo_into_coord = eina_module_symbol_get(m, "map_module_geo_into_coord");
-   coord_into_geo = eina_module_symbol_get(m, "map_module_coord_into_geo");
-   if ((!source) || (!zoom_min) || (!zoom_max) || (!url) || (!route_source) ||
-       (!route_url) || (!name_url) || (!geo_into_coord) || (!coord_into_geo))
-     {
-        WRN("could not find map_module_source_get() in module \"%s\": %s",
-            file, eina_error_msg_get(eina_error_get()));
-        eina_module_unload(m);
-        return EINA_FALSE;
-     }
-   s = ELM_NEW(Map_Sources_Tab);
-   s->name = source();
-   s->zoom_min = zoom_min();
-   s->zoom_max = zoom_max();
-   s->url_cb = url;
-   s->route_source = route_source();
-   s->route_url_cb = route_url;
-   s->name_url_cb = name_url;
-   s->geo_into_coord = geo_into_coord;
-   s->coord_into_geo = coord_into_geo;
-   wd->srcs = eina_list_append(wd->srcs, s);
-
-   eina_module_unload(m);
-   return EINA_TRUE;
-}
-
-static void
-source_init(Widget_Data *wd)
-{
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-
-   Map_Sources_Tab *s;
-   unsigned int idx;
-   Eina_Array *modules = NULL;
-   Eina_List *l;
-
-   for (idx = 0; idx < (sizeof(default_map_sources_tab) / sizeof(Map_Sources_Tab)); idx++)
-     {
-        s = ELM_NEW(Map_Sources_Tab);
-        s->name = default_map_sources_tab[idx].name;
-        s->zoom_min = default_map_sources_tab[idx].zoom_min;
-        s->zoom_max = default_map_sources_tab[idx].zoom_max;
-        s->url_cb = default_map_sources_tab[idx].url_cb;
-        s->route_source = default_map_sources_tab[idx].route_source;
-        s->route_url_cb = default_map_sources_tab[idx].route_url_cb;
-        s->name_url_cb = default_map_sources_tab[idx].name_url_cb;
-        s->geo_into_coord = default_map_sources_tab[idx].geo_into_coord;
-        s->coord_into_geo = default_map_sources_tab[idx].coord_into_geo;
-        wd->srcs = eina_list_append(wd->srcs, s);
-        if (!idx)
-          {
-             wd->src = s;
-             wd->zoom_min = s->zoom_min;
-             wd->zoom_max = s->zoom_max;
-          }
-     }
-   modules = eina_module_list_get(modules, MODULES_PATH, 1, &module_list_cb, wd);
-   eina_array_free(modules);
-
-   wd->src_names = calloc((eina_list_count(wd->srcs) + 1), sizeof(char *));
-   idx = 0;
-   EINA_LIST_FOREACH(wd->srcs, l, s)
-     {
-        eina_stringshare_replace(&wd->src_names[idx], s->name);
-        INF("source : %s", wd->src_names[idx]);
-        idx++;
-     }
-}
-
 static void
-_edj_marker_size_get(Widget_Data *wd, Evas_Coord *w, Evas_Coord *h)
+_edj_overlay_size_get(Widget_Data *wd, Evas_Coord *w, Evas_Coord *h)
 {
    EINA_SAFETY_ON_NULL_RETURN(wd);
    EINA_SAFETY_ON_NULL_RETURN(w);
@@ -642,56 +574,14 @@ _edj_marker_size_get(Widget_Data *wd, Evas_Coord *w, Evas_Coord *h)
 }
 
 static void
-_coord_rotate(const Evas_Coord x, const Evas_Coord y, const Evas_Coord cx, const Evas_Coord cy, const double degree, Evas_Coord *xx, Evas_Coord *yy)
+_rotate(Evas_Coord x, Evas_Coord y, Evas_Coord cx, Evas_Coord cy, double degree, Evas_Coord *xx, Evas_Coord *yy)
 {
-   EINA_SAFETY_ON_NULL_RETURN(xx);
-   EINA_SAFETY_ON_NULL_RETURN(yy);
-
    double r = (degree * M_PI) / 180.0;
-   double tx, ty, ttx, tty;
-
-   tx = x - cx;
-   ty = y - cy;
-
-   ttx = tx * cos(r);
-   tty = tx * sin(r);
-   tx = ttx + (ty * cos(r + M_PI_2));
-   ty = tty + (ty * sin(r + M_PI_2));
-
-   *xx = tx + cx;
-   *yy = ty + cy;
-}
-
-static void
-_viewport_size_get(Widget_Data *wd, Evas_Coord *vw, Evas_Coord *vh)
-{
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-
-   Evas_Coord x, y, w, h;
-   evas_object_geometry_get(wd->pan_smart, &x, &y, &w, &h);
-   if (vw) *vw = (x * 2) + w;
-   if (vh) *vh = (y * 2) + h;
+   if (xx) *xx = ((x - cx) * cos(r)) + ((y - cy) * cos(r + M_PI_2)) + cx;
+   if (yy) *yy = ((x - cx) * sin(r)) + ((y - cy) * sin(r + M_PI_2)) + cy;
 }
 
 static void
-_pan_geometry_get(Widget_Data *wd, Evas_Coord *px, Evas_Coord *py)
-{
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-
-   Evas_Coord x, y, vx, vy, vw, vh;
-   elm_smart_scroller_child_pos_get(wd->scr, &x, &y);
-   evas_object_geometry_get(wd->pan_smart, &vx, &vy, &vw, &vh);
-   x = -x;
-   y = -y;
-   if (vw > wd->size.w) x += (((vw - wd->size.w) / 2) + vx);
-   else x -= vx;
-   if (vh > wd->size.h) y += (((vh - wd->size.h) / 2) + vy);
-   else y -= vy;
-   if (px) *px = x;
-   if (py) *py = y;
- }
-
-static void
 _obj_rotate(Widget_Data *wd, Evas_Object *obj)
 {
    Evas_Coord w, h, ow, oh;
@@ -723,463 +613,109 @@ _obj_place(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coor
 }
 
 static void
-_region_show(void *data)
+_coord_to_region_convert(Widget_Data *wd, Evas_Coord x, Evas_Coord y, Evas_Coord size, double *lon, double *lat)
 {
-   EINA_SAFETY_ON_NULL_RETURN(data);
-   Delayed_Data *dd = data;
-   int x, y, w, h;
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+   int zoom = floor(log(size / wd->size.tile) / log(2));
+   if ((wd->src_tile) && (wd->src_tile->coord_to_geo))
+     {
+        if (wd->src_tile->coord_to_geo(wd->obj, zoom, x, y, size, lon, lat))
+           return;
+     }
 
-   elm_map_utils_convert_geo_into_coord(dd->wd->obj, dd->lon, dd->lat,
-                                        dd->wd->size.w, &x, &y);
-   _viewport_size_get(dd->wd, &w, &h);
-   x = x - (w / 2);
-   y = y - (h / 2);
-   elm_smart_scroller_child_region_show(dd->wd->scr, x, y, w, h);
-   evas_object_smart_changed(dd->wd->pan_smart);
+   if (lon) *lon = (x / (double)size * 360.0) - 180;
+   if (lat)
+     {
+        double n = ELM_PI - (2.0 * ELM_PI * y / size);
+        *lat = 180.0 / ELM_PI * atan(0.5 * (exp(n) - exp(-n)));
+     }
 }
 
 static void
-_bubble_update(Marker_Bubble *bubble, Eina_List *contents)
+_region_to_coord_convert(Widget_Data *wd, double lon, double lat, Evas_Coord size, Evas_Coord *x, Evas_Coord *y)
 {
-   EINA_SAFETY_ON_NULL_RETURN(bubble);
-   EINA_SAFETY_ON_NULL_RETURN(contents);
-
-   Eina_List *l;
-   Evas_Object *c;
+   EINA_SAFETY_ON_NULL_RETURN(wd);
 
-   elm_box_clear(bubble->bx);
-   EINA_LIST_FOREACH(contents, l, c) elm_box_pack_end(bubble->bx, c);
+   int zoom = floor(log(size / 256) / log(2));
+   if ((wd->src_tile) && (wd->src_tile->geo_to_coord))
+     {
+        if (wd->src_tile->geo_to_coord(wd->obj, zoom, lon, lat, size, x, y)) return;
+     }
+   if (x) *x = floor((lon + 180.0) / 360.0 * size);
+   if (y)
+      *y = floor((1.0 - log(tan(lat * ELM_PI / 180.0) + (1.0 / cos(lat * ELM_PI / 180.0)))
+                 / ELM_PI) / 2.0 * size);
 }
 
 static void
-_bubble_place(Marker_Bubble *bubble)
+_viewport_coord_get(Widget_Data *wd, Evas_Coord *vx, Evas_Coord *vy, Evas_Coord *vw, Evas_Coord *vh)
 {
-   EINA_SAFETY_ON_NULL_RETURN(bubble);
+   EINA_SAFETY_ON_NULL_RETURN(wd);
 
    Evas_Coord x, y, w, h;
-   Evas_Coord xx, yy, ww, hh;
-   const char *s;
-
-   if ((!bubble->obj) || (!bubble->pobj)) return;
-   evas_object_geometry_get(bubble->pobj, &x, &y, &w, NULL);
-
-   s = edje_object_data_get(bubble->obj, "size_w");
-   if (s) ww = atoi(s);
-   else ww = 0;
-
-   edje_object_size_min_calc(bubble->obj, NULL, &hh);
-   s = edje_object_data_get(bubble->obj, "size_h");
-   if (s) h = atoi(s);
-   else h = 0;
-   if (hh < h) hh = h;
-
-   xx = x + (w / 2) - (ww / 2);
-   yy = y - hh;
-
-   _obj_place(bubble->obj, xx, yy, ww, hh);
-   evas_object_raise(bubble->obj);
+   elm_smart_scroller_child_pos_get(wd->scr, &x, &y);
+   elm_smart_scroller_child_viewport_size_get(wd->scr, &w, &h);
+   if (w > wd->size.w) x -= ((w - wd->size.w) / 2);
+   if (h > wd->size.h) y -= ((h - wd->size.h) / 2);
+   if (vx) *vx = x;
+   if (vy) *vy = y;
+   if (vw) *vw = w;
+   if (vh) *vh = h;
 }
 
+// Map coordinates to canvas geometry without rotate
 static void
-_bubble_sc_hints_changed_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_coord_to_canvas_no_rotate(Widget_Data *wd, Evas_Coord x, Evas_Coord y, Evas_Coord *xx, Evas_Coord *yy)
 {
-   Marker_Bubble *bubble = data;
-   EINA_SAFETY_ON_NULL_RETURN(bubble);
-   _bubble_place(data);
+   Evas_Coord vx, vy, sx, sy;
+   _viewport_coord_get(wd, &vx, &vy, NULL, NULL);
+   evas_object_geometry_get(wd->pan_smart, &sx, &sy, NULL, NULL);
+   if (xx) *xx = x - vx + sx;
+   if (yy) *yy = y - vy + sy;
 }
 
+// Map coordinates to canvas geometry
 static void
-_bubble_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_coord_to_canvas(Widget_Data *wd, Evas_Coord x, Evas_Coord y, Evas_Coord *xx, Evas_Coord *yy)
 {
-   Marker_Bubble *bubble = data;
-   EINA_SAFETY_ON_NULL_RETURN(bubble);
-   _bubble_place(bubble);
+   _coord_to_canvas_no_rotate(wd, x, y, &x, &y);
+   _rotate(x, y, wd->rotate.cx, wd->rotate.cy, wd->rotate.d, &x, &y);
+   if (xx) *xx = x;
+   if (yy) *yy = y;
 }
 
+// Canvas geometry to map coordinates
 static void
-_bubble_hide_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_canvas_to_coord(Widget_Data *wd, Evas_Coord x, Evas_Coord y, Evas_Coord *xx, Evas_Coord *yy)
 {
-   Marker_Bubble *bubble = data;
-   EINA_SAFETY_ON_NULL_RETURN(bubble);
-   evas_object_hide(bubble->obj);
+   Evas_Coord vx, vy, sx, sy;
+   _viewport_coord_get(wd, &vx, &vy, NULL, NULL);
+   evas_object_geometry_get(wd->pan_smart, &sx, &sy, NULL, NULL);
+   _rotate(x - sx + vx, y - sy + vy,  wd->rotate.cx - sx + vx,
+                 wd->rotate.cy - sy + vy,  -wd->rotate.d, &x, &y);
+   if (xx) *xx = x;
+   if (yy) *yy = y;
 }
 
 static void
-_bubble_show_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_region_show(void *data)
 {
-   Marker_Bubble *bubble = data;
-   EINA_SAFETY_ON_NULL_RETURN(bubble);
-   _bubble_place(bubble);
-}
+   EINA_SAFETY_ON_NULL_RETURN(data);
+   Delayed_Data *dd = data;
+   int x, y, w, h;
 
-static void
-_bubble_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   Marker_Bubble *bubble = data;
-   EINA_SAFETY_ON_NULL_RETURN(bubble);
-   _bubble_place(bubble);
+   _region_to_coord_convert(dd->wd, dd->lon, dd->lat, dd->wd->size.w, &x, &y);
+   _viewport_coord_get(dd->wd, NULL, NULL, &w, &h);
+   x = x - (w / 2);
+   y = y - (h / 2);
+   elm_smart_scroller_child_region_show(dd->wd->scr, x, y, w, h);
+   evas_object_smart_changed(dd->wd->pan_smart);
 }
 
 static void
-_bubble_free(Marker_Bubble* bubble)
+_grid_item_coord_get(Grid_Item *gi, int *x, int *y, int *w, int *h)
 {
-   EINA_SAFETY_ON_NULL_RETURN(bubble);
-
-   evas_object_del(bubble->bx);
-   evas_object_del(bubble->sc);
-   evas_object_del(bubble->obj);
-   free(bubble);
-}
-
-static Marker_Bubble*
-_bubble_create(Evas_Object *pobj, Widget_Data *wd)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(pobj, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
-
-   Marker_Bubble *bubble = ELM_NEW(Marker_Bubble);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(bubble, NULL);
-
-   bubble->wd = wd;
-   bubble->pobj = pobj;
-   evas_object_event_callback_add(pobj, EVAS_CALLBACK_HIDE, _bubble_hide_cb,
-                                  bubble);
-   evas_object_event_callback_add(pobj, EVAS_CALLBACK_SHOW, _bubble_show_cb,
-                                  bubble);
-   evas_object_event_callback_add(pobj, EVAS_CALLBACK_MOVE, _bubble_move_cb,
-                                  bubble);
-
-   bubble->obj = edje_object_add(evas_object_evas_get(pobj));
-   _elm_theme_object_set(wd->obj, bubble->obj , "map", "marker_bubble",
-                         elm_widget_style_get(wd->obj));
-   evas_object_event_callback_add(bubble->obj, EVAS_CALLBACK_MOUSE_UP,
-                                  _bubble_mouse_up_cb, bubble);
-
-   bubble->sc = elm_scroller_add(bubble->obj);
-   elm_widget_style_set(bubble->sc, "map_bubble");
-   elm_scroller_content_min_limit(bubble->sc, EINA_FALSE, EINA_TRUE);
-   elm_scroller_policy_set(bubble->sc, ELM_SCROLLER_POLICY_AUTO,
-                           ELM_SCROLLER_POLICY_OFF);
-   elm_scroller_bounce_set(bubble->sc, _elm_config->thumbscroll_bounce_enable,
-                           EINA_FALSE);
-   edje_object_part_swallow(bubble->obj, "elm.swallow.content", bubble->sc);
-   evas_object_event_callback_add(bubble->sc, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                  _bubble_sc_hints_changed_cb, bubble);
-
-   bubble->bx = elm_box_add(bubble->sc);
-   evas_object_size_hint_align_set(bubble->bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   evas_object_size_hint_weight_set(bubble->bx, EVAS_HINT_EXPAND,
-                                    EVAS_HINT_EXPAND);
-   elm_box_horizontal_set(bubble->bx, EINA_TRUE);
-   elm_object_content_set(bubble->sc, bubble->bx);
-
-   return bubble;
-}
-
-static void
-_marker_group_update(Marker_Group* group, Elm_Map_Group_Class *clas, Eina_List *markers)
-{
-   EINA_SAFETY_ON_NULL_RETURN(group);
-   EINA_SAFETY_ON_NULL_RETURN(clas);
-   EINA_SAFETY_ON_NULL_RETURN(markers);
-   Widget_Data *wd = clas->wd;
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-
-   char buf[PATH_MAX];
-   Eina_List *l;
-   Elm_Map_Marker *marker;
-   int cnt = 0;
-   int sum_x = 0, sum_y = 0;
-
-   EINA_LIST_FOREACH(markers, l, marker)
-     {
-        sum_x += marker->x;
-        sum_y += marker->y;
-        cnt++;
-     }
-
-   group->x = sum_x / cnt;
-   group->y = sum_y / cnt;
-   _edj_marker_size_get(wd, &group->w, &group->h);
-   group->w *=2;
-   group->h *=2;
-   group->clas = clas;
-   group->markers = markers;
-
-   if (clas->style) elm_layout_theme_set(group->obj, "map/marker", clas->style,
-                                         elm_widget_style_get(wd->obj));
-   else elm_layout_theme_set(group->obj, "map/marker", "radio",
-                             elm_widget_style_get(wd->obj));
-
-
-   if (clas->func.icon_get)
-     {
-        Evas_Object *icon = NULL;
-
-        icon = elm_object_part_content_get(group->obj, "elm.icon");
-        if (icon) evas_object_del(icon);
-
-        icon = clas->func.icon_get(wd->obj, clas->data);
-        elm_object_part_content_set(group->obj, "elm.icon", icon);
-     }
-   snprintf(buf, sizeof(buf), "%d", cnt);
-   edje_object_part_text_set(elm_layout_edje_get(group->obj), "elm.text", buf);
-
-   if (group->bubble)
-      {
-         Eina_List *contents = NULL;
-
-         EINA_LIST_FOREACH(group->markers, l, marker)
-           {
-              Evas_Object *c = marker->clas->func.get(marker->wd->obj,
-                                                      marker, marker->data);
-              if (c) contents = eina_list_append(contents, c);
-           }
-         _bubble_update(group->bubble, contents);
-      }
-}
-
-static void
-_marker_group_bubble_open_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *soure __UNUSED__)
-{
-   EINA_SAFETY_ON_NULL_RETURN(data);
-   Marker_Group *group = data;
-   Eina_List *l;
-   Elm_Map_Marker *marker;
-   Eina_List *contents = NULL;
-
-   if (!group->bubble) group->bubble = _bubble_create(group->obj, group->wd);
-
-   EINA_LIST_FOREACH(group->markers, l, marker)
-     {
-        if (group->wd->markers_max_num <= eina_list_count(contents)) break;
-        Evas_Object *c = marker->clas->func.get(marker->wd->obj,
-                                                marker, marker->data);
-        if (c) contents = eina_list_append(contents, c);
-     }
-   _bubble_update(group->bubble, contents);
-   _bubble_place(group->bubble);
-}
-
-static void
-_marker_group_bringin_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *soure __UNUSED__)
-{
-   EINA_SAFETY_ON_NULL_RETURN(data);
-
-   double lon, lat;
-   Marker_Group *group = data;
-   elm_map_utils_convert_coord_into_geo(group->wd->obj, group->x, group->y,
-                                        group->wd->size.w, &lon, &lat);
-   elm_map_geo_region_bring_in(group->wd->obj, lon, lat);
-}
-
-static void
-_marker_group_free(Marker_Group* group)
-{
-   EINA_SAFETY_ON_NULL_RETURN(group);
-
-   if (group->bubble) _bubble_free(group->bubble);
-
-   eina_list_free(group->markers);
-   evas_object_del(group->obj);
-
-   free(group);
-}
-
-static Marker_Group*
-_marker_group_create(Widget_Data *wd)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
-
-   Marker_Group *group = ELM_NEW(Marker_Group);
-
-   group->wd = wd;
-   group->obj = elm_layout_add(wd->obj);
-   evas_object_smart_member_add(group->obj, wd->pan_smart);
-   evas_object_stack_above(group->obj, wd->sep_maps_markers);
-   elm_layout_theme_set(group->obj, "map/marker", "radio",
-                        elm_widget_style_get(wd->obj));
-   edje_object_signal_callback_add(elm_layout_edje_get(group->obj),
-                                   "open", "elm", _marker_group_bubble_open_cb,
-                                   group);
-   edje_object_signal_callback_add(elm_layout_edje_get(group->obj),
-                                   "bringin", "elm", _marker_group_bringin_cb,
-                                   group);
-   return group;
-}
-
-static void
-_marker_bringin_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *soure __UNUSED__)
-{
-   Elm_Map_Marker *marker = data;
-   EINA_SAFETY_ON_NULL_RETURN(marker);
-   elm_map_geo_region_bring_in(marker->wd->obj, marker->longitude, marker->latitude);
-}
-
-static void
-_marker_bubble_open_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *soure __UNUSED__)
-{
-   EINA_SAFETY_ON_NULL_RETURN(data);
-   Elm_Map_Marker *marker = data;
-
-   if (!marker->bubble) marker->bubble = _bubble_create(marker->obj, marker->wd);
-   evas_object_smart_changed(marker->wd->pan_smart);
-}
-
-static void
-_marker_update(Elm_Map_Marker *marker)
-{
-   EINA_SAFETY_ON_NULL_RETURN(marker);
-   Elm_Map_Marker_Class *clas = marker->clas;
-   EINA_SAFETY_ON_NULL_RETURN(clas);
-
-   if (clas->style) elm_layout_theme_set(marker->obj, "map/marker", clas->style,
-                                         elm_widget_style_get(marker->wd->obj));
-   else elm_layout_theme_set(marker->obj, "map/marker", "radio",
-                             elm_widget_style_get(marker->wd->obj));
-
-   if (clas->func.icon_get)
-     {
-        Evas_Object *icon = NULL;
-
-        icon = elm_object_part_content_get(marker->obj, "elm.icon");
-        if (icon) evas_object_del(icon);
-
-        icon = clas->func.icon_get(marker->wd->obj, marker, marker->data);
-        elm_object_part_content_set(marker->obj, "elm.icon", icon);
-     }
-
-   elm_map_utils_convert_geo_into_coord(marker->wd->obj, marker->longitude,
-                                        marker->latitude, marker->wd->size.w,
-                                        &(marker->x), &(marker->y));
-
-    if (marker->bubble)
-      {
-         if (marker->content) evas_object_del(marker->content);
-         if (marker->clas->func.get)
-            marker->content = marker->clas->func.get(marker->wd->obj, marker,
-                                                     marker->data);
-        if (marker->content)
-          {
-             Eina_List *contents = NULL;
-             contents = eina_list_append(contents, marker->content);
-             _bubble_update(marker->bubble, contents);
-          }
-      }
-}
-
-
-
-static void
-_marker_place(Widget_Data *wd)
-{
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-
-   Eina_List *l;
-
-   Elm_Map_Marker *marker;
-   Elm_Map_Group_Class *group_clas;
-
-   Evas_Coord gw, gh;
-   Evas_Coord px, py;
-
-   if (wd->paused_markers || (!eina_list_count(wd->markers))) return;
-
-   _pan_geometry_get(wd, &px, &py);
-
-   _edj_marker_size_get(wd, &gw, &gh);
-   gw *= 2;
-   gh *= 2;
-
-   EINA_LIST_FOREACH(wd->markers, l, marker)
-     {
-        _marker_update(marker);
-        marker->grouped = EINA_FALSE;
-        marker->leader = EINA_FALSE;
-     }
-
-   EINA_LIST_FOREACH(wd->group_classes, l, group_clas)
-     {
-        Eina_List *ll;
-        EINA_LIST_FOREACH(group_clas->markers, ll, marker)
-          {
-             Eina_List *lll;
-             Elm_Map_Marker *mm;
-             Eina_List *markers = NULL;
-
-             if (marker->grouped) continue;
-             if (group_clas->zoom_grouped < wd->zoom)
-               {
-                  marker->grouped = EINA_FALSE;
-                  continue;
-               }
-
-             EINA_LIST_FOREACH(group_clas->markers, lll, mm)
-               {
-                  if (marker == mm || mm->grouped) continue;
-                  if (ELM_RECTS_INTERSECT(mm->x, mm->y, mm->w, mm->h,
-                                         marker->x, marker->y, gw, gh))
-                   {
-                      // mm is group follower.
-                      mm->leader = EINA_FALSE;
-                      mm->grouped = EINA_TRUE;
-                      markers = eina_list_append(markers, mm);
-                   }
-               }
-              if (eina_list_count(markers) >= 1)
-                {
-                   // marker is group leader.
-                   marker->leader = EINA_TRUE;
-                   marker->grouped = EINA_TRUE;
-                   markers = eina_list_append(markers, marker);
-
-                   if (!marker->group) marker->group = _marker_group_create(wd);
-                   _marker_group_update(marker->group, group_clas, markers);
-                }
-          }
-     }
-
-   EINA_LIST_FOREACH(wd->markers, l, marker)
-     {
-
-        if (marker->grouped ||
-           (marker->group_clas &&
-            (marker->group_clas->hide ||
-             marker->group_clas->zoom_displayed > wd->zoom)))
-           evas_object_hide(marker->obj);
-        else
-          {
-             Evas_Coord x, y;
-             _coord_rotate(marker->x + px, marker->y + py, wd->rotate.cx,
-                           wd->rotate.cy, wd->rotate.d, &x, &y);
-             _obj_place(marker->obj, x - (marker->w / 2), y - (marker->h / 2),
-                         marker->w, marker->h);
-          }
-     }
-
-   EINA_LIST_FOREACH(wd->markers, l, marker)
-     {
-        Marker_Group *group = marker->group;
-        if (!group) continue;
-
-        if (!marker->leader || (group->clas->hide) ||
-            (group->clas->zoom_displayed > wd->zoom))
-           evas_object_hide(group->obj);
-        else
-          {
-             Evas_Coord x, y;
-             _coord_rotate(group->x + px, group->y + py, wd->rotate.cx,
-                           wd->rotate.cy, wd->rotate.d, &x, &y);
-             _obj_place(group->obj, x - (group->w / 2), y - (group->h / 2),
-                         group->w, group->h);
-          }
-     }
-}
-
-static void
-_grid_item_coord_get(Grid_Item *gi, int *x, int *y, int *w, int *h)
-{
-   EINA_SAFETY_ON_NULL_RETURN(gi);
+   EINA_SAFETY_ON_NULL_RETURN(gi);
 
    if (x) *x = gi->x * gi->wd->size.tile;
    if (y) *y = gi->y * gi->wd->size.tile;
@@ -1188,18 +724,16 @@ _grid_item_coord_get(Grid_Item *gi, int *x, int *y, int *w, int *h)
 }
 
 static Eina_Bool
-_grid_item_intersect(Grid_Item *gi)
+_grid_item_in_viewport(Grid_Item *gi)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(gi, EINA_FALSE);
 
-   Evas_Coord px, py;
-   Evas_Coord vw, vh;
+   Evas_Coord vx, vy, vw, vh;
    Evas_Coord x, y, w, h;
 
-   _pan_geometry_get(gi->wd, &px, &py);
-   _viewport_size_get(gi->wd, &vw, &vh);
+   _viewport_coord_get(gi->wd, &vx, &vy, &vw, &vh);
    _grid_item_coord_get(gi, &x, &y, &w, &h);
-   return ELM_RECTS_INTERSECT(x + px, y + py, w, h, 0, 0, vw, vh);
+   return ELM_RECTS_INTERSECT(x, y, w, h, vx, vy, vw, vh);
 }
 
 static void
@@ -1219,13 +753,10 @@ _grid_item_update(Grid_Item *gi)
      }
    else
      {
-        Evas_Coord px, py;
         Evas_Coord x, y, w, h;
-
-        _pan_geometry_get(gi->wd, &px, &py);
         _grid_item_coord_get(gi, &x, &y, &w, &h);
-
-        _obj_place(gi->img, x + px, y + py, w, h);
+        _coord_to_canvas_no_rotate(gi->wd, x, y, &x, &y);
+        _obj_place(gi->img, xy, w, h);
         _obj_rotate(gi->wd, gi->img);
         gi->file_have = EINA_TRUE;
      }
@@ -1269,7 +800,7 @@ _grid_item_create(Grid *g, Evas_Coord x, Evas_Coord y)
    EINA_SAFETY_ON_NULL_RETURN_VAL(g, NULL);
    char buf[PATH_MAX];
    char buf2[PATH_MAX];
-   char *source;
+   char *url;
    Grid_Item *gi;
 
    gi = ELM_NEW(Grid_Item);
@@ -1284,24 +815,24 @@ _grid_item_create(Grid *g, Evas_Coord x, Evas_Coord y)
    gi->img = evas_object_image_add(evas_object_evas_get(g->wd->obj));
    evas_object_image_smooth_scale_set(gi->img, EINA_FALSE);
    evas_object_image_scale_hint_set(gi->img, EVAS_IMAGE_SCALE_HINT_DYNAMIC);
-   evas_object_image_filled_set(gi->img, 1);
+   evas_object_image_filled_set(gi->img, EINA_TRUE);
    evas_object_smart_member_add(gi->img, g->wd->pan_smart);
    evas_object_pass_events_set(gi->img, EINA_TRUE);
-   evas_object_stack_below(gi->img, g->wd->sep_maps_markers);
+   evas_object_stack_below(gi->img, g->wd->sep_maps_overlays);
 
-   snprintf(buf, sizeof(buf), CACHE_PATH, g->wd->id, g->zoom, x);
-   snprintf(buf2, sizeof(buf2), CACHE_FILE_PATH, buf, y);
+   snprintf(buf, sizeof(buf), CACHE_TILE_ROOT, g->wd->id, g->zoom, x);
+   snprintf(buf2, sizeof(buf2), CACHE_TILE_PATH, buf, y);
    if (!ecore_file_exists(buf)) ecore_file_mkpath(buf);
 
    eina_stringshare_replace(&gi->file, buf2);
-   source = g->wd->src->url_cb(g->wd->obj, x, y, g->zoom);
-   if ((!source) || (!strlen(source)))
+   url = g->wd->src_tile->url_cb(g->wd->obj, x, y, g->zoom);
+   if ((!url) || (!strlen(url)))
      {
-        eina_stringshare_replace(&gi->source, NULL);
+        eina_stringshare_replace(&gi->url, NULL);
         ERR("Getting source url failed: %s", gi->file);
      }
-   else eina_stringshare_replace(&gi->source, source);
-   if (source) free(source);
+   else eina_stringshare_replace(&gi->url, url);
+   if (url) free(url);
    eina_matrixsparse_data_idx_set(g->grid, y, x, gi);
    return gi;
 }
@@ -1310,11 +841,10 @@ static void
 _grid_item_free(Grid_Item *gi)
 {
    EINA_SAFETY_ON_NULL_RETURN(gi);
-
    _grid_item_unload(gi);
    if (gi->g && gi->g->grid) eina_matrixsparse_data_idx_set(gi->g->grid,
                                                             gi->y, gi->x, NULL);
-   if (gi->source) eina_stringshare_del(gi->source);
+   if (gi->url) eina_stringshare_del(gi->url);
    if (gi->file) eina_stringshare_del(gi->file);
    if (gi->img) evas_object_del(gi->img);
    if (gi->file_have) ecore_file_remove(gi->file);
@@ -1328,26 +858,26 @@ _downloaded_cb(void *data, const char *file __UNUSED__, int status)
 
    if (status == 200)
      {
-        DBG("Download success from %s to %s", gi->source, gi->file);
+        DBG("Download success from %s to %s", gi->url, gi->file);
         _grid_item_update(gi);
         gi->wd->finish_num++;
+        evas_object_smart_callback_call(gi->wd->obj, SIG_TILE_LOADED, NULL);
      }
    else
      {
-        WRN("Download failed from %s to %s (%d) ", gi->source, gi->file, status);
+        WRN("Download failed from %s to %s (%d) ", gi->url, gi->file, status);
         ecore_file_remove(gi->file);
         gi->file_have = EINA_FALSE;
+        evas_object_smart_callback_call(gi->wd->obj, SIG_TILE_LOADED_FAIL, NULL);
      }
 
    gi->job = NULL;
    gi->wd->download_num--;
-   evas_object_smart_callback_call(gi->wd->obj, SIG_DOWNLOADED, NULL);
-
    if (!gi->wd->download_num)
      {
         edje_object_signal_emit(elm_smart_scroller_edje_object_get(gi->wd->scr),
                                 "elm,state,busy,stop", "elm");
-        evas_object_smart_callback_call(gi->wd->obj, SIG_LOADED_DETAIL, NULL);
+        evas_object_smart_callback_call(gi->wd->obj, SIG_LOADED, NULL);
      }
 }
 
@@ -1368,7 +898,7 @@ _download_job(void *data)
 
    EINA_LIST_REVERSE_FOREACH_SAFE(wd->download_list, l, ll, gi)
      {
-        if (gi->g->zoom != wd->zoom || !_grid_item_intersect(gi))
+        if ((gi->g->zoom != wd->zoom) || !(_grid_item_in_viewport(gi)))
           {
              wd->download_list = eina_list_remove(wd->download_list, gi);
              continue;
@@ -1376,20 +906,21 @@ _download_job(void *data)
         if (wd->download_num >= MAX_CONCURRENT_DOWNLOAD)
            return ECORE_CALLBACK_RENEW;
 
-        Eina_Bool ret = ecore_file_download_full(gi->source, gi->file,
+        Eina_Bool ret = ecore_file_download_full(gi->url, gi->file,
                                                  _downloaded_cb, NULL,
                                                  gi, &(gi->job), wd->ua);
         if ((!ret) || (!gi->job))
-           ERR("Can't start to download from %s to %s", gi->source, gi->file);
+           ERR("Can't start to download from %s to %s", gi->url, gi->file);
         else
           {
              wd->download_list = eina_list_remove(wd->download_list, gi);
-
              wd->try_num++;
              wd->download_num++;
+             evas_object_smart_callback_call(wd->obj, SIG_TILE_LOAD,
+                                             NULL);
              if (wd->download_num == 1)
-               edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
-                                       "elm,state,busy,start", "elm");
+                edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
+                                        "elm,state,busy,start", "elm");
           }
      }
    return ECORE_CALLBACK_RENEW;
@@ -1400,17 +931,16 @@ _grid_viewport_get(Grid *g, int *x, int *y, int *w, int *h)
 {
    EINA_SAFETY_ON_NULL_RETURN(g);
    int xx, yy, ww, hh;
-   Evas_Coord px, py, vw, vh;
+   Evas_Coord vx, vy, vw, vh;
 
-   _pan_geometry_get(g->wd, &px, &py);
-   _viewport_size_get(g->wd, &vw, &vh);
-   if (px > 0) px = 0;
-   if (py > 0) py = 0;
+   _viewport_coord_get(g->wd, &vx, &vy, &vw, &vh);
+   if (vx < 0) vx = 0;
+   if (vy < 0) vy = 0;
 
-   xx = (-px / g->wd->size.tile) - 1;
+   xx = (vx / g->wd->size.tile) - 1;
    if (xx < 0) xx = 0;
 
-   yy = (-py / g->wd->size.tile) - 1;
+   yy = (vy / g->wd->size.tile) - 1;
    if (yy < 0) yy = 0;
 
    ww = (vw / g->wd->size.tile) + 3;
@@ -1455,7 +985,7 @@ _grid_load(Grid *g)
    EINA_ITERATOR_FOREACH(it, cell)
      {
         gi = eina_matrixsparse_cell_data_get(cell);
-        if (!_grid_item_intersect(gi)) _grid_item_unload(gi);
+        if (!_grid_item_in_viewport(gi)) _grid_item_unload(gi);
      }
    eina_iterator_free(it);
 
@@ -1490,10 +1020,10 @@ static void
 _grid_all_create(Widget_Data *wd)
 {
    EINA_SAFETY_ON_NULL_RETURN(wd);
-   EINA_SAFETY_ON_NULL_RETURN(wd->src);
+   EINA_SAFETY_ON_NULL_RETURN(wd->src_tile);
 
    int zoom;
-   for (zoom = wd->src->zoom_min; zoom <= wd->src->zoom_max; zoom++)
+   for (zoom = wd->src_tile->zoom_min; zoom <= wd->src_tile->zoom_max; zoom++)
      {
         Grid *g;
         int tnum;
@@ -1516,11 +1046,11 @@ _grid_all_clear(Widget_Data *wd)
    Grid *g;
    EINA_LIST_FREE(wd->grids, g)
      {
-        Grid_Item *gi;
-        Eina_Iterator *it = eina_matrixsparse_iterator_new(g->grid);
         Eina_Matrixsparse_Cell *cell;
+        Eina_Iterator *it = eina_matrixsparse_iterator_new(g->grid);
         EINA_ITERATOR_FOREACH(it, cell)
           {
+             Grid_Item *gi;
              gi = eina_matrixsparse_cell_data_get(cell);
              if (gi) _grid_item_free(gi);
           }
@@ -1529,8 +1059,6 @@ _grid_all_clear(Widget_Data *wd)
         eina_matrixsparse_free(g->grid);
         free(g);
      }
-   if (!ecore_file_recursive_rm(CACHE_ROOT_PATH))
-      ERR("Deletion of %s failed", CACHE_ROOT_PATH);
 }
 
 static void
@@ -1545,7 +1073,7 @@ _track_place(Widget_Data *wd)
    Evas_Coord px, py, ow, oh;
    px = wd->pan_x;
    py = wd->pan_y;
-   _viewport_size_get(wd, &ow, &oh);
+   _viewport_coord_get(wd, NULL, NULL, &ow, &oh);
 
    Evas_Coord size = wd->size.w;
 
@@ -1555,12 +1083,12 @@ _track_place(Widget_Data *wd)
         double lat_min, lat_max;
         elm_route_longitude_min_max_get(route, &lon_min, &lon_max);
         elm_route_latitude_min_max_get(route, &lat_min, &lat_max);
-        elm_map_utils_convert_geo_into_coord(wd->obj, lon_min, lat_max, size, &xmin, &ymin);
-        elm_map_utils_convert_geo_into_coord(wd->obj, lon_max, lat_min, size, &xmax, &ymax);
+        _region_to_coord_convert(wd, lon_min, lat_max, size, &xmin, &ymin);
+        _region_to_coord_convert(wd, lon_max, lat_min, size, &xmax, &ymax);
 
-        if( !(xmin < px && xmax < px) && !(xmin > px+ow && xmax > px+ow))
+        if ( !(xmin < px && xmax < px) && !(xmin > px+ow && xmax > px+ow))
         {
-           if( !(ymin < py && ymax < py) && !(ymin > py+oh && ymax > py+oh))
+           if ( !(ymin < py && ymax < py) && !(ymin > py+oh && ymax > py+oh))
            {
               //display the route
               evas_object_move(route, xmin - px, ymin - py);
@@ -1580,90 +1108,6 @@ _track_place(Widget_Data *wd)
    (void) wd;
 #endif
 }
-static void
-_route_place(Widget_Data *wd)
-{
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-   Eina_List *lr, *lp, *ln;
-   Path_Node *n;
-   Evas_Object *p;
-   Elm_Map_Route *r;
-   int nodes;
-   int x, y;
-   double a;
-   Evas_Coord ow, oh;
-   Evas_Coord px, py;
-
-   px = wd->pan_x;
-   py = wd->pan_y;
-   _viewport_size_get(wd, &ow, &oh);
-
-   Evas_Coord size = wd->size.w;
-
-   EINA_LIST_FOREACH(wd->route, lr, r)
-     {
-        EINA_LIST_FOREACH(r->path, lp, p)
-          {
-             evas_object_polygon_points_clear(p);
-          }
-
-        nodes = eina_list_count(r->nodes);
-
-        EINA_LIST_FOREACH(r->nodes, ln, n)
-          {
-             if ((!wd->zoom) || ((n->idx) &&
-                 ((n->idx % (int)ceil((double)nodes/(double)size*100.0))))) continue;
-             if (r->inbound)
-               {
-                  elm_map_utils_convert_geo_into_coord(wd->obj, n->pos.lon, n->pos.lat, size, &x, &y);
-                  if ((x >= px - ow) && (x <= (px + ow*2)) &&
-                      (y >= py - oh) && (y <= (py + oh*2)))
-                    {
-                       x = x - px;
-                       y = y - py;
-
-                       p = eina_list_nth(r->path, n->idx);
-                       a = (double)(y - r->y) / (double)(x - r->x);
-                       if ((abs(a) >= 1) || (r->x == x))
-                         {
-                            evas_object_polygon_point_add(p, r->x - 3, r->y);
-                            evas_object_polygon_point_add(p, r->x + 3, r->y);
-                            evas_object_polygon_point_add(p, x + 3, y);
-                            evas_object_polygon_point_add(p, x - 3, y);
-                         }
-                       else
-                         {
-                            evas_object_polygon_point_add(p, r->x, r->y - 3);
-                            evas_object_polygon_point_add(p, r->x, r->y + 3);
-                            evas_object_polygon_point_add(p, x, y + 3);
-                            evas_object_polygon_point_add(p, x, y - 3);
-                         }
-
-                       evas_object_color_set(p, r->color.r, r->color.g, r->color.b, r->color.a);
-                       evas_object_raise(p);
-                       _obj_rotate(wd, p);
-                       evas_object_show(p);
-                       r->x = x;
-                       r->y = y;
-                    }
-                  else r->inbound = EINA_FALSE;
-               }
-             else
-               {
-                  elm_map_utils_convert_geo_into_coord(wd->obj, n->pos.lon, n->pos.lat, size, &x, &y);
-                  if ((x >= px - ow) && (x <= (px + ow*2)) &&
-                      (y >= py - oh) && (y <= (py + oh*2)))
-                    {
-                       r->x = x - px;
-                       r->y = y - py;
-                       r->inbound = EINA_TRUE;
-                    }
-                  else r->inbound = EINA_FALSE;
-               }
-          }
-          r->inbound = EINA_FALSE;
-     }
-}
 
 static void
 _delayed_do(Widget_Data *wd)
@@ -1693,7 +1137,7 @@ _smooth_update(Widget_Data *wd)
         EINA_ITERATOR_FOREACH(it, cell)
           {
              Grid_Item *gi = eina_matrixsparse_cell_data_get(cell);
-             if (_grid_item_intersect(gi))
+             if (_grid_item_in_viewport(gi))
                 evas_object_image_smooth_scale_set(gi->img, EINA_TRUE);
           }
         eina_iterator_free(it);
@@ -1715,10 +1159,12 @@ static void
 zoom_do(Widget_Data *wd, double zoom)
 {
    EINA_SAFETY_ON_NULL_RETURN(wd);
+   if (zoom > wd->src_tile->zoom_max) zoom = wd->src_tile->zoom_max;
+   else if (zoom < wd->src_tile->zoom_min) zoom = wd->src_tile->zoom_min;
    if (zoom > wd->zoom_max) zoom = wd->zoom_max;
    else if (zoom < wd->zoom_min) zoom = wd->zoom_min;
 
-   Evas_Coord px, py, vw, vh;
+   Evas_Coord vx, vy, vw, vh;
    Evas_Coord ow, oh;
 
    wd->zoom = ROUND(zoom);
@@ -1729,37 +1175,35 @@ zoom_do(Widget_Data *wd, double zoom)
    wd->size.w = pow(2.0, wd->zoom) * wd->size.tile;
    wd->size.h = wd->size.w;;
 
-   // Fix to zooming with (viewport center px, py) as the center to prevent
+   // Fix to zooming with (viewport center vx, vy) as the center to prevent
    // from zooming with (0,0) as the cetner. (scroller default behavior)
-   _pan_geometry_get(wd, &px, &py);
-   _viewport_size_get(wd, &vw, &vh);
+   _viewport_coord_get(wd, &vx, &vy, &vw, &vh);
    if ((vw > 0) && (vh > 0) && (ow > 0) && (oh > 0))
      {
-        Evas_Coord xx, yy;
+        Evas_Coord xy;
         double sx, sy;
         if (vw > ow) sx = 0.5;
-        else         sx = (double)(-px + (vw / 2)) / ow;
+        else         sx = (double)(vx + (double)(vw / 2)) / ow;
         if (vh > oh) sy = 0.5;
-        else         sy = (double)(-py + (vh / 2)) / oh;
+        else         sy = (double)(vy + (double)(vh / 2)) / oh;
 
         if (sx > 1.0) sx = 1.0;
         if (sy > 1.0) sy = 1.0;
 
-        xx = (sx * wd->size.w) - (vw / 2);
-        yy = (sy * wd->size.h) - (vh / 2);
-        if (xx < 0) xx = 0;
-        else if (xx > (wd->size.w - vw)) xx = wd->size.w - vw;
-        if (yy < 0) yy = 0;
-        else if (yy > (wd->size.h - vh)) yy = wd->size.h - vh;
-        elm_smart_scroller_child_region_show(wd->scr, xx, yy, vw, vh);
+        x = ceil((sx * wd->size.w) - (vw / 2));
+        y = ceil((sy * wd->size.h) - (vh / 2));
+        if (x < 0) x = 0;
+        else if (x > (wd->size.w - vw)) x = wd->size.w - vw;
+        if (y < 0) y = 0;
+        else if (y > (wd->size.h - vh)) y = wd->size.h - vh;
+        elm_smart_scroller_child_region_show(wd->scr, xy, vw, vh);
      }
-
    if (wd->zoom_timer) ecore_timer_del(wd->zoom_timer);
    else evas_object_smart_callback_call(wd->obj, SIG_ZOOM_START, NULL);
    wd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout, wd);
    evas_object_smart_callback_call(wd->obj, SIG_ZOOM_CHANGE, NULL);
 
-   evas_object_smart_callback_call(wd->pan_smart, SIG_CHANGED, NULL);
+   evas_object_smart_callback_call(wd->pan_smart, "changed", NULL);
    evas_object_smart_changed(wd->pan_smart);
 }
 
@@ -1914,7 +1358,7 @@ _mouse_wheel_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
 
    if (!wd->paused)
      {
-        Evas_Event_Mouse_Wheel *ev = (Evas_Event_Mouse_Wheel*) event_info;
+        Evas_Event_Mouse_Wheel *ev = event_info;
         zoom_do(wd, wd->zoom_detail - ((double)ev->z / 10));
     }
 }
@@ -1967,14 +1411,14 @@ _region_max_min_get(Eina_List *overlays, double *max_longitude, double *min_long
 }
 
 static Evas_Object *
-_icon_dup(Evas_Object *icon, Evas_Object *parent)
+_icon_dup(const Evas_Object *icon, Evas_Object *parent)
 {
    if (!icon || !parent) return NULL;
    // Evas_Object do not support object duplication??
    const char *file = NULL, *group = NULL;
    Eina_Bool size_up, size_down;
    Evas_Object *dupp;
-   
+
    dupp = elm_icon_add(parent);
    elm_icon_file_get(icon, &file, &group);
    elm_icon_file_set(dupp, file, group);
@@ -1991,39 +1435,6 @@ _icon_dup(Evas_Object *icon, Evas_Object *parent)
    return dupp;
 }
 
-static Evas_Object *
-_overlay_layout_new(Widget_Data *wd, const char *group)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(group, NULL);
-   Evas_Object *obj = elm_layout_add(wd->obj);
-   evas_object_smart_member_add(obj, wd->pan_smart);
-   evas_object_stack_above(obj, wd->sep_maps_markers);
-   elm_layout_theme_set(obj, "map/marker", group,  elm_widget_style_get(wd->obj));
-   return obj;
-}
-
-static void
-_overlay_layout_update(Widget_Data *wd, Evas_Object *layout, Evas_Object *icon, const char *text, const char *group)
-{
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-   EINA_SAFETY_ON_NULL_RETURN(layout);
-
-   Evas_Object *prev_icon = elm_object_part_content_get(layout, "elm.icon");
-   if (icon && (prev_icon != icon))
-     {
-        elm_layout_theme_set(layout, "map/marker", "empty",
-                             elm_widget_style_get(wd->obj));
-        elm_object_part_content_set(layout, "elm.icon", icon);
-     }
-   else if (text)
-     {
-        if (group) elm_layout_theme_set(layout, "map/marker", group,
-                                        elm_widget_style_get(wd->obj));
-        edje_object_part_text_set(elm_layout_edje_get(layout), "elm.text", text);
-     }
-}
-
 static void
 _overlay_clicked_cb(void *data, Evas *e __UNUSED__,  Evas_Object *obj __UNUSED__, void *ev __UNUSED__)
 {
@@ -2037,207 +1448,261 @@ _overlay_clicked_cb(void *data, Evas *e __UNUSED__,  Evas_Object *obj __UNUSED__
 }
 
 static void
-_overlay_default_cb_add(Overlay_Default *ovl, Evas_Object_Event_Cb cb, void *data)
-{
-   EINA_SAFETY_ON_NULL_RETURN(ovl);
-   EINA_SAFETY_ON_NULL_RETURN(data);
-
-   // FIXME: Add icon or object event callback
-   evas_object_event_callback_add(ovl->layout, EVAS_CALLBACK_MOUSE_DOWN, cb,
-                                  data);
-}
-
-static void
-_overlay_default_cb_del(Overlay_Default *ovl, Evas_Object_Event_Cb cb)
-{
-   EINA_SAFETY_ON_NULL_RETURN(ovl);
-   // FIXME: Add icon or object event callback
-   evas_object_event_callback_del(ovl->layout, EVAS_CALLBACK_MOUSE_DOWN, cb);
-}
-
-static void
 _overlay_default_hide(Overlay_Default *ovl)
 {
    EINA_SAFETY_ON_NULL_RETURN(ovl);
-   if (ovl->obj) evas_object_hide(ovl->obj);
+   if (ovl->content) evas_object_hide(ovl->content);
+   if (ovl->icon) evas_object_hide(ovl->icon);
+   if (ovl->clas_content) evas_object_hide(ovl->clas_content);
+   if (ovl->clas_icon) evas_object_hide(ovl->clas_icon);
    if (ovl->layout) evas_object_hide(ovl->layout);
 }
 
 static void
-_overlay_default_show(Widget_Data *wd, Overlay_Default *ovl)
+_overlay_default_show(Overlay_Default *ovl)
 {
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
    Evas_Object *disp;
-   Evas_Coord px, py;
    Evas_Coord x, y, w, h;
 
-   if (ovl->obj)
+   evas_object_hide(ovl->layout);
+   if (ovl->content)
+     {
+        disp = ovl->content;
+        evas_object_geometry_get(disp, NULL, NULL, &w, &h);
+        if (w <= 0 || h <= 0) evas_object_size_hint_min_get(disp, &w, &h);
+     }
+   else if (!(ovl->icon) && ovl->clas_content)
      {
-        disp = ovl->obj;
+        disp = ovl->clas_content;
+
         evas_object_geometry_get(disp, NULL, NULL, &w, &h);
         if (w <= 0 || h <= 0) evas_object_size_hint_min_get(disp, &w, &h);
      }
    else
      {
+        if (ovl->icon) evas_object_show(ovl->icon);
+        else if (ovl->clas_icon) evas_object_show(ovl->clas_icon);
         disp = ovl->layout;
         w = ovl->w;
         h = ovl->h;
      }
-
-   _pan_geometry_get(wd, &px, &py);
-   _coord_rotate(ovl->x + px, ovl->y + py, wd->rotate.cx,  wd->rotate.cy,
-                 wd->rotate.d, &x, &y);
+   _coord_to_canvas(ovl->wd, ovl->x, ovl->y, &x, &y);
    _obj_place(disp, x - (w / 2), y - (h / 2), w, h);
 }
 
 static void
-_overlay_default_update(Widget_Data *wd, Overlay_Default *ovl, Evas_Object *obj, Evas_Object *icon, Overlay_Class *ovl_clas, const char *text, const char *group)
+_overlay_default_coord_get(Overlay_Default *ovl, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
 {
-   EINA_SAFETY_ON_NULL_RETURN(wd);
    EINA_SAFETY_ON_NULL_RETURN(ovl);
-
-   elm_map_utils_convert_geo_into_coord(wd->obj, ovl->lon, ovl->lat,
-                                        wd->size.w, &ovl->x, &ovl->y);
-
-   if (obj)
-     {
-        if (ovl->obj == obj) return;
-        if (ovl->obj) evas_object_del(ovl->obj);
-        ovl->obj = obj;
-     }
-   else if (!(ovl->obj) && icon)
-     {
-        if (ovl->icon == icon) return;
-        if (ovl->icon) evas_object_del(ovl->icon);
-        ovl->icon = icon;
-       _overlay_layout_update(wd, ovl->layout, ovl->icon, NULL, NULL);
-
-     }
-   else if (!(ovl->obj) && !(ovl->icon) && (ovl_clas) &&
-            ((ovl_clas->obj) || (ovl_clas->icon)))
-     {
-        // Inherit icon from group overlay's ojbect or icon
-
-        // FIXME: It is hard to duplicate evas object :-)
-        /*
-        if (ovl_clas->obj && (ovl_clas->obj != ovl->clas_obj_ref))
-          {
-             if (ovl->clas_obj) evas_object_del(ovl->clas_obj);
-             ovl->clas_obj_ref = ovl_clas->obj;
-             ovl->clas_obj = _obj_dup(ovl->clas_obj_ref, ovl->layout);
-             _overlay_layout_update(wd, ovl->layout, ovl->clas_obj, NULL, NULL);
-          }
-        */
-        if (ovl_clas->icon && (ovl_clas->icon != ovl->clas_icon_ref))
-          {
-             if (ovl->clas_icon) evas_object_del(ovl->clas_icon);
-             ovl->clas_icon_ref = ovl_clas->icon;
-             ovl->clas_icon = _icon_dup(ovl->clas_icon_ref, ovl->layout);
-             _overlay_layout_update(wd, ovl->layout, ovl->clas_icon, NULL, NULL);
-        }
-     }
-   else if (!(ovl->obj) && !(ovl->icon) && !(ovl->clas_icon) && text)
-     {
-        _overlay_layout_update(wd, ovl->layout, NULL, text, group);
-     }
+   if (x) *x = ovl->x;
+   if (y) *y = ovl->y;
+   if (w) *w = ovl->w;
+   if (h) *h = ovl->h;
 }
 
 static void
-_overlay_default_free(Overlay_Default *ovl)
+_overlay_default_coord_set(Overlay_Default *ovl, Evas_Coord x, Evas_Coord y)
 {
    EINA_SAFETY_ON_NULL_RETURN(ovl);
-   if (ovl->obj) evas_object_del(ovl->obj);
-   if (ovl->icon) evas_object_del(ovl->icon);
+   ovl->x = x;
+   ovl->y = y;
+}
+
+static void
+_overlay_default_coord_update(Overlay_Default *ovl)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   _region_to_coord_convert(ovl->wd, ovl->lon, ovl->lat, ovl->wd->size.w,
+                            &ovl->x, &ovl->y);
+}
+
+static void
+_overlay_default_layout_text_update(Overlay_Default *ovl, const char *text)
+{
+   if (!ovl->content && !ovl->icon && !ovl->clas_content && !ovl->clas_icon)
+      edje_object_part_text_set(elm_layout_edje_get(ovl->layout), "elm.text",
+                                text);
+}
+
+static void
+_overlay_default_content_update(Overlay_Default *ovl, Evas_Object *content, Elm_Map_Overlay *overlay)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   if (ovl->content == content) return;
+   if (ovl->content) evas_object_del(ovl->content);
+   ovl->content = content;
+
+   if (ovl->content)
+     evas_object_event_callback_add(ovl->content, EVAS_CALLBACK_MOUSE_DOWN,
+                                       _overlay_clicked_cb, overlay);
+}
+
+static void
+_overlay_default_clas_content_update(Overlay_Default *ovl, const Evas_Object *content __UNUSED__)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   if (ovl->clas_content) evas_object_del(ovl->clas_content);
+   // Evas_Object can not be duplicated.
+   //ovl->clas_content = _content_dup(content);
+}
+
+static void
+_overlay_default_layout_update(Overlay_Default *ovl)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   if (ovl->icon)
+     {
+        evas_object_color_set(ovl->layout, 255, 255, 255, 255);
+        elm_layout_theme_set(ovl->layout, "map/marker", "empty",
+                             elm_widget_style_get(ovl->wd->obj));
+        elm_object_part_content_set(ovl->layout, "elm.icon", ovl->icon);
+     }
+   else if (!ovl->icon && ovl->clas_icon)
+     {
+        evas_object_color_set(ovl->layout, 255, 255, 255, 255);
+        elm_layout_theme_set(ovl->layout, "map/marker", "empty",
+                             elm_widget_style_get(ovl->wd->obj));
+        elm_object_part_content_set(ovl->layout, "elm.icon", ovl->clas_icon);
+     }
+   else
+     {
+        evas_object_color_set(ovl->layout, ovl->c.r, ovl->c.g, ovl->c.b, ovl->c.a);
+        elm_layout_theme_set(ovl->layout, "map/marker", "radio",
+                             elm_widget_style_get(ovl->wd->obj));
+     }
+}
+
+static void
+_overlay_default_icon_update(Overlay_Default *ovl, Evas_Object *icon)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   if (ovl->icon == icon) return;
+   if (ovl->icon) evas_object_del(ovl->icon);
+   ovl->icon = icon;
+   _overlay_default_layout_update(ovl);
+}
+
+static void
+_overlay_default_clas_icon_update(Overlay_Default *ovl, const Evas_Object *icon)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   if (ovl->clas_icon) evas_object_del(ovl->clas_icon);
+   ovl->clas_icon = _icon_dup(icon, ovl->layout);
+   _overlay_default_layout_update(ovl);
+}
+
+static void
+_overlay_default_color_update(Overlay_Default *ovl, Color c)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   ovl->c = c;
+   _overlay_default_layout_update(ovl);
+}
+
+static void
+_overlay_default_free(Overlay_Default *ovl)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   if (ovl->content) evas_object_del(ovl->content);
+   if (ovl->icon) evas_object_del(ovl->icon);
+   if (ovl->clas_content) evas_object_del(ovl->clas_content);
    if (ovl->clas_icon) evas_object_del(ovl->clas_icon);
-   evas_object_event_callback_del(ovl->layout, EVAS_CALLBACK_MOUSE_DOWN,
-                                  _overlay_clicked_cb);
    if (ovl->layout) evas_object_del(ovl->layout);
    free(ovl);
 }
 
 static Overlay_Default *
-_overlay_default_new(Widget_Data *wd, double lon, double lat, const char *group)
+_overlay_default_new(Elm_Map_Overlay *overlay, double lon, double lat, Color c, double scale)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(group, NULL);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, NULL);
 
    Overlay_Default *ovl = ELM_NEW(Overlay_Default);
-   _edj_marker_size_get(wd, &(ovl->w), &(ovl->h));
-   ovl->layout = _overlay_layout_new(wd, group);
+   ovl->wd = overlay->wd;
+   _edj_overlay_size_get(ovl->wd, &(ovl->w), &(ovl->h));
+   ovl->w *= scale;
+   ovl->h *= scale;
+   ovl->layout = elm_layout_add(ovl->wd->obj);
+   evas_object_smart_member_add(ovl->layout, ovl->wd->pan_smart);
+   evas_object_stack_above(ovl->layout, ovl->wd->sep_maps_overlays);
+   elm_layout_theme_set(ovl->layout, "map/marker", "radio",
+                        elm_widget_style_get(ovl->wd->obj));
+   evas_object_event_callback_add(ovl->layout, EVAS_CALLBACK_MOUSE_DOWN,
+                                  _overlay_clicked_cb, overlay);
    ovl->lon = lon;
    ovl->lat = lat;
+   _overlay_default_color_update(ovl, c);
    return ovl;
 }
 
 static void
-_overlay_group_clicked_cb(void *data, Evas *e __UNUSED__,  Evas_Object *obj __UNUSED__, void *ev __UNUSED__)
-{
-   EINA_SAFETY_ON_NULL_RETURN(data);
-   Overlay_Group *ovl = data;
-
-   evas_object_smart_callback_call(ovl->clas->wd->obj, SIG_OVERLAY_CLICKED,
-                                   ovl->clas);
-   if (ovl->clas->cb) ovl->clas->cb(ovl->clas->cb_data, ovl->clas->wd->obj,
-                                    ovl->clas);
-}
-
-static void
-_overlay_group_cb_add(Overlay_Group *ovl)
+_overlay_group_hide(Overlay_Group *grp)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ovl);
-   _overlay_default_cb_add(ovl->ovl, _overlay_group_clicked_cb, ovl);
+   EINA_SAFETY_ON_NULL_RETURN(grp);
+   if (grp->ovl) _overlay_default_hide(grp->ovl);
 }
 
 static void
-_overlay_group_cb_del(Overlay_Group *ovl)
+_overlay_group_show(Overlay_Group *grp)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ovl);
-   _overlay_default_cb_del(ovl->ovl, _overlay_group_clicked_cb);
+   EINA_SAFETY_ON_NULL_RETURN(grp);
+   if (grp->ovl) _overlay_default_show(grp->ovl);
 }
 
 static void
-_overlay_group_update(Widget_Data *wd, Overlay_Group *grp, Eina_List *members)
+_overlay_group_coord_member_update(Overlay_Group *grp, Evas_Coord x, Evas_Coord y, Eina_List *members)
 {
-   EINA_SAFETY_ON_NULL_RETURN(wd);
    EINA_SAFETY_ON_NULL_RETURN(grp);
+   if (!grp->ovl) return;
 
-   Eina_List *l;
-   Elm_Map_Overlay *overlay;
-   Evas_Coord sum_x = 0, sum_y = 0, cnt = 0;
+   char text[32];
+   _overlay_default_coord_set(grp->ovl, x, y);
+   _coord_to_region_convert(grp->wd, x, y, grp->wd->size.w, &grp->lon, &grp->lat);
 
    if (grp->members) eina_list_free(grp->members);
    grp->members = members;
+   snprintf(text, sizeof(text), "%d", eina_list_count(members));
+   _overlay_default_layout_text_update(grp->ovl, text);
+}
 
-   if (!grp->members || eina_list_count(grp->members) <= 0)
-     {
-        _overlay_default_hide(grp->ovl);
-        return;
-     }
-   EINA_LIST_FOREACH(grp->members, l, overlay)
-     {
-        Overlay_Default *df = overlay->ovl;
-        sum_x += df->x;
-        sum_y += df->y;
-        cnt++;
-     }
-
-   Overlay_Class *ovl_clas = grp->clas->ovl;
+static void
+_overlay_group_icon_update(Overlay_Group *grp, const Evas_Object *icon)
+{
+   EINA_SAFETY_ON_NULL_RETURN(grp);
+   if (grp->ovl) _overlay_default_icon_update(grp->ovl,
+                                             _icon_dup(icon, grp->wd->obj));
+}
 
-   char text[128];
-   snprintf(text, sizeof(text), "%d", cnt);
-   _overlay_default_update(wd, grp->ovl, NULL, NULL, ovl_clas, text, "radio2");
+static void
+_overlay_group_content_update(Overlay_Group *grp __UNUSED__, const Evas_Object *content __UNUSED__)
+{
+   EINA_SAFETY_ON_NULL_RETURN(grp);
+   // Evas_Object can not be duplicated.
+   //_overlay_default_content_update(grp->ovl, _content_dup(content));
+   return;
+}
 
-   grp->ovl->x = sum_x / cnt;
-   grp->ovl->y = sum_y / cnt;
+static void
+_overlay_group_color_update(Overlay_Group *grp, Color c)
+{
+   EINA_SAFETY_ON_NULL_RETURN(grp);
+   _overlay_default_color_update(grp->ovl, c);
 }
 
 static void
-_overlay_group_free(Overlay_Group *grp, Elm_Map_Overlay *club_owner)
+_overlay_group_cb_set(Overlay_Group *grp, Elm_Map_Overlay_Get_Cb cb, void *data)
 {
    EINA_SAFETY_ON_NULL_RETURN(grp);
+   grp->overlay->cb = cb;
+   grp->overlay->data = data;
+}
 
-   _overlay_default_cb_del(grp->ovl, _overlay_group_clicked_cb);
-   _overlay_default_free(grp->ovl);
-   if (grp->clas) elm_map_overlay_class_remove(grp->clas, club_owner);
+static void
+_overlay_group_free(Overlay_Group *grp)
+{
+   EINA_SAFETY_ON_NULL_RETURN(grp);
+   if (grp->overlay) free(grp->overlay);
+   if (grp->ovl) _overlay_default_free(grp->ovl);
    if (grp->members) eina_list_free(grp->members);
    free(grp);
 }
@@ -2248,130 +1713,186 @@ _overlay_group_new(Widget_Data *wd)
    EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
 
    Overlay_Group *grp = ELM_NEW(Overlay_Group);
-   grp->ovl = ELM_NEW(Overlay_Default);
-   grp->ovl = _overlay_default_new(wd, -1, -1, "radio2");
-   grp->ovl->w *= 2;
-   grp->ovl->h *= 2;
+   grp->wd = wd;
+   grp->overlay = ELM_NEW(Elm_Map_Overlay);  // this is a virtual overlay
+   grp->overlay->wd = wd;
+   grp->overlay->type = ELM_MAP_OVERLAY_TYPE_GROUP;
+   grp->overlay->ovl = grp;
+   Color c = {0x90, 0xee, 0x90, 0xff};
+   grp->ovl = _overlay_default_new(grp->overlay, -1, -1, c, 2);
    return grp;
 }
 
 static void
-_overlay_class_update(Widget_Data *wd, Overlay_Class *clas, Evas_Object *obj, Evas_Object *icon)
+_overlay_class_cb_set(Overlay_Class *ovl, Elm_Map_Overlay_Get_Cb cb, void *data)
 {
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-   EINA_SAFETY_ON_NULL_RETURN(clas);
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+
+   Eina_List *l;
+   Elm_Map_Overlay *overlay;
+
+   // Update class members' callbacks
+   EINA_LIST_FOREACH(ovl->members, l, overlay)
+      _overlay_group_cb_set(overlay->grp, cb, data);
+}
+
+static void
+_overlay_class_icon_update(Overlay_Class *ovl, Evas_Object *icon)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+
+   Eina_List *l;
+   Elm_Map_Overlay *overlay;
+   if (ovl->icon == icon) return;
+   if (ovl->icon) evas_object_del(ovl->icon);
+   ovl->icon = icon;
 
-   if (obj && (clas->obj != obj))
+   // Update class members' class icons
+   EINA_LIST_FOREACH(ovl->members, l, overlay)
      {
-        if (clas->obj) evas_object_del(clas->obj);
-        clas->obj = icon;
+         _overlay_group_icon_update(overlay->grp, icon);
+
+        if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
+           _overlay_default_clas_icon_update(overlay->ovl, icon);
+
      }
-   else if (icon && (clas->icon != icon))
+}
+
+static void
+_overlay_class_content_update(Overlay_Class *ovl, Evas_Object *content)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+
+   Eina_List *l;
+   Elm_Map_Overlay *overlay;
+   if (ovl->content == content) return;
+   if (ovl->content) evas_object_del(ovl->content);
+   ovl->content = content;
+
+   // Update class members' class contents
+   EINA_LIST_FOREACH(ovl->members, l, overlay)
      {
-        if (clas->icon) evas_object_del(clas->icon);
-        clas->icon = icon;
+        _overlay_group_content_update(overlay->grp, content);
+
+        if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
+           _overlay_default_clas_content_update(overlay->ovl, content);
      }
 }
 
 static void
+_overlay_class_color_update(Overlay_Class *ovl, Color c)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+
+   Eina_List *l;
+   Elm_Map_Overlay *overlay;
+
+   // Update class members' class contents
+   EINA_LIST_FOREACH(ovl->members, l, overlay)
+      _overlay_group_color_update(overlay->grp, c);
+}
+
+static void
 _overlay_class_free(Overlay_Class *clas)
 {
    EINA_SAFETY_ON_NULL_RETURN(clas);
+
+   Eina_List *l;
+   Elm_Map_Overlay *overlay;
+
+   // Update class members' class contents
+   EINA_LIST_FOREACH(clas->members, l, overlay)
+     {
+        overlay->grp->clas = NULL;
+        _overlay_group_content_update(overlay->grp, NULL);
+        _overlay_group_icon_update(overlay->grp, NULL);
+
+        if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
+          {
+             _overlay_default_clas_content_update(overlay->ovl, NULL);
+             _overlay_default_clas_icon_update(overlay->ovl, NULL);
+          }
+     }
    if (clas->icon) evas_object_del(clas->icon);
    if (clas->members) eina_list_free(clas->members);
    free(clas);
 }
 
 static Overlay_Class *
-_overlay_class_new(Widget_Data *wd, Elm_Map_Overlay *clas)
+_overlay_class_new(Widget_Data *wd)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
    Overlay_Class *ovl = ELM_NEW(Overlay_Class);
-   ovl->clas = clas;
+   ovl->wd = wd;
    ovl->icon = NULL;
    ovl->zoom_max = OVERLAY_CLASS_ZOOM_MAX;
    return ovl;
 }
 
 static void
-_overlay_bubble_cb_add(Overlay_Bubble *ovl, Elm_Map_Overlay *overlay)
-{
-   EINA_SAFETY_ON_NULL_RETURN(ovl);
-   EINA_SAFETY_ON_NULL_RETURN(overlay);
-   evas_object_event_callback_add(ovl->obj, EVAS_CALLBACK_MOUSE_DOWN,
-                                  _overlay_clicked_cb, overlay);
-}
-
-static void
-_overlay_bubble_cb_del(Overlay_Bubble *ovl)
-{
-   EINA_SAFETY_ON_NULL_RETURN(ovl);
-   evas_object_event_callback_del(ovl->obj, EVAS_CALLBACK_MOUSE_DOWN,
-                                  _overlay_clicked_cb);
-}
-
-static void
-_overlay_bubble_hide(Overlay_Bubble *bubble)
-{
-   EINA_SAFETY_ON_NULL_RETURN(bubble);
-   if (bubble->obj) evas_object_hide(bubble->obj);
-}
-
-static void
-_overlay_bubble_update(Overlay_Bubble *bubble)
+_overlay_bubble_coord_update(Overlay_Bubble *bubble)
 {
    EINA_SAFETY_ON_NULL_RETURN(bubble);
-   if ((!bubble->pobj) && (bubble->lon >= 0) && (bubble->lat >= 0))
+   if (bubble->pobj)
      {
-        elm_map_utils_convert_geo_into_coord(bubble->wd->obj, bubble->lon,
-                                             bubble->lat, bubble->wd->size.w,
-                                             &bubble->x, &bubble->y);
+        Evas_Coord x, y, w, h;
+        evas_object_geometry_get(bubble->pobj, &x, &y, &w, &h);
+        bubble->x = x + (w / 2);
+        bubble->y = y - (bubble->h / 2);
+        _canvas_to_coord(bubble->wd, bubble->x, bubble->y,
+                         &(bubble->x), &(bubble->y));
+        _coord_to_region_convert(bubble->wd, bubble->x, bubble->y,
+                                 bubble->wd->size.w,
+                                 &(bubble->lon), &(bubble->lat));
+     }
+   else
+     {
+        _region_to_coord_convert(bubble->wd, bubble->lon, bubble->lat,
+                              bubble->wd->size.w, &bubble->x, &bubble->y);
      }
 }
 
 static void
-_overlay_bubble_show(Overlay_Bubble *bubble)
-{
-   EINA_SAFETY_ON_NULL_RETURN(bubble);
-   Evas_Coord x, y;
-
-   if ((bubble->x < 0) || (bubble->y < 0)) return;
-   Evas_Coord px, py;
-   _pan_geometry_get(bubble->wd, &px, &py);
-   _coord_rotate(bubble->x + px, bubble->y + py, bubble->wd->rotate.cx,
-                 bubble->wd->rotate.cy, bubble->wd->rotate.d, &x, &y);
-   x = x - (bubble->w / 2);
-   y = y - (bubble->h / 2);
-   _obj_place(bubble->obj, x, y, bubble->w, bubble->h);
-   //evas_object_raise(bubble->obj);
-}
-
-static void
-_overlay_bubble_chase(Overlay_Bubble *bubble)
+_overlay_bubble_coord_get(Overlay_Bubble *bubble, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
 {
    EINA_SAFETY_ON_NULL_RETURN(bubble);
-   EINA_SAFETY_ON_NULL_RETURN(bubble->pobj);
-
-   Evas_Coord x, y, w;
-   evas_object_geometry_get(bubble->pobj, &x, &y, &w, NULL);
-   x = x + (w / 2) - (bubble->w / 2);
-   y = y - bubble->h;
-   _obj_place(bubble->obj, x, y, bubble->w, bubble->h);
-   evas_object_raise(bubble->obj);
+   if (!(bubble->pobj))
+     {
+        if (x) *x = bubble->x;
+        if (y) *y = bubble->y;
+        if (w) *w = bubble->w;
+        if (h) *h = bubble->h;
+     }
+   else
+     {
+        if (x) *x = 0;
+        if (y) *y = 0;
+        if (w) *w = 0;
+        if (h) *h = 0;
+     }
 }
 
-static void
-_overlay_bubble_hide_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+static Eina_Bool
+_overlay_bubble_show_hide(Overlay_Bubble *bubble, Eina_Bool visible)
 {
-   EINA_SAFETY_ON_NULL_RETURN(data);
-   _overlay_bubble_hide(data);
-}
+   EINA_SAFETY_ON_NULL_RETURN_VAL(bubble, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(bubble->obj, EINA_FALSE);
 
-static void
-_overlay_bubble_chase_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   EINA_SAFETY_ON_NULL_RETURN(data);
-   _overlay_bubble_chase(data);
+   if (!visible) evas_object_hide(bubble->obj);
+   else if (bubble->pobj && !evas_object_visible_get(bubble->pobj))
+     {
+        evas_object_hide(bubble->obj);
+        visible = EINA_FALSE;
+     }
+   else
+     {
+        _coord_to_canvas(bubble->wd, bubble->x, bubble->y,
+                         &(bubble->x), &(bubble->y));
+        _obj_place(bubble->obj, bubble->x - (bubble->w /2),
+                   bubble->y - (bubble->h /2), bubble->w, bubble->h);
+        evas_object_raise(bubble->obj);
+     }
+   return visible;
 }
 
 static void
@@ -2382,33 +1903,24 @@ _overlay_bubble_free(Overlay_Bubble* bubble)
    evas_object_del(bubble->bx);
    evas_object_del(bubble->sc);
    evas_object_del(bubble->obj);
-   if (bubble->pobj)
-     {
-        evas_object_event_callback_del_full(bubble->pobj, EVAS_CALLBACK_HIDE,
-                                            _overlay_bubble_hide_cb, bubble);
-        evas_object_event_callback_del_full(bubble->pobj, EVAS_CALLBACK_SHOW,
-                                            _overlay_bubble_chase_cb, bubble);
-        evas_object_event_callback_del_full(bubble->pobj, EVAS_CALLBACK_MOVE,
-                                            _overlay_bubble_chase_cb, bubble);
-     }
    free(bubble);
 }
 
 static Overlay_Bubble*
-_overlay_bubble_new(Widget_Data *wd)
+_overlay_bubble_new(Elm_Map_Overlay *overlay)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, NULL);
 
    Evas_Coord h;
    const char *s;
    Overlay_Bubble *bubble = ELM_NEW(Overlay_Bubble);
-   bubble->wd = wd;
+   bubble->wd = overlay->wd;
 
-   bubble->obj = edje_object_add(evas_object_evas_get(wd->obj));
-   _elm_theme_object_set(wd->obj, bubble->obj , "map", "marker_bubble",
-                         elm_widget_style_get(wd->obj));
-   evas_object_event_callback_add(bubble->obj, EVAS_CALLBACK_MOUSE_UP,
-                                  _overlay_bubble_chase_cb, bubble);
+   bubble->obj = edje_object_add(evas_object_evas_get(overlay->wd->obj));
+   _elm_theme_object_set(overlay->wd->obj, bubble->obj , "map", "marker_bubble",
+                         elm_widget_style_get(overlay->wd->obj));
+   evas_object_event_callback_add(bubble->obj, EVAS_CALLBACK_MOUSE_DOWN,
+                                     _overlay_clicked_cb, overlay);
 
    bubble->sc = elm_scroller_add(bubble->obj);
    elm_widget_style_set(bubble->sc, "map_bubble");
@@ -2444,142 +1956,535 @@ _overlay_bubble_new(Widget_Data *wd)
 }
 
 static void
-_overlay_grouping(Eina_List *members, Elm_Map_Overlay *overlay)
+_overlay_route_color_update(Overlay_Route *ovl, Color c)
 {
-   EINA_SAFETY_ON_NULL_RETURN(members);
-   EINA_SAFETY_ON_NULL_RETURN(overlay);
-   // Currently support only basic overlay type
-   EINA_SAFETY_ON_FALSE_RETURN(overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT);
-
-   Eina_List *l;
-   Elm_Map_Overlay *overlay_memb;
-   Eina_List *club_members = NULL;
-
-   // Grouping only supports overlay default
-   Overlay_Default *ovl = (Overlay_Default *)overlay->ovl;
-   EINA_LIST_FOREACH(members, l, overlay_memb)
-     {
-        Overlay_Default *ovl_memb = overlay_memb->ovl;
-        if ((overlay_memb->hide) ||
-            (overlay_memb->zoom_min > overlay_memb->wd->zoom)) continue;
-        if (overlay == overlay_memb || overlay_memb->grp_in) continue;
-        if (ELM_RECTS_INTERSECT(ovl_memb->x, ovl_memb->y, ovl_memb->w,
-                                ovl_memb->h, ovl->x, ovl->y,
-                                ovl->w * OVERLAY_GROUPING_SCALE,
-                                ovl->h * OVERLAY_GROUPING_SCALE))
-          {
-             // Join group.
-             overlay_memb->grp_boss = EINA_FALSE;
-             overlay_memb->grp_in = EINA_TRUE;
-             club_members = eina_list_append(club_members, overlay_memb);
-             _overlay_group_update(overlay_memb->wd, overlay_memb->grp, NULL);
-             _overlay_group_cb_del(overlay_memb->grp);
-          }
-     }
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   evas_object_color_set(ovl->obj, c.r, c.g, c.b, c.a);
+}
 
-   if (eina_list_count(club_members) >= 1)
-     {
-        // Mark as boss
-        overlay->grp_boss = EINA_TRUE;
-        overlay->grp_in = EINA_TRUE;
-        club_members = eina_list_append(club_members, overlay);
-        _overlay_group_update(overlay->wd, overlay->grp, club_members);
-        _overlay_group_cb_del(overlay->grp);
-        _overlay_group_cb_add(overlay->grp);
-     }
+static void
+_overlay_route_hide(Overlay_Route *ovl)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   evas_object_hide(ovl->obj);
 }
 
 static void
-_overlay_display(Widget_Data *wd, Elm_Map_Overlay *overlay)
+_overlay_route_show(Overlay_Route *r)
 {
-   Eina_Bool hide = EINA_FALSE;
+   EINA_SAFETY_ON_NULL_RETURN(r);
+   EINA_SAFETY_ON_NULL_RETURN(r->wd);
 
-   if ((overlay->grp_in) || (overlay->hide) || (overlay->zoom_min > wd->zoom))
-      hide = EINA_TRUE;
-   if ((overlay->grp->clas) && ((overlay->grp->clas->hide) ||
-                                (overlay->grp->clas->zoom_min > wd->zoom)))
-      hide = EINA_TRUE;
+   Eina_List *l;
+   Path *p;
+   Path_Node *n;
 
-   if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
-     {
-        if (hide) _overlay_default_hide(overlay->ovl);
-        else _overlay_default_show(wd, overlay->ovl);
-     }
-   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_BUBBLE)
+   evas_object_polygon_points_clear(r->obj);
+   EINA_LIST_FOREACH(r->nodes, l, n)
      {
-        if (hide) _overlay_bubble_hide(overlay->ovl);
-        else _overlay_bubble_show(overlay->ovl);
+        p = eina_list_nth(r->paths, n->idx);
+        if (!p) continue;
+        _region_to_coord_convert(r->wd, n->pos.lon, n->pos.lat, r->wd->size.w,
+                                 &p->x, &p->y);
+        _coord_to_canvas(r->wd, p->x, p->y, &p->x, &p->y);
      }
+   EINA_LIST_FOREACH(r->paths, l, p)
+      evas_object_polygon_point_add(r->obj, p->x - 3, p->y - 3);
+
+   EINA_LIST_REVERSE_FOREACH(r->paths, l, p)
+      evas_object_polygon_point_add(r->obj, p->x + 3, p->y + 3);
+   evas_object_show(r->obj);
 }
 
 static void
-_overlay_place(Widget_Data *wd)
+_overlay_route_free(Overlay_Route* route)
 {
-   EINA_SAFETY_ON_NULL_RETURN(wd);
+   EINA_SAFETY_ON_NULL_RETURN(route);
+   Path *p;
+   Path_Node *n;
 
-   Eina_List *l, *ll;
-   Elm_Map_Overlay *overlay, *grp;
+   evas_object_del(route->obj);
+   EINA_LIST_FREE(route->paths, p)  free(p);
+   EINA_LIST_FREE(route->nodes, n)
+     {
+        if (n->pos.address) eina_stringshare_del(n->pos.address);
+        free(n);
+     }
+   free(route);
+}
 
-   if (eina_list_count(wd->overlays) == 0) return;
+static Overlay_Route *
+_overlay_route_new(Widget_Data *wd, const Elm_Map_Route *route, Color c)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(route, NULL);
 
-   // Reset overlays coord & grp except class type
-   EINA_LIST_FOREACH(wd->overlays, l, overlay)
-     {
+   Eina_List *l;
+   Path_Node *n;
 
-        if (overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS) continue;
-        if (overlay->paused) continue;
-        if ((overlay->grp) && (overlay->grp->clas) &&
-            (overlay->grp->clas->paused)) continue;
-        if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
-          {
-             Overlay_Class *ovl_grp = NULL;
-             if (overlay->grp->clas) ovl_grp = overlay->grp->clas->ovl;
-             _overlay_default_update(wd, overlay->ovl, NULL, NULL, ovl_grp, NULL,
-                                     NULL);
-           }
-        else if (overlay->type == ELM_MAP_OVERLAY_TYPE_BUBBLE)
-           _overlay_bubble_update(overlay->ovl);
-        // Reset grp flags
-        overlay->grp_in = EINA_FALSE;
-        overlay->grp_boss = EINA_FALSE;
-        _overlay_group_update(wd, overlay->grp, NULL);
-     }
+   Overlay_Route *ovl = ELM_NEW(Overlay_Route);
+   ovl->wd = wd;
+   ovl->obj = evas_object_polygon_add(evas_object_evas_get(wd->obj));
+   evas_object_smart_member_add(ovl->obj, wd->pan_smart);
+   _overlay_route_color_update(ovl, c);
 
-   // Classify into group idol or follwer
-   EINA_LIST_FOREACH(wd->overlays, l, grp)
+   EINA_LIST_FOREACH(route->nodes, l, n)
      {
-        Elm_Map_Overlay *idol;
-        Overlay_Class *ovl;
+        Path *path;
+        Path_Node *node;
 
-        if (grp->type != ELM_MAP_OVERLAY_TYPE_CLASS) continue;
-        if ((grp->hide) || (grp->zoom_min > wd->zoom)) continue;
+        node = ELM_NEW(Path_Node);
+        node->idx = n->idx;
+        node->pos.lon = n->pos.lon;
+        node->pos.lat = n->pos.lat;
+        if (n->pos.address) node->pos.address = strdup(n->pos.address);
+        ovl->nodes = eina_list_append(ovl->nodes, node);
 
-        ovl = grp->ovl;
-        if (ovl->zoom_max < wd->zoom) continue;
-        EINA_LIST_FOREACH(ovl->members, ll, idol)
-          {
-             if (!idol->grp_in) _overlay_grouping(ovl->members, idol);
-          }
+        path = ELM_NEW(Path);
+        ovl->paths = eina_list_append(ovl->paths, path);
      }
+   return ovl;
+}
 
-   // Place overlays
-   EINA_LIST_FOREACH(wd->overlays, l, overlay)
-      if (overlay->type != ELM_MAP_OVERLAY_TYPE_CLASS)
-         _overlay_display(wd, overlay);
-
-   // Place group overlays
-   EINA_LIST_FOREACH(wd->overlays, l, overlay)
-     {
-        if (overlay->grp_boss) _overlay_default_show(wd, overlay->grp->ovl);
-     }
+static void
+_overlay_line_color_update(Overlay_Line *ovl, Color c)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   evas_object_color_set(ovl->obj, c.r, c.g, c.b, c.a);
 }
 
-static Evas_Object *
-_overlay_obj_get(Elm_Map_Overlay *overlay)
+static void
+_overlay_line_hide(Overlay_Line *ovl)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, NULL);
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   if (ovl->obj) evas_object_hide(ovl->obj);
+}
+
+static void
+_overlay_line_show(Overlay_Line *ovl)
+{
+   Evas_Coord fx, fy, tx, ty;
+   Widget_Data *wd = ovl->wd;
+
+   _region_to_coord_convert(wd, ovl->flon, ovl->flat, wd->size.w, &fx, &fy);
+   _region_to_coord_convert(wd, ovl->tlon, ovl->tlat, wd->size.w, &tx, &ty);
+   _coord_to_canvas(wd, fx, fy, &fx, &fy);
+   _coord_to_canvas(wd, tx, ty, &tx, &ty);
+   evas_object_line_xy_set(ovl->obj, fx, fy, tx, ty);
+   evas_object_show(ovl->obj);
+}
+
+static void
+_overlay_line_free(Overlay_Line *ovl)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   evas_object_del(ovl->obj);
+   free(ovl);
+}
+
+static Overlay_Line *
+_overlay_line_new(Widget_Data *wd, double flon, double flat, double tlon, double tlat, Color c)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+
+   Overlay_Line *ovl = ELM_NEW(Overlay_Line);
+   ovl->wd = wd;
+   ovl->flon = flon;
+   ovl->flat = flat;
+   ovl->tlon = tlon;
+   ovl->tlat = tlat;
+   ovl->obj = evas_object_line_add(evas_object_evas_get(wd->obj));
+   evas_object_smart_member_add(ovl->obj, wd->pan_smart);
+   _overlay_line_color_update(ovl, c);
+   return ovl;
+}
+
+static void
+_overlay_polygon_color_update(Overlay_Polygon *ovl, Color c)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   evas_object_color_set(ovl->obj, c.r, c.g, c.b, c.a);
+}
+
+static void
+_overlay_polygon_hide(Overlay_Polygon *ovl)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   if (ovl->obj) evas_object_hide(ovl->obj);
+}
+
+static void
+_overlay_polygon_show(Overlay_Polygon *ovl)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   Eina_List *l;
+   Region *r;
+   Widget_Data *wd = ovl->wd;
+
+   evas_object_polygon_points_clear(ovl->obj);
+   EINA_LIST_FOREACH(ovl->regions, l, r)
+     {
+        Evas_Coord x, y;
+        _region_to_coord_convert(wd, r->lon, r->lat, wd->size.w, &x, &y);
+        _coord_to_canvas(wd, x, y, &x, &y);
+        evas_object_polygon_point_add(ovl->obj, x, y);
+     }
+   evas_object_show(ovl->obj);
+}
+
+static void
+_overlay_polygon_free(Overlay_Polygon *ovl)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   Region *r;
+   evas_object_del(ovl->obj);
+   EINA_LIST_FREE(ovl->regions, r) free(r);
+   free(ovl);
+}
+
+static Overlay_Polygon *
+_overlay_polygon_new(Widget_Data *wd, Color c)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+
+   Overlay_Polygon *ovl = ELM_NEW(Overlay_Polygon);
+   ovl->wd = wd;
+   ovl->obj = evas_object_polygon_add(evas_object_evas_get(wd->obj));
+   evas_object_smart_member_add(ovl->obj, wd->pan_smart);
+   _overlay_polygon_color_update(ovl, c);
+   return ovl;
+}
+
+static void
+_overlay_circle_color_update(Overlay_Circle *ovl, Color c)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   Evas_Object *obj = elm_layout_edje_get(ovl->obj);
+   evas_object_color_set(obj, c.r, c.g, c.b, c.a);
+}
+
+static void
+_overlay_circle_hide(Overlay_Circle *ovl)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   if (ovl->obj) evas_object_hide(ovl->obj);
+}
+
+static void
+_overlay_circle_show(Overlay_Circle *ovl)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   double r;
+   Evas_Coord x, y;
+   Widget_Data *wd = ovl->wd;
+
+   r = (ovl->ratio) * wd->size.w;
+   _region_to_coord_convert(wd, ovl->lon, ovl->lat, wd->size.w, &x, &y);
+   _coord_to_canvas(wd, x, y, &x, &y);
+   _obj_place(ovl->obj, x - r, y - r, r * 2, r * 2);
+}
+
+static void
+_overlay_circle_free(Overlay_Circle *ovl)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   evas_object_del(ovl->obj);
+   free(ovl);
+}
+
+static Overlay_Circle *
+_overlay_circle_new(Widget_Data *wd, double lon, double lat, double radius, Color c)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+
+   Overlay_Circle *ovl = ELM_NEW(Overlay_Circle);
+   ovl->wd = wd;
+   ovl->lon = lon;
+   ovl->lat = lat;
+   ovl->radius = radius;
+   ovl->ratio = radius / wd->size.w;
+
+   ovl->obj = elm_layout_add(wd->obj);
+   evas_object_smart_member_add(ovl->obj, wd->pan_smart);
+   evas_object_stack_above(ovl->obj, wd->sep_maps_overlays);
+   elm_layout_theme_set(ovl->obj, "map/circle", "base",
+                        elm_widget_style_get(wd->obj));
+   _overlay_circle_color_update(ovl, c);
+   return ovl;
+}
+
+static void
+_overlay_scale_color_update(Overlay_Scale *ovl, Color c)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   evas_object_color_set(ovl->obj, c.r, c.g, c.b, c.a);
+}
+
+static void
+_overlay_scale_hide(Overlay_Scale *ovl)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   if (ovl->obj) evas_object_hide(ovl->obj);
+}
+
+ static void
+_overlay_scale_show(Overlay_Scale *ovl)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   Evas_Coord  w;
+   double lon, lat;
+   double text;
+   char buf[32];
+   double meter;
+   Widget_Data *wd = ovl->wd;
+
+   if ((int)sizeof(_scale_tb) <= wd->zoom)
+     {
+        ERR("Zoom level is too high");
+        return;
+     }
+
+   elm_map_region_get(wd->obj, &lon, &lat);
+   meter = wd->src_tile->scale_cb(wd->obj, lon, lat, wd->zoom);
+
+   w = (_scale_tb[wd->zoom] / meter) * (wd->zoom_detail - wd->zoom + 1);
+
+   text = _scale_tb[wd->zoom]/1000;
+   if (text < 1)  snprintf(buf, sizeof(buf), "%d m", (int)(text * 1000));
+   else   snprintf(buf, sizeof(buf), "%d km", (int)text);
+
+   edje_object_part_text_set(elm_layout_edje_get(ovl->obj), "elm.text", buf);
+   _obj_place(ovl->obj, ovl->x, ovl->y, w, ovl->h);
+}
+
+ static void
+_overlay_scale_free(Overlay_Scale *ovl)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+   evas_object_del(ovl->obj);
+   free(ovl);
+}
+
+static Overlay_Scale *
+_overlay_scale_new(Widget_Data *wd, Evas_Coord x, Evas_Coord y, Color c)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+   const char *s;
+
+   Overlay_Scale *ovl = ELM_NEW(Overlay_Scale);
+   ovl->wd = wd;
+   ovl->x = x;
+   ovl->y = y;
+
+   ovl->obj = elm_layout_add(wd->obj);
+   evas_object_smart_member_add(ovl->obj, wd->pan_smart);
+   evas_object_stack_above(ovl->obj, wd->sep_maps_overlays);
+   elm_layout_theme_set(ovl->obj, "map/scale", "base",
+                        elm_widget_style_get(wd->obj));
+   s = edje_object_data_get(elm_layout_edje_get(ovl->obj), "size_w");
+   if (s) ovl->w = atoi(s);
+   else ovl->w = 100;
+   s = edje_object_data_get(elm_layout_edje_get(ovl->obj), "size_h");
+   if (s) ovl->h = atoi(s);
+   else ovl->h = 60;
+   _overlay_scale_color_update(ovl, c);
+   return ovl;
+}
+
+static void
+_overlay_grouping(Eina_List *clas_membs, Elm_Map_Overlay *boss)
+{
+   EINA_SAFETY_ON_NULL_RETURN(clas_membs);
+   EINA_SAFETY_ON_NULL_RETURN(boss);
+
+   Eina_List *l;
+   Eina_List *grp_membs = NULL;
+   Elm_Map_Overlay *memb;
+
+   int sum_x = 0, sum_y = 0, cnt = 0;
+   Evas_Coord bx = 0, by = 0, bw = 0, bh = 0;
+
+   if (boss->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
+      _overlay_default_coord_get(boss->ovl, &bx, &by, &bw, &bh);
+   else if (boss->type == ELM_MAP_OVERLAY_TYPE_BUBBLE)
+      _overlay_bubble_coord_get(boss->ovl, &bx, &by, &bw, &bh);
+
+   EINA_LIST_FOREACH(clas_membs, l, memb)
+     {
+        Evas_Coord x = 0, y = 0, w = 0, h = 0;
+
+        if (boss == memb || memb->grp->in) continue;
+        if ((memb->hide) || (memb->zoom_min > memb->wd->zoom)) continue;
+
+        if (memb->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
+           _overlay_default_coord_get(memb->ovl, &x, &y, &w, &h);
+        else if (memb->type == ELM_MAP_OVERLAY_TYPE_BUBBLE)
+           _overlay_bubble_coord_get(memb->ovl, &x, &y, &w, &h);
+
+        if (bw <= 0 || bh <= 0 || w <= 0 || h <= 0) continue;
+        if (ELM_RECTS_INTERSECT(x, y, w, h, bx, by,
+                                bw * OVERLAY_GROUPING_SCALE,
+                                bh * OVERLAY_GROUPING_SCALE))
+          {
+             // Join group.
+             memb->grp->boss = EINA_FALSE;
+             memb->grp->in = EINA_TRUE;
+             sum_x += x;
+             sum_y += y;
+             cnt++;
+             grp_membs = eina_list_append(grp_membs, memb);
+          }
+     }
+
+   if (cnt >= 1)
+     {
+        // Mark as boss
+        boss->grp->boss = EINA_TRUE;
+        boss->grp->in = EINA_TRUE;
+        sum_x = (sum_x + bx) / (cnt + 1);
+        sum_y = (sum_y + by) / (cnt + 1);
+        grp_membs = eina_list_append(grp_membs, boss);
+        _overlay_group_coord_member_update(boss->grp, sum_x, sum_y, grp_membs);
+
+        // Append group to all overlay list
+        boss->wd->group_overlays = eina_list_append(boss->wd->group_overlays,
+                                                  boss->grp->overlay);
+     }
+}
+
+static void
+_overlay_show(Elm_Map_Overlay *overlay)
+{
+   Widget_Data *wd = overlay->wd;
+
+   if (overlay->paused) return;
+   if ((overlay->grp) && (overlay->grp->clas) &&
+       (overlay->grp->clas->paused)) return;
+
+   overlay->visible = EINA_TRUE;
+   if (overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS)
+     {
+        overlay->visible = EINA_FALSE;
+        return;
+     }
+   if (overlay->grp)
+     {
+        if ((overlay->grp->in) ||
+            (overlay->hide) || (overlay->zoom_min > wd->zoom))
+           overlay->visible = EINA_FALSE;
+
+        if ((overlay->grp->clas) &&
+            ((overlay->grp->clas->hide) ||
+             (overlay->grp->clas->zoom_min > wd->zoom)))
+           overlay->visible = EINA_FALSE;
+     }
+
    if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
      {
+        if (overlay->visible) _overlay_default_show(overlay->ovl);
+        else _overlay_default_hide(overlay->ovl);
+     }
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_GROUP)
+     {
+        if (overlay->visible) _overlay_group_show(overlay->ovl);
+        else _overlay_group_hide(overlay->ovl);
+     }
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_BUBBLE)
+     {
+        overlay->visible = _overlay_bubble_show_hide(overlay->ovl,
+                                                     overlay->visible);
+     }
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_ROUTE)
+     {
+       if (overlay->visible) _overlay_route_show(overlay->ovl);
+       else _overlay_route_hide(overlay->ovl);
+     }
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_LINE)
+     {
+        if (overlay->visible) _overlay_line_show(overlay->ovl);
+        else _overlay_line_hide(overlay->ovl);
+     }
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_POLYGON)
+     {
+        if (overlay->visible) _overlay_polygon_show(overlay->ovl);
+        else _overlay_polygon_hide(overlay->ovl);
+     }
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_CIRCLE)
+     {
+        if (overlay->visible) _overlay_circle_show(overlay->ovl);
+        else _overlay_circle_hide(overlay->ovl);
+     }
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_SCALE)
+     {
+        if (overlay->visible) _overlay_scale_show(overlay->ovl);
+        else _overlay_scale_hide(overlay->ovl);
+     }
+}
+
+static void
+_overlay_place(Widget_Data *wd)
+{
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+
+   Eina_List *l, *ll;
+   Elm_Map_Overlay *overlay;
+
+   eina_list_free(wd->group_overlays);
+   wd->group_overlays = NULL;
+
+   EINA_LIST_FOREACH(wd->overlays, l, overlay)
+     {
+        // Reset groups
+        if ((overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS) ||
+            (overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS)) continue;
+        overlay->grp->in = EINA_FALSE;
+        overlay->grp->boss = EINA_FALSE;
+        _overlay_group_hide(overlay->grp);
+
+        // Update overlays' coord
+        if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
+           _overlay_default_coord_update(overlay->ovl);
+        else if (overlay->type == ELM_MAP_OVERLAY_TYPE_BUBBLE)
+           _overlay_bubble_coord_update(overlay->ovl);
+     }
+
+   // Classify into group boss or follwer
+   EINA_LIST_FOREACH(wd->overlays, l, overlay)
+     {
+        Elm_Map_Overlay *boss;
+        Overlay_Class *clas;
+
+        if (overlay->type != ELM_MAP_OVERLAY_TYPE_CLASS) continue;
+        if (overlay->hide || (overlay->zoom_min > wd->zoom)) continue;
+
+        clas = overlay->ovl;
+        if (clas->zoom_max < wd->zoom) continue;
+        EINA_LIST_FOREACH(clas->members, ll, boss)
+          {
+             if (boss->type == ELM_MAP_OVERLAY_TYPE_CLASS) continue;
+             if (boss->hide || (boss->zoom_min > wd->zoom)) continue;
+             if (boss->grp->in) continue;
+             _overlay_grouping(clas->members, boss);
+          }
+     }
+
+   // Place group overlays and overlays
+   EINA_LIST_FOREACH(wd->group_overlays, l, overlay) _overlay_show(overlay);
+   EINA_LIST_FOREACH(wd->overlays, l, overlay)  _overlay_show(overlay);
+}
+
+static Evas_Object *
+_overlay_obj_get(const Elm_Map_Overlay *overlay)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, NULL);
+   if (overlay->type == ELM_MAP_OVERLAY_TYPE_GROUP)
+     {
+        Overlay_Group *ovl = overlay->ovl;
+        Overlay_Default *df = ovl->ovl;
+        return df->layout;
+     }
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
+     {
         Overlay_Default *ovl = overlay->ovl;
         return ovl->layout;
      }
@@ -2596,7 +2501,7 @@ _overlays_show(void *data)
    EINA_SAFETY_ON_NULL_RETURN(data);
    Delayed_Data *dd = data;
 
-   int zoom;
+   int zoom, zoom_max;
    double max_lon, min_lon, max_lat, min_lat;
    Evas_Coord vw, vh;
 
@@ -2604,16 +2509,17 @@ _overlays_show(void *data)
    dd->lon = (max_lon + min_lon) / 2;
    dd->lat = (max_lat + min_lat) / 2;
 
-   zoom = dd->wd->src->zoom_min;
-   _viewport_size_get(dd->wd, &vw, &vh);
-   while (zoom <= dd->wd->src->zoom_max)
+   zoom = dd->wd->src_tile->zoom_min;
+   _viewport_coord_get(dd->wd, NULL, NULL, &vw, &vh);
+   if (dd->wd->src_tile->zoom_max < dd->wd->zoom_max)
+      zoom_max = dd->wd->src_tile->zoom_max;
+   else zoom_max = dd->wd->zoom_max;
+   while (zoom <= zoom_max)
      {
         Evas_Coord size, max_x, max_y, min_x, min_y;
         size = pow(2.0, zoom) * dd->wd->tsize;
-        elm_map_utils_convert_geo_into_coord(dd->wd->obj, min_lon, max_lat,
-                                             size, &min_x, &max_y);
-        elm_map_utils_convert_geo_into_coord(dd->wd->obj, max_lon, min_lat,
-                                             size, &max_x, &min_y);
+        _region_to_coord_convert(dd->wd, min_lon, max_lat, size, &min_x, &max_y);
+        _region_to_coord_convert(dd->wd, max_lon, min_lat, size, &max_x, &min_y);
         if ((max_x - min_x) > vw || (max_y - min_y) > vh) break;
         zoom++;
      }
@@ -2708,13 +2614,11 @@ _pan_calculate(Evas_Object *obj)
    EINA_SAFETY_ON_NULL_RETURN(sd);
 
    Evas_Coord w, h;
-   evas_object_geometry_get(sd->wd->pan_smart, NULL, NULL, &w, &h);
+   evas_object_geometry_get(obj, NULL, NULL, &w, &h);
    if (w <= 0 || h <= 0) return;
 
    _grid_place(sd->wd);
-   _marker_place(sd->wd);
    _overlay_place(sd->wd);
-   _route_place(sd->wd);
    _track_place(sd->wd);
    _delayed_do(sd->wd);
 }
@@ -2758,245 +2662,25 @@ _freeze_off(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__
    elm_smart_scroller_freeze_set(wd->scr, 0);
 }
 
-static void
-_on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
+static Eina_Bool
+cb_dump_name_attrs(void *data, const char *key, const char *value)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN(wd);
+   Name_Dump *dump = (Name_Dump*)data;
+   if (!dump) return EINA_FALSE;
 
-   if (elm_widget_focus_get(obj))
-     {
-        edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), "elm,action,focus", "elm");
-        evas_object_focus_set(wd->obj, EINA_TRUE);
-     }
-   else
-     {
-        edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), "elm,action,unfocus", "elm");
-        evas_object_focus_set(wd->obj, EINA_FALSE);
-     }
+   if (!strncmp(key, NOMINATIM_ATTR_LON, sizeof(NOMINATIM_ATTR_LON))) dump->lon = atof(value);
+   else if (!strncmp(key, NOMINATIM_ATTR_LAT, sizeof(NOMINATIM_ATTR_LAT))) dump->lat = atof(value);
+
+   return EINA_TRUE;
 }
 
-static void
-_del_hook(Evas_Object *obj)
+static Eina_Bool
+cb_route_dump(void *data, Eina_Simple_XML_Type type, const char *value, unsigned offset __UNUSED__, unsigned length)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-
-   Eina_List *l, *ll;
-   Evas_Object *p;
-   Path_Node *n;
-   Path_Waypoint *w;
-   Ecore_Event_Handler *h;
-   Elm_Map_Route *r;
-   Elm_Map_Name *na;
-   Evas_Object *route;
-   Elm_Map_Marker *marker;
-   Elm_Map_Group_Class *group_clas;
-   Elm_Map_Marker_Class *clas;
-   Elm_Map_Overlay *overlay;
-   Delayed_Data *dd;
-   int idx = 0;
-   Map_Sources_Tab *s;
+   Route_Dump *dump = data;
+   if (!dump) return EINA_FALSE;
 
-   EINA_LIST_FOREACH(wd->route, l, r)
-     {
-        EINA_LIST_FREE(r->path, p)
-          {
-             evas_object_del(p);
-          }
-
-        EINA_LIST_FREE(r->waypoint, w)
-          {
-             if (w->point) eina_stringshare_del(w->point);
-             free(w);
-          }
-
-        EINA_LIST_FREE(r->nodes, n)
-          {
-             if (n->pos.address) eina_stringshare_del(n->pos.address);
-             free(n);
-          }
-
-        EINA_LIST_FREE(r->handlers, h)
-          {
-             ecore_event_handler_del(h);
-          }
-
-        if (r->con_url) ecore_con_url_free(r->con_url);
-        if (r->info.nodes) eina_stringshare_del(r->info.nodes);
-        if (r->info.waypoints) eina_stringshare_del(r->info.waypoints);
-     }
-
-   EINA_LIST_FREE(wd->names, na)
-     {
-        if (na->address) free(na->address);
-        if (na->handler) ecore_event_handler_del(na->handler);
-        if (na->ud.fname)
-          {
-             ecore_file_remove(na->ud.fname);
-             free(na->ud.fname);
-             na->ud.fname = NULL;
-          }
-     }
-
-   EINA_LIST_FREE(wd->track, route)
-     {
-        evas_object_del(route);
-     }
-
-
-   EINA_LIST_FOREACH_SAFE(wd->markers, l, ll, marker)
-      elm_map_marker_remove(marker);
-   eina_list_free(wd->markers);
-
-   EINA_LIST_FREE(wd->group_classes, group_clas)
-     {
-        eina_list_free(group_clas->markers);
-        if (group_clas->style) eina_stringshare_del(group_clas->style);
-        free(group_clas);
-     }
-
-   EINA_LIST_FREE(wd->marker_classes, clas)
-     {
-        if (clas->style) eina_stringshare_del(clas->style);
-        free(clas);
-     }
-
-   EINA_LIST_FREE(wd->overlays, overlay) elm_map_overlay_del(overlay);
-
-   if (wd->scr_timer) ecore_timer_del(wd->scr_timer);
-   if (wd->long_timer) ecore_timer_del(wd->long_timer);
-
-   if (wd->delayed_jobs) EINA_LIST_FREE(wd->delayed_jobs, dd) free(dd);
-
-   if (wd->user_agent) eina_stringshare_del(wd->user_agent);
-   if (wd->ua) eina_hash_free(wd->ua);
-   if (wd->download_idler) ecore_idler_del(wd->download_idler);
-   eina_list_free(wd->download_list);
-
-   if (wd->zoom_timer) ecore_timer_del(wd->zoom_timer);
-   if (wd->zoom_animator) ecore_animator_del(wd->zoom_animator);
-
-   _grid_all_clear(wd);
-
-   for (idx = 0; wd->src_names[idx]; idx++)
-      eina_stringshare_del(wd->src_names[idx]);
-
-   EINA_LIST_FREE(wd->srcs, s) free(s);
-
-   if (wd->map) evas_map_free(wd->map);
-
-   free(wd);
-}
-
-static void
-_del_pre_hook(Evas_Object *obj)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-}
-
-static void
-_theme_hook(Evas_Object *obj)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-
-   elm_smart_scroller_object_theme_set(obj, wd->scr, "map", "base", elm_widget_style_get(obj));
-   _sizing_eval(wd);
-}
-
-static Eina_Bool
-_event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type type, void *event_info)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, EINA_FALSE);
-
-   Evas_Coord x, y;
-   Evas_Coord vh;
-   Evas_Coord step_x, step_y, page_x, page_y;
-
-   if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE;
-   Evas_Event_Key_Down *ev = event_info;
-   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
-
-   elm_smart_scroller_child_pos_get(wd->scr, &x, &y);
-   elm_smart_scroller_step_size_get(wd->scr, &step_x, &step_y);
-   elm_smart_scroller_page_size_get(wd->scr, &page_x, &page_y);
-   _viewport_size_get(wd, NULL, &vh);
-
-   if ((!strcmp(ev->keyname, "Left")) || (!strcmp(ev->keyname, "KP_Left")))
-     {
-        x -= step_x;
-     }
-   else if ((!strcmp(ev->keyname, "Right")) || (!strcmp(ev->keyname, "KP_Right")))
-     {
-        x += step_x;
-     }
-   else if ((!strcmp(ev->keyname, "Up"))  || (!strcmp(ev->keyname, "KP_Up")))
-     {
-        y -= step_y;
-     }
-   else if ((!strcmp(ev->keyname, "Down")) || (!strcmp(ev->keyname, "KP_Down")))
-     {
-        y += step_y;
-     }
-   else if ((!strcmp(ev->keyname, "Prior")) || (!strcmp(ev->keyname, "KP_Prior")))
-     {
-        if (page_y < 0)
-          y -= -(page_y * vh) / 100;
-        else
-          y -= page_y;
-     }
-   else if ((!strcmp(ev->keyname, "Next")) || (!strcmp(ev->keyname, "KP_Next")))
-     {
-        if (page_y < 0)
-          y += -(page_y * vh) / 100;
-        else
-          y += page_y;
-     }
-   else if (!strcmp(ev->keyname, "KP_Add"))
-     {
-        zoom_with_animation(wd, wd->zoom + 1, 10);
-        return EINA_TRUE;
-     }
-   else if (!strcmp(ev->keyname, "KP_Subtract"))
-     {
-        zoom_with_animation(wd, wd->zoom - 1, 10);
-        return EINA_TRUE;
-     }
-   else return EINA_FALSE;
-
-   ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-   elm_smart_scroller_child_pos_set(wd->scr, x, y);
-
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-cb_dump_name_attrs(void *data, const char *key, const char *value)
-{
-   Name_Dump *dump = (Name_Dump*)data;
-   if (!dump) return EINA_FALSE;
-
-   if (!strncmp(key, NOMINATIM_ATTR_LON, sizeof(NOMINATIM_ATTR_LON))) dump->lon = atof(value);
-   else if (!strncmp(key, NOMINATIM_ATTR_LAT, sizeof(NOMINATIM_ATTR_LAT))) dump->lat = atof(value);
-
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-cb_route_dump(void *data, Eina_Simple_XML_Type type, const char *value, unsigned offset __UNUSED__, unsigned length)
-{
-   Route_Dump *dump = data;
-   if (!dump) return EINA_FALSE;
-
-   switch (type)
+   switch (type)
      {
       case EINA_SIMPLE_XML_OPEN:
       case EINA_SIMPLE_XML_OPEN_EMPTY:
@@ -3071,20 +2755,19 @@ cb_name_dump(void *data, Eina_Simple_XML_Type type, const char *value, unsigned
 }
 
 static void
-_parse_kml(void *data)
+_kml_parse(Elm_Map_Route *r)
 {
-   Elm_Map_Route *r = (Elm_Map_Route*)data;
-   if (!r || !r->ud.fname) return;
+   EINA_SAFETY_ON_NULL_RETURN(r);
+   EINA_SAFETY_ON_NULL_RETURN(r->fname);
 
    FILE *f;
    char **str;
    unsigned int ele, idx;
    double lon, lat;
-   Evas_Object *path;
 
-   Route_Dump dump = {0, r->ud.fname, 0.0, NULL, NULL};
+   Route_Dump dump = {0, r->fname, 0.0, NULL, NULL};
 
-   f = fopen(r->ud.fname, "rb");
+   f = fopen(r->fname, "rb");
    if (f)
      {
         long sz;
@@ -3101,7 +2784,8 @@ _parse_kml(void *data)
                {
                   if (fread(buf, 1, sz, f))
                     {
-                       eina_simple_xml_parse(buf, sz, EINA_TRUE, cb_route_dump, &dump);
+                       eina_simple_xml_parse(buf, sz, EINA_TRUE, cb_route_dump,
+                                             &dump);
                        free(buf);
                     }
                }
@@ -3151,10 +2835,6 @@ _parse_kml(void *data)
                        DBG("%lf:%lf", lon, lat);
                        n->pos.address = NULL;
                        r->nodes = eina_list_append(r->nodes, n);
-
-                       path = evas_object_polygon_add(evas_object_evas_get(r->wd->obj));
-                       evas_object_smart_member_add(path, r->wd->pan_smart);
-                       r->path = eina_list_append(r->path, path);
                     }
                }
              if (str && str[0])
@@ -3167,16 +2847,16 @@ _parse_kml(void *data)
 }
 
 static void
-_parse_name(void *data)
+_name_parse(Elm_Map_Name *n)
 {
-   Elm_Map_Name *n = (Elm_Map_Name*)data;
-   if (!n || !n->ud.fname) return;
+   EINA_SAFETY_ON_NULL_RETURN(n);
+   EINA_SAFETY_ON_NULL_RETURN(n->fname);
 
    FILE *f;
 
    Name_Dump dump = {0, NULL, 0.0, 0.0};
 
-   f = fopen(n->ud.fname, "rb");
+   f = fopen(n->fname, "rb");
    if (f)
      {
         long sz;
@@ -3226,106 +2906,119 @@ Grid *_get_current_grid(Widget_Data *wd)
    return ret;
 }
 
-static Eina_Bool
-_route_complete_cb(void *data, int ev_type __UNUSED__, void *event)
+static void
+_route_cb(void *data, const char *file,  int status)
 {
-   Ecore_Con_Event_Url_Complete *ev = event;
-   Elm_Map_Route *r = (Elm_Map_Route*)data;
-   Widget_Data *wd = r->wd;
-
-   if ((!r) || (!ev)) return EINA_TRUE;
-   Elm_Map_Route *rr = ecore_con_url_data_get(r->con_url);
-   ecore_con_url_data_set(r->con_url, NULL);
-   if (r!=rr) return EINA_TRUE;
+   EINA_SAFETY_ON_NULL_RETURN(data);
+   EINA_SAFETY_ON_NULL_RETURN(file);
 
-   if (r->ud.fd) fclose(r->ud.fd);
-   _parse_kml(r);
+   Elm_Map_Route *route = data;
+   Widget_Data *wd = route->wd;
+   EINA_SAFETY_ON_NULL_RETURN(wd);
 
-   _route_place(wd);
+   route->job = NULL;
+   if (status == 200)
+     {
+        _kml_parse(route);
+        INF("Route request success from (%lf, %lf) to (%lf, %lf)",
+            route->flon, route->flat, route->tlon, route->tlat);
+        if (route->cb) route->cb(route->data, wd->obj, route);
+        evas_object_smart_callback_call(wd->obj, SIG_ROUTE_LOADED, NULL);
+     }
+   else
+     {
+        ERR("Route request failed: %d", status);
+        if (route->cb) route->cb(route->data, wd->obj, NULL);
+        evas_object_smart_callback_call(wd->obj, SIG_ROUTE_LOADED_FAIL, NULL);
+     }
 
    edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
                            "elm,state,busy,stop", "elm");
-   evas_object_smart_callback_call(wd->obj, SIG_ROUTE_LOADED, NULL);
-   return EINA_TRUE;
 }
 
-static Eina_Bool
-_name_complete_cb(void *data, int ev_type __UNUSED__, void *event)
+static void
+_name_cb(void *data, const char *file,  int status)
 {
-   Ecore_Con_Event_Url_Complete *ev = event;
-   Elm_Map_Name *n = (Elm_Map_Name*)data;
-   Widget_Data *wd = n->wd;
-
-   if ((!n) || (!ev)) return EINA_TRUE;
-   Elm_Map_Name *nn = ecore_con_url_data_get(n->con_url);
-   ecore_con_url_data_set(n->con_url, NULL);
-   if (n!=nn) return EINA_TRUE;
+   EINA_SAFETY_ON_NULL_RETURN(data);
+   EINA_SAFETY_ON_NULL_RETURN(file);
 
-   if (n->ud.fd) fclose(n->ud.fd);
-   _parse_name(n);
+   Elm_Map_Name *name = data;
+   Widget_Data *wd = name->wd;
+   EINA_SAFETY_ON_NULL_RETURN(wd);
 
+   name->job = NULL;
+   if (status == 200)
+     {
+        _name_parse(name);
+        INF("Name request success address:%s, lon:%lf, lat:%lf",
+            name->address, name->lon, name->lat);
+        if (name->cb) name->cb(name->data, wd->obj, name);
+        evas_object_smart_callback_call(wd->obj, SIG_NAME_LOADED, NULL);
+     }
+   else
+     {
+        ERR("Name request failed: %d", status);
+        if (name->cb) name->cb(name->data, wd->obj, NULL);
+        evas_object_smart_callback_call(wd->obj, SIG_NAME_LOADED_FAIL, NULL);
+     }
    edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
                            "elm,state,busy,stop", "elm");
-   evas_object_smart_callback_call(wd->obj, SIG_NAME_LOADED, NULL);
-   return EINA_TRUE;
 }
 
+
+
 static Elm_Map_Name *
-_utils_convert_name(const Evas_Object *obj, int method, char *address, double lon, double lat)
+_name_request(const Evas_Object *obj, int method, const char *address, double lon, double lat, Elm_Map_Name_Cb name_cb, void *data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
-   char buf[PATH_MAX];
-   char *source;
-   int fd;
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd->src_name, NULL);
 
-   if ((!wd) || (!wd->src)) return NULL;
-   Elm_Map_Name *name = ELM_NEW(Elm_Map_Name);
 
-   snprintf(buf, sizeof(buf), DEST_NAME_XML_FILE);
-   fd = mkstemp(buf);
-   if (fd < 0)
-     {
-        free(name);
-        return NULL;
-     }
+   char *url;
+   char fname[PATH_MAX];
 
-   name->con_url = ecore_con_url_new(NULL);
-   name->ud.fname = strdup(buf);
-   INF("xml file : %s", name->ud.fname);
+   if (!ecore_file_exists(CACHE_NAME_ROOT)) ecore_file_mkpath(CACHE_NAME_ROOT);
 
-   name->ud.fd = fdopen(fd, "w+");
-   if ((!name->con_url) || (!name->ud.fd))
+   url = wd->src_name->url_cb(wd->obj, method, address, lon, lat);
+   if (!url)
      {
-        ecore_con_url_free(name->con_url);
-        free(name);
+        ERR("Name URL is NULL");
         return NULL;
      }
 
+   Elm_Map_Name *name = ELM_NEW(Elm_Map_Name);
    name->wd = wd;
-   name->handler = ecore_event_handler_add (ECORE_CON_EVENT_URL_COMPLETE, _name_complete_cb, name);
+   snprintf(fname, sizeof(fname), CACHE_NAME_ROOT"/%d", rand());
+   name->fname = strdup(fname);
    name->method = method;
    if (method == ELM_MAP_NAME_METHOD_SEARCH) name->address = strdup(address);
-   else if (method == ELM_MAP_NAME_METHOD_REVERSE) name->address = NULL;
-   name->lon = lon;
-   name->lat = lat;
+   else if (method == ELM_MAP_NAME_METHOD_REVERSE)
+     {
+        name->lon = lon;
+        name->lat = lat;
+     }
+   name->cb = name_cb;
+   name->data = data;
 
-   source = wd->src->name_url_cb(wd->obj, method, address, lon, lat);
-   INF("name url = %s", source);
+   if (!ecore_file_download_full(url, name->fname, _name_cb, NULL, name,
+                                 &(name->job), wd->ua) || !(name->job))
+     {
+        ERR("Can't request Name from %s to %s", url, name->fname);
+        if (name->address) free(name->address);
+        free(name->fname);
+        free(name);
+        return NULL;
+     }
+   INF("Name requested from %s to %s", url, name->fname);
+   free(url);
 
    wd->names = eina_list_append(wd->names, name);
-   ecore_con_url_url_set(name->con_url, source);
-   ecore_con_url_fd_set(name->con_url, fileno(name->ud.fd));
-   ecore_con_url_data_set(name->con_url, name);
-
+   evas_object_smart_callback_call(wd->obj, SIG_NAME_LOAD, name);
    edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
                            "elm,state,busy,start", "elm");
-   evas_object_smart_callback_call(wd->obj, SIG_NAME_LOAD, NULL);
-   ecore_con_url_get(name->con_url);
-   if (source) free(source);
-
    return name;
-
 }
 
 static Evas_Event_Flags
@@ -3384,27 +3077,409 @@ _pinch_rotate_end_cb(void *data, void *event_info __UNUSED__)
    return EVAS_EVENT_FLAG_NONE;
 }
 
+static Eina_Bool
+_source_tile_mod_cb(Eina_Module *m, void *data)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(data, EINA_FALSE);
+
+   Widget_Data *wd = data;
+   Source_Tile *s;
+   Elm_Map_Module_Source_Name_Func name_cb;
+   Elm_Map_Module_Tile_Zoom_Min_Func zoom_min;
+   Elm_Map_Module_Tile_Zoom_Max_Func zoom_max;
+   Elm_Map_Module_Tile_Url_Func url_cb;
+   Elm_Map_Module_Tile_Geo_to_Coord_Func geo_to_coord;
+   Elm_Map_Module_Tile_Coord_to_Geo_Func coord_to_geo;
+   Elm_Map_Module_Tile_Scale_Func scale_cb;
+   const char *file;
+
+   file = eina_module_file_get(m);
+   if (!eina_module_load(m))
+     {
+        ERR("Could not load module \"%s\": %s", file,
+            eina_error_msg_get(eina_error_get()));
+        return EINA_FALSE;
+     }
+
+   name_cb = eina_module_symbol_get(m, "map_module_source_name_get");
+   zoom_min = eina_module_symbol_get(m, "map_module_tile_zoom_min_get");
+   zoom_max = eina_module_symbol_get(m, "map_module_tile_zoom_max_get");
+   url_cb = eina_module_symbol_get(m, "map_module_tile_url_get");
+   geo_to_coord = eina_module_symbol_get(m, "map_module_tile_geo_to_coord");
+   coord_to_geo = eina_module_symbol_get(m, "map_module_tile_coord_to_geo");
+   scale_cb = eina_module_symbol_get(m, "map_module_tile_scale_get");
+   if ((!name_cb) || (!zoom_min) || (!zoom_max) || (!url_cb) ||
+       (!geo_to_coord) || (!coord_to_geo) || (!scale_cb))
+     {
+        WRN("Could not find map module functions from module \"%s\": %s",
+            file, eina_error_msg_get(eina_error_get()));
+        eina_module_unload(m);
+        return EINA_FALSE;
+     }
+   s = ELM_NEW(Source_Tile);
+   s->name = name_cb();
+   s->zoom_min = zoom_min();
+   s->zoom_max = zoom_max();
+   s->url_cb = url_cb;
+   s->geo_to_coord = geo_to_coord;
+   s->coord_to_geo = coord_to_geo;
+   s->scale_cb = scale_cb;
+   wd->src_tiles = eina_list_append(wd->src_tiles, s);
+
+   return EINA_TRUE;
+}
+
 static void
-_zoom_mode_set(void *data)
+_source_tile_load(Widget_Data *wd)
 {
-   EINA_SAFETY_ON_NULL_RETURN(data);
-   Delayed_Data *dd = data;
+   unsigned int idx;
+   Eina_List *l;
+   Source_Tile *s;
 
-   dd->wd->mode = dd->mode;
-   if (dd->mode != ELM_MAP_ZOOM_MODE_MANUAL)
+   // Load from hard coded data
+   for (idx = 0; idx < (sizeof(src_tiles) / sizeof(Source_Tile)); idx++)
      {
-        Evas_Coord w, h;
-        Evas_Coord vw, vh;
+        s= ELM_NEW(Source_Tile);
+        s->name = src_tiles[idx].name;
+        s->zoom_min = src_tiles[idx].zoom_min;
+        s->zoom_max = src_tiles[idx].zoom_max;
+        s->url_cb = src_tiles[idx].url_cb;
+        s->geo_to_coord = src_tiles[idx].geo_to_coord;
+        s->coord_to_geo = src_tiles[idx].coord_to_geo;
+        s->scale_cb = src_tiles[idx].scale_cb;
+        wd->src_tiles = eina_list_append(wd->src_tiles, s);
+     }
 
-        double zoom;
-        double diff;
+   // Load from modules
+   wd->src_tile_mods = eina_module_list_get(wd->src_tile_mods, MODULES_PATH, 1,
+                                            &_source_tile_mod_cb, wd);
 
-        w = dd->wd->size.w;
-        h = dd->wd->size.h;
-        zoom = dd->wd->zoom_detail;
-        _viewport_size_get(dd->wd, &vw, &vh);
+   // Set default source
+   wd->src_tile = eina_list_nth(wd->src_tiles, 0);
 
-        if (dd->mode == ELM_MAP_ZOOM_MODE_AUTO_FIT)
+   // Make name strings
+   idx = 0;
+   wd->src_tile_names  = calloc((eina_list_count(wd->src_tiles) + 1),
+                                sizeof(char *));
+   EINA_LIST_FOREACH(wd->src_tiles, l, s)
+     {
+        eina_stringshare_replace(&wd->src_tile_names[idx], s->name);
+        INF("source : %s", wd->src_tile_names[idx]);
+        idx++;
+     }
+}
+
+static void
+_source_tile_unload(Widget_Data *wd)
+{
+   int idx = 0;
+   Source_Tile *s;
+
+   for (idx = 0; wd->src_tile_names[idx]; idx++)
+      eina_stringshare_del(wd->src_tile_names[idx]);
+   EINA_LIST_FREE(wd->src_tiles, s) free(s);
+   eina_module_list_free(wd->src_tile_mods);
+}
+
+static void
+_source_tile_set(Widget_Data *wd, const char *source_name)
+{
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+   EINA_SAFETY_ON_NULL_RETURN(source_name);
+   Source_Tile *s;
+   Eina_List *l;
+
+   if (wd->src_tile && !strcmp(wd->src_tile->name, source_name)) return;
+
+   EINA_LIST_FOREACH(wd->src_tiles, l, s)
+     {
+        if (!strcmp(s->name, source_name))
+          {
+             wd->src_tile = s;
+             break;
+          }
+     }
+   if (!wd->src_tile)
+     {
+        ERR("source name (%s) is not found", source_name);
+        return;
+     }
+
+   if (wd->src_tile->zoom_max < wd->zoom)
+      wd->zoom = wd->src_tile->zoom_max;
+   else if (wd->src_tile->zoom_min > wd->zoom)
+      wd->zoom = wd->src_tile->zoom_min;
+
+   if (wd->src_tile->zoom_max < wd->zoom_max)
+      wd->zoom_max = wd->src_tile->zoom_max;
+   if (wd->src_tile->zoom_min > wd->zoom_min)
+      wd->zoom_min = wd->src_tile->zoom_min;
+
+   _grid_all_clear(wd);
+   _grid_all_create(wd);
+   zoom_do(wd, wd->zoom);
+}
+
+static Eina_Bool
+_source_route_mod_cb(Eina_Module *m, void *data)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(data, EINA_FALSE);
+
+   Widget_Data *wd = data;
+   Source_Route *s;
+   Elm_Map_Module_Source_Name_Func name_cb;
+   Elm_Map_Module_Route_Url_Func url_cb;
+   const char *file;
+
+   file = eina_module_file_get(m);
+   if (!eina_module_load(m))
+     {
+        ERR("Could not load module \"%s\": %s", file,
+            eina_error_msg_get(eina_error_get()));
+        return EINA_FALSE;
+     }
+
+   name_cb = eina_module_symbol_get(m, "map_module_source_name_get");
+   url_cb = eina_module_symbol_get(m, "map_module_route_url_get");
+
+   if ((!name_cb) || (!url_cb))
+     {
+        WRN("Could not find map module functions from module \"%s\": %s",
+            file, eina_error_msg_get(eina_error_get()));
+        eina_module_unload(m);
+        return EINA_FALSE;
+     }
+   s = ELM_NEW(Source_Tile);
+   s->name = name_cb();
+   s->url_cb = url_cb;
+   wd->src_routes = eina_list_append(wd->src_routes, s);
+
+   eina_module_unload(m);
+   return EINA_TRUE;
+}
+
+static void
+_source_route_load(Widget_Data *wd)
+{
+   unsigned int idx;
+   Eina_List *l;
+   Source_Route *s;
+
+   // Load from hard coded data
+   for (idx = 0; idx < (sizeof(src_routes) / sizeof(Source_Route)); idx++)
+     {
+        s= ELM_NEW(Source_Route);
+        s->name = src_routes[idx].name;
+        s->url_cb = src_routes[idx].url_cb;
+        wd->src_routes = eina_list_append(wd->src_routes, s);
+     }
+
+   // Load from modules
+   wd->src_route_mods = eina_module_list_get(wd->src_route_mods, MODULES_PATH,
+                                            1, &_source_route_mod_cb, wd);
+
+   // Set default source
+   wd->src_route = eina_list_nth(wd->src_routes, 0);
+
+   // Make name strings
+   idx = 0;
+   wd->src_route_names  = calloc((eina_list_count(wd->src_routes) + 1),
+                                   sizeof(char *));
+   EINA_LIST_FOREACH(wd->src_routes, l, s)
+     {
+        eina_stringshare_replace(&wd->src_route_names[idx], s->name);
+        INF("source : %s", wd->src_route_names[idx]);
+        idx++;
+     }
+}
+
+static void
+_source_route_unload(Widget_Data *wd)
+{
+   int idx = 0;
+   Source_Route *s;
+
+   for (idx = 0; wd->src_route_names[idx]; idx++)
+      eina_stringshare_del(wd->src_route_names[idx]);
+   EINA_LIST_FREE(wd->src_routes, s) free(s);
+   eina_module_list_free(wd->src_route_mods);
+}
+
+static void
+_source_route_set(Widget_Data *wd, const char *source_name)
+{
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+   EINA_SAFETY_ON_NULL_RETURN(source_name);
+   Source_Route *s;
+   Eina_List *l;
+
+   if (wd->src_route && !strcmp(wd->src_route->name, source_name)) return;
+
+   EINA_LIST_FOREACH(wd->src_routes, l, s)
+     {
+        if (!strcmp(s->name, source_name))
+          {
+             wd->src_route = s;
+             break;
+          }
+     }
+   if (!wd->src_route)
+     {
+        ERR("source name (%s) is not found", source_name);
+        return;
+     }
+}
+
+static Eina_Bool
+_source_name_mod_cb(Eina_Module *m, void *data)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(data, EINA_FALSE);
+
+   Widget_Data *wd = data;
+   Source_Name *s;
+   Elm_Map_Module_Source_Name_Func name_cb;
+   Elm_Map_Module_Name_Url_Func url_cb;
+   const char *file;
+
+   file = eina_module_file_get(m);
+   if (!eina_module_load(m))
+     {
+        ERR("Could not load module \"%s\": %s", file,
+            eina_error_msg_get(eina_error_get()));
+        return EINA_FALSE;
+     }
+
+   name_cb = eina_module_symbol_get(m, "map_module_source_name_get");
+   url_cb = eina_module_symbol_get(m, "map_module_name_url_get");
+
+   if ((!name_cb) || (!url_cb))
+     {
+        WRN("Could not find map module functions from module \"%s\": %s",
+            file, eina_error_msg_get(eina_error_get()));
+        eina_module_unload(m);
+        return EINA_FALSE;
+     }
+   s = ELM_NEW(Source_Tile);
+   s->name = name_cb();
+   s->url_cb = url_cb;
+   wd->src_names = eina_list_append(wd->src_names, s);
+
+   eina_module_unload(m);
+   return EINA_TRUE;
+}
+
+static void
+_source_name_load(Widget_Data *wd)
+{
+   unsigned int idx;
+   Eina_List *l;
+   Source_Name *s;
+
+   // Load from hard coded data
+   for (idx = 0; idx < (sizeof(src_names) / sizeof(Source_Name)); idx++)
+     {
+        s= ELM_NEW(Source_Name);
+        s->name = src_names[idx].name;
+        s->url_cb = src_names[idx].url_cb;
+        wd->src_names = eina_list_append(wd->src_names, s);
+     }
+
+   // Load from modules
+   wd->src_name_mods = eina_module_list_get(wd->src_name_mods, MODULES_PATH, 1,
+                                            &_source_name_mod_cb, wd);
+
+   // Set default source
+   wd->src_name = eina_list_nth(wd->src_names, 0);
+
+   // Make name strings
+   idx = 0;
+   wd->src_name_names  = calloc((eina_list_count(wd->src_names) + 1),
+                                   sizeof(char *));
+   EINA_LIST_FOREACH(wd->src_names, l, s)
+     {
+        eina_stringshare_replace(&wd->src_name_names[idx], s->name);
+        INF("source : %s", wd->src_name_names[idx]);
+        idx++;
+     }
+}
+
+static void
+_source_name_unload(Widget_Data *wd)
+{
+   int idx = 0;
+   Source_Name *s;
+
+   for (idx = 0; wd->src_name_names[idx]; idx++)
+      eina_stringshare_del(wd->src_name_names[idx]);
+   EINA_LIST_FREE(wd->src_names, s) free(s);
+   eina_module_list_free(wd->src_name_mods);
+}
+
+static void
+_source_name_set(Widget_Data *wd, const char *source_name)
+{
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+   EINA_SAFETY_ON_NULL_RETURN(source_name);
+
+   Source_Name *s;
+   Eina_List *l;
+
+   if (wd->src_name && !strcmp(wd->src_name->name, source_name)) return;
+
+   EINA_LIST_FOREACH(wd->src_names, l, s)
+     {
+        if (!strcmp(s->name, source_name))
+          {
+             wd->src_name = s;
+             break;
+          }
+     }
+   if (!wd->src_name)
+     {
+        ERR("source name (%s) is not found", source_name);
+        return;
+     }
+}
+
+static void
+_source_all_load(Widget_Data *wd)
+{
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+   _source_tile_load(wd);
+   _source_route_load(wd);
+   _source_name_load(wd);
+}
+
+static void
+_source_all_unload(Widget_Data *wd)
+{
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+   _source_tile_unload(wd);
+   _source_route_unload(wd);
+   _source_name_unload(wd);
+}
+
+static void
+_zoom_mode_set(void *data)
+{
+   EINA_SAFETY_ON_NULL_RETURN(data);
+   Delayed_Data *dd = data;
+
+   dd->wd->mode = dd->mode;
+   if (dd->mode != ELM_MAP_ZOOM_MODE_MANUAL)
+     {
+        Evas_Coord w, h;
+        Evas_Coord vw, vh;
+
+        double zoom;
+        double diff;
+
+        w = dd->wd->size.w;
+        h = dd->wd->size.h;
+        zoom = dd->wd->zoom_detail;
+        _viewport_coord_get(dd->wd, NULL, NULL, &vw, &vh);
+
+        if (dd->mode == ELM_MAP_ZOOM_MODE_AUTO_FIT)
           {
              if ((w < vw) && (h < vh))
                {
@@ -3451,7 +3526,7 @@ _zoom_mode_set(void *data)
                   }
                }
           }
-       zoom_with_animation(dd->wd, zoom, 10);
+        zoom_do(dd->wd, zoom);
      }
 }
 
@@ -3473,56 +3548,16 @@ _region_bring_in(void *data)
    Delayed_Data *dd = data;
    int x, y, w, h;
 
-   elm_map_utils_convert_geo_into_coord(dd->wd->obj, dd->lon, dd->lat,
-                                        dd->wd->size.w, &x, &y);
-   _viewport_size_get(dd->wd, &w, &h);
+   _region_to_coord_convert(dd->wd, dd->lon, dd->lat, dd->wd->size.w, &x, &y);
+   _viewport_coord_get(dd->wd, NULL, NULL, &w, &h);
    x = x - (w / 2);
    y = y - (h / 2);
    elm_smart_scroller_region_bring_in(dd->wd->scr, x, y, w, h);
    evas_object_smart_changed(dd->wd->pan_smart);
 }
 
-static void
-_marker_list_show(void *data)
-{
-   EINA_SAFETY_ON_NULL_RETURN(data);
-   Delayed_Data *dd = data;
-   int zoom;
-   double max_lon = -180, min_lon = 180;
-   double max_lat = -90, min_lat = 90;
-   Evas_Coord vw, vh;
-   Elm_Map_Marker *marker;
-
-   EINA_LIST_FREE(dd->markers, marker)
-     {
-        if (marker->longitude > max_lon) max_lon = marker->longitude;
-        if (marker->longitude < min_lon) min_lon = marker->longitude;
-        if (marker->latitude > max_lat) max_lat = marker->latitude;
-        if (marker->latitude < min_lat) min_lat = marker->latitude;
-     }
-   dd->lon = (max_lon + min_lon) / 2;
-   dd->lat = (max_lat + min_lat) / 2;
-
-   zoom = dd->wd->src->zoom_min;
-   _viewport_size_get(dd->wd, &vw, &vh);
-   while (zoom <= dd->wd->src->zoom_max)
-     {
-        Evas_Coord size, max_x, max_y, min_x, min_y;
-        size = pow(2.0, zoom) * dd->wd->tsize;
-        elm_map_utils_convert_geo_into_coord(dd->wd->obj, min_lon, max_lat, size, &min_x, &max_y);
-        elm_map_utils_convert_geo_into_coord(dd->wd->obj, max_lon, min_lat, size, &max_x, &min_y);
-        if ((max_x - min_x) > vw || (max_y - min_y) > vh) break;
-        zoom++;
-     }
-   zoom--;
-
-   zoom_do(dd->wd, zoom);
-   _region_show(dd);
-   evas_object_smart_changed(dd->wd->pan_smart);
-}
-
 static char *
-_mapnik_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
+_mapnik_url_cb(const Evas_Object *obj __UNUSED__, int x, int y, int zoom)
 {
    char buf[PATH_MAX];
    // ((x+y+zoom)%3)+'a' is requesting map images from distributed tile servers (eg., a, b, c)
@@ -3532,7 +3567,7 @@ _mapnik_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
 }
 
 static char *
-_osmarender_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
+_osmarender_url_cb(const Evas_Object *obj __UNUSED__, int x, int y, int zoom)
 {
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf),
@@ -3542,7 +3577,7 @@ _osmarender_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
 }
 
 static char *
-_cyclemap_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
+_cyclemap_url_cb(const Evas_Object *obj __UNUSED__, int x, int y, int zoom)
 {
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf),
@@ -3552,7 +3587,7 @@ _cyclemap_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
 }
 
 static char *
-_mapquest_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
+_mapquest_url_cb(const Evas_Object *obj __UNUSED__, int x, int y, int zoom)
 {
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf),
@@ -3562,7 +3597,7 @@ _mapquest_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
 }
 
 static char *
-_mapquest_aerial_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
+_mapquest_aerial_url_cb(const Evas_Object *obj __UNUSED__, int x, int y, int zoom)
 {
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "http://oatile%d.mqcdn.com/naip/%d/%d/%d.png",
@@ -3570,7 +3605,7 @@ _mapquest_aerial_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
    return strdup(buf);
 }
 
-static char *_yours_url_cb(Evas_Object *obj __UNUSED__, char *type_name, int method, double flon, double flat, double tlon, double tlat)
+static char *_yours_url_cb(const Evas_Object *obj __UNUSED__, const char *type_name, int method, double flon, double flat, double tlon, double tlat)
 {
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf),
@@ -3582,7 +3617,7 @@ static char *_yours_url_cb(Evas_Object *obj __UNUSED__, char *type_name, int met
 
 // TODO: fix monav api
 /*
-static char *_monav_url_cb(Evas_Object *obj __UNUSED__, char *type_name, int method, double flon, double flat, double tlon, double tlat)
+static char *_monav_url_cb(const Evas_Object *obj __UNUSED__, char *type_name, int method, double flon, double flat, double tlon, double tlat)
 {
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf),
@@ -3595,7 +3630,7 @@ static char *_monav_url_cb(Evas_Object *obj __UNUSED__, char *type_name, int met
 
 // TODO: fix ors api
 /*
-static char *_ors_url_cb(Evas_Object *obj __UNUSED__, char *type_name, int method, double flon, double flat, double tlon, double tlat)
+static char *_ors_url_cb(const Evas_Object *obj __UNUSED__, char *type_name, int method, double flon, double flat, double tlon, double tlat)
 {
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf),
@@ -3607,7 +3642,7 @@ static char *_ors_url_cb(Evas_Object *obj __UNUSED__, char *type_name, int metho
 */
 
 static char *
-_nominatim_url_cb(Evas_Object *obj, int method, char *name, double lon, double lat)
+_nominatim_url_cb(const Evas_Object *obj, int method, const char *name, double lon, double lat)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) strdup("");
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -3647,60 +3682,231 @@ _nominatim_url_cb(Evas_Object *obj, int method, char *name, double lon, double l
    return strdup(buf);
 }
 
-#endif
-
-EAPI Evas_Object *
-elm_map_add(Evas_Object *parent)
+static double
+_scale_cb(const Evas_Object *obj __UNUSED__, double lon __UNUSED__, double lat, int zoom)
 {
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   Evas *e;
-   Widget_Data *wd;
-   Evas_Object *obj;
-   Evas_Coord minw, minh;
-
-   ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
-   ELM_SET_WIDTYPE(widtype, "map");
-   elm_widget_type_set(obj, "map");
-   elm_widget_sub_object_add(parent, obj);
-   elm_widget_data_set(obj, wd);
-   elm_widget_can_focus_set(obj, EINA_TRUE);
-   elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL);
-   elm_widget_del_hook_set(obj, _del_hook);
-   elm_widget_del_pre_hook_set(obj, _del_pre_hook);
-   elm_widget_theme_hook_set(obj, _theme_hook);
-   elm_widget_event_hook_set(obj, _event_hook);
-   evas_object_smart_callback_add(obj, "scroll-hold-on", _hold_on, wd);
-   evas_object_smart_callback_add(obj, "scroll-hold-off", _hold_off, wd);
-   evas_object_smart_callback_add(obj, "scroll-freeze-on", _freeze_on, wd);
-   evas_object_smart_callback_add(obj, "scroll-freeze-off", _freeze_off, wd);
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN,
-                                  _mouse_down, wd);
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_UP,
-                                  _mouse_up, wd);
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_WHEEL,
-                                  _mouse_wheel_cb,wd);
-   wd->obj = obj;
+   if (zoom < 0 || zoom >= (int)sizeof(_osm_scale_meter)) return 0;
+   return _osm_scale_meter[zoom] / cos(lat * ELM_PI / 180.0);
+}
 
-   wd->scr = elm_smart_scroller_add(e);
-   elm_widget_sub_object_add(obj, wd->scr);
-   elm_smart_scroller_widget_set(wd->scr, obj);
-   elm_smart_scroller_object_theme_set(obj, wd->scr, "map", "base", "default");
-   elm_widget_resize_object_set(obj, wd->scr);
-   elm_smart_scroller_wheel_disabled_set(wd->scr, EINA_TRUE);
-   elm_smart_scroller_bounce_allow_set(wd->scr,
-                                       _elm_config->thumbscroll_bounce_enable,
-                                       _elm_config->thumbscroll_bounce_enable);
-   evas_object_event_callback_add(wd->scr, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                  _changed_size_hints, wd);
-   evas_object_smart_callback_add(wd->scr, "scroll", _scr, wd);
-   evas_object_smart_callback_add(wd->scr, "drag", _scr, wd);
-   evas_object_smart_callback_add(wd->scr, "animate,start", _scr_anim_start, wd);
-   evas_object_smart_callback_add(wd->scr, "animate,stop", _scr_anim_stop, wd);
+static void
+_on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN(wd);
 
-   if (!smart)
+   if (elm_widget_focus_get(obj))
      {
-        evas_object_smart_clipped_smart_set(&parent_sc);
-        sc = parent_sc;
+        edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), "elm,action,focus", "elm");
+        evas_object_focus_set(wd->obj, EINA_TRUE);
+     }
+   else
+     {
+        edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), "elm,action,unfocus", "elm");
+        evas_object_focus_set(wd->obj, EINA_FALSE);
+     }
+}
+
+static void
+_del_hook(Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+
+   if (wd->map) evas_map_free(wd->map);
+   free(wd);
+}
+
+static void
+_del_pre_hook(Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+
+   Eina_List *l, *ll;
+   Elm_Map_Route *r;
+   Elm_Map_Name *na;
+   Evas_Object *track;
+   Elm_Map_Overlay *overlay;
+   Delayed_Data *dd;
+
+   EINA_LIST_FOREACH_SAFE(wd->routes, l, ll, r) elm_map_route_del(r);
+   eina_list_free(wd->routes);
+
+   EINA_LIST_FOREACH_SAFE(wd->names, l, ll, na) elm_map_name_del(na);
+   eina_list_free(wd->names);
+
+   EINA_LIST_FOREACH_SAFE(wd->overlays, l, ll, overlay)
+      elm_map_overlay_del(overlay);
+   eina_list_free(wd->overlays);
+   eina_list_free(wd->group_overlays);
+   eina_list_free(wd->all_overlays);
+
+   EINA_LIST_FREE(wd->track, track) evas_object_del(track);
+
+   if (wd->scr_timer) ecore_timer_del(wd->scr_timer);
+   if (wd->long_timer) ecore_timer_del(wd->long_timer);
+
+   if (wd->delayed_jobs) EINA_LIST_FREE(wd->delayed_jobs, dd) free(dd);
+
+   if (wd->user_agent) eina_stringshare_del(wd->user_agent);
+   if (wd->ua) eina_hash_free(wd->ua);
+
+   if (wd->zoom_timer) ecore_timer_del(wd->zoom_timer);
+   if (wd->zoom_animator) ecore_animator_del(wd->zoom_animator);
+
+   _grid_all_clear(wd);
+   // Removal of download list should be after grid clear.
+   if (wd->download_idler) ecore_idler_del(wd->download_idler);
+   eina_list_free(wd->download_list);
+
+   _source_all_unload(wd);
+
+   if (!ecore_file_recursive_rm(CACHE_ROOT))
+      ERR("Deletion of %s failed", CACHE_ROOT);
+}
+
+static void
+_theme_hook(Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+
+   elm_smart_scroller_object_theme_set(obj, wd->scr, "map", "base", elm_widget_style_get(obj));
+   _sizing_eval(wd);
+}
+
+static Eina_Bool
+_event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type type, void *event_info)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, EINA_FALSE);
+
+   Evas_Coord x, y;
+   Evas_Coord vh;
+   Evas_Coord step_x, step_y, page_x, page_y;
+
+   if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE;
+   Evas_Event_Key_Down *ev = event_info;
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
+
+   elm_smart_scroller_child_pos_get(wd->scr, &x, &y);
+   elm_smart_scroller_step_size_get(wd->scr, &step_x, &step_y);
+   elm_smart_scroller_page_size_get(wd->scr, &page_x, &page_y);
+   elm_smart_scroller_child_viewport_size_get(wd->scr, NULL, &vh);
+
+   if ((!strcmp(ev->keyname, "Left")) ||
+       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+     {
+        x -= step_x;
+     }
+   else if ((!strcmp(ev->keyname, "Right")) ||
+            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+     {
+        x += step_x;
+     }
+   else if ((!strcmp(ev->keyname, "Up")) ||
+            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+     {
+        y -= step_y;
+     }
+   else if ((!strcmp(ev->keyname, "Down")) ||
+            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+     {
+        y += step_y;
+     }
+   else if ((!strcmp(ev->keyname, "Prior")) ||
+            ((!strcmp(ev->keyname, "KP_Prior")) && (!ev->string)))
+     {
+        if (page_y < 0)
+          y -= -(page_y * vh) / 100;
+        else
+          y -= page_y;
+     }
+   else if ((!strcmp(ev->keyname, "Next")) ||
+            ((!strcmp(ev->keyname, "KP_Next")) && (!ev->string)))
+     {
+        if (page_y < 0)
+          y += -(page_y * vh) / 100;
+        else
+          y += page_y;
+     }
+   else if (!strcmp(ev->keyname, "KP_Add"))
+     {
+        zoom_with_animation(wd, wd->zoom + 1, 10);
+        return EINA_TRUE;
+     }
+   else if (!strcmp(ev->keyname, "KP_Subtract"))
+     {
+        zoom_with_animation(wd, wd->zoom - 1, 10);
+        return EINA_TRUE;
+     }
+   else return EINA_FALSE;
+
+   ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+   elm_smart_scroller_child_pos_set(wd->scr, x, y);
+
+   return EINA_TRUE;
+}
+#endif
+
+EAPI Evas_Object *
+elm_map_add(Evas_Object *parent)
+{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
+   Evas *e;
+   Widget_Data *wd;
+   Evas_Object *obj;
+   Evas_Coord minw, minh;
+
+   ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
+   ELM_SET_WIDTYPE(widtype, "map");
+   elm_widget_type_set(obj, "map");
+   elm_widget_sub_object_add(parent, obj);
+   elm_widget_data_set(obj, wd);
+   elm_widget_can_focus_set(obj, EINA_TRUE);
+   elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL);
+   elm_widget_del_hook_set(obj, _del_hook);
+   elm_widget_del_pre_hook_set(obj, _del_pre_hook);
+   elm_widget_theme_hook_set(obj, _theme_hook);
+   elm_widget_event_hook_set(obj, _event_hook);
+   evas_object_smart_callback_add(obj, "scroll-hold-on", _hold_on, wd);
+   evas_object_smart_callback_add(obj, "scroll-hold-off", _hold_off, wd);
+   evas_object_smart_callback_add(obj, "scroll-freeze-on", _freeze_on, wd);
+   evas_object_smart_callback_add(obj, "scroll-freeze-off", _freeze_off, wd);
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN,
+                                  _mouse_down, wd);
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_UP,
+                                  _mouse_up, wd);
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_WHEEL,
+                                  _mouse_wheel_cb, wd);
+   wd->obj = obj;
+
+   wd->scr = elm_smart_scroller_add(e);
+   elm_widget_sub_object_add(obj, wd->scr);
+   elm_smart_scroller_widget_set(wd->scr, obj);
+   elm_smart_scroller_object_theme_set(obj, wd->scr, "map", "base", "default");
+   elm_widget_resize_object_set(obj, wd->scr);
+   elm_smart_scroller_wheel_disabled_set(wd->scr, EINA_TRUE);
+   elm_smart_scroller_bounce_allow_set(wd->scr,
+                                       _elm_config->thumbscroll_bounce_enable,
+                                       _elm_config->thumbscroll_bounce_enable);
+   evas_object_event_callback_add(wd->scr, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                  _changed_size_hints, wd);
+   evas_object_smart_callback_add(wd->scr, "scroll", _scr, wd);
+   evas_object_smart_callback_add(wd->scr, "drag", _scr, wd);
+   evas_object_smart_callback_add(wd->scr, "animate,start", _scr_anim_start, wd);
+   evas_object_smart_callback_add(wd->scr, "animate,stop", _scr_anim_stop, wd);
+
+   if (!smart)
+     {
+        evas_object_smart_clipped_smart_set(&parent_sc);
+        sc = parent_sc;
         sc.name = "elm_map_pan";
         sc.version = EVAS_SMART_CLASS_VERSION;
         sc.add = _pan_add;
@@ -3739,14 +3945,19 @@ elm_map_add(Evas_Object *parent)
    elm_gesture_layer_cb_set(wd->ges, ELM_GESTURE_ROTATE, ELM_GESTURE_STATE_ABORT,
                             _pinch_rotate_end_cb, wd);
 
-   wd->sep_maps_markers = evas_object_rectangle_add(evas_object_evas_get(obj));
-   elm_widget_sub_object_add(obj, wd->sep_maps_markers);
-   evas_object_smart_member_add(wd->sep_maps_markers, wd->pan_smart);
+   wd->sep_maps_overlays = evas_object_rectangle_add(evas_object_evas_get(obj));
+   elm_widget_sub_object_add(obj, wd->sep_maps_overlays);
+   evas_object_smart_member_add(wd->sep_maps_overlays, wd->pan_smart);
 
    wd->map = evas_map_new(EVAS_MAP_POINT);
 
-   source_init(wd);
-   wd->tsize = DEFAULT_TILE_SIZE; // FIXME: It should be hard-coded ? or can get from provider?
+   _source_all_load(wd);
+   wd->zoom_min = wd->src_tile->zoom_min;
+   wd->zoom_max = wd->src_tile->zoom_max;
+   // FIXME: Tile Provider is better to provide tile size!
+   wd->tsize = DEFAULT_TILE_SIZE;
+
+   srand(time(NULL));
 
    wd->id = ((int)getpid() << 16) | idnum;
    idnum++;
@@ -3755,7 +3966,6 @@ elm_map_add(Evas_Object *parent)
    zoom_do(wd, 0);
 
    wd->mode = ELM_MAP_ZOOM_MODE_MANUAL;
-   wd->markers_max_num = MARER_MAX_NUMBER;
 
    // TODO: convert Elementary to subclassing of Evas_Smart_Class
    // TODO: and save some bytes, making descriptions per-class and not instance!
@@ -3778,14 +3988,11 @@ elm_map_zoom_set(Evas_Object *obj, int zoom)
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    EINA_SAFETY_ON_NULL_RETURN(wd);
-   EINA_SAFETY_ON_NULL_RETURN(wd->src);
+   EINA_SAFETY_ON_NULL_RETURN(wd->src_tile);
 
    if (wd->mode != ELM_MAP_ZOOM_MODE_MANUAL) return;
    if (zoom < 0) zoom = 0;
    if (wd->zoom == zoom) return;
-   if (zoom > wd->src->zoom_max) zoom = wd->src->zoom_max;
-   if (zoom < wd->src->zoom_min) zoom = wd->src->zoom_min;
-
    Delayed_Data *data = ELM_NEW(Delayed_Data);
    data->func = _zoom_set;
    data->wd = wd;
@@ -3793,921 +4000,460 @@ elm_map_zoom_set(Evas_Object *obj, int zoom)
    data->wd->delayed_jobs = eina_list_append(data->wd->delayed_jobs, data);
    evas_object_smart_changed(data->wd->pan_smart);
 #else
-   (void) obj;
-   (void) zoom;
-#endif
-}
-
-EAPI int
-elm_map_zoom_get(const Evas_Object *obj)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype) 0;
-   Widget_Data *wd = elm_widget_data_get(obj);
-
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, 0);
-   return wd->zoom;
-#else
-   (void) obj;
-   return 0;
-#endif
-}
-
-EAPI void
-elm_map_zoom_mode_set(Evas_Object *obj, Elm_Map_Zoom_Mode mode)
-{
-#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 ((mode == ELM_MAP_ZOOM_MODE_MANUAL) && (wd->mode == !!mode)) return;
-
-   Delayed_Data *data = ELM_NEW(Delayed_Data);
-   data->mode = mode;
-   data->func = _zoom_mode_set;
-   data->wd = wd;
-   data->wd->delayed_jobs = eina_list_append(data->wd->delayed_jobs, data);
-   evas_object_smart_changed(data->wd->pan_smart);
-#else
-   (void) obj;
-   (void) mode;
-#endif
-}
-
-EAPI Elm_Map_Zoom_Mode
-elm_map_zoom_mode_get(const Evas_Object *obj)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype) ELM_MAP_ZOOM_MODE_MANUAL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, ELM_MAP_ZOOM_MODE_MANUAL);
-
-   return wd->mode;
-#else
-   (void) obj;
-   return ELM_MAP_ZOOM_MODE_MANUAL;
-#endif
-}
-
-EAPI void
-elm_map_geo_region_bring_in(Evas_Object *obj, double lon, double lat)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-
-   Delayed_Data *data = ELM_NEW(Delayed_Data);
-   data->func = _region_bring_in;
-   data->wd = wd;
-   data->lon = lon;
-   data->lat = lat;
-   data->wd->delayed_jobs = eina_list_append(data->wd->delayed_jobs, data);
-   evas_object_smart_changed(data->wd->pan_smart);
-#else
-   (void) obj;
-   (void) lon;
-   (void) lat;
-#endif
-}
-
-EAPI void
-elm_map_geo_region_show(Evas_Object *obj, double lon, double lat)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-
-   Delayed_Data *data = ELM_NEW(Delayed_Data);
-   data->func = _region_show;
-   data->wd = wd;
-   data->lon = lon;
-   data->lat = lat;
-   data->wd->delayed_jobs = eina_list_append(data->wd->delayed_jobs, data);
-   evas_object_smart_changed(data->wd->pan_smart);
-#else
-   (void) obj;
-   (void) lon;
-   (void) lat;
-#endif
-}
-
-EAPI void
-elm_map_geo_region_get(const Evas_Object *obj, 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);
-
-   double tlon, tlat;
-   Evas_Coord px, py, vw, vh;
-
-   _pan_geometry_get(wd, &px, &py);
-   _viewport_size_get(wd, &vw, &vh);
-   elm_map_utils_convert_coord_into_geo(obj, vw/2 - px, vh/2 -py, wd->size.w,
-                                        &tlon, &tlat);
-   if (lon) *lon = tlon;
-   if (lat) *lat = tlat;
-#else
-   (void) obj;
-   (void) lon;
-   (void) lat;
-#endif
-}
-
-EAPI void
-elm_map_paused_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 == !!paused) return;
-   wd->paused = !!paused;
-   if (wd->paused)
-     {
-        if (wd->zoom_animator)
-          {
-             if (wd->zoom_animator) ecore_animator_del(wd->zoom_animator);
-             wd->zoom_animator = NULL;
-             zoom_do(wd, wd->zoom);
-          }
-        edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
-                                "elm,state,busy,stop", "elm");
-     }
-   else
-     {
-        if (wd->download_num >= 1)
-           edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
-                                   "elm,state,busy,start", "elm");
-     }
-#else
-   (void) obj;
-   (void) paused;
-#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_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;
-#else
-   (void) obj;
-   return EINA_FALSE;
-#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_utils_downloading_status_get(const Evas_Object *obj, int *try_num, int *finish_num)
-{
-#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 (try_num) *try_num = wd->try_num;
-   if (finish_num) *finish_num = wd->finish_num;
-#else
-   (void) obj;
-   (void) try_num;
-   (void) finish_num;
-#endif
-}
-
-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);
-
-   int zoom = floor(log(size / 256) / log(2));
-   if ((wd->src) && (wd->src->coord_into_geo))
-     {
-        if (wd->src->coord_into_geo(obj, zoom, x, y, size, lon, lat)) return;
-     }
-
-   if (lon) *lon = (x / (double)size * 360.0) - 180;
-   if (lat)
-     {
-        double n = ELM_PI - (2.0 * ELM_PI * y / size);
-        *lat = 180.0 / ELM_PI * atan(0.5 * (exp(n) - exp(-n)));
-     }
-#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);
-
-   int zoom = floor(log(size / 256) / log(2));
-   if ((wd->src) && (wd->src->geo_into_coord))
-     {
-        if (wd->src->geo_into_coord(obj, zoom, lon, lat, size, x, y)) return;
-     }
-
-   if (x) *x = floor((lon + 180.0) / 360.0 * size);
-   if (y)
-      *y = floor((1.0 - log(tan(lat * ELM_PI / 180.0) + (1.0 / cos(lat * ELM_PI / 180.0)))
-                 / ELM_PI) / 2.0 * size);
-#else
-   (void) obj;
-   (void) lon;
-   (void) lat;
-   (void) size;
-   (void) x;
-   (void) y;
-#endif
-}
-
-EAPI Elm_Map_Name *
-elm_map_utils_convert_coord_into_name(const Evas_Object *obj, double lon, double lat)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   return _utils_convert_name(obj, ELM_MAP_NAME_METHOD_REVERSE, NULL, lon, lat);
-#else
-   (void) obj;
-   (void) lon;
-   (void) lat;
-   return NULL;
-#endif
-}
-
-EAPI Elm_Map_Name *
-elm_map_utils_convert_name_into_coord(const Evas_Object *obj, char *address)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   if (!address) return NULL;
-   return _utils_convert_name(obj, ELM_MAP_NAME_METHOD_SEARCH, address, 0.0, 0.0);
-#else
-   (void) obj;
-   (void) address;
-   return NULL;
-#endif
-}
-
-EINA_DEPRECATED EAPI void
-elm_map_utils_rotate_coord(const Evas_Object *obj, const Evas_Coord x, const Evas_Coord y, const Evas_Coord cx, const Evas_Coord cy, const 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_canvas_to_geo_convert(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, 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(lon);
-   EINA_SAFETY_ON_NULL_RETURN(lat);
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-
-   Evas_Coord px, py, vw, vh;
-   _pan_geometry_get(wd, &px, &py);
-   _viewport_size_get(wd, &vw, &vh);
-   _coord_rotate(x - px, y - py, (vw / 2) - px, (vh / 2) - py, -wd->rotate.d,
-                 &x, &y);
-   elm_map_utils_convert_coord_into_geo(obj, x, y, wd->size.w, lon, lat);
-#else
-   (void) obj;
-   (void) x;
-   (void) y;
-   (void) lon;
-   (void) lat;
-#endif
-}
-
-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)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(clas, NULL);
-
-   Elm_Map_Marker *marker = ELM_NEW(Elm_Map_Marker);
-   marker->wd = wd;
-   marker->clas = clas;
-   marker->group_clas = group_clas;
-   marker->longitude = lon;
-   marker->latitude = lat;
-   marker->data = data;
-   marker->x = 0;
-   marker->y = 0;
-   _edj_marker_size_get(wd, &marker->w, &marker->h);
-
-   marker->obj = elm_layout_add(wd->obj);
-   evas_object_smart_member_add(marker->obj, wd->pan_smart);
-   evas_object_stack_above(marker->obj, wd->sep_maps_markers);
-
-   edje_object_signal_callback_add(elm_layout_edje_get(marker->obj),
-                                   "open", "elm", _marker_bubble_open_cb,
-                                   marker);
-   edje_object_signal_callback_add(elm_layout_edje_get(marker->obj),
-                                   "bringin", "elm", _marker_bringin_cb,
-                                   marker);
-
-   wd->markers = eina_list_append(wd->markers, marker);
-   if (marker->group_clas) group_clas->markers = eina_list_append(group_clas->markers,
-                                                                  marker);
-   evas_object_smart_changed(wd->pan_smart);
-   return marker;
-#else
-   (void) obj;
-   (void) lon;
-   (void) lat;
-   (void) clas;
-   (void) group_clas;
-   (void) data;
-   return NULL;
-#endif
-}
-
-EAPI void
-elm_map_marker_remove(Elm_Map_Marker *marker)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(marker);
-   Widget_Data *wd = marker->wd;
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-
-   if ((marker->content) && (marker->clas->func.del))
-      marker->clas->func.del(wd->obj, marker, marker->data, marker->content);
-
-   if (marker->bubble) _bubble_free(marker->bubble);
-   if (marker->group) _marker_group_free(marker->group);
-
-   if (marker->group_clas)
-      marker->group_clas->markers = eina_list_remove(marker->group_clas->markers, marker);
-   wd->markers = eina_list_remove(wd->markers, marker);
-
-   evas_object_del(marker->obj);
-   free(marker);
-
-   evas_object_smart_changed(wd->pan_smart);
-#else
-   (void) marker;
-#endif
-}
-
-EAPI void
-elm_map_marker_region_get(const Elm_Map_Marker *marker, double *lon, double *lat)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(marker);
-   if (lon) *lon = marker->longitude;
-   if (lat) *lat = marker->latitude;
-#else
-   (void) marker;
-   (void) lon;
-   (void) lat;
-#endif
-}
-
-EAPI void
-elm_map_marker_bring_in(Elm_Map_Marker *marker)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(marker);
-   elm_map_geo_region_bring_in(marker->wd->obj, marker->longitude, marker->latitude);
-#else
-   (void) marker;
-#endif
-}
-
-EAPI void
-elm_map_marker_show(Elm_Map_Marker *marker)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(marker);
-   elm_map_geo_region_show(marker->wd->obj, marker->longitude, marker->latitude);
-#else
-   (void) marker;
-#endif
-}
-
-EAPI void
-elm_map_markers_list_show(Eina_List *markers)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(markers);
-   EINA_SAFETY_ON_FALSE_RETURN(eina_list_count(markers));
-
-   Elm_Map_Marker *marker;
-   marker = eina_list_data_get(markers);
-
-   Delayed_Data *data = ELM_NEW(Delayed_Data);
-   data->func = _marker_list_show;
-   data->wd = marker->wd;
-   data->markers = eina_list_clone(markers);
-   data->wd->delayed_jobs = eina_list_append(data->wd->delayed_jobs, data);
-   evas_object_smart_changed(data->wd->pan_smart);
-#else
-   (void) markers;
-#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)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN_VAL(marker, NULL);
-   return marker->content;
-#else
-   (void) marker;
-   return NULL;
+   (void) obj;
+   (void) zoom;
 #endif
 }
 
-EAPI void
-elm_map_marker_update(Elm_Map_Marker *marker)
+EAPI int
+elm_map_zoom_get(const Evas_Object *obj)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(marker);
-   Widget_Data *wd = marker->wd;
-   EINA_SAFETY_ON_NULL_RETURN(wd);
+   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   Widget_Data *wd = elm_widget_data_get(obj);
 
-   _marker_update(marker);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, 0);
+   return wd->zoom;
 #else
-   (void) marker;
+   (void) obj;
+   return 0;
 #endif
 }
 
 EAPI void
-elm_map_bubbles_close(Evas_Object *obj)
+elm_map_zoom_mode_set(Evas_Object *obj, Elm_Map_Zoom_Mode mode)
 {
 #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 ((mode == ELM_MAP_ZOOM_MODE_MANUAL) && (wd->mode == !!mode)) return;
 
-        if (marker->group)
-          {
-             if (marker->group->bubble) _bubble_free(marker->group->bubble);
-             marker->group->bubble = NULL;
-          }
-     }
+   Delayed_Data *data = ELM_NEW(Delayed_Data);
+   data->mode = mode;
+   data->func = _zoom_mode_set;
+   data->wd = wd;
+   data->wd->delayed_jobs = eina_list_append(data->wd->delayed_jobs, data);
+   evas_object_smart_changed(data->wd->pan_smart);
 #else
    (void) obj;
+   (void) mode;
 #endif
 }
 
-EAPI Elm_Map_Group_Class *
-elm_map_group_class_new(Evas_Object *obj)
+EAPI Elm_Map_Zoom_Mode
+elm_map_zoom_mode_get(const Evas_Object *obj)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   ELM_CHECK_WIDTYPE(obj, widtype) ELM_MAP_ZOOM_MODE_MANUAL;
    Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
-
-   Elm_Map_Group_Class *clas = ELM_NEW(Elm_Map_Group_Class);
-   clas->wd = wd;
-   clas->zoom_displayed = 0;
-   clas->zoom_grouped = 255;
-   eina_stringshare_replace(&clas->style, "radio");
-
-   wd->group_classes = eina_list_append(wd->group_classes, clas);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, ELM_MAP_ZOOM_MODE_MANUAL);
 
-   return clas;
+   return wd->mode;
 #else
    (void) obj;
-   return NULL;
+   return ELM_MAP_ZOOM_MODE_MANUAL;
 #endif
 }
 
 EAPI void
-elm_map_group_class_style_set(Elm_Map_Group_Class *clas, const char *style)
+elm_map_zoom_max_set(Evas_Object *obj, int zoom)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(clas);
-   eina_stringshare_replace(&clas->style, style);
-#else
-   (void) clas;
-   (void) style;
-#endif
-}
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+   EINA_SAFETY_ON_NULL_RETURN(wd->src_tile);
 
-EAPI void
-elm_map_group_class_icon_cb_set(Elm_Map_Group_Class *clas, Elm_Map_Group_Icon_Get_Func icon_get)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(clas);
-   clas->func.icon_get = icon_get;
+   wd->zoom_max = zoom;
 #else
-   (void) clas;
-   (void) icon_get;
+   (void) obj;
+   (void) zoom;
 #endif
 }
 
-EAPI void
-elm_map_group_class_data_set(Elm_Map_Group_Class *clas, void *data)
+EAPI int
+elm_map_zoom_max_get(const Evas_Object *obj)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(clas);
-   clas->data = data;
+   ELM_CHECK_WIDTYPE(obj, widtype) -1;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, -1);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd->src_tile, -1);
+
+   return wd->zoom_max;
 #else
-   (void) clas;
-   (void) data;
+   (void) obj;
+   return -1;
 #endif
 }
 
 EAPI void
-elm_map_group_class_zoom_displayed_set(Elm_Map_Group_Class *clas, int zoom)
+elm_map_zoom_min_set(Evas_Object *obj, int zoom)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(clas);
-   clas->zoom_displayed = zoom;
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+   EINA_SAFETY_ON_NULL_RETURN(wd->src_tile);
+
+   wd->zoom_min = zoom;
 #else
-   (void) clas;
+   (void) obj;
    (void) zoom;
 #endif
 }
 
-EAPI void
-elm_map_group_class_zoom_grouped_set(Elm_Map_Group_Class *clas, int zoom)
+EAPI int
+elm_map_zoom_min_get(const Evas_Object *obj)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(clas);
-   clas->zoom_grouped = zoom;
+   ELM_CHECK_WIDTYPE(obj, widtype) -1;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, -1);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd->src_tile, -1);
+
+   return wd->zoom_min;
 #else
-   (void) clas;
-   (void) zoom;
+   (void) obj;
+   return -1;
 #endif
 }
 
 EAPI void
-elm_map_group_class_hide_set(Evas_Object *obj, Elm_Map_Group_Class *clas, Eina_Bool hide)
+elm_map_region_bring_in(Evas_Object *obj, 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);
-   EINA_SAFETY_ON_NULL_RETURN(clas);
 
-   clas->hide = hide;
-   evas_object_smart_changed(wd->pan_smart);
+   Delayed_Data *data = ELM_NEW(Delayed_Data);
+   data->func = _region_bring_in;
+   data->wd = wd;
+   data->lon = lon;
+   data->lat = lat;
+   data->wd->delayed_jobs = eina_list_append(data->wd->delayed_jobs, data);
+   evas_object_smart_changed(data->wd->pan_smart);
 #else
    (void) obj;
-   (void) clas;
-   (void) hide;
+   (void) lon;
+   (void) lat;
 #endif
 }
 
-EAPI Elm_Map_Marker_Class *
-elm_map_marker_class_new(Evas_Object *obj)
+EAPI void
+elm_map_region_show(Evas_Object *obj, double lon, double lat)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
-
-   Elm_Map_Marker_Class *clas = ELM_NEW(Elm_Map_Marker_Class);
-   eina_stringshare_replace(&clas->style, "radio");
 
-   wd->marker_classes = eina_list_append(wd->marker_classes, clas);
-   return clas;
+   Delayed_Data *data = ELM_NEW(Delayed_Data);
+   data->func = _region_show;
+   data->wd = wd;
+   data->lon = lon;
+   data->lat = lat;
+   data->wd->delayed_jobs = eina_list_append(data->wd->delayed_jobs, data);
+   evas_object_smart_changed(data->wd->pan_smart);
 #else
    (void) obj;
-   return NULL;
+   (void) lon;
+   (void) lat;
 #endif
 }
 
 EAPI void
-elm_map_marker_class_style_set(Elm_Map_Marker_Class *clas, const char *style)
+elm_map_region_get(const Evas_Object *obj, double *lon, double *lat)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(clas);
-   eina_stringshare_replace(&clas->style, style);
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+
+   double tlon, tlat;
+   Evas_Coord vx, vy, vw, vh;
+
+   _viewport_coord_get(wd, &vx, &vy, &vw, &vh);
+   _coord_to_region_convert(wd, vx + vw/2, vy + vh/2, wd->size.w, &tlon, &tlat);
+   if (lon) *lon = tlon;
+   if (lat) *lat = tlat;
 #else
-   (void) clas;
-   (void) style;
+   (void) obj;
+   (void) lon;
+   (void) lat;
 #endif
 }
 
 EAPI void
-elm_map_marker_class_icon_cb_set(Elm_Map_Marker_Class *clas, Elm_Map_Marker_Icon_Get_Func icon_get)
+elm_map_paused_set(Evas_Object *obj, Eina_Bool paused)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(clas);
-   clas->func.icon_get = icon_get;
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+
+   if (wd->paused == !!paused) return;
+   wd->paused = !!paused;
+   if (wd->paused)
+     {
+        if (wd->zoom_animator)
+          {
+             if (wd->zoom_animator) ecore_animator_del(wd->zoom_animator);
+             wd->zoom_animator = NULL;
+             zoom_do(wd, wd->zoom);
+          }
+        edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
+                                "elm,state,busy,stop", "elm");
+     }
+   else
+     {
+        if (wd->download_num >= 1)
+           edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
+                                   "elm,state,busy,start", "elm");
+     }
 #else
-   (void) clas;
-   (void) icon_get;
+   (void) obj;
+   (void) paused;
 #endif
 }
 
-EAPI void
-elm_map_marker_class_get_cb_set(Elm_Map_Marker_Class *clas, Elm_Map_Marker_Get_Func get)
+EAPI Eina_Bool
+elm_map_paused_get(const Evas_Object *obj)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(clas);
-   clas->func.get = get;
+   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;
 #else
-   (void) clas;
-   (void) get;
+   (void) obj;
+   return EINA_FALSE;
 #endif
 }
 
 EAPI void
-elm_map_marker_class_del_cb_set(Elm_Map_Marker_Class *clas, Elm_Map_Marker_Del_Func del)
+elm_map_rotate_set(Evas_Object *obj, double degree, Evas_Coord cx, Evas_Coord cy)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(clas);
-   clas->func.del = del;
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+
+   wd->rotate.d = degree;
+   wd->rotate.cx = cx;
+   wd->rotate.cy = cy;
+
+   evas_object_smart_changed(wd->pan_smart);
 #else
-   (void) clas;
-   (void) del;
+   (void) obj;
+   (void) degree;
+   (void) cx;
+   (void) cy;
 #endif
 }
 
-EAPI const char **
-elm_map_source_names_get(const Evas_Object *obj)
+EAPI void
+elm_map_rotate_get(const Evas_Object *obj, double *degree, Evas_Coord *cx, Evas_Coord *cy)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+   EINA_SAFETY_ON_NULL_RETURN(wd);
 
-   return wd->src_names;
+   if (degree) *degree = wd->rotate.d;
+   if (cx) *cx = wd->rotate.cx;
+   if (cy) *cy = wd->rotate.cy;
 #else
    (void) obj;
-   return NULL;
+   (void) degree;
+   (void) cx;
+   (void) cy;
 #endif
 }
 
 EAPI void
-elm_map_source_name_set(Evas_Object *obj, const char *source_name)
+elm_map_wheel_disabled_set(Evas_Object *obj, Eina_Bool disabled)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    EINA_SAFETY_ON_NULL_RETURN(wd);
 
-   Map_Sources_Tab *s;
-   Eina_List *l;
-   int zoom;
-
-   if (wd->src)
-     {
-        if (!strcmp(wd->src->name, source_name)) return;
-        if (!wd->src->url_cb) return;
-     }
-
-   _grid_all_clear(wd);
-   EINA_LIST_FOREACH(wd->srcs, l, s)
-     {
-        if (!strcmp(s->name, source_name))
-          {
-             wd->src = s;
-             break;
-          }
-     }
-   zoom = wd->zoom;
-   wd->zoom = -1;
-
-   if (wd->src)
-     {
-        if (wd->src->zoom_max < zoom)
-          zoom = wd->src->zoom_max;
-        if (wd->src->zoom_min > zoom)
-          zoom = wd->src->zoom_min;
-        if (wd->src->zoom_max < wd->zoom_max) wd->zoom_max = wd->src->zoom_max;
-        if (wd->src->zoom_min > wd->zoom_min) wd->zoom_min = wd->src->zoom_min;
-     }
-   _grid_all_create(wd);
-   zoom_do(wd, zoom);
+   if ((!wd->wheel_disabled) && (disabled))
+     evas_object_event_callback_del_full(obj, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel_cb, wd);
+   else if ((wd->wheel_disabled) && (!disabled))
+     evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel_cb, wd);
+   wd->wheel_disabled = !!disabled;
 #else
    (void) obj;
-   (void) source_name;
+   (void) disabled;
 #endif
 }
 
-EAPI const char *
-elm_map_source_name_get(const Evas_Object *obj)
+EAPI Eina_Bool
+elm_map_wheel_disabled_get(const Evas_Object *obj)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, EINA_FALSE);
 
-   if ((!wd) || (!wd->src)) return NULL;
-   return wd->src->name;
+   return wd->wheel_disabled;
 #else
    (void) obj;
-   return NULL;
+   return EINA_FALSE;
 #endif
 }
 
 EAPI void
-elm_map_route_source_set(Evas_Object *obj, Elm_Map_Route_Sources source)
+elm_map_tile_load_status_get(const Evas_Object *obj, int *try_num, int *finish_num)
 {
 #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->route_source = source;
+   if (try_num) *try_num = wd->try_num;
+   if (finish_num) *finish_num = wd->finish_num;
 #else
    (void) obj;
-   (void) source;
+   (void) try_num;
+   (void) finish_num;
 #endif
 }
 
-EAPI Elm_Map_Route_Sources
-elm_map_route_source_get(const Evas_Object *obj)
+EAPI void
+elm_map_canvas_to_region_convert(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, double *lon, double *lat)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype) ELM_MAP_ROUTE_SOURCE_YOURS;
+   ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, ELM_MAP_ROUTE_SOURCE_YOURS);
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+   EINA_SAFETY_ON_NULL_RETURN(lon);
+   EINA_SAFETY_ON_NULL_RETURN(lat);
 
-   return wd->route_source;
+   _canvas_to_coord(wd, x, y, &x, &y);
+   _coord_to_region_convert(wd, x, y, wd->size.w, lon, lat);
 #else
    (void) obj;
-   return ELM_MAP_ROUTE_SOURCE_YOURS;
+   (void) x;
+   (void) y;
+   (void) lon;
+   (void) lat;
 #endif
 }
 
 EAPI void
-elm_map_source_zoom_max_set(Evas_Object *obj, int zoom)
+elm_map_region_to_canvas_convert(const Evas_Object *obj, double lon, double lat, Evas_Coord *x, Evas_Coord *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);
-   EINA_SAFETY_ON_NULL_RETURN(wd->src);
+   EINA_SAFETY_ON_NULL_RETURN(x);
+   EINA_SAFETY_ON_NULL_RETURN(y);
 
-   if ((zoom > wd->src->zoom_max) || (zoom < wd->src->zoom_min)) return;
-   wd->zoom_max = zoom;
+   _region_to_coord_convert(wd, lon, lat, wd->size.w, x, y);
+   _coord_to_canvas(wd, *x, *y, x, y);
 #else
    (void) obj;
-   (void) zoom;
+   (void) lon;
+   (void) lat;
+   (void) x;
+   (void) y;
 #endif
 }
 
-EAPI int
-elm_map_source_zoom_max_get(const Evas_Object *obj)
+EAPI void
+elm_map_user_agent_set(Evas_Object *obj, const char *user_agent)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype) 18;
+   ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, -1);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd->src, -1);
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+   EINA_SAFETY_ON_NULL_RETURN(user_agent);
 
-   return wd->zoom_max;
+   eina_stringshare_replace(&wd->user_agent, user_agent);
+
+   if (!wd->ua) wd->ua = eina_hash_string_small_new(NULL);
+   eina_hash_set(wd->ua, "User-Agent", wd->user_agent);
 #else
    (void) obj;
-   return 18;
+   (void) user_agent;
 #endif
 }
 
-EAPI void
-elm_map_source_zoom_min_set(Evas_Object *obj, int zoom)
+EAPI const char *
+elm_map_user_agent_get(const Evas_Object *obj)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype);
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-   EINA_SAFETY_ON_NULL_RETURN(wd->src);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
 
-   if ((zoom > wd->src->zoom_max) || (zoom < wd->src->zoom_min)) return;
-   wd->zoom_min = zoom;
+   return wd->user_agent;
 #else
    (void) obj;
-   (void) zoom;
+   return NULL;
 #endif
 }
 
-EAPI int
-elm_map_source_zoom_min_get(const Evas_Object *obj)
+EAPI void
+elm_map_source_set(Evas_Object *obj, Elm_Map_Source_Type type, const char *source_name)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, -1);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd->src, -1);
+   EINA_SAFETY_ON_NULL_RETURN(wd);
+   EINA_SAFETY_ON_NULL_RETURN(source_name);
+
+   if (type == ELM_MAP_SOURCE_TYPE_TILE) _source_tile_set(wd, source_name);
+   else if (type == ELM_MAP_SOURCE_TYPE_ROUTE)
+      _source_route_set(wd, source_name);
+   else if (type == ELM_MAP_SOURCE_TYPE_NAME) _source_name_set(wd, source_name);
+   else ERR("Not supported map source type: %d", type);
 
-   return wd->zoom_min;
 #else
    (void) obj;
-   return 0;
+   (void) source_name;
 #endif
 }
 
-EAPI void
-elm_map_user_agent_set(Evas_Object *obj, const char *user_agent)
+EAPI const char *
+elm_map_source_get(const Evas_Object *obj, Elm_Map_Source_Type type)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype);
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN(wd);
-   EINA_SAFETY_ON_NULL_RETURN(user_agent);
-
-   eina_stringshare_replace(&wd->user_agent, user_agent);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd->src_tile, NULL);
 
-   if (!wd->ua) wd->ua = eina_hash_string_small_new(NULL);
-   eina_hash_set(wd->ua, "User-Agent", wd->user_agent);
+   if (type == ELM_MAP_SOURCE_TYPE_TILE) return wd->src_tile->name;
+   else if (type == ELM_MAP_SOURCE_TYPE_ROUTE) return wd->src_route->name;
+   else if (type == ELM_MAP_SOURCE_TYPE_NAME) return wd->src_name->name;
+   else ERR("Not supported map source type: %d", type);
+   return NULL;
 #else
    (void) obj;
-   (void) user_agent;
+   return NULL;
 #endif
 }
 
-EAPI const char *
-elm_map_user_agent_get(const Evas_Object *obj)
+EAPI const char **
+elm_map_sources_get(const Evas_Object *obj, Elm_Map_Source_Type type)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
    EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
 
-   return wd->user_agent;
+   if (type == ELM_MAP_SOURCE_TYPE_TILE) return wd->src_tile_names;
+   else if (type == ELM_MAP_SOURCE_TYPE_ROUTE) return wd->src_route_names;
+   else if (type == ELM_MAP_SOURCE_TYPE_NAME) return wd->src_name_names;
+   else ERR("Not supported map source type: %d", type);
+   return NULL;
 #else
    (void) obj;
    return NULL;
@@ -4715,88 +4461,66 @@ elm_map_user_agent_get(const Evas_Object *obj)
 }
 
 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 *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)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
-   char buf[PATH_MAX];
-   char *source;
-   char *type_name = NULL;
-   int fd;
-
    EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd->src, NULL);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd->src_route, NULL);
 
-   Elm_Map_Route *route = ELM_NEW(Elm_Map_Route);
+   char *type_name;
+   char *url;
+   char fname[PATH_MAX];
 
-   snprintf(buf, sizeof(buf), DEST_ROUTE_XML_FILE);
-   fd = mkstemp(buf);
-   if (fd < 0)
-     {
-        free(route);
-        return NULL;
-     }
+   if (!ecore_file_exists(CACHE_ROUTE_ROOT))
+      ecore_file_mkpath(CACHE_ROUTE_ROOT);
 
-   route->con_url = ecore_con_url_new(NULL);
-   route->ud.fname = strdup(buf);
-   INF("xml file : %s", route->ud.fname);
+   if (type == ELM_MAP_ROUTE_TYPE_MOTOCAR)
+      type_name = strdup(ROUTE_TYPE_MOTORCAR);
+   else if (type == ELM_MAP_ROUTE_TYPE_BICYCLE)
+      type_name = strdup(ROUTE_TYPE_BICYCLE);
+   else if (type == ELM_MAP_ROUTE_TYPE_FOOT)
+      type_name = strdup(ROUTE_TYPE_FOOT);
+   else type_name = NULL;
 
-   route->ud.fd = fdopen(fd, "w+");
-   if ((!route->con_url) || (!route->ud.fd))
+   url = wd->src_route->url_cb(obj, type_name, method, flon, flat, tlon, tlat);
+   if (!url)
      {
-        ecore_con_url_free(route->con_url);
-        free(route);
+        ERR("Route URL is NULL");
+        if (type_name) free(type_name);
         return NULL;
      }
+   if (type_name) free(type_name);
 
+   Elm_Map_Route *route = ELM_NEW(Elm_Map_Route);
    route->wd = wd;
-   route->color.r = 255;
-   route->color.g = 0;
-   route->color.b = 0;
-   route->color.a = 255;
-   route->handlers = eina_list_append
-     (route->handlers, (void *)ecore_event_handler_add
-         (ECORE_CON_EVENT_URL_COMPLETE, _route_complete_cb, route));
-
-   route->inbound = EINA_FALSE;
+   snprintf(fname, sizeof(fname), CACHE_ROUTE_ROOT"/%d", rand());
+   route->fname = strdup(fname);
    route->type = type;
    route->method = method;
    route->flon = flon;
    route->flat = flat;
    route->tlon = tlon;
    route->tlat = tlat;
+   route->cb = route_cb;
+   route->data = data;
 
-   switch (type)
+   if (!ecore_file_download_full(url, route->fname, _route_cb, NULL, route,
+                                 &(route->job), wd->ua) || !(route->job))
      {
-      case ELM_MAP_ROUTE_TYPE_MOTOCAR:
-        type_name = strdup(ROUTE_TYPE_MOTORCAR);
-        break;
-      case ELM_MAP_ROUTE_TYPE_BICYCLE:
-        type_name = strdup(ROUTE_TYPE_BICYCLE);
-        break;
-      case ELM_MAP_ROUTE_TYPE_FOOT:
-        type_name = strdup(ROUTE_TYPE_FOOT);
-        break;
-      default:
-        break;
+        ERR("Can't request Route from %s to %s", url, route->fname);
+        free(route->fname);
+        free(route);
+        return NULL;
      }
+   INF("Route requested from %s to %s", url, route->fname);
+   free(url);
 
-   source = wd->src->route_url_cb(obj, type_name, method, flon, flat, tlon, tlat);
-   INF("route url = %s", source);
-
-   wd->route = eina_list_append(wd->route, route);
-
-   ecore_con_url_url_set(route->con_url, source);
-   ecore_con_url_fd_set(route->con_url, fileno(route->ud.fd));
-   ecore_con_url_data_set(route->con_url, route);
-   ecore_con_url_get(route->con_url);
-   if (type_name) free(type_name);
-   if (source) free(source);
-
+   wd->routes = eina_list_append(wd->routes, route);
+   evas_object_smart_callback_call(wd->obj, SIG_ROUTE_LOAD, route);
    edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
                            "elm,state,busy,start", "elm");
-   evas_object_smart_callback_call(wd->obj, SIG_ROUTE_LOAD, NULL);
    return route;
 #else
    (void) obj;
@@ -4806,25 +4530,25 @@ elm_map_route_add(Evas_Object *obj, Elm_Map_Route_Type type, Elm_Map_Route_Metho
    (void) flat;
    (void) tlon;
    (void) tlat;
+   (void) route_cb;
+   (void) data;
    return NULL;
 #endif
 }
 
+
 EAPI void
-elm_map_route_remove(Elm_Map_Route *route)
+elm_map_route_del(Elm_Map_Route *route)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
    EINA_SAFETY_ON_NULL_RETURN(route);
+   EINA_SAFETY_ON_NULL_RETURN(route->wd);
+   ELM_CHECK_WIDTYPE(route->wd->obj, widtype);
 
    Path_Waypoint *w;
    Path_Node *n;
-   Evas_Object *p;
-   Ecore_Event_Handler *h;
 
-   EINA_LIST_FREE(route->path, p)
-     {
-        evas_object_del(p);
-     }
+   if (route->job) ecore_file_download_abort(route->job);
 
    EINA_LIST_FREE(route->waypoint, w)
      {
@@ -4838,55 +4562,16 @@ elm_map_route_remove(Elm_Map_Route *route)
         free(n);
      }
 
-   EINA_LIST_FREE(route->handlers, h)
+   if (route->fname)
      {
-        ecore_event_handler_del(h);
+        ecore_file_remove(route->fname);
+        free(route->fname);
      }
 
-   if (route->ud.fname)
-     {
-        ecore_file_remove(route->ud.fname);
-        free(route->ud.fname);
-        route->ud.fname = NULL;
-     }
-#else
-   (void) route;
-#endif
-}
-
-EAPI void
-elm_map_route_color_set(Elm_Map_Route *route, int r, int g , int b, int a)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(route);
-   route->color.r = r;
-   route->color.g = g;
-   route->color.b = b;
-   route->color.a = a;
-#else
-   (void) route;
-   (void) r;
-   (void) g;
-   (void) b;
-   (void) a;
-#endif
-}
-
-EAPI void
-elm_map_route_color_get(const Elm_Map_Route *route, int *r, int *g , int *b, int *a)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(route);
-   if (r) *r = route->color.r;
-   if (g) *g = route->color.g;
-   if (b) *b = route->color.b;
-   if (a) *a = route->color.a;
+   route->wd->routes = eina_list_remove(route->wd->routes, route);
+   free(route);
 #else
    (void) route;
-   (void) r;
-   (void) g;
-   (void) b;
-   (void) a;
 #endif
 }
 
@@ -4926,167 +4611,81 @@ elm_map_route_waypoint_get(const Elm_Map_Route *route)
 #endif
 }
 
-EAPI const char *
-elm_map_name_address_get(const Elm_Map_Name *name)
+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)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL);
-   return name->address;
-#else
-   (void) name;
-   return NULL;
-#endif
-}
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
 
-EAPI void
-elm_map_name_region_get(const Elm_Map_Name *name, double *lon, double *lat)
-{
-#ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(name);
-   if (lon) *lon = name->lon;
-   if (lat) *lat = name->lat;
+   if (address)
+      return _name_request(obj, ELM_MAP_NAME_METHOD_SEARCH, address, 0, 0,
+                           name_cb, data);
+  else
+     return _name_request(obj, ELM_MAP_NAME_METHOD_REVERSE, NULL, lon, lat,
+                          name_cb, data);
 #else
-   (void) name;
+   (void) obj;
+   (void) address;
    (void) lon;
    (void) lat;
+   (void) name_cb;
+   (void) data;
+   return NULL;
 #endif
 }
 
 EAPI void
-elm_map_name_remove(Elm_Map_Name *name)
+elm_map_name_del(Elm_Map_Name *name)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
    EINA_SAFETY_ON_NULL_RETURN(name);
-   if (name->address)
-     {
-        free(name->address);
-        name->address = NULL;
-     }
-   if (name->handler)
-     {
-        ecore_event_handler_del(name->handler);
-        name->handler = NULL;
-     }
-   if (name->ud.fname)
+   EINA_SAFETY_ON_NULL_RETURN(name->wd);
+   ELM_CHECK_WIDTYPE(name->wd->obj, widtype);
+
+   if (name->job) ecore_file_download_abort(name->job);
+   if (name->address) free(name->address);
+   if (name->fname)
      {
-        ecore_file_remove(name->ud.fname);
-        free(name->ud.fname);
-        name->ud.fname = NULL;
+        ecore_file_remove(name->fname);
+        free(name->fname);
      }
-#else
-   (void) name;
-#endif
-}
 
-EAPI void
-elm_map_rotate_set(Evas_Object *obj, double degree, Evas_Coord cx, Evas_Coord cy)
-{
-#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->rotate.d = degree;
-   wd->rotate.cx = cx;
-   wd->rotate.cy = cy;
-
-   evas_object_smart_changed(wd->pan_smart);
-#else
-   (void) obj;
-   (void) degree;
-   (void) cx;
-   (void) cy;
-#endif
-}
-
-EAPI void
-elm_map_rotate_get(const Evas_Object *obj, double *degree, Evas_Coord *cx, Evas_Coord *cy)
-{
-#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 (degree) *degree = wd->rotate.d;
-   if (cx) *cx = wd->rotate.cx;
-   if (cy) *cy = wd->rotate.cy;
-#else
-   (void) obj;
-   (void) degree;
-   (void) cx;
-   (void) cy;
-#endif
-}
-
-EAPI void
-elm_map_wheel_disabled_set(Evas_Object *obj, Eina_Bool disabled)
-{
-#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->wheel_disabled) && (disabled))
-     evas_object_event_callback_del_full(obj, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel_cb, obj);
-   else if ((wd->wheel_disabled) && (!disabled))
-     evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel_cb, obj);
-   wd->wheel_disabled = !!disabled;
-#else
-   (void) obj;
-   (void) disabled;
-#endif
-}
-
-EAPI Eina_Bool
-elm_map_wheel_disabled_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->wheel_disabled;
+   name->wd->names = eina_list_remove(name->wd->names, name);
+   free(name);
 #else
-   (void) obj;
-   return EINA_FALSE;
+   (void) name;
 #endif
 }
 
-#ifdef ELM_EMAP
-EAPI Evas_Object *
-elm_map_track_add(Evas_Object *obj, EMap_Route *emap)
+EAPI const char *
+elm_map_name_address_get(const Elm_Map_Name *name)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, EINA_FALSE);
-
-   Evas_Object *route = elm_route_add(obj);
-   elm_route_emap_set(route, emap);
-   wd->track = eina_list_append(wd->track, route);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(name->wd, NULL);
+   ELM_CHECK_WIDTYPE(name->wd->obj, widtype) NULL;
 
-   return route;
+   return name->address;
 #else
-   (void) obj;
-   (void) emap;
+   (void) name;
    return NULL;
 #endif
 }
-#endif
 
 EAPI void
-elm_map_track_remove(Evas_Object *obj, Evas_Object *route)
+elm_map_name_region_get(const Elm_Map_Name *name, 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);
+   EINA_SAFETY_ON_NULL_RETURN(name);
+   EINA_SAFETY_ON_NULL_RETURN(name->wd);
+   ELM_CHECK_WIDTYPE(name->wd->obj, widtype);
 
-   wd->track = eina_list_remove(wd->track, route);
-   evas_object_del(route);
+   if (lon) *lon = name->lon;
+   if (lat) *lat = name->lat;
 #else
-   (void) obj;
-   (void) route;
+   (void) name;
+   (void) lon;
+   (void) lat;
 #endif
 }
 
@@ -5101,8 +4700,11 @@ elm_map_overlay_add(Evas_Object *obj, double lon, double lat)
    Elm_Map_Overlay *overlay = ELM_NEW(Elm_Map_Overlay);
    overlay->wd = wd;
    overlay->type = ELM_MAP_OVERLAY_TYPE_DEFAULT;
-   overlay->ovl = _overlay_default_new(wd, lon, lat, "radio");
-   _overlay_default_cb_add(overlay->ovl, _overlay_clicked_cb, overlay);
+   overlay->c.r = 0x87;
+   overlay->c.g = 0xce;
+   overlay->c.b = 0xeb;
+   overlay->c.a = 255;
+   overlay->ovl = _overlay_default_new(overlay, lon, lat, overlay->c, 1);
    overlay->grp = _overlay_group_new(wd);
    wd->overlays = eina_list_append(wd->overlays, overlay);
 
@@ -5116,33 +4718,65 @@ elm_map_overlay_add(Evas_Object *obj, double lon, double lat)
 #endif
 }
 
+EAPI Eina_List *
+elm_map_overlays_get(Evas_Object *obj)
+{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+
+   Eina_List *l;
+   Elm_Map_Overlay *ovl;
+
+   eina_list_free(wd->all_overlays);
+   wd->all_overlays = NULL;
+
+   EINA_LIST_FOREACH(wd->overlays, l, ovl)
+      wd->all_overlays = eina_list_append(wd->all_overlays, ovl);
+   EINA_LIST_FOREACH(wd->group_overlays, l, ovl)
+      wd->all_overlays = eina_list_append(wd->all_overlays, ovl);
+
+   return wd->all_overlays;
+#else
+   (void) obj;
+   return NULL;
+#endif
+}
+
 EAPI void
 elm_map_overlay_del(Elm_Map_Overlay *overlay)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
    EINA_SAFETY_ON_NULL_RETURN(overlay);
-   EINA_SAFETY_ON_NULL_RETURN(overlay->wd);
-   ELM_CHECK_WIDTYPE(overlay->wd->obj, widtype);
-
-   if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
-     {
-        _overlay_default_cb_del(overlay->ovl, _overlay_clicked_cb);
-        _overlay_default_free(overlay->ovl);
-     }
-   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_BUBBLE)
-     {
-        _overlay_bubble_cb_del(overlay->ovl);
-        _overlay_bubble_free(overlay->ovl);
-     }
-   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS)
-      _overlay_class_free(overlay->ovl);
+   EINA_SAFETY_ON_NULL_RETURN(overlay->wd);
+   ELM_CHECK_WIDTYPE(overlay->wd->obj, widtype);
 
    if (overlay->grp)
      {
-        _overlay_group_cb_del(overlay->grp);
-        _overlay_group_free(overlay->grp, overlay);
+        if (overlay->grp->clas)
+           elm_map_overlay_class_remove(overlay->grp->clas, overlay);
+        _overlay_group_free(overlay->grp);
      }
 
+   if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
+      _overlay_default_free(overlay->ovl);
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_BUBBLE)
+      _overlay_bubble_free(overlay->ovl);
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS)
+      _overlay_class_free(overlay->ovl);
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_ROUTE)
+      _overlay_route_free(overlay->ovl);
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_LINE)
+      _overlay_line_free(overlay->ovl);
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_POLYGON)
+      _overlay_polygon_free(overlay->ovl);
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_CIRCLE)
+      _overlay_circle_free(overlay->ovl);
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_SCALE)
+      _overlay_scale_free(overlay->ovl);
+   else ERR("Invalid overlay type: %d", overlay->type);
+
    overlay->wd->overlays = eina_list_remove(overlay->wd->overlays, overlay);
    evas_object_smart_changed(overlay->wd->pan_smart);
 
@@ -5153,7 +4787,7 @@ elm_map_overlay_del(Elm_Map_Overlay *overlay)
 }
 
 EAPI Elm_Map_Overlay_Type
-elm_map_overlay_type_get(Elm_Map_Overlay *overlay)
+elm_map_overlay_type_get(const Elm_Map_Overlay *overlay)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
    EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, ELM_MAP_OVERLAY_TYPE_NONE);
@@ -5163,7 +4797,7 @@ elm_map_overlay_type_get(Elm_Map_Overlay *overlay)
    return overlay->type;
 #else
    (void) overlay;
-   return OVERLAY_TYPE_NONE;
+   return ELM_MAP_OVERLAY_TYPE_NONE;
 #endif
 }
 
@@ -5294,6 +4928,21 @@ elm_map_overlay_paused_get(const Elm_Map_Overlay *overlay)
 #endif
 }
 
+EAPI Eina_Bool
+elm_map_overlay_visible_get(const Elm_Map_Overlay *overlay)
+{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
+   EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wd, EINA_FALSE);
+   ELM_CHECK_WIDTYPE(overlay->wd->obj, widtype) EINA_FALSE;
+
+   return overlay->visible;
+#else
+   (void) overlay;
+   return EINA_FALSE;
+#endif
+}
+
 EAPI void
 elm_map_overlay_show(Elm_Map_Overlay *overlay)
 {
@@ -5305,12 +4954,12 @@ elm_map_overlay_show(Elm_Map_Overlay *overlay)
    if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
      {
         Overlay_Default *ovl = overlay->ovl;
-        elm_map_geo_region_show(overlay->wd->obj, ovl->lon, ovl->lat);
+        elm_map_region_show(overlay->wd->obj, ovl->lon, ovl->lat);
      }
    else if (overlay->type == ELM_MAP_OVERLAY_TYPE_BUBBLE)
      {
         Overlay_Bubble *ovl = overlay->ovl;
-        elm_map_geo_region_show(overlay->wd->obj, ovl->lon, ovl->lat);
+        elm_map_region_show(overlay->wd->obj, ovl->lon, ovl->lat);
      }
    else if (overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS)
      {
@@ -5319,7 +4968,7 @@ elm_map_overlay_show(Elm_Map_Overlay *overlay)
         _region_max_min_get(ovl->members, &max_lo, &min_lo, &max_la, &min_la);
         lon = (max_lo + min_lo) / 2;
         lat = (max_la + min_la) / 2;
-        elm_map_geo_region_show(overlay->wd->obj, lon, lat);
+        elm_map_region_show(overlay->wd->obj, lon, lat);
      }
    else ERR("Not supported overlay type: %d", overlay->type);
 
@@ -5351,7 +5000,7 @@ elm_map_overlays_show(Eina_List *overlays)
 }
 
 EAPI void
-elm_map_overlay_geo_set(Elm_Map_Overlay *overlay, double lon, double lat)
+elm_map_overlay_region_set(Elm_Map_Overlay *overlay, double lon, double lat)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
    EINA_SAFETY_ON_NULL_RETURN(overlay);
@@ -5367,6 +5016,7 @@ elm_map_overlay_geo_set(Elm_Map_Overlay *overlay, double lon, double lat)
    else if (overlay->type == ELM_MAP_OVERLAY_TYPE_BUBBLE)
      {
         Overlay_Bubble *ovl = overlay->ovl;
+        ovl->pobj = NULL;
         ovl->lon = lon;
         ovl->lat = lat;
      }
@@ -5381,14 +5031,20 @@ elm_map_overlay_geo_set(Elm_Map_Overlay *overlay, double lon, double lat)
 }
 
 EAPI void
-elm_map_overlay_geo_get(const Elm_Map_Overlay *overlay, double *lon, double *lat)
+elm_map_overlay_region_get(const Elm_Map_Overlay *overlay, double *lon, double *lat)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
    EINA_SAFETY_ON_NULL_RETURN(overlay);
    EINA_SAFETY_ON_NULL_RETURN(overlay->wd);
    ELM_CHECK_WIDTYPE(overlay->wd->obj, widtype);
 
-   if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
+   if (overlay->type == ELM_MAP_OVERLAY_TYPE_GROUP)
+     {
+        Overlay_Group *ovl = overlay->ovl;
+        if (lon) *lon = ovl->lon;
+        if (lat) *lat = ovl->lat;
+     }
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
      {
         const Overlay_Default *ovl = overlay->ovl;
         if (lon) *lon = ovl->lon;
@@ -5418,10 +5074,9 @@ elm_map_overlay_icon_set(Elm_Map_Overlay *overlay, Evas_Object *icon)
    ELM_CHECK_WIDTYPE(overlay->wd->obj, widtype);
 
    if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
-      _overlay_default_update(overlay->wd, overlay->ovl, NULL, icon,
-                              NULL, NULL, NULL);
+      _overlay_default_icon_update(overlay->ovl, icon);
    else if (overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS)
-      _overlay_class_update(overlay->wd, overlay->ovl, NULL, icon);
+      _overlay_class_icon_update(overlay->ovl, icon);
    else ERR("Not supported overlay type: %d", overlay->type);
 
    evas_object_smart_changed(overlay->wd->pan_smart);
@@ -5442,7 +5097,7 @@ elm_map_overlay_icon_get(const Elm_Map_Overlay *overlay)
    if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
      {
         const Overlay_Default *ovl = overlay->ovl;
-        return elm_object_part_content_get(ovl->layout, "elm.icon");
+        return ovl->icon;
      }
    else if (overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS)
      {
@@ -5461,19 +5116,18 @@ elm_map_overlay_icon_get(const Elm_Map_Overlay *overlay)
 }
 
 EAPI void
-elm_map_overlay_content_set(Elm_Map_Overlay *overlay, Evas_Object *obj)
+elm_map_overlay_content_set(Elm_Map_Overlay *overlay, Evas_Object *content)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
    EINA_SAFETY_ON_NULL_RETURN(overlay);
-   EINA_SAFETY_ON_NULL_RETURN(obj);
+   EINA_SAFETY_ON_NULL_RETURN(content);
    EINA_SAFETY_ON_NULL_RETURN(overlay->wd);
    ELM_CHECK_WIDTYPE(overlay->wd->obj, widtype);
 
    if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
-      _overlay_default_update(overlay->wd, overlay->ovl, obj, NULL, NULL,
-                                 NULL, NULL);
+      _overlay_default_content_update(overlay->ovl, content, overlay);
    else if (overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS)
-      _overlay_class_update(overlay->wd, overlay->ovl, obj, NULL);
+      _overlay_class_content_update(overlay->ovl, content);
    else ERR("Not supported overlay type: %d", overlay->type);
 
    evas_object_smart_changed(overlay->wd->pan_smart);
@@ -5494,12 +5148,12 @@ elm_map_overlay_content_get(const Elm_Map_Overlay *overlay)
    if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
      {
         const Overlay_Default *ovl = overlay->ovl;
-        return elm_object_part_content_get(ovl->layout, "elm.icon");
+        return ovl->content;
      }
    else if (overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS)
      {
         const Overlay_Class *ovl = overlay->ovl;
-        return ovl->icon;
+        return ovl->content;
      }
    else
      {
@@ -5513,6 +5167,64 @@ elm_map_overlay_content_get(const Elm_Map_Overlay *overlay)
 }
 
 EAPI void
+elm_map_overlay_color_set(Elm_Map_Overlay *overlay, int r, int g , int b, int a)
+{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
+   EINA_SAFETY_ON_NULL_RETURN(overlay);
+   EINA_SAFETY_ON_NULL_RETURN(overlay->wd);
+   ELM_CHECK_WIDTYPE(overlay->wd->obj, widtype);
+
+   overlay->c.r = r;
+   overlay->c.g = g;
+   overlay->c.b = b;
+   overlay->c.a = a;
+
+   if (overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS)
+      _overlay_class_color_update(overlay->ovl, overlay->c);
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
+      _overlay_default_color_update(overlay->ovl, overlay->c);
+   else if (overlay->type == ELM_MAP_OVERLAY_TYPE_ROUTE)
+      _overlay_route_color_update(overlay->ovl, overlay->c);
+   else
+     {
+        ERR("Not supported overlay type: %d", overlay->type);
+     }
+
+#else
+   (void) overlay;
+   (void) r;
+   (void) g;
+   (void) b;
+   (void) a;
+#endif
+}
+
+EAPI void
+elm_map_overlay_color_get(const Elm_Map_Overlay *overlay, int *r, int *g , int *b, int *a)
+{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
+   EINA_SAFETY_ON_NULL_RETURN(overlay);
+   EINA_SAFETY_ON_NULL_RETURN(overlay->wd);
+   ELM_CHECK_WIDTYPE(overlay->wd->obj, widtype);
+
+   if (overlay->type == ELM_MAP_OVERLAY_TYPE_ROUTE)
+     {
+         if (r) *r = overlay->c.r;
+         if (g) *g = overlay->c.g;
+         if (b) *b = overlay->c.b;
+         if (a) *a = overlay->c.a;
+      }
+   else ERR("Not supported overlay type: %d", overlay->type);
+#else
+   (void) overlay;
+   (void) r;
+   (void) g;
+   (void) b;
+   (void) a;
+#endif
+}
+
+EAPI void
 elm_map_overlay_get_cb_set(Elm_Map_Overlay *overlay, Elm_Map_Overlay_Get_Cb get_cb, void *data)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
@@ -5522,6 +5234,9 @@ elm_map_overlay_get_cb_set(Elm_Map_Overlay *overlay, Elm_Map_Overlay_Get_Cb get_
 
    overlay->cb = get_cb;
    overlay->cb_data = data;
+
+   if (overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS)
+      _overlay_class_cb_set(overlay->ovl, get_cb, data);
 #else
    (void) overlay;
    (void) get_cb;
@@ -5540,8 +5255,11 @@ elm_map_overlay_class_add(Evas_Object *obj)
    Elm_Map_Overlay *overlay = ELM_NEW(Elm_Map_Overlay);
    overlay->wd = wd;
    overlay->type = ELM_MAP_OVERLAY_TYPE_CLASS;
-   overlay->ovl = _overlay_class_new(wd, overlay);
-   overlay->grp = NULL;
+   overlay->ovl = _overlay_class_new(wd);
+   overlay->c.r = 0x90;
+   overlay->c.g = 0xee;
+   overlay->c.b = 0x90;
+   overlay->c.a = 0xff;
    wd->overlays = eina_list_append(wd->overlays, overlay);
 
    evas_object_smart_changed(wd->pan_smart);
@@ -5553,97 +5271,121 @@ elm_map_overlay_class_add(Evas_Object *obj)
 }
 
 EAPI void
-elm_map_overlay_class_append(Elm_Map_Overlay *group, Elm_Map_Overlay *overlay)
+elm_map_overlay_class_append(Elm_Map_Overlay *clas, Elm_Map_Overlay *overlay)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(group);
+   EINA_SAFETY_ON_NULL_RETURN(clas);
    EINA_SAFETY_ON_NULL_RETURN(overlay);
-   EINA_SAFETY_ON_NULL_RETURN(group->wd);
-   ELM_CHECK_WIDTYPE(group->wd->obj, widtype);
-   EINA_SAFETY_ON_FALSE_RETURN(group->type == ELM_MAP_OVERLAY_TYPE_CLASS);
+   EINA_SAFETY_ON_NULL_RETURN(clas->wd);
+   ELM_CHECK_WIDTYPE(clas->wd->obj, widtype);
+   EINA_SAFETY_ON_FALSE_RETURN(clas->type == ELM_MAP_OVERLAY_TYPE_CLASS);
 
-   if (overlay->type != ELM_MAP_OVERLAY_TYPE_DEFAULT)
+   Overlay_Class *clas_ovl = clas->ovl;
+   if (eina_list_data_find(clas_ovl->members, overlay))
      {
-        ERR("Currently group supports only default overlays");
+        ERR("Already added overlay into clas");
         return;
      }
+   clas_ovl->members = eina_list_append(clas_ovl->members, overlay);
 
-   Overlay_Class *ovl = group->ovl;
-   if (eina_list_data_find(ovl->members, overlay))
+   // Update group by class
+   overlay->grp->clas = clas;
+   _overlay_group_icon_update(overlay->grp, clas_ovl->icon);
+   _overlay_group_content_update(overlay->grp, clas_ovl->content);
+   _overlay_group_color_update(overlay->grp, clas->c);
+   _overlay_group_cb_set(overlay->grp, clas->cb, clas->data);
+   if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
      {
-        ERR("Already added overlay into group");
-        return;
+        _overlay_default_clas_icon_update(overlay->ovl, clas_ovl->icon);
+        _overlay_default_clas_content_update(overlay->ovl, clas_ovl->content);
      }
-   ovl->members = eina_list_append(ovl->members, overlay);
-   overlay->grp->clas = group;
 
-  evas_object_smart_changed(group->wd->pan_smart);
+  evas_object_smart_changed(clas->wd->pan_smart);
 #else
-   (void) group;
+   (void) clas;
    (void) overlay;
 #endif
 }
 
 EAPI void
-elm_map_overlay_class_remove(Elm_Map_Overlay *group, Elm_Map_Overlay *overlay)
+elm_map_overlay_class_remove(Elm_Map_Overlay *clas, Elm_Map_Overlay *overlay)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(group);
+   EINA_SAFETY_ON_NULL_RETURN(clas);
    EINA_SAFETY_ON_NULL_RETURN(overlay);
-   EINA_SAFETY_ON_NULL_RETURN(group->wd);
-   ELM_CHECK_WIDTYPE(group->wd->obj, widtype);
-   EINA_SAFETY_ON_FALSE_RETURN(group->type == ELM_MAP_OVERLAY_TYPE_CLASS);
+   EINA_SAFETY_ON_NULL_RETURN(clas->wd);
+   ELM_CHECK_WIDTYPE(clas->wd->obj, widtype);
+   EINA_SAFETY_ON_FALSE_RETURN(clas->type == ELM_MAP_OVERLAY_TYPE_CLASS);
 
-    if (overlay->type != ELM_MAP_OVERLAY_TYPE_DEFAULT)
-     {
-        ERR("Currently group supports only default overlays");
-        return;
-     }
-   Overlay_Class *ovl = group->ovl;
+   Overlay_Class *ovl = clas->ovl;
    ovl->members = eina_list_remove(ovl->members, overlay);
+
    overlay->grp->clas = NULL;
-   _overlay_group_update(group->wd, overlay->grp, NULL);
+   _overlay_group_icon_update(overlay->grp, NULL);
+   _overlay_group_content_update(overlay->grp, NULL);
+   if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
+     {
+        _overlay_default_clas_icon_update(overlay->ovl, NULL);
+        _overlay_default_clas_content_update(overlay->ovl, NULL);
+     }
 
-  evas_object_smart_changed(group->wd->pan_smart);
+  evas_object_smart_changed(clas->wd->pan_smart);
 #else
-   (void) group;
+   (void) clas;
    (void) overlay;
 #endif
 }
 
 EAPI void
-elm_map_overlay_class_zoom_max_set(Elm_Map_Overlay *group, int zoom)
+elm_map_overlay_class_zoom_max_set(Elm_Map_Overlay *clas, int zoom)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN(group);
-   EINA_SAFETY_ON_NULL_RETURN(group->wd);
-   ELM_CHECK_WIDTYPE(group->wd->obj, widtype);
-   EINA_SAFETY_ON_FALSE_RETURN(group->type == ELM_MAP_OVERLAY_TYPE_CLASS);
+   EINA_SAFETY_ON_NULL_RETURN(clas);
+   EINA_SAFETY_ON_NULL_RETURN(clas->wd);
+   ELM_CHECK_WIDTYPE(clas->wd->obj, widtype);
+   EINA_SAFETY_ON_FALSE_RETURN(clas->type == ELM_MAP_OVERLAY_TYPE_CLASS);
 
-   Overlay_Class *ovl = group->ovl;
+   Overlay_Class *ovl = clas->ovl;
    if (ovl->zoom_max == !!zoom) return;
    ovl->zoom_max = zoom;
 
-   evas_object_smart_changed(group->wd->pan_smart);
+   evas_object_smart_changed(clas->wd->pan_smart);
 #else
-   (void) group;
+   (void) clas;
    (void) zoom;
 #endif
 }
 
 EAPI int
-elm_map_overlay_class_zoom_max_get(const Elm_Map_Overlay *group)
+elm_map_overlay_class_zoom_max_get(const Elm_Map_Overlay *clas)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
-   EINA_SAFETY_ON_NULL_RETURN_VAL(group, OVERLAY_CLASS_ZOOM_MAX);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(group->wd, OVERLAY_CLASS_ZOOM_MAX);
-   ELM_CHECK_WIDTYPE(group->wd->obj, widtype) OVERLAY_CLASS_ZOOM_MAX;
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(group->type == ELM_MAP_OVERLAY_TYPE_CLASS, OVERLAY_CLASS_ZOOM_MAX);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(clas, OVERLAY_CLASS_ZOOM_MAX);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(clas->wd, OVERLAY_CLASS_ZOOM_MAX);
+   ELM_CHECK_WIDTYPE(clas->wd->obj, widtype) OVERLAY_CLASS_ZOOM_MAX;
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(clas->type == ELM_MAP_OVERLAY_TYPE_CLASS, OVERLAY_CLASS_ZOOM_MAX);
 
-   const Overlay_Class *ovl = group->ovl;
+   const Overlay_Class *ovl = clas->ovl;
    return ovl->zoom_max;
 #else
-   (void) group;
+   (void) clas;
+   return OVERLAY_CLASS_ZOOM_MAX;
+#endif
+}
+
+EAPI Eina_List *
+elm_map_overlay_group_members_get(const Elm_Map_Overlay *grp)
+{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
+   EINA_SAFETY_ON_NULL_RETURN_VAL(grp, NULL);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(grp->wd, NULL);
+   ELM_CHECK_WIDTYPE(grp->wd->obj, widtype) NULL;
+  EINA_SAFETY_ON_FALSE_RETURN_VAL(grp->type == ELM_MAP_OVERLAY_TYPE_GROUP, NULL);
+
+   Overlay_Group *ovl = grp->ovl;
+   return ovl->members;
+#else
+   (void) clas;
    return OVERLAY_CLASS_ZOOM_MAX;
 #endif
 }
@@ -5659,8 +5401,11 @@ elm_map_overlay_bubble_add(Evas_Object *obj)
    Elm_Map_Overlay *overlay = ELM_NEW(Elm_Map_Overlay);
    overlay->wd = wd;
    overlay->type = ELM_MAP_OVERLAY_TYPE_BUBBLE;
-   overlay->ovl =  _overlay_bubble_new(wd);
-   _overlay_bubble_cb_add(overlay->ovl, overlay);
+   overlay->c.r = 255;
+   overlay->c.g = 255;
+   overlay->c.b = 255;
+   overlay->c.a = 255;
+   overlay->ovl =  _overlay_bubble_new(overlay);
    overlay->grp = _overlay_group_new(wd);
    wd->overlays = eina_list_append(wd->overlays, overlay);
 
@@ -5673,7 +5418,7 @@ elm_map_overlay_bubble_add(Evas_Object *obj)
 }
 
 EAPI void
-elm_map_overlay_bubble_follow(Elm_Map_Overlay *bubble, Elm_Map_Overlay *parent)
+elm_map_overlay_bubble_follow(Elm_Map_Overlay *bubble, const Elm_Map_Overlay *parent)
 {
 #ifdef HAVE_ELEMENTARY_ECORE_CON
    EINA_SAFETY_ON_NULL_RETURN(bubble);
@@ -5685,25 +5430,7 @@ elm_map_overlay_bubble_follow(Elm_Map_Overlay *bubble, Elm_Map_Overlay *parent)
    Evas_Object *pobj = _overlay_obj_get(parent);
    if (!pobj) return;
 
-   if (ovl->pobj)
-     {
-        evas_object_event_callback_del_full(ovl->pobj, EVAS_CALLBACK_HIDE,
-                                            _overlay_bubble_hide_cb, ovl);
-        evas_object_event_callback_del_full(ovl->pobj, EVAS_CALLBACK_SHOW,
-                                            _overlay_bubble_chase_cb, ovl);
-        evas_object_event_callback_del_full(ovl->pobj, EVAS_CALLBACK_MOVE,
-                                            _overlay_bubble_chase_cb, ovl);
-     }
-
    ovl->pobj = pobj;
-   evas_object_event_callback_add(ovl->pobj, EVAS_CALLBACK_HIDE,
-                                  _overlay_bubble_hide_cb, ovl);
-   evas_object_event_callback_add(ovl->pobj, EVAS_CALLBACK_SHOW,
-                                  _overlay_bubble_chase_cb, ovl);
-   evas_object_event_callback_add(ovl->pobj, EVAS_CALLBACK_MOVE,
-                                  _overlay_bubble_chase_cb, ovl);
-
-   _overlay_bubble_chase(ovl);
    evas_object_smart_changed(bubble->wd->pan_smart);
 #else
    (void) bubble;
@@ -5746,3 +5473,217 @@ elm_map_overlay_bubble_content_clear(Elm_Map_Overlay *bubble)
    (void) bubble;
 #endif
 }
+
+EAPI Elm_Map_Overlay *
+elm_map_overlay_route_add(Evas_Object *obj, const Elm_Map_Route *route)
+{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(route, NULL);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(route->wd, NULL);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(obj == route->wd->obj, NULL);
+
+   Elm_Map_Overlay *overlay = ELM_NEW(Elm_Map_Overlay);
+   overlay->wd = wd;
+   overlay->type = ELM_MAP_OVERLAY_TYPE_ROUTE;
+   overlay->c.r = 0xff;
+   overlay->c.g = 0x00;
+   overlay->c.b = 0x00;
+   overlay->c.a = 0xff;
+   overlay->ovl =  _overlay_route_new(wd, route, overlay->c);
+   overlay->grp = _overlay_group_new(wd);
+   wd->overlays = eina_list_append(wd->overlays, overlay);
+
+   evas_object_smart_changed(wd->pan_smart);
+   return overlay;
+#else
+   (void) obj;
+   (void) route;
+   return NULL;
+#endif
+}
+
+EAPI Elm_Map_Overlay *
+elm_map_overlay_line_add(Evas_Object *obj, double flon, double flat, double tlon, double tlat)
+{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+
+   Elm_Map_Overlay *overlay = ELM_NEW(Elm_Map_Overlay);
+   overlay->wd = wd;
+   overlay->type = ELM_MAP_OVERLAY_TYPE_LINE;
+   overlay->c.r = 0xff;
+   overlay->c.g = 0x00;
+   overlay->c.b = 0x00;
+   overlay->c.a = 0xff;
+   overlay->ovl =  _overlay_line_new(wd, flon, flat, tlon, tlat, overlay->c);
+   overlay->grp = _overlay_group_new(wd);
+   wd->overlays = eina_list_append(wd->overlays, overlay);
+
+   evas_object_smart_changed(wd->pan_smart);
+   return overlay;
+#else
+   (void) obj;
+   (void) flon;
+   (void) flat
+   (void) tlon;
+   (void) tlat;
+   return NULL;
+#endif
+}
+
+EAPI Elm_Map_Overlay *
+elm_map_overlay_polygon_add(Evas_Object *obj)
+{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+
+   Elm_Map_Overlay *overlay = ELM_NEW(Elm_Map_Overlay);
+   overlay->wd = wd;
+   overlay->type = ELM_MAP_OVERLAY_TYPE_POLYGON;
+   overlay->c.r = 0xdc;
+   overlay->c.g = 0x14;
+   overlay->c.b = 0x3c;
+   overlay->c.a = 200;
+   overlay->ovl =  _overlay_polygon_new(wd, overlay->c);
+   overlay->grp = _overlay_group_new(wd);
+   wd->overlays = eina_list_append(wd->overlays, overlay);
+   evas_object_smart_changed(wd->pan_smart);
+   return overlay;
+#else
+   (void) obj;
+    return NULL;
+#endif
+}
+
+EAPI void
+elm_map_overlay_polygon_region_add(Elm_Map_Overlay *overlay, double lon, double lat)
+{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
+   EINA_SAFETY_ON_NULL_RETURN(overlay);
+   ELM_CHECK_WIDTYPE(overlay->wd->obj, widtype);
+   EINA_SAFETY_ON_FALSE_RETURN(overlay->type == ELM_MAP_OVERLAY_TYPE_POLYGON);
+
+   Overlay_Polygon *ovl = overlay->ovl;
+   Region *r = ELM_NEW(Region);
+   r->lon = lon;
+   r->lat = lat;
+   ovl->regions = eina_list_append(ovl->regions, r);
+
+   evas_object_smart_changed(ovl->wd->pan_smart);
+#else
+   (void) overlay;
+   (void) lon;
+   (void) lat
+ #endif
+}
+
+EAPI Elm_Map_Overlay *
+elm_map_overlay_circle_add(Evas_Object *obj, double lon, double lat, double radius)
+{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+
+   Elm_Map_Overlay *overlay = ELM_NEW(Elm_Map_Overlay);
+   overlay->wd = wd;
+   overlay->type = ELM_MAP_OVERLAY_TYPE_CIRCLE;
+   overlay->c.r = 0xdc;
+   overlay->c.g = 0x14;
+   overlay->c.b = 0x3c;
+   overlay->c.a = 200;
+   overlay->ovl = _overlay_circle_new(wd, lon, lat, radius, overlay->c);
+   overlay->grp = _overlay_group_new(wd);
+   wd->overlays = eina_list_append(wd->overlays, overlay);
+
+   evas_object_smart_changed(wd->pan_smart);
+   return overlay;
+#else
+   (void) obj;
+    return NULL;
+#endif
+}
+
+EAPI Elm_Map_Overlay *
+elm_map_overlay_scale_add(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL);
+
+   Elm_Map_Overlay *overlay = ELM_NEW(Elm_Map_Overlay);
+   overlay->wd = wd;
+   overlay->type = ELM_MAP_OVERLAY_TYPE_SCALE;
+   overlay->c.r = 0;
+   overlay->c.g = 0;
+   overlay->c.b = 0;
+   overlay->c.a = 255;
+   overlay->ovl = _overlay_scale_new(wd, x, y, overlay->c);
+   overlay->grp = _overlay_group_new(wd);
+   wd->overlays = eina_list_append(wd->overlays, overlay);
+
+   evas_object_smart_changed(wd->pan_smart);
+   return overlay;
+#else
+   (void) obj;
+    return NULL;
+#endif
+}
+
+#ifdef ELM_EMAP
+EAPI Evas_Object *
+elm_map_track_add(Evas_Object *obj, void *emap)
+{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
+   EMap_Route *emapr = emap;
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wd, EINA_FALSE);
+
+   Evas_Object *route = elm_route_add(obj);
+   elm_route_emap_set(route, emapr);
+   wd->track = eina_list_append(wd->track, route);
+
+   return route;
+#else
+   (void) obj;
+   (void) emap;
+   return NULL;
+#endif
+}
+
+EAPI void
+elm_map_track_remove(Evas_Object *obj, Evas_Object *route)
+{
+#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->track = eina_list_remove(wd->track, route);
+   evas_object_del(route);
+#else
+   (void) obj;
+   (void) route;
+#endif
+}
+#else
+EAPI Evas_Object *
+elm_map_track_add(Evas_Object *obj __UNUSED__, void *emap __UNUSED__)
+{
+   return NULL;
+}
+
+EAPI void
+elm_map_track_remove(Evas_Object *obj __UNUSED__, Evas_Object *route __UNUSED__)
+{
+}
+#endif