Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java (revision 31377) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java (revision 31378) @@ -44,7 +44,9 @@ public MapillaryImportAction() { - super(tr("Import pictures"), new ImageProvider("icon24.png"), tr("Import local pictures"), Shortcut - .registerShortcut("Import Mapillary", tr("Import pictures into Mapillary layer"), KeyEvent.CHAR_UNDEFINED, - Shortcut.NONE), false, "mapillaryImport", false); + super(tr("Import pictures"), new ImageProvider("icon24.png"), + tr("Import local pictures"), Shortcut.registerShortcut( + "Import Mapillary", tr("Import pictures into Mapillary layer"), + KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false, "mapillaryImport", + false); this.setEnabled(false); } @@ -53,10 +55,12 @@ public void actionPerformed(ActionEvent e) { chooser = new JFileChooser(); - File startDirectory = new File(Main.pref.get("mapillary.start-directory", System.getProperty("user.home"))); + File startDirectory = new File(Main.pref.get("mapillary.start-directory", + System.getProperty("user.home"))); chooser.setCurrentDirectory(startDirectory); chooser.setDialogTitle(tr("Select pictures")); chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); chooser.setAcceptAllFileFilterUsed(false); - chooser.addChoosableFileFilter(new FileNameExtensionFilter("images", "jpg", "jpeg", "png")); + chooser.addChoosableFileFilter(new FileNameExtensionFilter("images", "jpg", + "jpeg", "png")); chooser.setMultiSelectionEnabled(true); if (chooser.showOpenDialog(Main.parent) == JFileChooser.APPROVE_OPTION) { @@ -66,8 +70,25 @@ MapillaryLayer.getInstance(); if (file.isDirectory()) { - // TODO import directory + for (int j = 0; j < file.listFiles().length; j++) { + int k = file.listFiles()[j].getName().lastIndexOf('.'); + String extension = null; + if (k > 0) { + extension = file.listFiles()[j].getName().substring(k + 1); + } + try { + if (extension.equals("jpg") || extension.equals("jpeg")) + readJPG(file.listFiles()[j]); + + else if (extension.equals("png")) + readPNG(file.listFiles()[j]); + } catch (ImageReadException | IOException e1) { + Main.error(e1); + } + } } else { - if (file.getPath().substring(file.getPath().length() - 4).equals(".jpg") - || file.getPath().substring(file.getPath().length() - 5).equals(".jpeg")) { + if (file.getPath().substring(file.getPath().length() - 4) + .equals(".jpg") + || file.getPath().substring(file.getPath().length() - 5) + .equals(".jpeg")) { try { readJPG(file); @@ -77,5 +98,6 @@ Main.error(ex); } - } else if (file.getPath().substring(file.getPath().length() - 4).equals(".png")) { + } else if (file.getPath().substring(file.getPath().length() - 4) + .equals(".png")) { readPNG(file); } @@ -97,9 +119,14 @@ if (metadata instanceof JpegImageMetadata) { final JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata; - final TiffField lat_ref = jpegMetadata.findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF); - final TiffField lat = jpegMetadata.findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LATITUDE); - final TiffField lon_ref = jpegMetadata.findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF); - final TiffField lon = jpegMetadata.findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LONGITUDE); - final TiffField ca = jpegMetadata.findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION); + final TiffField lat_ref = jpegMetadata + .findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF); + final TiffField lat = jpegMetadata + .findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LATITUDE); + final TiffField lon_ref = jpegMetadata + .findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF); + final TiffField lon = jpegMetadata + .findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LONGITUDE); + final TiffField ca = jpegMetadata + .findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION); final TiffField datetimeOriginal = jpegMetadata .findEXIFValueWithExactMatch(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL); @@ -112,14 +139,18 @@ double caValue = 0; if (lat.getValue() instanceof RationalNumber[]) - latValue = degMinSecToDouble((RationalNumber[]) lat.getValue(), lat_ref.getValue().toString()); + latValue = degMinSecToDouble((RationalNumber[]) lat.getValue(), lat_ref + .getValue().toString()); if (lon.getValue() instanceof RationalNumber[]) - lonValue = degMinSecToDouble((RationalNumber[]) lon.getValue(), lon_ref.getValue().toString()); + lonValue = degMinSecToDouble((RationalNumber[]) lon.getValue(), lon_ref + .getValue().toString()); if (ca != null && ca.getValue() instanceof RationalNumber) caValue = ((RationalNumber) ca.getValue()).doubleValue(); if (datetimeOriginal != null) - MapillaryData.getInstance() - .add(new MapillaryImportedImage(latValue, lonValue, caValue, file, datetimeOriginal.getStringValue())); + MapillaryData.getInstance().add( + new MapillaryImportedImage(latValue, lonValue, caValue, file, + datetimeOriginal.getStringValue())); else - MapillaryData.getInstance().add(new MapillaryImportedImage(latValue, lonValue, caValue, file)); + MapillaryData.getInstance().add( + new MapillaryImportedImage(latValue, lonValue, caValue, file)); } } @@ -138,6 +169,8 @@ else horDev = -HORIZONTAL_DISTANCE * ((noTagsPics + 1) / 2); - LatLon pos = Main.map.mapView.getProjection().eastNorth2latlon(Main.map.mapView.getCenter()); - MapillaryData.getInstance().add(new MapillaryImportedImage(pos.lat(), pos.lon() + horDev, 0, file)); + LatLon pos = Main.map.mapView.getProjection().eastNorth2latlon( + Main.map.mapView.getCenter()); + MapillaryData.getInstance().add( + new MapillaryImportedImage(pos.lat(), pos.lon() + horDev, 0, file)); noTagsPics++; } @@ -148,21 +181,35 @@ /** - * Calculates the decimal degree-value from a degree value given in degrees-minutes-seconds-format + * Calculates the decimal degree-value from a degree value given in + * degrees-minutes-seconds-format * - * @param degMinSec an array of length 3, the values in there are (in this order) degrees, minutes and seconds - * @param ref the latitude or longitude reference determining if the given value is: - * - * @return the decimal degree-value for the given input, negative when west of 0-meridian or south of equator, - * positive otherwise - * @throws IllegalArgumentException if {@code degMinSec} doesn't have length 3 or if {@code ref} is not one of the - * values mentioned above - */ // TODO: Maybe move into a separate utility class? + * @param degMinSec + * an array of length 3, the values in there are (in this order) + * degrees, minutes and seconds + * @param ref + * the latitude or longitude reference determining if the given value + * is: + * + * @return the decimal degree-value for the given input, negative when west of + * 0-meridian or south of equator, positive otherwise + * @throws IllegalArgumentException + * if {@code degMinSec} doesn't have length 3 or if {@code ref} is + * not one of the values mentioned above + */ + // TODO: Maybe move into a separate utility class? public static double degMinSecToDouble(RationalNumber[] degMinSec, String ref) { - if (degMinSec == null || degMinSec.length != 3) { throw new IllegalArgumentException(); } + if (degMinSec == null || degMinSec.length != 3) { + throw new IllegalArgumentException(); + } switch (ref) { case GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF_VALUE_NORTH: Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java (revision 31377) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java (revision 31378) @@ -39,7 +39,10 @@ public MapillaryImportIntoSequenceAction() { - super(tr("Import pictures into sequence"), new ImageProvider("icon24.png"), tr("Import local pictures"), Shortcut - .registerShortcut("Import Mapillary Sequence", tr("Import pictures into Mapillary layer in a sequence"), - KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false, "mapillaryImportSequence", false); + super(tr("Import pictures into sequence"), new ImageProvider("icon24.png"), + tr("Import local pictures"), Shortcut.registerShortcut( + "Import Mapillary Sequence", + tr("Import pictures into Mapillary layer in a sequence"), + KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false, + "mapillaryImportSequence", false); this.setEnabled(false); } @@ -50,20 +53,40 @@ chooser = new JFileChooser(); - File startDirectory = new File(Main.pref.get("mapillary.start-directory", System.getProperty("user.home"))); - chooser.setCurrentDirectory(startDirectory); chooser.setDialogTitle(tr("Select pictures")); + File startDirectory = new File(Main.pref.get("mapillary.start-directory", + System.getProperty("user.home"))); + chooser.setCurrentDirectory(startDirectory); + chooser.setDialogTitle(tr("Select pictures")); chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); chooser.setAcceptAllFileFilterUsed(false); - chooser.addChoosableFileFilter(new FileNameExtensionFilter("images", "jpg", "jpeg")); + chooser.addChoosableFileFilter(new FileNameExtensionFilter("images", "jpg", + "jpeg")); chooser.setMultiSelectionEnabled(true); + if (chooser.showOpenDialog(Main.parent) == JFileChooser.APPROVE_OPTION) { for (int i = 0; i < chooser.getSelectedFiles().length; i++) { File file = chooser.getSelectedFiles()[i]; Main.pref.put("mapillary.start-directory", file.getParent()); + MapillaryLayer.getInstance(); if (file.isDirectory()) { - // TODO import directory + for (int j = 0; j < file.listFiles().length; j++) { + int k = file.listFiles()[j].getName().lastIndexOf('.'); + String extension = null; + if (k > 0) { + extension = file.listFiles()[j].getName().substring(k + 1); + } + try { + if (extension.equals("jpg") || extension.equals("jpeg")) + readJPG(file.listFiles()[j]); + } catch (ImageReadException e) { + Main.error(e); + } catch (IOException e) { + Main.error(e); + } + } } else { - MapillaryLayer.getInstance(); - if (file.getPath().substring(file.getPath().length() - 4).equals(".jpg") - || file.getPath().substring(file.getPath().length() - 5).equals(".jpeg")) { + if (file.getPath().substring(file.getPath().length() - 4) + .equals(".jpg") + || file.getPath().substring(file.getPath().length() - 5) + .equals(".jpeg")) { try { readJPG(file); @@ -92,13 +115,20 @@ if (metadata instanceof JpegImageMetadata) { final JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata; - final TiffField lat_ref = jpegMetadata.findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF); - final TiffField lat = jpegMetadata.findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LATITUDE); - final TiffField lon_ref = jpegMetadata.findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF); - final TiffField lon = jpegMetadata.findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LONGITUDE); - final TiffField ca = jpegMetadata.findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION); + final TiffField lat_ref = jpegMetadata + .findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF); + final TiffField lat = jpegMetadata + .findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LATITUDE); + final TiffField lon_ref = jpegMetadata + .findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF); + final TiffField lon = jpegMetadata + .findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LONGITUDE); + final TiffField ca = jpegMetadata + .findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION); final TiffField datetimeOriginal = jpegMetadata .findEXIFValueWithExactMatch(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL); - if (lat_ref == null || lat == null || lon == null || lon_ref == null || datetimeOriginal == null) - throw new IllegalArgumentException("The picture has not correct EXIF tags"); + if (lat_ref == null || lat == null || lon == null || lon_ref == null + || datetimeOriginal == null) + throw new IllegalArgumentException( + "The picture has not correct EXIF tags"); double latValue = 0; @@ -106,12 +136,14 @@ double caValue = 0; if (lat.getValue() instanceof RationalNumber[]) - latValue = MapillaryImportAction.degMinSecToDouble((RationalNumber[]) lat.getValue(), lat_ref.getValue().toString()); + latValue = MapillaryImportAction.degMinSecToDouble( + (RationalNumber[]) lat.getValue(), lat_ref.getValue().toString()); if (lon.getValue() instanceof RationalNumber[]) - lonValue = MapillaryImportAction.degMinSecToDouble((RationalNumber[]) lon.getValue(), lon_ref.getValue().toString()); + lonValue = MapillaryImportAction.degMinSecToDouble( + (RationalNumber[]) lon.getValue(), lon_ref.getValue().toString()); if (ca != null && ca.getValue() instanceof RationalNumber) caValue = ((RationalNumber) ca.getValue()).doubleValue(); - MapillaryImportedImage image = new MapillaryImportedImage(latValue, lonValue, caValue, file, - datetimeOriginal.getStringValue()); + MapillaryImportedImage image = new MapillaryImportedImage(latValue, + lonValue, caValue, file, datetimeOriginal.getStringValue()); MapillaryData.getInstance().add(image); image.getCapturedAt(); @@ -130,5 +162,6 @@ } - public class MapillaryEpochComparator implements Comparator { + public class MapillaryEpochComparator implements + Comparator { @Override