diff --git a/pom.xml b/pom.xml index 32fcfb9..27329a0 100644 --- a/pom.xml +++ b/pom.xml @@ -49,31 +49,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -116,12 +116,6 @@ [2.0.0, 3.0.0-SNAPSHOT) provided - - org.gcube.resources.discovery - ic-client - [1.0.0, 2.0.0-SNAPSHOT) - provided - org.gcube.core common-scope-maps @@ -151,12 +145,12 @@ geoportal-client [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) compile - - - - - - + + + org.gcube.resources.discovery + ic-client + + com.liferay.portal diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerConstants.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerConstants.java index 4a2c5ff..39321ca 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerConstants.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerConstants.java @@ -53,7 +53,7 @@ public class GeoportalDataViewerConstants { * @param msg the msg */ public static native void print(String msg)/*-{ - console.log(msg); + console.log("js console: "+msg); }-*/; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java index e9528ab..b105793 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java @@ -134,6 +134,7 @@ public class LayerManager { mapBBOX.setCrs(GeoportalDataViewerConstants.EPSG_4326); GWT.log("Bounds is: "+mapBBOX); + GWT.log("MAX_WFS_FEATURES is: "+GeoportalDataViewerConstants.MAX_WFS_FEATURES); GeoportalDataViewerServiceAsync.Util.getInstance().getDataResult(layerObjects, olMap.getProjectionCode(), mapBBOX, GeoportalDataViewerConstants.MAX_WFS_FEATURES, olMap.getCurrentZoomLevel(), new AsyncCallback>() { @@ -184,8 +185,12 @@ public class LayerManager { } //If recordId not passed, I'm using the first feature returned - if(feature==null) + if(feature==null && recordId==null) { feature = features.get(0); + }else { + //the recordId to show has been passed but not found into list of FeatureRow + return; + } Map> entries = feature.getMapProperties(); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java index 3bceeb3..8253e09 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java @@ -30,7 +30,6 @@ import org.gcube.portlets.user.geoportaldataviewer.shared.gis.wms.GeoInformation import org.gcube.portlets.user.geoportaldataviewer.shared.gis.wms.Styles; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.wms.ZAxis; import org.gcube.portlets.user.geoportaldataviewer.shared.products.ConcessioneDV; -import org.gcube.portlets.user.geoportaldataviewer.shared.products.content.WorkspaceContentDV; import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.UploadedImageDV; import org.gcube.portlets.user.urlshortener.UrlShortener; import org.gcube.spatial.data.geoutility.GeoNcWMSMetadataUtility; @@ -173,7 +172,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme */ @Override public List getUploadedImagesForId(String itemType, Long id, int maxImages) throws Exception{ - LOG.info("getUploadedImagesForId "+id+ " called"); + LOG.info("getUploadedImagesForId [id: "+id+", itemType: "+itemType+"] called"); if(itemType==null) throw new Exception("Invalid parameter. The itemType is null"); @@ -209,25 +208,25 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme throw new Exception("Concessione with id: "+id +" not available"); } - return listUI; }catch (Exception e) { String erroMsg = UploadedImage.class.getSimpleName() +" not available for "+Concessione.class.getSimpleName() +" with id "+id; LOG.error(erroMsg,e); + throw new Exception(erroMsg); //TODO REMOTE THIS - listUI = new ArrayList(1); - UploadedImageDV img = new UploadedImageDV(); - List listWsContent = new ArrayList(); - WorkspaceContentDV wcDV = new WorkspaceContentDV(); - wcDV.setLink("https://upload.wikimedia.org/wikipedia/commons/thumb/b/b4/Tempio_di_Giove_2.jpg/1280px-Tempio_di_Giove_2.jpg"); - listWsContent.add(wcDV); - img.setListWsContent(listWsContent); - listUI.add(img); - LOG.warn("DUMMY UploadedImageDVs: "+listUI); - return listUI; +// listUI = new ArrayList(1); +// UploadedImageDV img = new UploadedImageDV(); +// List listWsContent = new ArrayList(); +// WorkspaceContentDV wcDV = new WorkspaceContentDV(); +// wcDV.setLink("https://upload.wikimedia.org/wikipedia/commons/thumb/b/b4/Tempio_di_Giove_2.jpg/1280px-Tempio_di_Giove_2.jpg"); +// listWsContent.add(wcDV); +// img.setListWsContent(listWsContent); +// listUI.add(img); +// LOG.warn("DUMMY UploadedImageDVs: "+listUI); +// return listUI; + - //throw new Exception(erroMsg); } } @@ -260,6 +259,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme if(concessionDV==null) throw new Exception("Concessione with id: "+id +" not available"); + LOG.debug("For id "+id+" returning "+ConcessioneDV.class.getSimpleName()+": "+concessionDV); return concessionDV; }catch (Exception e) { diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/gis/FeatureParser.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/gis/FeatureParser.java index bc2cfb0..a50cf28 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/gis/FeatureParser.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/gis/FeatureParser.java @@ -73,7 +73,7 @@ public class FeatureParser { @SuppressWarnings("unchecked") private static List getWFSFeatureProperties(LayerItem layerItem, String mapSrsName, BoundsMap selectBBOX, int maxWFSFeature) { - LOG.info("getWFSFeatureProperties for layerItem: "+layerItem.getName() +" in the "+selectBBOX); + LOG.info("getWFSFeatureProperties for layerItem: "+layerItem.getName() +" in the "+selectBBOX +" and maxWFSFeature: "+maxWFSFeature); InputStream is = null; List listFeaturesRow = new ArrayList(); try { diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/gis/GisMakers.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/gis/GisMakers.java index 16bdc4c..ef156f6 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/gis/GisMakers.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/gis/GisMakers.java @@ -60,6 +60,7 @@ public class GisMakers { String link = layerItem.getMapServerHost(); LOG.debug("Map server host URL: " + link); LOG.debug("CQL filter is: " + layerItem.getCqlFilter()); + LOG.debug("MAX FEATURES: " + maxFeatures); String outputformat = null; String boundingBox = ""; diff --git a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GetConcessione.java b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GetConcessione.java index cfd9cf8..e8915ed 100644 --- a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GetConcessione.java +++ b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GetConcessione.java @@ -13,10 +13,10 @@ public class GetConcessione { private static final Logger LOG = LoggerFactory.getLogger(GetConcessione.class); - private static final String YOUR_TOKEN = "8e74a17c-92f1-405a-b591-3a6090066248-98187548"; + private static final String YOUR_TOKEN = ""; public static String SCOPE = "/gcube/devsec/devVRE"; - public static long concessioneId = 67; + public static long concessioneId = 8; public static ConcessioneDV getConcessioneForId(Long id) throws Exception{ LOG.info("getConcessioneForId "+id+ "called");