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

Updated pom version at 4.3.0

This commit is contained in:
Francesco Mangiacrapa 2020-04-08 14:49:47 +02:00
parent 51b04ddc28
commit 42a0c7aac7
8 changed files with 112 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
changelog.xml
View File

@ -1,46 +1,58 @@
<ReleaseNotes>
<Changeset component="org.gcube.portlets-user.GISViewer.4-2-2"
date="2018-06-08">
<Change>[Task #11352] Another fix regarding print out of password in clear
<Changeset
component="org.gcube.portlets-user.GISViewer.4-3-0" date="2020-04-08">
<Change>[Task #189812] change the base layer True Marble
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.4-2-1"
date="2018-03-07">
<Changeset
component="org.gcube.portlets-user.GISViewer.4-2-2" date="2018-06-08">
<Change>[Task #11352] Another fix regarding print out of password in
clear
</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-user.GISViewer.4-2-2" date="2018-06-08">
<Change>[Task #11352] Another fix regarding print out of password in
clear
</Change>
</Changeset>
<Changeset
component="org.gcube.portlets-user.GISViewer.4-2-1" date="2018-03-07">
<Change>[Task #11352] Removed print out password as plaintext
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.4-2-0"
date="2017-12-19">
<Changeset
component="org.gcube.portlets-user.GISViewer.4-2-0" date="2017-12-19">
<Change>[Feature #10612] Extend GISViewer's zoom range
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.4-1-0"
date="2017-06-28">
<Changeset
component="org.gcube.portlets-user.GISViewer.4-1-0" date="2017-06-28">
<Change>Changed maven compiler at 1.8
</Change>
<Change>[Feature #5164] Upgraded to gwt 2.7.0
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.4-0-0"
date="2016-09-26">
<Changeset
component="org.gcube.portlets-user.GISViewer.4-0-0" date="2016-09-26">
<Change>[Feature #5148] Removed dependency 'geoserverinterface' and
changed interface
</Change>
<Change>[Feature #5164] Upgraded to gwt 2.7.0
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-10-2"
date="2016-09-16">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-10-2" date="2016-09-16">
<Change>[Release #5037] Fixed Etics dependency
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-10-1"
date="2016-04-28">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-10-1" date="2016-04-28">
<Change>Bug Fixing for method getValueOfParameter
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-10-0"
date="2016-02-15">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-10-0" date="2016-02-15">
<Change>[Feature: #2034] Added method to get gcube token for WPS
service
</Change>
@ -52,13 +64,13 @@
<Change>[Feature #2232] Added Z-Axis for ncWMS layers
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-9-0"
date="2016-01-04">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-9-0" date="2016-01-04">
<Change>[Task: #1283] Added code to manage ncWMS layers
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-8-0"
date="2015-09-25">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-8-0" date="2015-09-25">
<Change>Bug #427. Validation of the datestamp read from metadata
retrieved;
GisViewer upgrade to OpenLayers 2.11
@ -70,76 +82,76 @@
integration
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-7-0"
date="2015-03-13">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-7-0" date="2015-03-13">
<Change>Feature #203. Updated transect invocation</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-6-2"
date="2015-03-13">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-6-2" date="2015-03-13">
<Change>Changed css
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-6-1"
date="2015-02-10">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-6-1" date="2015-02-10">
<Change>Fixed True Marble
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-5-1"
date="2014-09-01">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-5-1" date="2014-09-01">
<Change>Fixed support #832: z-index too high
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-5-0"
date="2014-09-01">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-5-0" date="2014-09-01">
<Change>Updated to support display of layers stored on Map Server
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-4-0"
date="2014-06-04">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-4-0" date="2014-06-04">
<Change>Updated to support new portal bom configurations
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-3-0"
date="2013-10-21">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-3-0" date="2013-10-21">
<Change>#Ticket 2223. This project was enhancements to gwt 2.5.1
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-2-0"
date="2013-09-16">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-2-0" date="2013-09-16">
<Change>New methods are added to read "describe feature type" used for
trunsect functionality
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-1-0"
date="2013-05-29">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-1-0" date="2013-05-29">
<Change>#497 Fixed issue</Change>
<Change>New method - add wms layers</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.3-0-0"
date="2013-03-05">
<Changeset
component="org.gcube.portlets-user.GISViewer.3-0-0" date="2013-03-05">
<Change># 1272 Gis Viewer was mavenized</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.2-1-3"
date="2012-11-30">
<Changeset
component="org.gcube.portlets-user.GISViewer.2-1-3" date="2012-11-30">
<Change>Update</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.2-1-2"
date="2012-10-25">
<Changeset
component="org.gcube.portlets-user.GISViewer.2-1-2" date="2012-10-25">
<Change>Update</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.2-1-1"
date="2012-09-03">
<Changeset
component="org.gcube.portlets-user.GISViewer.2-1-1" date="2012-09-03">
<Change>Update</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.2-1-0"
date="2012-07-24">
<Changeset
component="org.gcube.portlets-user.GISViewer.2-1-0" date="2012-07-24">
<Change>WFS performance improvement</Change>
<Change>Advanced click data interface</Change>
<Change>Enabling workspace image exporting</Change>
<Change>Interface enhancement</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.2-0-0"
date="2012-05-04">
<Changeset
component="org.gcube.portlets-user.GISViewer.2-0-0" date="2012-05-04">
<Change>Code optimizing</Change>
<Change>Interface Enhancement</Change>
<Change>Implementation of an additional panel interface version
@ -155,8 +167,8 @@
<Change>Optimize map preview</Change>
<Change>Filter on Workspace</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.1-4-0"
date="2012-02-17">
<Changeset
component="org.gcube.portlets-user.GISViewer.1-4-0" date="2012-02-17">
<Change>Most of the code has been refactorized</Change>
<Change>Unused files and libraries have been removed</Change>
<Change>Added generic parameters retrieving system</Change>
@ -165,12 +177,12 @@
date="2011-07-09">
<Change>release with minor changes</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.1-1-1"
date="2011-12-07">
<Changeset
component="org.gcube.portlets-user.GISViewer.1-1-1" date="2011-12-07">
<Change>release with minor changes</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.GISViewer.1-1-0"
date="2011-02-02">
<Changeset
component="org.gcube.portlets-user.GISViewer.1-1-0" date="2011-02-02">
<Change>First Release</Change>
</Changeset>
</ReleaseNotes>

2
pom.xml
View File

@ -11,7 +11,7 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>gis-viewer</artifactId>
<version>4.2.2-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<name>GIS Viewer Widget</name>
<description>
GWT Widget application to access GIS Data

4
src/main/java/org/gcube/portlets/user/gisviewer/client/Constants.java
View File

@ -13,7 +13,7 @@ import com.google.gwt.core.client.GWT;
*/
public class Constants {
public static String VERSION = "4.2.0";
public static String VERSION = "4.3.0";
public static String GCUBE_TOKEN = "d7a4076c-e8c1-42fe-81e0-bdecb1e8074a"; //A STATIC GCUBE TOKEN FOR TEST
public static final Float DEFAULT_XY_WPS_RESOLUTION = new Float(0.5);
@ -107,7 +107,7 @@ public class Constants {
public static final String MessageLoadingLayersData = "Loading layers data...";
public static final String FAO_DATA_STORE = "FI Geoserver";
public static final String FAO_DATA_STORE_PREFIX = "fifao_";
public static final int numZoomLevels = 19;
public static final int numZoomLevels = 14;
public static final String defaultScope = "/gcube/devsec/devVRE";
// public static final String defaultScope = "/d4science.research-infrastructures.eu/gCubeApps/EcologicalModelling";

11
src/main/java/org/gcube/portlets/user/gisviewer/client/GisViewerLayout.java
View File

@ -26,6 +26,8 @@ import com.extjs.gxt.ui.client.widget.layout.CenterLayout;
import com.extjs.gxt.ui.client.widget.layout.FitLayout;
import com.extjs.gxt.ui.client.widget.layout.FlowLayout;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.user.client.ui.HTML;
public class GisViewerLayout extends LayoutContainer {
@ -120,6 +122,15 @@ public class GisViewerLayout extends LayoutContainer {
westPanel.setBodyStyle(Constants.panelsBodyStyle);
//westPanel.setSize(500, 100);
westPanel.setScrollMode(Scroll.AUTO);
Scheduler.get().scheduleDeferred(new ScheduledCommand() {
@Override
public void execute() {
westPanel.collapse(); //I'm closing the panel as default
}
});
// northPanel = new ContentPanel();
// northPanel.setBodyStyle(Constants.panelsBodyStyle);

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

@ -350,7 +350,7 @@ implements ToolbarHandler, DataPanelHandler, LayersPanelHandler, CqlFilterHandle
private void createOpenLayersMap() { // TODO update for pluggable layers
openLayersMap = new OpenLayersMap(Constants.omWidth + "px",
Constants.omHeight + "px", Constants.numZoomLevels, "GisViewer ver. "+Constants.VERSION, this);
toolBarPanel = new ToolBarPanel(this, openLayersMap);
// toolBarPanel.setStyleName("x-toolbar");
openLayersMap.addToolBar(toolBarPanel);

16
src/main/java/org/gcube/portlets/user/gisviewer/client/openlayers/OpenLayersMap.java
View File

@ -45,6 +45,8 @@ import org.gwtopenmaps.openlayers.client.util.JSObject;
import com.extjs.gxt.ui.client.widget.ContentPanel;
import com.extjs.gxt.ui.client.widget.layout.FitLayout;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.core.shared.GWT;
import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.Window;
@ -178,6 +180,7 @@ public class OpenLayersMap {
map = mapWidget.getMap(); // map js-mapped object
mapWidget.setTitle(title); // set title
map.setMaxExtent(defaultBounds);
//Bounds boundOnItaly = new Bounds(22.5,56.25,28.125,61.875);
//map.getJSObject().setProperty("allOverlays", true);
// set click listener on the map
map.addMapClickListener(new MapClickListener() {
@ -250,7 +253,7 @@ public class OpenLayersMap {
GWT.log("ERROR: No base layer found!");
}
addBaseLayerToOpenLayerMap("True Marble", baseLayerName, baseLayerURI);
addBaseLayerToOpenLayerMap(baseLayerName, baseLayerName, baseLayerURI);
addControl(mouseDefaults);
addControl(pamZoomBar);
addControl(getMousePosition());
@ -258,6 +261,17 @@ public class OpenLayersMap {
addControl(new LayerSwitcher());
addTransectControl();
addBoxControl();
Scheduler.get().scheduleDeferred(new ScheduledCommand() {
@Override
public void execute() {
GWT.log("Centering on Italy");
map.setCenter(new LonLat(12.45, 42.98), 6);
}
});
}
/**

2
src/main/java/org/gcube/portlets/user/gisviewer/client/resources/baselayer.txt
View File

@ -1 +1 @@
http://geoserver1.d4science.org/geoserver/aquamaps/wms?layers=aquamaps:TrueMarble.16km.2700x1350
https://ows.terrestris.de/osm/service?layers=OSM-WMS

29
src/main/java/org/gcube/portlets/user/gisviewer/server/gisconfiguration/GisConfigurationPropertyReader.java
View File

@ -118,9 +118,6 @@ public class GisConfigurationPropertyReader {
}
}
/**
* @param dataMinerUrl the dataMinerUrl to set
*/
@ -294,18 +291,16 @@ public class GisConfigurationPropertyReader {
return builder.toString();
}
//TEST
public static void main(String[] args) {
GisConfigurationPropertyReader gr;
try {
// ScopeProvider.instance.set(DEFAULT_SCOPE);
gr = new GisConfigurationPropertyReader(true);
System.out.println(gr);
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
// //TEST
// public static void main(String[] args) {
// GisConfigurationPropertyReader gr;
// try {
//// ScopeProvider.instance.set(DEFAULT_SCOPE);
// gr = new GisConfigurationPropertyReader(true);
// System.out.println(gr);
// } catch (Exception e) {
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
// }
}