From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 21 Jul 2021 08:39:49 +0000 (+0200)
Subject: Start experimenting with another approach for maps.
X-Git-Tag: argeo-suite-2.3.1~8
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=aed0041dc225ccd19d97229ca656e17b6c9c47d4

Start experimenting with another approach for maps.
---

diff --git a/environment/org.argeo.geo.ui/bnd.bnd b/environment/org.argeo.geo.ui/bnd.bnd
index a50ed43..4fdb49b 100644
--- a/environment/org.argeo.geo.ui/bnd.bnd
+++ b/environment/org.argeo.geo.ui/bnd.bnd
@@ -12,3 +12,6 @@ org.osgi.framework,\
 Service-Component:\
 OSGI-INF/mapLayer.xml,\
 OSGI-INF/overviewMap.xml
+
+Provide-Capability:\
+cms.publish;pkg=org.djapps.on.openheritage.ui,file="*.png,*.js,*.html"
\ No newline at end of file
diff --git a/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OLMap.java b/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OLMap.java
new file mode 100644
index 0000000..ac104c6
--- /dev/null
+++ b/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OLMap.java
@@ -0,0 +1,21 @@
+package org.argeo.support.openlayers;
+
+import org.argeo.cms.ui.util.CmsUiUtils;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+public class OLMap extends Composite {
+	private Label div;
+
+	public OLMap(Composite parent, int style) {
+		super(parent, style);
+		setLayout(CmsUiUtils.noSpaceGridLayout());
+		div = new Label(this, SWT.NONE);
+		CmsUiUtils.markup(div);
+		CmsUiUtils.disableMarkupValidation(div);
+		div.setText("<div id='map'></div>");
+		div.setLayoutData(CmsUiUtils.fillAll());
+	}
+
+}
diff --git a/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OverviewMap.java b/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OverviewMap.java
index 8ecdc1c..b2fd01e 100644
--- a/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OverviewMap.java
+++ b/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OverviewMap.java
@@ -56,11 +56,11 @@ public class OverviewMap implements CmsUiProvider {
 		Query query = context.getSession().getWorkspace().getQueryManager()
 				.createQuery("SELECT * FROM [" + EntityType.geopoint.get() + "]", Query.JCR_SQL2);
 		List<Node> geoPoints = JcrUtils.nodeIteratorToList(query.execute().getNodes());
-		OpenLayersMap apafMap = new OpenLayersMap(parent, SWT.NONE, getClass().getResource("map-osm.html"));
-		apafMap.setLayoutData(CmsUiUtils.fillAll());
+		OpenLayersMap map = new OpenLayersMap(parent, SWT.NONE, getClass().getResource("map-osm.html"));
+		map.setLayoutData(CmsUiUtils.fillAll());
 
 		// apafMap.setZoom(7);
 		// apafMap.setCenter(-2.472, 8.010);
-		apafMap.addPoints(geoPoints);
+		map.addPoints(geoPoints);
 	}
 }
diff --git a/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/map.js b/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/map.js
new file mode 100644
index 0000000..68489fb
--- /dev/null
+++ b/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/map.js
@@ -0,0 +1,11 @@
+var map = new ol.Map({
+	target : 'map',
+	layers : [ new ol.layer.Tile({
+		source : new ol.source.OSM()
+	}) ],
+	view : new ol.View({
+		center : ol.proj.fromLonLat([ 34, 34 ]),
+		zoom : 4
+	})
+});
+		
\ No newline at end of file