correction: for issue #7

Geonovum · Sep 11, 2014 · 92d3ac1 · 92d3ac1
1 parent 8553a75
commit 92d3ac1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 46 deletions.
diff --git a/src/aq-report/output/dataflow-B.xml b/src/aq-report/output/dataflow-B.xml
diff --git a/src/aq-report/templates/dataflow-B.jinja2 b/src/aq-report/templates/dataflow-B.jinja2
@@ -80,7 +80,8 @@
             </am:name>       
                 {# Thijs: do this later, since this is a bit more work for multipolygons #}  
                 <am:geometry>
-                    {{ macros_gml.render_multipolygon2d(globs.srs_name, feature.geometry.coordinates, 'geometry-' + globs.namespace + '-' + feature.properties.zone_code) }}
+                    {% set gml_id = 'geometry-' + globs.namespace + '-' + feature.properties.zone_code %}
+                    {{ feature.geometry | geojson2gml(source_crs=4326, target_crs=4258, gml_id=gml_id, gml_format='GML3', gml_longsrs='YES') }}
                 </am:geometry>
             {# Thijs: how to match the zone_type? The value comes from the CSV-file for the Zones. A macro could be the best, but would be nice if we could use the vocabulary directly.
 

diff --git a/src/aq-report/templates/macros-gml.jinja2 b/src/aq-report/templates/macros-gml.jinja2
@@ -82,12 +82,3 @@
        {{ content }}
     </{{tag}}>
 {%- endmacro %}
-
-{# Macro that renders a MultiPolygon element #}
-{# Thijs: a stub for now, Just will work on this #}
-{% macro render_multipolygon2d(srs_name, coordinates, gml_id) -%}
-    <!-- Rendered by macro render_multipolygon2d(). NOTE: this is an invalid geometry for now -->
-    <gml:MultiSurface srsName="{{ srs_name }}" gml:id="{{ gml_id }}">
-       {{ coordinates }}
-    </gml:MultiSurface>
-{%- endmacro %}