@speleotica/frcsdata 4.1.1 → 4.3.0

package/parseFrcsSurveyFile.js

@@ -6,11 +6,16 @@ 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 _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _FrcsSurveyFile = require("./FrcsSurveyFile.js");
 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) {
@@ -40,6 +45,7 @@ function parseLengthUnit(unit) {
     case 'FT':
       return _unitized.Length.feet;
     case 'MT':
+    case 'MM':
     case 'M ':
       return _unitized.Length.meters;
   }
@@ -114,52 +120,87 @@ function parseFromStationLruds(line, distanceUnit) {
     down: down
   }];
 }
-
+function getColumnRanges(config) {
+  var result = {
+    toStation: [0, 0],
+    fromStation: [0, 0],
+    distance: [0, 0],
+    distanceFeet: [0, 0],
+    distanceInches: [0, 0],
+    kind: [0, 0],
+    exclude: [0, 0],
+    frontsightAzimuth: [0, 0],
+    backsightAzimuth: [0, 0],
+    frontsightInclination: [0, 0],
+    backsightInclination: [0, 0],
+    left: [0, 0],
+    right: [0, 0],
+    up: [0, 0],
+    down: [0, 0]
+  };
+  var c = 0;
+  for (var _i = 0, _arr = Object.entries(config); _i < _arr.length; _i++) {
+    var _arr$_i = (0, _slicedToArray2["default"])(_arr[_i], 2),
+      key = _arr$_i[0],
+      _value = _arr$_i[1];
+    if (key === 'distanceFeet' || key === 'distanceInches') continue;
+    result[key][0] = c;
+    result[key][1] = c + _value;
+    c += _value;
+  }
+  if (config.distanceFeet) {
+    result.distanceFeet[0] = result.distance[0];
+    result.distanceFeet[1] = result.distance[0] + config.distanceFeet;
+    result.distanceInches[0] = result.distanceFeet[1];
+    result.distanceInches[1] = result.distanceFeet[1] + config.distanceInches;
+  }
+  return result;
+}
 /**
- * Parses a raw cdata.fr survey file.  These look like so:
- *
-<pre>      Fisher Ridge Cave System, Hart Co., KY
-ENTRANCE DROPS, JOE'S "I LOVE MY WIFE TRAVERSE", TRICKY TRAVERSE
-PETER QUICK, KEITH ORTIZ   -  2-15-81
-This File has Crumps test connected.  11/20/12
- *
-FT C  DD    A
-      AE20     0                          1  3  0  2
-*      %FS
-*     AE20     0        0        0        Bug-can't put before so put after-so can't make 2 fixed 10/28/12
- AE19 AE20   9.3    60.0  60.0-36.0       2 12  0 20
- AE18 AE19  24.5     0.0   0.0-90.0       6 10 25  0
- AE17 AE18   8.0   350.5 350.5 17.0       3  5  0  0
- AE16 AE17   6.7     0.0   0.0-90.0       3  5  6  1
- AE15 AE16  12.6    70.5  71.0-18.0       4  0  2  1
- AE14 AE15  10.0    21.5  20.0  6.0       5  5  0  3
- AE13 AE14  26.8   288.0 286.0-50.0       0  7 20  5
-*
-*SHORT CANYON AT THE BASE OF THE SECOND DROP
- AE12 AE13  20.7   236.0 236.0 34.0       3  5  4  4
- AE11 AE12  12.4   210.0 210.0 35.0       7  4  5  1
- AE10 AE13  25.7    40.0  40.0 -9.0       2  2  3  6
-*
-*AE10 AT JOE'S " I LOVE MY WIFE TRAVERSE "
-  AE9 AE10  17.8    32.5  31.0 23.0       4  5 20 15
-  AE1  AE9  13.7    82.0  82.0-13.0
-   A1  AE1  34.3    46.0  48.0-17.5
-*
-*SURVEY TO DOME NEAR THE ENTRANCE DOME (ABOVE THE SECOND DROP)
-  AD1 AE15   8.0   200.0 200.0  0.0       3  1  1  1
-  AD2  AD1  17.7   161.0 161.0  7.0       1  4 25  1
-  AD3  AD2  10.4   180.0 180.0 50.0       4  1 15  5
- *
-TRICKY TRAVERSE AND THEN FIRST SURVEY IN UPPER CROWLWAY
-DAN CROWL, KEITH ORTIZ, CHIP HOPPER, PETER QUICK, LARRY BEAN    14 FEB 1981
- *
-FI B  DD
-   A2   A1  48 10  292.0 110.0-42.0       5 10 35  5
-   A3   A2  12  5  333.5 153.5 35.0       3  1 15  5
-   A4   A3   4  2    0.0   0.0 90.0       3  1 10 10
-...</pre>
- *
- */
+   * Parses a raw cdata.fr survey file.  These look like so:
+   *
+  <pre>      Fisher Ridge Cave System, Hart Co., KY
+  ENTRANCE DROPS, JOE'S "I LOVE MY WIFE TRAVERSE", TRICKY TRAVERSE
+  PETER QUICK, KEITH ORTIZ   -  2-15-81
+  This File has Crumps test connected.  11/20/12
+  *
+  FT C  DD    A
+        AE20     0                          1  3  0  2
+  *      %FS
+  *     AE20     0        0        0        Bug-can't put before so put after-so can't make 2 fixed 10/28/12
+  AE19 AE20   9.3    60.0  60.0-36.0       2 12  0 20
+  AE18 AE19  24.5     0.0   0.0-90.0       6 10 25  0
+  AE17 AE18   8.0   350.5 350.5 17.0       3  5  0  0
+  AE16 AE17   6.7     0.0   0.0-90.0       3  5  6  1
+  AE15 AE16  12.6    70.5  71.0-18.0       4  0  2  1
+  AE14 AE15  10.0    21.5  20.0  6.0       5  5  0  3
+  AE13 AE14  26.8   288.0 286.0-50.0       0  7 20  5
+  *
+  *SHORT CANYON AT THE BASE OF THE SECOND DROP
+  AE12 AE13  20.7   236.0 236.0 34.0       3  5  4  4
+  AE11 AE12  12.4   210.0 210.0 35.0       7  4  5  1
+  AE10 AE13  25.7    40.0  40.0 -9.0       2  2  3  6
+  *
+  *AE10 AT JOE'S " I LOVE MY WIFE TRAVERSE "
+    AE9 AE10  17.8    32.5  31.0 23.0       4  5 20 15
+    AE1  AE9  13.7    82.0  82.0-13.0
+    A1  AE1  34.3    46.0  48.0-17.5
+  *
+  *SURVEY TO DOME NEAR THE ENTRANCE DOME (ABOVE THE SECOND DROP)
+    AD1 AE15   8.0   200.0 200.0  0.0       3  1  1  1
+    AD2  AD1  17.7   161.0 161.0  7.0       1  4 25  1
+    AD3  AD2  10.4   180.0 180.0 50.0       4  1 15  5
+  *
+  TRICKY TRAVERSE AND THEN FIRST SURVEY IN UPPER CROWLWAY
+  DAN CROWL, KEITH ORTIZ, CHIP HOPPER, PETER QUICK, LARRY BEAN    14 FEB 1981
+  *
+  FI B  DD
+    A2   A1  48 10  292.0 110.0-42.0       5 10 35  5
+    A3   A2  12  5  333.5 153.5 35.0       3  1 15  5
+    A4   A3   4  2    0.0   0.0 90.0       3  1 10 10
+  ...</pre>
+  *
+  */
 function parseFrcsSurveyFile(_x, _x2) {
   return _parseFrcsSurveyFile.apply(this, arguments);
 }
