Commit 423ea93a authored by Daniele Romagnoli's avatar Daniele Romagnoli
Browse files

Merge pull request #1054 from dromagnoli/GEOS-7019-2.6.x

[GEOS-7019]: Fixing om:FeatureOfInterest wrong schema element in WCS2…
parents 681c4240 17dcdeae
......@@ -165,7 +165,7 @@ public class WCSEOCoverageMetadataProvider implements WCS20CoverageMetadataProvi
double miny = ge.getLowerCorner().getOrdinate(axisSwap ? 0 : 1);
double maxx = ge.getUpperCorner().getOrdinate(axisSwap ? 1 : 0);
double maxy = ge.getUpperCorner().getOrdinate(axisSwap ? 0 : 1);
tx.start("om:FeatureOfInterest");
tx.start("om:featureOfInterest");
tx.start("eop:Footprint", atts("gml:id", coverageId + "_fp"));
tx.start("eop:multiExtentOf");
tx.start("gml:MultiSurface", atts("gml:id", coverageId + "_ms", "srsName", srsName));
......@@ -189,7 +189,7 @@ public class WCSEOCoverageMetadataProvider implements WCS20CoverageMetadataProvi
tx.end("gml:Point");
tx.end("eop:centerOf");
tx.end("eop:Footprint");
tx.end("om:FeatureOfInterest");
tx.end("om:featureOfInterest");
// fixed metadata properties (at least for the moment)
tx.start("eop:metaDataProperty");
......
......@@ -24,8 +24,8 @@ public class DescribeCoverageTest extends WCSEOTestSupport {
assertEquals("2008-11-07T00:00:00.000Z", xpath.evaluate("//eop:EarthObservation/om:phenomenonTime/gml:TimePeriod/gml:endPosition", dom));
assertEquals("2008-11-07T00:00:00.000Z", xpath.evaluate("//eop:EarthObservation/om:resultTime/gml:TimeInstant/gml:timePosition", dom));
assertEquals("1", xpath.evaluate("count(//eop:EarthObservation/om:FeatureOfInterest/eop:Footprint/eop:multiExtentOf/gml:MultiSurface)", dom));
assertEquals("1", xpath.evaluate("count(//eop:EarthObservation/om:FeatureOfInterest/eop:Footprint/eop:centerOf/gml:Point)", dom));
assertEquals("1", xpath.evaluate("count(//eop:EarthObservation/om:featureOfInterest/eop:Footprint/eop:multiExtentOf/gml:MultiSurface)", dom));
assertEquals("1", xpath.evaluate("count(//eop:EarthObservation/om:featureOfInterest/eop:Footprint/eop:centerOf/gml:Point)", dom));
assertEquals("sf__timeranges", xpath.evaluate("//eop:EarthObservation/eop:metaDataProperty/eop:EarthObservationMetaData/eop:identifier", dom));
assertEquals("NOMINAL", xpath.evaluate("//eop:EarthObservation/eop:metaDataProperty/eop:EarthObservationMetaData/eop:acquisitionType", dom));
......@@ -60,8 +60,8 @@ public class DescribeCoverageTest extends WCSEOTestSupport {
assertEquals("2008-11-07T00:00:00.000Z", xpath.evaluate("//eop:EarthObservation/om:phenomenonTime/gml:TimePeriod/gml:endPosition", dom));
assertEquals("2008-11-07T00:00:00.000Z", xpath.evaluate("//eop:EarthObservation/om:resultTime/gml:TimeInstant/gml:timePosition", dom));
assertEquals("1", xpath.evaluate("count(//eop:EarthObservation/om:FeatureOfInterest/eop:Footprint/eop:multiExtentOf/gml:MultiSurface)", dom));
assertEquals("1", xpath.evaluate("count(//eop:EarthObservation/om:FeatureOfInterest/eop:Footprint/eop:centerOf/gml:Point)", dom));
assertEquals("1", xpath.evaluate("count(//eop:EarthObservation/om:featureOfInterest/eop:Footprint/eop:multiExtentOf/gml:MultiSurface)", dom));
assertEquals("1", xpath.evaluate("count(//eop:EarthObservation/om:featureOfInterest/eop:Footprint/eop:centerOf/gml:Point)", dom));
assertEquals("sf__timeranges", xpath.evaluate("//eop:EarthObservation/eop:metaDataProperty/eop:EarthObservationMetaData/eop:identifier", dom));
assertEquals("NOMINAL", xpath.evaluate("//eop:EarthObservation/eop:metaDataProperty/eop:EarthObservationMetaData/eop:acquisitionType", dom));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment