gCubeSystem
/
geoportal-data-viewer-app
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MapBox Satellite integrated in the principal Map

This commit is contained in:
Francesco Mangiacrapa 2021-11-12 16:57:57 +01:00
parent 2846ba6e2f
commit 002d6d2301
6 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewer.java
View File

@ -95,10 +95,8 @@ public class GeoportalDataViewer implements EntryPoint {
int attempt = 0;
private LoaderIcon loaderApp = new LoaderIcon("Loading application....");
private HTML attributionDiv = new HTML();
/**
@ -148,7 +146,7 @@ public class GeoportalDataViewer implements EntryPoint {
olMapMng = new OLMapManager(mainPanel.getMapPanel().getElement().getId(),
layerManager.getLayerManagerBus(), firstBaseLayer);
OpenLayerMap olMap = olMapMng.getOLMap();
layerManager.setOlMap(olMap);
layerManager.setOLMap(olMap);
mainPanel.setMap(olMap);
//mainPanel.setMapAttribution(olMapMng.getOLOSMMap().getMapAttribution());
@ -310,8 +308,6 @@ public class GeoportalDataViewer implements EntryPoint {
@Override
public void onLayerRendered(AddedLayerToMapEvent addedLayerToMapEvent) {
GWT.log("Fired AddedLayerToMapEvent " + addedLayerToMapEvent.getLayerItem() + "layer type: "+addedLayerToMapEvent.getLayerType());
// GeoportalDataViewerConstants.print("Fired AddedLayerToMapEvent
// "+addedLayerToMapEvent.getLayerItem());
try {
@ -454,7 +450,7 @@ public class GeoportalDataViewer implements EntryPoint {
+ baseLayer.getAttribution() + "</div></div>";
olMapMng.getOLMap().changeBaseMap(baseLayer);
//THE OSM Contributors are automatically added by gwt-ol, other ones not.
// THE OSM Contributors are automatically added by gwt-ol, others ones not.
if (!baseLayer.getType().equals(BaseMapLayer.OL_BASE_MAP.OSM)) {
attributionDiv.setHTML(attributionHTML);
} else

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

@ -869,7 +869,7 @@ public class LayerManager {
*
* @param olMap the new ol map
*/
public void setOlMap(OpenLayerMap olMap) {
public void setOLMap(OpenLayerMap olMap) {
this.olMap = olMap;
}

2
src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/gis/LightOpenLayerMap.java
View File

@ -81,7 +81,7 @@ public class LightOpenLayerMap {
private String markerURL = Images.ICONS.mapMarkerIcon().getURL();
/**
* Instantiates a new light open layer OSM.
* Instantiates a new light open layer map.
*
* @param divTargetId the div target id
*/

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

@ -136,8 +136,6 @@ public abstract class OpenLayerMap {
private LinkedHashMap<String, Image> wmsDetailsLayerMap;
private Integer[] wmsDetailsLayerZIndex = new Integer[100];
private LinkedHashMap<String, Image> wmsLayerMap;
private Layer baseLayerTile;
@ -155,9 +153,6 @@ public abstract class OpenLayerMap {
public OpenLayerMap(String divTargetId, HandlerManager eventBus, BaseMapLayer baseLayer) {
this.eventBus = eventBus;
for (int i = 0; i < 100; i++) {
wmsDetailsLayerZIndex[i] = 1000 + i;
}
// create a projection
projectionOptions.setCode(MAP_PROJECTION.EPSG_3857.getName());

8
src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.ui.xml
View File

@ -16,10 +16,6 @@
<g:HTMLPanel ui:field="mainContainerPanel">
<g:HTMLPanel ui:field="mainToolBar"
addStyleNames="inner-toolbar">
<b:DropdownButton type="LINK" text="Map">
<g:HTMLPanel ui:field="panelBaseLayers">
</g:HTMLPanel>
</b:DropdownButton>
<b:DropdownButton type="LINK" text=" " icon="INFO">
<g:HTMLPanel ui:field="panelInfo"
addStyleNames="info-interaction">
@ -39,6 +35,10 @@
</g:HTMLPanel>
</g:HTMLPanel>
</b:DropdownButton>
<b:DropdownButton type="LINK" text="Map">
<g:HTMLPanel ui:field="panelBaseLayers">
</g:HTMLPanel>
</b:DropdownButton>
<b:DropdownButton type="LINK"
text="Preset Location" icon="TH_LARGE">
<b:Nav>

2
src/main/webapp/GeoportalDataViewer.css
View File

@ -342,7 +342,7 @@ body {
.layers-panel {
margin-top: 10px;
background-color: white;
opacity: 80%;
opacity: 90%;
padding: 10px;
width: 410px;
}