From 5aa24f61988c82766c61e57381316599490cc2e1 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Thu, 29 Oct 2020 17:08:29 +0100
Subject: [PATCH] fixing wsf query

---
 .../client/LayerManager.java                  | 26 +++++++++++-
 .../client/gis/OpenLayerOSM.java              |  4 ++
 .../server/gis/FeatureParser.java             |  8 ++--
 .../server/gis/GisMakers.java                 | 42 ++++++++++---------
 4 files changed, 55 insertions(+), 25 deletions(-)

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 3c5796a..9141618 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
@@ -21,6 +21,8 @@ import com.google.gwt.event.shared.HandlerManager;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
+import ol.Coordinate;
+
 
 /**
  * The Class LayerManager.
@@ -63,12 +65,34 @@ public class LayerManager {
 						isLayerVisible(layerItem);
 						
 					}
+					
 					BoundsMap mapBBOX = new BoundsMap();
-					mapBBOX.setCrs(olMap.getProjectionCode());
+					//THIS IS SHOULD BE CORRET, THE BOUND AND CRS ARE READ FROM MAP
+					/*mapBBOX.setCrs(olMap.getProjectionCode());
 					mapBBOX.setLowerLeftX(olMap.getExtent().getLowerLeftX());
 					mapBBOX.setLowerLeftY(olMap.getExtent().getLowerLeftY());
 					mapBBOX.setUpperRightX(olMap.getExtent().getUpperRightX());
 					mapBBOX.setUpperRightY(olMap.getExtent().getUpperRightY());
+					*/
+					
+					//THE FOLLOWING SHOULD BE NOT NEEDED BUT THE GETFEATURE WITH EPSG_3857 SEEMS NOT WORK IN OUR GEOSERVER
+					double minX = olMap.getExtent().getLowerLeftX();
+					double minY = olMap.getExtent().getLowerLeftY();
+					Coordinate centerCoordinate = new Coordinate(minX, minY);
+					centerCoordinate = olMap.transform(centerCoordinate, GeoportalDataViewerConstants.EPSG_3857, GeoportalDataViewerConstants.EPSG_4326);
+					mapBBOX.setLowerLeftX(centerCoordinate.getX());
+					mapBBOX.setLowerLeftY(centerCoordinate.getY());
+					
+					double maxX = olMap.getExtent().getUpperRightX();
+					double maxY = olMap.getExtent().getUpperRightY();
+					centerCoordinate = new Coordinate(maxX,maxY);
+					centerCoordinate = olMap.transform(centerCoordinate, GeoportalDataViewerConstants.EPSG_3857, GeoportalDataViewerConstants.EPSG_4326);
+					mapBBOX.setUpperRightX(centerCoordinate.getX());
+					mapBBOX.setUpperRightY(centerCoordinate.getY());
+					
+					mapBBOX.setCrs(GeoportalDataViewerConstants.EPSG_4326);
+					
+					GWT.log("Bounds is: "+mapBBOX);
 
 					GeoportalDataViewerServiceAsync.Util.getInstance().getDataResult(layerItems, olMap.getProjectionCode(), mapBBOX, GeoportalDataViewerConstants.MAX_WFS_FEATURES, olMap.getCurrentZoomLevel(), new AsyncCallback<List<GeoNaDataObject>>() {
 
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerOSM.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerOSM.java
index 7e80634..857daaa 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerOSM.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/OpenLayerOSM.java
@@ -421,6 +421,10 @@ public class OpenLayerOSM {
 		return this.map.getView().calculateExtent(map.getSize());
 	}
 	
+	public Coordinate transform (Coordinate centerCoordinate, String source, String target){
+		 return Projection.transform(centerCoordinate, source, target);
+	}
+	
 
 }
 
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 4eded49..b81f88b 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
@@ -77,7 +77,7 @@ public class FeatureParser {
 	@SuppressWarnings("unchecked")
 	private static List<FeatureRow> getWFSFeatureProperties(LayerItem layerItem, String mapSrsName, BoundsMap mapBBOX, int maxWFSFeature) {
 
-		LOG.info("getTableFromJson -> Creating WfsTable to layerItem:  "+layerItem.getName());
+		LOG.info("getWFSFeatureProperties for layerItem:  "+layerItem.getName() +" in the "+mapBBOX);
 		InputStream is = null;
 		List<FeatureRow> listFeaturesRow = new ArrayList<FeatureRow>();
 		try {
@@ -93,7 +93,7 @@ public class FeatureParser {
 				url = url.replace(notEncodedCQLFilter, toEncodeCQLFilter);
 			}
 			
-			LOG.info("getTableFromJson -> WFS URL:  "+url);
+			LOG.info("Built WFS URL:  "+url);
 			is = new URL(url).openStream();
 			String jsonTxt = IOUtils.toString(is);
 
@@ -109,6 +109,7 @@ public class FeatureParser {
 				LOG.info("No features detected in the response, returning empty list");
 				return listFeaturesRow;
 			}
+			LOG.info("Features are:  "+features.length());
 			
 			for (int i=0; i<features.length(); i++) {
 				final FeatureRow row = new FeatureRow();
@@ -131,10 +132,8 @@ public class FeatureParser {
 						mapProperties.put(key, theValues);
 					}
 				}
-				
 				row.setMapProperties(mapProperties);
 				listFeaturesRow.add(row);
-
 				LOG.info("Added row "+row+" to exported properties");
 			}
 
@@ -146,6 +145,7 @@ public class FeatureParser {
 			IOUtils.closeQuietly(is);
 		}
 
+		LOG.info("Returning  "+listFeaturesRow.size()+" features");
 		return listFeaturesRow;
 	}
 }
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 4493061..16bdc4c 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
@@ -4,8 +4,8 @@ import org.gcube.portlets.user.geoportaldataviewer.server.gis.MapServerRecognize
 import org.gcube.portlets.user.geoportaldataviewer.server.util.URLParserUtil;
 import org.gcube.portlets.user.geoportaldataviewer.shared.gis.BoundsMap;
 import org.gcube.portlets.user.geoportaldataviewer.shared.gis.LayerItem;
-
-import com.google.gwt.core.shared.GWT;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -31,6 +31,8 @@ public class GisMakers {
 	
 	private static String[][] a = { { "\\?", "%3F" }, { "&", "%26" }, };
 	
+	private static final Logger LOG = LoggerFactory.getLogger(GisMakers.class);
+	
 	/**
 	 * The Enum COORDINATE_FORMAT.
 	 *
@@ -56,35 +58,35 @@ public class GisMakers {
 	public static String buildWFSFeatureQuery(LayerItem layerItem, String mapSrsName, BoundsMap mapBBOX, int maxFeatures, String outputFormat) {
 
 		String link = layerItem.getMapServerHost();
-		GWT.log("Map server host URL: " + link);
-		GWT.log("CQL filter is: " + layerItem.getCqlFilter());
+		LOG.debug("Map server host URL: " + link);
+		LOG.debug("CQL filter is: " + layerItem.getCqlFilter());
 
 		String outputformat = null;
 		String boundingBox = "";
 
 		// CASE MAP SERVER
 		SERVERTYPE mapserverType = MapServerRecognize.recongnize(layerItem);
-		GWT.log("Recongnized SERVERTYPE: " + mapserverType);
+		LOG.debug("Recongnized SERVERTYPE: " + mapserverType);
+		
 
 		if (mapserverType != null) {
 			if (mapserverType.equals(SERVERTYPE.MAPSERVER)) {
-				GWT.log("wms url contains wxs is a map server? no appending /wfs ");
+				LOG.debug("wms url contains wxs is a map server? no appending /wfs ");
 				outputformat = MapServerRecognize.outputFormatRecognize(SERVERTYPE.MAPSERVER, outputFormat);
-				mapSrsName = "EPSG:4326";
-				boundingBox = BBOX_FORMAT(COORDINATE_FORMAT.XY, ",",mapBBOX.getLowerLeftX(),mapBBOX.getLowerLeftY(),mapBBOX.getUpperRightX(),mapBBOX.getUpperRightY()); // USE AXIS XY
-				// TODO DEBUG
-				GWT.log("SERVERTYPE.MAPSERVER outputformat: " + outputformat);
-				GWT.log("SERVERTYPE.MAPSERVER srsName: " + mapSrsName);
-				GWT.log("SERVERTYPE.MAPSERVER boundingBox: " + boundingBox);
-			} else {
-				GWT.log("is geoserver appending suffix /wfs if is not present");
-				link += link.endsWith("wfs") ? "" : "/wfs";
-				outputformat = MapServerRecognize.outputFormatRecognize(SERVERTYPE.GEOSEVER, outputFormat);
-				mapSrsName = "urn:x-ogc:def:crs:"+mapSrsName; // USE AXIS YX
 				boundingBox = BBOX_FORMAT(COORDINATE_FORMAT.YX, ",",mapBBOX.getLowerLeftX(),mapBBOX.getLowerLeftY(),mapBBOX.getUpperRightX(),mapBBOX.getUpperRightY()); // USE AXIS XY
 				// TODO DEBUG
-				GWT.log("SERVERTYPE.GEOSEVER outputformat: " + outputformat);
-				GWT.log("SERVERTYPE.GEOSEVER srsName: " + mapSrsName);
+				LOG.debug("SERVERTYPE.MAPSERVER outputformat: " + outputformat);
+				LOG.debug("SERVERTYPE.MAPSERVER srsName: " + mapSrsName);
+				LOG.debug("SERVERTYPE.MAPSERVER boundingBox: " + boundingBox);
+			} else {
+				LOG.debug("is geoserver appending suffix /wfs if is not present");
+				link += link.endsWith("wfs") ? "" : "/wfs";
+				outputformat = MapServerRecognize.outputFormatRecognize(SERVERTYPE.GEOSEVER, outputFormat);
+				mapSrsName = "urn:x-ogc:def:crs:"+mapSrsName;
+				boundingBox = BBOX_FORMAT(COORDINATE_FORMAT.YX, ",",mapBBOX.getLowerLeftX(),mapBBOX.getLowerLeftY(),mapBBOX.getUpperRightX(),mapBBOX.getUpperRightY()); // USE AXIS XY
+				// TODO DEBUG
+				LOG.debug("SERVERTYPE.GEOSEVER outputformat: " + outputformat);
+				LOG.debug("SERVERTYPE.GEOSEVER srsName: " + mapSrsName);
 			}
 		}
 //
@@ -119,7 +121,7 @@ public class GisMakers {
 			link += (boundingBox == null ? "" : "&BBOX=" + boundingBox);
 		}
 
-		GWT.log("WFS: " + link);
+		LOG.info("WFS: " + link);
 		return link;
 	}