[
https://issues.apache.org/jira/browse/TIKA-2770?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16687151#comment-16687151
]
ASF GitHub Bot commented on TIKA-2770:
--------------------------------------
tballison closed pull request #257: fix for TIKA-2770 contributed by
kristencheung
URL: https://github.com/apache/tika/pull/257
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/tika-parsers/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java
b/tika-parsers/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java
index 10d8845e7..4eb26ae25 100644
---
a/tika-parsers/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java
+++
b/tika-parsers/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java
@@ -116,10 +116,24 @@ private void readLines(AutoDetectReader reader, Metadata
metadata) throws IOExce
* Write a line to the XHTMLContentHandler and populate the key, value
into the Metadata
*/
private void writeParagraphAndSetMetadata(String line, Metadata metadata)
throws SAXException {
- if(line.length() < 150) {
- String[] keyValue = line.split("=");
+ if(line.length() < 300) {
+ String[] keyValue = line.split("=", 2);
if(keyValue.length != 1) {
- metadata.set("envi." + keyValue[0].trim().replace(" ", "."),
keyValue[1].trim());
+ if (keyValue[0].trim().equals("map info")) {
+ String[] mapInfoValues = parseMapInfoContents(keyValue[1]);
+ if (mapInfoValues[0].equals("UTM")) {
+ metadata.set("envi." + keyValue[0].trim().replace(" ",
"."), keyValue[1].trim());
+ String [] latLonStringArray =
convertMapInfoValuesToLatLngAndSetMetadata(mapInfoValues, metadata);
+ String xhtmlLatLongLine = "lat/lon = { " +
latLonStringArray[0] + ", " + latLonStringArray[1] + " }";
+ xhtml.startElement("p");
+ xhtml.characters(xhtmlLatLongLine);
+ xhtml.endElement("p");
+ } else {
+ metadata.set("envi." + keyValue[0].trim().replace(" ",
"."), keyValue[1].trim());
+ }
+ } else {
+ metadata.set("envi." + keyValue[0].trim().replace(" ",
"."), keyValue[1].trim());
+ }
}
}
xhtml.startElement("p");
@@ -127,6 +141,69 @@ private void writeParagraphAndSetMetadata(String line,
Metadata metadata) throws
xhtml.endElement("p");
}
+ private String[] parseMapInfoContents(String mapInfoValue) {
+ StringBuilder mapInfoValueStringBuilder = new StringBuilder();
+ for (int i = 0; i < mapInfoValue.length(); ++i) {
+ if (mapInfoValue.charAt(i) != '{' && mapInfoValue.charAt(i) != '}'
&& mapInfoValue.charAt(i) != ' ') {
+ mapInfoValueStringBuilder.append(mapInfoValue.charAt(i));
+ }
+ }
+ String[] mapInfoValues =
mapInfoValueStringBuilder.toString().split(",");
+ return mapInfoValues;
+ }
+
+ // Conversion logic taken from
https://stackoverflow.com/questions/343865/how-to-convert-from-utm-to-latlng-in-python-or-javascript/344083#344083
+ private String [] convertMapInfoValuesToLatLngAndSetMetadata(String[]
mapInfoValues, Metadata metadata) {
+ // Based on the map info data, pixelEasting is at index 3 and
pixelNorthing is at index 4
+ double pixelEasting = Double.valueOf(mapInfoValues[3].trim());
+ double pixelNorthing = Double.valueOf(mapInfoValues[4].trim());
+ int zone = 0;
+ if(!mapInfoValues[7].trim().isEmpty()){
+ zone = Integer.parseInt(mapInfoValues[7].trim());
+ }
+
+ double a = 6378137.0;
+ double e = 0.0818191910;
+ double e1sq = 0.006739497;
+ double k0 = 0.9996;
+
+ double arc = pixelNorthing / k0;
+ double mu = arc / (a * (1.0 - Math.pow(e, 2.0) / 4.0 - 3.0 *
Math.pow(e, 4.0) / 64.0 - 5.0 * Math.pow(e, 6.0) / 256.0));
+
+ double ei = (1.0 - Math.pow((1.0 - e * e), (1.0 / 2.0))) / (1.0 +
Math.pow((1.0 - e * e), (1.0 / 2.0)));
+
+ double ca = 3.0 * ei / 2.0 - 27.0 * Math.pow(ei, 3.0) / 32.0;
+
+ double cb = 21.0 * Math.pow(ei, 2.0) / 16.0 - 55.0 * Math.pow(ei, 4.0)
/ 32.0;
+ double cc = 151.0 * Math.pow(ei, 3.0) / 96.0;
+ double cd = 1097.0 * Math.pow(ei, 4.0) / 512.0;
+ double phi1 = mu + ca * Math.sin(2.0 * mu) + cb * Math.sin(4.0 * mu) +
cc * Math.sin(6.0 * mu) + cd * Math.sin(8.0 * mu);
+
+ double n0 = a / Math.pow((1.0 - Math.pow((e * Math.sin(phi1)), 2.0)),
(1.0 / 2.0));
+
+ double r0 = a * (1.0 - e * e) / Math.pow((1.0 - Math.pow((e *
Math.sin(phi1)), 2.0)), (3.0 / 2.0));
+ double fact1 = n0 * Math.tan(phi1) / r0;
+
+ double _a1 = 500000.0 - pixelEasting;
+ double dd0 = _a1 / (n0 * k0);
+ double fact2 = dd0 * dd0 / 2.0;
+ double t0 = Math.pow(Math.tan(phi1), 2.0);
+ double Q0 = e1sq * Math.pow(Math.cos(phi1), 2.0);
+ double fact3 = (5.0 + 3.0 * t0 + 10.0 * Q0 - 4.0 * Q0 * Q0 - 9.0 *
e1sq) * Math.pow(dd0, 4.0) / 24.0;
+ double fact4 = (61.0 + 90.0 * t0 + 298.0 * Q0 + 45.0 * t0 * t0 - 252.0
* e1sq - 3.0 * Q0 * Q0) * Math.pow(dd0, 6.0) / 720.0;
+ double lof1 = _a1 / (n0 * k0);
+ double lof2 = (1.0 + 2.0 * t0 + Q0) * Math.pow(dd0, 3.0) / 6.0;
+ double lof3 = (5.0 - 2.0 * Q0 + 28.0 * t0 - 3.0 * Math.pow(Q0, 2.0) +
8.0 * e1sq + 24.0 * Math.pow(t0, 2.0)) * Math.pow(dd0, 5.0) / 120.0;
+ double _a2 = (lof1 - lof2 + lof3) / Math.cos(phi1);
+ double _a3 = _a2 * 180.0 / Math.PI;
+ double zoneCM = (zone > 0) ? 6 * zone - 183.0 : 3.0;
+ double latitude = 180.0 * (phi1 - fact1 * (fact2 + fact3 + fact4)) /
Math.PI;
+ double longitude = zoneCM - _a3;
+ metadata.set("envi.lat/lon" , latitude + ", " + longitude);
+
+ return new String [] {Double.toString(latitude),
Double.toString(longitude)};
+ }
+
/*
* Enables correct extraction of fiel values which span more
* than one line. Essentially, multi-line fiel values are
diff --git
a/tika-parsers/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java
b/tika-parsers/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java
index 51b90048b..8ab1c4159 100644
---
a/tika-parsers/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java
+++
b/tika-parsers/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java
@@ -90,6 +90,7 @@ public void testParseGlobalMetadataMultiLineMetadataValues()
throws Exception {
assertContains("<body><p>ENVI</p>", content);
assertContains("<p>description = { Georeferenced Image built from
input GLT. [Wed Jun 10 04:37:54 2015] [Wed Jun 10 04:48:52 2015]}</p>",
content);
assertContains("<p>samples = 739</p>", content);
+ assertContains("<p>lat/lon = { 36.79077627261556, -108.48370867914815
}</p>", content);
assertContains("<p>map info = { UTM , 1.000 , 1.000 , 724522.127 ,
4074620.759 , 1.1000000000e+00 , 1.1000000000e+00 , 12 , North , WGS-84 ,
units=Meters , rotation=75.00000000 }</p>", content);
assertContains("correction factors = { 1.0 , 1.0 , 1.0 , 1.0 , 1.0 ,
1.0 , 1.0 , 1.0 , 1.880586 , 1.741631 , 1.524632 , 1.564904 , 1.390035 ,
1.342501 , 1.264768 , 1.200357 , 1.131471 , 1.06512 , 1.105211 , 1.081234 ,
1.064999 , 1.056798 , 1.042573 , 1.009621 , 1.009031 , 1.002107 , 0.997332 ,
0.976807 , 0.963755 , 0.969028 , 0.962823 , 0.949522 , 0.960568 , 0.957813 ,
0.934766 , 0.944994 , 0.937726 , 0.935257 , 0.932706 , 0.932568 , 0.933217 ,
0.928705 , 0.929294 , 0.936669 , 0.935498 , 0.94823 , 0.949846 , 0.945885 ,
0.935468 , 0.930084 , 0.934473 , 0.935378 , 0.939193 , 0.935081 , 0.937398 ,
0.943396 , 0.947133 , 0.950645 , 0.945531 , 0.940295 , 0.933129 , 0.930664 ,
0.92736 , 0.931786 , 0.928217 , 0.928205 , 0.926481 , 0.928583 , 0.930504 ,
0.93648 , 0.930731 , 0.931265 , 0.935063 , 0.93434 , 0.926983 , 0.932689 ,
0.936477 , 0.939647 , 0.940155 , 0.937519 , 0.939448 , 0.942124 , 0.93653 ,
0.9435 , 0.959204 , 0.942566 , 0.940873 , 0.939414 , 0.939822 , 0.940174 ,
0.941372 , 0.939347 , 0.942108 , 0.942664 , 0.934811 , 0.934567 , 0.937712 ,
0.940611 , 0.944809 , 0.939877 , 0.943376 , 0.939189 , 0.943619 , 0.946268 ,
0.940166 , 0.953752 , 0.958975 , 0.954512 , 0.954103 , 0.958978 , 0.953247 ,
0.952199 , 0.956082 , 0.957846 , 0.970078 , 0.973704 , 0.980014 , 0.928845 ,
0.922973 , 0.954414 , 0.95521 , 0.961276 , 0.964513 , 0.965296 , 0.964644 ,
0.954999 , 0.951133 , 0.956216 , 0.951977 , 0.948547 , 0.949499 , 0.952685 ,
0.950158 , 0.944263 , 0.936946 , 0.938394 , 0.941325 , 0.94116 , 0.941397 ,
0.940811 , 0.942695 , 0.945228 , 0.953929 , 0.962457 , 0.968728 , 0.963947 ,
0.961222 , 0.963003 , 0.967658 , 0.969773 , 0.970294 , 0.963456 , 0.970497 ,
0.976972 , 0.961611 , 0.953081 , 0.945668 , 0.993867 , 1.019915 , 0.997013 ,
0.977643 , 0.998022 , 1.007041 , 1.003881 , 0.991335 , 0.976202 , 0.967636 ,
0.969294 , 0.965331 , 0.968705 , 0.965705 , 0.973601 , 0.97282 , 0.970848 ,
0.970687 , 0.969394 , 0.972263 , 0.969286 , 0.970327 , 0.97754 , 0.984703 ,
0.993916 , 1.02186 , 1.054704 , 1.061183 , 1.036962 , 1.012519 , 0.991209 ,
0.975974 , 0.965446 , 0.958801 , 0.951519 , 0.960628 , 0.957276 , 0.96061 ,
0.95689 , 0.956666 , 0.965567 , 0.982251 , 1.038526 , 1.0 , 1.0 , 1.0 , 1.0 ,
1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 ,
1.131643 , 1.150333 , 1.112466 , 1.06255 , 1.033182 , 1.03018 , 1.006512 ,
0.993285 , 1.003557 , 1.014441 , 0.998586 , 0.994426 , 0.987975 , 0.984681 ,
0.981863 , 0.964106 , 0.956432 , 0.954467 , 0.956429 , 0.950668 , 0.947217 ,
0.944635 , 0.942942 , 0.941078 , 0.943502 , 0.950408 , 0.957625 , 0.965073 ,
0.976012 , 0.976683 , 0.975625 , 0.968011 , 0.968843 , 0.970632 , 0.960977 ,
0.960505 , 0.955015 , 0.953597 , 0.951119 , 0.945679 , 0.949988 , 0.951236 ,
0.947813 , 0.948004 , 0.950015 , 0.939258 , 0.945863 , 0.953927 , 0.953145 ,
0.945291 , 0.942319 , 0.947022 , 0.948264 , 0.947112 , 0.942092 , 0.943128 ,
0.948068 , 0.944432 , 0.950396 , 0.964006 , 0.961019 , 0.951786 , 0.957457 ,
0.950327 , 0.954375 , 0.9608 , 0.965864 , 0.982396 , 1.011334 , 1.0 , 1.0 , 1.0
, 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 ,
1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 ,
1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.289798 , 1.126375 , 1.074621 , 1.069365 ,
1.051364 , 1.009432 , 0.984578 , 0.991187 , 1.016306 , 1.083681 , 1.076539 ,
1.104657 , 1.114005 , 1.081102 , 1.039196 , 1.009524 , 0.966515 , 0.953688 ,
0.966274 , 0.973232 , 0.966402 , 0.946801 , 0.951952 , 0.965679 , 0.96977 ,
0.946541 , 0.941678 , 0.937528 , 0.922351 , 0.914192 , 0.92879 , 0.932284 ,
0.933182 , 0.922322 , 0.91851 , 0.919591 , 0.925027 , 0.924611 , 0.932288 ,
0.933352 , 0.930517 , 0.931666 , 0.931763 , 0.932655 , 0.928945 , 0.933308 ,
0.932392 , 0.932943 , 0.935328 , 0.947019 , 0.954093 , 0.95156 , 0.939591 ,
0.942808 , 0.944862 , 0.944004 , 0.949161 , 0.950992 , 0.956738 , 0.951184 ,
0.953545 , 0.958836 , 0.966134 , 0.956752 , 0.951961 , 0.958667 , 0.9579 ,
0.968531 , 0.973792 , 0.969238 , 0.970838 , 0.954552 , 0.968166 , 0.989176 ,
0.974784 , 0.970674 , 0.9733 , 0.990576 , 1.0062 , 1.010295 , 0.99378 ,
0.986109 , 1.007054 , 1.005377 , 1.010013 , 1.014671 , 1.021618 , 1.021229 ,
1.021003 , 1.020866 , 1.029358 , 1.042136 , 1.030482 , 1.019556 , 1.036656 ,
1.05348 , 1.015947 , 1.07263 , 1.092879 , 1.053624 , 1.086491 , 1.139334 ,
1.163645 , 1.162487 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 }", content);
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Convert EnviHeader "map info" from UTM to LatLon
> ------------------------------------------------
>
> Key: TIKA-2770
> URL: https://issues.apache.org/jira/browse/TIKA-2770
> Project: Tika
> Issue Type: Improvement
> Components: parser
> Affects Versions: 2.0.0
> Reporter: Kristen Cheung
> Assignee: Lewis John McGibbney
> Priority: Major
> Fix For: 1.20
>
>
> Would like to create the conversion logic for coordinates from Universal
> Transverse Mercator (UTM) to Geographic (Lat/Lon) Coordinate System in Apache
> Tika Extraction logic, found in
> tika/tika-parsers/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
