[GEOS-9155] Fixed GetFeatureInfo templates not being able to retrieve…

… metadata for raster layers.
geoserver · Mar 20, 2019 · 2aecebd · 2aecebd
1 parent bde79d5
commit 2aecebd
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 3 deletions.
diff --git a/src/main/src/main/java/org/geoserver/template/FeatureWrapper.java b/src/main/src/main/java/org/geoserver/template/FeatureWrapper.java
@@ -28,8 +28,8 @@
 import java.util.Map;
 import java.util.Set;
 import org.geoserver.catalog.Catalog;
-import org.geoserver.catalog.FeatureTypeInfo;
 import org.geoserver.catalog.NamespaceInfo;
+import org.geoserver.catalog.ResourceInfo;
 import org.geoserver.platform.GeoServerExtensions;
 import org.geotools.data.DataUtilities;
 import org.geotools.feature.FeatureCollection;
@@ -269,13 +269,13 @@ private SimpleHash buildComplex(ComplexAttribute att) {
 
         Catalog cat = getCatalog();
 
-        FeatureTypeInfo info = null;
+        ResourceInfo info = null;
         if (cat != null) {
             info =
                     cat.getResourceByName(
                             att.getType().getName().getNamespaceURI(),
                             att.getType().getName().getLocalPart(),
-                            FeatureTypeInfo.class);
+                            ResourceInfo.class);
 
             if (info != null) {
                 map.put("type", info);

diff --git a/src/wms/src/test/java/org/geoserver/wms/featureinfo/HTMLFeatureInfoOutputFormatTest.java b/src/wms/src/test/java/org/geoserver/wms/featureinfo/HTMLFeatureInfoOutputFormatTest.java
@@ -30,6 +30,7 @@
 import net.opengis.wfs.FeatureCollectionType;
 import net.opengis.wfs.WfsFactory;
 import org.geoserver.catalog.FeatureTypeInfo;
+import org.geoserver.catalog.Keyword;
 import org.geoserver.catalog.LayerInfo;
 import org.geoserver.catalog.NamespaceInfo;
 import org.geoserver.catalog.PublishedType;
@@ -44,11 +45,15 @@
 import org.geoserver.wms.GetFeatureInfoRequest;
 import org.geoserver.wms.MapLayerInfo;
 import org.geoserver.wms.WMSTestSupport;
+import org.geotools.data.DataUtilities;
+import org.geotools.feature.simple.SimpleFeatureBuilder;
+import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.opengis.feature.simple.SimpleFeatureType;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;
 
@@ -163,6 +168,45 @@ public void testEnvironmentVariablesAreEvaluatedInTemplate() throws IOException
         }
     }
 
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testCoverageInfoIsEvaluatedInTemplate() throws IOException {
+        currentTemplate = "test_resource_content.ftl";
+        SimpleFeatureTypeBuilder builder = new SimpleFeatureTypeBuilder();
+        builder.setName(toName(MockData.WORLD));
+        SimpleFeatureType type = builder.buildFeatureType();
+        Double[] values = new Double[0];
+        fcType.getFeature()
+                .set(0, DataUtilities.collection(SimpleFeatureBuilder.build(type, values, "")));
+        ResourceInfo resource = getCatalog().getCoverageByName(toName(MockData.WORLD));
+        resource.setTitle("Raster Title");
+        resource.setAbstract("Raster Abstract");
+        resource.getKeywords().set(0, new Keyword("Raster Keyword"));
+        getCatalog().save(resource);
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        outputFormat.write(fcType, getFeatureInfoRequest, outStream);
+        String result = new String(outStream.toByteArray());
+
+        // Verify that a raster layer's title, abstract, etc. is retrieved properly.
+        assertEquals("Raster Title,Raster Abstract,Raster Keyword,EPSG:4326", result);
+    }
+
+    @Test
+    public void testFeatureTypeInfoIsEvaluatedInTemplate() throws IOException {
+        currentTemplate = "test_resource_content.ftl";
+        ResourceInfo resource = getFeatureTypeInfo(MockData.PRIMITIVEGEOFEATURE);
+        resource.setTitle("Vector Title");
+        resource.setAbstract("Vector Abstract");
+        resource.getKeywords().set(0, new Keyword("Vector Keyword"));
+        getCatalog().save(resource);
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        outputFormat.write(fcType, getFeatureInfoRequest, outStream);
+        String result = new String(outStream.toByteArray());
+
+        // Verify that a vector layer's title, abstract, etc. is retrieved properly.
+        assertEquals("Vector Title,Vector Abstract,Vector Keyword,EPSG:4326", result);
+    }
+
     @Test
     public void testExecuteIsBlocked() throws IOException {
         currentTemplate = "test_execute.ftl";

diff --git a/src/wms/src/test/resources/org/geoserver/wms/featureinfo/test_resource_content.ftl b/src/wms/src/test/resources/org/geoserver/wms/featureinfo/test_resource_content.ftl
@@ -0,0 +1,2 @@
+<#assign layer=features[0].type>
+${layer.title},${layer.abstract},${layer.keywords[0]},${layer.SRS}