Added function GtkGisGeometryLine::get_svg_path.

Changed method to draw polygons, so they have also internal rings.
Implemented fill-color style property.

diff --git a/.gitignore b/.gitignore
index 517b2c6b68c0d98f2a63d4c56d9d0aa9eae26b7a..197a3e0e9058c79cff8d2d77c5734b13d8a88d56 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ tests/.deps
 tests/.libs
 tests/from_xml
 tests/test_comune.gtkgis
+tests/test_ciambella.gtkgis
 tests/samples
 docs/reference/.libs
 docs/reference/html

diff --git a/docs/reference/libgtkgis-decl-list.txt b/docs/reference/libgtkgis-decl-list.txt
index d13f871e741dd8c65b11e9bf2343a4ab7991cdf4..3d4d57a1362bfa2fbf91c0271afe4ee34a50cd17 100644 (file)
--- a/docs/reference/libgtkgis-decl-list.txt
+++ b/docs/reference/libgtkgis-decl-list.txt
@@ -144,6 +144,7 @@ gtk_gis_geometry_line_new
 gtk_gis_geometry_line_new_from_list
 gtk_gis_geometry_line_add_point
 gtk_gis_geometry_line_add_point_from_coordinates
+gtk_gis_geometry_line_get_svg_path
 </SECTION>
 
 <SECTION>

diff --git a/docs/reference/libgtkgis-decl.txt b/docs/reference/libgtkgis-decl.txt
index bf232564e2eb1a8f0d7f65270f08b2951acdfe13..f93f13516650c732efd5c0c451640185e9f63414 100644 (file)
--- a/docs/reference/libgtkgis-decl.txt
+++ b/docs/reference/libgtkgis-decl.txt
@@ -606,6 +606,11 @@ GtkGisGeometryLine *line, GtkGisPoint point
 <RETURNS>void </RETURNS>
 GtkGisGeometryLine *line,gdouble x, gdouble y
 </FUNCTION>
+<FUNCTION>
+<NAME>gtk_gis_geometry_line_get_svg_path</NAME>
+<RETURNS>const gchar *</RETURNS>
+GtkGisGeometryLine *line
+</FUNCTION>
 <MACRO>
 <NAME>TYPE_GTK_GIS_GEOMETRY</NAME>
 #define TYPE_GTK_GIS_GEOMETRY                 (gtk_gis_geometry_get_type ())

diff --git a/docs/reference/libgtkgis-undocumented.txt b/docs/reference/libgtkgis-undocumented.txt
index 0221b22980079a62b1289108f2f6ce7c2b77372b..d61db35f670c4897813fd707308e66866ae371b2 100644 (file)
--- a/docs/reference/libgtkgis-undocumented.txt
+++ b/docs/reference/libgtkgis-undocumented.txt
@@ -1,7 +1,7 @@
 11% symbol docs coverage.
 22 symbols documented.
 7 symbols incomplete.
-170 not documented.
+171 not documented.
 
 
 GTK_GIS
@@ -98,6 +98,7 @@ gtk_gis_geometry_get_point
 gtk_gis_geometry_get_type
 gtk_gis_geometry_line_add_point
 gtk_gis_geometry_line_add_point_from_coordinates
+gtk_gis_geometry_line_get_svg_path
 gtk_gis_geometry_line_get_type
 gtk_gis_geometry_point_get_type
 gtk_gis_geometry_point_get_x

diff --git a/docs/reference/libgtkgis-unused.txt b/docs/reference/libgtkgis-unused.txt
index 4144b618118aca4c85a47c684fb7d741eca21dfa..36fa92aed04049abcb59c74be155ab3ca05e013f 100644 (file)
--- a/docs/reference/libgtkgis-unused.txt
+++ b/docs/reference/libgtkgis-unused.txt
@@ -10,5 +10,6 @@ GtkGisLayerSourcePostgisClass
 GtkGisLayerSourceRasterClass
 GtkGisLayerSourceShpClass
 GtkGisLayersGroupClass
+gtk_gis_geometry_line_get_svg_path
 gtk_gis_layer_get_style
 gtk_gis_layer_set_style

diff --git a/src/geometryline.c b/src/geometryline.c
index 15d10516e52e5d88dfdf5b5e834442cab7c9bd2f..35d9c7740de8f71241849a40f989db69f79ccd1a 100644 (file)
--- a/src/geometryline.c
+++ b/src/geometryline.c
@@ -130,6 +130,8 @@ gtk_gis_geometry_line_add_point (GtkGisGeometryLine *line, GtkGisPoint point)
 
        GtkGisPoint *gpoint;
 
+       g_return_if_fail (IS_GTK_GIS_GEOMETRY_LINE (line));
+
        gpoint = g_malloc0 (sizeof (GtkGisPoint));
 
        gpoint->x = point.x;
