Fix conflicts: Map, Hover, Hoversel, Menu, Web

[framework/uifw/elementary.git] / src / lib / elm_map.h

diff --git a/src/lib/elm_map.h b/src/lib/elm_map.h
index 26992d2..b56c2d8 100644 (file)
--- a/src/lib/elm_map.h
+++ b/src/lib/elm_map.h
@@ -185,15 +185,6 @@ typedef void                       (*Elm_Map_Overlay_Get_Cb)(void *data, Evas_Ob
 typedef void                       (*Elm_Map_Name_Cb)(void *data, Evas_Object *map, const Elm_Map_Name *name);                /**< Async-callback function for the name request. */
 typedef void                       (*Elm_Map_Route_Cb)(void *data, Evas_Object *map, const Elm_Map_Route *route);             /**< Async-callback function for the route request. */
 
-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)(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 char                      *(*Elm_Map_Module_Route_Url_Func)(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)(Evas_Object *obj, int method, const char *name, double lon, double lat);
-
 /**
  * Add a new map widget to the given parent Elementary (container) object.
  *
@@ -394,7 +385,7 @@ EAPI void                  elm_map_region_bring_in(Evas_Object *obj, double lon,
 EAPI void                  elm_map_region_show(Evas_Object *obj, double lon, double lat);
 
 /**
- * Convert canvas coordinates into a geographic coordinate
+ * Convert canvas coordinates into geographic coordinates
  * (longitude, latitude).
  *
  * @param obj The map object.
@@ -406,13 +397,32 @@ EAPI void                  elm_map_region_show(Evas_Object *obj, double lon, dou
  * This gets longitude and latitude from canvas x, y coordinates. The canvas
  * coordinates mean x, y coordinate from current viewport.
  *
- * see elm_map_rotate_get()
+ * see elm_map_region_to_canvas_convert()
  *
  * @ingroup Map
  */
 EAPI void                  elm_map_canvas_to_region_convert(const Evas_Object *obj, const Evas_Coord x, const Evas_Coord y, double *lon, double *lat);
 
 /**
+ * Convert geographic coordinates (longitude, latitude)
+ * into canvas coordinates.
+ *
+ * @param obj The map object.
+ * @param lon The longitude to convert.
+ * @param lat The latitude to convert.
+ * @param x   A pointer to horizontal coordinate.
+ * @param y   A pointer to vertical coordinate.
+ *
+ * This gets canvas x, y coordinates from longitude and latitude. The canvas
+ * coordinates mean x, y coordinate from current viewport.
+ *
+ * see elm_map_canvas_to_region_convert()
+ *
+ * @ingroup Map
+ */
+EAPI void                  elm_map_region_to_canvas_convert(const Evas_Object *obj, double lon, double lat, Evas_Coord *x, Evas_Coord *y);
+
+/**
  * Pause or unpause the map.
  *
  * @param obj The map object.
@@ -992,7 +1002,6 @@ EAPI void                  elm_map_overlay_class_remove(Elm_Map_Overlay *clas, E
  *
  * @ingroup Map
  */
-EAPI
 EAPI void                  elm_map_overlay_class_zoom_max_set(Elm_Map_Overlay *clas, int zoom);
 
 /**
@@ -1015,7 +1024,7 @@ EAPI int                   elm_map_overlay_class_zoom_max_get(const Elm_Map_Over
  * @param obj The map object to add a new overlay.
  * @return The created overlay or @c NULL upon failure.
  *
- * A bubble will not be displayed before geogrphic coordinates are set or
+ * A bubble will not be displayed before geographic coordinates are set or
  * any other overlays are followed.
  *
  * This overlay has a bubble style layout and icon or content can not
@@ -1365,3 +1374,4 @@ EAPI Evas_Object          *elm_map_track_add(Evas_Object *obj, void *emap);
  * @ingroup Map
  */
 EAPI void                  elm_map_track_remove(Evas_Object *obj, Evas_Object *route);
+