Fix crash if a route requested by the route finder is empty.

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

diff --git a/src/vikutils.c b/src/vikutils.c
index ab3dd4548a52ec7042b42b9d76ee131dd841caa9..ac5ec59057a174c920f3e3f316a6901b73ad8f4c 100644 (file)
--- a/src/vikutils.c
+++ b/src/vikutils.c
@@ -371,7 +371,7 @@ static gboolean new_version_available_message ( new_version_thread_data *nvtd )
 static void latest_version_thread ( GtkWindow *window )
 {
        // Need to allow a few redirects, as SF file is often served from different server
-       DownloadMapOptions options = { FALSE, FALSE, NULL, 5, NULL, NULL, NULL };
+       DownloadFileOptions options = { FALSE, FALSE, NULL, 5, NULL, NULL, NULL };
        gchar *filename = a_download_uri_to_tmp_file ( "http://sourceforge.net/projects/viking/files/VERSION", &options );
        //gchar *filename = g_strdup ( "VERSION" );
        if ( !filename ) {
@@ -681,9 +681,14 @@ static gchar* time_string_adjusted ( time_t *time, gint offset_s )
 static gchar* time_string_tz ( time_t *time, const gchar *format, GTimeZone *tz )
 {
        GDateTime *utc = g_date_time_new_from_unix_utc (*time);
+       if ( !utc ) {
+               g_warning ( "%s: result from g_date_time_new_from_unix_utc() is NULL", __FUNCTION__ );
+               return NULL;
+       }
        GDateTime *local = g_date_time_to_timezone ( utc, tz );
        if ( !local ) {
                g_date_time_unref ( utc );
+               g_warning ( "%s: result from g_date_time_to_timezone() is NULL", __FUNCTION__ );
                return NULL;
        }
        gchar *str = g_date_time_format ( local, format );
@@ -870,3 +875,55 @@ void vu_copy_label_menu ( GtkWidget *widget, guint button )
        gtk_widget_show ( item );
        gtk_menu_popup ( GTK_MENU(menu), NULL, NULL, NULL, NULL, button, gtk_get_current_event_time() );
 }
+
+/**
+ * Work out the best zoom level for the LatLon area and set the viewport to that zoom level
+ */
+void vu_zoom_to_show_latlons ( VikCoordMode mode, VikViewport *vvp, struct LatLon maxmin[2] )
+{
+       /* First set the center [in case previously viewing from elsewhere] */
+       /* Then loop through zoom levels until provided positions are in view */
+       /* This method is not particularly fast - but should work well enough */
+       struct LatLon average = { (maxmin[0].lat+maxmin[1].lat)/2, (maxmin[0].lon+maxmin[1].lon)/2 };
+       VikCoord coord;
+       vik_coord_load_from_latlon ( &coord, mode, &average );
+       vik_viewport_set_center_coord ( vvp, &coord, TRUE );
+
+       /* Convert into definite 'smallest' and 'largest' positions */
+       struct LatLon minmin;
+       if ( maxmin[0].lat < maxmin[1].lat )
+               minmin.lat = maxmin[0].lat;
+       else
+               minmin.lat = maxmin[1].lat;
+
+       struct LatLon maxmax;
+       if ( maxmin[0].lon > maxmin[1].lon )
+               maxmax.lon = maxmin[0].lon;
+       else
+               maxmax.lon = maxmin[1].lon;
+
+       /* Never zoom in too far - generally not that useful, as too close ! */
+       /* Always recalculate the 'best' zoom level */
+       gdouble zoom = 1.0;
+       vik_viewport_set_zoom ( vvp, zoom );
+
+       gdouble min_lat, max_lat, min_lon, max_lon;
+       /* Should only be a maximum of about 18 iterations from min to max zoom levels */
+       while ( zoom <= VIK_VIEWPORT_MAX_ZOOM ) {
+               vik_viewport_get_min_max_lat_lon ( vvp, &min_lat, &max_lat, &min_lon, &max_lon );
+               /* NB I think the logic used in this test to determine if the bounds is within view
+                  fails if track goes across 180 degrees longitude.
+                  Hopefully that situation is not too common...
+                  Mind you viking doesn't really do edge locations to well anyway */
+               if ( min_lat < minmin.lat &&
+                    max_lat > minmin.lat &&
+                    min_lon < maxmax.lon &&
+                    max_lon > maxmax.lon )
+                       /* Found within zoom level */
+                       break;
+
+               /* Try next */
+               zoom = zoom * 2;
+               vik_viewport_set_zoom ( vvp, zoom );
+       }
+}