@@ -151,12 +153,53 @@ gtk_gis_geometry_line_add_point_from_coordinates (GtkGisGeometryLine *line,
 {
        GtkGisPoint gpoint;
 
+       g_return_if_fail (IS_GTK_GIS_GEOMETRY_LINE (line));
+
        gpoint.x = x;
        gpoint.y = y;
 
        gtk_gis_geometry_line_add_point (line, gpoint);
 }
 
+/**
+ * gtk_gis_geometry_line_get_svg_path:
+ * @line: a #GtkGisGeometryLine object.
+ *
+ * Returns: the SVG path string representation of the object.
+ */
+const gchar
+*gtk_gis_geometry_line_get_svg_path (GtkGisGeometryLine *line)
+{
+       GtkGisGeometryLinePrivate *priv;        
+       gchar *ret;
+       GSList *cur;
+       GtkGisPoint *point;
+
+       g_return_val_if_fail (IS_GTK_GIS_GEOMETRY_LINE (line), NULL);
+
+       priv = GTK_GIS_GEOMETRY_LINE_GET_PRIVATE (line);
+
+       cur = priv->points;
+
+       point = (GtkGisPoint *)cur->data;
+       ret = g_strdup_printf ("M %f %f", point->x, point->y);
+
+       cur = g_slist_next (cur);
+       while (cur != NULL)
+               {
+                       point = (GtkGisPoint *)cur->data;
+                       ret = g_strconcat (ret,
+                             g_strdup_printf (" L %f %f", point->x, point->y),
+                             NULL);
+
+                       cur = g_slist_next (cur);
+               }
+
+       ret = convert_comma_to_dot (ret);
+
+       return ret;
+}
+
 static gchar
 *convert_comma_to_dot (gchar *str)
 {
@@ -191,7 +234,6 @@ static GooCanvasItem
 {
        GtkGisGeometryLinePrivate *priv;
        GooCanvasItem *item = NULL;
-       GtkGisPoint *point;
 
        gchar *path;
 
@@ -199,30 +241,15 @@ static GooCanvasItem
 
        if (priv->points != NULL)
                {
-                       GSList *cur;
-
-                       cur = priv->points;
-
-                       point = (GtkGisPoint *)cur->data;
-                       path = g_strdup_printf ("M %f %f", point->x, point->y);
-
-                       cur = g_slist_next (cur);
-                       while (cur != NULL)
+                       path = (gchar *)gtk_gis_geometry_line_get_svg_path (GTK_GIS_GEOMETRY_LINE (line));
+                       if (path != NULL)
                                {
-                                       point = (GtkGisPoint *)cur->data;
-                                       path = g_strconcat (path,
-                                              g_strdup_printf (" L %f %f", point->x, point->y),
-                                              NULL);
-
-                                       cur = g_slist_next (cur);
+                                       item = goo_canvas_path_new (NULL,
+                                                                   path,
+                                                                   "line-width", style.width / scale->xy,
+                                                                   "stroke-color", style.stroke_color,
+                                                                   NULL);
                                }
-
-                       path = convert_comma_to_dot (path);
-                       item = goo_canvas_path_new (NULL,
-                                                   path,
-                                                   "line-width", style.width / scale->xy,
-                                                   "stroke-color", style.stroke_color,
-                                                   NULL);
                }
 
        return item;

diff --git a/src/geometryline.h b/src/geometryline.h
index e967a9b5e45bad985ffc233c83ebe5c3fce5d8ba..96a73ca9939d744cdf6a42d26c65bd97e0757e0d 100644 (file)
--- a/src/geometryline.h
+++ b/src/geometryline.h
@@ -58,6 +58,7 @@ void gtk_gis_geometry_line_add_point (GtkGisGeometryLine *line, GtkGisPoint poin
 void gtk_gis_geometry_line_add_point_from_coordinates (GtkGisGeometryLine *line,
                                                        gdouble x, gdouble y);
 
+const gchar *gtk_gis_geometry_line_get_svg_path (GtkGisGeometryLine *line);
 
 
 G_END_DECLS

diff --git a/src/geometrypolygon.c b/src/geometrypolygon.c
index 90aaa5075ffd7f0aa056cde9f1b0a15dc9dc8440..dd75085c51c4dc3da41bbaae5654ccc08650be41 100644 (file)
--- a/src/geometrypolygon.c
+++ b/src/geometrypolygon.c
@@ -104,6 +104,8 @@ GtkGisGeometry
 {
        GtkGisGeometry *polygon;
 
+       g_return_val_if_fail (IS_GTK_GIS_GEOMETRY_LINE (line), NULL);
+
        polygon = gtk_gis_geometry_polygon_new ();
 
        gtk_gis_geometry_polygon_add_line (GTK_GIS_GEOMETRY_POLYGON (polygon), line);
@@ -146,7 +148,12 @@ void
 gtk_gis_geometry_polygon_add_line (GtkGisGeometryPolygon *polygon,
                                    GtkGisGeometryLine *line)
 {
-       GtkGisGeometryPolygonPrivate *priv = GTK_GIS_GEOMETRY_POLYGON_GET_PRIVATE (polygon);
+       GtkGisGeometryPolygonPrivate *priv;
+
+       g_return_if_fail (IS_GTK_GIS_GEOMETRY_POLYGON (polygon));
+       g_return_if_fail (IS_GTK_GIS_GEOMETRY_LINE (line));
+
+       priv = GTK_GIS_GEOMETRY_POLYGON_GET_PRIVATE (polygon);
 
        priv->lines = g_slist_append (priv->lines, line);
 }
@@ -163,6 +170,8 @@ gtk_gis_geometry_polygon_add_line_from_list (GtkGisGeometryPolygon *polygon,
 {
        GtkGisGeometry *line;
 
+       g_return_if_fail (IS_GTK_GIS_GEOMETRY_POLYGON (polygon));
+
        line = gtk_gis_geometry_line_new_from_list (points);
 
        if (line != NULL)
@@ -181,7 +190,12 @@ void
 gtk_gis_geometry_polygon_remove_line (GtkGisGeometryPolygon *polygon,
                                       GtkGisGeometryLine *line)
 {
-       GtkGisGeometryPolygonPrivate *priv = GTK_GIS_GEOMETRY_POLYGON_GET_PRIVATE (polygon);
+       GtkGisGeometryPolygonPrivate *priv;
+
+       g_return_if_fail (IS_GTK_GIS_GEOMETRY_POLYGON (polygon));
+       g_return_if_fail (IS_GTK_GIS_GEOMETRY_LINE (line));
+
+       priv = GTK_GIS_GEOMETRY_POLYGON_GET_PRIVATE (polygon);
 
        priv->lines = g_slist_remove (priv->lines, line);
 }
@@ -192,9 +206,11 @@ static GooCanvasItem
                                 GtkGisLayerStyle style)
 {
        GtkGisGeometryPolygonPrivate *priv;
-       GooCanvasItem *polygon_item = NULL;
+       GooCanvasItem *item = NULL;
 
-       gchar *path;
+       gchar *path = "";
+
+       g_return_val_if_fail (IS_GTK_GIS_GEOMETRY_POLYGON (polygon), NULL);
 
        priv = GTK_GIS_GEOMETRY_POLYGON_GET_PRIVATE (GTK_GIS_GEOMETRY_POLYGON (polygon));
 
@@ -202,27 +218,29 @@ static GooCanvasItem
                {
                        GSList *cur;
                        GtkGisGeometry *line;
-                       GooCanvasItem *item = NULL;
-
-                       polygon_item = goo_canvas_group_new (NULL, NULL);
 
                        cur = priv->lines;
-
                        while (cur != NULL)
                                {
-                                       line = (GtkGisGeometry *)cur->data;
-                                       item = gtk_gis_geometry_draw (line, scale, style);
-
-                                       if (item != NULL)
-                                               {
-                                                       goo_canvas_item_add_child (polygon_item, item, -1);
-                                               }
-                                       
+                                       line = (GtkGisGeometry *)cur->data;                                     
+                                       path = g_strconcat (path,
+                                                           " ",
+                                                           gtk_gis_geometry_line_get_svg_path (GTK_GIS_GEOMETRY_LINE (line)),
+                                                           NULL);
+
                                        cur = g_slist_next (cur);
                                }
+
+                       item = goo_canvas_path_new (NULL,
+                                                   path,
+                                                   "line-width", style.width / scale->xy,
+                                                   "stroke-color", style.stroke_color,
+                                                   "fill-color", style.fill_color,
+                                                   "fill-rule", CAIRO_FILL_RULE_EVEN_ODD,
+                                                   NULL);
                }
 
-       return polygon_item;
+       return item;
 }
 
 static void

diff --git a/src/layersource.c b/src/layersource.c
index 96619393719b8a16cf9d845e457d3e692eeeb9cc..b9548f378c3fd0d7e8ef465180945b4405baabe6 100644 (file)
--- a/src/layersource.c
+++ b/src/layersource.c
@@ -340,6 +340,7 @@ static GList
                        if (poGeometry != NULL
                                && wkbFlatten (OGR_G_GetGeometryType (poGeometry)) == wkbPoint)
                                {
+                                       /* POINTS */
                                        GtkGisPoint gpoint;
 
                                        gpoint.x = OGR_G_GetX (poGeometry, 0);
@@ -350,6 +351,7 @@ static GList
                        else if (poGeometry != NULL
                                && wkbFlatten (OGR_G_GetGeometryType (poGeometry)) == wkbLineString)
                                {
+                                       /* LINES */
                                        gint points;
                                        gint point;
                                        GSList *gpoints = NULL;
@@ -373,6 +375,7 @@ static GList
                        else if (poGeometry != NULL
                                && wkbFlatten (OGR_G_GetGeometryType (poGeometry)) == wkbPolygon)
                                {
+                                       /* POLYGONS */
                                        gint num_geometries;
                                        gint i_geometry;
 

diff --git a/tests/test1.gtkgis b/tests/test1.gtkgis
index 28baeca005f57a5e8a14a072884531bc086b0a78..3910e0408e3f37ace6f7f5f2224a65f1a298bde6 100644 (file)
--- a/tests/test1.gtkgis
+++ b/tests/test1.gtkgis
@@ -4,6 +4,9 @@
                <source>
                        <shape filename="tests/samples/alaska.shp" />
                </source>
+               <style>
+                       <fill-color>#FFFF00</fill-color>
+               </style>
        </layer>
 
        <layer name="airports">