X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/7114e87955b0a009e3fcc406dbe97c88e67eaf8a..8f661d805260d5e9540afe6111a86d1e1afc0d90:/src/vikcoord.c?ds=sidebyside diff --git a/src/vikcoord.c b/src/vikcoord.c index a4bbeadd..163b52a6 100644 --- a/src/vikcoord.c +++ b/src/vikcoord.c @@ -152,9 +152,9 @@ void vik_coord_set_area(const VikCoord *coord, const struct LatLon *wh, VikCoord get_north_west(¢er, &dist, &nw); get_south_east(¢er, &dist, &se); - tl->mode = br->mode = VIK_COORD_LATLON; *((struct LatLon *)tl) = nw; *((struct LatLon *)br) = se; + tl->mode = br->mode = VIK_COORD_LATLON; } gboolean vik_coord_inside(const VikCoord *coord, const VikCoord *tl, const VikCoord *br) @@ -165,11 +165,6 @@ gboolean vik_coord_inside(const VikCoord *coord, const VikCoord *tl, const VikCo vik_coord_to_latlon(tl, &tl_ll); vik_coord_to_latlon(br, &br_ll); -#ifdef DEBUG - fprintf(stderr, "DEBUG: %s() ll=%f, %f tl=%f, %f br=%f, %f\n", - __PRETTY_FUNCTION__, ll.lat, ll.lon, tl_ll.lat, tl_ll.lon, br_ll.lat, br_ll.lon); -#endif - if ((ll.lat > tl_ll.lat) || (ll.lon < tl_ll.lon)) return FALSE; if ((ll.lat < br_ll.lat) || (ll.lon > br_ll.lon))