X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fopenlayers%2FOpenLayersMap.java;h=28a84b059d542bb3fcc4dc199a0586351ac78d45;hb=f1b87af2e0de38f1f49ab8fe68f9988018914811;hp=d755e8b9719bff4d7fb1105dbe5c1e50d82648b0;hpb=942fd932e1f6ed3319575c4c1d944912dfca9fa5;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OpenLayersMap.java b/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OpenLayersMap.java
index d755e8b..28a84b0 100644
--- a/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OpenLayersMap.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OpenLayersMap.java
@@ -13,11 +13,11 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.apache.commons.io.IOUtils;
-import org.argeo.api.cms.CmsView;
 import org.argeo.app.api.EntityNames;
 import org.argeo.app.api.EntityType;
 import org.argeo.app.ui.SuiteEvent;
 import org.argeo.api.cms.CmsLog;
+import org.argeo.api.cms.ux.CmsView;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.eclipse.swt.SWT;
@@ -127,6 +127,7 @@ public class OpenLayersMap extends Composite {
 					entityType = node.getProperty(EntityNames.ENTITY_TYPE).getString();
 					sb.append(", type:'").append(entityType).append("'");
 				}
+				enrichFeature(node, sb);
 				sb.append("})");
 			}
 		}
@@ -135,6 +136,10 @@ public class OpenLayersMap extends Composite {
 		return sb.toString();
 	}
 
+	protected void enrichFeature(Node node, StringBuffer sb) throws RepositoryException {
+
+	}
+
 	public void addPoints(List<Node> geoPoints) throws RepositoryException {
 		this.vectorSource = asVectorSource(geoPoints);
 		if (log.isTraceEnabled())
@@ -174,7 +179,8 @@ public class OpenLayersMap extends Composite {
 						+ ",name: '" + name + "'}));";
 				toExecute.append(toEvaluate);
 			}
-			System.out.println(toExecute);
+			if (log.isTraceEnabled())
+				log.trace(toExecute);
 			browser.execute(toExecute.toString());
 		}
 	}
@@ -267,8 +273,9 @@ public class OpenLayersMap extends Composite {
 				return null;
 			String path = arguments[0].toString();
 			Map<String, Object> properties = new HashMap<>();
-			properties.put(SuiteEvent.NODE_PATH, path);
-			properties.put(SuiteEvent.WORKSPACE, CmsConstants.SYS_WORKSPACE);
+//			properties.put(SuiteEvent.NODE_PATH, path);
+//			properties.put(SuiteEvent.WORKSPACE, CmsConstants.SYS_WORKSPACE);
+			properties.put(SuiteEvent.CONTENT_PATH, '/' + CmsConstants.SYS_WORKSPACE + path);
 			cmsView.sendEvent(SuiteEvent.refreshPart.topic(), properties);
 			return null;
 		}