got multipolygon to unmarshal

geosolutions-it · Jun 24, 2024 · b9cfe56 · b9cfe56
1 parent afd8007
commit b9cfe56
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/src/extension/mapml/src/test/java/org/geoserver/mapml/MapMLWMSFeatureTest.java b/src/extension/mapml/src/test/java/org/geoserver/mapml/MapMLWMSFeatureTest.java
@@ -536,18 +536,19 @@ public void testMapMLFeatureMultiPolygonHasClass() throws Exception {
                             + "</map-head>\n"
                             + "  <#list attributes as attribute>\n"
                             + "    <#if attribute.name == \"NAME\">\n"
-                            + "      <map-property name=\"UPDATED ${attribute.name}\" value=\"CHANGED ${attribute.value}\"/>\n"
+                            + "      <map-interpolated-property name=\"UPDATED ${attribute.name}\" value=\"CHANGED ${attribute.value}\"/>\n"
                             + "      <#elseif !attribute.isGeometry>\n"
-                            + "      <map-property name=\"${attribute.name}\" value=\"${attribute.value}\"/>\n"
+                            + "      <map-interpolated-property name=\"${attribute.name}\" value=\"${attribute.value}\"/>\n"
                             + "    </#if>\n"
                             + "    <#if attribute.isGeometry>\n"
                             + "      <map-interpolated-geometry type=\"multipolygon\" >\n"
                             + "        <map-components>"
-                            + "        <#list attribute.rawValue.geometries as polygon>"
-                            + "          <map-interpolated-geometry type=\"polygon\" >"
+                            + "      <#list 0 ..< attribute.rawValue.getNumGeometries() as index>"
+                            + "        <#assign polygon = attribute.rawValue.getGeometryN(index)>"
+                            + "       <map-interpolated-geometry type=\"polygon\" >\n"
                             + "       <map-components>"
-                            + "       <#assign shell = polygon.shell>"
-                            + "        <map-interpolated-geometry type=\"linestring\" >\n"
+                            + "       <#assign shell = polygon.getExteriorRing()>"
+                            + "        <map-interpolated-geometry type=\"linestring\">\n"
                             + "         <map-coordinates>"
                             + "          <#list shell.coordinates as coord>"
                             + "           <#if coord?index == 0>"
@@ -556,11 +557,12 @@ public void testMapMLFeatureMultiPolygonHasClass() throws Exception {
                             + "            ${coord.x} ${coord.y}<![CDATA[</span>]]>"
                             + "           <#else>"
                             + "            ${coord.x} ${coord.y}"
-                            + "           </#list>"
+                            + "           </#if>"
+                            + "         </#list>"
                             + "         </map-coordinates>"
                             + "      </map-interpolated-geometry>"
-                            + "      <#assign holes = attribute.rawValue.holes>"
-                            + "      <#list holes as hole>"
+                            + "      <#list 0 ..< polygon.getNumInteriorRing() as index>"
+                            + "        <#assign hole = polygon.getInteriorRingN(index)>"
                             + "        <map-interpolated-geometry type=\"linestring\" >\n"
                             + "         <map-coordinates>"
                             + "          <#list hole.coordinates as coord>"
@@ -570,10 +572,14 @@ public void testMapMLFeatureMultiPolygonHasClass() throws Exception {
                             + "            ${coord.x} ${coord.y}<![CDATA[</span>]]>"
                             + "           <#else>"
                             + "            ${coord.x} ${coord.y}"
-                            + "           </#map-coordinates>"
+                            + "           </#if>"
+                            + "         </#list>"
+                            + "           </map-coordinates>"
                             + "        </map-interpolated-geometry>"
+                            + "        </#list>"
                             + "      </map-components>\n"
                             + "      </map-interpolated-geometry>\n"
+                            + "        </#list>"
                             + "       </map-components>"
                             + "      </map-interpolated-geometry>\n"
                             + "    </#if>\n"