X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=environment%2Forg.argeo.geo.ui%2Fsrc%2Forg%2Fargeo%2Fsupport%2Fopenlayers%2FOpenLayersMap.java;h=9d46eacb24b8a4e9145c2c8ef7a0e23b42893d95;hb=172a84b8fd7d3240288ca1727f8bfde696f4d869;hp=622f5a49b7566cc220614767cd55a0b3e3a89d1a;hpb=096e9828998febd0faffe0c369b897d4826a2bc1;p=gpl%2Fargeo-suite.git

diff --git a/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java b/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
index 622f5a4..9d46eac 100644
--- a/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
+++ b/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
@@ -106,7 +106,7 @@ public class OpenLayersMap extends Composite {
 		StringBuffer sb = new StringBuffer("new ol.source.Vector({ features: [");
 		for (int i = 0; i < geoPoints.size(); i++) {
 			Node node = geoPoints.get(i);
-			if (node.isNodeType(EntityType.geopoint.get()) && !node.isCheckedOut()) {
+			if (node.isNodeType(EntityType.geopoint.get())) {
 				if (first)
 					first = false;
 				else
@@ -121,7 +121,8 @@ public class OpenLayersMap extends Composite {
 				sb.append("})");
 			}
 		}
-		sb.append("] })");
+		sb.append("]");
+		sb.append(" })");
 		this.vectorSource = sb.toString();
 		if (log.isTraceEnabled())
 			log.trace("Vector source: " + vectorSource);
@@ -131,8 +132,13 @@ public class OpenLayersMap extends Composite {
 	protected void renderVectorSource() {
 		if (vectorSource == null)
 			return;
-		if (isRenderCompleted())
-			browser.evaluate("map.addLayer(new ol.layer.Vector({ source: " + vectorSource + "}));");
+		if (isRenderCompleted()) {
+//			String style = ", style: new ol.style.Style({  image: new ol.style.Icon({ src: 'https://openlayers.org/en/latest/examples/data/icon.png' }) })";
+			String style = "";
+			String toEvaluate = "map.addLayer(new ol.layer.Vector({ source: " + vectorSource + style + "}));";
+			System.out.println(toEvaluate);
+			browser.execute(toEvaluate);
+		}
 	}
 
 	public void addPoint(Double lng, Double lat) {
@@ -190,12 +196,12 @@ public class OpenLayersMap extends Composite {
 					if (centerLat != null && centerLng != null) {
 						setCenter(centerLng, centerLat);
 					}
-					if (vectorSource != null)
-						renderVectorSource();
-					if (gpxSource != null)
-						renderGpxSource();
 					if (!geoJsonSources.isEmpty())
 						renderGeoJsonSources();
+					if (gpxSource != null)
+						renderGpxSource();
+					if (vectorSource != null)
+						renderVectorSource();
 				}
 				return null;
 			} catch (Exception e) {