Changeset 31459 in osm for applications/editors/josm/plugins/mapillary/test

Timestamp:

2015-08-06T16:55:05+02:00 (10 years ago)

Author:

nokutu

Message:

Moved bounds ArrayList from MapillaryLayer to MapillaryData.

File:

• applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceDownloadThreadTest.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceDownloadThreadTest.java

@@ -21 +21 @@
 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.");
+  }
 
 }