Make TestBuilder select use focus layer

Author: dr-jts

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/controller/JTSTestBuilderController.java

@@ -29,6 +29,7 @@
 import org.locationtech.jtstest.testbuilder.JTSTestBuilderToolBar;
 import org.locationtech.jtstest.testbuilder.SpatialFunctionPanel;
 import org.locationtech.jtstest.testbuilder.TestBuilderDialogs;
+import org.locationtech.jtstest.testbuilder.geom.GeometryElementLocater;
 import org.locationtech.jtstest.testbuilder.model.GeometryEditModel;
 import org.locationtech.jtstest.testbuilder.model.LayerList;
 import org.locationtech.jtstest.testbuilder.model.TestBuilderModel;
@@ -165,21 +166,17 @@ public void copyElementToClipboard(Coordinate pt)
 
   public void selectElements(Geometry aoi)
   {
-    LayerList lyrList = model().getLayers();
-    Geometry[] comp;
-    comp = lyrList.getElements(aoi);
+    Geometry geom = model().getGeometryEditModel().getGeometry();
+    Geometry comp = null;
+    if (geom != null) {
+      comp = GeometryElementLocater.extractElements(geom, aoi);
+    }
     if (comp == null) {
       model().clearSelection();
     } 
     else {
       model().getLayerSelect().setEnabled(true);
-      //TODO: allow selecting from A or B when enabled
-      if (comp[0] != null) {
-        model().setSelection(comp[0]);
-      }
-      else {
-        model().setSelection(comp[1]);
-      }
+      model().setSelection(comp);
     }
     geometryViewChanged();
     layerListRefresh();
@@ -212,7 +209,7 @@ public void inspectGeometry(String tag, Geometry geometry) {
 
   public void inspectGeometryDialogForCurrentCase()
   {
-    int geomIndex = JTSTestBuilder.model().getGeometryEditModel().getGeomIndex();
+    int geomIndex = model().getGeometryEditModel().getGeomIndex();
     Geometry geometry = model().getCurrentCase().getGeometry(geomIndex);
     TestBuilderDialogs.inspectGeometry(frame(), geomIndex, geometry);
   }

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryElementLocater.java

@@ -13,13 +13,15 @@
 package org.locationtech.jtstest.testbuilder.geom;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Stack;
 
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Envelope;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
 
 
 /**
@@ -31,6 +33,32 @@
  */
 public class GeometryElementLocater {
 
+  public static Geometry extractElements(Geometry parentGeom, Geometry aoi)
+  {
+    GeometryElementLocater locater = new GeometryElementLocater(parentGeom);
+    List locs = locater.getElements(aoi);
+    List geoms = extractLocationGeometry(locs);
+    if (geoms.size() <= 0)
+      return null;
+    if (geoms.size() == 1) 
+      return (Geometry) geoms.get(0);
+    // if parent was a GC, ensure returning a GC
+    if (parentGeom.getGeometryType().equals("GeometryCollection"))
+      return parentGeom.getFactory().createGeometryCollection(GeometryFactory.toGeometryArray(geoms));
+    // otherwise return MultiGeom
+    return parentGeom.getFactory().buildGeometry(geoms);
+  }
+  
+  private static List extractLocationGeometry(List locs)
+  {
+    List geoms = new ArrayList();
+    for (Iterator i = locs.iterator(); i.hasNext();) {
+      GeometryLocation loc = (GeometryLocation) i.next();
+      geoms.add(loc.getElement());
+    }
+    return geoms;
+  }
+  
   public static List<GeometryLocation> getElements(Geometry parentGeom, Coordinate queryPt, double tolerance) {
     GeometryElementLocater locater = new GeometryElementLocater(parentGeom);
     return locater.getElements(queryPt, tolerance);

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/model/LayerList.java

@@ -103,12 +103,13 @@ public Geometry[] getElements(Geometry aoi, boolean isSegments)
         comp[i] = SegmentExtracter.extract(geom, aoi);
       }
       else {
-        comp[i] = extractElements(geom, aoi);
+        comp[i] = GeometryElementLocater.extractElements(geom, aoi);
       }
     }
     return comp;
   }
 
+  /*
   private Geometry extractElements(Geometry parentGeom, Geometry aoi)
   {
     GeometryElementLocater locater = new GeometryElementLocater(parentGeom);
@@ -134,6 +135,7 @@ private List extractLocationGeometry(List locs)
     }
     return geoms;
   }
+  */
 
   public Layer add(Layer lyr, boolean atTop) {
     if (atTop) {