exiftool-vendored 28.7.0 → 29.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +30 -0
- package/SECURITY.md +1 -2
- package/dist/BinaryField.js +2 -0
- package/dist/BinaryField.js.map +1 -1
- package/dist/BinaryToBufferTask.js +5 -5
- package/dist/BinaryToBufferTask.js.map +1 -1
- package/dist/CoordinateParser.d.ts +38 -0
- package/dist/CoordinateParser.js +185 -0
- package/dist/CoordinateParser.js.map +1 -0
- package/dist/DateTime.js +4 -5
- package/dist/DateTime.js.map +1 -1
- package/dist/DefaultExifToolOptions.js +1 -3
- package/dist/DefaultExifToolOptions.js.map +1 -1
- package/dist/ErrorsAndWarnings.js +2 -2
- package/dist/ErrorsAndWarnings.js.map +1 -1
- package/dist/ExifDate.js +7 -2
- package/dist/ExifDate.js.map +1 -1
- package/dist/ExifDateTime.js +61 -64
- package/dist/ExifDateTime.js.map +1 -1
- package/dist/ExifTime.js +19 -26
- package/dist/ExifTime.js.map +1 -1
- package/dist/ExifTool.d.ts +1 -3
- package/dist/ExifTool.js +56 -57
- package/dist/ExifTool.js.map +1 -1
- package/dist/ExifToolTask.js +21 -26
- package/dist/ExifToolTask.js.map +1 -1
- package/dist/ExiftoolPath.js +7 -4
- package/dist/ExiftoolPath.js.map +1 -1
- package/dist/FirstDateTime.js +1 -1
- package/dist/FirstDateTime.js.map +1 -1
- package/dist/GPS.d.ts +24 -0
- package/dist/GPS.js +152 -0
- package/dist/GPS.js.map +1 -0
- package/dist/JSON.js +1 -1
- package/dist/JSON.js.map +1 -1
- package/dist/Number.d.ts +13 -0
- package/dist/Number.js +26 -0
- package/dist/Number.js.map +1 -1
- package/dist/ReadRawTask.js +3 -1
- package/dist/ReadRawTask.js.map +1 -1
- package/dist/ReadTask.js +189 -254
- package/dist/ReadTask.js.map +1 -1
- package/dist/RewriteAllTagsTask.js +2 -2
- package/dist/RewriteAllTagsTask.js.map +1 -1
- package/dist/String.d.ts +6 -2
- package/dist/String.js +7 -0
- package/dist/String.js.map +1 -1
- package/dist/Struct.js +1 -2
- package/dist/Struct.js.map +1 -1
- package/dist/Tags.d.ts +26 -26
- package/dist/TimeParsing.js +6 -8
- package/dist/TimeParsing.js.map +1 -1
- package/dist/Times.d.ts +6 -0
- package/dist/Times.js +7 -3
- package/dist/Times.js.map +1 -1
- package/dist/Timezones.d.ts +1 -1
- package/dist/Timezones.js +19 -24
- package/dist/Timezones.js.map +1 -1
- package/dist/VersionTask.js +1 -1
- package/dist/VersionTask.js.map +1 -1
- package/dist/WriteTask.js +38 -13
- package/dist/WriteTask.js.map +1 -1
- package/package.json +10 -10
package/CHANGELOG.md
CHANGED
|
@@ -25,6 +25,36 @@ vendored versions of ExifTool match the version that they vendor.
|
|
|
25
25
|
|
|
26
26
|
## Version history
|
|
27
27
|
|
|
28
|
+
### v29.0.0
|
|
29
|
+
|
|
30
|
+
- 💔/🐞/📦 ExifTool sometimes returns `boolean` values for some tags, like `SemanticStylePreset`, but uses "Yes" or "No" values for other tags, like `GPSValid` (TIL!). If the tag name ends in `Valid` and is truthy (1, true, "Yes") or falsy (0, false, "No"), we'll convert it to a boolean for you. Note that this is arguably a breaking API change, but it should be what you were already expecting (so is it a bug fix?). See the diff to the Tags interface in this version to verify what types have changed.
|
|
31
|
+
|
|
32
|
+
- 📦 Reduced `streamFlushMillis` to `10`. This reduced elapsed time for the full test suite by 2.5x on macOS and 3x on Windows, and drops the upper latency bound substantially. Note that this is at the risk of buffered stream collisions between tasks. The (extensive) test suite on Github Actions (whose virtual machines are notoriously slower than molasses) still runs solidly, but if you see internal errors, please open a Github issue and increase your `streamFlushMillis`.
|
|
33
|
+
|
|
34
|
+
#### GPS improvements
|
|
35
|
+
|
|
36
|
+
- 🐞/📦 GPS Latitude and GPS Longitude values are now parsed from [DMS notation](<https://en.wikipedia.org/wiki/Degree_(angle)#Subdivisions>), which seems to avoid some incorrectly signed values in some file formats (especially for some problematic XMP exports, like from Apple Photos). Numeric GPSLatitude and GPSLongitude are still accepted: to avoid the new coordinates parsing code, restore `GPSLatitude` and `GPSLongitude` to the `ExifToolOptions.numericTags` array.
|
|
37
|
+
|
|
38
|
+
- 🐞/📦 If `ExifToolOptions.geolocation` is enabled, and `GeolocationPosition` exists, and we got numeric GPS coordinates, we will assume the hemisphere from GeolocationPosition, as that tag seems to correct for more conditions than GPS\*Ref values.
|
|
39
|
+
|
|
40
|
+
- 🐞/📦 If the encoded GPS location is invalid, all `GPS*` and `Geolocation*` metadata will be omitted from `ExifTool.readTags()`. Prior versions let some values (like `GPSCoordinates`) from invalid values slip by. A location is invalid if latitude and longitude are 0, out of bounds, either are unspecified.
|
|
41
|
+
|
|
42
|
+
- 🐞/📦 Reading and writing GPS latitude and GPS longitude values is surprisingly tricky, and could fail for some file formats due to inconsistent handling of negative values. Now, within `ExifTool.writeTags()`, we will automatically set `GPSLatitudeRef` and `GPSLongitudeRef` if lat/lon are provided but references are unspecified. More tests were added to verify this workaround. On reads, `GPSLatitudeRef` and `GPSLongitudeRef` will be backfilled to be correct. Note that they only return `"N" | "S" | "E" | "W"` now, rather than possibly being the full cardinal direction name.
|
|
43
|
+
|
|
44
|
+
- 🐞 If `ignoreZeroZeroLatLon` and `geolocation` were `true`, (0,0) location timezones could still be inferred in prior versions.
|
|
45
|
+
|
|
46
|
+
- 📦 GPS coordinates are now round to 6 decimal places (≈11cm precision). This exceeds consumer GPS accuracy while simplifying test assertions and reducing noise in comparisons. Previously storing full float precision added complexity without practical benefit.
|
|
47
|
+
|
|
48
|
+
### v28.8.0
|
|
49
|
+
|
|
50
|
+
**Important:** ExifTool versions use the format `NN.NN` and do not follow semantic versioning. The version from ExifTool will not parse correctly with the `semver` library (for the next 10 versions) since they are zero- padded.
|
|
51
|
+
|
|
52
|
+
- 🌱 Upgraded ExifTool to version [13.00](https://exiftool.org/history.html#13.00)
|
|
53
|
+
|
|
54
|
+
**Note:** ExifTool version numbers increment by 0.01 and do not follow semantic versioning conventions. The changes between version 12.99 and 13.00 are minor updates without any known breaking changes.
|
|
55
|
+
|
|
56
|
+
- 📦 Added Node.js v23 to the build matrix.
|
|
57
|
+
|
|
28
58
|
### v28.7.0
|
|
29
59
|
|
|
30
60
|
- 🌱 ExifTool upgraded to version [12.99](https://exiftool.org/history.html#12.99)
|
package/SECURITY.md
CHANGED
|
@@ -10,8 +10,7 @@ If you find a vulnerability, _or even think you have_, please send an email to
|
|
|
10
10
|
the author. Each signed git release by `mceachen` contains a monitored email
|
|
11
11
|
address.
|
|
12
12
|
|
|
13
|
-
If you prefer, you may DM
|
|
14
|
-
[@PhotoStructure](https://twitter.com/PhotoStructure).
|
|
13
|
+
If you prefer, you may [DM @mrm on the PhotoStructure forum](https://forum.photostructure.com/new-message?username=mrm&title=Security+concern).
|
|
15
14
|
|
|
16
15
|
Expect a reply in under 36 hours. Please try an alternative contact method if
|
|
17
16
|
you don't get a response.
|
package/dist/BinaryField.js
CHANGED
package/dist/BinaryField.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BinaryField.js","sourceRoot":"","sources":["../src/BinaryField.ts"],"names":[],"mappings":";;;AACA,qCAAgC;AAEhC,0DAA0D;AAC1D,MAAM,aAAa;AACjB,2EAA2E;AAC3E,+DAA+D;AAC/D,qCAAqC;AACrC,oCAAoC,CAAA;AAEtC,MAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"BinaryField.js","sourceRoot":"","sources":["../src/BinaryField.ts"],"names":[],"mappings":";;;AACA,qCAAgC;AAEhC,0DAA0D;AAC1D,MAAM,aAAa;AACjB,2EAA2E;AAC3E,+DAA+D;AAC/D,qCAAqC;AACrC,oCAAoC,CAAA;AAEtC,MAAa,WAAW;IAEX;IACA;IAFX,YACW,KAAa,EACb,QAAgB;QADhB,UAAK,GAAL,KAAK,CAAQ;QACb,aAAQ,GAAR,QAAQ,CAAQ;IACxB,CAAC;IAEJ,MAAM;QACJ,OAAO;YACL,KAAK,EAAE,aAAa;YACpB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAA;IACH,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,IAAuC;QACrD,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;IACnD,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,QAAgB;QAClC,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QACvC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;YACd,MAAM,KAAK,GAAG,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACzB,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAClB,OAAO,IAAI,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;YACzC,CAAC;QACH,CAAC;QACD,OAAM;IACR,CAAC;CACF;AA5BD,kCA4BC"}
|
|
@@ -13,6 +13,7 @@ const String_1 = require("./String");
|
|
|
13
13
|
* everything seems to have worked.
|
|
14
14
|
*/
|
|
15
15
|
class BinaryToBufferTask extends ExifToolTask_1.ExifToolTask {
|
|
16
|
+
tagname;
|
|
16
17
|
constructor(tagname, args, options) {
|
|
17
18
|
super(args, options);
|
|
18
19
|
this.tagname = tagname;
|
|
@@ -25,9 +26,8 @@ class BinaryToBufferTask extends ExifToolTask_1.ExifToolTask {
|
|
|
25
26
|
return new BinaryToBufferTask(tagname, args, options);
|
|
26
27
|
}
|
|
27
28
|
parse(data, err) {
|
|
28
|
-
var _a;
|
|
29
29
|
try {
|
|
30
|
-
const obj =
|
|
30
|
+
const obj = JSON.parse(data)?.[0];
|
|
31
31
|
// did they get the casing right?
|
|
32
32
|
{
|
|
33
33
|
const result = decode(obj[this.tagname]);
|
|
@@ -43,13 +43,13 @@ class BinaryToBufferTask extends ExifToolTask_1.ExifToolTask {
|
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
catch (caught) {
|
|
46
|
-
err
|
|
46
|
+
err ??= (0, String_1.notBlank)(data)
|
|
47
47
|
? new Error(data)
|
|
48
48
|
: caught instanceof Error
|
|
49
49
|
? caught
|
|
50
|
-
: new Error(String(caught))
|
|
50
|
+
: new Error(String(caught));
|
|
51
51
|
}
|
|
52
|
-
return err
|
|
52
|
+
return err ?? new Error(this.tagname + " not found");
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
55
|
exports.BinaryToBufferTask = BinaryToBufferTask;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BinaryToBufferTask.js","sourceRoot":"","sources":["../src/BinaryToBufferTask.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAC5B,iDAAkE;AAClE,+DAA+D;AAE/D,qCAAmC;AAEnC;;;GAGG;AACH,MAAa,kBAAmB,SAAQ,2BAA4B;
|
|
1
|
+
{"version":3,"file":"BinaryToBufferTask.js","sourceRoot":"","sources":["../src/BinaryToBufferTask.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAC5B,iDAAkE;AAClE,+DAA+D;AAE/D,qCAAmC;AAEnC;;;GAGG;AACH,MAAa,kBAAmB,SAAQ,2BAA4B;IAEvD;IADX,YACW,OAAe,EACxB,IAAc,EACd,OAA6B;QAE7B,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAJX,YAAO,GAAP,OAAO,CAAQ;IAK1B,CAAC;IAED,MAAM,CAAC,GAAG,CACR,OAAe,EACf,MAAc,EACd,OAA6B;QAE7B,sEAAsE;QACtE,wCAAwC;QACxC,MAAM,IAAI,GAAG,CAAC,GAAG,6CAAuB,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,CAAA;QACvE,IAAI,CAAC,IAAI,CAAC,mBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;QAC/B,OAAO,IAAI,kBAAkB,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACvD,CAAC;IAED,KAAK,CAAC,IAAY,EAAE,GAAW;QAC7B,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YACjC,iCAAiC;YACjC,CAAC;gBACC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;gBACxC,IAAI,MAAM,IAAI,IAAI;oBAAE,OAAO,MAAM,CAAA;YACnC,CAAC,CAAC,+CAA+C;YACjD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACjC,IAAI,CAAC,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;oBACnD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;oBAC7B,IAAI,MAAM,IAAI,IAAI;wBAAE,OAAO,MAAM,CAAA;gBACnC,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC;YAChB,GAAG,KAAK,IAAA,iBAAQ,EAAC,IAAI,CAAC;gBACpB,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC;gBACjB,CAAC,CAAC,MAAM,YAAY,KAAK;oBACvB,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;QACjC,CAAC;QACD,OAAO,GAAG,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC,CAAA;IACtD,CAAC;CACF;AA5CD,gDA4CC;AAED,MAAM,SAAS,GAAG,SAAS,CAAA;AAE3B,SAAS,MAAM,CAAC,IAAmB;IACjC,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;QAChD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAA;AAC7D,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
type Direction = "N" | "S" | "E" | "W";
|
|
2
|
+
type CoordinateFormat = "DMS" | "DM" | "D";
|
|
3
|
+
interface Coordinate {
|
|
4
|
+
degrees: number;
|
|
5
|
+
minutes: number | undefined;
|
|
6
|
+
seconds: number | undefined;
|
|
7
|
+
direction: Direction | undefined;
|
|
8
|
+
format: CoordinateFormat;
|
|
9
|
+
remainder: string | undefined;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Parses a string containing both latitude and longitude coordinates.
|
|
13
|
+
* @param input - String containing both coordinates
|
|
14
|
+
* @returns Object containing latitude and longitude in decimal degrees, or undefined if parsing fails
|
|
15
|
+
* @throws CoordinateParseError if the input format is invalid
|
|
16
|
+
*/
|
|
17
|
+
export declare function parseCoordinates(input: string): {
|
|
18
|
+
latitude: number;
|
|
19
|
+
longitude: number;
|
|
20
|
+
};
|
|
21
|
+
/**
|
|
22
|
+
* Parses a coordinate string in decimal degrees format.
|
|
23
|
+
* @param input - String containing a single coordinate
|
|
24
|
+
* @returns Object containing degrees and direction, or undefined if parsing fails
|
|
25
|
+
* @throws CoordinateParseError if the format is not decimal degrees or direction is missing
|
|
26
|
+
*/
|
|
27
|
+
export declare function parseDecimalCoordinate(input: string): {
|
|
28
|
+
degrees: number;
|
|
29
|
+
direction: Direction;
|
|
30
|
+
} | undefined;
|
|
31
|
+
/**
|
|
32
|
+
* Parses a single coordinate string into its components.
|
|
33
|
+
* @param input - String containing a single coordinate
|
|
34
|
+
* @returns Parsed coordinate object
|
|
35
|
+
* @throws CoordinateParseError if the format is invalid
|
|
36
|
+
*/
|
|
37
|
+
export declare function parseCoordinate(input: string): Coordinate;
|
|
38
|
+
export {};
|
|
@@ -0,0 +1,185 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parseCoordinates = parseCoordinates;
|
|
4
|
+
exports.parseDecimalCoordinate = parseDecimalCoordinate;
|
|
5
|
+
exports.parseCoordinate = parseCoordinate;
|
|
6
|
+
const Number_1 = require("./Number");
|
|
7
|
+
const Object_1 = require("./Object");
|
|
8
|
+
// Constants
|
|
9
|
+
const MAX_LATITUDE_DEGREES = 90;
|
|
10
|
+
const MAX_LONGITUDE_DEGREES = 180;
|
|
11
|
+
class CoordinateParseError extends Error {
|
|
12
|
+
constructor(message) {
|
|
13
|
+
super(message);
|
|
14
|
+
this.name = "CoordinateParseError";
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Parses a string containing both latitude and longitude coordinates.
|
|
19
|
+
* @param input - String containing both coordinates
|
|
20
|
+
* @returns Object containing latitude and longitude in decimal degrees, or undefined if parsing fails
|
|
21
|
+
* @throws CoordinateParseError if the input format is invalid
|
|
22
|
+
*/
|
|
23
|
+
function parseCoordinates(input) {
|
|
24
|
+
if (!input?.trim()) {
|
|
25
|
+
throw new CoordinateParseError("Input string cannot be empty");
|
|
26
|
+
}
|
|
27
|
+
let latitude;
|
|
28
|
+
let longitude;
|
|
29
|
+
for (const coord of _parseCoordinates(input)) {
|
|
30
|
+
if (!coord.direction) {
|
|
31
|
+
throw new CoordinateParseError("Direction is required for position parsing");
|
|
32
|
+
}
|
|
33
|
+
if (coord.direction === "S" || coord.direction === "N") {
|
|
34
|
+
if (latitude !== undefined) {
|
|
35
|
+
throw new CoordinateParseError("Multiple latitude values found");
|
|
36
|
+
}
|
|
37
|
+
latitude = toDecimalDegrees(coord);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
if (longitude !== undefined) {
|
|
41
|
+
throw new CoordinateParseError("Multiple longitude values found");
|
|
42
|
+
}
|
|
43
|
+
longitude = toDecimalDegrees(coord);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
const missing = [];
|
|
47
|
+
if (latitude === undefined)
|
|
48
|
+
missing.push("latitude");
|
|
49
|
+
if (longitude === undefined)
|
|
50
|
+
missing.push("longitude");
|
|
51
|
+
if (latitude === undefined || longitude === undefined) {
|
|
52
|
+
throw new CoordinateParseError(`Missing ${missing.join(" and ")}`);
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
return { latitude, longitude };
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Parses a string containing one or more coordinates.
|
|
60
|
+
* @param input - String containing coordinates
|
|
61
|
+
* @returns Array of parsed coordinates
|
|
62
|
+
*/
|
|
63
|
+
function _parseCoordinates(input) {
|
|
64
|
+
if (!input?.trim()) {
|
|
65
|
+
throw new CoordinateParseError("Input string cannot be empty");
|
|
66
|
+
}
|
|
67
|
+
const result = [];
|
|
68
|
+
let remainder = input;
|
|
69
|
+
do {
|
|
70
|
+
const coord = parseCoordinate(remainder);
|
|
71
|
+
remainder = coord.remainder ?? "";
|
|
72
|
+
result.push((0, Object_1.omit)(coord, "remainder"));
|
|
73
|
+
} while (remainder.length > 0);
|
|
74
|
+
return result;
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Parses a coordinate string in decimal degrees format.
|
|
78
|
+
* @param input - String containing a single coordinate
|
|
79
|
+
* @returns Object containing degrees and direction, or undefined if parsing fails
|
|
80
|
+
* @throws CoordinateParseError if the format is not decimal degrees or direction is missing
|
|
81
|
+
*/
|
|
82
|
+
function parseDecimalCoordinate(input) {
|
|
83
|
+
if (!input?.trim()) {
|
|
84
|
+
throw new CoordinateParseError("Input string cannot be empty");
|
|
85
|
+
}
|
|
86
|
+
const coord = parseCoordinate(input);
|
|
87
|
+
if (coord.format !== "D") {
|
|
88
|
+
throw new CoordinateParseError("Expected decimal degrees format");
|
|
89
|
+
}
|
|
90
|
+
if (!coord.direction) {
|
|
91
|
+
throw new CoordinateParseError("Missing direction");
|
|
92
|
+
}
|
|
93
|
+
return { degrees: toDecimalDegrees(coord), direction: coord.direction };
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* Parses a single coordinate string into its components.
|
|
97
|
+
* @param input - String containing a single coordinate
|
|
98
|
+
* @returns Parsed coordinate object
|
|
99
|
+
* @throws CoordinateParseError if the format is invalid
|
|
100
|
+
*/
|
|
101
|
+
function parseCoordinate(input) {
|
|
102
|
+
if (!input?.trim()) {
|
|
103
|
+
throw new CoordinateParseError("Input string cannot be empty");
|
|
104
|
+
}
|
|
105
|
+
const dmsPattern = /^(?<degrees>-?\d+)\s*(?:°|DEG)\s*(?<minutes>\d+)\s*['′]\s*(?<seconds>\d+(?:\.\d+)?)\s*["″]\s?(?<direction>[NSEW])?[\s,]{0,3}(?<remainder>.*)$/i;
|
|
106
|
+
const dmPattern = /^(?<degrees>-?\d+)\s*(?:°|DEG)\s*(?<minutes>\d+(?:\.\d+)?)\s?['′]\s?(?<direction>[NSEW])?(?<remainder>.*)$/i;
|
|
107
|
+
const dPattern = /^(?<degrees>-?\d+(?:\.\d+)?)\s*(?:°|DEG)\s?(?<direction>[NSEW])?(?<remainder>.*)$/i;
|
|
108
|
+
const trimmedInput = input.trimStart();
|
|
109
|
+
let match;
|
|
110
|
+
let format;
|
|
111
|
+
if ((match = trimmedInput.match(dmsPattern))) {
|
|
112
|
+
format = "DMS";
|
|
113
|
+
}
|
|
114
|
+
else if ((match = trimmedInput.match(dmPattern))) {
|
|
115
|
+
format = "DM";
|
|
116
|
+
}
|
|
117
|
+
else if ((match = trimmedInput.match(dPattern))) {
|
|
118
|
+
format = "D";
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
throw new CoordinateParseError("Invalid coordinate format. Expected one of:\n" +
|
|
122
|
+
" DDD° MM' SS.S\" k (deg/min/sec)\n" +
|
|
123
|
+
" DDD° MM.MMM' k (deg/decimal minutes)\n" +
|
|
124
|
+
" DDD.DDDDD° (decimal degrees)\n" +
|
|
125
|
+
" (where k indicates direction: N, S, E, or W)");
|
|
126
|
+
}
|
|
127
|
+
if (!match.groups) {
|
|
128
|
+
throw new CoordinateParseError("Failed to parse coordinate components");
|
|
129
|
+
}
|
|
130
|
+
const { degrees: degreesStr, minutes: minutesStr, seconds: secondsStr, direction: directionStr, remainder, } = match.groups;
|
|
131
|
+
const direction = directionStr?.toUpperCase();
|
|
132
|
+
const degrees = parseFloat(degreesStr);
|
|
133
|
+
let minutes;
|
|
134
|
+
let seconds;
|
|
135
|
+
if (format === "DMS") {
|
|
136
|
+
minutes = parseInt(minutesStr, 10);
|
|
137
|
+
seconds = parseFloat(secondsStr);
|
|
138
|
+
if (minutes >= 60) {
|
|
139
|
+
throw new CoordinateParseError("Minutes must be between 0 and 59");
|
|
140
|
+
}
|
|
141
|
+
if (seconds >= 60) {
|
|
142
|
+
throw new CoordinateParseError("Seconds must be between 0 and 59.999...");
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
else if (format === "DM") {
|
|
146
|
+
minutes = parseFloat(minutesStr);
|
|
147
|
+
if (minutes >= 60) {
|
|
148
|
+
throw new CoordinateParseError("Minutes must be between 0 and 59.999...");
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
const maxDegrees = direction === "N" || direction === "S"
|
|
152
|
+
? MAX_LATITUDE_DEGREES
|
|
153
|
+
: MAX_LONGITUDE_DEGREES;
|
|
154
|
+
if (Math.abs(degrees) > maxDegrees) {
|
|
155
|
+
throw new CoordinateParseError(`Degrees must be between -${maxDegrees} and ${maxDegrees} for ${direction} direction`);
|
|
156
|
+
}
|
|
157
|
+
return {
|
|
158
|
+
degrees,
|
|
159
|
+
minutes,
|
|
160
|
+
seconds,
|
|
161
|
+
direction,
|
|
162
|
+
format,
|
|
163
|
+
remainder: remainder?.trim(),
|
|
164
|
+
};
|
|
165
|
+
}
|
|
166
|
+
function toDecimalDegrees(coord) {
|
|
167
|
+
let decimal = coord.degrees;
|
|
168
|
+
decimal += (coord.minutes ?? 0) / 60.0;
|
|
169
|
+
decimal += (coord.seconds ?? 0) / 3600.0;
|
|
170
|
+
if (coord.direction === "S" || coord.direction === "W") {
|
|
171
|
+
decimal = -Math.abs(decimal);
|
|
172
|
+
}
|
|
173
|
+
const maxDegrees = coord.direction === "N" || coord.direction === "S"
|
|
174
|
+
? MAX_LATITUDE_DEGREES
|
|
175
|
+
: MAX_LONGITUDE_DEGREES;
|
|
176
|
+
const axis = coord.direction === "N" || coord.direction === "S"
|
|
177
|
+
? "latitude"
|
|
178
|
+
: "longitude";
|
|
179
|
+
if (Math.abs(decimal) > maxDegrees) {
|
|
180
|
+
throw new CoordinateParseError(`Degrees must be between -${maxDegrees} and ${maxDegrees} for ${axis}`);
|
|
181
|
+
}
|
|
182
|
+
// Most consumer devices can only resolve 4-5 decimal places (1m resolution)
|
|
183
|
+
return (0, Number_1.roundToDecimalPlaces)(decimal, 6);
|
|
184
|
+
}
|
|
185
|
+
//# sourceMappingURL=CoordinateParser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CoordinateParser.js","sourceRoot":"","sources":["../src/CoordinateParser.ts"],"names":[],"mappings":";;AAgCA,4CAuCC;AA4BD,wDAeC;AAQD,0CAwFC;AAlND,qCAA+C;AAC/C,qCAA+B;AAE/B,YAAY;AACZ,MAAM,oBAAoB,GAAG,EAAE,CAAA;AAC/B,MAAM,qBAAqB,GAAG,GAAG,CAAA;AAcjC,MAAM,oBAAqB,SAAQ,KAAK;IACtC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAA;IACpC,CAAC;CACF;AAED;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,KAAa;IAI5C,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC;QACnB,MAAM,IAAI,oBAAoB,CAAC,8BAA8B,CAAC,CAAA;IAChE,CAAC;IAED,IAAI,QAA4B,CAAA;IAChC,IAAI,SAA6B,CAAA;IAEjC,KAAK,MAAM,KAAK,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7C,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YACrB,MAAM,IAAI,oBAAoB,CAC5B,4CAA4C,CAC7C,CAAA;QACH,CAAC;QAED,IAAI,KAAK,CAAC,SAAS,KAAK,GAAG,IAAI,KAAK,CAAC,SAAS,KAAK,GAAG,EAAE,CAAC;YACvD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,MAAM,IAAI,oBAAoB,CAAC,gCAAgC,CAAC,CAAA;YAClE,CAAC;YACD,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;QACpC,CAAC;aAAM,CAAC;YACN,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC5B,MAAM,IAAI,oBAAoB,CAAC,iCAAiC,CAAC,CAAA;YACnE,CAAC;YACD,SAAS,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;QACrC,CAAC;IACH,CAAC;IACD,MAAM,OAAO,GAAG,EAAE,CAAA;IAClB,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACpD,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAEtD,IAAI,QAAQ,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QACtD,MAAM,IAAI,oBAAoB,CAAC,WAAW,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACpE,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAA;IAChC,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,KAAa;IACtC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC;QACnB,MAAM,IAAI,oBAAoB,CAAC,8BAA8B,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,MAAM,GAAG,EAAE,CAAA;IACjB,IAAI,SAAS,GAAG,KAAK,CAAA;IACrB,GAAG,CAAC;QACF,MAAM,KAAK,GAAG,eAAe,CAAC,SAAS,CAAC,CAAA;QACxC,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,EAAE,CAAA;QACjC,MAAM,CAAC,IAAI,CAAC,IAAA,aAAI,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAA;IACvC,CAAC,QAAQ,SAAS,CAAC,MAAM,GAAG,CAAC,EAAC;IAC9B,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;;;;GAKG;AACH,SAAgB,sBAAsB,CACpC,KAAa;IAEb,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC;QACnB,MAAM,IAAI,oBAAoB,CAAC,8BAA8B,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;IACpC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACzB,MAAM,IAAI,oBAAoB,CAAC,iCAAiC,CAAC,CAAA;IACnE,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;QACrB,MAAM,IAAI,oBAAoB,CAAC,mBAAmB,CAAC,CAAA;IACrD,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAA;AACzE,CAAC;AAED;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,KAAa;IAC3C,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC;QACnB,MAAM,IAAI,oBAAoB,CAAC,8BAA8B,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,UAAU,GACd,gJAAgJ,CAAA;IAClJ,MAAM,SAAS,GACb,6GAA6G,CAAA;IAC/G,MAAM,QAAQ,GACZ,oFAAoF,CAAA;IAEtF,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,EAAE,CAAA;IAEtC,IAAI,KAA8B,CAAA;IAClC,IAAI,MAAwB,CAAA;IAE5B,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;QAC7C,MAAM,GAAG,KAAK,CAAA;IAChB,CAAC;SAAM,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QACnD,MAAM,GAAG,IAAI,CAAA;IACf,CAAC;SAAM,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QAClD,MAAM,GAAG,GAAG,CAAA;IACd,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,oBAAoB,CAC5B,+CAA+C;YAC7C,qCAAqC;YACrC,0CAA0C;YAC1C,kCAAkC;YAClC,gDAAgD,CACnD,CAAA;IACH,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAClB,MAAM,IAAI,oBAAoB,CAAC,uCAAuC,CAAC,CAAA;IACzE,CAAC;IAED,MAAM,EACJ,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,YAAY,EACvB,SAAS,GACV,GAAG,KAAK,CAAC,MAAM,CAAA;IAEhB,MAAM,SAAS,GAAG,YAAY,EAAE,WAAW,EAA2B,CAAA;IAEtE,MAAM,OAAO,GAAG,UAAU,CAAC,UAAW,CAAC,CAAA;IACvC,IAAI,OAA2B,CAAA;IAC/B,IAAI,OAA2B,CAAA;IAE/B,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;QACrB,OAAO,GAAG,QAAQ,CAAC,UAAW,EAAE,EAAE,CAAC,CAAA;QACnC,OAAO,GAAG,UAAU,CAAC,UAAW,CAAC,CAAA;QAEjC,IAAI,OAAO,IAAI,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,oBAAoB,CAAC,kCAAkC,CAAC,CAAA;QACpE,CAAC;QACD,IAAI,OAAO,IAAI,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,oBAAoB,CAAC,yCAAyC,CAAC,CAAA;QAC3E,CAAC;IACH,CAAC;SAAM,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAC3B,OAAO,GAAG,UAAU,CAAC,UAAW,CAAC,CAAA;QAEjC,IAAI,OAAO,IAAI,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,oBAAoB,CAAC,yCAAyC,CAAC,CAAA;QAC3E,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GACd,SAAS,KAAK,GAAG,IAAI,SAAS,KAAK,GAAG;QACpC,CAAC,CAAC,oBAAoB;QACtB,CAAC,CAAC,qBAAqB,CAAA;IAE3B,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,UAAU,EAAE,CAAC;QACnC,MAAM,IAAI,oBAAoB,CAC5B,4BAA4B,UAAU,QAAQ,UAAU,QAAQ,SAAS,YAAY,CACtF,CAAA;IACH,CAAC;IAED,OAAO;QACL,OAAO;QACP,OAAO;QACP,OAAO;QACP,SAAS;QACT,MAAM;QACN,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE;KAC7B,CAAA;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAiB;IACzC,IAAI,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;IAE3B,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,IAAI,CAAA;IACtC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,MAAM,CAAA;IAExC,IAAI,KAAK,CAAC,SAAS,KAAK,GAAG,IAAI,KAAK,CAAC,SAAS,KAAK,GAAG,EAAE,CAAC;QACvD,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC9B,CAAC;IAED,MAAM,UAAU,GACd,KAAK,CAAC,SAAS,KAAK,GAAG,IAAI,KAAK,CAAC,SAAS,KAAK,GAAG;QAChD,CAAC,CAAC,oBAAoB;QACtB,CAAC,CAAC,qBAAqB,CAAA;IAC3B,MAAM,IAAI,GACR,KAAK,CAAC,SAAS,KAAK,GAAG,IAAI,KAAK,CAAC,SAAS,KAAK,GAAG;QAChD,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,WAAW,CAAA;IAEjB,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,UAAU,EAAE,CAAC;QACnC,MAAM,IAAI,oBAAoB,CAC5B,4BAA4B,UAAU,QAAQ,UAAU,QAAQ,IAAI,EAAE,CACvE,CAAA;IACH,CAAC;IACD,4EAA4E;IAC5E,OAAO,IAAA,6BAAoB,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;AACzC,CAAC"}
|
package/dist/DateTime.js
CHANGED
|
@@ -25,19 +25,18 @@ function isDateOrTime(o) {
|
|
|
25
25
|
}
|
|
26
26
|
function dateTimeToExif(d, opts) {
|
|
27
27
|
return d.toFormat("y:MM:dd HH:mm:ss" +
|
|
28
|
-
(
|
|
29
|
-
(
|
|
28
|
+
(opts?.includeMilliseconds === true ? ".u" : "") +
|
|
29
|
+
(opts?.includeOffset === false ? "" : "ZZ"));
|
|
30
30
|
}
|
|
31
31
|
function toExifString(d) {
|
|
32
|
-
var _a;
|
|
33
32
|
if (luxon_1.DateTime.isDateTime(d)) {
|
|
34
33
|
return dateTimeToExif(d);
|
|
35
34
|
}
|
|
36
35
|
else {
|
|
37
|
-
return
|
|
36
|
+
return d?.toExifString?.();
|
|
38
37
|
}
|
|
39
38
|
}
|
|
40
39
|
function hms(d, opts) {
|
|
41
|
-
return d.toFormat("HH:mm:ss" + (
|
|
40
|
+
return d.toFormat("HH:mm:ss" + (opts?.includeMilliseconds === true ? ".SSS" : ""));
|
|
42
41
|
}
|
|
43
42
|
//# sourceMappingURL=DateTime.js.map
|
package/dist/DateTime.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../src/DateTime.ts"],"names":[],"mappings":";;;AAMA,sCAEC;AASD,oCAOC;AAED,wCASC;AAED,oCAMC;AAED,kBAOC;AApDD,iCAAgC;AAChC,yCAAqC;AACrC,iDAA6C;AAC7C,yCAAqC;AAGrC,SAAgB,aAAa,CAAC,EAAmB;IAC/C,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,OAAO,CAAA;AACjC,CAAC;AAEY,QAAA,QAAQ,GAAG,IAAI,CAAA;AACf,QAAA,QAAQ,GAAG,EAAE,GAAG,gBAAQ,CAAA;AACxB,QAAA,MAAM,GAAG,EAAE,GAAG,gBAAQ,CAAA;AACtB,QAAA,KAAK,GAAG,EAAE,GAAG,cAAM,CAAA;AAIhC,SAAgB,YAAY,CAAC,CAAM;IACjC,OAAO,CACL,CAAC,YAAY,2BAAY;QACzB,CAAC,YAAY,mBAAQ;QACrB,CAAC,YAAY,mBAAQ;QACrB,gBAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CACvB,CAAA;AACH,CAAC;AAED,SAAgB,cAAc,CAC5B,CAAW,EACX,IAAiE;IAEjE,OAAO,CAAC,CAAC,QAAQ,CACf,kBAAkB;QAChB,CAAC,
|
|
1
|
+
{"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../src/DateTime.ts"],"names":[],"mappings":";;;AAMA,sCAEC;AASD,oCAOC;AAED,wCASC;AAED,oCAMC;AAED,kBAOC;AApDD,iCAAgC;AAChC,yCAAqC;AACrC,iDAA6C;AAC7C,yCAAqC;AAGrC,SAAgB,aAAa,CAAC,EAAmB;IAC/C,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,OAAO,CAAA;AACjC,CAAC;AAEY,QAAA,QAAQ,GAAG,IAAI,CAAA;AACf,QAAA,QAAQ,GAAG,EAAE,GAAG,gBAAQ,CAAA;AACxB,QAAA,MAAM,GAAG,EAAE,GAAG,gBAAQ,CAAA;AACtB,QAAA,KAAK,GAAG,EAAE,GAAG,cAAM,CAAA;AAIhC,SAAgB,YAAY,CAAC,CAAM;IACjC,OAAO,CACL,CAAC,YAAY,2BAAY;QACzB,CAAC,YAAY,mBAAQ;QACrB,CAAC,YAAY,mBAAQ;QACrB,gBAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CACvB,CAAA;AACH,CAAC;AAED,SAAgB,cAAc,CAC5B,CAAW,EACX,IAAiE;IAEjE,OAAO,CAAC,CAAC,QAAQ,CACf,kBAAkB;QAChB,CAAC,IAAI,EAAE,mBAAmB,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,CAAC,IAAI,EAAE,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAC9C,CAAA;AACH,CAAC;AAED,SAAgB,YAAY,CAAC,CAAa;IACxC,IAAI,gBAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3B,OAAO,cAAc,CAAC,CAAC,CAAC,CAAA;IAC1B,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,EAAE,YAAY,EAAE,EAAE,CAAA;IAC5B,CAAC;AACH,CAAC;AAED,SAAgB,GAAG,CACjB,CAAW,EACX,IAAwC;IAExC,OAAO,CAAC,CAAC,QAAQ,CACf,UAAU,GAAG,CAAC,IAAI,EAAE,mBAAmB,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAChE,CAAA;AACH,CAAC"}
|
|
@@ -56,6 +56,7 @@ exports.DefaultExifToolOptions = Object.freeze({
|
|
|
56
56
|
maxProcs: DefaultMaxProcs_1.DefaultMaxProcs,
|
|
57
57
|
maxTasksPerProcess: 500,
|
|
58
58
|
spawnTimeoutMillis: 30000,
|
|
59
|
+
streamFlushMillis: 10,
|
|
59
60
|
// see https://github.com/photostructure/exiftool-vendored.js/issues/34 :
|
|
60
61
|
taskTimeoutMillis: 20000,
|
|
61
62
|
onIdleIntervalMillis: 2000,
|
|
@@ -85,9 +86,6 @@ exports.DefaultExifToolOptions = Object.freeze({
|
|
|
85
86
|
numericTags: [
|
|
86
87
|
"*Duration*",
|
|
87
88
|
"GPSAltitude",
|
|
88
|
-
"GPSLatitude",
|
|
89
|
-
"GPSLongitude",
|
|
90
|
-
"GPSPosition",
|
|
91
89
|
"Orientation",
|
|
92
90
|
// NOT Rotation! Rotation can be encoded as degrees rotated clockwise, or a
|
|
93
91
|
// EXIF-Orientation string (!!). If we ask ExifTool for numeric rotations of HEICs,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultExifToolOptions.js","sourceRoot":"","sources":["../src/DefaultExifToolOptions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAwGA,wFASC;AAjHD,kDAAmC;AACnC,yCAAoC;AACpC,uCAAqC;AACrC,6DAAyD;AACzD,+DAA2D;AAC3D,uDAAmD;AAEnD,iDAA6C;AAC7C,mCAA+B;AAC/B,uCAAmC;AAGnC,+CAA2C;AAE3C,MAAM,SAAS,GAAG,IAAA,oBAAQ,EAAC,mBAAmB,CAAC,CAAA;AAC/C,SAAS,IAAI,KAAI,CAAC;AAEL,QAAA,aAAa,GAAc;IACtC,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,OAAO,CAAC,IAAI;IAClB,KAAK,EAAE,OAAO,CAAC,KAAK;CACrB,CAAA;AAED,SAAS,MAAM;IACb,OAAO,IAAA,oBAAQ,EAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAa,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAA;AAC5E,CAAC;AAED;;;GAGG;AACU,QAAA,sBAAsB,GAG/B,MAAM,CAAC,MAAM,CAAC;IAChB,GAAG,IAAI,EAAE,CAAC,mBAAmB,EAAE;IAC/B,QAAQ,EAAE,iCAAe;IACzB,kBAAkB,EAAE,GAAG;IACvB,kBAAkB,EAAE,KAAK;IACzB,yEAAyE;IACzE,iBAAiB,EAAE,KAAK;IACxB,oBAAoB,EAAE,IAAI;IAC1B,WAAW,EAAE,CAAC;IACd,YAAY,EAAZ,2BAAY;IACZ,YAAY,EAAE,yCAAmB;IACjC,WAAW,EAAE,EAAE;IACf,SAAS,EAAE,CAAC,IAAA,iBAAO,GAAE;IACrB,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,qBAAqB;IAClC,cAAc,EAAE,IAAI,yBAAW,EAAE,CAAC,OAAO;IACzC,yBAAyB,EAAE,KAAK;IAChC,kBAAkB,EAAE,kBAAkB;IAEtC,iBAAiB,EAAE,IAAI;IACvB,kBAAkB,EAAE,IAAI;IACxB,KAAK,EAAE,aAAK;IACZ,WAAW,EAAE,KAAK;IAClB,oBAAoB,EAAE,IAAI;IAC1B,iBAAiB,EAAE,IAAI;IACvB,aAAa,EAAE,KAAK;IACpB,mBAAmB,EAAE,SAAS;IAC9B,2BAA2B,EAAE,KAAK,EAAE,2BAA2B;IAC/D,8BAA8B,EAAE,CAAC,GAAG,uCAAkB,CAAC;IACvD,0BAA0B,EAAE,KAAK,EAAE,2BAA2B;IAC9D,MAAM;IACN,WAAW,EAAE;QACX,YAAY;QACZ,aAAa;
|
|
1
|
+
{"version":3,"file":"DefaultExifToolOptions.js","sourceRoot":"","sources":["../src/DefaultExifToolOptions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAwGA,wFASC;AAjHD,kDAAmC;AACnC,yCAAoC;AACpC,uCAAqC;AACrC,6DAAyD;AACzD,+DAA2D;AAC3D,uDAAmD;AAEnD,iDAA6C;AAC7C,mCAA+B;AAC/B,uCAAmC;AAGnC,+CAA2C;AAE3C,MAAM,SAAS,GAAG,IAAA,oBAAQ,EAAC,mBAAmB,CAAC,CAAA;AAC/C,SAAS,IAAI,KAAI,CAAC;AAEL,QAAA,aAAa,GAAc;IACtC,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,OAAO,CAAC,IAAI;IAClB,KAAK,EAAE,OAAO,CAAC,KAAK;CACrB,CAAA;AAED,SAAS,MAAM;IACb,OAAO,IAAA,oBAAQ,EAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAa,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAA;AAC5E,CAAC;AAED;;;GAGG;AACU,QAAA,sBAAsB,GAG/B,MAAM,CAAC,MAAM,CAAC;IAChB,GAAG,IAAI,EAAE,CAAC,mBAAmB,EAAE;IAC/B,QAAQ,EAAE,iCAAe;IACzB,kBAAkB,EAAE,GAAG;IACvB,kBAAkB,EAAE,KAAK;IACzB,iBAAiB,EAAE,EAAE;IACrB,yEAAyE;IACzE,iBAAiB,EAAE,KAAK;IACxB,oBAAoB,EAAE,IAAI;IAC1B,WAAW,EAAE,CAAC;IACd,YAAY,EAAZ,2BAAY;IACZ,YAAY,EAAE,yCAAmB;IACjC,WAAW,EAAE,EAAE;IACf,SAAS,EAAE,CAAC,IAAA,iBAAO,GAAE;IACrB,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,qBAAqB;IAClC,cAAc,EAAE,IAAI,yBAAW,EAAE,CAAC,OAAO;IACzC,yBAAyB,EAAE,KAAK;IAChC,kBAAkB,EAAE,kBAAkB;IAEtC,iBAAiB,EAAE,IAAI;IACvB,kBAAkB,EAAE,IAAI;IACxB,KAAK,EAAE,aAAK;IACZ,WAAW,EAAE,KAAK;IAClB,oBAAoB,EAAE,IAAI;IAC1B,iBAAiB,EAAE,IAAI;IACvB,aAAa,EAAE,KAAK;IACpB,mBAAmB,EAAE,SAAS;IAC9B,2BAA2B,EAAE,KAAK,EAAE,2BAA2B;IAC/D,8BAA8B,EAAE,CAAC,GAAG,uCAAkB,CAAC;IACvD,0BAA0B,EAAE,KAAK,EAAE,2BAA2B;IAC9D,MAAM;IACN,WAAW,EAAE;QACX,YAAY;QACZ,aAAa;QAGb,aAAa;QACb,2EAA2E;QAC3E,mFAAmF;QACnF,6CAA6C;QAE7C,qDAAqD;QACrD,KAAK;QACL,gCAAgC;QAChC,kCAAkC;QAClC,KAAK;QAEL,uDAAuD;QACvD,KAAK;QACL,yDAAyD;QACzD,mCAAmC;QACnC,KAAK;KACN;IACD,MAAM,EAAE,KAAK;IACb,MAAM,EAAE,CAAC;IACT,QAAQ,EAAE,CAAC,OAAO,CAAC;IACnB,SAAS,EAAE,EAAE;IAEb,+BAA+B,EAAE,sCAAsC;IAEvE,8BAA8B,EAAE,KAAK,EAAE,2BAA2B;CACnE,CAAC,CAAA;AAEF;;GAEG;AACH,SAAgB,sCAAsC,CACpD,CAAO;IAEP,4CAA4C;IAC5C,OAAO,IAAI,KAAK,IAAA,mBAAS,EAAC,CAAC,CAAC,eAAe,CAAC;QAC1C,2EAA2E;QAC3E,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,SAAS,CAAA;AACf,CAAC"}
|
|
@@ -5,8 +5,8 @@ const Array_1 = require("./Array");
|
|
|
5
5
|
const String_1 = require("./String");
|
|
6
6
|
function errorsAndWarnings(task, t) {
|
|
7
7
|
return {
|
|
8
|
-
errors: (0, Array_1.uniq)((0, String_1.compactBlanks)([t
|
|
9
|
-
warnings: (0, Array_1.uniq)((0, String_1.compactBlanks)([t
|
|
8
|
+
errors: (0, Array_1.uniq)((0, String_1.compactBlanks)([t?.Error, ...task.errors])),
|
|
9
|
+
warnings: (0, Array_1.uniq)((0, String_1.compactBlanks)([t?.Warning, ...task.warnings])),
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
12
|
//# sourceMappingURL=ErrorsAndWarnings.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ErrorsAndWarnings.js","sourceRoot":"","sources":["../src/ErrorsAndWarnings.ts"],"names":[],"mappings":";;AAoBA,8CAQC;AA5BD,mCAA8B;AAE9B,qCAAwC;AAkBxC,SAAgB,iBAAiB,CAC/B,IAAuB,EACvB,CAAwC;IAExC,OAAO;QACL,MAAM,EAAE,IAAA,YAAI,EAAC,IAAA,sBAAa,EAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"ErrorsAndWarnings.js","sourceRoot":"","sources":["../src/ErrorsAndWarnings.ts"],"names":[],"mappings":";;AAoBA,8CAQC;AA5BD,mCAA8B;AAE9B,qCAAwC;AAkBxC,SAAgB,iBAAiB,CAC/B,IAAuB,EACvB,CAAwC;IAExC,OAAO;QACL,MAAM,EAAE,IAAA,YAAI,EAAC,IAAA,sBAAa,EAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACvD,QAAQ,EAAE,IAAA,YAAI,EAAC,IAAA,sBAAa,EAAC,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;KAC9D,CAAA;AACH,CAAC"}
|
package/dist/ExifDate.js
CHANGED
|
@@ -11,11 +11,16 @@ const LooseExifRE = /^\S+\s+\S+\s+\S+$/;
|
|
|
11
11
|
* Encodes an ExifDate
|
|
12
12
|
*/
|
|
13
13
|
class ExifDate {
|
|
14
|
+
year;
|
|
15
|
+
month;
|
|
16
|
+
day;
|
|
17
|
+
rawValue;
|
|
14
18
|
static from(exifOrIso) {
|
|
15
|
-
var _a, _b;
|
|
16
19
|
return (
|
|
17
20
|
// in order of strictness:
|
|
18
|
-
|
|
21
|
+
this.fromExifStrict(exifOrIso) ??
|
|
22
|
+
this.fromISO(exifOrIso) ??
|
|
23
|
+
this.fromExifLoose(exifOrIso));
|
|
19
24
|
}
|
|
20
25
|
static fromISO(text) {
|
|
21
26
|
return StrictExifRE.test((0, String_1.toS)(text).trim())
|
package/dist/ExifDate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExifDate.js","sourceRoot":"","sources":["../src/ExifDate.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAEhC,yCAAkD;AAClD,mCAAkD;AAClD,qCAA2C;AAE3C,MAAM,YAAY,GAAG,mDAAmD,CAAA;AACxE,MAAM,WAAW,GAAG,mBAAmB,CAAA;AAEvC;;GAEG;AACH,MAAa,QAAQ;
|
|
1
|
+
{"version":3,"file":"ExifDate.js","sourceRoot":"","sources":["../src/ExifDate.ts"],"names":[],"mappings":"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"}
|