@@ -167,14 +208,55 @@ 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 _ref,
+      _ref$columns,
+      columns,
+      ranges,
+      maxRange,
+      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,
+      began,
+      _iteratorAbruptCompletion,
+      _didIteratorError,
+      _iteratorError,
+      _loop,
+      _ret,
+      _iterator,
+      _step,
+      _args2 = arguments;
     return _regenerator["default"].wrap(function _callee$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           getComment = function _getComment() {
-            if (!commentLines) return null;
+            if (!(commentLines !== null && commentLines !== void 0 && commentLines.length)) return null;
             var comment = commentLines.join('\n').trim();
-            commentLines = null;
+            commentLines.length = 0;
             return comment || null;
           };
           addCommentLine = function _addCommentLine(comment) {
@@ -190,6 +272,11 @@ function _parseFrcsSurveyFile() {
               commentLines.push(comment);
             }
           };
+          _ref = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : {}, _ref$columns = _ref.columns, columns = _ref$columns === void 0 ? _FrcsSurveyFile.defaultFrcsShotColumnConfig : _ref$columns;
+          ranges = getColumnRanges(columns);
+          maxRange = Math.max.apply(Math, (0, _toConsumableArray2["default"])(Object.values(ranges).map(function (r) {
+            return r[1];
+          })));
           cave = null;
           location = null;
           trips = [];
@@ -198,79 +285,201 @@ function _parseFrcsSurveyFile() {
           tripCommentStartLine = 1;
           tripCommentEndLine = -1;
           tripComment = [];
-          commentLines = null;
+          commentLines = [];
           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);
+          };
+          began = false;
           _iteratorAbruptCompletion = false;
           _didIteratorError = false;
