summaryrefslogtreecommitdiffstats
path: root/friendfinder/draw_user.c
diff options
context:
space:
mode:
authorPatrick Hornecker2010-01-11 16:55:11 +0100
committerPatrick Hornecker2010-01-11 16:55:11 +0100
commitd4ee5bf46d1df6d68be178a1258df2020cb15aef (patch)
tree64618feff288e5e1c7f237c70584e17ee1ef69d6 /friendfinder/draw_user.c
parentfew bugs removed (diff)
downloadfriendfinder-d4ee5bf46d1df6d68be178a1258df2020cb15aef.tar.gz
friendfinder-d4ee5bf46d1df6d68be178a1258df2020cb15aef.tar.xz
friendfinder-d4ee5bf46d1df6d68be178a1258df2020cb15aef.zip
bug fixes
Diffstat (limited to 'friendfinder/draw_user.c')
-rw-r--r--friendfinder/draw_user.c48
1 files changed, 39 insertions, 9 deletions
diff --git a/friendfinder/draw_user.c b/friendfinder/draw_user.c
index bf08f61..32f1baf 100644
--- a/friendfinder/draw_user.c
+++ b/friendfinder/draw_user.c
@@ -10,7 +10,7 @@
int _h= 600;
int _w = 450;
-int _distance = 250;
+int _distance = 1000;
int active_map = 0;
double own_lat, own_lon;
@@ -40,29 +40,59 @@ void set_dist(int distance)
void draw_user(struct position *pos)
{
- int *e = NULL, *n = NULL, *own_e = NULL, *own_n = NULL;
+ //int *e = NULL, *n = NULL, *own_e = NULL, *own_n = NULL;
+/* int *e = (int*) malloc(sizeof(int));
+ int *n = (int*) malloc(sizeof(int));
+ int *own_e = (int*) malloc(sizeof(int));
+ int *own_n = (int*) malloc(sizeof(int));*/
+
+ int e = NULL;
+ int n = NULL;
+ int own_e = NULL;
+ int own_n = NULL;
double old_lat, old_lon, sender_lat, sender_lon;
sender_lat = atof(pos->lat);
sender_lon = atof(pos->lon);
- if (active_map == 1 && test_distance(sender_lat, sender_lon, e, n, own_lat, own_lon, own_e, own_n) == 1)
+ if (sender_lat > 0 && sender_lon > 0)
{
- e_smart_map_overlay_set_bubble(map, "routing", pos->nick, pos->nick, sender_lat, sender_lon, 0xffffffff);
+ printf("sender_lat %f \n", sender_lat);
+ printf("sender_lon %f \n", sender_lon);
+ printf("sender_nick %s \n", pos->nick);
+
+ if (active_map == 1 && test_distance(sender_lat, sender_lon, e, n, own_lat, own_lon, own_e, own_n) == 1)
+ {
+ e_smart_map_overlay_set_bubble(map, "routing", pos->nick, pos->nick, sender_lat, sender_lon, 0xffffffff);
+ }
}
-
}
int test_distance(double lat, double lon, int e, int n, double own_lat, double own_lon, int own_e, int own_n)
{
- project_latlon(lat, lon, &e, &n, PROJECTION_UTM);
+ project_latlon(lat, lon, &e, &n, PROJECTION_MERC);
project_latlon(own_lat, own_lon, &own_e, &own_n, PROJECTION_UTM);
-
+ printf("e %i \n", e);
+ printf("own_e %i \n", own_e);
+ printf("n %i \n", n);
+ printf("own_n %i \n", own_n);
+
if (e != NULL && n !=NULL && own_n != NULL && own_e != NULL)
{
- double x = sqrt(((e - own_e)*(e - own_e) + (n - own_n)*(n - own_n)));
-
+ double x = sqrt(((e - own_e) * (e - own_e)) + ((n - own_n) * (n - own_n)));
+/*
+ printf("e %f \n", e);
+ printf("own_e %f \n", own_e);
+ printf("n %f \n", n);
+ printf("own_n %f \n", own_n);
+ printf("e - own_e %f \n", e - own_e);
+ printf("n - own_n %f \n", n - own_n);
+ printf("(e - own_e) * (e - own_e) %f \n", (e - own_e) * (e - own_e));
+ printf("(n - own_n) * (n - own_n) %f \n", (n - own_n) * (n - own_n));
+ printf("((e - own_e) * (e - own_e)) + ((n - own_n) * (n - own_n)) %f \n", ((e - own_e) * (e - own_e)) + ((n - own_n) * (n - own_n))); */
+ printf("sqrt(((e - own_e) * (e - own_e)) + ((n - own_n) * (n - own_n))) %f \n", sqrt(((e - own_e) * (e - own_e)) + ((n - own_n) * (n - own_n))));
+ printf("e - own_e %i || n - own_n %i \n", (e - own_e), (n - own_n));
printf("x: %f distance: %i \n", x, _distance);
if (x <= _distance)