Skip to content

Commit d21c3f1

Browse files
james2432james2432
committed
Write Bearing information to image
Writing bearing to the image
1 parent fa4797b commit d21c3f1

File tree

4 files changed

+152
-2
lines changed

4 files changed

+152
-2
lines changed

‎OSVUploadr/pom.xml

+19
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,26 @@
3333
<version>1.3</version>
3434
<scope>test</scope>
3535
</dependency>
36+
<dependency>
37+
<groupId>org.apache.commons</groupId>
38+
<artifactId>commons-imaging</artifactId>
39+
<version>1.0-SNAPSHOT</version>
40+
<type>jar</type>
41+
</dependency>
3642
</dependencies>
43+
<repositories>
44+
<repository>
45+
<id>apache.snapshots</id>
46+
<name>Apache Development Snapshot Repository</name>
47+
<url>https://repository.apache.org/content/repositories/snapshots/</url>
48+
<releases>
49+
<enabled>false</enabled>
50+
</releases>
51+
<snapshots>
52+
<enabled>true</enabled>
53+
</snapshots>
54+
</repository>
55+
</repositories>
3756
<properties>
3857
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3958
<maven.compiler.source>1.8</maven.compiler.source>

‎OSVUploadr/src/main/java/ca/osmcanada/osvuploadr/JPMain.java

+15-2
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@
5656
import java.nio.charset.Charset;
5757
import java.util.Locale;
5858
import java.util.ResourceBundle;
59+
import org.apache.commons.imaging.ImageReadException;
60+
import org.apache.commons.imaging.ImageWriteException;
5961
import org.apache.http.client.HttpClient;
6062
import org.apache.http.client.CookieStore;
6163
import org.apache.http.cookie.Cookie;
@@ -157,12 +159,18 @@ public int compare(File f1, File f2)
157159
}});
158160
System.out.println("End sorting");
159161

160-
Double last_bearing;
162+
Double last_bearing=0.0;
161163
ImageProperties imTO = null;
162164
ImageProperties imFROM = null;
163165
for(int i=file_list.length-1;i>=0;i--){
164166
if(i==0){
165167
//TODO: set last bearing
168+
try{
169+
Helper.setBearing(file_list[i], last_bearing);
170+
}
171+
catch(IOException|ImageReadException|ImageWriteException ex){
172+
Logger.getLogger(JPMain.class.getName()).log(Level.SEVERE, "Error writing exif data", ex);
173+
}
166174
continue;
167175
}
168176
if(imTO==null){
@@ -176,7 +184,12 @@ public int compare(File f1, File f2)
176184
}
177185
last_bearing = (Helper.calc_bearing(imFROM.getLatitude(), imFROM.getLongitude(), imTO.getLatitude(), imTO.getLongitude())+ Offset) % 360.00;
178186
System.out.println("Calculated bearing (with offset) at: " + last_bearing);
179-
187+
try{
188+
Helper.setBearing(file_list[i], last_bearing);
189+
}
190+
catch(IOException|ImageReadException|ImageWriteException ex){
191+
Logger.getLogger(JPMain.class.getName()).log(Level.SEVERE, "Error writing exif data", ex);
192+
}
180193
}
181194
}
182195

‎OSVUploadr/src/main/java/ca/osmcanada/osvuploadr/Utils/Helper.java

+59
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
import com.drew.metadata.exif.ExifSubIFDDirectory;
1414
import com.drew.metadata.exif.GpsDirectory;
1515
import java.awt.Desktop;
16+
import java.io.BufferedOutputStream;
1617
import java.io.BufferedReader;
1718
import java.io.File;
19+
import java.io.FileOutputStream;
1820
import java.net.URI;
1921
import java.util.Date;
2022
import java.util.logging.Level;
@@ -23,13 +25,30 @@
2325
import java.util.List;
2426
import java.io.IOException;
2527
import java.io.InputStreamReader;
28+
import java.io.OutputStream;
29+
import java.nio.file.Files;
30+
import java.nio.file.Path;
31+
import java.nio.file.Paths;
32+
import java.nio.file.StandardCopyOption;
2633
import java.util.Locale;
2734
import org.apache.http.HttpResponse;
2835
import org.apache.http.NameValuePair;
2936
import org.apache.http.client.HttpClient;
3037
import org.apache.http.client.methods.HttpGet;
3138
import org.apache.http.client.methods.HttpPost;
3239
import org.apache.http.impl.client.HttpClientBuilder;
40+
import org.apache.commons.imaging.formats.jpeg.exif.ExifRewriter;
41+
import org.apache.commons.imaging.ImageReadException;
42+
import org.apache.commons.imaging.ImageWriteException;
43+
import org.apache.commons.imaging.Imaging;
44+
import org.apache.commons.imaging.common.ImageMetadata;
45+
import org.apache.commons.imaging.common.RationalNumber;
46+
import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
47+
import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
48+
import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants;
49+
import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants;
50+
import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory;
51+
import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
3352

