Improve grammar/usage for conversion macro function to convert meters into feet....

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

diff --git a/src/terraservermapsource.c b/src/terraservermapsource.c
index 889301c6d04e1bf511b39f505c457825f66511cb..49fa883aa06113951ba851c2e770757195fce2a4 100644 (file)
--- a/src/terraservermapsource.c
+++ b/src/terraservermapsource.c
@@ -34,7 +34,7 @@ static void * _download_handle_init ( VikMapSource *self );
 static void _download_handle_cleanup ( VikMapSource *self, void *handle );
 
 /* FIXME Huge gruik */
-static DownloadOptions terraserver_options = { NULL, 0, a_check_map_file };
+static DownloadOptions terraserver_options = { 0, NULL, 0, a_check_map_file };
 
 typedef struct _TerraserverMapSourcePrivate TerraserverMapSourcePrivate;
 struct _TerraserverMapSourcePrivate
@@ -52,7 +52,7 @@ enum
   PROP_TYPE,
 };
 
-G_DEFINE_TYPE_EXTENDED (TerraserverMapSource, terraserver_map_source, VIK_TYPE_MAP_SOURCE_DEFAULT, (GTypeFlags)0,);
+G_DEFINE_TYPE (TerraserverMapSource, terraserver_map_source, VIK_TYPE_MAP_SOURCE_DEFAULT);
 
 static void
 terraserver_map_source_init (TerraserverMapSource *self)
@@ -148,7 +148,7 @@ terraserver_map_source_class_init (TerraserverMapSourceClass *klass)
        object_class->finalize = terraserver_map_source_finalize;
 }
 
-#define TERRASERVER_SITE "terraserver-usa.com"
+#define TERRASERVER_SITE "msrmaps.com"
 #define MARGIN_OF_ERROR 0.001
 
 static int mpp_to_scale ( gdouble mpp, guint8 type )
@@ -187,7 +187,8 @@ _coord_to_mapcoord ( VikMapSource *self, const VikCoord *src, gdouble xmpp, gdou
        
        TerraserverMapSourcePrivate *priv = TERRASERVER_MAP_SOURCE_PRIVATE(self);
        int type = priv->type;
-       g_assert ( src->mode == VIK_COORD_UTM );
+       if ( src->mode != VIK_COORD_UTM )
+               return FALSE;
 
        if ( xmpp != ympp )
                return FALSE;