Merge branch 'MBTilesRead'

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

diff --git a/src/util.c b/src/util.c
index 2bff7fa269596cae2c79820ea1f0fbbdba222053..ee84287041970b7d5367843eec9f1d2cfb68e5e7 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -17,6 +17,10 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
+ /*
+  * Ideally dependencies should just be on Glib, Gtk,
+  * see vikutils for things that further depend on other Viking types
+  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -27,8 +31,6 @@
 
 #include "util.h"
 #include "dialog.h"
-#include "globals.h"
-#include "download.h"
 
 /*
 #ifdef WINDOWS
@@ -160,108 +162,3 @@ gboolean split_string_from_file_on_equals ( const gchar *buf, gchar **key, gchar
 
   return TRUE;
 }
-
-/* 1 << (x) is like a 2**(x) */
-#define GZ(x) (1<<(x))
-
-static const gdouble scale_mpps[] = { 0.125, 0.25, 0.5, GZ(0), GZ(1), GZ(2), GZ(3), GZ(4), GZ(5), GZ(6), GZ(7), GZ(8), GZ(9),
-                                      GZ(10), GZ(11), GZ(12), GZ(13), GZ(14), GZ(15), GZ(16), GZ(17) };
-
-static const gint num_scales = (sizeof(scale_mpps) / sizeof(scale_mpps[0]));
-
-#define ERROR_MARGIN 0.01
-/**
- * mpp_to_zoom:
- *
- * Returns: a zoom level. see : http://wiki.openstreetmap.org/wiki/Zoom_levels
- */
-guint8 mpp_to_zoom ( gdouble mpp )
-{
-  gint i;
-  for ( i = 0; i < num_scales; i++ ) {
-    if ( ABS(scale_mpps[i] - mpp) < ERROR_MARGIN ) {
-      g_debug ( "mpp_to_zoom: %f -> %d", mpp, i );
-      return 20-i;
-    }
-  }
-  return 17; // a safe zoomed in default
-}
-
-typedef struct {
-  GtkWindow *window; // Layer needed for redrawing
-  gchar *version;     // Image list
-} new_version_thread_data;
-
-static gboolean new_version_available_message ( new_version_thread_data *nvtd )
-{
-  // Only a simple goto website option is offered
-  // Trying to do an installation update is platform specific
-  if ( a_dialog_yes_or_no ( nvtd->window,
-                            _("There is a newer version of Viking available: %s\n\nDo you wish to go to Viking's website now?"), nvtd->version ) )
-    // NB 'VIKING_URL' redirects to the Wiki, here we want to go the main site.
-    open_url ( nvtd->window, "http://sourceforge.net/projects/viking/" );
-  //else
-  //  increase amount of time between performing version checks
-  g_free ( nvtd->version );
-  g_free ( nvtd );
-  return FALSE;
-}
-
-static void latest_version_thread ( GtkWindow *window )
-{
-  // Need to allow a few of redirects, as SF file is often served from different server
-  DownloadMapOptions options = { FALSE, FALSE, NULL, 5, 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 ) {
-    return;
-  }
-
-  GMappedFile *mf = g_mapped_file_new ( filename, FALSE, NULL );
-  if ( !mf )
-    return;
-
-  gchar *text = g_mapped_file_get_contents ( mf );
-
-  gint latest_version = viking_version_to_number ( text );
-  gint my_version = viking_version_to_number ( VIKING_VERSION );
-
-  g_debug ( "The lastest version is: %s", text );
-
-  if ( my_version < latest_version ) {
-    new_version_thread_data *nvtd = g_malloc ( sizeof(new_version_thread_data) );
-    nvtd->window = window;
-    nvtd->version = g_strdup ( text );
-    gdk_threads_add_idle ( (GSourceFunc) new_version_available_message, nvtd );
-  }
-  else
-    g_debug ( "Running the lastest version: %s", VIKING_VERSION );
-
-  g_mapped_file_unref ( mf );
-  if ( filename ) {
-    g_remove ( filename );
-    g_free ( filename );
-  }
-}
-
-/*
- * check_latest_version:
- * @window: Somewhere where we may need use the display to inform the user about the version status
- *
- * Periodically checks the released latest VERSION file on the website to compare with the running version
- *
- * ATM the plan is for a 1.4.2 release to be always on *just* for Windows platforms
- * Then in 1.5.X it will made entirely optional (default on for Windows)
- *  with a longer periodic check (enabled via state saving using the soon to be released 'settings' code)
- *
- */
-void check_latest_version ( GtkWindow *window )
-{
-#ifdef WINDOWS
-#if GLIB_CHECK_VERSION (2, 32, 0)
-  g_thread_try_new ( "latest_version_thread", (GThreadFunc)latest_version_thread, window, NULL );
-#else
-  g_thread_create ( (GThreadFunc)latest_version_thread, window, FALSE, NULL );
-#endif
-#endif
-}