[libchamplain] Add ChamplainBoundingBox, remove unused functions
- From: Pierre-Luc Beaudoin <plbeaudoin src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libchamplain] Add ChamplainBoundingBox, remove unused functions
- Date: Sun, 24 Jan 2010 20:10:45 +0000 (UTC)
commit 89583e2718660bb905cc83333c6767acd5119096
Author: Simon Wenner <simon wenner ch>
Date: Wed Jul 15 23:24:15 2009 +0200
Add ChamplainBoundingBox, remove unused functions
champlain/champlain-map-data-source.c | 69 ++++++++-------------------------
champlain/champlain-map-data-source.h | 13 ++++--
2 files changed, 25 insertions(+), 57 deletions(-)
---
diff --git a/champlain/champlain-map-data-source.c b/champlain/champlain-map-data-source.c
index 709bff8..d309013 100644
--- a/champlain/champlain-map-data-source.c
+++ b/champlain/champlain-map-data-source.c
@@ -35,10 +35,7 @@ enum
enum
{
PROP_0,
- PROP_ID,
- PROP_NAME,
- PROP_LICENSE,
- PROP_LICENSE_URI
+ PROP_BOUNDING_BOX
};
static guint signals[LAST_SIGNAL] = { 0, };
@@ -46,10 +43,8 @@ static guint signals[LAST_SIGNAL] = { 0, };
typedef struct _ChamplainMapDataSourcePrivate ChamplainMapDataSourcePrivate;
struct _ChamplainMapDataSourcePrivate {
- const char *id;
- const char *name;
- const char *license;
- const char *license_uri;
+ ChamplainBoundingBox *bounding_box;
+ /* the area that is covered by this source */
};
static void
@@ -89,6 +84,11 @@ champlain_map_data_source_dispose (GObject *object)
static void
champlain_map_data_source_finalize (GObject *object)
{
+ ChamplainMapDataSource *self = CHAMPLAIN_MAP_DATA_SOURCE (object);
+ ChamplainMapDataSourcePrivate *priv = GET_PRIVATE (self);
+
+ g_free (priv->bounding_box);
+
G_OBJECT_CLASS (champlain_map_data_source_parent_class)->finalize (object);
}
@@ -113,7 +113,7 @@ champlain_map_data_source_class_init (ChamplainMapDataSourceClass *klass)
klass->get_map_data = champlain_map_data_source_real_get_map_data;
/**
- * ChamplainView::map-data-changed:
+ * ChamplainMapDataSource::map-data-changed:
* @map_data_source: the #ChamplainMapDataSource that received the signal
*
* The ::map-data-changed signal is emitted when the map data was
@@ -131,60 +131,25 @@ champlain_map_data_source_class_init (ChamplainMapDataSourceClass *klass)
static void
champlain_map_data_source_init (ChamplainMapDataSource *self)
{
- ChamplainMapDataSourcePrivate *priv = GET_PRIVATE(self);
+ ChamplainMapDataSourcePrivate *priv = GET_PRIVATE (self);
- priv->id = NULL;
- priv->name = NULL;
- priv->license = NULL;
- priv->license_uri = NULL;
+ priv->bounding_box = g_new (ChamplainBoundingBox, 1);
+ priv->bounding_box->left = 0.0;
+ priv->bounding_box->bottom = 0.0;
+ priv->bounding_box->right = 0.0;
+ priv->bounding_box->top = 0.0;
}
-ChamplainMapDataSource*
+ChamplainMapDataSource *
champlain_map_data_source_new (void)
{
return g_object_new (CHAMPLAIN_TYPE_MAP_DATA_SOURCE, NULL);
}
-MemphisMap*
+MemphisMap *
champlain_map_data_source_get_map_data (ChamplainMapDataSource *self)
{
g_return_val_if_fail (CHAMPLAIN_IS_MAP_DATA_SOURCE (self), NULL);
return CHAMPLAIN_MAP_DATA_SOURCE_GET_CLASS (self)->get_map_data (self);
}
-
-const gchar*
-champlain_map_data_source_get_id (ChamplainMapDataSource *self)
-{
- g_return_val_if_fail (CHAMPLAIN_IS_MAP_DATA_SOURCE (self), NULL);
-
- ChamplainMapDataSourcePrivate *priv = GET_PRIVATE(self);
- return priv->id;
-}
-
-const gchar*
-champlain_map_data_source_get_name (ChamplainMapDataSource *self)
-{
- g_return_val_if_fail (CHAMPLAIN_IS_MAP_DATA_SOURCE (self), NULL);
-
- ChamplainMapDataSourcePrivate *priv = GET_PRIVATE(self);
- return priv->name;
-}
-
-const gchar*
-champlain_map_data_source_get_license (ChamplainMapDataSource *self)
-{
- g_return_val_if_fail (CHAMPLAIN_IS_MAP_DATA_SOURCE (self), NULL);
-
- ChamplainMapDataSourcePrivate *priv = GET_PRIVATE(self);
- return priv->license;
-}
-
-const gchar*
-champlain_map_data_source_get_license_uri (ChamplainMapDataSource *self)
-{
- g_return_val_if_fail (CHAMPLAIN_IS_MAP_DATA_SOURCE (self), NULL);
-
- ChamplainMapDataSourcePrivate *priv = GET_PRIVATE(self);
- return priv->license_uri;
-}
diff --git a/champlain/champlain-map-data-source.h b/champlain/champlain-map-data-source.h
index b5f3e4c..cfb8d16 100644
--- a/champlain/champlain-map-data-source.h
+++ b/champlain/champlain-map-data-source.h
@@ -45,6 +45,14 @@ typedef struct {
GObject parent;
} ChamplainMapDataSource;
+// TODO: Maybe it should be an object
+typedef struct {
+ gdouble left;
+ gdouble bottom;
+ gdouble right;
+ gdouble top;
+} ChamplainBoundingBox;
+
typedef struct {
GObjectClass parent_class;
MemphisMap* (*get_map_data) (ChamplainMapDataSource *data_source);
@@ -56,11 +64,6 @@ ChamplainMapDataSource * champlain_map_data_source_new (void);
MemphisMap * champlain_map_data_source_get_map_data (ChamplainMapDataSource *data_source);
-const gchar * champlain_map_data_source_get_id (ChamplainMapDataSource *data_source);
-const gchar * champlain_map_data_source_get_name (ChamplainMapDataSource *data_source);
-const gchar * champlain_map_data_source_get_license (ChamplainMapDataSource *data_source);
-const gchar * champlain_map_data_source_get_license_uri (ChamplainMapDataSource *data_source);
-
G_END_DECLS
#endif /* _CHAMPLAIN_MAP_DATA_SOURCE */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]