Changeset 31183 in osm for applications/editors

Timestamp:

2015-06-02T17:24:37+02:00 (10 years ago)

Author:

nokutu

Message:

Code cleaned

Location:

applications/editors/josm/plugins/mapillary

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryToggleDialog.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportWriterThread.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/build.xml

@@ -30 +30 @@
     <!-- <property name="plugin.link" value="..."/>-->
     <!--<property name="plugin.early" value="..."/>-->
-    <!--<property name="plugin.requires" value="commons-imagery"/>-->
+    <!--<property name="plugin.requires" value="commons-imaging"/>-->
     <!--<property name="plugin.stage" value="..."/>-->
     

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

@@ -49 +49 @@
                 MouseListener, DataSetListener, EditLayerChangeListener {
 
+        public final static int SEQUENCE_MAX_JUMP_DISTANCE = 100;
+        
         public static Boolean INSTANCED = false;
         public static MapillaryLayer INSTANCE;
@@ -249 +251 @@
         private MapillaryImage[] getClosestImagesFromDifferentSequences() {
                 MapillaryImage[] ret = new MapillaryImage[2];
-                double[] distances = { 100, 100 };
+                double[] distances = { SEQUENCE_MAX_JUMP_DISTANCE, SEQUENCE_MAX_JUMP_DISTANCE };
                 LatLon selectedCoords = mapillaryData.getSelectedImage().getLatLon();
-                double maxJumpDistance = 100;
                 for (MapillaryImage image : mapillaryData.getImages()) {
-                        if (image.getLatLon().greatCircleDistance(selectedCoords) < maxJumpDistance
+                        if (image.getLatLon().greatCircleDistance(selectedCoords) < SEQUENCE_MAX_JUMP_DISTANCE
                                         && mapillaryData.getSelectedImage().getSequence() != image
                                                         .getSequence()) {

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

@@ -37 +37 @@
         public MapillaryPlugin(PluginInformation info) {
                 super(info);
-                Main.logLevel = 1;
+                synchronized (this) {
+                        Main.logLevel = 1;
+                }
                 downloadAction = new MapillaryDownloadAction();
                 exportAction = new MapillaryExportAction();

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

@@ -105 +105 @@
                                 return;
                         }
-                        if (this.image != null) {
-                                this.nextButton.setEnabled(true);
-                                this.previousButton.setEnabled(true);
-                                if (this.image.next() == null)
-                                        this.nextButton.setEnabled(false);
-                                if (this.image.previous() == null)
-                                        this.previousButton.setEnabled(false);
-                                        
-                                CacheAccess<String, BufferedImageCacheEntry> prev;
-                                try {
-                                        this.mapillaryImageDisplay.setImage(null);
-                                        prev = JCSCacheManager.getCache("mapillary");
-                                        if (thumbnailCache != null)
-                                                thumbnailCache.cancelOutstandingTasks();
-                                        thumbnailCache = new MapillaryCache(image.getKey(),
-                                                        MapillaryCache.Type.THUMBNAIL, prev, 200000,
-                                                        200000, new HashMap<String, String>());
-                                        thumbnailCache.submit(this, false);
-
-                                        if (imageCache != null)
-                                                imageCache.cancelOutstandingTasks();
-                                        imageCache = new MapillaryCache(image.getKey(),
-                                                        MapillaryCache.Type.FULL_IMAGE, prev, 200000,
-                                                        200000, new HashMap<String, String>());
-                                        imageCache.submit(this, false);
-                                } catch (IOException e) {
-                                        // TODO Auto-generated catch block
-                                        e.printStackTrace();
-                                }
+                        if (this.image == null)
+                                return;
+                        this.nextButton.setEnabled(true);
+                        this.previousButton.setEnabled(true);
+                        if (this.image.next() == null)
+                                this.nextButton.setEnabled(false);
+                        if (this.image.previous() == null)
+                                this.previousButton.setEnabled(false);
+
+                        CacheAccess<String, BufferedImageCacheEntry> prev;
+                        try {
+                                this.mapillaryImageDisplay.setImage(null);
+                                prev = JCSCacheManager.getCache("mapillary");
+                                if (thumbnailCache != null)
+                                        thumbnailCache.cancelOutstandingTasks();
+                                thumbnailCache = new MapillaryCache(image.getKey(),
+                                                MapillaryCache.Type.THUMBNAIL, prev, 200000, 200000,
+                                                new HashMap<String, String>());
+                                thumbnailCache.submit(this, false);
+
+                                if (imageCache != null)
+                                        imageCache.cancelOutstandingTasks();
+                                imageCache = new MapillaryCache(image.getKey(),
+                                                MapillaryCache.Type.FULL_IMAGE, prev, 200000, 200000,
+                                                new HashMap<String, String>());
+                                imageCache.submit(this, false);
+                        } catch (IOException e) {
+                                Main.error(e);
                         }
                 }
@@ -173 +172 @@
                         if (MapillaryToggleDialog.getInstance().getImage() != null) {
                                 MapillaryData.getInstance().selectNext();
-                                if (MapillaryData.getInstance()
-                                                .getSelectedImage() != null)
+                                if (MapillaryData.getInstance().getSelectedImage() != null)
                                         Main.map.mapView.zoomTo(MapillaryData.getInstance()
                                                         .getSelectedImage().getLatLon());
@@ -198 +196 @@
                         if (MapillaryToggleDialog.getInstance().getImage() != null) {
                                 MapillaryData.getInstance().selectPrevious();
-                                if (MapillaryData.getInstance()
-                                                .getSelectedImage() != null)
+                                if (MapillaryData.getInstance().getSelectedImage() != null)
                                         Main.map.mapView.zoomTo(MapillaryData.getInstance()
                                                         .getSelectedImage().getLatLon());

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportWriterThread.java

@@ -25 +25 @@
 
 /**
- * Writes the images from the queue in the HD.
+ * Writes the images from the queue in the file system.
  * 
  * @author nokutu