PR fixes
This commit is contained in:
parent
93601754d8
commit
5012dddbd6
@ -73,37 +73,46 @@ const frontlineDataA = {
|
|||||||
splineStep: 0.08,
|
splineStep: 0.08,
|
||||||
spacing: 10,
|
spacing: 10,
|
||||||
offsetDistance: 10,
|
offsetDistance: 10,
|
||||||
protrusionLength: 15,
|
|
||||||
protrusionStartSize: 5,
|
|
||||||
protrusionEndSize: 2,
|
|
||||||
protrusionGap: 20,
|
|
||||||
style: LEFT_SIDE,
|
style: LEFT_SIDE,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const protrusionDataA = {
|
||||||
|
length: 15,
|
||||||
|
startSize: 5,
|
||||||
|
endSize: 2,
|
||||||
|
gap: 20,
|
||||||
|
};
|
||||||
|
|
||||||
const frontlineDataB = {
|
const frontlineDataB = {
|
||||||
points: frontlinePointsB,
|
points: frontlinePointsB,
|
||||||
splineStep: 0.02,
|
splineStep: 0.02,
|
||||||
spacing: 10,
|
spacing: 10,
|
||||||
offsetDistance: 10,
|
offsetDistance: 10,
|
||||||
protrusionLength: 15,
|
|
||||||
protrusionStartSize: 5,
|
|
||||||
protrusionEndSize: 5,
|
|
||||||
protrusionGap: 20,
|
|
||||||
style: RIGHT_SIDE,
|
style: RIGHT_SIDE,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const protrusionDataB = {
|
||||||
|
length: 15,
|
||||||
|
startSize: 5,
|
||||||
|
endSize: 5,
|
||||||
|
gap: 20,
|
||||||
|
};
|
||||||
|
|
||||||
const frontlineDataC = {
|
const frontlineDataC = {
|
||||||
points: frontlinePointsC,
|
points: frontlinePointsC,
|
||||||
splineStep: 0.02,
|
splineStep: 0.02,
|
||||||
spacing: 10,
|
spacing: 10,
|
||||||
offsetDistance: 10,
|
offsetDistance: 10,
|
||||||
protrusionLength: 15,
|
|
||||||
protrusionStartSize: 5,
|
|
||||||
protrusionEndSize: 0,
|
|
||||||
protrusionGap: 20,
|
|
||||||
style: BOTH_SIDES,
|
style: BOTH_SIDES,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const protrusionDataC = {
|
||||||
|
length: 15,
|
||||||
|
startSize: 5,
|
||||||
|
endSize: 5,
|
||||||
|
gap: 20,
|
||||||
|
};
|
||||||
|
|
||||||
const arrowDataA = {
|
const arrowDataA = {
|
||||||
points: pointsA,
|
points: pointsA,
|
||||||
splineStep: 0.02,
|
splineStep: 0.02,
|
||||||
@ -163,20 +172,17 @@ const rectanglePoly = getRectanglePolygon(circleCenter, rectangleSideA, rectangl
|
|||||||
const rectangleToTurfPoly = toTurfPolygon(rectanglePoly);
|
const rectangleToTurfPoly = toTurfPolygon(rectanglePoly);
|
||||||
|
|
||||||
const frontlinePolygonA = getFrontline(frontlineDataA);
|
const frontlinePolygonA = getFrontline(frontlineDataA);
|
||||||
let frontlinePolygonMergedA = mergeTurfPolygons(frontlinePolygonA.body,frontlinePolygonA.protrusions[0]);
|
let frontlinePolygonMergedA = toTurfPolygon(frontlinePolygonA.body);
|
||||||
for (let i = 1; i < frontlinePolygonA.protrusions.length; i++)
|
|
||||||
{
|
|
||||||
frontlinePolygonMergedA = addTurfPolygonToMerge(frontlinePolygonMergedA, frontlinePolygonA.protrusions[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
const frontlinePolygonB = getFrontline(frontlineDataB);
|
|
||||||
|
const frontlinePolygonB = getFrontline(frontlineDataB, protrusionDataB);
|
||||||
let frontlinePolygonMergedB = mergeTurfPolygons(frontlinePolygonB.body,frontlinePolygonB.protrusions[0]);
|
let frontlinePolygonMergedB = mergeTurfPolygons(frontlinePolygonB.body,frontlinePolygonB.protrusions[0]);
|
||||||
for (let i = 1; i < frontlinePolygonB.protrusions.length; i++)
|
for (let i = 1; i < frontlinePolygonB.protrusions.length; i++)
|
||||||
{
|
{
|
||||||
frontlinePolygonMergedB = addTurfPolygonToMerge(frontlinePolygonMergedB, frontlinePolygonB.protrusions[i]);
|
frontlinePolygonMergedB = addTurfPolygonToMerge(frontlinePolygonMergedB, frontlinePolygonB.protrusions[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
const frontlinePolygonC = getFrontline(frontlineDataC);
|
const frontlinePolygonC = getFrontline(frontlineDataC, protrusionDataC);
|
||||||
|
|
||||||
let frontlinePolygonMergedLeft = mergeTurfPolygons(frontlinePolygonC.bodyLeft, frontlinePolygonC.protrusionsLeft[0]);
|
let frontlinePolygonMergedLeft = mergeTurfPolygons(frontlinePolygonC.bodyLeft, frontlinePolygonC.protrusionsLeft[0]);
|
||||||
for (let i = 1; i < frontlinePolygonC.protrusionsLeft.length; i++) {
|
for (let i = 1; i < frontlinePolygonC.protrusionsLeft.length; i++) {
|
||||||
|
|||||||
2
package-lock.json
generated
2
package-lock.json
generated
@ -2718,7 +2718,7 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/athena-utils": {
|
"node_modules/athena-utils": {
|
||||||
"resolved": "git+https://git.projectathena.ca/andyaxxe/athena-utils.git#03f16f45f2",
|
"resolved": "git+https://git.projectathena.ca/andyaxxe/athena-utils.git#d21133ef0f",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@turf/turf": "7.2.0"
|
"@turf/turf": "7.2.0"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user