@speleotica/frcsdata 4.1.1 → 4.3.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/FrcsSurveyFile.d.ts

@@ -2,8 +2,27 @@ import { FrcsTrip } from './FrcsTrip';
 import { SegmentParseError } from 'parse-segment';
 export type FrcsSurveyFile = {
     cave?: string | null;
+    columns?: FrcsShotColumnConfig;
     location?: string | null;
     comment?: string | null;
     trips: Array<FrcsTrip>;
     errors?: Array<SegmentParseError> | null;
 };
+export type FrcsShotColumnConfig = {
+    toStation: number;
+    fromStation: number;
+    distance: number;
+    distanceFeet: number;
+    distanceInches: number;
+    kind: number;
+    exclude: number;
+    frontsightAzimuth: number;
+    backsightAzimuth: number;
+    frontsightInclination: number;
+    backsightInclination: number;
+    left: number;
+    right: number;
+    up: number;
+    down: number;
+};
+export declare const defaultFrcsShotColumnConfig: FrcsShotColumnConfig;

package/FrcsSurveyFile.js

@@ -2,4 +2,22 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
+});
+exports.defaultFrcsShotColumnConfig = void 0;
+var defaultFrcsShotColumnConfig = exports.defaultFrcsShotColumnConfig = {
+  toStation: 5,
+  fromStation: 5,
+  distance: 6,
+  distanceFeet: 4,
+  distanceInches: 3,
+  kind: 1,
+  exclude: 1,
+  frontsightAzimuth: 6,
+  backsightAzimuth: 6,
+  frontsightInclination: 5,
+  backsightInclination: 5,
+  left: 3,
+  right: 3,
+  up: 3,
+  down: 3
+};

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/formatFrcsShot.d.ts

@@ -1,3 +1,8 @@
-import { FrcsTripHeader } from './FrcsTrip';
+import { FrcsUnits } from './FrcsTrip';
 import { FrcsShot } from './FrcsShot';
-export default function formatFrcsShot(shot: FrcsShot, header: FrcsTripHeader): string;
+import { FrcsShotColumnConfig } from './FrcsSurveyFile';
+export declare function makeFormatFrcsShot({ columns, }?: {
+    columns?: FrcsShotColumnConfig;
+}): (shot: FrcsShot, header: FrcsUnits) => string;
+declare const _default: (shot: FrcsShot, header: FrcsUnits) => string;
+export default _default;

package/formatFrcsShot.js

@@ -3,71 +3,94 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = formatFrcsShot;
+exports["default"] = void 0;
+exports.makeFormatFrcsShot = makeFormatFrcsShot;
 var _FrcsShot = require("./FrcsShot.js");
 var _unitized = require("@speleotica/unitized");
