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

2087: Geo improvements: moving geo-utility dependecy from geo-explorer to gisviewer 

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

gis-viewer-app integrated with new GisViewer

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/gis-viewer-app@122606 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2016-01-28 15:45:01 +00:00
parent e27c900f67
commit a2311fcdf8
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/org/gcube/portlets/user/gisviewerapp/client/WmsRequestConverter.java
View File

@ -3,16 +3,12 @@
*/
package org.gcube.portlets.user.gisviewerapp.client;
import java.util.ArrayList;
import java.util.HashMap;
import org.gcube.portlets.user.gisviewer.client.GisViewerPanel;
import org.gcube.portlets.user.gisviewer.client.GisViewerPanel.LayerType;
import org.gcube.portlets.user.gisviewerapp.client.rpc.GisViewerAppServiceAsync;
import org.gcube.portlets.user.gisviewerapp.shared.GeoInformation;
import org.gcube.portlets.user.gisviewer.client.commons.utils.WmsParameters;
import org.gcube.portlets.user.gisviewer.client.commons.utils.WmsUrlValidator;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
/**
@ -25,7 +21,7 @@ public class WmsRequestConverter {
private GisViewerPanel gisViewer;
private LayerType layerType = LayerType.FEATURETYPE;
private LayerType layerType = LayerType.FEATURE_TYPE;
private String title;
private String displayLayerName;
private String url;
@ -64,7 +60,11 @@ public class WmsRequestConverter {
// throw new Exception("Bad server request '?' not found!");
}
GisViewerAppServiceAsync.Util.getInstance().getParametersForWmsRequest(wmsRequest, displayName, new AsyncCallback<GeoInformation>() {
String layerName = WmsUrlValidator.getValueOfParameter(WmsParameters.LAYERS, wmsRequest);
displayName= displayName==null || displayName.isEmpty()?layerName:"No Title";
gisViewer.addLayerByWmsRequest(displayName, layerName, wmsRequest, isBase, displayInLayerSwitcher, "", onTop);
/*GisViewerAppServiceAsync.Util.getInstance().getParametersForWmsRequest(wmsRequest, displayName, new AsyncCallback<GeoInformation>() {
@Override
public void onFailure(Throwable caught) {
@ -75,7 +75,7 @@ public class WmsRequestConverter {
public void onSuccess(GeoInformation result) {
addRequestToGisViewer(result);
}
});
});*/
/*this.listStyles = new ArrayList<String>();
String style = urlValidator.getValueOfParsedWMSParameter(org.gcube.portlets.user.gisviewer.client.commons.utils.WmsParameters.STYLES);
@ -92,8 +92,18 @@ public class WmsRequestConverter {
}*/
}
/*
private void addRequestToGisViewer(GeoInformation result) {
gisViewer.addLayerByWms(GisViewerPanel.LayerType.FEATURETYPE, result.getTitle(), result.getLayerName(), url, isExternal, isBase, displayInLayerSwitcher, (ArrayList<String>)result.getGeoStyle().getStyles(), wmsRequest, onTop, (HashMap<String, String>) result.getMapWmsNoStandardParams(), result.getGeoStyle().isNcWMS(), null);
gisViewer.addLayerByWms(GisViewerPanel.LayerType.FEATURE_TYPE, result.getTitle(), result.getLayerName(), url, isExternal, isBase, displayInLayerSwitcher, (ArrayList<String>)result.getGeoStyle().getStyles(), wmsRequest, onTop, (HashMap<String, String>) result.getMapWmsNoStandardParams(), result.getGeoStyle().isNcWMS(), null);
}*/
/**
* @return the wmsRequest
*/
public String getWmsRequest() {
return wmsRequest;
}
/**