-          _context2.prev = 17;
+          _context2.prev = 27;
           _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, _match$k, k, team, dateMatch, month, day, year, _match2, _line, _line2, _line3, _line4, _ref2, distanceUnit, _ref3, 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, _line5, _line6, feetStr, inchesStr, invalid, offset, exclude, _line7, _line8, _feetStr, _exclude, 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);
-                    if (match) {
-                      cave = match[1].trim();
-                      if (match[3]) {
-                        location = match[3].trim();
-                      }
+                  if (began) {
+                    _context.next = 10;
+                    break;
+                  }
+                  if (!/^\s+\*/.test(line)) {
+                    _context.next = 7;
+                    break;
+                  }
+                  lineNumber++;
+                  return _context.abrupt("return", 0);
+                case 7:
+                  began = true;
+                  match = /^\s*([^,]+)(,(.*))?/.exec(line);
+                  if (match) {
+                    cave = match[1].trim();
+                    if (match[3]) {
+                      location = match[3].trim();
                     }
                   }
-                  if (!(line.charAt(0) === ' ' && line.charAt(1) === '*')) {
-                    _context.next = 12;
+                case 10:
+                  if (!unitsChanged) {
+                    _context.next = 16;
+                    break;
+                  }
+                  unitsChanged = false;
+                  alternateUnits = parseUnits();
+                  nextShotUnits = alternateUnits;
+                  _context.next = 113;
+                  break;
+                case 16:
+                  if (!/^\s{1,8}\*/.test(line)) {
+                    _context.next = 23;
                     break;
                   }
                   inTripComment = !inTripComment;
+                  alternateUnits = nextShotUnits = undefined;
+                  unitsChanged = false;
                   if (inTripComment) {
                     section = undefined;
-                    tripComment = [];
+                    tripTeam = undefined;
+                    tripDate = undefined;
+                    tripComment.length = 0;
                     tripCommentStartLine = lineNumber;
                   } else {
                     tripCommentEndLine = lineNumber;
                   }
-                  _context.next = 109;
+                  _context.next = 113;
                   break;
-                case 12:
+                case 23:
                   if (!inTripComment) {
-                    _context.next = 18;
+                    _context.next = 29;
                     break;
                   }
                   if (lineNumber === tripCommentStartLine + 1) {
                     tripName = line && line.trim();
                   } else if (lineNumber === tripCommentStartLine + 2) {
-                    _match = /^(.+?)\s*[-.]\s*(\d+)\/(\d+)\/(\d+)$/.exec(line && line.trim());
+                    _match = /^(.+?,.+?)\s*(?:[-.](.*))?$/.exec(line && line.trim());
                     if (_match) {
                       k = 1;
                       team = _match[k++];
-                      month = parseInt(_match[k++]);
-                      day = parseInt(_match[k++]);
-                      year = parseInt(_match[k++]);
-                      tripDate = new Date(year < 70 ? year + 2000 : year, month - 1, day);
                       tripTeam = team.split(team.indexOf(';') >= 0 ? /\s*;\s*/g : /\s*,\s*/g);
+                      dateMatch = /^(\d+)[-/](\d+)[-/](\d+)$/.exec((_match$k = _match[k++]) === null || _match$k === void 0 ? void 0 : _match$k.trim());
+                      if (dateMatch) {
+                        month = parseInt(dateMatch[1]);
+                        day = parseInt(dateMatch[2]);
+                        year = parseInt(dateMatch[3]);
+                        tripDate = new Date(year < 70 ? year + 2000 : year, month - 1, day);
+                      }
                     }
                   } else if (lineNumber > 1) {
                     tripComment.push(line);
@@ -279,129 +488,106 @@ function _parseFrcsSurveyFile() {
                   if (_match2) {
                     section = _match2[1].trim();
                   }
-                  _context.next = 109;
+                  _context.next = 113;
                   break;
-                case 18:
-                  if (!(line.charAt(0) === '*')) {
-                    _context.next = 23;
+                case 29:
+                  if (!/^(\s{9,}|)\*/.test(line)) {
+                    _context.next = 36;
                     break;
                   }
-                  inBlockComment = !inBlockComment;
-                  if (inBlockComment) commentLines = [];else {
-                    part = line.substring(1);
-                    if (part) addCommentLine(part);
+                  if (/^\*\s*%NC(\b|$)/.test(line)) {
+                    unitsChanged = true;
+                  }
+                  if (!/^\*\s*%/.test(line)) {
+                    _context.next = 33;
+                    break;
                   }
-                  _context.next = 109;
+                  return _context.abrupt("return", 0);
+                case 33:
+                  if (/[^\s*]/.test(line)) {
+                    addCommentLine(line.replace(/^\s*\*/, ''));
+                    inBlockComment = false;
+                  } else {
+                    inBlockComment = !inBlockComment;
+                    if (inBlockComment) commentLines.length = 0;
+                  }
+                  _context.next = 113;
                   break;
-                case 23:
+                case 36:
                   if (!inBlockComment) {
-                    _context.next = 27;
+                    _context.next = 40;
                     break;
                   }
                   addCommentLine(line);
-                  _context.next = 109;
+                  _context.next = 113;
                   break;
-                case 27:
+                case 40:
                   if (!(lineNumber === tripCommentEndLine + 1)) {
-                    _context.next = 44;
+                    _context.next = 45;
                     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 = 113;
                   break;
-                case 44:
+                case 45:
                   if (!trip) {
-                    _context.next = 109;
+                    _context.next = 113;
                     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;
+                  _ref2 = alternateUnits || trip.header, distanceUnit = _ref2.distanceUnit;
+                  _ref3 = alternateUnits || trip.header, azimuthUnit = _ref3.azimuthUnit, inclinationUnit = _ref3.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
                   // not properly delimited.
 
                   // from station name
-                  if (/\S/.test(line.substring(5, 10))) {
-                    _context.next = 51;
+                  if (/\S/.test((_line = line).substring.apply(_line, (0, _toConsumableArray2["default"])(ranges.fromStation)))) {
+                    _context.next = 52;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 51:
-                  fromStr = validate(5, 10, 'from station', isValidStation);
+                case 52:
+                  fromStr = validate.apply(void 0, (0, _toConsumableArray2["default"])(ranges.fromStation).concat(['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
                   // isValidOptFloat instead of isValidOptUFloat
-                  lStr = validate(40, 43, 'left', isValidOptFloat);
-                  rStr = validate(43, 46, 'right', isValidOptFloat);
-                  uStr = validate(46, 49, 'up', isValidOptFloat);
-                  dStr = validate(49, 52, 'down', isValidOptFloat);
+                  lStr = validate.apply(void 0, (0, _toConsumableArray2["default"])(ranges.left).concat(['left', isValidOptFloat]));
+                  rStr = validate.apply(void 0, (0, _toConsumableArray2["default"])(ranges.right).concat(['right', isValidOptFloat]));
+                  uStr = validate.apply(void 0, (0, _toConsumableArray2["default"])(ranges.up).concat(['up', isValidOptFloat]));
+                  dStr = validate.apply(void 0, (0, _toConsumableArray2["default"])(ranges.down).concat(['down', isValidOptFloat]));
                   if (!errored) {
-                    _context.next = 59;
+                    _context.next = 60;
                     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
-                  toStr = line.substring(0, 5);
+                case 60:
+                  up = parseLrud(uStr, distanceUnit);
+                  down = parseLrud(dStr, distanceUnit);
+                  left = parseLrud(lStr, distanceUnit);
+                  right = parseLrud(rStr, distanceUnit); // to station name
+                  toStr = (_line2 = line).substring.apply(_line2, (0, _toConsumableArray2["default"])(ranges.toStation));
                   if (toStr.trim()) {
-                    _context.next = 68;
+                    _context.next = 69;
                     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,20 +601,20 @@ function _parseFrcsSurveyFile() {
                     excludeDistance: true,
                     comment: getComment()
                   };
-                  shots.push(_shot);
+                  addShot(_shot);
                   return _context.abrupt("return", 0);
-                case 68:
+                case 69:
                   if (!isValidStation(toStr)) {
-                    error('Invalid station name', 0, 5);
+                    error.apply(void 0, ['Invalid station name'].concat((0, _toConsumableArray2["default"])(ranges.toStation)));
                   }
                   fromLruds = commentFromStationLruds.get(from);
                   if (fromLruds) {
                     commentFromStationLruds["delete"](from);
                   } else {
-                    fromLrudMatch = new RegExp("^\\s+".concat(fromStr.trim().replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), "((\\s+(\\d+(\\.\\d*)?|\\.\\d+)){4})")).exec(line.substring(52));
+                    fromLrudMatch = new RegExp("^\\s+".concat(fromStr.trim().replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), "((\\s+(\\d+(\\.\\d*)?|\\.\\d+)){4})")).exec(line.substring(maxRange));
                     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,
@@ -439,52 +625,54 @@ function _parseFrcsSurveyFile() {
                     }
                   }
                   comment = getComment(); // azimuth and inclination
-                  azmFsStr = validate(19, 25, 'azimuth', isValidOptUFloat);
-                  azmBsStr = validate(25, 30, 'azimuth', isValidOptUFloat);
-                  incFsStr = line.substring(30, 35);
-                  incBsStr = line.substring(35, 40);
+                  azmFsStr = validate.apply(void 0, (0, _toConsumableArray2["default"])(ranges.frontsightAzimuth).concat(['azimuth', isValidOptUFloat]));
+                  azmBsStr = validate.apply(void 0, (0, _toConsumableArray2["default"])(ranges.backsightAzimuth).concat(['azimuth', isValidOptUFloat]));
+                  incFsStr = (_line3 = line).substring.apply(_line3, (0, _toConsumableArray2["default"])(ranges.frontsightInclination));
+                  incBsStr = (_line4 = line).substring.apply(_line4, (0, _toConsumableArray2["default"])(ranges.backsightInclination));
                   if (!errored) {
-                    _context.next = 78;
+                    _context.next = 79;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 78:
+                case 79:
                   if (!inches) {
-                    _context.next = 91;
+                    _context.next = 94;
                     break;
                   }
-                  feetStr = line.substring(10, 14);
-                  inchesStr = line.substring(14, 17); // feet and inches are not both optional
+                  feetStr = (_line5 = line).substring.apply(_line5, (0, _toConsumableArray2["default"])(ranges.distanceFeet));
+                  inchesStr = (_line6 = line).substring.apply(_line6, (0, _toConsumableArray2["default"])(ranges.distanceInches)); // feet and inches are not both optional
                   if (!(!isValidUInt(feetStr) && !isValidUInt(inchesStr))) {
-                    _context.next = 85;
+                    _context.next = 86;
                     break;
                   }
                   invalid = feetStr.trim() || inchesStr.trim();
-                  error(invalid ? 'Invalid distance' : 'Missing distance', 10, 17);
+                  error(invalid ? 'Invalid distance' : 'Missing distance', ranges.distanceFeet[0], ranges.distanceInches[1]);
                   return _context.abrupt("return", 0);
-                case 85:
+                case 86:
                   // 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));
-                  kind = parseKind(line[17]);
-                  // NOTE there are two columns around here that can contain a *.
+                  offset = ranges.kind[0] === ranges.distance[1] ? ranges.distanceInches[1] - ranges.distance[1] : 0;
+                  kind = parseKind(line.substring(ranges.kind[0] + offset, ranges.kind[1] + offset).trim());
+                  exclude = line.substring(ranges.exclude[0] + offset, ranges.exclude[1] + offset).trim(); // NOTE there are two columns around here that can contain a *.
                   // I think they might represent different values, but thisis confused by
                   // the fact that for ft/in shots, if there is a D or H flag it occupies the
                   // first column that can contain a * for decimal feet shots
-                  excludeDistance = line[18] === '*' || line[18] === 's';
-                  isSplay = line[18] === 's';
-                  _context.next = 96;
+                  excludeDistance = exclude === '*' || exclude === 's';
+                  isSplay = exclude === 's';
+                  _context.next = 100;
                   break;
-                case 91:
+                case 94:
                   // decimal feet are not optional
-                  _feetStr = validate(10, 16, 'distance', isValidUFloat);
-                  distance = new _unitized.UnitizedNumber(parseFloat(_feetStr), _distanceUnit);
-                  kind = parseKind(line[16]);
-                  excludeDistance = line[17] === '*' || line[17] === 's';
-                  isSplay = line[17] === 's';
-                case 96:
+                  _feetStr = validate.apply(void 0, (0, _toConsumableArray2["default"])(ranges.distance).concat(['distance', isValidUFloat]));
+                  distance = new _unitized.UnitizedNumber(parseFloat(_feetStr), distanceUnit);
+                  kind = parseKind((_line7 = line).substring.apply(_line7, (0, _toConsumableArray2["default"])(ranges.kind)).trim());
+                  _exclude = (_line8 = line).substring.apply(_line8, (0, _toConsumableArray2["default"])(ranges.exclude)).trim();
+                  excludeDistance = _exclude === '*' || _exclude === 's';
+                  isSplay = _exclude === 's';
+                case 100:
                   if (kind !== _FrcsShot.FrcsShotKind.Normal) {
-                    validate(30, 35, 'vertical-distance', isValidFloat);
+                    validate.apply(void 0, (0, _toConsumableArray2["default"])(ranges.frontsightInclination).concat(['vertical-distance', isValidFloat]));
                   }
 
                   // convert horizontal and diagonal shots to standard
@@ -494,35 +682,35 @@ 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 {
                     // frontsight inclination
-                    validate(30, 35, 'inclination', isValidOptInclination);
-                    // frontsight inclination
-                    validate(35, 40, 'inclination', isValidOptInclination);
-                    frontsightInclination = parseNumber(incFsStr, _inclinationUnit);
-                    backsightInclination = parseNumber(incBsStr, _inclinationUnit);
+                    validate.apply(void 0, (0, _toConsumableArray2["default"])(ranges.frontsightInclination).concat(['inclination', isValidOptInclination]));
+                    // backsight inclination
+                    validate.apply(void 0, (0, _toConsumableArray2["default"])(ranges.backsightInclination).concat(['inclination', isValidOptInclination]));
+                    frontsightInclination = parseNumber(incFsStr, inclinationUnit);
+                    backsightInclination = parseNumber(incBsStr, inclinationUnit);
                   }
                   if (!errored) {
-                    _context.next = 100;
+                    _context.next = 104;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 100:
-                  frontsightAzimuth = parseAzimuth(azmFsStr, _azimuthUnit);
-                  backsightAzimuth = parseAzimuth(azmBsStr, _azimuthUnit);
+                case 104:
+                  frontsightAzimuth = parseAzimuth(azmFsStr, azimuthUnit);
+                  backsightAzimuth = parseAzimuth(azmBsStr, azimuthUnit);
                   if (!frontsightInclination && !backsightInclination) {
                     frontsightInclination = _unitized.Unitize.degrees(0);
                   }
@@ -548,74 +736,75 @@ 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 113:
                 case "end":
                   return _context.stop();
               }
             }, _loop);
           });
           _iterator = _asyncIterator(lines);
-        case 20:
-          _context2.next = 22;
+        case 30:
+          _context2.next = 32;
           return _iterator.next();
-        case 22:
+        case 32:
           if (!(_iteratorAbruptCompletion = !(_step = _context2.sent).done)) {
-            _context2.next = 30;
+            _context2.next = 40;
             break;
           }
-          return _context2.delegateYield(_loop(), "t0", 24);
-        case 24:
+          return _context2.delegateYield(_loop(), "t0", 34);
+        case 34:
           _ret = _context2.t0;
           if (!(_ret === 0)) {
-            _context2.next = 27;
+            _context2.next = 37;
             break;
           }
-          return _context2.abrupt("continue", 27);
-        case 27:
+          return _context2.abrupt("continue", 37);
+        case 37:
           _iteratorAbruptCompletion = false;
-          _context2.next = 20;
+          _context2.next = 30;
           break;
-        case 30:
-          _context2.next = 36;
+        case 40:
+          _context2.next = 46;
           break;
-        case 32:
-          _context2.prev = 32;
-          _context2.t1 = _context2["catch"](17);
+        case 42:
+          _context2.prev = 42;
+          _context2.t1 = _context2["catch"](27);
           _didIteratorError = true;
           _iteratorError = _context2.t1;
-        case 36:
-          _context2.prev = 36;
-          _context2.prev = 37;
+        case 46:
+          _context2.prev = 46;
+          _context2.prev = 47;
           if (!(_iteratorAbruptCompletion && _iterator["return"] != null)) {
-            _context2.next = 41;
+            _context2.next = 51;
             break;
           }
-          _context2.next = 41;
+          _context2.next = 51;
           return _iterator["return"]();
-        case 41:
-          _context2.prev = 41;
+        case 51:
+          _context2.prev = 51;
           if (!_didIteratorError) {
-            _context2.next = 44;
+            _context2.next = 54;
             break;
           }
           throw _iteratorError;
-        case 44:
-          return _context2.finish(41);
-        case 45:
-          return _context2.finish(36);
-        case 46:
+        case 54:
+          return _context2.finish(51);
+        case 55:
+          return _context2.finish(46);
+        case 56:
           return _context2.abrupt("return", {
             cave: cave,
+            columns: columns,
             location: location,
             trips: trips,
             errors: errors
           });
-        case 47:
+        case 57:
         case "end":
           return _context2.stop();
       }
-    }, _callee, null, [[17, 32, 36, 46], [37,, 41, 45]]);
+    }, _callee, null, [[27, 42, 46, 56], [47,, 51, 55]]);
   }));
   return _parseFrcsSurveyFile.apply(this, arguments);
 }