Changeset 14802 in josm

Timestamp:

2019-02-23T17:46:51+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #17131 - add mapcss function gpx_distance to get the distance to a gpx track (patch by Taylor Smock, modified)

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/gpx/GpxDistance.java (added)
• src/org/openstreetmap/josm/gui/layer/MainLayerManager.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/gpx/GpxDistanceTest.java (added)

trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java

@@ -13 +13 @@
 import javax.swing.JOptionPane;
 
+import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmData;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.io.AsynchronousUploadPrimitivesTask;
+import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Logging;
@@ -542 +544 @@
         }
     }
+
+    /**
+     * Returns all {@link GpxData} we can get from current layers.
+     * @return all {@code GpxData} we can get from current layers
+     * @since 14802
+     */
+    public List<GpxData> getAllGpxData() {
+        List<GpxData> result = new ArrayList<>();
+        for (Layer layer : getLayers()) {
+            if (layer instanceof GpxLayer) {
+                result.add(((GpxLayer) layer).data);
+            } else if (layer instanceof GeoImageLayer) {
+                result.add(((GeoImageLayer) layer).getFauxGpxLayer().data);
+            }
+        }
+        return result;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -43 +43 @@
 import org.openstreetmap.josm.data.ImageData;
 import org.openstreetmap.josm.data.ImageData.ImageDataUpdateListener;
+import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -76 +78 @@
     private final ImageData data;
     GpxLayer gpxLayer;
+    GpxLayer gpxFauxLayer;
 
     private final Icon icon = ImageProvider.get("dialogs/geoimage/photo-marker");
@@ -925 +928 @@
     }
 
+    /**
+     * Returns a faux GPX layer built from the images or the associated GPX layer.
+     * @return A faux GPX layer or the associated GPX layer
+     * @since 14802
+     */
+    public synchronized GpxLayer getFauxGpxLayer() {
+        if (gpxLayer != null) return getGpxLayer();
+        if (gpxFauxLayer == null) {
+            GpxData gpxData = new GpxData();
+            List<ImageEntry> imageList = data.getImages();
+            for (ImageEntry image : imageList) {
+                WayPoint twaypoint = new WayPoint(image.getPos());
+                gpxData.addWaypoint(twaypoint);
+            }
+            gpxFauxLayer = new GpxLayer(gpxData);
+        }
+        return gpxFauxLayer;
+    }
+
     @Override
     public void jumpToNextMarker() {

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -25 +25 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.gpx.GpxDistance;
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler.Match;
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.mappaint.Cascade;
 import org.openstreetmap.josm.gui.mappaint.Environment;
@@ -520 +523 @@
 
         /**
+         * Returns the lowest distance between the OSM object and a GPX point
+         * <p>
+         * @param env the environment
+         * @return the distance between the object and the closest gpx point or {@code Double.MAX_VALUE}
+         * @since 14802
+         */
+        public static double gpx_distance(final Environment env) { // NO_UCD (unused code)
+            if (env.osm instanceof OsmPrimitive) {
+                return MainApplication.getLayerManager().getAllGpxData().stream()
+                        .mapToDouble(gpx -> GpxDistance.getLowestDistance((OsmPrimitive) env.osm, gpx))
+                        .min().orElse(Double.MAX_VALUE);
+            }
+            return Double.MAX_VALUE;
+        }
+
+        /**
          * Determines whether the object has a tag with the given key.
          * @param env the environment