.settings/org.eclipse.wst.common.component

@@ -67,6 +67,7 @@
     
     
     
+    
     
     
     
@@ -157,6 +158,7 @@
         
         
         
+        
         
         
         
@@ -247,6 +249,7 @@
         
         
         
+        
         
         
         
@@ -337,6 +340,7 @@
         
         
         
+        
         
         
         
@@ -427,6 +431,7 @@
         
         
         
+        
         
         
         
@@ -449,6 +454,10 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <dependent-module archiveName="geoportal-data-common-2.2.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-data-common/geoportal-data-common">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
         
         
         
@@ -607,6 +616,7 @@
         
         
         
+        
         
         
         
@@ -697,6 +707,7 @@
     
     
     
+    
     
     
     
@@ -787,6 +798,7 @@
 
 
 
+
 
 
 

src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java

@@ -515,7 +515,7 @@ public class LayerManager {
 						GWT.log("Parsed WMS Request returned: " + geoInfoWMS);
 
 						LayerItem layerItem = toLayerItem(featureType, layerTitle, geoInfoWMS.getLayerName(),
-								geoInfoWMS.getWmsRequest(), geoInfoWMS.getBaseWmsServiceHost(), true, isBase,
+								geoInfoWMS.getWmsRequest(), geoInfoWMS.getServiceEndPoint(), true, isBase,
 								displayInLayerSwitcher, (ArrayList<String>) geoInfoWMS.getStyles().getGeoStyles(),
 								geoInfoWMS.getWmsRequest(), false, geoInfoWMS.getMapWMSNoStandard(),
 								geoInfoWMS.isNcWMS(), UUID, geoInfoWMS.getZAxis(), minResolution, maxResolution);

src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerMap.java

@@ -439,7 +439,7 @@ public abstract class OpenLayerMap {
 			imageWMSParams.setLayers(layerItem.getName());
 
 			ImageWmsOptions imageWMSOptions = OLFactory.createOptions();
-			imageWMSOptions.setUrl(layerItem.getMapServerHost());
+			imageWMSOptions.setUrl(layerItem.getMapServerEndpoint());
 
 			imageWMSOptions.setParams(imageWMSParams);
 			// imageWMSOptions.setRatio(1.5f);
@@ -544,7 +544,7 @@ public abstract class OpenLayerMap {
 			imageWMSParams.setLayers(layerItem.getName());
 
 			ImageWmsOptions imageWMSOptions = OLFactory.createOptions();
-			imageWMSOptions.setUrl(layerItem.getMapServerHost());
+			imageWMSOptions.setUrl(layerItem.getMapServerEndpoint());
 			imageWMSOptions.setParams(imageWMSParams);
 			// imageWMSOptions.setRatio(1.5f);
 
@@ -595,7 +595,7 @@ public abstract class OpenLayerMap {
 			imageWMSParams.setLayers(layerItem.getName());
 
 			ImageWmsOptions imageWMSOptions = OLFactory.createOptions();
-			imageWMSOptions.setUrl(layerItem.getMapServerHost());
+			imageWMSOptions.setUrl(layerItem.getMapServerEndpoint());
 			imageWMSOptions.setParams(imageWMSParams);
 			// imageWMSOptions.setRatio(1.5f);
 

src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/customoverlays/OverlayCustomLayerPanel.java

@@ -219,7 +219,7 @@ public class OverlayCustomLayerPanel extends Composite {
 		flow.add(new HTMLPanel("Legend for: " + theLayerName));
 		final HorizontalPanel hpLegend = new HorizontalPanel();
 
-		String url = geoInformation.getBaseWmsServiceHost() + "?service=WMS&" + "version="
+		String url = geoInformation.getServiceEndPoint() + "?service=WMS&" + "version="
 				+ URLUtil.getValueOfParameter("version", wmsLink) + "&" + "request=GetLegendGraphic&" + "layer="
 				+ theLayerName;
 

src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/layercollection/LayerCollectionPanel.java

@@ -271,7 +271,7 @@ public class LayerCollectionPanel extends Composite {
 		flow.add(new HTMLPanel("Legend for: " + theLayerName));
 		final HorizontalPanel hpLegend = new HorizontalPanel();
 
-		String url = geoInformation.getBaseWmsServiceHost() + "?service=WMS&" + "version="
+		String url = geoInformation.getServiceEndPoint() + "?service=WMS&" + "version="
 				+ URLUtil.getValueOfParameter("version", wmsLink) + "&" + "request=GetLegendGraphic&" + "layer="
 				+ theLayerName;
 

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

@@ -65,6 +65,7 @@ import org.gcube.application.geoportalcommon.shared.geoportal.ucd.HandlerDeclara
 import org.gcube.application.geoportalcommon.shared.geoportal.ucd.UseCaseDescriptorDV;
 import org.gcube.application.geoportalcommon.shared.geoportal.view.ProjectView;
 import org.gcube.application.geoportalcommon.shared.gis.BoundsMap;
+import org.gcube.application.geoportalcommon.util.StringUtil;
 import org.gcube.application.geoportalcommon.util.URLParserUtil;
 import org.gcube.application.geoportaldatamapper.GcubeProfilesPerUCDIdCache;
 import org.gcube.application.geoportaldatamapper.Geoportal_JSON_Mapper;
@@ -262,7 +263,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme
 	public GeoInformationForWMSRequest loadGeoInfoForWmsRequest(String wmsLink, String layerName) throws Exception {
 		try {
 			WMSUrlValidator validator = new WMSUrlValidator(wmsLink, layerName);
-			String wmsServiceHost = validator.getWmsServiceHost();
+			String wmsServiceServiceEndpoint = validator.getWmsServiceEndPoint();
 			String validWMSRequest = validator.parseWMSRequest(true, true);
 			layerName = validator.getLayerName();
 			String versionWms = validator.getValueOfParsedWMSParameter(WmsParameters.VERSION);
@@ -289,7 +290,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme
 					? new ZAxis(layerZAxis.getUnits(), layerZAxis.isPositive(), layerZAxis.getValues())
 					: null;
 
-			return new GeoInformationForWMSRequest(wmsServiceHost, validWMSRequest, layerName, versionWms, crs,
+			return new GeoInformationForWMSRequest(wmsServiceServiceEndpoint, validWMSRequest, layerName, versionWms, crs,
 					mapWmsNotStandard, styles, styles.isNcWms(), zAxis);
 		} catch (Exception e) {
 			String msg = "An error occurred during wms request validation for layer: " + layerName;
@@ -705,7 +706,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme
 		GCubeSDILayer indexLayer = index.getLayer();
 		HashMap<String, String> ogcLinks = indexLayer.getOgcLinks();
 		String wmsLink = ogcLinks.get("wms");
-		LOG.info("wms link is {}", wmsLink);
+		LOG.info("wms link is {}",  StringUtil.ellipsize(wmsLink, 150));
 		int lastCharOfthePath = wmsLink.indexOf("?");
 		String wmsPath = wmsLink.substring(0, lastCharOfthePath);
 		for (GeoServerPlatformInfoDV geoserver : indexLayer.getPlatformInfos()) {
@@ -715,7 +716,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme
 				LOG.debug("purged wmsPath from the 'workspace' is {}", wmsPath);
 				wmsLink = wmsPath + wmsLink.substring(lastCharOfthePath, wmsLink.length());
 				ogcLinks.put("wms", wmsLink);
-				LOG.info("wms link without {} is {}", geoserver.getWorkspace(), wmsLink);
+				LOG.info("wms link without {} is {}", geoserver.getWorkspace(), StringUtil.ellipsize(wmsLink, 150));
 			}
 		}
 		return index;
@@ -863,7 +864,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme
 	 */
 	@Override
 	protected void onBeforeRequestDeserialized(String serializedRequest) {
-		LOG.info("onBeforeRequestDeserialized called");
+		LOG.debug("onBeforeRequestDeserialized called");
 		String scope = "";
 
 		try {

src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/gis/GisMakers.java

@@ -61,8 +61,8 @@ public class GisMakers {
 	public static String buildWFSFeatureQuery(LayerItem layerItem, String mapSrsName, BoundsMap mapBBOX,
 			int maxFeatures, String outputFormat) {
 
-		String link = layerItem.getMapServerHost();
+		String link = layerItem.getMapServerEndpoint();
-		LOG.debug("Map server host URL: " + link);
+		LOG.debug("Map server endpoint: " + link);
 		LOG.debug("CQL filter is: " + layerItem.getCqlFilter());
 		LOG.debug("MAX FEATURES: " + maxFeatures);
 		LOG.debug("BBOX: " + mapBBOX);

src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/gis/WMSUrlValidator.java

@@ -24,7 +24,7 @@ public class WMSUrlValidator {
 	private static final String OWS = "ows";
 	private HashMap<String, String> parametersValue = new HashMap<String, String>();
 	private String wmsRequestURI;
-	private String wmsServiceHost;
+	private String wmsServiceEndPoint;
 	private String layerName;
 
 	private String wmsNoStandardParameters = "";
@@ -48,34 +48,29 @@ public class WMSUrlValidator {
 			throw new Exception("WMS request is null or empty");
 
 		this.wmsRequestURI = wmsRequest.trim();
-		boolean isOwsService = GeoWmsServiceUtility.isOWSSerice(this.wmsRequestURI);
-		WebMapServerHost webMapServerHost;
-
-		// IS WMS?
-		if (GeoWmsServiceUtility.isWMSService(wmsRequestURI)) {
-			LOG.trace("found " + GeoWmsServiceUtility.SERVICE_WMS + " in wms request: " + wmsRequestURI);
-			webMapServerHost = getWebMapServerHost(wmsRequestURI);
-		} else
-			throw new Exception("WMS service not found for layer: " + inputLayerName);
 
 		// VALIDATION WMS
-		String baseWmsService = webMapServerHost.getHost();
+		int endpointLastCharIndex = wmsRequest.lastIndexOf("?");
-		// IS OWS OR WMS?
+		// No '?' char found
-		this.wmsServiceHost = appendWmsServiceToBaseUrl(wmsRequest.substring(0, wmsRequest.indexOf("?")), isOwsService);
+		if (endpointLastCharIndex == -1) {
-		this.layerName = inputLayerName;
+			LOG.info("Char '?' not found, setting last index the end of the URI");
-
+			endpointLastCharIndex = wmsRequest.length();
+		}
+		String readWMSServiceEndpoint = wmsRequest.substring(0, endpointLastCharIndex);
+		this.wmsServiceEndPoint = readWMSServiceEndpoint;
 		try {
 			// VALIDATE WMS SERVICE FOR WEB MAP SERVER
-			if (!HttpRequestUtil.urlExists(this.wmsServiceHost, true)) {
+			if (!HttpRequestUtil.urlExists(this.wmsServiceEndPoint, true)) {
-				LOG.info("baseWmsServiceUrl: " + wmsServiceHost
+				LOG.warn("baseWmsServiceUrl: " + wmsServiceEndPoint + " is not valid URL!!");
-						+ " is not a geoserver, setting as input base wms server: " + baseWmsService);
+				this.wmsServiceEndPoint = readWMSServiceEndpoint;
-				this.wmsServiceHost = baseWmsService;
+
 			}
 
 		} catch (Exception e) {
-			LOG.error("error on validating geoserver wms service: " + e);
+			LOG.error("Error on validating the endpoint: " + this.wmsServiceEndPoint, e);
-			LOG.info("setting baseWmsService as input base wms server: " + baseWmsService);
+			boolean isOwsService = GeoWmsServiceUtility.isOWSSerice(this.wmsRequestURI);
-			this.wmsServiceHost = baseWmsService;
+			LOG.info("Retrying by appending suffix WMS or WFS...");
+			this.wmsServiceEndPoint = appendWmsServiceToBaseUrl(readWMSServiceEndpoint, isOwsService);
 		}
 
 		// VALIDATION FOR THREDDS - FIND LAYER NAME INTO WMS PATH
@@ -87,6 +82,7 @@ public class WMSUrlValidator {
 
 		}
 		
+		LOG.info("WMSURLValidator found endpoint: " + wmsServiceEndPoint);
 		parametersValue.put(WmsParameters.LAYERS.getParameter(), this.layerName);
 	}
 
@@ -230,13 +226,13 @@ public class WMSUrlValidator {
 	}
 
 	/**
-	 * Gets the wms service host.
+	 * Gets the wms service end point.
 	 *
-	 * @return the wms service host
+	 * @return the wms service end point
 	 */
-	public String getWmsServiceHost() {
+	public String getWmsServiceEndPoint() {
 
-		return wmsServiceHost;
+		return wmsServiceEndPoint;
 	}
 
 	/**

src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/gis/LayerItem.java

@@ -36,7 +36,7 @@ public class LayerItem implements Serializable, Cloneable {
 	private String url;
 
 	/** The base map server URL. */
-	private String mapServerHost;
+	private String mapServerEndpoint;
 
 	/** The style. */
 	private String style;
@@ -774,21 +774,21 @@ public class LayerItem implements Serializable, Cloneable {
 	}
 
 	/**
-	 * Gets the map server host.
+	 * Gets the map server endpoint.
 	 *
-	 * @return the map server host
+	 * @return the map server endpoint
 	 */
-	public String getMapServerHost() {
+	public String getMapServerEndpoint() {
-		return mapServerHost;
+		return mapServerEndpoint;
 	}
 
 	/**
 	 * Sets the map server host.
 	 *
-	 * @param mapServerHost the new map server host
+	 * @param mapServerEndpoint the new map server host
 	 */
-	public void setMapServerHost(String mapServerHost) {
+	public void setMapServerHost(String mapServerEndpoint) {
-		this.mapServerHost = mapServerHost;
+		this.mapServerEndpoint = mapServerEndpoint;
 	}
 
 	/**
@@ -881,6 +881,11 @@ public class LayerItem implements Serializable, Cloneable {
 		return maxResolution;
 	}
 
+	/**
+	 * To string.
+	 *
+	 * @return the string
+	 */
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();
@@ -890,8 +895,8 @@ public class LayerItem implements Serializable, Cloneable {
 		builder.append(title);
 		builder.append(", url=");
 		builder.append(url);
-		builder.append(", mapServerHost=");
+		builder.append(", mapServerEndpoint=");
-		builder.append(mapServerHost);
+		builder.append(mapServerEndpoint);
 		builder.append(", style=");
 		builder.append(style);
 		builder.append(", isTrasparent=");

src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/gis/wms/GeoInformationForWMSRequest.java

@@ -15,8 +15,7 @@ public class GeoInformationForWMSRequest implements Serializable {
 	/** The Constant serialVersionUID. */
 	private static final long serialVersionUID = -6846636281073641003L;
 
-	/** The base wms service host. */
+	private String serviceEndPoint;
-	private String baseWmsServiceHost;
 
 	/** The wms request. */
 	private String wmsRequest;
@@ -53,7 +52,7 @@ public class GeoInformationForWMSRequest implements Serializable {
 	/**
 	 * Instantiates a new geo information for wms request.
 	 *
-	 * @param baseWmsServiceHost the base wms service host
+	 * @param serviceEndPoint  the base wms service host
 	 * @param wmsRequest       the wms request
 	 * @param layerName        the layer name
 	 * @param versionWms       the version wms
@@ -63,10 +62,9 @@ public class GeoInformationForWMSRequest implements Serializable {
 	 * @param isNcWMS          the is nc WMS
 	 * @param zAxis            the z axis
 	 */
-	public GeoInformationForWMSRequest(String baseWmsServiceHost, String wmsRequest, String layerName,
+	public GeoInformationForWMSRequest(String serviceEndPoint, String wmsRequest, String layerName, String versionWms,
-			String versionWms, String crs, HashMap<String, String> mapWmsNoStandard, Styles styles, boolean isNcWMS,
+			String crs, HashMap<String, String> mapWmsNoStandard, Styles styles, boolean isNcWMS, ZAxis zAxis) {
-			ZAxis zAxis) {
+		this.serviceEndPoint = serviceEndPoint;
-		this.baseWmsServiceHost = baseWmsServiceHost;
 		this.wmsRequest = wmsRequest;
 		this.layerName = layerName;
 		this.versionWMS = versionWms;
@@ -98,13 +96,21 @@ public class GeoInformationForWMSRequest implements Serializable {
 	}
 
 	/**
-	 * Gets the base wms service host.
+	 * Gets the service end point.
 	 *
-	 * @return the baseWmsServiceHost
+	 * @return the service end point
 	 */
-	public String getBaseWmsServiceHost() {
+	public String getServiceEndPoint() {
+		return serviceEndPoint;
+	}
 
-		return baseWmsServiceHost;
+	/**
+	 * Sets the service end point.
+	 *
+	 * @param serviceEndPoint the new service end point
+	 */
+	public void setServiceEndPoint(String serviceEndPoint) {
+		this.serviceEndPoint = serviceEndPoint;
 	}
 
 	/**
@@ -180,11 +186,11 @@ public class GeoInformationForWMSRequest implements Serializable {
 	/**
 	 * Sets the base wms service host.
 	 *
-	 * @param baseWmsServiceHost the baseWmsServiceHost to set
+	 * @param baseWmsServiceHost the new base wms service host
 	 */
 	public void setBaseWmsServiceHost(String baseWmsServiceHost) {
 
-		this.baseWmsServiceHost = baseWmsServiceHost;
+		this.serviceEndPoint = baseWmsServiceHost;
 	}
 
 	/**
@@ -271,8 +277,8 @@ public class GeoInformationForWMSRequest implements Serializable {
 	public String toString() {
 
 		StringBuilder builder = new StringBuilder();
-		builder.append("GeoInformationForWMSRequest [baseWmsServiceHost=");
+		builder.append("GeoInformationForWMSRequest [serviceEndPoint=");
-		builder.append(baseWmsServiceHost);
+		builder.append(serviceEndPoint);
 		builder.append(", wmsRequest=");
 		builder.append(wmsRequest);
 		builder.append(", layerName=");

src/main/webapp/GeoportalDataViewer.css

@@ -877,10 +877,14 @@ RESPONSIVE
 	.dand-layer {
 		width: 336px;
 	}
-	.search-facility {
-		width: 100%;
-	}
 	.thePopDataTable {
+		
+	}
+	.search-facility {
+		max-width: 680px;
+	}
+	.search-field {
+		width: 97%;
 	}
 	.ol-popup {
 		min-width: 220px;
@@ -889,6 +893,9 @@ RESPONSIVE
 	.thePopDataTable tr:last-of-type {
 		display: none;
 	}
+	.layer-panel {
+		width: 355px;
+	}
 }
 @media all and (max-width: 1024px) {
 	#timeline-data {
@@ -900,8 +907,8 @@ RESPONSIVE
 		width: 400px;
 	}
 	.search-facility {
-		width: 250px;
+		/*width: 250px;
-		max-width: 300px;
+		max-width: 300px;*/
 	}
 	.inner-toolbar {
 		/*width: 100px;*/