ropegeo-common 1.9.4 → 1.9.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/classes/filters/acaDifficultyFilterOptions.d.ts +2 -2
  2. package/dist/classes/filters/acaDifficultyFilterOptions.d.ts.map +1 -1
  3. package/dist/classes/filters/acaDifficultyFilterOptions.js +9 -6
  4. package/dist/classes/requestParams/acaDifficultyParams.d.ts +2 -2
  5. package/dist/classes/requestParams/acaDifficultyParams.d.ts.map +1 -1
  6. package/dist/classes/requestParams/acaDifficultyParams.js +9 -9
  7. package/package.json +1 -1
package/dist/classes/filters/acaDifficultyFilterOptions.d.ts CHANGED
@@ -27,8 +27,8 @@ export declare class AcaDifficultyFilterOptions extends DifficultyFilterOptions
27
27
  readonly technical: TechnicalMinMax;
28
28
  readonly water: WaterMinMax;
29
29
  readonly time: TimeMinMax;
30
- readonly risk: RiskMinMax;
31
- constructor(technical: TechnicalMinMax, water: WaterMinMax, time: TimeMinMax, risk: RiskMinMax);
30
+ readonly effectiveRisk: RiskMinMax;
31
+ constructor(technical: TechnicalMinMax, water: WaterMinMax, time: TimeMinMax, effectiveRisk: RiskMinMax);
32
32
  toDifficultyParams(): AcaDifficultyParams;
33
33
  toJSON(): Record<string, unknown>;
