gCubeSystem
/
geonetwork
16
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

git-svn-id: http://svn.research-infrastructures.eu/d4science/gcube/trunk/spatial-data/geonetwork@150731 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Fabio Sinibaldi 2017-07-04 16:25:05 +00:00
parent 3c6c52240f
commit dc4d1f6652
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/gcube/spatial/data/geonetwork/iso/ISOMetadataFactory.java
View File

@ -262,7 +262,7 @@ public class ISOMetadataFactory {
public static String getWmsUrl(String geoServerUrl, String layerName,String style, String bbox,String CRS) {
public static String getWmsUrl(String geoServerUrl, String layerName,String workspace, String style, String bbox,String CRS) {
if(bbox==null) bbox=BoundingBox.WORLD_EXTENT.toString();
return geoServerUrl +
"/wms?service=wms&version=1.1.0"
@ -273,13 +273,13 @@ public class ISOMetadataFactory {
}
public static String getWfsUrl(String geoServerUrl, String layerName) {
public static String getWfsUrl(String geoServerUrl, String layerName,String workspace) {
return geoServerUrl +
"/ows?service=wfs&version=1.0.0"
+ "&request=GetFeature&typeName=" + layerName
+ "&request=GetFeature&typeName=" + workspace+":"+layerName
+"&format=json";
}
public static String getWcsUrl(String geoServerUrl, String layerName,String bbox) {
public static String getWcsUrl(String geoServerUrl, String layerName, String workspace, String bbox) {
if(bbox==null) bbox=BoundingBox.WORLD_EXTENT.toString();
return geoServerUrl + "/wcs?service=wcs&version=1.0.0" + "&request=GetCoverage&coverage=" +
layerName + "&CRS=EPSG:4326" + "&bbox=" + bbox + "&width=676&height=330&format=geotiff";

8
src/main/java/org/gcube/spatial/data/geonetwork/iso/tpl/MetadataDescriptor.java
View File

@ -51,12 +51,12 @@ public class MetadataDescriptor {
private String lineageStatement;
public void setGeoServerDistributionInfo(String geoServerUrl,String layerName, String style, String CRS) throws UriResolverMapException, IllegalArgumentException{
public void setGeoServerDistributionInfo(String geoServerUrl,String layerName, String workspace, String style, String CRS) throws UriResolverMapException, IllegalArgumentException{
List<OnlineResource> resources=new ArrayList<OnlineResource>();
String bbox=this.getBoundingBox().toString();
String wmsUrl=ISOMetadataFactory.getWmsUrl(geoServerUrl, layerName, style, bbox, CRS);
String wcsUrl=ISOMetadataFactory.getWcsUrl(geoServerUrl, layerName, bbox);
String wfsUrl=ISOMetadataFactory.getWfsUrl(geoServerUrl, layerName);
String wmsUrl=ISOMetadataFactory.getWmsUrl(geoServerUrl, layerName, workspace, style, bbox, CRS);
String wcsUrl=ISOMetadataFactory.getWcsUrl(geoServerUrl, layerName, workspace, bbox);
String wfsUrl=ISOMetadataFactory.getWfsUrl(geoServerUrl, layerName, workspace);
String gisViewerUrl=ISOMetadataFactory.getGisLinkByUUID(UUIDIdentifier);
resources.add(new OnlineResource(wmsUrl, "WMS Link"));

8
src/test/java/org/gcube/spatial/data/geonetwork/test/ScopeTests.java
View File

@ -33,10 +33,10 @@ public class ScopeTests {
// DEV
// scopes.add("/gcube");
scopes.add("/gcube/devNext");
// scopes.add("/gcube/devNext");
// scopes.add("/gcube/devsec");
//
// scopes.add("/gcube/devNext/NextNext");
scopes.add("/gcube/devNext/NextNext");
//
// scopes.add("/gcube/devsec/StaTabTest");
//
@ -53,6 +53,8 @@ public class ScopeTests {
// scopes.add("/gcube/preprod/preVRE");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/FAO_TunaAtlas");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/EGIP");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/SIASPA");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/InfraScience");
@ -70,7 +72,6 @@ public class ScopeTests {
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/ScalableDataMining");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/BiodiversityLab");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/DESCRAMBLE");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/FAO_TunaAtlas");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/StocksAndFisheriesKB");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/BlueCommons");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/ICES_TCSSM");
@ -95,7 +96,6 @@ public class ScopeTests {
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/EFG");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/StockAssessment");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/iSearch");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/ICOS_ETC");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/VesselActivitiesAnalyzer");
// scopes.add("/d4science.research-infrastructures.eu/gCubeApps/BiOnym");

2
src/test/java/org/gcube/spatial/data/geonetwork/test/TrueMarbleMeta.java
View File

@ -64,7 +64,7 @@ public class TrueMarbleMeta {
desc.setTitle("Il mio bel titolone");
desc.setUUIDIdentifier(UUID.randomUUID().toString());
desc.setBoundingBox(BoundingBox.WORLD_EXTENT);
desc.setGeoServerDistributionInfo("http://geoserver.d4science.org/geoserver", "ws:wmpa", "speciesProb", "EPSG:4326");
desc.setGeoServerDistributionInfo("http://geoserver.d4science.org/geoserver", "ws","wmpa", "speciesProb", "EPSG:4326");
desc.setSpatialResolution(0.5d);
desc.setTopicCategory("environment");
desc.setLineageStatement("I made with my own hands");

2
src/test/resources/log4j.properties
View File

@ -1,4 +1,4 @@
log4j.rootLogger=DEBUG, A1,stdout
log4j.rootLogger=DEBUG, A1
log4j.appender.A1=org.apache.log4j.RollingFileAppender
log4j.appender.A1.File=log.txt
log4j.appender.A1.layout=org.apache.log4j.PatternLayout