Changeset 31347 in osm for applications/editors/josm/plugins/mapillary/src

Timestamp:

2015-07-06T23:24:31+02:00 (10 years ago)

Author:

floscher

Message:

Test downloading of sequences in a given bbox

The new testcase starts the MapillarySequenceDownloadThread, waits until it's finished. Then it checks, if images were added to the MapillaryLayer. We can assume, that there are images in the given rectangle, as currently there are several images uploaded there.
This change required quite extensive changes, as the tests are run in headless mode and so the GUI must not be started. TestUtil is built along the lines of JosmFixture from josm-core, but trimmed a lot.

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary

Files:

• MapillaryLayer.java (modified) (1 diff)
• MapillaryPlugin.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java

@@ -109 +109 @@
                 Main.map.mapView.getEditLayer().data.addDataSetListener(this);
         }
-        MapillaryPlugin.setMenuEnabled(MapillaryPlugin.EXPORT_MENU, true);
-        if (!MapillaryMainDialog.getInstance().isShowing())
-            MapillaryMainDialog.getInstance().getButton().doClick();
+        if (MapillaryPlugin.EXPORT_MENU != null) { // Does not execute when in headless mode
+            MapillaryPlugin.setMenuEnabled(MapillaryPlugin.EXPORT_MENU, true);
+            if (!MapillaryMainDialog.getInstance().isShowing())
+                MapillaryMainDialog.getInstance().getButton().doClick();
+        }
+
         createHatchTexture();
         data.dataUpdated();

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java

@@ -69 +69 @@
         downloadViewAction = new MapillaryDownloadViewAction();
 
-        DOWNLOAD_MENU = MainMenu.add(Main.main.menu.imageryMenu,
-                downloadAction, false);
-        EXPORT_MENU = MainMenu.add(Main.main.menu.fileMenu, exportAction,
-                false, 14);
-        IMPORT_MENU = MainMenu.add(Main.main.menu.fileMenu, importAction,
-                false, 14);
-        ZOOM_MENU = MainMenu
-                .add(Main.main.menu.viewMenu, zoomAction, false, 15);
-        DOWNLOAD_VIEW_MENU = MainMenu.add(Main.main.menu.fileMenu,
-                downloadViewAction, false, 14);
+        if (Main.main != null) { // important for headless mode
+            DOWNLOAD_MENU = MainMenu.add(Main.main.menu.imageryMenu,
+                    downloadAction, false);
+            EXPORT_MENU = MainMenu.add(Main.main.menu.fileMenu, exportAction,
+                    false, 14);
+            IMPORT_MENU = MainMenu.add(Main.main.menu.fileMenu, importAction,
+                    false, 14);
+            ZOOM_MENU = MainMenu
+                    .add(Main.main.menu.viewMenu, zoomAction, false, 15);
+            DOWNLOAD_VIEW_MENU = MainMenu.add(Main.main.menu.fileMenu,
+                    downloadViewAction, false, 14);
+        }
 
         EXPORT_MENU.setEnabled(false);