[QA] Rename and correct some map cache variables usage for better understanding.

[andy/viking.git] / src / vikcoord.h

diff --git a/src/vikcoord.h b/src/vikcoord.h
index a3d0cf5fe1083bfb8a84d12559d421906d22a282..2b5100094e0177a9227c9587cde1de78a84eec22 100644 (file)
--- a/src/vikcoord.h
+++ b/src/vikcoord.h
@@ -24,6 +24,8 @@
 
 #include "coords.h"
 
 
 #include "coords.h"
 

+G_BEGIN_DECLS
+

 typedef gshort VikCoordMode;
 #define VIK_COORD_UTM 0
 #define VIK_COORD_LATLON 1
 typedef gshort VikCoordMode;
 #define VIK_COORD_UTM 0
 #define VIK_COORD_LATLON 1


@@ -42,9 +44,6 @@ typedef struct {
 /* notice we can cast to either UTM or LatLon */
 /* possible more modes to come? xy? we'll leave that as an option */
 
 /* notice we can cast to either UTM or LatLon */
 /* possible more modes to come? xy? we'll leave that as an option */
 

-VikCoord *vik_coord_new();
-void vik_coord_free(VikCoord *coord);
-

 void vik_coord_convert(VikCoord *coord, VikCoordMode dest_mode);
 void vik_coord_copy_convert(const VikCoord *coord, VikCoordMode dest_mode, VikCoord *dest);
 gdouble vik_coord_diff(const VikCoord *c1, const VikCoord *c2);
 void vik_coord_convert(VikCoord *coord, VikCoordMode dest_mode);
 void vik_coord_copy_convert(const VikCoord *coord, VikCoordMode dest_mode, VikCoord *dest);
 gdouble vik_coord_diff(const VikCoord *c1, const VikCoord *c2);


@@ -57,6 +56,10 @@ void vik_coord_to_utm ( const VikCoord *coord, struct UTM *dest );
 
 gboolean vik_coord_equals ( const VikCoord *coord1, const VikCoord *coord2 );
 
 
 gboolean vik_coord_equals ( const VikCoord *coord1, const VikCoord *coord2 );
 

+void vik_coord_set_area(const VikCoord *coord, const struct LatLon *wh, VikCoord *tl, VikCoord *br);
+gboolean vik_coord_inside(const VikCoord *coord, const VikCoord *tl, const VikCoord *br);

 /* all coord operations MUST BE ABSTRACTED!!! */
 
 /* all coord operations MUST BE ABSTRACTED!!! */
 

+G_END_DECLS
+

 #endif
 #endif