raain-model 3.0.11 → 3.0.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +25 -2
- package/README.md +1 -0
- package/bpInfo.js +1 -1
- package/bpInfo.js.map +1 -1
- package/cartesian/CartesianMeasureValue.js +6 -4
- package/cartesian/CartesianMeasureValue.js.map +1 -1
- package/cartesian/CartesianTools.js +62 -39
- package/cartesian/CartesianTools.js.map +1 -1
- package/cartesian/CartesianValue.js.map +1 -1
- package/cartesian/LatLng.js.map +1 -1
- package/cartesian/RadarCartesianMeasureValue.js +1 -1
- package/cartesian/RadarCartesianMeasureValue.js.map +1 -1
- package/cartesian/RainCartesianMeasureValue.js +1 -1
- package/cartesian/RainCartesianMeasureValue.js.map +1 -1
- package/gauge/GaugeMeasure.js +12 -3
- package/gauge/GaugeMeasure.js.map +1 -1
- package/gauge/GaugeNode.js +3 -1
- package/gauge/GaugeNode.js.map +1 -1
- package/gauge/GaugeNodeMap.js +4 -2
- package/gauge/GaugeNodeMap.js.map +1 -1
- package/organization/EventNode.js.map +1 -1
- package/organization/Link.js.map +1 -1
- package/organization/Measure.js +4 -2
- package/organization/Measure.js.map +1 -1
- package/organization/PeopleNode.js.map +1 -1
- package/organization/RaainNode.js +8 -8
- package/organization/RaainNode.js.map +1 -1
- package/organization/TeamNode.d.ts +1 -3
- package/organization/TeamNode.js.map +1 -1
- package/package.json +23 -10
- package/polar/AbstractPolarMeasureValue.js +13 -5
- package/polar/AbstractPolarMeasureValue.js.map +1 -1
- package/polar/MeasureValuePolarContainer.js +4 -4
- package/polar/MeasureValuePolarContainer.js.map +1 -1
- package/polar/PolarFilter.js +18 -10
- package/polar/PolarFilter.js.map +1 -1
- package/polar/PolarMeasureValue.js +19 -16
- package/polar/PolarMeasureValue.js.map +1 -1
- package/polar/PolarMeasureValueMap.js +76 -40
- package/polar/PolarMeasureValueMap.js.map +1 -1
- package/polar/RadarPolarMeasureValue.js +12 -5
- package/polar/RadarPolarMeasureValue.js.map +1 -1
- package/polar/RainPolarMeasureValue.js +2 -2
- package/polar/RainPolarMeasureValue.js.map +1 -1
- package/quality/QualityPoint.js +3 -3
- package/quality/QualityPoint.js.map +1 -1
- package/quality/SpeedMatrix.js +19 -13
- package/quality/SpeedMatrix.js.map +1 -1
- package/quality/SpeedMatrixContainer.js +34 -27
- package/quality/SpeedMatrixContainer.js.map +1 -1
- package/quality/history/CartesianRainHistory.js.map +1 -1
- package/quality/position/Position.js +1 -1
- package/quality/position/Position.js.map +1 -1
- package/quality/position/PositionValue.js.map +1 -1
- package/quality/tools/QualityTools.js +3 -1
- package/quality/tools/QualityTools.js.map +1 -1
- package/radar/RadarMeasure.js +13 -4
- package/radar/RadarMeasure.js.map +1 -1
- package/radar/RadarNode.js +3 -1
- package/radar/RadarNode.js.map +1 -1
- package/radar/RadarNodeMap.js +5 -3
- package/radar/RadarNodeMap.js.map +1 -1
- package/rain/RainComputation.js +7 -5
- package/rain/RainComputation.js.map +1 -1
- package/rain/RainComputationAbstract.js +36 -13
- package/rain/RainComputationAbstract.js.map +1 -1
- package/rain/RainComputationMap.js +7 -4
- package/rain/RainComputationMap.js.map +1 -1
- package/rain/RainComputationQuality.d.ts +2 -0
- package/rain/RainComputationQuality.js +17 -7
- package/rain/RainComputationQuality.js.map +1 -1
- package/rain/RainMeasure.js.map +1 -1
- package/rain/RainNode.js +77 -27
- package/rain/RainNode.js.map +1 -1
|
@@ -62,8 +62,8 @@ class RaainNode {
|
|
|
62
62
|
return [];
|
|
63
63
|
}
|
|
64
64
|
const linksPurified = linksToPurify
|
|
65
|
-
.filter(l => l !== null && l !== undefined)
|
|
66
|
-
.map(l => {
|
|
65
|
+
.filter((l) => l !== null && l !== undefined)
|
|
66
|
+
.map((l) => {
|
|
67
67
|
var _a;
|
|
68
68
|
if (l instanceof Link_1.Link || Link_1.Link.isCloneable(l)) {
|
|
69
69
|
return Link_1.Link.clone(l);
|
|
@@ -83,7 +83,7 @@ class RaainNode {
|
|
|
83
83
|
}
|
|
84
84
|
return null;
|
|
85
85
|
})
|
|
86
|
-
.filter(l => l !== null);
|
|
86
|
+
.filter((l) => l !== null);
|
|
87
87
|
function uniqBy(a, key) {
|
|
88
88
|
const seen = {};
|
|
89
89
|
return a.filter((item) => {
|
|
@@ -91,7 +91,7 @@ class RaainNode {
|
|
|
91
91
|
return false;
|
|
92
92
|
}
|
|
93
93
|
const k = key(item);
|
|
94
|
-
if (
|
|
94
|
+
if (Object.prototype.hasOwnProperty.call(seen, k)) {
|
|
95
95
|
return false;
|
|
96
96
|
}
|
|
97
97
|
seen[k] = true;
|
|
@@ -108,7 +108,7 @@ class RaainNode {
|
|
|
108
108
|
toJSON() {
|
|
109
109
|
const json = {
|
|
110
110
|
id: this.id,
|
|
111
|
-
links: this.links
|
|
111
|
+
links: this.links,
|
|
112
112
|
};
|
|
113
113
|
if (this.version) {
|
|
114
114
|
json.version = this.version;
|
|
@@ -123,7 +123,7 @@ class RaainNode {
|
|
|
123
123
|
return this._links;
|
|
124
124
|
}
|
|
125
125
|
// return this.links.filter(l => l && l.rel && linkType === l.rel);
|
|
126
|
-
return this._links.filter(l => l.getLinkType() === linkType);
|
|
126
|
+
return this._links.filter((l) => l.getLinkType() === linkType);
|
|
127
127
|
}
|
|
128
128
|
getLink(linkType, index) {
|
|
129
129
|
index = !index ? 0 : index;
|
|
@@ -139,7 +139,7 @@ class RaainNode {
|
|
|
139
139
|
* @returns Array of link IDs
|
|
140
140
|
*/
|
|
141
141
|
getLinkIds() {
|
|
142
|
-
return this._links.map(l => l.getId());
|
|
142
|
+
return this._links.map((l) => l.getId());
|
|
143
143
|
}
|
|
144
144
|
/**
|
|
145
145
|
* Gets the count of links, optionally filtered by type.
|
|
@@ -154,7 +154,7 @@ class RaainNode {
|
|
|
154
154
|
if (!linkType) {
|
|
155
155
|
return this._links.length;
|
|
156
156
|
}
|
|
157
|
-
return this._links.filter(l => l.getLinkType() === linkType).length;
|
|
157
|
+
return this._links.filter((l) => l.getLinkType() === linkType).length;
|
|
158
158
|
}
|
|
159
159
|
/**
|
|
160
160
|
* Adds new links to the node.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaainNode.js","sourceRoot":"","sources":["../../src/organization/RaainNode.ts"],"names":[],"mappings":";;;AAAA,iCAA4B;AAG5B;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAa,SAAS;IAMlB;;;;;;;OAOG;IACH,YAAY,
|
|
1
|
+
{"version":3,"file":"RaainNode.js","sourceRoot":"","sources":["../../src/organization/RaainNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { PeopleNode } from './PeopleNode';
|
|
2
2
|
import { RaainNode } from './RaainNode';
|
|
3
|
-
export interface ITeamNode {
|
|
4
|
-
}
|
|
5
3
|
/**
|
|
6
4
|
* Represents a team in the RAAIN system.
|
|
7
5
|
* This class manages team members and their contracts.
|
|
@@ -27,7 +25,7 @@ export declare class TeamNode extends RaainNode {
|
|
|
27
25
|
contracts: string[];
|
|
28
26
|
contacts: PeopleNode[];
|
|
29
27
|
constructor(json: {
|
|
30
|
-
id:
|
|
28
|
+
id: string;
|
|
31
29
|
name?: string;
|
|
32
30
|
description?: string;
|
|
33
31
|
contracts?: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TeamNode.js","sourceRoot":"","sources":["../../src/organization/TeamNode.ts"],"names":[],"mappings":";;;AACA,2CAAsC;
|
|
1
|
+
{"version":3,"file":"TeamNode.js","sourceRoot":"","sources":["../../src/organization/TeamNode.ts"],"names":[],"mappings":";;;AACA,2CAAsC;AAEtC;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAa,QAAS,SAAQ,qBAAS;IAQnC,YAAY,IAMX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;IAClC,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5B,OAAO;YACH,GAAG,IAAI;YACP,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;SAC1B,CAAC;IACN,CAAC;IAED;;;;OAIG;IACO,WAAW;QACjB,OAAO,QAAQ,CAAC,IAAI,CAAC;IACzB,CAAC;;AAzCL,4BA0CC;AAzC0B,aAAI,GAAG,MAAM,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "raain-model",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.13",
|
|
4
4
|
"author": "contact@radartorain.com",
|
|
5
5
|
"homepage": "https://github.com/raainio/raain-model",
|
|
6
6
|
"description": "radartorain.com api model",
|
|
@@ -13,13 +13,17 @@
|
|
|
13
13
|
"main": "./index.js",
|
|
14
14
|
"types": "./index.d.ts",
|
|
15
15
|
"scripts": {
|
|
16
|
-
"bp:_clean": "rm -rf package-lock.json node_modules .gen .logs .nyc_output .logs .output.txt .coverage .
|
|
17
|
-
"bp:bump": "OLD_VERSION=\"v$(node -e \"console.log(require('./package.json').version)\")\" && VERSION=\"$(npm version patch --no-git-tag-version)\" &&
|
|
18
|
-
"bp:update-changelog-dates": "node ./scripts/bp/update-changelog-date.
|
|
19
|
-
"bp:
|
|
20
|
-
"bp:use-
|
|
21
|
-
"bp:
|
|
22
|
-
"bp:branch:
|
|
16
|
+
"bp:_clean": "rm -rf package-lock.json node_modules .gen .logs .nyc_output .logs .output.txt .coverage .angular dist disti www && npm i",
|
|
17
|
+
"bp:bump": "OLD_VERSION=\"v$(node -e \"console.log(require('./package.json').version)\")\" && VERSION=\"$(npm version patch --no-git-tag-version)\" && echo \"export const bpInfo = {version: '$VERSION'};\" > ./src/bpInfo.ts && git tag $OLD_VERSION && git checkout -b $VERSION && git push origin refs/heads/$VERSION:$VERSION --tags && git push --set-upstream origin $VERSION",
|
|
18
|
+
"bp:update-changelog-dates": "node ./scripts/bp/update-changelog-date.cjs",
|
|
19
|
+
"bp:style:lint-format-ts": "eslint 'src/**/*.ts' 'specs/**/*.ts' --fix --no-error-on-unmatched-pattern",
|
|
20
|
+
"bp:use-local-deps": "node ./scripts/bp/switch-dependencies.cjs local && npm run bp:_clean",
|
|
21
|
+
"bp:use-remote-deps": "node ./scripts/bp/switch-dependencies.cjs remote && npm run bp:_clean",
|
|
22
|
+
"bp:branch:push": "BRANCH=$(git rev-parse --abbrev-ref HEAD) && git add . && (git diff-index --quiet HEAD && echo 'No changes to commit' || (git commit -m \"$BRANCH pushed\" && git push))",
|
|
23
|
+
"bp:branch:squash": "node ./scripts/bp/squash-commits.cjs",
|
|
24
|
+
"bp:branch:check-before-release": "npm run bp:use-remote-deps && node ./scripts/bp/check-before-release.cjs",
|
|
25
|
+
"bp:branch:last-push:main": "npm run bp:branch:push && npm run bp:branch:squash && BRANCH=$(git rev-parse --abbrev-ref HEAD) && git checkout main && git merge $BRANCH && git push",
|
|
26
|
+
"bp:main:package": "git checkout package && git merge main -m \"$(git log -1 --pretty=%B main)\" && git push --set-upstream origin package && git checkout main",
|
|
23
27
|
"build": "npm run build-dist",
|
|
24
28
|
"build-dist": "rm -rf dist/ && npx tsc && cp package.json dist/ && cp *.md dist/",
|
|
25
29
|
"test": "nyc mocha --require ts-node/register 'specs/**/**.spec.ts'",
|
|
@@ -40,6 +44,15 @@
|
|
|
40
44
|
"ts-node": "^8.10.2",
|
|
41
45
|
"tslint": "^6.1.3",
|
|
42
46
|
"typedoc": "^0.25.12",
|
|
43
|
-
"typescript": "^5.0.4"
|
|
47
|
+
"typescript": "^5.0.4",
|
|
48
|
+
"eslint": "^9.28.0",
|
|
49
|
+
"eslint-config-prettier": "^10.1.5",
|
|
50
|
+
"eslint-plugin-import": "^2.31.0",
|
|
51
|
+
"eslint-plugin-prettier": "^5.4.1",
|
|
52
|
+
"prettier": "^3.5.3",
|
|
53
|
+
"@typescript-eslint/eslint-plugin": "^8.34.0",
|
|
54
|
+
"@typescript-eslint/parser": "^8.34.0",
|
|
55
|
+
"@eslint/js": "^9.29.0",
|
|
56
|
+
"@eslint/eslintrc": "^3.3.1"
|
|
44
57
|
}
|
|
45
|
-
}
|
|
58
|
+
}
|
|
@@ -11,8 +11,8 @@ class AbstractPolarMeasureValue {
|
|
|
11
11
|
if (typeof polarMeasureValue1 === 'string') {
|
|
12
12
|
polarMeasureValue1 = JSON.parse(polarMeasureValue1);
|
|
13
13
|
}
|
|
14
|
-
if (polarMeasureValue1 instanceof AbstractPolarMeasureValue
|
|
15
|
-
|
|
14
|
+
if (polarMeasureValue1 instanceof AbstractPolarMeasureValue ||
|
|
15
|
+
polarMeasureValue1 instanceof PolarMeasureValue_1.PolarMeasureValue) {
|
|
16
16
|
this.setPolarsAsContainer(polarMeasureValue1.getPolars(), polarMeasureValue1.getAzimuthsCount(), polarMeasureValue1.getPolarEdgesCount());
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
@@ -52,10 +52,18 @@ class AbstractPolarMeasureValue {
|
|
|
52
52
|
return this.polarMeasureValue.getPolars();
|
|
53
53
|
}
|
|
54
54
|
setPolarsAsString(measureValuePolarContainers, azimuthsCount, polarEdgesCount) {
|
|
55
|
-
this.polarMeasureValue = new PolarMeasureValue_1.PolarMeasureValue({
|
|
55
|
+
this.polarMeasureValue = new PolarMeasureValue_1.PolarMeasureValue({
|
|
56
|
+
measureValuePolarContainers,
|
|
57
|
+
azimuthsCount,
|
|
58
|
+
polarEdgesCount,
|
|
59
|
+
});
|
|
56
60
|
}
|
|
57
61
|
setPolarsAsContainer(measureValuePolarContainers, azimuthsCount, polarEdgesCount) {
|
|
58
|
-
this.polarMeasureValue = new PolarMeasureValue_1.PolarMeasureValue({
|
|
62
|
+
this.polarMeasureValue = new PolarMeasureValue_1.PolarMeasureValue({
|
|
63
|
+
measureValuePolarContainers,
|
|
64
|
+
azimuthsCount,
|
|
65
|
+
polarEdgesCount,
|
|
66
|
+
});
|
|
59
67
|
}
|
|
60
68
|
getPolarValue(json) {
|
|
61
69
|
return this.polarMeasureValue.getPolarValue(json);
|
|
@@ -78,7 +86,7 @@ class AbstractPolarMeasureValue {
|
|
|
78
86
|
const json = this.toJSON();
|
|
79
87
|
return {
|
|
80
88
|
...json,
|
|
81
|
-
polarMeasureValue: JSON.stringify(this.polarMeasureValue.toJSONWithPolarStringified())
|
|
89
|
+
polarMeasureValue: JSON.stringify(this.polarMeasureValue.toJSONWithPolarStringified()),
|
|
82
90
|
};
|
|
83
91
|
}
|
|
84
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractPolarMeasureValue.js","sourceRoot":"","sources":["../../src/polar/AbstractPolarMeasureValue.ts"],"names":[],"mappings":";;;AAEA,2DAAsD;AAGtD,MAAa,yBAAyB;
|
|
1
|
+
{"version":3,"file":"AbstractPolarMeasureValue.js","sourceRoot":"","sources":["../../src/polar/AbstractPolarMeasureValue.ts"],"names":[],"mappings":";;;AAEA,2DAAsD;AAGtD,MAAa,yBAAyB;IAGlC,YAAY,IAAiF;QACzF,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,iBAAiB,CAAA,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,kBAAkB,GAAQ,IAAI,CAAC,iBAAiB,CAAC;QACrD,IAAI,OAAO,kBAAkB,KAAK,QAAQ,EAAE,CAAC;YACzC,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACxD,CAAC;QAED,IACI,kBAAkB,YAAY,yBAAyB;YACvD,kBAAkB,YAAY,qCAAiB,EACjD,CAAC;YACC,IAAI,CAAC,oBAAoB,CACrB,kBAAkB,CAAC,SAAS,EAAE,EAC9B,kBAAkB,CAAC,gBAAgB,EAAE,EACrC,kBAAkB,CAAC,kBAAkB,EAAE,CAC1C,CAAC;YACF,OAAO;QACX,CAAC;QAED,IAAI,kBAAkB,GAAG,kBAAkB,CAAC;QAC5C,IAAI,kBAAkB,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC1C,IAAI,OAAO,kBAAkB,CAAC,mBAAmB,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAC9D,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAC7E,CAAC;iBAAM,CAAC;gBACJ,kBAAkB,GAAG,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;YACjE,CAAC;QACL,CAAC;QAED,IAAI,aAAqB,CAAC;QAC1B,IAAI,eAAuB,CAAC;QAC5B,IAAI,2BAA2B,GAAG,EAAE,CAAC;QACrC,IAAI,kBAAkB,IAAI,kBAAkB,CAAC,6BAA6B,CAAC,EAAE,CAAC;YAC1E,2BAA2B,GAAG,kBAAkB,CAAC,6BAA6B,CAAC,CAAC;YAEhF,IAAI,kBAAkB,CAAC,eAAe,CAAC,IAAI,kBAAkB,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC/E,aAAa,GAAG,QAAQ,CAAC,EAAE,GAAG,kBAAkB,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,CAAC;gBACvE,eAAe,GAAG,QAAQ,CAAC,EAAE,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/E,CAAC;QACL,CAAC;QAED,IAAI,OAAO,2BAA2B,KAAK,QAAQ,EAAE,CAAC;YAClD,IAAI,CAAC,iBAAiB,CAAC,2BAA2B,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;YACpF,OAAO;QACX,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,2BAA2B,CAAC,EAAE,CAAC;YAC7C,IAAI,CAAC,oBAAoB,CAAC,2BAA2B,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;YACvF,OAAO;QACX,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACrD,CAAC;IAED,oBAAoB;QAChB,OAAO,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;IACzD,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC;IAC9C,CAAC;IAED,iBAAiB,CACb,2BAAmC,EACnC,aAAqB,EACrB,eAAuB;QAEvB,IAAI,CAAC,iBAAiB,GAAG,IAAI,qCAAiB,CAAC;YAC3C,2BAA2B;YAC3B,aAAa;YACb,eAAe;SAClB,CAAC,CAAC;IACP,CAAC;IAED,oBAAoB,CAChB,2BAAyD,EACzD,aAAqB,EACrB,eAAuB;QAEvB,IAAI,CAAC,iBAAiB,GAAG,IAAI,qCAAiB,CAAC;YAC3C,2BAA2B;YAC3B,aAAa;YACb,eAAe;SAClB,CAAC,CAAC;IACP,CAAC;IAED,aAAa,CAAC,IAA0D;QACpE,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,aAAa,CAAC,IAAyE;QACnF,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,CAAC;IACrD,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,CAAC;IACvD,CAAC;IAEM,MAAM;QACT,OAAO;YACH,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;SAC5C,CAAC;IACN,CAAC;IAEM,0BAA0B;QAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC3B,OAAO;YACH,GAAG,IAAI;YACP,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,0BAA0B,EAAE,CAAC;SACzF,CAAC;IACN,CAAC;CACJ;AAxHD,8DAwHC"}
|
|
@@ -23,16 +23,16 @@ class MeasureValuePolarContainer {
|
|
|
23
23
|
return this.edgeOffset + this.polarEdges.length;
|
|
24
24
|
}
|
|
25
25
|
getNotNullValuesCount() {
|
|
26
|
-
const edges = this.polarEdges.filter(e => !!e);
|
|
26
|
+
const edges = this.polarEdges.filter((e) => !!e);
|
|
27
27
|
return edges.length;
|
|
28
28
|
}
|
|
29
29
|
getFiltered(options = { nullValues: true }) {
|
|
30
|
-
let polarEdges = this.polarEdges.map(e => 1 - 1 + e);
|
|
30
|
+
let polarEdges = this.polarEdges.map((e) => 1 - 1 + e);
|
|
31
31
|
let edgeOffset = this.edgeOffset + 1 - 1;
|
|
32
32
|
if (options.nullValues) {
|
|
33
|
-
const firstNonNullValue = polarEdges.findIndex(value => !!value);
|
|
33
|
+
const firstNonNullValue = polarEdges.findIndex((value) => !!value);
|
|
34
34
|
const lastNonNullValue = polarEdges.reduce((lastIndex, value, currentIndex) => {
|
|
35
|
-
if (
|
|
35
|
+
if (value) {
|
|
36
36
|
return currentIndex;
|
|
37
37
|
}
|
|
38
38
|
return lastIndex;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasureValuePolarContainer.js","sourceRoot":"","sources":["../../src/polar/MeasureValuePolarContainer.ts"],"names":[],"mappings":";;;AAAA,MAAa,0BAA0B;
|
|
1
|
+
{"version":3,"file":"MeasureValuePolarContainer.js","sourceRoot":"","sources":["../../src/polar/MeasureValuePolarContainer.ts"],"names":[],"mappings":";;;AAAA,MAAa,0BAA0B;IAMnC,YAAY,IAKX;QACG,IAAI,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAA,KAAK,WAAW,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACvE,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC;IAEM,MAAM;QACT,OAAO;YACH,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC;IACN,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACpD,CAAC;IAED,qBAAqB;QACjB,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjD,OAAO,KAAK,CAAC,MAAM,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,OAAO,GAAG,EAAC,UAAU,EAAE,IAAI,EAAC;QACpC,IAAI,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,IAAI,UAAU,GAAG,IAAI,CAAC,UAAU,GAAG,CAAC,GAAG,CAAC,CAAC;QAEzC,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,iBAAiB,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACnE,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE;gBAC1E,IAAI,KAAK,EAAE,CAAC;oBACR,OAAO,YAAY,CAAC;gBACxB,CAAC;gBACD,OAAO,SAAS,CAAC;YACrB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAEP,IAAI,iBAAiB,IAAI,CAAC,IAAI,gBAAgB,IAAI,CAAC,EAAE,CAAC;gBAClD,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,iBAAiB,EAAE,gBAAgB,GAAG,CAAC,CAAC,CAAC;gBACvE,UAAU,GAAG,UAAU,GAAG,iBAAiB,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACJ,UAAU,GAAG,EAAE,CAAC;YACpB,CAAC;YAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1B,UAAU,GAAG,CAAC,CAAC;YACnB,CAAC;QACL,CAAC;QAED,OAAO,IAAI,0BAA0B,CAAC;YAClC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU;YACV,UAAU;SACb,CAAC,CAAC;IACP,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AA5ED,gEA4EC"}
|
package/polar/PolarFilter.js
CHANGED
|
@@ -3,27 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.PolarFilter = void 0;
|
|
4
4
|
class PolarFilter {
|
|
5
5
|
constructor(json) {
|
|
6
|
-
if (typeof (json === null || json === void 0 ? void 0 : json.azimuthMin) !== 'undefined')
|
|
6
|
+
if (typeof (json === null || json === void 0 ? void 0 : json.azimuthMin) !== 'undefined') {
|
|
7
7
|
this.azimuthMin = json.azimuthMin;
|
|
8
|
-
|
|
8
|
+
}
|
|
9
|
+
if (typeof (json === null || json === void 0 ? void 0 : json.azimuthMax) !== 'undefined') {
|
|
9
10
|
this.azimuthMax = json.azimuthMax;
|
|
10
|
-
|
|
11
|
+
}
|
|
12
|
+
if (typeof (json === null || json === void 0 ? void 0 : json.edgeMin) !== 'undefined') {
|
|
11
13
|
this.edgeMin = json.edgeMin;
|
|
12
|
-
|
|
14
|
+
}
|
|
15
|
+
if (typeof (json === null || json === void 0 ? void 0 : json.edgeMax) !== 'undefined') {
|
|
13
16
|
this.edgeMax = json.edgeMax;
|
|
17
|
+
}
|
|
14
18
|
}
|
|
15
19
|
static min(a, b) {
|
|
16
|
-
if (typeof a === 'undefined')
|
|
20
|
+
if (typeof a === 'undefined') {
|
|
17
21
|
return b;
|
|
18
|
-
|
|
22
|
+
}
|
|
23
|
+
if (typeof b === 'undefined') {
|
|
19
24
|
return a;
|
|
25
|
+
}
|
|
20
26
|
return Math.min(a, b);
|
|
21
27
|
}
|
|
22
28
|
static max(a, b) {
|
|
23
|
-
if (typeof a === 'undefined')
|
|
29
|
+
if (typeof a === 'undefined') {
|
|
24
30
|
return b;
|
|
25
|
-
|
|
31
|
+
}
|
|
32
|
+
if (typeof b === 'undefined') {
|
|
26
33
|
return a;
|
|
34
|
+
}
|
|
27
35
|
return Math.max(a, b);
|
|
28
36
|
}
|
|
29
37
|
merging(polarFilter) {
|
|
@@ -35,10 +43,10 @@ class PolarFilter {
|
|
|
35
43
|
});
|
|
36
44
|
}
|
|
37
45
|
equal(polarFilter) {
|
|
38
|
-
return this.azimuthMin === polarFilter.azimuthMin &&
|
|
46
|
+
return (this.azimuthMin === polarFilter.azimuthMin &&
|
|
39
47
|
this.azimuthMax === polarFilter.azimuthMax &&
|
|
40
48
|
this.edgeMin === polarFilter.edgeMin &&
|
|
41
|
-
this.edgeMax === polarFilter.edgeMax;
|
|
49
|
+
this.edgeMax === polarFilter.edgeMax);
|
|
42
50
|
}
|
|
43
51
|
}
|
|
44
52
|
exports.PolarFilter = PolarFilter;
|
package/polar/PolarFilter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PolarFilter.js","sourceRoot":"","sources":["../../src/polar/PolarFilter.ts"],"names":[],"mappings":";;;AAAA,MAAa,WAAW;IAMpB,YAAY,IAKX;QACG,IAAI,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CAAA,KAAK,WAAW;
|
|
1
|
+
{"version":3,"file":"PolarFilter.js","sourceRoot":"","sources":["../../src/polar/PolarFilter.ts"],"names":[],"mappings":";;;AAAA,MAAa,WAAW;IAMpB,YAAY,IAKX;QACG,IAAI,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CAAA,KAAK,WAAW,EAAE,CAAC;YAC1C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACtC,CAAC;QACD,IAAI,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CAAA,KAAK,WAAW,EAAE,CAAC;YAC1C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACtC,CAAC;QACD,IAAI,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAA,KAAK,WAAW,EAAE,CAAC;YACvC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAChC,CAAC;QACD,IAAI,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAA,KAAK,WAAW,EAAE,CAAC;YACvC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAChC,CAAC;IACL,CAAC;IAES,MAAM,CAAC,GAAG,CAAC,CAAS,EAAE,CAAS;QACrC,IAAI,OAAO,CAAC,KAAK,WAAW,EAAE,CAAC;YAC3B,OAAO,CAAC,CAAC;QACb,CAAC;QACD,IAAI,OAAO,CAAC,KAAK,WAAW,EAAE,CAAC;YAC3B,OAAO,CAAC,CAAC;QACb,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,CAAC;IAES,MAAM,CAAC,GAAG,CAAC,CAAS,EAAE,CAAS;QACrC,IAAI,OAAO,CAAC,KAAK,WAAW,EAAE,CAAC;YAC3B,OAAO,CAAC,CAAC;QACb,CAAC;QACD,IAAI,OAAO,CAAC,KAAK,WAAW,EAAE,CAAC;YAC3B,OAAO,CAAC,CAAC;QACb,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,CAAC,WAAyB;QAC7B,OAAO,IAAI,WAAW,CAAC;YACnB,UAAU,EAAE,WAAW,CAAC,GAAG,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;YACrE,UAAU,EAAE,WAAW,CAAC,GAAG,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;YACrE,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;YAC5D,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;SAC/D,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,WAAwB;QAC1B,OAAO,CACH,IAAI,CAAC,UAAU,KAAK,WAAW,CAAC,UAAU;YAC1C,IAAI,CAAC,UAAU,KAAK,WAAW,CAAC,UAAU;YAC1C,IAAI,CAAC,OAAO,KAAK,WAAW,CAAC,OAAO;YACpC,IAAI,CAAC,OAAO,KAAK,WAAW,CAAC,OAAO,CACvC,CAAC;IACN,CAAC;CACJ;AA/DD,kCA+DC"}
|
|
@@ -12,8 +12,8 @@ class PolarMeasureValue {
|
|
|
12
12
|
if (typeof json.measureValuePolarContainers === 'string') {
|
|
13
13
|
this.setPolarsAsString(json.measureValuePolarContainers);
|
|
14
14
|
}
|
|
15
|
-
else if (json.measureValuePolarContainers instanceof AbstractPolarMeasureValue_1.AbstractPolarMeasureValue
|
|
16
|
-
|
|
15
|
+
else if (json.measureValuePolarContainers instanceof AbstractPolarMeasureValue_1.AbstractPolarMeasureValue ||
|
|
16
|
+
json.measureValuePolarContainers instanceof PolarMeasureValue) {
|
|
17
17
|
this.setPolarsAsContainer(json.measureValuePolarContainers.getPolars());
|
|
18
18
|
}
|
|
19
19
|
else {
|
|
@@ -55,7 +55,7 @@ class PolarMeasureValue {
|
|
|
55
55
|
if (typeof polars === 'string') {
|
|
56
56
|
polars = JSON.parse(polars);
|
|
57
57
|
}
|
|
58
|
-
this.measureValuePolarContainers = polars.map(convertedPolar => new MeasureValuePolarContainer_1.MeasureValuePolarContainer(convertedPolar));
|
|
58
|
+
this.measureValuePolarContainers = polars.map((convertedPolar) => new MeasureValuePolarContainer_1.MeasureValuePolarContainer(convertedPolar));
|
|
59
59
|
}
|
|
60
60
|
catch (e) {
|
|
61
61
|
// console.warn('setPolarsAsString pb: ', e, typeof s, s);
|
|
@@ -80,12 +80,11 @@ class PolarMeasureValue {
|
|
|
80
80
|
}
|
|
81
81
|
let edgeValue = 0;
|
|
82
82
|
let distance = this.getDefaultDistance();
|
|
83
|
-
const measureValuePolarContainersFound = this.measureValuePolarContainers
|
|
84
|
-
.filter(c => c.azimuth === json.azimuthInDegrees);
|
|
83
|
+
const measureValuePolarContainersFound = this.measureValuePolarContainers.filter((c) => c.azimuth === json.azimuthInDegrees);
|
|
85
84
|
if (measureValuePolarContainersFound.length === 1) {
|
|
86
85
|
const measureValuePolarContainer = measureValuePolarContainersFound[0];
|
|
87
86
|
distance = measureValuePolarContainer.distance;
|
|
88
|
-
const edgeIndex =
|
|
87
|
+
const edgeIndex = json.distanceInMeters / distance - 1 - measureValuePolarContainer.edgeOffset;
|
|
89
88
|
if (0 <= edgeIndex && edgeIndex < measureValuePolarContainer.polarEdges.length) {
|
|
90
89
|
edgeValue = measureValuePolarContainer.polarEdges[edgeIndex];
|
|
91
90
|
}
|
|
@@ -93,7 +92,7 @@ class PolarMeasureValue {
|
|
|
93
92
|
return new PolarValue_1.PolarValue({
|
|
94
93
|
value: edgeValue,
|
|
95
94
|
polarAzimuthInDegrees: json.azimuthInDegrees,
|
|
96
|
-
polarDistanceInMeters: json.distanceInMeters
|
|
95
|
+
polarDistanceInMeters: json.distanceInMeters,
|
|
97
96
|
});
|
|
98
97
|
}
|
|
99
98
|
setPolarValue(json) {
|
|
@@ -103,11 +102,11 @@ class PolarMeasureValue {
|
|
|
103
102
|
}
|
|
104
103
|
let distance = this.getDefaultDistance();
|
|
105
104
|
const azimuth = json.azimuthInDegrees;
|
|
106
|
-
const found = this.measureValuePolarContainers.filter(c => c.azimuth === azimuth);
|
|
105
|
+
const found = this.measureValuePolarContainers.filter((c) => c.azimuth === azimuth);
|
|
107
106
|
if (found.length === 1) {
|
|
108
107
|
const measureValuePolarContainer = found[0];
|
|
109
108
|
distance = measureValuePolarContainer.distance;
|
|
110
|
-
const edgeIndex =
|
|
109
|
+
const edgeIndex = json.distanceInMeters / distance - 1 - measureValuePolarContainer.edgeOffset;
|
|
111
110
|
if (0 <= edgeIndex && edgeIndex < measureValuePolarContainer.polarEdges.length) {
|
|
112
111
|
measureValuePolarContainer.polarEdges[edgeIndex] = json.value;
|
|
113
112
|
}
|
|
@@ -123,7 +122,8 @@ class PolarMeasureValue {
|
|
|
123
122
|
measureValuePolarContainer.polarEdges = [json.value].concat(arrayWithNullValuesToAdd.concat(measureValuePolarContainer.polarEdges));
|
|
124
123
|
}
|
|
125
124
|
else if (edgeIndex > 0) {
|
|
126
|
-
measureValuePolarContainer.polarEdges =
|
|
125
|
+
measureValuePolarContainer.polarEdges =
|
|
126
|
+
measureValuePolarContainer.polarEdges.concat(arrayWithNullValuesToAdd.concat([json.value]));
|
|
127
127
|
}
|
|
128
128
|
}
|
|
129
129
|
}
|
|
@@ -139,7 +139,7 @@ class PolarMeasureValue {
|
|
|
139
139
|
const azimuth = measureValuePolarContainer.azimuth;
|
|
140
140
|
const distance = measureValuePolarContainer.distance;
|
|
141
141
|
const polarEdges = measureValuePolarContainer.polarEdges;
|
|
142
|
-
const azimuthIndex = azimuth * this.getAzimuthsCount() / 360;
|
|
142
|
+
const azimuthIndex = (azimuth * this.getAzimuthsCount()) / 360;
|
|
143
143
|
for (const [edgeIndex, value] of polarEdges.entries()) {
|
|
144
144
|
const edgeAbsoluteIndex = edgeIndex + measureValuePolarContainer.edgeOffset;
|
|
145
145
|
const valueSetter = (newValue) => {
|
|
@@ -148,7 +148,7 @@ class PolarMeasureValue {
|
|
|
148
148
|
onEachValue(new PolarValue_1.PolarValue({
|
|
149
149
|
value,
|
|
150
150
|
polarAzimuthInDegrees: azimuth,
|
|
151
|
-
polarDistanceInMeters: distance * (edgeAbsoluteIndex + 1)
|
|
151
|
+
polarDistanceInMeters: distance * (edgeAbsoluteIndex + 1),
|
|
152
152
|
}), azimuthIndex, edgeAbsoluteIndex, valueSetter);
|
|
153
153
|
}
|
|
154
154
|
}
|
|
@@ -169,16 +169,19 @@ class PolarMeasureValue {
|
|
|
169
169
|
}
|
|
170
170
|
getFiltered(options = {
|
|
171
171
|
nullValues: true,
|
|
172
|
-
ordered: false
|
|
172
|
+
ordered: false,
|
|
173
173
|
}) {
|
|
174
174
|
const azimuthsCount = this.getAzimuthsCount();
|
|
175
175
|
const polarEdgesCount = this.getPolarEdgesCount();
|
|
176
176
|
let measureValuePolarContainers = [];
|
|
177
177
|
for (const measureValuePolarContainer of this.measureValuePolarContainers) {
|
|
178
178
|
let filteredMeasureValuePolarContainer = measureValuePolarContainer;
|
|
179
|
-
if (measureValuePolarContainer.getFiltered &&
|
|
180
|
-
filteredMeasureValuePolarContainer
|
|
181
|
-
|
|
179
|
+
if (measureValuePolarContainer.getFiltered &&
|
|
180
|
+
filteredMeasureValuePolarContainer.getNotNullValuesCount) {
|
|
181
|
+
filteredMeasureValuePolarContainer =
|
|
182
|
+
measureValuePolarContainer.getFiltered(options);
|
|
183
|
+
if (options.nullValues &&
|
|
184
|
+
filteredMeasureValuePolarContainer.getNotNullValuesCount()) {
|
|
182
185
|
measureValuePolarContainers.push(filteredMeasureValuePolarContainer);
|
|
183
186
|
}
|
|
184
187
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PolarMeasureValue.js","sourceRoot":"","sources":["../../src/polar/PolarMeasureValue.ts"],"names":[],"mappings":";;;AAAA,6EAAwE;AAExE,6CAAwC;AACxC,2EAAsE;AAEtE,MAAa,iBAAiB;
|
|
1
|
+
{"version":3,"file":"PolarMeasureValue.js","sourceRoot":"","sources":["../../src/polar/PolarMeasureValue.ts"],"names":[],"mappings":"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"}
|