Changeset 36278 in osm

Timestamp:

2024-06-06T18:41:48+02:00 (7 months ago)

Author:

taylor.smock

Message:

Update MicrosoftStreetside to use apache commons-imaging 1.0.0-alpha5

Location:

applications/editors/josm/plugins/MicrosoftStreetside

Files:

• gradle.properties (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/streetside/io/export/StreetsideExportWriterThread.java (modified) (4 diffs)

applications/editors/josm/plugins/MicrosoftStreetside/gradle.properties

@@ -9 +9 @@
 # Minimum required JOSM version to run this plugin, choose the lowest version possible that is compatible.
 # You can check if the plugin compiles against this version by executing `./gradlew compileJava_minJosm`.
-plugin.main.version=18877
+plugin.main.version=19044
 #plugin.version=
 # Version of JOSM against which the plugin is compiled

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/export/StreetsideExportWriterThread.java

@@ -13 +13 @@
 import javax.imageio.ImageIO;
 
-import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.ImageWriteException;
 import org.apache.commons.imaging.common.RationalNumber;
 import org.apache.commons.imaging.formats.jpeg.exif.ExifRewriter;
@@ -80 +78 @@
 
                 exifDirectory = outputSet.getOrCreateExifDirectory();
-                gpsDirectory = outputSet.getOrCreateGPSDirectory();
+                gpsDirectory = outputSet.getOrCreateGpsDirectory();
 
                 gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF);
@@ -91 +89 @@
                 exifDirectory.removeField(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL);
 
-                outputSet.setGPSInDegrees(mimg.lon(), mimg.lat());
+                outputSet.setGpsInDegrees(mimg.lon(), mimg.lat());
                 try (OutputStream os = new BufferedOutputStream(new FileOutputStream(finalPath + ".jpg"))) {
                     new ExifRewriter().updateExifMetadataLossless(imageBytes, os, outputSet);
@@ -99 +97 @@
                 LOGGER.info("Streetside export cancelled");
                 return;
-            } catch (IOException | ImageReadException | ImageWriteException e) {
+            } catch (IOException e) {
                 LOGGER.log(Logging.LEVEL_ERROR, e.getMessage(), e);
             }