Make simple GPSBabel filter options use the updated acquire framework options.

[andy/viking.git] / src / vikmapniklayer.c

diff --git a/src/vikmapniklayer.c b/src/vikmapniklayer.c
index 652466bdd355114c5b0dbc101b5dfda08400ff2f..dc64985d3bcb726103ffe893de3a78925ad7ca2a 100644 (file)
--- a/src/vikmapniklayer.c
+++ b/src/vikmapniklayer.c
@@ -163,6 +163,8 @@ VikLayerInterface vik_mapnik_layer_interface = {
        (VikLayerFuncDraw)                    mapnik_layer_draw,
        (VikLayerFuncChangeCoordMode)         NULL,
 
+       (VikLayerFuncGetTimestamp)            NULL,
+
        (VikLayerFuncSetMenuItemsSelection)   NULL,
        (VikLayerFuncGetMenuItemsSelection)   NULL,
 
@@ -270,7 +272,7 @@ static GHashTable *requests = NULL;
 /**
  * vik_mapnik_layer_init:
  *
- * Mostly to initialize preferences
+ * Just initialize preferences
  */
 void vik_mapnik_layer_init (void)
 {
@@ -291,7 +293,15 @@ void vik_mapnik_layer_init (void)
 
        tmp.s = "carto";
        a_preferences_register(&prefs[i++], tmp, MAPNIK_PREFS_GROUP_KEY);
+}
 
+/**
+ * vik_mapnik_layer_post_init:
+ *
+ * Initialize data structures - now that reading preferences is OK to perform
+ */
+void vik_mapnik_layer_post_init (void)
+{
        tp_mutex = vik_mutex_new();
 
        // Just storing keys only
@@ -359,7 +369,11 @@ static void mapnik_layer_set_file_xml ( VikMapnikLayer *vml, const gchar *name )
 {
        if ( vml->filename_xml )
                g_free (vml->filename_xml);
-       vml->filename_xml = g_strdup (name);
+       // Mapnik doesn't seem to cope with relative filenames
+       if ( g_strcmp0 (name, "" ) )
+               vml->filename_xml = vu_get_canonical_filename ( VIK_LAYER(vml), name);
+       else
+               vml->filename_xml = g_strdup (name);
 }
 
 static void mapnik_layer_set_file_css ( VikMapnikLayer *vml, const gchar *name )
@@ -726,7 +740,7 @@ void thread_add (VikMapnikLayer *vml, MapCoord *mul, VikCoord *ul, VikCoord *br,
        gchar *basename = g_path_get_basename (name);
        gchar *description = g_strdup_printf ( _("Mapnik Render %d:%d:%d %s"), zoom, x, y, basename );
        g_free ( basename );
-       a_background_thread ( BACKGROUND_POOL_LOCAL,
+       a_background_thread ( BACKGROUND_POOL_LOCAL_MAPNIK,
                              VIK_GTK_WINDOW_FROM_LAYER(vml),
                              description,
                              (vik_thr_func) background,
@@ -815,6 +829,13 @@ static void mapnik_layer_draw ( VikMapnikLayer *vml, VikViewport *vvp )
                return;
        }
 
+       if ( vml->mi ) {
+               gchar *copyright = mapnik_interface_get_copyright ( vml->mi );
+               if ( copyright ) {
+                       vik_viewport_add_copyright ( vvp, copyright );
+               }
+       }
+
        VikCoord ul, br;
        ul.mode = VIK_COORD_LATLON;
        br.mode = VIK_COORD_LATLON;
@@ -950,6 +971,24 @@ static void mapnik_layer_carto ( menu_array_values values )
                mapnik_layer_draw ( vml, vvp );
 }
 
+/**
+ * Show Mapnik configuration parameters
+ */
+static void mapnik_layer_information ( menu_array_values values )
+{
+       VikMapnikLayer *vml = values[MA_VML];
+       if ( !vml->mi )
+               return;
+       GArray *array = mapnik_interface_get_parameters( vml->mi );
+       if ( array->len ) {
+               a_dialog_list (  VIK_GTK_WINDOW_FROM_LAYER(vml), _("Mapnik Information"), array, 1 );
+               // Free the copied strings
+               for ( int i = 0; i < array->len; i++ )
+                       g_free ( g_array_index(array,gchar*,i) );
+       }
+       g_array_free ( array, FALSE );
+}
+
 /**
  *
  */
@@ -996,6 +1035,11 @@ static void mapnik_layer_add_menu_items ( VikMapnikLayer *vml, GtkMenu *menu, gp
                gtk_widget_show ( item );
        }
 
+       item = gtk_image_menu_item_new_from_stock ( GTK_STOCK_INFO, NULL );
+       g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(mapnik_layer_information), values );
+       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+       gtk_widget_show ( item );
+
        item = gtk_image_menu_item_new_from_stock ( GTK_STOCK_ABOUT, NULL );
        g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(mapnik_layer_about), values );
        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
@@ -1020,6 +1064,59 @@ static void mapnik_layer_rerender ( VikMapnikLayer *vml )
        thread_add (vml, &ulm, &vml->rerender_ul, &vml->rerender_br, ulm.x, ulm.y, ulm.z, ulm.scale, vml->filename_xml );
 }
 
