MapWidget: Some more properties, free mutex and condition variables on free.

[mapper] / libs / libgtkmap / map-widget-test.c

diff --git a/libs/libgtkmap/map-widget-test.c b/libs/libgtkmap/map-widget-test.c
index 08c6f088709884362fdf2ba7e744be4f4083f9e7..2ff104203206e7a6000df7433c11c019ecbb30a1 100644 (file)
--- a/libs/libgtkmap/map-widget-test.c
+++ b/libs/libgtkmap/map-widget-test.c
@@ -2,11 +2,13 @@
 #include <gtk/gtk.h>
 
 #include "gtkmap.h"
-#include "map-tile-repo.h"
+#include "tilerepo.h"
 
-#define TESTREPO "/home/milang/MyDocs/.documents/Maps/OpenStreet"
+#define TESTREPO "/home/milang/Maps/OpenStreet"
 
 GtkWidget *map;
+Path *track;
+Path *route;
 
 static gboolean
 map_zoom(GtkWidget *widget, gpointer data)
@@ -65,7 +67,9 @@ main (int argc, char **args)
 GtkWidget *window, *wvbox;
 GtkWidget *hbox, *zoomer, *btn_left, *btn_right, *btn_up, *btn_down, *vbox;
 GtkWidget *rotate;
-RepoData *rd;
+TileRepo *rd;
+gint t;
+gdouble slat, slon;
 
 g_thread_init(NULL);
 g_type_init();
@@ -79,7 +83,7 @@ gtk_window_resize(GTK_WINDOW(window), 800, 600);
 wvbox=gtk_vbox_new(FALSE, 3);
 gtk_container_add(GTK_CONTAINER(window), wvbox);
 
-rd=map_tile_repo_new();
+rd=tile_repo_new();
 rd->view_zoom_steps=1;
 rd->cache_dir=TESTREPO;
 
@@ -127,6 +131,26 @@ gtk_map_set_center_latlon(map, 60.45, 22.25);
 gtk_range_set_value(GTK_RANGE(zoomer), 8);
 gtk_map_set_zoom(map, 8);
 
+gtk_map_set_path_display(map, TRACKS_MASK | ROUTES_MASK);
+
+track=path_new(PATH_TYPE_TRACK, 0);
+route=path_new(PATH_TYPE_ROUTE, 1);
+
+slon=slat=0.001;
+for (t=1;t<256;t++) {
+    if (g_random_double()<0.1) {
+        slat=g_random_double_range(-0.0009, 0.0009);
+        slon=g_random_double_range(-0.0009, 0.0009);
+    }
+       path_add_latlon(track, 60.450 + slat, 22.241 + slon, t, 1, 1);
+       path_add_latlon(route, 60.555 + slat, 22.140 + slon, t, 1, 1);
+       if (g_random_double()<0.1)
+               path_add_waypoint(route, 60.555 + slat, 22.140 + slon, "WPT");
+}
+
+gtk_map_add_path(map, track, TRUE);
+gtk_map_add_path(map, route, TRUE);
+
 gdk_threads_enter();
 gtk_main();
 gdk_threads_leave();