Clean up OpenLayers integration

[gpl/argeo-suite.git] / org.argeo.app.geo / src / org / argeo / app / geo / ux / OpenLayersMapPart.java

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 a856bccd188fd1b9ed8d4fe5893aee5a6cf6e53f..0d99f40300bacff44cd1a2a9638ddd8638565ddb 100644 (file)
--- 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,6 +1,8 @@
 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;
@@ -14,7 +16,7 @@ import org.locationtech.jts.geom.Envelope;
  * A wrapper around an OpenLayers map, adding specific features, such as SLD
  * styling.
  */
-public class OpenLayersMapPart extends AbstractGeoJsObject {
+public class OpenLayersMapPart extends AbstractGeoJsObject implements MapPart {
        private final String mapPartName;
 
        public OpenLayersMapPart(JsClient jsClient, String mapPartName) {
@@ -31,7 +33,7 @@ public class OpenLayersMapPart extends AbstractGeoJsObject {
                executeMethod(getMethodName(), JsClient.escapeQuotes(xml));
        }
 
-       public void setCenter(Double lat, Double lon) {
+       public void setCenter(double lat, double lon) {
                executeMethod(getMethodName(), lat, lon);
        }
 
@@ -63,4 +65,43 @@ public class OpenLayersMapPart extends AbstractGeoJsObject {
                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);
+               });
+       }
+
 }