Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java (revision 31458) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java (revision 31459) @@ -2,4 +2,5 @@ import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.plugins.mapillary.cache.CacheUtils; import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryMainDialog; @@ -26,4 +27,7 @@ private CopyOnWriteArrayList listeners = new CopyOnWriteArrayList<>(); + + /** The bounds of the areas for which the pictures have been downloaded. */ + public CopyOnWriteArrayList bounds; /** Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java (revision 31458) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java (revision 31459) @@ -74,18 +74,15 @@ public boolean TEMP_SEMIAUTOMATIC = false; - /** Unique instance of the class */ + /** Unique instance of the class. */ public static MapillaryLayer INSTANCE; - /** The image pointed by the blue line */ + /** The image pointed by the blue line. */ public static MapillaryImage BLUE; - /** The image pointed by the red line */ + /** The image pointed by the red line. */ public static MapillaryImage RED; - /** {@link MapillaryData} object that stores the database */ + /** {@link MapillaryData} object that stores the database. */ private final MapillaryData data; - /** The bounds of the areas for which the pictures have been downloaded */ - public CopyOnWriteArrayList bounds; - - /** Mode of the layer */ + /** Mode of the layer. */ public AbstractMode mode; @@ -100,5 +97,5 @@ super(tr("Mapillary Images")); this.data = new MapillaryData(); - this.bounds = new CopyOnWriteArrayList<>(); + this.data.bounds = new CopyOnWriteArrayList<>(); init(); } @@ -243,5 +240,5 @@ * Replies background color for downloaded areas. * - * @return background color for downloaded areas. Black by default + * @return background color for downloaded areas. Black by default. */ private static Color getBackgroundColor() { @@ -252,5 +249,5 @@ * Replies background color for non-downloaded areas. * - * @return background color for non-downloaded areas. Yellow by default + * @return background color for non-downloaded areas. Yellow by default. */ private static Color getOutsideColor() { @@ -259,5 +256,5 @@ /** - * Initialize the hatch pattern used to paint the non-downloaded area + * Initialize the hatch pattern used to paint the non-downloaded area. */ private void createHatchTexture() { @@ -283,5 +280,5 @@ Area a = new Area(b); // now successively subtract downloaded areas - for (Bounds bounds : this.bounds) { + for (Bounds bounds : this.data.bounds) { Point p1 = mv.getPoint(bounds.getMin()); Point p2 = mv.getPoint(bounds.getMax()); @@ -508,5 +505,4 @@ } - // EditDataLayerChanged @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryDownloader.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryDownloader.java (revision 31458) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryDownloader.java (revision 31459) @@ -82,5 +82,5 @@ if (isViewDownloaded(view)) return; - MapillaryLayer.getInstance().bounds.add(view); + MapillaryLayer.getInstance().getData().bounds.add(view); getImages(view); } @@ -108,6 +108,13 @@ } + /** + * Checks if the given {@LatLon} object lies inside the bounds of the + * image. + * + * @param latlon + * @return true if it lies inside the bounds; false otherwise; + */ private static boolean isInBounds(LatLon latlon) { - for (Bounds bounds : MapillaryLayer.getInstance().bounds) { + for (Bounds bounds : MapillaryLayer.getInstance().getData().bounds) { if (bounds.contains(latlon)) return true; @@ -141,6 +148,6 @@ for (Bounds bounds : Main.map.mapView.getEditLayer().data .getDataSourceBounds()) { - if (!layer.bounds.contains(bounds)) { - layer.bounds.add(bounds); + if (!layer.getData().bounds.contains(bounds)) { + layer.getData().bounds.add(bounds); MapillaryDownloader.getImages(bounds.getMin(), bounds.getMax()); } Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThread.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThread.java (revision 31458) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThread.java (revision 31459) @@ -132,6 +132,6 @@ private boolean isInside(MapillaryAbstractImage image) { - for (int i = 0; i < this.layer.bounds.size(); i++) - if (this.layer.bounds.get(i).contains(image.getLatLon())) + for (int i = 0; i < this.layer.getData().bounds.size(); i++) + if (this.layer.getData().bounds.get(i).contains(image.getLatLon())) return true; return false; Index: /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceDownloadThreadTest.java =================================================================== --- /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceDownloadThreadTest.java (revision 31458) +++ /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceDownloadThreadTest.java (revision 31459) @@ -21,43 +21,49 @@ public class MapillarySequenceDownloadThreadTest extends AbstractTest { - /** - * Test method for {@link org.openstreetmap.josm.plugins.mapillary.downloads.MapillarySequenceDownloadThread#run()}. - * - * This downloads a small area of mapillary-sequences where we know that images already exist. - * When the download-thread finishes, we check if the Mapillary-layer now contains one or more images. - * - * @throws InterruptedException - */ - @Test - public void testRun() throws InterruptedException { - System.out.println("[JUnit] MapillarySequenceDownloadThreadTest.testRun()"); - //Area around image UjEbeXZYIoyAKOsE-remlg (59.32125452° N 18.06166856° E) - LatLon minLatLon = new LatLon(59.3212545, 18.0616685); - LatLon maxLatLon = new LatLon(59.3212546, 18.0616686); + /** + * Test method for + * {@link org.openstreetmap.josm.plugins.mapillary.downloads.MapillarySequenceDownloadThread#run()} + * . + * + * This downloads a small area of mapillary-sequences where we know that + * images already exist. When the download-thread finishes, we check if the + * Mapillary-layer now contains one or more images. + * + * @throws InterruptedException + */ + @Test + public void testRun() throws InterruptedException { + System.out.println("[JUnit] MapillarySequenceDownloadThreadTest.testRun()"); + // Area around image UjEbeXZYIoyAKOsE-remlg (59.32125452° N 18.06166856° E) + LatLon minLatLon = new LatLon(59.3212545, 18.0616685); + LatLon maxLatLon = new LatLon(59.3212546, 18.0616686); - ExecutorService ex = Executors.newSingleThreadExecutor(); - String queryString = String.format( + ExecutorService ex = Executors.newSingleThreadExecutor(); + String queryString = String + .format( Locale.UK, "?max_lat=%.8f&max_lon=%.8f&min_lat=%.8f&min_lon=%.8f&limit=10&client_id=%s", - maxLatLon.lat(), - maxLatLon.lon(), - minLatLon.lat(), - minLatLon.lon(), - MapillaryDownloader.CLIENT_ID - ); - MapillaryLayer.getInstance().bounds.add(new Bounds(minLatLon, maxLatLon)); + maxLatLon.lat(), maxLatLon.lon(), minLatLon.lat(), minLatLon.lon(), + MapillaryDownloader.CLIENT_ID); + MapillaryLayer.getInstance().getData().bounds.add(new Bounds(minLatLon, + maxLatLon)); - int page = 1; - while (!ex.isShutdown() && MapillaryLayer.getInstance().getData().getImages().size() <= 0 && page < 50) { - System.out.println("Sending sequence-request "+page+" to Mapillary-servers…"); - Thread downloadThread = new MapillarySequenceDownloadThread(ex, queryString+"&page="+page); - downloadThread.start(); - downloadThread.join(); - page++; - Thread.sleep(500); - } - assertTrue(MapillaryLayer.getInstance().getData().getImages().size() >= 1); - System.out.println("One or more images were added to the MapillaryLayer within the given bounds."); + int page = 1; + while (!ex.isShutdown() + && MapillaryLayer.getInstance().getData().getImages().size() <= 0 + && page < 50) { + System.out.println("Sending sequence-request " + page + + " to Mapillary-servers…"); + Thread downloadThread = new MapillarySequenceDownloadThread(ex, + queryString + "&page=" + page); + downloadThread.start(); + downloadThread.join(); + page++; + Thread.sleep(500); } + assertTrue(MapillaryLayer.getInstance().getData().getImages().size() >= 1); + System.out + .println("One or more images were added to the MapillaryLayer within the given bounds."); + } }