@fleet-frontend/mower-maps 0.2.5-beta.28 → 0.2.5-beta.29

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/dist/index.esm.js CHANGED
@@ -27978,7 +27978,14 @@ const usePosition = ({ mowerPositionData, viewBox, modelType, hasEdger, mapData,
27978
27978
  const relY = (sy - viewBox.y) / viewBox.height;
27979
27979
  if (!isFinite(relX) || !isFinite(relY))
27980
27980
  return;
27981
- updatePosition({ postureX: x, postureY: y, postureTheta: theta }, 0);
27981
+ const inChargingPiles = [RobotStatus.CHARGING, RobotStatus.PARKED];
27982
+ const isInChargingPile = inChargingPiles.includes(mowerPositionData?.vehicleState);
27983
+ if (isInChargingPile) {
27984
+ resetInCharginPie();
27985
+ }
27986
+ else {
27987
+ updatePosition({ postureX: x, postureY: y, postureTheta: theta }, 0);
27988
+ }
27982
27989
  setFirstRender(false);
27983
27990
  }, [mowerPositionData, viewBox, modelType, hasEdger]);
27984
27991
  return {
@@ -29957,13 +29964,25 @@ modelType, showStraddleBoundaryBorder = true, mapRef, mapJson, pathJson, realTim
29957
29964
  const mowerPositionData = useMemo(() => {
29958
29965
  // realTimeData 中包含三个种类的数据,之需要实时坐标的数据即可。
29959
29966
  // 在初始的状态按照正常图标进行渲染,所以构造一个基本在rtk桩的一个数据
29960
- if (!realTimeData || realTimeData.length === 0)
29961
- return {
29962
- postureX: 0.01,
29963
- postureY: 0.1,
29964
- postureTheta: 0.01,
29965
- vehicleState: RobotStatus.PARKED,
29966
- };
29967
+ if (!realTimeData || realTimeData.length === 0) {
29968
+ const chargingPiles = svgElementDatas?.[DataType.CHARGING_PILE]?.[0];
29969
+ if (chargingPiles?.position) {
29970
+ return {
29971
+ postureX: chargingPiles.position?.[0],
29972
+ postureY: chargingPiles.position?.[1],
29973
+ postureTheta: chargingPiles.direction - Math.PI || 0,
29974
+ vehicleState: RobotStatus.PARKED,
29975
+ };
29976
+ }
29977
+ else {
29978
+ return {
29979
+ postureX: 0.01,
29980
+ postureY: 0.1,
29981
+ postureTheta: 0.01,
29982
+ vehicleState: RobotStatus.PARKED,
29983
+ };
29984
+ }
29985
+ }
29967
29986
  let currentPositionData;
29968
29987
  if (realTimeData.length === 1 && realTimeData[0].type === RealTimeDataType.LOCATION) {
29969
29988
  currentPositionData = realTimeData[0];
package/dist/index.js CHANGED
@@ -27998,7 +27998,14 @@ const usePosition = ({ mowerPositionData, viewBox, modelType, hasEdger, mapData,
27998
27998
  const relY = (sy - viewBox.y) / viewBox.height;
27999
27999
  if (!isFinite(relX) || !isFinite(relY))
28000
28000
  return;
28001
- updatePosition({ postureX: x, postureY: y, postureTheta: theta }, 0);
28001
+ const inChargingPiles = [RobotStatus.CHARGING, RobotStatus.PARKED];
28002
+ const isInChargingPile = inChargingPiles.includes(mowerPositionData?.vehicleState);
28003
+ if (isInChargingPile) {
28004
+ resetInCharginPie();
28005
+ }
28006
+ else {
28007
+ updatePosition({ postureX: x, postureY: y, postureTheta: theta }, 0);
28008
+ }
28002
28009
  setFirstRender(false);
28003
28010
  }, [mowerPositionData, viewBox, modelType, hasEdger]);
28004
28011
  return {
@@ -29977,13 +29984,25 @@ modelType, showStraddleBoundaryBorder = true, mapRef, mapJson, pathJson, realTim
29977
29984
  const mowerPositionData = React.useMemo(() => {
29978
29985
  // realTimeData 中包含三个种类的数据,之需要实时坐标的数据即可。
29979
29986
  // 在初始的状态按照正常图标进行渲染,所以构造一个基本在rtk桩的一个数据
29980
- if (!realTimeData || realTimeData.length === 0)
29981
- return {
29982
- postureX: 0.01,
29983
- postureY: 0.1,
29984
- postureTheta: 0.01,
29985
- vehicleState: RobotStatus.PARKED,
29986
- };
29987
+ if (!realTimeData || realTimeData.length === 0) {
29988
+ const chargingPiles = svgElementDatas?.[exports.DataType.CHARGING_PILE]?.[0];
29989
+ if (chargingPiles?.position) {
29990
+ return {
29991
+ postureX: chargingPiles.position?.[0],
29992
+ postureY: chargingPiles.position?.[1],
29993
+ postureTheta: chargingPiles.direction - Math.PI || 0,
29994
+ vehicleState: RobotStatus.PARKED,
29995
+ };
29996
+ }
29997
+ else {
29998
+ return {
29999
+ postureX: 0.01,
30000
+ postureY: 0.1,
30001
+ postureTheta: 0.01,
30002
+ vehicleState: RobotStatus.PARKED,
30003
+ };
30004
+ }
30005
+ }
29987
30006
  let currentPositionData;
29988
30007
  if (realTimeData.length === 1 && realTimeData[0].type === RealTimeDataType.LOCATION) {
29989
30008
  currentPositionData = realTimeData[0];
@@ -1 +1 @@
1
- {"version":3,"file":"MowerMapRenderer.d.ts","sourceRoot":"","sources":["../../src/render/MowerMapRenderer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAQN,MAAM,OAAO,CAAC;AAwBf,OAAO,EAGL,qBAAqB,EACrB,mBAAmB,EAEpB,MAAM,mBAAmB,CAAC;AA0B3B,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,MAAM,EAAE,GAAG,CAAC;KACb;CACF;AAMD,eAAO,MAAM,gBAAgB,mGA80B5B,CAAC;AAIF,eAAe,gBAAgB,CAAC;AAChC,YAAY,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,CAAC"}
1
+ {"version":3,"file":"MowerMapRenderer.d.ts","sourceRoot":"","sources":["../../src/render/MowerMapRenderer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAQN,MAAM,OAAO,CAAC;AAwBf,OAAO,EAGL,qBAAqB,EACrB,mBAAmB,EAEpB,MAAM,mBAAmB,CAAC;AA0B3B,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,MAAM,EAAE,GAAG,CAAC;KACb;CACF;AAMD,eAAO,MAAM,gBAAgB,mGAy1B5B,CAAC;AAIF,eAAe,gBAAgB,CAAC;AAChC,YAAY,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"usePosition.d.ts","sourceRoot":"","sources":["../../../src/render/mowerPosition/usePosition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAoB,WAAW,EAAE,MAAM,SAAS,CAAC;AAKjE,UAAU,kBAAkB;IAC1B,iBAAiB,EAAE,mBAAmB,GAAG,SAAS,GAAG,IAAI,CAAC;IAC1D,OAAO,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACzE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IACrB,sBAAsB,CAAC,EAAE,CAAC,YAAY,EAAE;QACtC,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,YAAY,CAAC,EAAE,WAAW,CAAC;KAC5B,KAAK,IAAI,CAAC;CACZ;AAED,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,WAAW,GAAI,qGAQzB,kBAAkB;6CAiHA,mBAAmB;kDAQnB,mBAAmB,kBAAiB,MAAM;qCA5E1C,mBAAmB,kBAAiB,MAAM;mDAqG1C,mBAAmB;;CA8FvC,CAAC;AAEF,YAAY,EAAE,SAAS,EAAE,CAAC"}
1
+ {"version":3,"file":"usePosition.d.ts","sourceRoot":"","sources":["../../../src/render/mowerPosition/usePosition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAoB,WAAW,EAAE,MAAM,SAAS,CAAC;AAKjE,UAAU,kBAAkB;IAC1B,iBAAiB,EAAE,mBAAmB,GAAG,SAAS,GAAG,IAAI,CAAC;IAC1D,OAAO,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACzE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IACrB,sBAAsB,CAAC,EAAE,CAAC,YAAY,EAAE;QACtC,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,YAAY,CAAC,EAAE,WAAW,CAAC;KAC5B,KAAK,IAAI,CAAC;CACZ;AAED,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,WAAW,GAAI,qGAQzB,kBAAkB;6CAiHA,mBAAmB;kDAQnB,mBAAmB,kBAAiB,MAAM;qCA5E1C,mBAAmB,kBAAiB,MAAM;mDAqG1C,mBAAmB;;CAoGvC,CAAC;AAEF,YAAY,EAAE,SAAS,EAAE,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fleet-frontend/mower-maps",
3
- "version": "0.2.5-beta.28",
3
+ "version": "0.2.5-beta.29",
4
4
  "type": "module",
5
5
  "description": "a mower maps in google maps",
6
6
  "main": "dist/index.js",