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 7fb9472d21c9eca5229d1765894fe7af3c5e2ef5..49fa883aa06113951ba851c2e770757195fce2a4 100644 (file)
--- a/src/terraservermapsource.c
+++ b/src/terraservermapsource.c
@@ -52,7 +52,7 @@ enum
   PROP_TYPE,
 };
 
   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)
 
 static void
 terraserver_map_source_init (TerraserverMapSource *self)


@@ -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;
        
        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;
 
        if ( xmpp != ympp )
                return FALSE;