-var STATION_WIDTH = 5;
-var EMPTY_STATION = ' '.repeat(STATION_WIDTH);
-function formatStation(station) {
-  if (station.length > STATION_WIDTH) {
-    throw new Error("station is too long: ".concat(station));
+var _FrcsSurveyFile = require("./FrcsSurveyFile.js");
+function makeFormatFrcsShot() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    _ref$columns = _ref.columns,
+    columns = _ref$columns === void 0 ? _FrcsSurveyFile.defaultFrcsShotColumnConfig : _ref$columns;
+  var EMPTY_TO_STATION = ' '.repeat(columns.toStation);
+  function formatFromStation(station) {
+    if (station.length > columns.fromStation) {
+      throw new Error("station is too long: ".concat(station));
+    }
+    return station.padStart(columns.fromStation, ' ');
   }
-  return station.padStart(STATION_WIDTH, ' ');
-}
-function trimZeroes(str) {
-  var match = /(-?\d+)(\.[1-9]*)0+$/.exec(str);
-  if (!match) return str;
-  return match[2].length > 1 ? match[1] + match[2] : match[1];
-}
-var formatNumber = function formatNumber(width) {
-  return function (num) {
-    if (num == null || !Number.isFinite(num)) return ' '.repeat(width);
-    var formatted = trimZeroes(num.toFixed(2));
-    if (formatted.length <= width) return formatted.padStart(width, ' ');
-    if (formatted.length > width + 2) return formatted.substring(0, width);
-    return trimZeroes(num.toFixed(2 - formatted.length + width)).padStart(width, ' ');
+  function formatToStation(station) {
+    if (station.length > columns.toStation) {
+      throw new Error("station is too long: ".concat(station));
+    }
+    return station.padStart(columns.toStation, ' ');
+  }
+  function trimZeroes(str) {
+    var match = /(-?\d+)(\.[1-9]*)0+$/.exec(str);
+    if (!match) return str;
+    return match[2].length > 1 ? match[1] + match[2] : match[1];
+  }
+  var formatNumber = function formatNumber(width) {
+    function formatNum(num, unit, verbatim) {
+      if (num instanceof _unitized.UnitizedNumber) {
+        return formatNum(num.get(verbatim ? num.unit : unit || num.unit));
+      }
+      if (num == null || !Number.isFinite(num)) return ' '.repeat(width);
+      var formatted = trimZeroes(num.toFixed(2));
+      if (formatted.length <= width) return formatted.padStart(width, ' ');
+      if (formatted.length > width + 2) return formatted.substring(0, width);
+      return trimZeroes(num.toFixed(2 - formatted.length + width)).padStart(width, ' ');
+    }
+    return formatNum;
   };
-};
-var LRUD_WIDTH = 3;
-var formatLrud = formatNumber(LRUD_WIDTH);
-var DISTANCE_WIDTH = 6;
-var EMPTY_DISTANCE = ' '.repeat(DISTANCE_WIDTH);
-var formatDistance = formatNumber(DISTANCE_WIDTH);
-var AZIMUTH_WIDTH = 6;
-var EMPTY_AZIMUTH = ' '.repeat(AZIMUTH_WIDTH);
-var formatAzimuth = formatNumber(AZIMUTH_WIDTH);
-var INCLINATION_WIDTH = 5;
-var EMPTY_INCLINATION = ' '.repeat(INCLINATION_WIDTH);
-var formatInclination = formatNumber(INCLINATION_WIDTH);
-var formatVerticalDistance = formatNumber(INCLINATION_WIDTH);
-var FEET_WIDTH = 4;
-var EMPTY_FEET = ' '.repeat(FEET_WIDTH);
-function formatFeet(distance) {
-  if (!distance) return EMPTY_FEET;
-  return formatNumber(FEET_WIDTH)(Math.trunc(distance.get(_unitized.Length.feet)));
-}
-var INCHES_WIDTH = 3;
-var EMPTY_INCHES = ' '.repeat(INCHES_WIDTH);
-function formatInches(distance) {
-  if (!distance) return EMPTY_INCHES;
-  return formatNumber(INCHES_WIDTH)(Math.round(distance.get(_unitized.Length.inches) % 12));
-}
-function formatFrcsShot(shot, header) {
-  var _shot$frontsightAzimu, _shot$backsightAzimut, _shot$frontsightIncli, _shot$verticalDistanc, _shot$backsightInclin, _shot$toLruds, _shot$toLruds2, _shot$toLruds3, _shot$toLruds4;
-  var azimuthUnit = header.azimuthUnit,
-    inclinationUnit = header.inclinationUnit;
-  var distanceUnit = header.distanceUnit;
-  var inches = distanceUnit === _unitized.Length.inches;
-  if (inches) distanceUnit = _unitized.Length.feet;
-  if (!shot.to) {
-    var _shot$fromLruds, _shot$fromLruds2, _shot$fromLruds3, _shot$fromLruds4;
-    return [formatStation(shot.from), EMPTY_STATION, EMPTY_DISTANCE, ' ',
-    // kind
-    ' ',
-    // exclude
-    EMPTY_AZIMUTH, EMPTY_AZIMUTH, EMPTY_INCLINATION, EMPTY_INCLINATION, formatLrud((_shot$fromLruds = shot.fromLruds) === null || _shot$fromLruds === void 0 || (_shot$fromLruds = _shot$fromLruds.left) === null || _shot$fromLruds === void 0 ? void 0 : _shot$fromLruds.get(distanceUnit)), formatLrud((_shot$fromLruds2 = shot.fromLruds) === null || _shot$fromLruds2 === void 0 || (_shot$fromLruds2 = _shot$fromLruds2.right) === null || _shot$fromLruds2 === void 0 ? void 0 : _shot$fromLruds2.get(distanceUnit)), formatLrud((_shot$fromLruds3 = shot.fromLruds) === null || _shot$fromLruds3 === void 0 || (_shot$fromLruds3 = _shot$fromLruds3.up) === null || _shot$fromLruds3 === void 0 ? void 0 : _shot$fromLruds3.get(distanceUnit)), formatLrud((_shot$fromLruds4 = shot.fromLruds) === null || _shot$fromLruds4 === void 0 || (_shot$fromLruds4 = _shot$fromLruds4.down) === null || _shot$fromLruds4 === void 0 ? void 0 : _shot$fromLruds4.get(distanceUnit))].join('');
+  var formatLeft = formatNumber(columns.left);
+  var formatRight = formatNumber(columns.right);
+  var formatUp = formatNumber(columns.up);
+  var formatDown = formatNumber(columns.down);
+  var EMPTY_DISTANCE = ' '.repeat(columns.distance);
+  var formatDistance = formatNumber(columns.distance);
+  var EMPTY_FS_AZIMUTH = ' '.repeat(columns.frontsightAzimuth);
+  var formatFsAzimuth = formatNumber(columns.frontsightAzimuth);
+  var EMPTY_BS_AZIMUTH = ' '.repeat(columns.backsightAzimuth);
+  var formatBsAzimuth = formatNumber(columns.backsightAzimuth);
+  var EMPTY_FS_INCLINATION = ' '.repeat(columns.frontsightInclination);
+  var formatFsInclination = formatNumber(columns.frontsightInclination);
+  var EMPTY_BS_INCLINATION = ' '.repeat(columns.backsightInclination);
+  var formatBsInclination = formatNumber(columns.backsightInclination);
+  var formatVerticalDistance = formatNumber(columns.frontsightInclination);
+  var EMPTY_FEET = ' '.repeat(columns.distanceFeet);
+  function formatFeet(distance) {
+    if (!distance) return EMPTY_FEET;
+    return formatNumber(columns.distanceFeet)(Math.trunc(distance.get(_unitized.Length.feet)));
   }
-  var distColumnValue = shot.kind === _FrcsShot.FrcsShotKind.Horizontal ? shot.horizontalDistance : shot.distance;
-  return [formatStation(shot.to), formatStation(shot.from), inches ? formatFeet(distColumnValue) : formatDistance(distColumnValue === null || distColumnValue === void 0 ? void 0 : distColumnValue.get(distanceUnit)), inches ? formatInches(distColumnValue) : shot.kind, inches ? shot.kind : shot.excludeDistance ? '*' : ' ', formatAzimuth((_shot$frontsightAzimu = shot.frontsightAzimuth) === null || _shot$frontsightAzimu === void 0 ? void 0 : _shot$frontsightAzimu.get(azimuthUnit)), formatAzimuth((_shot$backsightAzimut = shot.backsightAzimuth) === null || _shot$backsightAzimut === void 0 ? void 0 : _shot$backsightAzimut.get(azimuthUnit)), shot.kind === _FrcsShot.FrcsShotKind.Normal ? formatInclination((_shot$frontsightIncli = shot.frontsightInclination) === null || _shot$frontsightIncli === void 0 ? void 0 : _shot$frontsightIncli.get(inclinationUnit)) : formatVerticalDistance((_shot$verticalDistanc = shot.verticalDistance) === null || _shot$verticalDistanc === void 0 ? void 0 : _shot$verticalDistanc.get(distanceUnit)), shot.kind === _FrcsShot.FrcsShotKind.Normal ? formatInclination((_shot$backsightInclin = shot.backsightInclination) === null || _shot$backsightInclin === void 0 ? void 0 : _shot$backsightInclin.get(inclinationUnit)) : EMPTY_INCLINATION, formatLrud((_shot$toLruds = shot.toLruds) === null || _shot$toLruds === void 0 || (_shot$toLruds = _shot$toLruds.left) === null || _shot$toLruds === void 0 ? void 0 : _shot$toLruds.get(distanceUnit)), formatLrud((_shot$toLruds2 = shot.toLruds) === null || _shot$toLruds2 === void 0 || (_shot$toLruds2 = _shot$toLruds2.right) === null || _shot$toLruds2 === void 0 ? void 0 : _shot$toLruds2.get(distanceUnit)), formatLrud((_shot$toLruds3 = shot.toLruds) === null || _shot$toLruds3 === void 0 || (_shot$toLruds3 = _shot$toLruds3.up) === null || _shot$toLruds3 === void 0 ? void 0 : _shot$toLruds3.get(distanceUnit)), formatLrud((_shot$toLruds4 = shot.toLruds) === null || _shot$toLruds4 === void 0 || (_shot$toLruds4 = _shot$toLruds4.down) === null || _shot$toLruds4 === void 0 ? void 0 : _shot$toLruds4.get(distanceUnit))].join('');
+  var EMPTY_INCHES = ' '.repeat(columns.distanceInches);
+  function formatInches(distance) {
+    if (!distance) return EMPTY_INCHES;
+    return formatNumber(columns.distanceInches)(Math.round(distance.get(_unitized.Length.inches) % 12));
+  }
+  return function formatFrcsShot(shot, header) {
+    var _shot$toLruds, _shot$toLruds2, _shot$toLruds3, _shot$toLruds4;
+    var azimuthUnit = header.azimuthUnit,
+      inclinationUnit = header.inclinationUnit;
+    var distanceUnit = header.distanceUnit;
+    var inches = distanceUnit === _unitized.Length.inches;
+    if (inches) distanceUnit = _unitized.Length.feet;
+    var isRecorded = shot.recorded !== null;
+    if (!shot.to) {
+      var _shot$recorded;
+      var _ref2 = ((_shot$recorded = shot.recorded) === null || _shot$recorded === void 0 ? void 0 : _shot$recorded.fromLruds) || shot.fromLruds || {},
+        left = _ref2.left,
+        right = _ref2.right,
+        up = _ref2.up,
+        down = _ref2.down;
+      return [EMPTY_TO_STATION, formatFromStation(shot.from), EMPTY_DISTANCE, ' ',
+      // kind
+      ' ',
+      // exclude
+      EMPTY_FS_AZIMUTH, EMPTY_BS_AZIMUTH, EMPTY_FS_INCLINATION, EMPTY_BS_INCLINATION, formatLeft(left, distanceUnit, isRecorded), formatRight(right, distanceUnit, isRecorded), formatUp(up, distanceUnit, isRecorded), formatDown(down, distanceUnit, isRecorded)].join('');
+    }
+    var distColumnValue = shot.kind === _FrcsShot.FrcsShotKind.Horizontal ? shot.horizontalDistance : shot.distance;
+    return [formatToStation(shot.to), formatFromStation(shot.from), inches ? formatFeet(distColumnValue) : formatDistance(distColumnValue, distanceUnit, isRecorded), inches ? formatInches(distColumnValue) : shot.kind, inches ? shot.kind : shot.excludeDistance ? '*' : ' ', formatFsAzimuth(shot.frontsightAzimuth, azimuthUnit, isRecorded), formatBsAzimuth(shot.backsightAzimuth, azimuthUnit, isRecorded), shot.kind === _FrcsShot.FrcsShotKind.Normal ? formatFsInclination(shot.frontsightInclination, inclinationUnit, isRecorded) : formatVerticalDistance(shot.verticalDistance, distanceUnit, isRecorded), shot.kind === _FrcsShot.FrcsShotKind.Normal ? formatBsInclination(shot.backsightInclination, inclinationUnit, isRecorded) : EMPTY_BS_INCLINATION, formatLeft((_shot$toLruds = shot.toLruds) === null || _shot$toLruds === void 0 ? void 0 : _shot$toLruds.left, distanceUnit, isRecorded), formatRight((_shot$toLruds2 = shot.toLruds) === null || _shot$toLruds2 === void 0 ? void 0 : _shot$toLruds2.right, distanceUnit, isRecorded), formatUp((_shot$toLruds3 = shot.toLruds) === null || _shot$toLruds3 === void 0 ? void 0 : _shot$toLruds3.up, distanceUnit, isRecorded), formatDown((_shot$toLruds4 = shot.toLruds) === null || _shot$toLruds4 === void 0 ? void 0 : _shot$toLruds4.down, distanceUnit, isRecorded)].join('');
+  };
 }
-module.exports = exports.default;
+var _default = exports["default"] = makeFormatFrcsShot();

package/formatFrcsSurveyFile.d.ts

@@ -0,0 +1,2 @@
+import { FrcsSurveyFile } from './FrcsSurveyFile';
+export declare function formatFrcsSurveyFile(file: FrcsSurveyFile): AsyncIterable<string>;

package/formatFrcsSurveyFile.js

@@ -0,0 +1,164 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formatFrcsSurveyFile = formatFrcsSurveyFile;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _awaitAsyncGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/awaitAsyncGenerator"));
+var _wrapAsyncGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapAsyncGenerator"));
+var _unitized = require("@speleotica/unitized");
+var _formatFrcsShot = require("./formatFrcsShot.js");
+function formatFrcsSurveyFile(_x) {
+  return _formatFrcsSurveyFile.apply(this, arguments);
+}
+function _formatFrcsSurveyFile() {
+  _formatFrcsSurveyFile = (0, _wrapAsyncGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(file) {
+    var formatFrcsShot, tripIndex, trip, shots, header, name, team, date, comment, line2, alternateUnits, i, _shot$recorded, shot, lines, _i;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          formatFrcsShot = (0, _formatFrcsShot.makeFormatFrcsShot)(file);
+          if (!file.cave) {
+            _context.next = 4;
+            break;
+          }
+          _context.next = 4;
+          return "      ".concat(file.cave).concat(file.location ? ", ".concat(file.location) : '', "\n");
+        case 4:
+          tripIndex = 0;
+        case 5:
+          if (!(tripIndex < file.trips.length)) {
+            _context.next = 56;
+            break;
+          }
+          trip = file.trips[tripIndex];
+          shots = trip.shots, header = trip.header;
+          name = header.name, team = header.team, date = header.date, comment = header.comment;
+          if (!(tripIndex > 0)) {
+            _context.next = 12;
+            break;
+          }
+          _context.next = 12;
+          return ' *\n';
+        case 12:
+          _context.next = 14;
+          return name.replace(/\n?$/, '\n');
+        case 14:
+          line2 = [].concat((0, _toConsumableArray2["default"])(team !== null && team !== void 0 && team.length ? [team.join(', ')] : []), (0, _toConsumableArray2["default"])(date ? [formatDate(date)] : [])).join('. ');
+          if (!line2) {
+            _context.next = 18;
+            break;
+          }
+          _context.next = 18;
+          return "".concat(line2, "\n");
+        case 18:
+          if (!comment) {
+            _context.next = 21;
+            break;
+          }
+          _context.next = 21;
+          return comment.replace(/\n?$/, '\n');
+        case 21:
+          _context.next = 23;
+          return ' *\n';
+        case 23:
+          _context.next = 25;
+          return formatUnits(header);
+        case 25:
+          alternateUnits = void 0;
+          i = 0;
+        case 27:
+          if (!(i < shots.length)) {
+            _context.next = 53;
+            break;
+          }
+          shot = shots[i];
+          if (!shot.comment) {
+            _context.next = 42;
+            break;
+          }
+          lines = shot.comment.split(/\n/gm);
+          _context.next = 33;
+          return '*\n';
+        case 33:
+          _i = 0;
+        case 34:
+          if (!(_i < lines.length - 1)) {
+            _context.next = 40;
+            break;
+          }
+          _context.next = 37;
+          return lines[_i].replace(/\n?$/, '\n');
+        case 37:
+          _i++;
+          _context.next = 34;
+          break;
+        case 40:
+          _context.next = 42;
+          return "* ".concat(lines[lines.length - 1].replace(/\n?$/, '\n'));
+        case 42:
+          if (!((_shot$recorded = shot.recorded) !== null && _shot$recorded !== void 0 && _shot$recorded.units)) {
+            _context.next = 48;
+            break;
+          }
+          alternateUnits = shot.recorded.units;
+          _context.next = 46;
+          return "*      %NC\n";
+        case 46:
+          _context.next = 48;
+          return formatUnits(shot.recorded.units);
+        case 48:
+          _context.next = 50;
+          return formatFrcsShot(shot.recorded || shot, alternateUnits || header).replace(/\n?$/, '\n');
+        case 50:
+          i++;
+          _context.next = 27;
+          break;
+        case 53:
+          tripIndex++;
+          _context.next = 5;
+          break;
+        case 56:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _formatFrcsSurveyFile.apply(this, arguments);
+}
+function formatUnits(units) {
+  var distUnit = formatLengthUnit(units.distanceUnit);
+  var azmMode = units.hasBacksightAzimuth ? units.backsightAzimuthCorrected ? 'C' : 'B' : ' ';
+  var incMode = units.hasBacksightInclination ? units.backsightInclinationCorrected ? 'C' : 'B' : ' ';
+  var azmUnit = formatAngleUnit(units.azimuthUnit);
+  var incUnit = formatAngleUnit(units.inclinationUnit);
+  return "".concat(distUnit, " ").concat(azmMode).concat(incMode, " ").concat(azmUnit).concat(incUnit, "\n");
+}
+function formatDate(date) {
+  return "".concat(date.getMonth() + 1, "/").concat(date.getDate(), "/").concat(date.getFullYear() % 100);
+}
+function formatLengthUnit(unit) {
+  switch (unit) {
+    case _unitized.Length.meters:
+      return 'M ';
+    case _unitized.Length.feet:
+      return 'FT';
+    case _unitized.Length.inches:
+      return 'FI';
+    default:
+      throw new Error("invalid length unit: ".concat(unit));
+  }
+}
+function formatAngleUnit(unit) {
+  switch (unit) {
+    case _unitized.Angle.degrees:
+      return 'D';
+    case _unitized.Angle.gradians:
+      return 'G';
+    default:
+      throw new Error("invalid angle unit: ".concat(unit));
+  }
+}

package/index.d.ts

@@ -9,4 +9,5 @@ import { FrcsTripSummary } from './FrcsTripSummary';
 import { FrcsTripSummaryFile } from './FrcsTripSummaryFile';
 import parseFrcsTripSummaryFile from './parseFrcsTripSummaryFile';
 import formatFrcsShot from './formatFrcsShot';
-export { FrcsShot, FrcsShotKind, FrcsSurveyFile, FrcsTrip, FrcsTripHeader, parseFrcsSurveyFile, FrcsPlotShot, FrcsPlotFile, parseFrcsPlotFile, FrcsTripSummary, FrcsTripSummaryFile, parseFrcsTripSummaryFile, formatFrcsShot, };
+import { formatFrcsSurveyFile } from './formatFrcsSurveyFile';
+export { FrcsShot, FrcsShotKind, FrcsSurveyFile, FrcsTrip, FrcsTripHeader, parseFrcsSurveyFile, FrcsPlotShot, FrcsPlotFile, parseFrcsPlotFile, FrcsTripSummary, FrcsTripSummaryFile, parseFrcsTripSummaryFile, formatFrcsShot, formatFrcsSurveyFile, };

package/index.js

@@ -64,6 +64,12 @@ Object.defineProperty(exports, "formatFrcsShot", {
     return _formatFrcsShot["default"];
   }
 });
+Object.defineProperty(exports, "formatFrcsSurveyFile", {
+  enumerable: true,
+  get: function get() {
+    return _formatFrcsSurveyFile.formatFrcsSurveyFile;
+  }
+});
 Object.defineProperty(exports, "parseFrcsPlotFile", {
   enumerable: true,
   get: function get() {
@@ -92,4 +98,5 @@ var _parseFrcsPlotFile = _interopRequireDefault(require("./parseFrcsPlotFile.js"
 var _FrcsTripSummary = require("./FrcsTripSummary.js");
 var _FrcsTripSummaryFile = require("./FrcsTripSummaryFile.js");
 var _parseFrcsTripSummaryFile = _interopRequireDefault(require("./parseFrcsTripSummaryFile.js"));
-var _formatFrcsShot = _interopRequireDefault(require("./formatFrcsShot.js"));
+var _formatFrcsShot = _interopRequireDefault(require("./formatFrcsShot.js"));
+var _formatFrcsSurveyFile = require("./formatFrcsSurveyFile.js");

package/node/index.d.ts

@@ -1,3 +1,3 @@
-export declare const parseFrcsSurveyFile: (file: string) => Promise<import("..").FrcsSurveyFile>;
+export declare const parseFrcsSurveyFile: (file: string, rest_0?: import("../parseFrcsSurveyFile").ParseFrcsSurveyFileOptions | undefined) => Promise<import("..").FrcsSurveyFile>;
 export declare const parseFrcsPlotFile: (file: string) => Promise<import("..").FrcsPlotFile>;
 export declare const parseFrcsTripSummaryFile: (file: string) => Promise<import("..").FrcsTripSummaryFile>;

package/node/index.js

@@ -12,7 +12,10 @@ var _parseFrcsPlotFile2 = _interopRequireDefault(require("../parseFrcsPlotFile.j
 var _parseFrcsTripSummaryFile2 = _interopRequireDefault(require("../parseFrcsTripSummaryFile.js"));
 var convert = function convert(fn) {
   return function (file) {
-    return fn(file, _readline["default"].createInterface(_fs["default"].createReadStream(file)));
+    for (var _len = arguments.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      rest[_key - 1] = arguments[_key];
+    }
+    return fn.apply(void 0, [file, _readline["default"].createInterface(_fs["default"].createReadStream(file))].concat(rest));
   };
 };
 var parseFrcsSurveyFile = exports.parseFrcsSurveyFile = convert(_parseFrcsSurveyFile2["default"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speleotica/frcsdata",
-  "version": "4.1.1",
+  "version": "4.3.0",
   "description": "parser for Chip Hopper's survey data format used in Fisher Ridge Cave System",
   "sideEffects": false,
   "publishConfig": {
@@ -22,7 +22,7 @@
   "dependencies": {
     "@babel/runtime": "^7.18.6",
     "@speleotica/unitized": "^2.0.0",
-    "parse-segment": "^1.5.1"
+    "parse-segment": "^1.5.4"
   },
   "main": "index.js",
   "types": "index.d.ts",

package/parseFrcsSurveyFile.d.ts

@@ -1,48 +1,51 @@
-import { FrcsSurveyFile } from './FrcsSurveyFile';
+import { FrcsShotColumnConfig, FrcsSurveyFile } from './FrcsSurveyFile';
+export type ParseFrcsSurveyFileOptions = {
+    columns?: FrcsShotColumnConfig;
+};
 /**
- * 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>
+  *
+  */
 export default function parseFrcsSurveyFile(file: any, // eslint-disable-line @typescript-eslint/no-explicit-any
-lines: AsyncIterable<string>): Promise<FrcsSurveyFile>;
+lines: AsyncIterable<string>, { columns }?: ParseFrcsSurveyFileOptions): Promise<FrcsSurveyFile>;