[libchamplain] Add ChamplainLocalMapDataSource class
- From: Pierre-Luc Beaudoin <plbeaudoin src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libchamplain] Add ChamplainLocalMapDataSource class
- Date: Sun, 24 Jan 2010 20:06:44 +0000 (UTC)
commit 3ddfd9d7d8c73f48b62419929ec92dbb7000e719
Author: Simon Wenner <simon wenner ch>
Date: Mon Jun 22 11:13:39 2009 +0200
Add ChamplainLocalMapDataSource class
champlain/Makefile.am | 18 +++--
champlain/champlain-local-map-data-source.c | 114 +++++++++++++++++++++++++++
champlain/champlain-local-map-data-source.h | 63 +++++++++++++++
3 files changed, 189 insertions(+), 6 deletions(-)
---
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index 9374a72..dfda22c 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -111,12 +111,18 @@ AM_CPPFLAGS = \
$(WARN_CFLAGS)
if ENABLE_MEMPHIS
-libchamplain_headers += champlain-memphis-map-source.h \
- champlain-map-data-source.h
-libchamplain_0_3_la_SOURCES += champlain-memphis-map-source.c \
- champlain-map-data-source.c
-libchamplain_include_HEADERS += champlain-memphis-map-source.h \
- champlain-map-data-source.h
+libchamplain_headers += \
+ champlain-memphis-map-source.h \
+ champlain-map-data-source.h \
+ champlain-local-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
+libchamplain_include_HEADERS += \
+ champlain-memphis-map-source.h \
+ champlain-map-data-source.h \
+ champlain-local-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-local-map-data-source.c b/champlain/champlain-local-map-data-source.c
new file mode 100644
index 0000000..410e79f
--- /dev/null
+++ b/champlain/champlain-local-map-data-source.c
@@ -0,0 +1,114 @@
+/*
+ * 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-local-map-data-source.h"
+
+#include <memphis/memphis.h>
+
+G_DEFINE_TYPE (ChamplainLocalMapDataSource, champlain_local_map_data_source, CHAMPLAIN_TYPE_MAP_DATA_SOURCE)
+
+#define GET_PRIVATE(o) \
+ (G_TYPE_INSTANCE_GET_PRIVATE ((o), CHAMPLAIN_TYPE_LOCAL_MAP_DATA_SOURCE, ChamplainLocalMapDataSourcePrivate))
+
+typedef struct _ChamplainLocalMapDataSourcePrivate ChamplainLocalMapDataSourcePrivate;
+
+struct _ChamplainLocalMapDataSourcePrivate {
+ MemphisMap* map;
+};
+
+static void
+champlain_local_map_data_source_get_property (GObject *object, guint property_id,
+ GValue *value, GParamSpec *pspec)
+{
+ switch (property_id) {
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+champlain_local_map_data_source_set_property (GObject *object, guint property_id,
+ const GValue *value, GParamSpec *pspec)
+{
+ switch (property_id) {
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+champlain_local_map_data_source_dispose (GObject *object)
+{
+ G_OBJECT_CLASS (champlain_local_map_data_source_parent_class)->dispose (object);
+}
+
+static void
+champlain_local_map_data_source_finalize (GObject *object)
+{
+ G_OBJECT_CLASS (champlain_local_map_data_source_parent_class)->finalize (object);
+}
+
+static MemphisMap*
+get_map_data (ChamplainMapDataSource *self)
+{
+ ChamplainLocalMapDataSourcePrivate *priv = GET_PRIVATE(self);
+
+ return priv->map;
+}
+
+static void
+champlain_local_map_data_source_class_init (ChamplainLocalMapDataSourceClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ g_type_class_add_private (klass, sizeof (ChamplainLocalMapDataSourcePrivate));
+
+ object_class->get_property = champlain_local_map_data_source_get_property;
+ object_class->set_property = champlain_local_map_data_source_set_property;
+ object_class->dispose = champlain_local_map_data_source_dispose;
+ object_class->finalize = champlain_local_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_local_map_data_source_init (ChamplainLocalMapDataSource *self)
+{
+ ChamplainLocalMapDataSourcePrivate *priv = GET_PRIVATE(self);
+
+ priv->map = NULL;
+}
+
+ChamplainLocalMapDataSource*
+champlain_local_map_data_source_new (void)
+{
+ return g_object_new (CHAMPLAIN_TYPE_LOCAL_MAP_DATA_SOURCE, NULL);
+}
+
+void
+champlain_local_map_data_source_load_map_data (ChamplainLocalMapDataSource *self,
+ gchar *map_path)
+{
+ g_return_if_fail (CHAMPLAIN_IS_LOCAL_MAP_DATA_SOURCE (self)
+ && map_path);
+
+ ChamplainLocalMapDataSourcePrivate *priv = GET_PRIVATE(self);
+
+ memphis_map_load_from_file (priv->map, map_path);
+}
diff --git a/champlain/champlain-local-map-data-source.h b/champlain/champlain-local-map-data-source.h
new file mode 100644
index 0000000..d37fbbc
--- /dev/null
+++ b/champlain/champlain-local-map-data-source.h
@@ -0,0 +1,63 @@
+/*
+ * 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_LOCAL_MAP_DATA_SOURCE
+#define _CHAMPLAIN_LOCAL_MAP_DATA_SOURCE
+
+#include <glib-object.h>
+
+#include <champlain/champlain-map-data-source.h>
+
+G_BEGIN_DECLS
+
+#define CHAMPLAIN_TYPE_LOCAL_MAP_DATA_SOURCE champlain_local_map_data_source_get_type()
+
+#define CHAMPLAIN_LOCAL_MAP_DATA_SOURCE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_LOCAL_MAP_DATA_SOURCE, ChamplainLocalMapDataSource))
+
+#define CHAMPLAIN_LOCAL_MAP_DATA_SOURCE_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_LOCAL_MAP_DATA_SOURCE, ChamplainLocalMapDataSourceClass))
+
+#define CHAMPLAIN_IS_LOCAL_MAP_DATA_SOURCE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_LOCAL_MAP_DATA_SOURCE))
+
+#define CHAMPLAIN_IS_LOCAL_MAP_DATA_SOURCE_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_LOCAL_MAP_DATA_SOURCE))
+
+#define CHAMPLAIN_LOCAL_MAP_DATA_SOURCE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_LOCAL_MAP_DATA_SOURCE, ChamplainLocalMapDataSourceClass))
+
+typedef struct {
+ ChamplainMapDataSource parent;
+} ChamplainLocalMapDataSource;
+
+typedef struct {
+ ChamplainMapDataSourceClass parent_class;
+} ChamplainLocalMapDataSourceClass;
+
+GType champlain_local_map_data_source_get_type (void);
+
+ChamplainLocalMapDataSource* champlain_local_map_data_source_new (void);
+
+void champlain_local_map_data_source_load_map_data (
+ ChamplainLocalMapDataSource *map_data_source,
+ gchar *map_path);
+
+G_END_DECLS
+
+#endif /* _CHAMPLAIN_LOCAL_MAP_DATA_SOURCE */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]