34
34
  /**
package/dist/classes/filters/acaDifficultyFilterOptions.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"acaDifficultyFilterOptions.d.ts","sourceRoot":"","sources":["../../../src/classes/filters/acaDifficultyFilterOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAKH,aAAa,EACb,kBAAkB,EAClB,aAAa,EACb,cAAc,EACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,uBAAuB,EAAyC,MAAM,2BAA2B,CAAC;AAC3G,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAkD3E,qBAAa,eAAe;IACxB,QAAQ,CAAC,GAAG,EAAE,kBAAkB,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,kBAAkB,CAAC;gBACrB,GAAG,EAAE,kBAAkB,EAAE,GAAG,EAAE,kBAAkB;CAK/D;AAED,qBAAa,WAAW;IACpB,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;gBACjB,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc;CAKvD;AAED,qBAAa,UAAU;IACnB,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;gBAChB,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa;CAKrD;AAED,qBAAa,UAAU;IACnB,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;gBAChB,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa;CAKrD;AAED,qBAAa,0BAA2B,SAAQ,uBAAuB;IACnE,QAAQ,CAAC,cAAc,sBAAsB;IAC7C,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;gBAGtB,SAAS,EAAE,eAAe,EAC1B,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,UAAU;IASpB,kBAAkB,IAAI,mBAAmB;IA6BzC,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAUjC;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,0BAA0B;CA4BjE"}
1
+ {"version":3,"file":"acaDifficultyFilterOptions.d.ts","sourceRoot":"","sources":["../../../src/classes/filters/acaDifficultyFilterOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAKH,aAAa,EACb,kBAAkB,EAClB,aAAa,EACb,cAAc,EACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,uBAAuB,EAAyC,MAAM,2BAA2B,CAAC;AAC3G,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAkD3E,qBAAa,eAAe;IACxB,QAAQ,CAAC,GAAG,EAAE,kBAAkB,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,kBAAkB,CAAC;gBACrB,GAAG,EAAE,kBAAkB,EAAE,GAAG,EAAE,kBAAkB;CAK/D;AAED,qBAAa,WAAW;IACpB,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;gBACjB,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc;CAKvD;AAED,qBAAa,UAAU;IACnB,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;gBAChB,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa;CAKrD;AAED,qBAAa,UAAU;IACnB,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;gBAChB,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa;CAKrD;AAED,qBAAa,0BAA2B,SAAQ,uBAAuB;IACnE,QAAQ,CAAC,cAAc,sBAAsB;IAC7C,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,aAAa,EAAE,UAAU,CAAC;gBAG/B,SAAS,EAAE,eAAe,EAC1B,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,UAAU,EAChB,aAAa,EAAE,UAAU;IAS7B,kBAAkB,IAAI,mBAAmB;IA6BzC,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAajC;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,0BAA0B;CA+BjE"}
package/dist/classes/filters/acaDifficultyFilterOptions.js CHANGED
@@ -60,16 +60,16 @@ class RiskMinMax {
60
60
  }
61
61
  exports.RiskMinMax = RiskMinMax;
62
62
  class AcaDifficultyFilterOptions extends difficultyFilterOptions_1.DifficultyFilterOptions {
63
- constructor(technical, water, time, risk) {
63
+ constructor(technical, water, time, effectiveRisk) {
64
64
  super();
65
65
  this.difficultyType = difficulty_1.DifficultyType.ACA;
66
66
  this.technical = technical;
67
67
  this.water = water;
68
68
  this.time = time;
69
- this.risk = risk;
69
+ this.effectiveRisk = effectiveRisk;
70
70
  }
71
71
  toDifficultyParams() {
72
- return new acaDifficultyParams_1.AcaDifficultyParams(expandInclusive(this.technical.min, this.technical.max, TECHNICAL_ORDERED, acaRatings_1.ACA_TECHNICAL_ORDER), expandInclusive(this.water.min, this.water.max, WATER_ORDERED, acaRatings_1.ACA_WATER_ORDER), expandInclusive(this.time.min, this.time.max, TIME_ORDERED, acaRatings_1.ACA_TIME_ORDER), expandInclusive(this.risk.min, this.risk.max, RISK_ORDERED, acaRatings_1.ACA_RISK_ORDER));
72
+ return new acaDifficultyParams_1.AcaDifficultyParams(expandInclusive(this.technical.min, this.technical.max, TECHNICAL_ORDERED, acaRatings_1.ACA_TECHNICAL_ORDER), expandInclusive(this.water.min, this.water.max, WATER_ORDERED, acaRatings_1.ACA_WATER_ORDER), expandInclusive(this.time.min, this.time.max, TIME_ORDERED, acaRatings_1.ACA_TIME_ORDER), expandInclusive(this.effectiveRisk.min, this.effectiveRisk.max, RISK_ORDERED, acaRatings_1.ACA_RISK_ORDER));
73
73
  }
74
74
  toJSON() {
75
75
  return {
@@ -77,7 +77,10 @@ class AcaDifficultyFilterOptions extends difficultyFilterOptions_1.DifficultyFil
77
77
  technical: { min: this.technical.min, max: this.technical.max },
78
78
  water: { min: this.water.min, max: this.water.max },
79
79
  time: { min: this.time.min, max: this.time.max },
80
- risk: { min: this.risk.min, max: this.risk.max },
80
+ effectiveRisk: {
81
+ min: this.effectiveRisk.min,
82
+ max: this.effectiveRisk.max,
83
+ },
81
84
  };
82
85
  }
83
86
  /**
@@ -99,8 +102,8 @@ class AcaDifficultyFilterOptions extends difficultyFilterOptions_1.DifficultyFil
99
102
  const tech = r.technical;
100
103
  const water = r.water;
101
104
  const time = r.time;
102
- const risk = r.risk;
103
- return new AcaDifficultyFilterOptions(new TechnicalMinMax(tech.min, tech.max), new WaterMinMax(water.min, water.max), new TimeMinMax(time.min, time.max), new RiskMinMax(risk.min, risk.max));
105
+ const riskRec = r.effectiveRisk;
106
+ return new AcaDifficultyFilterOptions(new TechnicalMinMax(tech.min, tech.max), new WaterMinMax(water.min, water.max), new TimeMinMax(time.min, time.max), new RiskMinMax(riskRec.min, riskRec.max));
104
107
  }
105
108
  }
106
109
  exports.AcaDifficultyFilterOptions = AcaDifficultyFilterOptions;
package/dist/classes/requestParams/acaDifficultyParams.d.ts CHANGED
@@ -11,8 +11,8 @@ export declare class AcaDifficultyParams extends DifficultyParams {
11
11
  readonly technical: AcaTechnicalRating[];
12
12
  readonly water: AcaWaterRating[];
13
13
  readonly time: AcaTimeRating[];
14
- readonly risk: AcaRiskRating[];
15
- constructor(technical: AcaTechnicalRating[], water: AcaWaterRating[], time: AcaTimeRating[], risk: AcaRiskRating[]);
14
+ readonly effectiveRisk: AcaRiskRating[];
15
+ constructor(technical: AcaTechnicalRating[], water: AcaWaterRating[], time: AcaTimeRating[], effectiveRisk: AcaRiskRating[]);
16
16
  isActive(): boolean;
17
17
  toQueryString(): string;
18
18
  static fromQueryStringParams(q: DifficultyParamsQueryRecord): AcaDifficultyParams;
package/dist/classes/requestParams/acaDifficultyParams.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"acaDifficultyParams.d.ts","sourceRoot":"","sources":["../../../src/classes/requestParams/acaDifficultyParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACH,aAAa,EACb,kBAAkB,EAClB,aAAa,EACb,cAAc,EACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACH,gBAAgB,EAChB,KAAK,2BAA2B,EAGnC,MAAM,oBAAoB,CAAC;AAE5B,eAAO,MAAM,iBAAiB,oBAAoB,CAAC;AACnD,eAAO,MAAM,eAAe,yBAAyB,CAAC;AACtD,eAAO,MAAM,WAAW,qBAAqB,CAAC;AAC9C,eAAO,MAAM,UAAU,oBAAoB,CAAC;AAC5C,eAAO,MAAM,UAAU,oBAAoB,CAAC;AA8C5C,qBAAa,mBAAoB,SAAQ,gBAAgB;IACrD,QAAQ,CAAC,cAAc,sBAAsB;IAE7C,QAAQ,CAAC,SAAS,EAAE,kBAAkB,EAAE,CAAC;IACzC,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,CAAC;gBAG3B,SAAS,EAAE,kBAAkB,EAAE,EAC/B,KAAK,EAAE,cAAc,EAAE,EACvB,IAAI,EAAE,aAAa,EAAE,EACrB,IAAI,EAAE,aAAa,EAAE;IASzB,QAAQ,IAAI,OAAO;IASnB,aAAa,IAAI,MAAM;IAqBvB,MAAM,CAAC,qBAAqB,CACxB,CAAC,EAAE,2BAA2B,GAC/B,mBAAmB;IAwBtB,OAAO,CAAC,MAAM,CAAC,cAAc;IAW7B,uFAAuF;IACvF,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,mBAAmB;IAgCpE,kEAAkE;IAClE,MAAM,CAAC,cAAc,CACjB,MAAM,EAAE,mBAAmB,GAAG,IAAI,GACnC,mBAAmB,GAAG,IAAI;CAIhC"}
1
+ {"version":3,"file":"acaDifficultyParams.d.ts","sourceRoot":"","sources":["../../../src/classes/requestParams/acaDifficultyParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACH,aAAa,EACb,kBAAkB,EAClB,aAAa,EACb,cAAc,EACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACH,gBAAgB,EAChB,KAAK,2BAA2B,EAGnC,MAAM,oBAAoB,CAAC;AAE5B,eAAO,MAAM,iBAAiB,oBAAoB,CAAC;AACnD,eAAO,MAAM,eAAe,yBAAyB,CAAC;AACtD,eAAO,MAAM,WAAW,qBAAqB,CAAC;AAC9C,eAAO,MAAM,UAAU,oBAAoB,CAAC;AAC5C,eAAO,MAAM,UAAU,oBAAoB,CAAC;AA8C5C,qBAAa,mBAAoB,SAAQ,gBAAgB;IACrD,QAAQ,CAAC,cAAc,sBAAsB;IAE7C,QAAQ,CAAC,SAAS,EAAE,kBAAkB,EAAE,CAAC;IACzC,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,CAAC;IAC/B,QAAQ,CAAC,aAAa,EAAE,aAAa,EAAE,CAAC;gBAGpC,SAAS,EAAE,kBAAkB,EAAE,EAC/B,KAAK,EAAE,cAAc,EAAE,EACvB,IAAI,EAAE,aAAa,EAAE,EACrB,aAAa,EAAE,aAAa,EAAE;IASlC,QAAQ,IAAI,OAAO;IASnB,aAAa,IAAI,MAAM;IAwBvB,MAAM,CAAC,qBAAqB,CACxB,CAAC,EAAE,2BAA2B,GAC/B,mBAAmB;IAwBtB,OAAO,CAAC,MAAM,CAAC,cAAc;IAW7B,uFAAuF;IACvF,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,mBAAmB;IAgCpE,kEAAkE;IAClE,MAAM,CAAC,cAAc,CACjB,MAAM,EAAE,mBAAmB,GAAG,IAAI,GACnC,mBAAmB,GAAG,IAAI;CAIhC"}
package/dist/classes/requestParams/acaDifficultyParams.js CHANGED
@@ -43,19 +43,19 @@ function acaAxisKeysPresent(q) {
43
43
  (q[exports.Q_ACA_RISK] ?? '').trim() !== '');
44
44
  }
45
45
  class AcaDifficultyParams extends difficultyParams_1.DifficultyParams {
46
- constructor(technical, water, time, risk) {
46
+ constructor(technical, water, time, effectiveRisk) {
47
47
  super();
48
48
  this.difficultyType = difficulty_1.DifficultyType.ACA;
49
49
  this.technical = [...technical];
50
50
  this.water = [...water];
51
51
  this.time = [...time];
52
- this.risk = [...risk];
52
+ this.effectiveRisk = [...effectiveRisk];
53
53
  }
54
54
  isActive() {
55
55
  return (this.technical.length > 0 ||
56
56
  this.water.length > 0 ||
57
57
  this.time.length > 0 ||
58
- this.risk.length > 0);
58
+ this.effectiveRisk.length > 0);
59
59
  }
60
60
  toQueryString() {
61
61
  const p = new URLSearchParams();
@@ -69,8 +69,8 @@ class AcaDifficultyParams extends difficultyParams_1.DifficultyParams {
69
69
  if (this.time.length > 0) {
70
70
  p.set(exports.Q_ACA_TIME, this.time.map((x) => x.toLowerCase()).join('|'));
71
71
  }
72
- if (this.risk.length > 0) {
73
- p.set(exports.Q_ACA_RISK, this.risk.map((x) => x.toLowerCase()).join('|'));
72
+ if (this.effectiveRisk.length > 0) {
73
+ p.set(exports.Q_ACA_RISK, this.effectiveRisk.map((x) => x.toLowerCase()).join('|'));
74
74
  }
75
75
  return p.toString();
76
76
  }
@@ -78,8 +78,8 @@ class AcaDifficultyParams extends difficultyParams_1.DifficultyParams {
78
78
  const technical = parseEnumTokens(q[exports.Q_ACA_TECHNICAL] ?? q['Aca-Technical-Rating'], Object.values(acaRatings_1.AcaTechnicalRating), 'aca-technical-rating');
79
79
  const water = parseEnumTokens(q[exports.Q_ACA_WATER] ?? q['Aca-Water-Rating'], Object.values(acaRatings_1.AcaWaterRating), 'aca-water-rating');
80
80
  const time = parseEnumTokens(q[exports.Q_ACA_TIME] ?? q['Aca-Time-Rating'], Object.values(acaRatings_1.AcaTimeRating), 'aca-time-rating');
81
- const risk = parseEnumTokens(q[exports.Q_ACA_RISK] ?? q['Aca-Risk-Rating'], Object.values(acaRatings_1.AcaRiskRating), 'aca-risk-rating');
82
- return new AcaDifficultyParams(technical, water, time, risk);
81
+ const effectiveRisk = parseEnumTokens(q[exports.Q_ACA_RISK] ?? q['Aca-Risk-Rating'], Object.values(acaRatings_1.AcaRiskRating), 'aca-risk-rating');
82
+ return new AcaDifficultyParams(technical, water, time, effectiveRisk);
83
83
  }
84
84
  static optionalString(obj, ...keys) {
85
85
  for (const k of keys) {
@@ -94,8 +94,8 @@ class AcaDifficultyParams extends difficultyParams_1.DifficultyParams {
94
94
  const technical = parseEnumTokens(AcaDifficultyParams.optionalString(obj, exports.Q_ACA_TECHNICAL, 'Aca-Technical-Rating'), Object.values(acaRatings_1.AcaTechnicalRating), 'aca-technical-rating');
95
95
  const water = parseEnumTokens(AcaDifficultyParams.optionalString(obj, exports.Q_ACA_WATER, 'Aca-Water-Rating'), Object.values(acaRatings_1.AcaWaterRating), 'aca-water-rating');
96
96
  const time = parseEnumTokens(AcaDifficultyParams.optionalString(obj, exports.Q_ACA_TIME, 'Aca-Time-Rating'), Object.values(acaRatings_1.AcaTimeRating), 'aca-time-rating');
97
- const risk = parseEnumTokens(AcaDifficultyParams.optionalString(obj, exports.Q_ACA_RISK, 'Aca-Risk-Rating'), Object.values(acaRatings_1.AcaRiskRating), 'aca-risk-rating');
98
- return new AcaDifficultyParams(technical, water, time, risk);
97
+ const effectiveRisk = parseEnumTokens(AcaDifficultyParams.optionalString(obj, exports.Q_ACA_RISK, 'Aca-Risk-Rating'), Object.values(acaRatings_1.AcaRiskRating), 'aca-risk-rating');
98
+ return new AcaDifficultyParams(technical, water, time, effectiveRisk);
99
99
  }
100
100
  /** Returns null if every axis is empty (no difficulty filter). */
101
101
  static normalizeEmpty(params) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ropegeo-common",
3
- "version": "1.9.4",
3
+ "version": "1.9.5",
4
4
  "description": "Shared domain classes and helpers for RopeGeo and WebScraper",
5
5
  "license": "ISC",
6
6
  "repository": {