X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.app.geo.swt%2Fsrc%2Forg%2Fargeo%2Fapp%2Fgeo%2Fswt%2FMapUiProvider.java;h=55c7d6cfb269467d45bc826ec1e61db2fed243c8;hb=d76ddbc151846278fabe03f5e5dcbbca94704ba5;hp=fa70146f3d48e557ae5720e1abb8a596e66b2495;hpb=187dcc18d0f09b834774b74b32244113d6aa3daf;p=gpl%2Fargeo-suite.git

diff --git a/swt/org.argeo.app.geo.swt/src/org/argeo/app/geo/swt/MapUiProvider.java b/swt/org.argeo.app.geo.swt/src/org/argeo/app/geo/swt/MapUiProvider.java
index fa70146..55c7d6c 100644
--- a/swt/org.argeo.app.geo.swt/src/org/argeo/app/geo/swt/MapUiProvider.java
+++ b/swt/org.argeo.app.geo.swt/src/org/argeo/app/geo/swt/MapUiProvider.java
@@ -1,6 +1,13 @@
 package org.argeo.app.geo.swt;
 
 import org.argeo.api.acr.Content;
+import org.argeo.app.geo.ux.OpenLayersMapPart;
+import org.argeo.app.geo.ux.SentinelCloudless;
+import org.argeo.app.ol.Layer;
+import org.argeo.app.ol.OSM;
+import org.argeo.app.ol.TileLayer;
+import org.argeo.app.swt.js.SwtBrowserJsPart;
+import org.argeo.app.ux.js.JsClient;
 import org.argeo.cms.swt.acr.SwtUiProvider;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -10,14 +17,27 @@ public class MapUiProvider implements SwtUiProvider {
 
 	@Override
 	public Control createUiPart(Composite parent, Content context) {
-		SwtJSMapPart map = new SwtJSMapPart("defaultOverviewMap", parent, 0);
-		map.setCenter(13.404954, 52.520008); // Berlin
-//		map.setCenter(-74.00597, 40.71427); // NYC
-//		map.addPoint(-74.00597, 40.71427, null);
-		map.setZoom(6);
-		// map.addUrlLayer("https://openlayers.org/en/v4.6.5/examples/data/geojson/countries.geojson",
-		// Format.GEOJSON);
-		return map.getControl();
+		JsClient jsClient = new SwtBrowserJsPart(parent, 0, "/pkg/org.argeo.app.js/geo.html");
+		OpenLayersMapPart mapPart = new OpenLayersMapPart(jsClient, "defaultOverviewMap");
+		mapPart.getMap().getView().setCenter(new int[] { 0, 0 });
+		mapPart.getMap().getView().setZoom(6);
+
+		Layer satelliteLayer = new TileLayer(new SentinelCloudless());
+		satelliteLayer.setMaxResolution(200);
+		mapPart.getMap().addLayer(satelliteLayer);
+		TileLayer baseLayer = new TileLayer();
+		baseLayer.setSource(new OSM());
+		baseLayer.setOpacity(0.5);
+		mapPart.getMap().addLayer(baseLayer);
+
+//		SwtJsMapPart map = new SwtJsMapPart("defaultOverviewMap", parent, 0);
+//		map.setCenter(13.404954, 52.520008); // Berlin
+////		map.setCenter(-74.00597, 40.71427); // NYC
+////		map.addPoint(-74.00597, 40.71427, null);
+//		map.setZoom(6);
+//		// map.addUrlLayer("https://openlayers.org/en/v4.6.5/examples/data/geojson/countries.geojson",
+//		// Format.GEOJSON);
+		return parent;
 	}
 
 }