Merge branch 'main' of http://185.100.212.76:7776/Dwinzo-Beta/Dwinzo_dev
This commit is contained in:
1
app/.gitignore
vendored
1
app/.gitignore
vendored
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
# dependencies
|
# dependencies
|
||||||
/node_modules
|
/node_modules
|
||||||
|
/package-lock.json
|
||||||
/.pnp
|
/.pnp
|
||||||
.pnp.js
|
.pnp.js
|
||||||
|
|
||||||
|
|||||||
22266
app/package-lock.json
generated
22266
app/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -128,6 +128,25 @@ const ZoneGroup: React.FC = () => {
|
|||||||
const userId = localStorage.getItem('userId');
|
const userId = localStorage.getItem('userId');
|
||||||
const organization = (email!.split("@")[1]).split(".")[0];
|
const organization = (email!.split("@")[1]).split(".")[0];
|
||||||
|
|
||||||
|
const calculateCenter = (points: number[][]) => {
|
||||||
|
if (!points || points.length === 0) return null;
|
||||||
|
|
||||||
|
let sumX = 0, sumY = 0, sumZ = 0;
|
||||||
|
const numPoints = points.length;
|
||||||
|
|
||||||
|
points.forEach(([x, y, z]) => {
|
||||||
|
sumX += x;
|
||||||
|
sumY += y;
|
||||||
|
sumZ += z;
|
||||||
|
});
|
||||||
|
|
||||||
|
return [sumX / numPoints, sumY / numPoints, sumZ / numPoints] as [number, number, number];
|
||||||
|
};
|
||||||
|
|
||||||
|
const target: [number, number, number] | null = calculateCenter(zone.points);
|
||||||
|
if (!target) return;
|
||||||
|
const position = [target[0], 75, target[2]];
|
||||||
|
|
||||||
const input = {
|
const input = {
|
||||||
userId: userId,
|
userId: userId,
|
||||||
organization: organization,
|
organization: organization,
|
||||||
@@ -135,6 +154,8 @@ const ZoneGroup: React.FC = () => {
|
|||||||
zoneName: zone.zoneName,
|
zoneName: zone.zoneName,
|
||||||
zoneId: zone.zoneId,
|
zoneId: zone.zoneId,
|
||||||
points: zone.points,
|
points: zone.points,
|
||||||
|
viewPortCenter: target,
|
||||||
|
viewPortposition: position,
|
||||||
layer: zone.layer
|
layer: zone.layer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -148,6 +169,25 @@ const ZoneGroup: React.FC = () => {
|
|||||||
const userId = localStorage.getItem('userId');
|
const userId = localStorage.getItem('userId');
|
||||||
const organization = (email!.split("@")[1]).split(".")[0];
|
const organization = (email!.split("@")[1]).split(".")[0];
|
||||||
|
|
||||||
|
const calculateCenter = (points: number[][]) => {
|
||||||
|
if (!points || points.length === 0) return null;
|
||||||
|
|
||||||
|
let sumX = 0, sumY = 0, sumZ = 0;
|
||||||
|
const numPoints = points.length;
|
||||||
|
|
||||||
|
points.forEach(([x, y, z]) => {
|
||||||
|
sumX += x;
|
||||||
|
sumY += y;
|
||||||
|
sumZ += z;
|
||||||
|
});
|
||||||
|
|
||||||
|
return [sumX / numPoints, sumY / numPoints, sumZ / numPoints] as [number, number, number];
|
||||||
|
};
|
||||||
|
|
||||||
|
const target: [number, number, number] | null = calculateCenter(zone.points);
|
||||||
|
if (!target) return;
|
||||||
|
const position = [target[0], 75, target[2]];
|
||||||
|
|
||||||
const input = {
|
const input = {
|
||||||
userId: userId,
|
userId: userId,
|
||||||
organization: organization,
|
organization: organization,
|
||||||
@@ -155,6 +195,8 @@ const ZoneGroup: React.FC = () => {
|
|||||||
zoneName: zone.zoneName,
|
zoneName: zone.zoneName,
|
||||||
zoneId: zone.zoneId,
|
zoneId: zone.zoneId,
|
||||||
points: zone.points,
|
points: zone.points,
|
||||||
|
viewPortCenter: target,
|
||||||
|
viewPortposition: position,
|
||||||
layer: zone.layer
|
layer: zone.layer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -162,6 +204,7 @@ const ZoneGroup: React.FC = () => {
|
|||||||
socket.emit('v2:zone:set', input);
|
socket.emit('v2:zone:set', input);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const deleteZoneFromBackend = async (zoneId: string) => {
|
const deleteZoneFromBackend = async (zoneId: string) => {
|
||||||
|
|
||||||
const email = localStorage.getItem('email');
|
const email = localStorage.getItem('email');
|
||||||
|
|||||||
Reference in New Issue
Block a user