3453
/**
3554
*
@@ -76,10 +95,49 @@ public static long getFileTime(File f){
7695
return 0;
7796
}
7897

98+
public static void setBearing(File f, Double bearing)
99+
throws IOException, ImageReadException, ImageWriteException{
100+
101+
try (FileOutputStream fos = new FileOutputStream(f.getParent()+ File.separator+"SUPERTMPDUMP12324231.jpg",false);
102+
OutputStream os = new BufferedOutputStream(fos);) {
103+
104+
TiffOutputSet outputSet = null;
105+
106+
final ImageMetadata metadata = Imaging.getMetadata(new File(f.getAbsolutePath()));
107+
final JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
108+
if (null != jpegMetadata) {
109+
final TiffImageMetadata exif = jpegMetadata.getExif();
110+
111+
if (null != exif) {
112+
outputSet = exif.getOutputSet();
113+
}
114+
}
115+
116+
if (null == outputSet) {
117+
outputSet = new TiffOutputSet();
118+
}
119+
120+
Rational r = new Rational(bearing);
121+
final TiffOutputDirectory exifDirectory = outputSet.getOrCreateGPSDirectory();
122+
123+
exifDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION );
124+
exifDirectory.add(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION, new RationalNumber(r.getNumerator(), r.getDenominator()));
125+
126+
127+
new ExifRewriter().updateExifMetadataLossless(f, os,
128+
outputSet);
129+
//Replace file with new meta data
130+
Files.move(Paths.get(f.getPath()+ File.separator+"SUPERTMPDUMP12324231.jpg"), Paths.get(f.getAbsolutePath()), StandardCopyOption.REPLACE_EXISTING);
131+
}
132+
133+
}
134+
135+
79136
public static ImageProperties getImageProperties(File f){
80137
try{
81138
Metadata metadata = ImageMetadataReader.readMetadata(f);
82139
GpsDirectory directory = metadata.getFirstDirectoryOfType(GpsDirectory.class);
140+
83141

84142
ImageProperties imp = new ImageProperties();
85143
imp.setLatitude(directory.getGeoLocation().getLatitude());
@@ -304,3 +362,4 @@ public static Double calc_bearing(Double start_latitude, Double start_longitude,
304362
return Math.toDegrees( Math.atan2(Math.sin(dLongitude)*Math.cos(end_latitude), Math.cos(start_latitude)*Math.sin(end_latitude) - Math.sin(start_latitude)*Math.cos(end_latitude)*Math.cos(dLongitude)));
305363
}
306364
}
365+

‎OSVUploadr/src/main/java/ca/osmcanada/osvuploadr/Utils/Rational.java

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* To change this license header, choose License Headers in Project Properties.
3+
* To change this template file, choose Tools | Templates
4+
* and open the template in the editor.
5+
*/
6+
package ca.osmcanada.osvuploadr.Utils;
7+
8+
import java.math.BigDecimal;
9+
import java.math.BigInteger;
10+
import java.math.MathContext;
11+
12+
/**
13+
*
14+
* @author james
15+
*/
16+
public class Rational {
17+
18+
private int num, denom;
19+
20+
static int[] reduceFraction(BigInteger num, BigInteger den) {
21+
int gcd = num.gcd(den).intValue();
22+
int[] rf = { num.divide(BigInteger.valueOf(gcd)).intValue(), den.divide(BigInteger.valueOf(gcd)).intValue() };
23+
return rf;
24+
}
25+
public Rational(double d) {
26+
String[] parts = String.valueOf(d).split("\\.");
27+
BigDecimal den=null;
28+
if(parts[1].length()>6){
29+
den=BigDecimal.TEN.pow(6);
30+
parts[1]=parts[1].substring(0, 6);
31+
}
32+
else{
33+
den=BigDecimal.TEN.pow(parts[1].length());
34+
}
35+
BigDecimal num = (new BigDecimal(parts[0]).multiply(den)).add(new BigDecimal(parts[1])); // numerator
36+
int[] fraction = reduceFraction(num.toBigInteger(), den.toBigInteger());
37+
this.num = fraction[0]; this.denom = fraction[1];
38+
}
39+
40+
public Rational(int num, int denom) {
41+
this.num = num; this.denom = denom;
42+
}
43+
44+
Rational() {
45+
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
46+
}
47+
48+
public int getNumerator(){
49+
return num;
50+
}
51+
52+
public int getDenominator(){
53+
return denom;
54+
}
55+
public String toString() {
56+
return String.valueOf(num) + "/" + String.valueOf(denom);
57+
}
58+
}
59+

0 commit comments

Comments
 (0)