Github/geoserver-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow to set bbox in publishGeoTiff. Closes #6.

Browse Source
This commit is contained in:
Oscar Fonts 2012-06-25 18:03:00 +02:00
parent 8f6e8b9ac2
commit 6d9fbac1c1
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTPublisher.java
View File

@ -1323,6 +1323,19 @@ public class GeoServerRESTPublisher {
: (NameValuePair[]) null); : (NameValuePair[]) null);
} }
/**
* Same as {@link publishGeoTIFF(String, String, String, File, String, ProjectionPolicy, String, double[])}
* but without the last parameter (bbox). Kept here for backwards compatibility.
* @deprecated
*/
public boolean publishGeoTIFF(String workspace, String storeName,
String resourceName, File geotiff, String srs,
ProjectionPolicy policy, String defaultStyle)
throws FileNotFoundException, IllegalArgumentException {
return publishGeoTIFF(workspace, storeName, resourceName,
geotiff, srs, policy, defaultStyle, null);
}
/** /**
* @see {@link #publishExternalGeoTIFF(String, String, File, String, String, ProjectionPolicy, String)} * @see {@link #publishExternalGeoTIFF(String, String, File, String, String, ProjectionPolicy, String)}
* @param workspace * @param workspace
@ -1332,13 +1345,14 @@ public class GeoServerRESTPublisher {
* @param srs * @param srs
* @param policy * @param policy
* @param defaultStyle * @param defaultStyle
* @param bbox An array of 4 doubles indicating envelope in EPSG:4326. Order is [Xmin, Ymin, Xmax, Ymax]
* @return * @return
* @throws FileNotFoundException * @throws FileNotFoundException
* @throws IllegalArgumentException * @throws IllegalArgumentException
*/ */
public boolean publishGeoTIFF(String workspace, String storeName, public boolean publishGeoTIFF(String workspace, String storeName,
String resourceName, File geotiff, String srs, String resourceName, File geotiff, String srs,
ProjectionPolicy policy, String defaultStyle) ProjectionPolicy policy, String defaultStyle, double[] bbox)
throws FileNotFoundException, IllegalArgumentException { throws FileNotFoundException, IllegalArgumentException {
if (workspace == null || storeName == null || geotiff == null if (workspace == null || storeName == null || geotiff == null
|| resourceName == null || srs == null || policy == null || resourceName == null || srs == null || policy == null
@ -1360,6 +1374,9 @@ public class GeoServerRESTPublisher {
coverageEncoder.setName(resourceName); coverageEncoder.setName(resourceName);
coverageEncoder.setSRS(srs); coverageEncoder.setSRS(srs);
coverageEncoder.setProjectionPolicy(policy); coverageEncoder.setProjectionPolicy(policy);
if(bbox != null && bbox.length == 4) {
coverageEncoder.setLatLonBoundingBox(bbox[0], bbox[1], bbox[2], bbox[3], "EPSG:4326");
}
if (!createCoverage(workspace, storeName, coverageEncoder)) { if (!createCoverage(workspace, storeName, coverageEncoder)) {
LOGGER.error("Unable to create a coverage store for coverage: " LOGGER.error("Unable to create a coverage store for coverage: "

3
src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTGeoTiffTest.java
View File

@ -108,7 +108,8 @@ public class GeoserverRESTGeoTiffTest extends GeoserverRESTTest {
assertTrue("publish() failed", pub); assertTrue("publish() failed", pub);
pub = publisher.publishGeoTIFF(DEFAULT_WS, storeName+"another_complex", "layername_complex", geotiff, "EPSG:4326", ProjectionPolicy.REPROJECT_TO_DECLARED,"raster"); double[] bbox = {-103.85, 44.38, -103.62, 44.50};
pub = publisher.publishGeoTIFF(DEFAULT_WS, storeName+"another_complex", "layername_complex", geotiff, "EPSG:4326", ProjectionPolicy.REPROJECT_TO_DECLARED, "raster", bbox);
assertTrue("publish() failed", pub); assertTrue("publish() failed", pub);