Working JavaScript charts

[gpl/argeo-suite.git] / swt / org.argeo.app.geo.swt / src / org / argeo / app / geo / swt / MapUiProvider.java

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 2edd0f15ae2b40969913e330a1aaf07999e40473..b75892371c68f5b65416d704f230364a8b239681 100644 (file)
--- 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,7 +1,6 @@
 package org.argeo.app.geo.swt;
 
 import org.argeo.api.acr.Content;
-import org.argeo.app.geo.swt.openlayers.OLMap;
 import org.argeo.cms.swt.acr.SwtUiProvider;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -11,11 +10,14 @@ public class MapUiProvider implements SwtUiProvider {
 
        @Override
        public Control createUiPart(Composite parent, Content context) {
-               OLMap map = new OLMap(parent, 0);
-               // map.setCenter(13.404954, 52.520008); // Berlin
-               map.setCenter(-74.00597, 40.71427); // NYC
+               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);
-               return map;
+               // map.addUrlLayer("https://openlayers.org/en/v4.6.5/examples/data/geojson/countries.geojson",
+               // Format.GEOJSON);
+               return map.getControl();
        }
 
 }