updated according to itegrate GisViewer 3.6

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/gis-viewer-app@101707 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2014-11-26 14:56:32 +00:00
parent ab4ddd83db
commit ae7b08d657
3 changed files with 4 additions and 4 deletions

View File

@ -3,7 +3,7 @@
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<dependent-module archiveName="gis-viewer-3.5.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gisViewer/gisViewer">
<dependent-module archiveName="gis-viewer-3.6.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gisViewer/gisViewer">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>

View File

@ -23,11 +23,9 @@ import com.google.gwt.user.client.ui.RootPanel;
*/
public class ApplicationController {
/**
*
*/
private GisViewerPanel gisViewerPanel; // for normal mode
// private GCubeGisViewerPanel gisViewerPanel; // for gcube mode
private ContentPanel gisViewerContentPanel;

View File

@ -29,6 +29,7 @@ public class WmsRequestConverter {
private ArrayList<String> styles;
private boolean onTop = true;
private ArrayList<String> listStyles;
private String wmsRequest;
/**
*
*/
@ -37,6 +38,7 @@ public class WmsRequestConverter {
}
public void parseRequest(String wmsRequest) throws Exception{
this.wmsRequest = wmsRequest;
//FIND BASE URL
int indexStart = wmsRequest.indexOf("?");
@ -63,7 +65,7 @@ public class WmsRequestConverter {
}
public void addRequestToGisViewer(){
gisViewer.addLayerByWms(GisViewerPanel.LayerType.FEATURETYPE, layerName, title, url, isExternal, isBase, displayInLayerSwitcher, listStyles, onTop);
gisViewer.addLayerByWms(GisViewerPanel.LayerType.FEATURETYPE, layerName, title, url, isExternal, isBase, displayInLayerSwitcher, listStyles, wmsRequest, onTop);
}
private String getValueOfParameter(WmsParameters wmsParam, String url){