@speleotica/frcsdata 4.1.1 → 4.2.0

package/FrcsShot.d.ts

@@ -1,4 +1,5 @@
 import { UnitizedNumber, Length, Angle } from '@speleotica/unitized';
+import { FrcsUnits } from './FrcsTrip';
 export declare enum FrcsShotKind {
     Normal = " ",
     Horizontal = "H",
@@ -42,4 +43,14 @@ export type FrcsShot = {
     excludeDistance?: boolean | null;
     isSplay?: boolean | null;
     comment?: string | null;
+    /**
+     * In the edge case that the surveyors changed measurement units or
+     * corrected/uncorrected backsights in the middle of a trip, the measurements
+     * will be normalized to the initial trip settings, and this field will contain
+     * the actual values recorded, verbatim.  The first shot of the group with
+     * changed units will include the changed units.
+     */
+    recorded?: FrcsShot & {
+        units?: FrcsUnits;
+    };
 };

package/FrcsTrip.d.ts

@@ -1,11 +1,6 @@
 import { Unit, Length, Angle } from '@speleotica/unitized';
 import { FrcsShot } from './FrcsShot';
-export type FrcsTripHeader = {
-    name: string;
-    comment?: string | null;
-    section?: string | null;
-    date?: Date | null;
-    team?: Array<string> | null;
+export type FrcsUnits = {
     distanceUnit: Unit<Length>;
     azimuthUnit: Unit<Angle>;
     inclinationUnit: Unit<Angle>;
@@ -14,6 +9,13 @@ export type FrcsTripHeader = {
     hasBacksightAzimuth?: boolean | null;
     hasBacksightInclination?: boolean | null;
 };
+export type FrcsTripHeader = FrcsUnits & {
+    name: string;
+    comment?: string | null;
+    section?: string | null;
+    date?: Date | null;
+    team?: Array<string> | null;
+};
 export type FrcsTrip = {
     header: FrcsTripHeader;
     shots: Array<FrcsShot>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speleotica/frcsdata",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "description": "parser for Chip Hopper's survey data format used in Fisher Ridge Cave System",
   "sideEffects": false,
   "publishConfig": {

package/parseFrcsSurveyFile.js

@@ -7,10 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = parseFrcsSurveyFile;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _parseSegment = require("parse-segment");
 var _unitized = require("@speleotica/unitized");
 var _FrcsShot = require("./FrcsShot.js");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _asyncIterator(r) { var n, t, o, e = 2; for ("undefined" != typeof Symbol && (t = Symbol.asyncIterator, o = Symbol.iterator); e--;) { if (t && null != (n = r[t])) return n.call(r); if (o && null != (n = r[o])) return new AsyncFromSyncIterator(n.call(r)); t = "@@asyncIterator", o = "@@iterator"; } throw new TypeError("Object is not async iterable"); }
 function AsyncFromSyncIterator(r) { function AsyncFromSyncIteratorContinuation(r) { if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object.")); var n = r.done; return Promise.resolve(r.value).then(function (r) { return { value: r, done: n }; }); } return AsyncFromSyncIterator = function AsyncFromSyncIterator(r) { this.s = r, this.n = r.next; }, AsyncFromSyncIterator.prototype = { s: null, n: null, next: function next() { return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments)); }, "return": function _return(r) { var n = this.s["return"]; return void 0 === n ? Promise.resolve({ value: r, done: !0 }) : AsyncFromSyncIteratorContinuation(n.apply(this.s, arguments)); }, "throw": function _throw(r) { var n = this.s["return"]; return void 0 === n ? Promise.reject(r) : AsyncFromSyncIteratorContinuation(n.apply(this.s, arguments)); } }, new AsyncFromSyncIterator(r); }
 function parseNumber(s, unit) {
@@ -167,7 +170,7 @@ function _parseFrcsSurveyFile() {
   _parseFrcsSurveyFile = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(file,
   // eslint-disable-line @typescript-eslint/no-explicit-any
   lines) {
-    var cave, location, trips, errors, tripName, tripTeam, tripDate, inTripComment, tripCommentStartLine, tripCommentEndLine, tripComment, commentLines, trip, inBlockComment, section, commentFromStationLruds, addCommentLine, getComment, lineNumber, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _loop, _ret, _iterator, _step;
+    var cave, location, trips, errors, tripName, tripTeam, tripDate, inTripComment, tripCommentStartLine, tripCommentEndLine, tripComment, commentLines, trip, inBlockComment, section, commentFromStationLruds, addCommentLine, getComment, unitsChanged, alternateUnits, nextShotUnits, lineNumber, line, errored, error, parseUnits, validate, addShot, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _loop, _ret, _iterator, _step;
     return _regenerator["default"].wrap(function _callee$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -202,34 +205,127 @@ function _parseFrcsSurveyFile() {
           trip = null;
           inBlockComment = false;
           commentFromStationLruds = new Map();
+          unitsChanged = false;
           lineNumber = 0;
+          errored = false;
+          error = function error(message, startColumn, endColumn) {
+            errored = true;
+            errors.push(new _parseSegment.SegmentParseError(message, new _parseSegment.Segment({
+              value: line,
+              source: file,
+              startLine: lineNumber,
+              startCol: 0
+            }).substring(startColumn, endColumn)));
+          };
+          parseUnits = function parseUnits() {
+            // FT CC DD
+            // 01234567
+            var distanceUnit = parseLengthUnit(line.slice(0, 2));
+            if (!distanceUnit) {
+              distanceUnit = _unitized.Length.feet;
+              error('Invalid distance unit', 0, 2);
+            }
+            var azimuthUnit = parseAngleUnit(line[6]);
+            if (!azimuthUnit) {
+              azimuthUnit = _unitized.Angle.degrees;
+              error('Invalid azimuth unit', 6, 7);
+            }
+            var inclinationUnit = parseAngleUnit(line[7]);
+            if (!inclinationUnit) {
+              inclinationUnit = _unitized.Angle.degrees;
+              error('Invalid inclination unit', 7, 8);
+            }
+            var backsightAzimuthCorrected = line[3] === 'C';
+            var backsightInclinationCorrected = line[4] === 'C';
+            var hasBacksightAzimuth = line[3] !== ' ' && line[3] !== '-';
+            var hasBacksightInclination = line[4] !== ' ' && line[4] !== '-';
+            if (!/[-CB ]/.test(line[3])) {
+              error('Invalid backsight azimuth type', 3, 4);
+            }
+            if (!/[-CB ]/.test(line[4])) {
+              error('Invalid backsight inclination type', 4, 5);
+            }
+            return {
+              distanceUnit: distanceUnit,
+              azimuthUnit: azimuthUnit,
+              inclinationUnit: inclinationUnit,
+              backsightAzimuthCorrected: backsightAzimuthCorrected,
+              backsightInclinationCorrected: backsightInclinationCorrected,
+              hasBacksightAzimuth: hasBacksightAzimuth,
+              hasBacksightInclination: hasBacksightInclination
+            };
+          };
+          validate = function validate(startColumn, endColumn, fieldName, validator) {
+            var field = line.substring(startColumn, endColumn);
+            if (!validator(field)) {
+              error((field.trim() ? 'Invalid ' : 'Missing ') + fieldName, startColumn, endColumn);
+            }
+            return field;
+          };
+          addShot = function addShot(shot) {
+            if (!trip) return;
+            if (alternateUnits) {
+              var recorded = shot;
+              shot = _objectSpread(_objectSpread({}, shot), {}, {
+                recorded: recorded
+              });
+              if (nextShotUnits) {
+                recorded.units = nextShotUnits;
+                nextShotUnits = undefined;
+              }
+              var _trip$header = trip.header,
+                backsightAzimuthCorrected = _trip$header.backsightAzimuthCorrected,
+                backsightInclinationCorrected = _trip$header.backsightInclinationCorrected,
+                distanceUnit = _trip$header.distanceUnit,
+                azimuthUnit = _trip$header.azimuthUnit,
+                inclinationUnit = _trip$header.inclinationUnit;
+              if (alternateUnits.backsightAzimuthCorrected !== backsightAzimuthCorrected) {
+                shot.backsightAzimuth = shot.backsightAzimuth ? _unitized.Angle.opposite(shot.backsightAzimuth) : undefined;
+              }
+              if (alternateUnits.backsightInclinationCorrected !== backsightInclinationCorrected) {
+                var _shot$backsightInclin;
+                shot.backsightInclination = (_shot$backsightInclin = shot.backsightInclination) === null || _shot$backsightInclin === void 0 ? void 0 : _shot$backsightInclin.negate();
+              }
+              if (distanceUnit !== alternateUnits.distanceUnit) {
+                shot.distance = shot.distance["in"](distanceUnit);
+                if (shot.fromLruds) {
+                  var _shot$fromLruds$left, _shot$fromLruds$right, _shot$fromLruds$up, _shot$fromLruds$down;
+                  shot.fromLruds.left = (_shot$fromLruds$left = shot.fromLruds.left) === null || _shot$fromLruds$left === void 0 ? void 0 : _shot$fromLruds$left["in"](distanceUnit);
+                  shot.fromLruds.right = (_shot$fromLruds$right = shot.fromLruds.right) === null || _shot$fromLruds$right === void 0 ? void 0 : _shot$fromLruds$right["in"](distanceUnit);
+                  shot.fromLruds.up = (_shot$fromLruds$up = shot.fromLruds.up) === null || _shot$fromLruds$up === void 0 ? void 0 : _shot$fromLruds$up["in"](distanceUnit);
+                  shot.fromLruds.down = (_shot$fromLruds$down = shot.fromLruds.down) === null || _shot$fromLruds$down === void 0 ? void 0 : _shot$fromLruds$down["in"](distanceUnit);
+                }
+                if (shot.toLruds) {
+                  var _shot$toLruds$left, _shot$toLruds$right, _shot$toLruds$up, _shot$toLruds$down;
+                  shot.toLruds.left = (_shot$toLruds$left = shot.toLruds.left) === null || _shot$toLruds$left === void 0 ? void 0 : _shot$toLruds$left["in"](distanceUnit);
+                  shot.toLruds.right = (_shot$toLruds$right = shot.toLruds.right) === null || _shot$toLruds$right === void 0 ? void 0 : _shot$toLruds$right["in"](distanceUnit);
+                  shot.toLruds.up = (_shot$toLruds$up = shot.toLruds.up) === null || _shot$toLruds$up === void 0 ? void 0 : _shot$toLruds$up["in"](distanceUnit);
+                  shot.toLruds.down = (_shot$toLruds$down = shot.toLruds.down) === null || _shot$toLruds$down === void 0 ? void 0 : _shot$toLruds$down["in"](distanceUnit);
+                }
+              }
+              if (azimuthUnit !== alternateUnits.azimuthUnit) {
+                var _shot$frontsightAzimu, _shot$backsightAzimut;
+                shot.frontsightAzimuth = (_shot$frontsightAzimu = shot.frontsightAzimuth) === null || _shot$frontsightAzimu === void 0 ? void 0 : _shot$frontsightAzimu["in"](azimuthUnit);
+                shot.backsightAzimuth = (_shot$backsightAzimut = shot.backsightAzimuth) === null || _shot$backsightAzimut === void 0 ? void 0 : _shot$backsightAzimut["in"](azimuthUnit);
+              }
+              if (inclinationUnit !== alternateUnits.inclinationUnit) {
+                var _shot$frontsightIncli, _shot$backsightInclin2;
+                shot.frontsightInclination = (_shot$frontsightIncli = shot.frontsightInclination) === null || _shot$frontsightIncli === void 0 ? void 0 : _shot$frontsightIncli["in"](inclinationUnit);
+                shot.backsightInclination = (_shot$backsightInclin2 = shot.backsightInclination) === null || _shot$backsightInclin2 === void 0 ? void 0 : _shot$backsightInclin2["in"](inclinationUnit);
+              }
+            }
+            trip.shots.push(shot);
+          };
           _iteratorAbruptCompletion = false;
           _didIteratorError = false;
-          _context2.prev = 17;
+          _context2.prev = 23;
           _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
-            var line, errored, thisLineNumber, error, validate, match, _match, k, team, month, day, year, _match2, part, distanceUnit, azimuthUnit, inclinationUnit, backsightAzimuthCorrected, backsightInclinationCorrected, hasBacksightAzimuth, hasBacksightInclination, _trip, shots, _trip$header, _azimuthUnit, _inclinationUnit, _distanceUnit, inches, fromStr, from, lStr, rStr, uStr, dStr, up, down, left, right, toStr, _shot, fromLruds, fromLrudMatch, _fromLrudMatch$1$trim, _fromLrudMatch$1$trim2, _left, _right, _up, _down, comment, azmFsStr, azmBsStr, incFsStr, incBsStr, kind, distance, horizontalDistance, verticalDistance, frontsightInclination, backsightInclination, excludeDistance, isSplay, feetStr, inchesStr, invalid, _feetStr, h, v, d, _v, frontsightAzimuth, backsightAzimuth, shot;
+            var match, _match, k, team, month, day, year, _match2, part, _ref, distanceUnit, _ref2, azimuthUnit, inclinationUnit, inches, fromStr, from, lStr, rStr, uStr, dStr, up, down, left, right, toStr, _shot, fromLruds, fromLrudMatch, _fromLrudMatch$1$trim, _fromLrudMatch$1$trim2, _left, _right, _up, _down, comment, azmFsStr, azmBsStr, incFsStr, incBsStr, kind, distance, horizontalDistance, verticalDistance, frontsightInclination, backsightInclination, excludeDistance, isSplay, feetStr, inchesStr, invalid, _feetStr, h, v, d, _v, frontsightAzimuth, backsightAzimuth, shot;
             return _regenerator["default"].wrap(function _loop$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
                   line = _step.value;
                   errored = false;
-                  thisLineNumber = lineNumber;
-                  error = function error(message, startColumn, endColumn) {
-                    errored = true;
-                    errors.push(new _parseSegment.SegmentParseError(message, new _parseSegment.Segment({
-                      value: line,
-                      source: file,
-                      startLine: thisLineNumber,
-                      startCol: 0
-                    }).substring(startColumn, endColumn)));
-                  };
-                  validate = function validate(startColumn, endColumn, fieldName, validator) {
-                    var field = line.substring(startColumn, endColumn);
-                    if (!validator(field)) {
-                      error((field.trim() ? 'Invalid ' : 'Missing ') + fieldName, startColumn, endColumn);
-                    }
-                    return field;
-                  };
                   lineNumber++;
                   if (lineNumber === 1) {
                     match = /^\s*([^,]+)(,(.*))?/.exec(line);
@@ -240,11 +336,23 @@ function _parseFrcsSurveyFile() {
                       }
                     }
                   }
+                  if (!unitsChanged) {
+                    _context.next = 10;
+                    break;
+                  }
+                  unitsChanged = false;
+                  alternateUnits = parseUnits();
+                  nextShotUnits = alternateUnits;
+                  _context.next = 105;
+                  break;
+                case 10:
                   if (!(line.charAt(0) === ' ' && line.charAt(1) === '*')) {
-                    _context.next = 12;
+                    _context.next = 17;
                     break;
                   }
                   inTripComment = !inTripComment;
+                  alternateUnits = nextShotUnits = undefined;
+                  unitsChanged = false;
                   if (inTripComment) {
                     section = undefined;
                     tripComment = [];
@@ -252,11 +360,11 @@ function _parseFrcsSurveyFile() {
                   } else {
                     tripCommentEndLine = lineNumber;
                   }
-                  _context.next = 109;
+                  _context.next = 105;
                   break;
-                case 12:
+                case 17:
                   if (!inTripComment) {
-                    _context.next = 18;
+                    _context.next = 23;
                     break;
                   }
                   if (lineNumber === tripCommentStartLine + 1) {
@@ -279,89 +387,62 @@ function _parseFrcsSurveyFile() {
                   if (_match2) {
                     section = _match2[1].trim();
                   }
-                  _context.next = 109;
+                  _context.next = 105;
                   break;
-                case 18:
+                case 23:
                   if (!(line.charAt(0) === '*')) {
-                    _context.next = 23;
+                    _context.next = 31;
+                    break;
+                  }
+                  if (!/^\*\s*%NC(\b|$)/.test(line)) {
+                    _context.next = 27;
                     break;
                   }
+                  unitsChanged = true;
+                  return _context.abrupt("return", 0);
+                case 27:
                   inBlockComment = !inBlockComment;
                   if (inBlockComment) commentLines = [];else {
                     part = line.substring(1);
                     if (part) addCommentLine(part);
                   }
-                  _context.next = 109;
+                  _context.next = 105;
                   break;
-                case 23:
+                case 31:
                   if (!inBlockComment) {
-                    _context.next = 27;
+                    _context.next = 35;
                     break;
                   }
                   addCommentLine(line);
-                  _context.next = 109;
+                  _context.next = 105;
                   break;
-                case 27:
+                case 35:
                   if (!(lineNumber === tripCommentEndLine + 1)) {
-                    _context.next = 44;
+                    _context.next = 40;
                     break;
                   }
-                  // FT CC DD
-                  // 01234567
-                  distanceUnit = parseLengthUnit(line.slice(0, 2));
-                  if (!distanceUnit) {
-                    distanceUnit = _unitized.Length.feet;
-                    error('Invalid distance unit', 0, 2);
-                  }
-                  azimuthUnit = parseAngleUnit(line[6]);
-                  if (!azimuthUnit) {
-                    azimuthUnit = _unitized.Angle.degrees;
-                    error('Invalid azimuth unit', 6, 7);
-                  }
-                  inclinationUnit = parseAngleUnit(line[7]);
-                  if (!inclinationUnit) {
-                    inclinationUnit = _unitized.Angle.degrees;
-                    error('Invalid inclination unit', 7, 8);
-                  }
-                  backsightAzimuthCorrected = line[3] === 'C';
-                  backsightInclinationCorrected = line[4] === 'C';
-                  hasBacksightAzimuth = line[3] !== ' ' && line[3] !== '-';
-                  hasBacksightInclination = line[4] !== ' ' && line[4] !== '-';
-                  if (!/[-CB ]/.test(line[3])) {
-                    error('Invalid backsight azimuth type', 3, 4);
-                  }
-                  if (!/[-CB ]/.test(line[4])) {
-                    error('Invalid backsight inclination type', 4, 5);
-                  }
                   trip = {
-                    header: {
+                    header: _objectSpread({
                       name: tripName || '',
                       comment: tripComment && tripComment.join('\n') || null,
                       section: section,
                       date: tripDate,
-                      team: tripTeam,
-                      distanceUnit: distanceUnit,
-                      azimuthUnit: azimuthUnit,
-                      inclinationUnit: inclinationUnit,
-                      backsightAzimuthCorrected: backsightAzimuthCorrected,
-                      backsightInclinationCorrected: backsightInclinationCorrected,
-                      hasBacksightAzimuth: hasBacksightAzimuth,
-                      hasBacksightInclination: hasBacksightInclination
-                    },
+                      team: tripTeam
+                    }, parseUnits()),
                     shots: []
                   };
                   trips.push(trip);
-                  _context.next = 109;
+                  _context.next = 105;
                   break;
-                case 44:
+                case 40:
                   if (!trip) {
-                    _context.next = 109;
+                    _context.next = 105;
                     break;
                   }
-                  _trip = trip, shots = _trip.shots, _trip$header = _trip.header, _azimuthUnit = _trip$header.azimuthUnit, _inclinationUnit = _trip$header.inclinationUnit;
-                  _distanceUnit = trip.header.distanceUnit;
-                  inches = _distanceUnit === _unitized.Length.inches;
-                  if (inches) _distanceUnit = _unitized.Length.feet;
+                  _ref = alternateUnits || trip.header, distanceUnit = _ref.distanceUnit;
+                  _ref2 = alternateUnits || trip.header, azimuthUnit = _ref2.azimuthUnit, inclinationUnit = _ref2.inclinationUnit;
+                  inches = distanceUnit === _unitized.Length.inches;
+                  if (inches) distanceUnit = _unitized.Length.feet;
 
                   // rigorously check the values in all the columns to make sure this
                   // is really a survey shot line, just in case any stray comments are
@@ -369,11 +450,11 @@ function _parseFrcsSurveyFile() {
 
                   // from station name
                   if (/\S/.test(line.substring(5, 10))) {
-                    _context.next = 51;
+                    _context.next = 47;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 51:
+                case 47:
                   fromStr = validate(5, 10, 'from station', isValidStation);
                   from = fromStr.trim(); // Sadly I have found negative LRUD values in Chip's format and apparently
                   // his program doesn't fail on them, so I have to accept them here
@@ -383,25 +464,25 @@ function _parseFrcsSurveyFile() {
                   uStr = validate(46, 49, 'up', isValidOptFloat);
                   dStr = validate(49, 52, 'down', isValidOptFloat);
                   if (!errored) {
-                    _context.next = 59;
+                    _context.next = 55;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 59:
-                  up = parseLrud(uStr, _distanceUnit);
-                  down = parseLrud(dStr, _distanceUnit);
-                  left = parseLrud(lStr, _distanceUnit);
-                  right = parseLrud(rStr, _distanceUnit); // to station name
+                case 55:
+                  up = parseLrud(uStr, distanceUnit);
+                  down = parseLrud(dStr, distanceUnit);
+                  left = parseLrud(lStr, distanceUnit);
+                  right = parseLrud(rStr, distanceUnit); // to station name
                   toStr = line.substring(0, 5);
                   if (toStr.trim()) {
-                    _context.next = 68;
+                    _context.next = 64;
                     break;
                   }
                   _shot = {
                     from: from,
                     to: null,
                     kind: _FrcsShot.FrcsShotKind.Normal,
-                    distance: new _unitized.UnitizedNumber(0, _distanceUnit),
+                    distance: new _unitized.UnitizedNumber(0, distanceUnit),
                     frontsightAzimuth: null,
                     backsightAzimuth: null,
                     frontsightInclination: null,
@@ -415,9 +496,9 @@ function _parseFrcsSurveyFile() {
                     excludeDistance: true,
                     comment: getComment()
                   };
-                  shots.push(_shot);
+                  addShot(_shot);
                   return _context.abrupt("return", 0);
-                case 68:
+                case 64:
                   if (!isValidStation(toStr)) {
                     error('Invalid station name', 0, 5);
                   }
@@ -428,7 +509,7 @@ function _parseFrcsSurveyFile() {
                     fromLrudMatch = new RegExp("^\\s+".concat(fromStr.trim().replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), "((\\s+(\\d+(\\.\\d*)?|\\.\\d+)){4})")).exec(line.substring(52));
                     if (fromLrudMatch) {
                       _fromLrudMatch$1$trim = fromLrudMatch[1].trim().split(/\s+/g).map(function (s) {
-                        return parseLrud(s, _distanceUnit);
+                        return parseLrud(s, distanceUnit);
                       }), _fromLrudMatch$1$trim2 = (0, _slicedToArray2["default"])(_fromLrudMatch$1$trim, 4), _left = _fromLrudMatch$1$trim2[0], _right = _fromLrudMatch$1$trim2[1], _up = _fromLrudMatch$1$trim2[2], _down = _fromLrudMatch$1$trim2[3];
                       fromLruds = {
                         left: _left,
@@ -444,25 +525,25 @@ function _parseFrcsSurveyFile() {
                   incFsStr = line.substring(30, 35);
                   incBsStr = line.substring(35, 40);
                   if (!errored) {
-                    _context.next = 78;
+                    _context.next = 74;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 78:
+                case 74:
                   if (!inches) {
-                    _context.next = 91;
+                    _context.next = 87;
                     break;
                   }
                   feetStr = line.substring(10, 14);
                   inchesStr = line.substring(14, 17); // feet and inches are not both optional
                   if (!(!isValidUInt(feetStr) && !isValidUInt(inchesStr))) {
-                    _context.next = 85;
+                    _context.next = 81;
                     break;
                   }
                   invalid = feetStr.trim() || inchesStr.trim();
                   error(invalid ? 'Invalid distance' : 'Missing distance', 10, 17);
                   return _context.abrupt("return", 0);
-                case 85:
+                case 81:
                   // sometimes inches are omitted, hence the || 0...I'm assuming it's possible
                   // for feet to be omitted as well
                   distance = _unitized.Unitize.inches(parseFloat(inchesStr) || 0).add(_unitized.Unitize.feet(parseFloat(feetStr) || 0));
@@ -473,16 +554,16 @@ function _parseFrcsSurveyFile() {
                   // first column that can contain a * for decimal feet shots
                   excludeDistance = line[18] === '*' || line[18] === 's';
                   isSplay = line[18] === 's';
-                  _context.next = 96;
+                  _context.next = 92;
                   break;
-                case 91:
+                case 87:
                   // decimal feet are not optional
                   _feetStr = validate(10, 16, 'distance', isValidUFloat);
-                  distance = new _unitized.UnitizedNumber(parseFloat(_feetStr), _distanceUnit);
+                  distance = new _unitized.UnitizedNumber(parseFloat(_feetStr), distanceUnit);
                   kind = parseKind(line[16]);
                   excludeDistance = line[17] === '*' || line[17] === 's';
                   isSplay = line[17] === 's';
-                case 96:
+                case 92:
                   if (kind !== _FrcsShot.FrcsShotKind.Normal) {
                     validate(30, 35, 'vertical-distance', isValidFloat);
                   }
@@ -494,17 +575,17 @@ function _parseFrcsSurveyFile() {
                   if (kind === _FrcsShot.FrcsShotKind.Horizontal) {
                     // distance is horizontal offset and incFsStr is vertical offset
                     horizontalDistance = distance;
-                    h = horizontalDistance.get(_distanceUnit);
+                    h = horizontalDistance.get(distanceUnit);
                     v = parseFloat(incFsStr);
-                    verticalDistance = new _unitized.UnitizedNumber(v, _distanceUnit);
-                    distance = new _unitized.UnitizedNumber(Math.sqrt(h * h + v * v), _distanceUnit);
+                    verticalDistance = new _unitized.UnitizedNumber(v, distanceUnit);
+                    distance = new _unitized.UnitizedNumber(Math.sqrt(h * h + v * v), distanceUnit);
                     frontsightInclination = _unitized.Angle.atan2(verticalDistance, horizontalDistance);
                     backsightInclination = null;
                   } else if (kind === _FrcsShot.FrcsShotKind.Diagonal) {
                     // distance is as usual, but incFsStr is vertical offset
-                    d = distance.get(_distanceUnit);
+                    d = distance.get(distanceUnit);
                     _v = parseFloat(incFsStr);
-                    verticalDistance = new _unitized.UnitizedNumber(_v, _distanceUnit);
+                    verticalDistance = new _unitized.UnitizedNumber(_v, distanceUnit);
                     frontsightInclination = _unitized.Angle.asin(_v / d);
                     backsightInclination = null;
                   } else {
@@ -512,17 +593,17 @@ function _parseFrcsSurveyFile() {
                     validate(30, 35, 'inclination', isValidOptInclination);
                     // frontsight inclination
                     validate(35, 40, 'inclination', isValidOptInclination);
-                    frontsightInclination = parseNumber(incFsStr, _inclinationUnit);
-                    backsightInclination = parseNumber(incBsStr, _inclinationUnit);
+                    frontsightInclination = parseNumber(incFsStr, inclinationUnit);
+                    backsightInclination = parseNumber(incBsStr, inclinationUnit);
                   }
                   if (!errored) {
-                    _context.next = 100;
+                    _context.next = 96;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 100:
-                  frontsightAzimuth = parseAzimuth(azmFsStr, _azimuthUnit);
-                  backsightAzimuth = parseAzimuth(azmBsStr, _azimuthUnit);
+                case 96:
+                  frontsightAzimuth = parseAzimuth(azmFsStr, azimuthUnit);
+                  backsightAzimuth = parseAzimuth(azmBsStr, azimuthUnit);
                   if (!frontsightInclination && !backsightInclination) {
                     frontsightInclination = _unitized.Unitize.degrees(0);
                   }
@@ -548,74 +629,74 @@ function _parseFrcsSurveyFile() {
                   if (fromLruds) shot.fromLruds = fromLruds;
                   if (horizontalDistance) shot.horizontalDistance = horizontalDistance;
                   if (verticalDistance) shot.verticalDistance = verticalDistance;
-                  shots.push(shot);
-                case 109:
+                  addShot(shot);
+                case 105:
                 case "end":
                   return _context.stop();
               }
             }, _loop);
           });
           _iterator = _asyncIterator(lines);
-        case 20:
-          _context2.next = 22;
+        case 26:
+          _context2.next = 28;
           return _iterator.next();
-        case 22:
+        case 28:
           if (!(_iteratorAbruptCompletion = !(_step = _context2.sent).done)) {
-            _context2.next = 30;
+            _context2.next = 36;
             break;
           }
-          return _context2.delegateYield(_loop(), "t0", 24);
-        case 24:
+          return _context2.delegateYield(_loop(), "t0", 30);
+        case 30:
           _ret = _context2.t0;
           if (!(_ret === 0)) {
-            _context2.next = 27;
+            _context2.next = 33;
             break;
           }
-          return _context2.abrupt("continue", 27);
-        case 27:
+          return _context2.abrupt("continue", 33);
+        case 33:
           _iteratorAbruptCompletion = false;
-          _context2.next = 20;
+          _context2.next = 26;
           break;
-        case 30:
-          _context2.next = 36;
+        case 36:
+          _context2.next = 42;
           break;
-        case 32:
-          _context2.prev = 32;
-          _context2.t1 = _context2["catch"](17);
+        case 38:
+          _context2.prev = 38;
+          _context2.t1 = _context2["catch"](23);
           _didIteratorError = true;
           _iteratorError = _context2.t1;
-        case 36:
-          _context2.prev = 36;
-          _context2.prev = 37;
+        case 42:
+          _context2.prev = 42;
+          _context2.prev = 43;
           if (!(_iteratorAbruptCompletion && _iterator["return"] != null)) {
-            _context2.next = 41;
+            _context2.next = 47;
             break;
           }
-          _context2.next = 41;
+          _context2.next = 47;
           return _iterator["return"]();
-        case 41:
-          _context2.prev = 41;
+        case 47:
+          _context2.prev = 47;
           if (!_didIteratorError) {
-            _context2.next = 44;
+            _context2.next = 50;
             break;
           }
           throw _iteratorError;
-        case 44:
-          return _context2.finish(41);
-        case 45:
-          return _context2.finish(36);
-        case 46:
+        case 50:
+          return _context2.finish(47);
+        case 51:
+          return _context2.finish(42);
+        case 52:
           return _context2.abrupt("return", {
             cave: cave,
             location: location,
             trips: trips,
             errors: errors
           });
-        case 47:
+        case 53:
         case "end":
           return _context2.stop();
       }
-    }, _callee, null, [[17, 32, 36, 46], [37,, 41, 45]]);
+    }, _callee, null, [[23, 38, 42, 52], [43,, 47, 51]]);
   }));
   return _parseFrcsSurveyFile.apply(this, arguments);
 }

package/web/index.js

@@ -43,6 +43,7 @@ var LinesTransform = /*#__PURE__*/function (_TransformStream) {
         } finally {
           _iterator.f();
         }
+        if (end < chunk.length) _this.parts.push(chunk.substring(end));
       },
       flush: function flush(controller) {
         if (_this.parts.length) {