Changeset 31260 in osm

Timestamp:

2015-06-11T20:25:14+02:00 (10 years ago)

Author:

nokutu

Message:

Now you can export imported picutres, with modified exif data

Location:

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

Files:

• actions/MapillaryExportAction.java (modified) (2 diffs)
• downloads/MapillarySignalDownloaderThread.java (modified) (1 diff)
• gui/MapillaryExportDialog.java (modified) (3 diffs)

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

@@ -17 +17 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryData;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryImage;
+import org.openstreetmap.josm.plugins.mapillary.MapillaryImportedImage;
 import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryExportManager;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryExportDialog;
@@ -66 +67 @@
                         } else if (dialog.group.isSelected(dialog.selected.getModel())) {
                                 export(MapillaryData.getInstance().getMultiSelectedImages());
+                        } else if (dialog.group.isSelected(dialog.rewrite.getModel())) {
+                                ArrayList<MapillaryAbstractImage> images = new ArrayList<>();
+                                for (MapillaryAbstractImage image : MapillaryData.getInstance().getMultiSelectedImages())
+                                        if (image instanceof MapillaryImportedImage) {
+                                                images.addAll(((MapillaryImage) image).getSequence().getImages());
+                                        }
+                                        else
+                                                images.add(image);
+                                export(images);
                         }
                 }

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

@@ -31 +31 @@
                 BufferedReader br;
                 try {
-                        System.out.println(url);
                         br = new BufferedReader(new InputStreamReader(
                                         new URL(url).openStream()));

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java

@@ -40 +40 @@
          */
         public JRadioButton selected;
+        public JRadioButton rewrite;
         public ButtonGroup group;
         protected JButton choose;
@@ -53 +54 @@
                 sequence = new JRadioButton(tr("Export selected sequence"));
                 selected = new JRadioButton(tr("Export selected images"));
+                rewrite = new JRadioButton(tr("Rewrite imported images"));
                 group.add(all);
                 group.add(sequence);
                 group.add(selected);
+                group.add(rewrite);
                 // Some options are disabled depending on the circumstances
                 if (MapillaryData.getInstance().getSelectedImage() == null
-                                || (MapillaryData.getInstance().getSelectedImage() instanceof MapillaryImage && ((MapillaryImage) MapillaryData
-                                                .getInstance().getSelectedImage()).getSequence() == null)) {
+                                || !(MapillaryData.getInstance().getSelectedImage() instanceof MapillaryImage && ((MapillaryImage) MapillaryData
+                                                .getInstance().getSelectedImage()).getSequence() != null)) {
                         sequence.setEnabled(false);
                 }
@@ -75 +78 @@
                 jpanel.add(sequence);
                 jpanel.add(selected);
+                jpanel.add(rewrite);
                 jpanel.setAlignmentX(Component.CENTER_ALIGNMENT);
                 path.setAlignmentX(Component.CENTER_ALIGNMENT);