gCubeSystem
/
geo-utility
17
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2191: Geo Utility enhancements: update json parser to retrieve z-axis property 

Task-Url: https://support.d4science.org/issues/2191

Changed List<Double> for ZAxis

git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/spatial-data/geo-utility@124055 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2016-02-10 14:30:51 +00:00
parent aa7b96a1d3
commit a87db32ae8
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/gcube/spatial/data/geoutility/bean/LayerZAxis.java
View File

@ -25,7 +25,7 @@ public class LayerZAxis implements Serializable{
private String units; private String units;
private boolean positive; private boolean positive;
private List<Long> values; private List<Double> values;
/** /**
* Instantiates a new layer z axis. * Instantiates a new layer z axis.
@ -40,7 +40,7 @@ public class LayerZAxis implements Serializable{
* @param positive the positive * @param positive the positive
* @param values the values * @param values the values
*/ */
public LayerZAxis(String units, boolean positive, List<Long> values) { public LayerZAxis(String units, boolean positive, List<Double> values) {
this.units = units; this.units = units;
this.positive = positive; this.positive = positive;
this.values = values; this.values = values;
@ -74,7 +74,7 @@ public class LayerZAxis implements Serializable{
* *
* @return the values * @return the values
*/ */
public List<Long> getValues() { public List<Double> getValues() {
return values; return values;
} }
@ -107,7 +107,7 @@ public class LayerZAxis implements Serializable{
* *
* @param values the values to set * @param values the values to set
*/ */
public void setValues(List<Long> values) { public void setValues(List<Double> values) {
this.values = values; this.values = values;
} }

7
src/main/java/org/gcube/spatial/data/geoutility/wms/NcWmsGetMetadata.java
View File

@ -203,16 +203,15 @@ public class NcWmsGetMetadata {
if(listMeta.contains(NcWmsLayerMetadata.METADATA.Z_AXIS)){ if(listMeta.contains(NcWmsLayerMetadata.METADATA.Z_AXIS)){
JSONObject zaxis = json.getJSONObject(NcWmsLayerMetadata.METADATA.Z_AXIS.getKey()); JSONObject zaxis = json.getJSONObject(NcWmsLayerMetadata.METADATA.Z_AXIS.getKey());
if(zaxis!=null){ if(zaxis!=null){
System.out.println(zaxis); logger.trace("z-axis: "+zaxis.toString());
LayerZAxis zAxis = new LayerZAxis(); LayerZAxis zAxis = new LayerZAxis();
zAxis.setUnits(zaxis.getString(LayerZAxis.UNITS)); zAxis.setUnits(zaxis.getString(LayerZAxis.UNITS));
zAxis.setPositive(zaxis.getBoolean(LayerZAxis.POSITIVE)); zAxis.setPositive(zaxis.getBoolean(LayerZAxis.POSITIVE));
JSONArray values = zaxis.getJSONArray(LayerZAxis.VALUES); JSONArray values = zaxis.getJSONArray(LayerZAxis.VALUES);
System.out.println(values);
if(values!=null){ if(values!=null){
List<Long> s = new ArrayList<Long>(values.length()); List<Double> s = new ArrayList<Double>(values.length());
for (int i=0; i<values.length(); i++) { for (int i=0; i<values.length(); i++) {
s.add(values.getLong(i)); s.add(values.getDouble(i));
} }
zAxis.setValues(s); zAxis.setValues(s);
} }