X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.geo%2Fsrc%2Forg%2Fargeo%2Fapp%2Fgeo%2Fux%2FOpenLayersMapPart.java;h=0d99f40300bacff44cd1a2a9638ddd8638565ddb;hb=362c92fd2bdb555e1d691b661f0ee69c513be5a8;hp=c66ed3a03164760ec6aa61db61273b68d677e48a;hpb=b384a9cbe93b83b3aa94fe46cf2ff0a929f0332c;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.geo/src/org/argeo/app/geo/ux/OpenLayersMapPart.java b/org.argeo.app.geo/src/org/argeo/app/geo/ux/OpenLayersMapPart.java
index c66ed3a..0d99f40 100644
--- a/org.argeo.app.geo/src/org/argeo/app/geo/ux/OpenLayersMapPart.java
+++ b/org.argeo.app.geo/src/org/argeo/app/geo/ux/OpenLayersMapPart.java
@@ -1,14 +1,23 @@
 package org.argeo.app.geo.ux;
 
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
 import org.argeo.app.ol.AbstractOlObject;
 import org.argeo.app.ol.Layer;
 import org.argeo.app.ol.OlMap;
 import org.argeo.app.ol.TileLayer;
 import org.argeo.app.ol.VectorLayer;
 import org.argeo.app.ux.js.JsClient;
+import org.locationtech.jts.geom.Envelope;
 
-public class OpenLayersMapPart extends AbstractGeoJsObject {
-	private String mapPartName;
+/**
+ * A wrapper around an OpenLayers map, adding specific features, such as SLD
+ * styling.
+ */
+public class OpenLayersMapPart extends AbstractGeoJsObject implements MapPart {
+	private final String mapPartName;
 
 	public OpenLayersMapPart(JsClient jsClient, String mapPartName) {
 		super(mapPartName);
@@ -24,17 +33,25 @@ public class OpenLayersMapPart extends AbstractGeoJsObject {
 		executeMethod(getMethodName(), JsClient.escapeQuotes(xml));
 	}
 
-	public void applyStyle(String layerName, String styledLayerName) {
-		executeMethod(getMethodName(), layerName, styledLayerName);
+	public void setCenter(double lat, double lon) {
+		executeMethod(getMethodName(), lat, lon);
 	}
 
-	public void applyBboxStrategy(String layerName) {
-		executeMethod(getMethodName(), layerName);
+	public void fit(double[] extent, Map<String, Object> options) {
+		executeMethod(getMethodName(), extent, options);
+	}
+
+	public void fit(Envelope extent, Map<String, Object> options) {
+		fit(new double[] { extent.getMinX(), extent.getMinY(), extent.getMaxX(), extent.getMaxY() }, options);
+	}
+
+	public void applyStyle(String layerName, String styledLayerName) {
+		executeMethod(getMethodName(), layerName, styledLayerName);
 	}
 
 	public Layer getLayer(String name) {
 		// TODO deal with not found
-		String reference = "getLayerByName('" + name + "')";
+		String reference = getReference() + ".getLayerByName('" + name + "')";
 		if (getJsClient().isInstanceOf(reference, AbstractOlObject.getJsClassName(VectorLayer.class))) {
 			return new VectorLayer(getJsClient(), reference);
 		} else if (getJsClient().isInstanceOf(reference, AbstractOlObject.getJsClassName(TileLayer.class))) {
@@ -43,4 +60,48 @@ public class OpenLayersMapPart extends AbstractGeoJsObject {
 			return new Layer(getJsClient(), reference);
 		}
 	}
+
+	public String getMapPartName() {
+		return mapPartName;
+	}
+
+	public void selectFeatures(String layerName, Object... ids) {
+		executeMethod(getMethodName(), layerName, (Object[]) ids);
+	}
+
+	public void fitToLayer(String layerName) {
+		executeMethod(getMethodName(), layerName);
+	}
+
+	/*
+	 * CALLBACKS
+	 */
+	public void onFeatureSelected(Consumer<FeatureSelectedEvent> toDo) {
+		addCallback("FeatureSelected", (arr) -> {
+			toDo.accept(new FeatureSelectedEvent((String) arr[0]));
+			return null;
+		});
+	}
+
+	public void onFeatureSingleClick(Consumer<FeatureSingleClickEvent> toDo) {
+		addCallback("FeatureSingleClick", (arr) -> {
+			toDo.accept(new FeatureSingleClickEvent((String) arr[0]));
+			return null;
+		});
+	}
+
+	public void onFeaturePopup(Function<FeaturePopupEvent, String> toDo) {
+		addCallback("FeaturePopup", (arr) -> {
+			return toDo.apply(new FeaturePopupEvent((String) arr[0]));
+		});
+	}
+
+	protected void addCallback(String suffix, Function<Object[], Object> toDo) {
+		getJsClient().getReadyStage().thenAccept((ready) -> {
+			String functionName = getJsClient().createJsFunction(getMapPartName() + "__on" + suffix, toDo);
+			getJsClient().execute(getJsReference() + ".callbacks['on" + suffix + "']=" + functionName + ";");
+			executeMethod("enable" + suffix);
+		});
+	}
+
 }