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

Timestamp:

2015-06-16T18:31:23+02:00 (10 years ago)

Author:

nokutu

Message:

Code cleaned and commented

Location:

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

Files:

• MapillaryData.java (modified) (1 diff)
• MapillaryMouseAdapter.java (modified) (1 diff)
• MapillaryPlugin.java (modified) (2 diffs)
• actions/MapillaryImportAction.java (modified) (4 diffs)

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

@@ -15 +15 @@
  * 
  * @author nokutu
- * @see MapillaryImage
+ * @see MapillaryAbstractImage
  * @see MapillarySequence
  *

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

@@ -180 +180 @@
         public void mouseMoved(MouseEvent e) {
                 MapillaryAbstractImage closestTemp = getClosest(e.getPoint());
-
+                // TODO check if it is possible to do this while the OSM data layer is
+                // selected.
                 if (Main.map.mapView.getActiveLayer() instanceof MapillaryLayer
                                 && MapillaryData.getInstance().getHoveredImage() != closestTemp

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

@@ -43 +43 @@
         public static final ImageIcon MAP_SIGNAL = new ImageProvider("signal.png")
                         .get();
-        public static final ImageIcon MAP_ICON_HOVER = new ImageProvider("hover.png").get();
+        public static final ImageIcon MAP_ICON_HOVER = new ImageProvider(
+                        "hover.png").get();
         public static final int ICON_SIZE = 24;
 
@@ -74 +75 @@
                 IMPORT_MENU = MainMenu.add(Main.main.menu.fileMenu, importAction,
                                 false, 14);
-                SIGNAL_MENU = MainMenu.add(Main.main.menu.dataMenu, signalAction,
-                                false);
-                ZOOM_MENU = MainMenu.add(Main.main.menu.viewMenu, zoomAction,
-                                false, 15);
+                SIGNAL_MENU = MainMenu
+                                .add(Main.main.menu.dataMenu, signalAction, false);
+                ZOOM_MENU = MainMenu
+                                .add(Main.main.menu.viewMenu, zoomAction, false, 15);
 
                 EXPORT_MENU.setEnabled(false);

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java

@@ -27 +27 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
+/**
+ * Imports a set of picture files into JOSM. They must be in jpg or png format.
+ * 
+ * @author nokutu
+ *
+ */
 public class MapillaryImportAction extends JosmAction {
 
         public JFileChooser chooser;
 
+        /**
+         * Amount of pictures without the proper EXIF tags.
+         */
         private int noTagsPics = 0;
 
@@ -83 +92 @@
         }
 
+        /**
+         * Reads a jpg pictures that contains the needed GPS information (position
+         * and direction) and creates a new icon in that position.
+         * 
+         * @param file
+         * @throws ImageReadException
+         * @throws IOException
+         */
         public void readJPG(File file) throws ImageReadException, IOException {
                 final ImageMetadata metadata = Imaging.getMetadata(file);
@@ -122 +139 @@
         }
 
+        /**
+         * Reads a image file that doesn't contain the needed GPS information. And
+         * creates a new icon in the middle of the map.
+         * 
+         * @param file
+         */
         private void readNoTags(File file) {
                 double HORIZONTAL_DISTANCE = 0.0001;
@@ -132 +155 @@
                                 Main.map.mapView.getCenter());
                 MapillaryData.getInstance().add(
-                                new MapillaryImportedImage(pos.lat(), pos.lon() + horDev, 0, file));
+                                new MapillaryImportedImage(pos.lat(), pos.lon() + horDev, 0,
+                                                file));
                 noTagsPics++;
         }