From b360d9f717c2196af20e0ee230c4980e09aab268 Mon Sep 17 00:00:00 2001 From: Gianpaolo Coro Date: Tue, 23 Apr 2013 12:37:50 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/EcologicalEngineGeoSpatialExtension@73887 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../geo/insertion/ThreddsFetcher.java | 19 +++++++++++++++---- .../dataanalysis/geo/meta/NetCDFMetadata.java | 4 ++-- .../dataanalysis/geo/utils/CrsHelper.java | 1 + 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gcube/dataanalysis/geo/insertion/ThreddsFetcher.java b/src/main/java/org/gcube/dataanalysis/geo/insertion/ThreddsFetcher.java index 688c14c..acde6a4 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/insertion/ThreddsFetcher.java +++ b/src/main/java/org/gcube/dataanalysis/geo/insertion/ThreddsFetcher.java @@ -109,11 +109,22 @@ public class ThreddsFetcher { metadataInserter.setAbstractField(generateAbstractField(gdt.getFullName(), filename, description, gdt.getUnitsString().trim(), hStartDate, hEndDate, duration, resolution, numberOfDimensions, gds.getTitle(), gds.getDescription())); metadataInserter.setResolution(Math.max(resolutionX, resolutionY)); // set Bounding box + double minX = ThreddsDataExplorer.getMinX(gdt.getCoordinateSystem()); + double maxX = ThreddsDataExplorer.getMaxX(gdt.getCoordinateSystem()); + double minY = ThreddsDataExplorer.getMinY(gdt.getCoordinateSystem()); + double maxY = ThreddsDataExplorer.getMaxY(gdt.getCoordinateSystem()); - metadataInserter.setXLeftLow(ThreddsDataExplorer.getMinX(gdt.getCoordinateSystem())); - metadataInserter.setYLeftLow(ThreddsDataExplorer.getMinY(gdt.getCoordinateSystem())); - metadataInserter.setXRightUpper(ThreddsDataExplorer.getMaxX(gdt.getCoordinateSystem())); - metadataInserter.setYRightUpper(ThreddsDataExplorer.getMaxY(gdt.getCoordinateSystem())); + if (gds.getTitle().toUpperCase().contains("WORLD OCEAN ATLAS")) + { + AnalysisLogger.getLogger().debug("Managing WoA Layer"); + minX = minX-180; + maxX = maxX-180; + } + + metadataInserter.setXLeftLow(minX); + metadataInserter.setYLeftLow(minY); + metadataInserter.setXRightUpper(maxX); + metadataInserter.setYRightUpper(maxY); //set keywords metadataInserter.setCustomTopics(filename, description,numberOfDimensions+"D",gds.getTitle(),gds.getDescription()); diff --git a/src/main/java/org/gcube/dataanalysis/geo/meta/NetCDFMetadata.java b/src/main/java/org/gcube/dataanalysis/geo/meta/NetCDFMetadata.java index 4f12471..d244b85 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/meta/NetCDFMetadata.java +++ b/src/main/java/org/gcube/dataanalysis/geo/meta/NetCDFMetadata.java @@ -405,8 +405,8 @@ public class NetCDFMetadata { format1.setName(new DefaultInternationalString("WMS")); format1.setVersion(new DefaultInternationalString("1.1.0")); DefaultFormat format2 = new DefaultFormat(); - format2.setName(new DefaultInternationalString("WFS")); - format2.setVersion(new DefaultInternationalString("1.1.0")); + format2.setName(new DefaultInternationalString("OPeNDAP")); + format2.setVersion(new DefaultInternationalString("2.0.0")); DefaultFormat format3 = new DefaultFormat(); format3.setName(new DefaultInternationalString("WCS")); format3.setVersion(new DefaultInternationalString("1.0.0")); diff --git a/src/main/java/org/gcube/dataanalysis/geo/utils/CrsHelper.java b/src/main/java/org/gcube/dataanalysis/geo/utils/CrsHelper.java index 6bf0c3a..62288ff 100644 --- a/src/main/java/org/gcube/dataanalysis/geo/utils/CrsHelper.java +++ b/src/main/java/org/gcube/dataanalysis/geo/utils/CrsHelper.java @@ -66,6 +66,7 @@ public final class CrsHelper { for (Object codeObj : CRS.getSupportedCodes("urn:ogc:def")) { SUPPORTED_CRS_CODES.add((String) codeObj); } + System.out.println("Supported Codes:"+SUPPORTED_CRS_CODES); } /** Private constructor to prevent direct instantiation */