gCubeSystem
/
gis-viewer
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added a fix on isNCWMS 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/gis-viewer@128389 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2016-04-28 16:51:18 +00:00
parent 9739b1dd72
commit 5d847292b7
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/portlets/user/gisviewer/client/GisViewerPanel.java
View File

@ -466,6 +466,7 @@ implements ToolbarHandler, DataPanelHandler, LayersPanelHandler, CqlFilterHandle
if(layersPanel.isMasked())
layersPanel.unmask();
GWT.log("Add Layer By WMS: "+result.getMapWMSNoStandard() + ", and isNCWMS? "+result.isNcWMS());
addLayerByWms(featureType, layerTitle, layerName, result.getBaseWmsServiceHost(), true, isBase, displayInLayerSwitcher, (ArrayList<String>) result.getStyles().getGeoStyles(), result.getWmsRequest(), false, result.getMapWMSNoStandard(), result.isNcWMS(), UUID, result.getZAxis());
}
});
@ -677,6 +678,7 @@ implements ToolbarHandler, DataPanelHandler, LayersPanelHandler, CqlFilterHandle
}
}
GWT.log(url);
final FlexTable flexTable = new FlexTable();
flexTable.setStyleName("tablelegend");
flexTable.setWidget(0, 0, new Label("Style"));

3
src/main/java/org/gcube/portlets/user/gisviewer/client/commons/beans/GeoInformationForWMSRequest.java
View File

@ -48,7 +48,7 @@ public class GeoInformationForWMSRequest implements Serializable{
* @param styles the layer styles
* @param zAxis the z axis
*/
public GeoInformationForWMSRequest(String baseWmsServiceHost, String wmsRequest, String layerName, String versionWms, String crs, HashMap<String, String> mapWmsNoStandard, Styles styles, ZAxis zAxis) {
public GeoInformationForWMSRequest(String baseWmsServiceHost, String wmsRequest, String layerName, String versionWms, String crs, HashMap<String, String> mapWmsNoStandard, Styles styles, boolean isNcWMS, ZAxis zAxis) {
this.baseWmsServiceHost = baseWmsServiceHost;
this.wmsRequest = wmsRequest;
this.layerName = layerName;
@ -57,6 +57,7 @@ public class GeoInformationForWMSRequest implements Serializable{
this.mapWMSNoStandardParams = mapWmsNoStandard;
this.styles = styles;
this.zAxis = zAxis;
this.isNcWMS = isNcWMS;
}
/**

2
src/main/java/org/gcube/portlets/user/gisviewer/server/GisViewerServiceImpl.java
View File

@ -167,7 +167,7 @@ public abstract class GisViewerServiceImpl extends RemoteServiceServlet implemen
//MAP ZAXIS INTO GWT-SERIALIZABLE OBJECT
ZAxis zAxis = layerZAxis!=null?new ZAxis(layerZAxis.getUnits(), layerZAxis.isPositive(), layerZAxis.getValues()):null;
return new GeoInformationForWMSRequest(wmsServiceHost, validWMSRequest, layerName, versionWms, crs, mapWmsNotStandard, styles, zAxis);
return new GeoInformationForWMSRequest(wmsServiceHost, validWMSRequest, layerName, versionWms, crs, mapWmsNotStandard, styles, styles.isNcWms(), zAxis);
}
catch (Exception e) {
String msg = "An error occurred during wms request validation for layer: "+layerName;