+/**
+ * Info
+ */
+static void mapnik_layer_tile_info ( VikMapnikLayer *vml )
+{
+       MapCoord ulm;
+       // Requested position to map coord
+       map_utils_vikcoord_to_iTMS ( &vml->rerender_ul, vml->rerender_zoom, vml->rerender_zoom, &ulm );
+
+       mapcache_extra_t extra = a_mapcache_get_extra ( ulm.x, ulm.y, ulm.z, MAP_ID_MAPNIK_RENDER, ulm.scale, vml->alpha, 0.0, 0.0, vml->filename_xml );
+
+       gchar *filename = get_filename ( vml->file_cache_dir, ulm.x, ulm.y, ulm.scale );
+       gchar *filemsg = NULL;
+       gchar *timemsg = NULL;
+
+       if ( g_file_test ( filename, G_FILE_TEST_EXISTS ) ) {
+               filemsg = g_strconcat ( "Tile File: ", filename, NULL );
+               // Get some timestamp information of the tile
+               struct stat stat_buf;
+               if ( g_stat ( filename, &stat_buf ) == 0 ) {
+                       gchar time_buf[64];
+                       strftime ( time_buf, sizeof(time_buf), "%c", gmtime((const time_t *)&stat_buf.st_mtime) );
+                       timemsg = g_strdup_printf ( _("Tile File Timestamp: %s"), time_buf );
+               }
+               else {
+                       timemsg = g_strdup ( _("Tile File Timestamp: Not Available") );
+               }
+       }
+       else {
+               filemsg = g_strdup_printf ( "Tile File: %s [Not Available]", filename );
+               timemsg = g_strdup("");
+       }
+
+       GArray *array = g_array_new (FALSE, TRUE, sizeof(gchar*));
+       g_array_append_val ( array, filemsg );
+       g_array_append_val ( array, timemsg );
+
+       gchar *rendmsg = NULL;
+       // Show the info
+       if ( extra.duration > 0.0 ) {
+               rendmsg = g_strdup_printf ( _("Rendering time %.2f seconds"), extra.duration );
+               g_array_append_val ( array, rendmsg );
+       }
+
+       a_dialog_list (  VIK_GTK_WINDOW_FROM_LAYER(vml), _("Tile Information"), array, 5 );
+       g_array_free ( array, FALSE );
+
+       g_free ( rendmsg );
+       g_free ( timemsg );
+       g_free ( filemsg );
+       g_free ( filename );
+}
+
 static gboolean mapnik_feature_release ( VikMapnikLayer *vml, GdkEventButton *event, VikViewport *vvp )
 {
        if ( !vml )
@@ -1036,6 +1133,11 @@ static gboolean mapnik_feature_release ( VikMapnikLayer *vml, GdkEventButton *ev
                        gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_MENU) );
                        g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(mapnik_layer_rerender), vml );
                        gtk_menu_shell_append ( GTK_MENU_SHELL(vml->right_click_menu), item );
+
+                       item = gtk_image_menu_item_new_with_mnemonic ( _("_Info") );
+                       gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_INFO, GTK_ICON_SIZE_MENU) );
+                       g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(mapnik_layer_tile_info), vml );
+                       gtk_menu_shell_append ( GTK_MENU_SHELL(vml->right_click_menu), item );
                }
 
                gtk_menu_popup ( GTK_MENU(vml->right_click_menu), NULL, NULL, NULL, NULL, event->button, event->time );