X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/50a14534a51f892500ee82f867e8ab2f85b936ae..b870a51291519a44976d85d47471abaf791028ec:/src/vikcoord.h?ds=inline diff --git a/src/vikcoord.h b/src/vikcoord.h index 735a3678..ff788740 100644 --- a/src/vikcoord.h +++ b/src/vikcoord.h @@ -22,6 +22,8 @@ #ifndef _VIKING_VIKCOORD_H #define _VIKING_VIKCOORD_H +#include "coords.h" + typedef gshort VikCoordMode; #define VIK_COORD_UTM 0 #define VIK_COORD_LATLON 1 @@ -40,9 +42,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 */ -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); @@ -55,6 +54,8 @@ void vik_coord_to_utm ( const VikCoord *coord, struct UTM *dest ); 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!!! */ #endif