gCubeSystem
/
geoportal-data-viewer-app
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reading new properties

This commit is contained in:
Francesco Mangiacrapa 2020-10-29 17:57:29 +01:00
parent 7f56579113
commit 86353ede48
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java
View File

@ -84,9 +84,9 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme
* @see org.gcube.portlets.user.gisviewer.client.GisViewerService#getDataResult(java.util.List, java.lang.String, int) * @see org.gcube.portlets.user.gisviewer.client.GisViewerService#getDataResult(java.util.List, java.lang.String, int)
*/ */
@Override @Override
public List<GeoNaDataObject> getDataResult(List<LayerItem> layerItems, String mapSrsName, BoundsMap mapBBOX, int maxWFSFeature, double zoomLevel) { public List<GeoNaDataObject> getDataResult(List<LayerItem> layerItems, String mapSrsName, BoundsMap selectBBOX, int maxWFSFeature, double zoomLevel) {
LOG.info("getDataResult called"); LOG.info("getDataResult called");
List<GeoNaDataObject> result = FeatureParser.getDataResults(layerItems, mapSrsName, mapBBOX, maxWFSFeature); List<GeoNaDataObject> result = FeatureParser.getDataResults(layerItems, mapSrsName, selectBBOX, maxWFSFeature);
return result; return result;
} }

21
src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/gis/FeatureParser.java
View File

@ -48,11 +48,11 @@ public class FeatureParser {
* *
* @param layerItems the layer items * @param layerItems the layer items
* @param mapSrsName the map srs name * @param mapSrsName the map srs name
* @param mapBBOX the map BBOX * @param selectBBOX the select BBOX
* @param maxWFSFeature the max WFS feature * @param maxWFSFeature the max WFS feature
* @return the data results * @return the data results
*/ */
public static List<GeoNaDataObject> getDataResults(List<LayerItem> layerItems, String mapSrsName, BoundsMap mapBBOX, int maxWFSFeature) { public static List<GeoNaDataObject> getDataResults(List<LayerItem> layerItems, String mapSrsName, BoundsMap selectBBOX, int maxWFSFeature) {
if(maxWFSFeature<0) { if(maxWFSFeature<0) {
maxWFSFeature = GeoportalDataViewerConstants.MAX_WFS_FEATURES; maxWFSFeature = GeoportalDataViewerConstants.MAX_WFS_FEATURES;
@ -61,7 +61,7 @@ public class FeatureParser {
List<GeoNaDataObject> listGeonaDO = new ArrayList<GeoNaDataObject>(); List<GeoNaDataObject> listGeonaDO = new ArrayList<GeoNaDataObject>();
//IF WFS IS AVAILABLE USE WFS REQUEST OTHERWHISE TRY TO USE WPS SERVICE //IF WFS IS AVAILABLE USE WFS REQUEST OTHERWHISE TRY TO USE WPS SERVICE
for (LayerItem layerItem : layerItems){ for (LayerItem layerItem : layerItems){
List<FeatureRow> rows = getWFSFeatureProperties(layerItem, mapSrsName, mapBBOX, maxWFSFeature); List<FeatureRow> rows = getWFSFeatureProperties(layerItem, mapSrsName, selectBBOX, maxWFSFeature);
GeoNaDataObject gdo = new GeoNaDataObject(); GeoNaDataObject gdo = new GeoNaDataObject();
gdo.setLayerItem(layerItem); gdo.setLayerItem(layerItem);
for (FeatureRow featureRow : rows) { for (FeatureRow featureRow : rows) {
@ -71,24 +71,24 @@ public class FeatureParser {
return null; return null;
} }
/** /**
* Gets the WFS feature properties. * Gets the WFS feature properties.
* *
* @param layerItem the layer item * @param layerItem the layer item
* @param mapSrsName the map srs name * @param mapSrsName the map srs name
* @param mapBBOX the map BBOX * @param selectBBOX the select BBOX
* @param maxWFSFeature the max WFS feature * @param maxWFSFeature the max WFS feature
* @return the WFS feature properties * @return the WFS feature properties
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private static List<FeatureRow> getWFSFeatureProperties(LayerItem layerItem, String mapSrsName, BoundsMap mapBBOX, int maxWFSFeature) { private static List<FeatureRow> getWFSFeatureProperties(LayerItem layerItem, String mapSrsName, BoundsMap selectBBOX, int maxWFSFeature) {
LOG.info("getWFSFeatureProperties for layerItem: "+layerItem.getName() +" in the "+mapBBOX); LOG.info("getWFSFeatureProperties for layerItem: "+layerItem.getName() +" in the "+selectBBOX);
InputStream is = null; InputStream is = null;
List<FeatureRow> listFeaturesRow = new ArrayList<FeatureRow>(); List<FeatureRow> listFeaturesRow = new ArrayList<FeatureRow>();
try { try {
String url = GisMakers.buildWFSFeatureQuery(layerItem, mapSrsName, mapBBOX, maxWFSFeature, GisMakers.JSON); String url = GisMakers.buildWFSFeatureQuery(layerItem, mapSrsName, selectBBOX, maxWFSFeature, GisMakers.JSON);
String cqlFilterValue = URLParserUtil.extractValueOfParameterFromURL(GisMakers.CQL_FILTER_PARAMETER, url); String cqlFilterValue = URLParserUtil.extractValueOfParameterFromURL(GisMakers.CQL_FILTER_PARAMETER, url);
LOG.info("Found CQL filter value into query string: "+cqlFilterValue); LOG.info("Found CQL filter value into query string: "+cqlFilterValue);
@ -116,6 +116,11 @@ public class FeatureParser {
LOG.info("No features detected in the response, returning empty list"); LOG.info("No features detected in the response, returning empty list");
return listFeaturesRow; return listFeaturesRow;
} }
JSONObject crs = json.getJSONObject("crs");
JSONObject crsProp = crs.getJSONObject("properties");
LOG.info("Features are: "+features.length()); LOG.info("Features are: "+features.length());
for (int i=0; i<features.length(); i++) { for (int i=0; i<features.length(); i++) {

11
src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/FeatureRow.java
View File

@ -26,6 +26,8 @@ public class FeatureRow implements Serializable {
private Map<String, List<String>> mapProperties; private Map<String, List<String>> mapProperties;
private FeatureGeometry geometry; private FeatureGeometry geometry;
private String crsName;
public FeatureRow() { public FeatureRow() {
} }
@ -43,7 +45,14 @@ public class FeatureRow implements Serializable {
public void setMapProperties(Map<String, List<String>> mapProperties) { public void setMapProperties(Map<String, List<String>> mapProperties) {
this.mapProperties = mapProperties; this.mapProperties = mapProperties;
} }
public String getCrsName() {
return crsName;
}
public void setCrsName(String crsName) {
this.crsName = crsName;
}
public FeatureGeometry getGeometry() { public FeatureGeometry getGeometry() {
return geometry; return geometry;