Remove now unused alphabetical sort functions as they have been superseded.

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

diff --git a/src/terraservermapsource.c b/src/terraservermapsource.c
index 9ec86fe30d481adeb0e4f87a48dc7dbb165e4315..9e6dd70993271183cc8e6c81a5f35121357959a3 100644 (file)
--- a/src/terraservermapsource.c
+++ b/src/terraservermapsource.c
@@ -29,6 +29,7 @@
 
 static gboolean _coord_to_mapcoord ( VikMapSource *self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest );
 static void _mapcoord_to_center_coord ( VikMapSource *self, MapCoord *src, VikCoord *dest );
+static gboolean _is_direct_file_access ( VikMapSource *self );
 
 static gchar *_get_uri( VikMapSourceDefault *self, MapCoord *src );
 static gchar *_get_hostname( VikMapSourceDefault *self );
@@ -122,7 +123,7 @@ static void
 terraserver_map_source_class_init (TerraserverMapSourceClass *klass)
 {
        GObjectClass* object_class = G_OBJECT_CLASS (klass);
-       VikMapSourceClass* granparent_class = VIK_MAP_SOURCE_CLASS (klass);
+       VikMapSourceClass* grandparent_class = VIK_MAP_SOURCE_CLASS (klass);
        VikMapSourceDefaultClass* parent_class = VIK_MAP_SOURCE_DEFAULT_CLASS (klass);
     GParamSpec *pspec = NULL;
        
@@ -130,8 +131,9 @@ terraserver_map_source_class_init (TerraserverMapSourceClass *klass)
     object_class->get_property = terraserver_map_source_get_property;
        
        /* Overiding methods */
-       granparent_class->coord_to_mapcoord =        _coord_to_mapcoord;
-       granparent_class->mapcoord_to_center_coord = _mapcoord_to_center_coord;
+       grandparent_class->coord_to_mapcoord =        _coord_to_mapcoord;
+       grandparent_class->mapcoord_to_center_coord = _mapcoord_to_center_coord;
+       grandparent_class->is_direct_file_access = _is_direct_file_access;
        
        parent_class->get_uri = _get_uri;
        parent_class->get_hostname = _get_hostname;
@@ -206,6 +208,12 @@ _coord_to_mapcoord ( VikMapSource *self, const VikCoord *src, gdouble xmpp, gdou
        return TRUE;
 }
 
+static gboolean
+_is_direct_file_access ( VikMapSource *self )
+{
+       return FALSE;
+}
+
 static void
 _mapcoord_to_center_coord ( VikMapSource *self, MapCoord *src, VikCoord *dest )
 {
@@ -248,5 +256,24 @@ _get_download_options( VikMapSourceDefault *self )
 TerraserverMapSource *
 terraserver_map_source_new_with_id (guint8 id, const char *label, int type)
 {
-       return g_object_new(TERRASERVER_TYPE_MAP_SOURCE, "id", id, "label", label, "type", type, NULL);
+       char *copyright = NULL;
+       switch (type)
+       {
+       case 1:
+               copyright = "© DigitalGlobe";
+               break;
+       case 2:
+               copyright = "© LandVoyage";
+               break;
+       case 4:
+               copyright = "© DigitalGlobe";
+               break;
+       default:
+               g_critical("Houston, we've had a problem. type=%d", type);
+       }
+
+       return g_object_new(TERRASERVER_TYPE_MAP_SOURCE,
+                           "id", id, "label", label, "type", type,
+                           "copyright", copyright,
+                           NULL);
 }