X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2FDistrictNetworkUtil.java;h=0047057c0dca98a3f4b7243dde01c3595a0ba281;hb=45d66db8d7f81d6be14e7162579952791ac7092c;hp=596c3667543cd78a714925f9386fbcbe54ebe0c7;hpb=17a1044ecff7d5ea0c77ce56e1cc7a668e38adf4;p=simantics%2Fdistrict.git

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 596c3667..0047057c 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
@@ -31,6 +31,8 @@ import org.simantics.diagram.synchronization.graph.layer.GraphLayer;
 import org.simantics.diagram.synchronization.graph.layer.IGraphLayerUtil;
 import org.simantics.district.network.ontology.DistrictNetworkResource;
 import org.simantics.layer0.Layer0;
+import org.simantics.maps.elevation.server.SingletonTiffTileInterface;
+import org.simantics.maps.elevation.server.prefs.MapsElevationServerPreferences;
 import org.simantics.modeling.ModelingResources;
 import org.simantics.modeling.adapters.NewCompositeActionFactory;
 import org.simantics.operation.Layer0X;
@@ -77,12 +79,44 @@ public class DistrictNetworkUtil {
         return edge;
     }
 
+    /**
+     * @param graph
+     * @param composite
+     * @param coords
+     * @param elevation Double.MAX_VALUE to fetch elevation from elevation server (if enabled and has data)
+     * @return
+     * @throws DatabaseException
+     */
     public static Resource createVertex(WriteGraph graph, Resource composite, double[] coords, double elevation) throws DatabaseException {
         Resource defaultVertexMapping = graph.getPossibleObject(composite, DistrictNetworkResource.getInstance(graph).VertexDefaultMapping);
         return createVertex(graph, composite, coords, elevation, defaultVertexMapping);
     }
 
+    /**
+     * @param graph
+     * @param composite
+     * @param coords
+     * @param elevation Double.MAX_VALUE to fetch elevation from elevation server (if enabled and has data)
+     * @param mapping
+     * @return
+     * @throws DatabaseException
+     */
     public static Resource createVertex(WriteGraph graph, Resource composite, double[] coords, double elevation, Resource mapping) throws DatabaseException {
+        // Double.MAX_VALUE is our secret to lookup elevation from elevation server
+        if (elevation == Double.MAX_VALUE) {
+            // ok, resolve from server or default to 0
+            if (MapsElevationServerPreferences.useElevationServer()) {
+                // ok! we use new elevation API to resolve possible elevations for the starting points
+                try {
+                    elevation = SingletonTiffTileInterface.lookup(coords[1], coords[0]).doubleValue();
+                } catch (Exception ee) {
+                    LOGGER.error("Could not get elevation from tiff interface", ee);
+                }
+            } else {
+                elevation = 0;
+            }
+        }
+        
         Layer0 L0 = Layer0.getInstance(graph);
         DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
         DiagramResource DIA = DiagramResource.getInstance(graph);
@@ -352,4 +386,6 @@ public class DistrictNetworkUtil {
         }
         return results;
     }
+
+
 }