ref 11708: Setting initial map location and zoom level for the spatial data inputs in SAI
https://support.d4science.org/issues/11708 Added location and zoom git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@178770 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
c7776155a4
commit
c1e7231926
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" output="target/data-miner-manager-1.9.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
<classpathentry kind="src" output="target/data-miner-manager-1.10.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry excluding="**" kind="src" output="target/data-miner-manager-1.9.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
<classpathentry excluding="**" kind="src" output="target/data-miner-manager-1.10.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
@ -34,5 +34,5 @@
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||||
<classpathentry kind="output" path="target/data-miner-manager-1.9.1-SNAPSHOT/WEB-INF/classes"/>
|
<classpathentry kind="output" path="target/data-miner-manager-1.10.0-SNAPSHOT/WEB-INF/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
<ReleaseNotes>
|
<ReleaseNotes>
|
||||||
|
<Changeset component="${groupId}.${artifactId}.1-10-0" date="2019-04-01">
|
||||||
|
<Change>Added location and zoom support [ticket #11708]</Change>
|
||||||
|
<Change>Added coordinates EPSG:4326 and EPSG:3857 support [ticket
|
||||||
|
#11710]</Change>
|
||||||
|
</Changeset>
|
||||||
<Changeset component="${groupId}.${artifactId}.1-9-1" date="2018-12-13">
|
<Changeset component="${groupId}.${artifactId}.1-9-1" date="2018-12-13">
|
||||||
<Change>Updated to support StorageHub properties [ticket #11720]
|
<Change>Updated to support StorageHub properties [ticket #11720]
|
||||||
</Change>
|
</Change>
|
||||||
|
|
26
pom.xml
26
pom.xml
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>data-miner-manager</artifactId>
|
<artifactId>data-miner-manager</artifactId>
|
||||||
<version>1.9.1-SNAPSHOT</version>
|
<version>1.10.0-SNAPSHOT</version>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
|
|
||||||
<name>data-miner-manager</name>
|
<name>data-miner-manager</name>
|
||||||
|
@ -80,17 +80,6 @@
|
||||||
<version>2.4.0</version>
|
<version>2.4.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Storage
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.gcube.contentmanagement</groupId>
|
|
||||||
<artifactId>storage-manager-core</artifactId>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.gcube.contentmanagement</groupId>
|
|
||||||
<artifactId>storage-manager-wrapper</artifactId>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
</dependency> -->
|
|
||||||
|
|
||||||
<!-- StorageHub -->
|
<!-- StorageHub -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -190,19 +179,6 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<!-- Storage
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.gcube.contentmanagement</groupId>
|
|
||||||
<artifactId>storage-manager-core</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.gcube.contentmanagement</groupId>
|
|
||||||
<artifactId>storage-manager-wrapper</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency> -->
|
|
||||||
|
|
||||||
<!-- StorageHub -->
|
<!-- StorageHub -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.common</groupId>
|
<groupId>org.gcube.common</groupId>
|
||||||
|
|
|
@ -11,6 +11,7 @@ import org.gcube.portlets.widgets.openlayerbasicwidgets.client.event.SelectAreaD
|
||||||
import org.gcube.portlets.widgets.openlayerbasicwidgets.client.event.SelectAreaDialogEvent.SelectAreaDialogEventHandler;
|
import org.gcube.portlets.widgets.openlayerbasicwidgets.client.event.SelectAreaDialogEvent.SelectAreaDialogEventHandler;
|
||||||
import org.gcube.portlets.widgets.openlayerbasicwidgets.client.widgets.AreaSelectionDialog;
|
import org.gcube.portlets.widgets.openlayerbasicwidgets.client.widgets.AreaSelectionDialog;
|
||||||
import org.gcube.portlets.widgets.openlayerbasicwidgets.client.widgets.GeometryType;
|
import org.gcube.portlets.widgets.openlayerbasicwidgets.client.widgets.GeometryType;
|
||||||
|
import org.gcube.portlets.widgets.openlayerbasicwidgets.shared.data.Coordinates;
|
||||||
|
|
||||||
import com.allen_sauer.gwt.log.client.Log;
|
import com.allen_sauer.gwt.log.client.Log;
|
||||||
import com.google.gwt.core.shared.GWT;
|
import com.google.gwt.core.shared.GWT;
|
||||||
|
@ -119,6 +120,16 @@ public class WKTFld extends AbstractFld {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Coordinates getCoordinates() {
|
||||||
|
Coordinates coordinates = null;
|
||||||
|
if (wktParameter != null && wktParameter.getCoordinates() != null) {
|
||||||
|
coordinates = new Coordinates(wktParameter.getCoordinates().getProjection(),
|
||||||
|
wktParameter.getCoordinates().getX(), wktParameter.getCoordinates().getY(),
|
||||||
|
wktParameter.getCoordinates().getZoom());
|
||||||
|
}
|
||||||
|
return coordinates;
|
||||||
|
}
|
||||||
|
|
||||||
private void drawAGeometry() {
|
private void drawAGeometry() {
|
||||||
SelectAreaDialogEventHandler handler = new SelectAreaDialogEventHandler() {
|
SelectAreaDialogEventHandler handler = new SelectAreaDialogEventHandler() {
|
||||||
|
|
||||||
|
@ -145,7 +156,9 @@ public class WKTFld extends AbstractFld {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
areaSelectionDialog = new AreaSelectionDialog(getGeometryType());
|
GeometryType geometryType = getGeometryType();
|
||||||
|
Coordinates coordinates = getCoordinates();
|
||||||
|
areaSelectionDialog = new AreaSelectionDialog(geometryType, coordinates);
|
||||||
areaSelectionDialog.setZIndex(XDOM.getTopZIndex());
|
areaSelectionDialog.setZIndex(XDOM.getTopZIndex());
|
||||||
areaSelectionDialog.addSelectAreaDialogEventHandler(handler);
|
areaSelectionDialog.addSelectAreaDialogEventHandler(handler);
|
||||||
areaSelectionDialog.show();
|
areaSelectionDialog.show();
|
||||||
|
|
Loading…
Reference in New Issue