From 17a1044ecff7d5ea0c77ce56e1cc7a668e38adf4 Mon Sep 17 00:00:00 2001 From: JaniSimomaa Date: Mon, 8 Jul 2019 15:08:49 +0300 Subject: [PATCH] Add functions for finding elements by DN id gitlab #54 Change-Id: I948de22bc07d1c1cf1120ba37754c81b49d2e29f --- .../META-INF/MANIFEST.MF | 3 +- .../scl/Simantics/District.scl | 3 ++ .../district/network/DistrictNetworkUtil.java | 49 +++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/org.simantics.district.network/META-INF/MANIFEST.MF b/org.simantics.district.network/META-INF/MANIFEST.MF index 761e37fb..ddf8bb90 100644 --- a/org.simantics.district.network/META-INF/MANIFEST.MF +++ b/org.simantics.district.network/META-INF/MANIFEST.MF @@ -17,7 +17,8 @@ Require-Bundle: org.simantics.db, org.simantics;bundle-version="1.0.0", org.slf4j.api, org.simantics.maps.elevation.server;bundle-version="1.0.0", - org.simantics.modeling + org.simantics.modeling, + org.simantics.db.indexing Export-Package: org.simantics.district.network, org.simantics.district.network.changeset, org.simantics.district.network.profile diff --git a/org.simantics.district.network/scl/Simantics/District.scl b/org.simantics.district.network/scl/Simantics/District.scl index 56e8edb4..0e79ef77 100644 --- a/org.simantics.district.network/scl/Simantics/District.scl +++ b/org.simantics.district.network/scl/Simantics/District.scl @@ -153,3 +153,6 @@ dnElementsMappedToComponents mappedComponents = mapMaybe possibleDNElementMapped importJava "org.simantics.district.network.DistrictNetworkUtil" where createNetworkDiagram :: Resource -> Resource -> String -> Resource -> Resource -> Resource -> Resource -> Resource -> Resource changeMappingType :: Resource -> [Resource] -> () + findDNElementById :: Resource -> String -> Maybe Resource + findDNElementByXYCoordinates :: Resource -> Double -> Double -> Double -> [Resource] + diff --git a/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java b/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java index cf06ca8c..596c3667 100644 --- a/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java +++ b/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java @@ -1,8 +1,12 @@ package org.simantics.district.network; +import java.awt.geom.Rectangle2D; +import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.simantics.databoard.Bindings; import org.simantics.datatypes.literal.RGB; @@ -11,12 +15,14 @@ import org.simantics.db.ReadGraph; import org.simantics.db.Resource; import org.simantics.db.WriteGraph; import org.simantics.db.common.procedure.adapter.TransientCacheListener; +import org.simantics.db.common.request.IndexRoot; import org.simantics.db.common.request.ResourceRead; import org.simantics.db.common.utils.OrderedSetUtils; import org.simantics.db.exception.BindingException; import org.simantics.db.exception.DatabaseException; import org.simantics.db.exception.ManyObjectsForFunctionalRelationException; import org.simantics.db.exception.ServiceException; +import org.simantics.db.indexing.IndexUtils; import org.simantics.db.layer0.request.PossibleVariable; import org.simantics.db.layer0.variable.Variable; import org.simantics.diagram.stubs.DiagramResource; @@ -28,9 +34,13 @@ import org.simantics.layer0.Layer0; import org.simantics.modeling.ModelingResources; import org.simantics.modeling.adapters.NewCompositeActionFactory; import org.simantics.operation.Layer0X; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DistrictNetworkUtil { + private static final Logger LOGGER = LoggerFactory.getLogger(DistrictNetworkUtil.class); + public static Resource createEdge(WriteGraph graph, Resource composite, double[] detailedGeometryCoords) throws DatabaseException { return createEdge(graph, composite, graph.getPossibleObject(composite, DistrictNetworkResource.getInstance(graph).EdgeDefaultMapping), detailedGeometryCoords); } @@ -303,4 +313,43 @@ public class DistrictNetworkUtil { graph.claim(element, DN.HasMapping, newMapping); } } + + public static Stream findDNElementsById(ReadGraph graph, Resource context, String idToFind) throws DatabaseException { + DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph); + return IndexUtils.findByType(graph, + graph.syncRequest(new IndexRoot(context)), + DN.Element + ).stream().filter(element -> { + try { + String id = graph.getPossibleRelatedValue(element, DN.HasId, Bindings.STRING); + return id != null && id.contains(idToFind); + } catch (DatabaseException e) { + LOGGER.error("Could not read id for element {]", element, e); + return false; + } + }); + } + + public static Resource findDNElementById(ReadGraph graph, Resource context, String idToFind) throws DatabaseException { + List elements = findDNElementsById(graph, context, idToFind).collect(Collectors.toList()); + if (elements.size() == 1) { + return elements.iterator().next(); + } + return null; + } + + public static List findDNElementByXYCoordinates(ReadGraph graph, Resource context, double lat, double lon, double padding) throws DatabaseException { + DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph); + DiagramResource DIA = DiagramResource.getInstance(graph); + List results = new ArrayList<>(); + Collection vertices = IndexUtils.findByType(graph, graph.syncRequest(new IndexRoot(context)), DN.Vertex); + Rectangle2D rect = new Rectangle2D.Double(lat, lon, padding, padding); + for (Resource vertex : vertices) { + double[] location = graph.getRelatedValue(vertex, DIA.HasLocation, Bindings.DOUBLE_ARRAY); + if (rect.contains(location[0], location[1])) { + results.add(vertex); + } + } + return results; + } } -- 2.47.1