[libchamplain] Add initial implementation of ChamplainNetworkMapDataSource
- From: Pierre-Luc Beaudoin <plbeaudoin src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libchamplain] Add initial implementation of ChamplainNetworkMapDataSource
- Date: Sun, 24 Jan 2010 20:08:39 +0000 (UTC)
commit 11cbe9858470a52550c53fb8565e4399740c1c15
Author: Simon Wenner <simon wenner ch>
Date: Mon Jun 29 12:25:41 2009 +0200
Add initial implementation of ChamplainNetworkMapDataSource
champlain/Makefile.am | 9 +-
champlain/champlain-network-map-data-source.c | 174 +++++++++++++++++++++++++
champlain/champlain-network-map-data-source.h | 73 ++++++++++
champlain/champlain.h | 1 +
4 files changed, 254 insertions(+), 3 deletions(-)
---
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index dfda22c..2c6b118 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -114,15 +114,18 @@ if ENABLE_MEMPHIS
libchamplain_headers += \
champlain-memphis-map-source.h \
champlain-map-data-source.h \
- champlain-local-map-data-source.h
+ champlain-local-map-data-source.h \
+ champlain-network-map-data-source.h
libchamplain_0_3_la_SOURCES += \
champlain-memphis-map-source.c \
champlain-map-data-source.c \
- champlain-local-map-data-source.c
+ champlain-local-map-data-source.c \
+ champlain-network-map-data-source.c
libchamplain_include_HEADERS += \
champlain-memphis-map-source.h \
champlain-map-data-source.h \
- champlain-local-map-data-source.h
+ champlain-local-map-data-source.h \
+ champlain-network-map-data-source.h
libchamplain_0_3_la_LIBADD += ../memphis/libmemphis-1.0.la
AM_CPPFLAGS += -I$(top_srcdir)/memphis -DMEMPHIS_ENABLED
endif
diff --git a/champlain/champlain-network-map-data-source.c b/champlain/champlain-network-map-data-source.c
new file mode 100644
index 0000000..a0cd086
--- /dev/null
+++ b/champlain/champlain-network-map-data-source.c
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2009 Simon Wenner <simon wenner ch>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "champlain-network-map-data-source.h"
+
+#define DEBUG_FLAG CHAMPLAIN_DEBUG_MEMPHIS
+#include "champlain-debug.h"
+
+#include <memphis/memphis.h>
+
+G_DEFINE_TYPE (ChamplainNetworkMapDataSource, champlain_network_map_data_source, CHAMPLAIN_TYPE_MAP_DATA_SOURCE)
+
+#define GET_PRIVATE(o) \
+ (G_TYPE_INSTANCE_GET_PRIVATE ((o), CHAMPLAIN_TYPE_NETWORK_MAP_DATA_SOURCE, ChamplainNetworkMapDataSourcePrivate))
+
+enum
+{
+ PROP_0,
+ PROP_API_URI
+};
+
+typedef struct _ChamplainNetworkMapDataSourcePrivate ChamplainNetworkMapDataSourcePrivate;
+
+struct _ChamplainNetworkMapDataSourcePrivate {
+ MemphisMap *map;
+ gchar *api_uri;
+ gdouble bound_left;
+ gdouble bound_bottom;
+ gdouble bound_right;
+ gdouble bound_top;
+};
+
+static void
+champlain_network_map_data_source_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ switch (property_id) {
+ // TODO
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+champlain_network_map_data_source_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ switch (property_id) {
+ // TODO
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+champlain_network_map_data_source_dispose (GObject *object)
+{
+ ChamplainNetworkMapDataSource *self = (ChamplainNetworkMapDataSource *) object;
+ ChamplainNetworkMapDataSourcePrivate *priv = GET_PRIVATE(self);
+
+ memphis_map_free (priv->map);
+
+ G_OBJECT_CLASS (champlain_network_map_data_source_parent_class)->dispose (object);
+}
+
+static void
+champlain_network_map_data_source_finalize (GObject *object)
+{
+ ChamplainNetworkMapDataSource *self = (ChamplainNetworkMapDataSource *) object;
+ ChamplainNetworkMapDataSourcePrivate *priv = GET_PRIVATE(self);
+
+ g_free (priv->api_uri);
+
+ G_OBJECT_CLASS (champlain_network_map_data_source_parent_class)->finalize (object);
+}
+
+static MemphisMap*
+get_map_data (ChamplainMapDataSource *self)
+{
+ ChamplainNetworkMapDataSourcePrivate *priv = GET_PRIVATE(self);
+
+ return priv->map;
+}
+
+static void
+champlain_network_map_data_source_class_init (ChamplainNetworkMapDataSourceClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ g_type_class_add_private (klass, sizeof (ChamplainNetworkMapDataSourcePrivate));
+
+ object_class->get_property = champlain_network_map_data_source_get_property;
+ object_class->set_property = champlain_network_map_data_source_set_property;
+ object_class->dispose = champlain_network_map_data_source_dispose;
+ object_class->finalize = champlain_network_map_data_source_finalize;
+
+ ChamplainMapDataSourceClass *map_data_source_class = CHAMPLAIN_MAP_DATA_SOURCE_CLASS (klass);
+ map_data_source_class->get_map_data = get_map_data;
+}
+
+static void
+champlain_network_map_data_source_init (ChamplainNetworkMapDataSource *self)
+{
+ ChamplainNetworkMapDataSourcePrivate *priv = GET_PRIVATE(self);
+
+ priv->map = memphis_map_new ();
+ priv->api_uri = g_strdup ("http://www.informationfreeway.org/api/0.6");
+ priv->bound_left = 0.0;
+ priv->bound_bottom = 0.0;
+ priv->bound_right = 0.0;
+ priv->bound_top = 0.0;
+}
+
+ChamplainNetworkMapDataSource*
+champlain_network_map_data_source_new (void)
+{
+ return g_object_new (CHAMPLAIN_TYPE_NETWORK_MAP_DATA_SOURCE, NULL);
+}
+
+void
+champlain_network_map_data_source_load_map_data (
+ ChamplainNetworkMapDataSource *self,
+ gdouble bound_left,
+ gdouble bound_bottom,
+ gdouble bound_right,
+ gdouble bound_top)
+{
+ // TODO
+}
+
+gchar *
+champlain_network_map_data_source_get_api_uri (
+ ChamplainNetworkMapDataSource *self)
+{
+ g_return_val_if_fail (CHAMPLAIN_IS_NETWORK_MAP_DATA_SOURCE (self), NULL);
+
+ ChamplainNetworkMapDataSourcePrivate *priv = GET_PRIVATE(self);
+
+ return priv->api_uri;
+}
+
+void
+champlain_network_map_data_source_set_api_uri (
+ ChamplainNetworkMapDataSource *self,
+ gchar *api_uri)
+{
+ g_return_if_fail (CHAMPLAIN_IS_NETWORK_MAP_DATA_SOURCE (self));
+
+ ChamplainNetworkMapDataSourcePrivate *priv = GET_PRIVATE(self);
+
+ if (api_uri != NULL)
+ g_free (priv->api_uri);
+
+ priv->api_uri = api_uri;
+}
diff --git a/champlain/champlain-network-map-data-source.h b/champlain/champlain-network-map-data-source.h
new file mode 100644
index 0000000..2524233
--- /dev/null
+++ b/champlain/champlain-network-map-data-source.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2009 Simon Wenner <simon wenner ch>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef _CHAMPLAIN_NETWORK_MAP_DATA_SOURCE
+#define _CHAMPLAIN_NETWORK_MAP_DATA_SOURCE
+
+#include <glib-object.h>
+
+#include <champlain/champlain-map-data-source.h>
+
+G_BEGIN_DECLS
+
+#define CHAMPLAIN_TYPE_NETWORK_MAP_DATA_SOURCE champlain_network_map_data_source_get_type()
+
+#define CHAMPLAIN_NETWORK_MAP_DATA_SOURCE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_NETWORK_MAP_DATA_SOURCE, ChamplainNetworkMapDataSource))
+
+#define CHAMPLAIN_NETWORK_MAP_DATA_SOURCE_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_NETWORK_MAP_DATA_SOURCE, ChamplainNetworkMapDataSourceClass))
+
+#define CHAMPLAIN_IS_NETWORK_MAP_DATA_SOURCE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_NETWORK_MAP_DATA_SOURCE))
+
+#define CHAMPLAIN_IS_NETWORK_MAP_DATA_SOURCE_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_NETWORK_MAP_DATA_SOURCE))
+
+#define CHAMPLAIN_NETWORK_MAP_DATA_SOURCE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_NETWORK_MAP_DATA_SOURCE, ChamplainNetworkMapDataSourceClass))
+
+typedef struct {
+ ChamplainMapDataSource parent;
+} ChamplainNetworkMapDataSource;
+
+typedef struct {
+ ChamplainMapDataSourceClass parent_class;
+} ChamplainNetworkMapDataSourceClass;
+
+GType champlain_network_map_data_source_get_type (void);
+
+ChamplainNetworkMapDataSource* champlain_network_map_data_source_new (void);
+
+void champlain_network_map_data_source_load_map_data (
+ ChamplainNetworkMapDataSource *map_data_source,
+ gdouble bound_left,
+ gdouble bound_bottom,
+ gdouble bound_right,
+ gdouble bound_top);
+
+gchar * champlain_network_map_data_source_get_api_uri (
+ ChamplainNetworkMapDataSource *map_data_source);
+
+void champlain_network_map_data_source_set_api_uri (
+ ChamplainNetworkMapDataSource *map_data_source,
+ gchar *api_uri);
+
+G_END_DECLS
+
+#endif /* _CHAMPLAIN_NETWORK_MAP_DATA_SOURCE */
diff --git a/champlain/champlain.h b/champlain/champlain.h
index 87be461..3ba1618 100644
--- a/champlain/champlain.h
+++ b/champlain/champlain.h
@@ -45,6 +45,7 @@
#include "champlain/champlain-memphis-map-source.h"
#include "champlain/champlain-map-data-source.h"
#include "champlain/champlain-local-map-data-source.h"
+#include "champlain/champlain-network-map-data-source.h"
#endif
#undef __CHAMPLAIN_CHAMPLAIN_H_INSIDE__
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]