@mtes-mct/monitor-ui 8.8.0 → 9.0.1

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+# [9.0.0](https://github.com/MTES-MCT/monitor-ui/compare/v8.8.0...v9.0.0) (2023-08-23)
+
+
+### Bug Fixes
+
+* **utils:** fix getCoordinates rounding ([622d9fc](https://github.com/MTES-MCT/monitor-ui/commit/622d9fc887b663a92a30b74bd8a64bfb56acf40d))
+
+
+* feat(utils)!: add prop to getOptionsFromLabelledEnum function for sorted or not the options ([4ff53fe](https://github.com/MTES-MCT/monitor-ui/commit/4ff53fe398f3ac2d24a858f2f4c305d7880a22d0))
+
+
+### BREAKING CHANGES
+
+* - add mustSort prop with default value to false for sorted or not the options
+
+# [8.8.0](https://github.com/MTES-MCT/monitor-ui/compare/v8.7.0...v8.8.0) (2023-08-22)
+
+
+### Features
+
+* **utils:** add pluralize() ([57663f7](https://github.com/MTES-MCT/monitor-ui/commit/57663f78110e0ea66771a74699c712eb757431d1))
+* **utils:** expose cleanString() & normalizeString() ([41a6a6f](https://github.com/MTES-MCT/monitor-ui/commit/41a6a6f936e403aa66bf999664f0e5ad1f7c63fd))
+
 # [8.7.0](https://github.com/MTES-MCT/monitor-ui/compare/v8.6.1...v8.7.0) (2023-08-22)
 
 

package/README.md

@@ -2,8 +2,8 @@
 
 [![License][img-license]][lnk-license] [![CI Status][img-github]][lnk-github] [![NPM Version][img-npm]][lnk-npm]
 
-> Common React components, hooks, utilities and CSS stylesheets for [Monitorfish][lnk-github-monitorfish] and
-> [Monitorenv][lnk-github-monitorenv].
+> Common React components, hooks, utilities and CSS stylesheets for [MonitorFish][lnk-github-monitorfish],
+> [MonitorEnv][lnk-github-monitorenv] and [RapportNav][lnk-github-rapportnav].
 
 ## Usage
 
@@ -63,6 +63,7 @@ Please read the [contributing document](CONTRIBUTING.md) for setup and contribut
 [lnk-github]: https://github.com/MTES-MCT/monitor-ui/actions?query=branch%3Amain++
 [lnk-github-monitorenv]: https://github.com/MTES-MCT/monitorenv
 [lnk-github-monitorfish]: https://github.com/MTES-MCT/monitorfish
+[lnk-github-rapportnav]: https://github.com/MTES-MCT/rapportnav2
 [lnk-license]: https://github.com/MTES-MCT/monitor-ui/blob/main/LICENSE
 [lnk-npm]: https://www.npmjs.com/package/@mtes-mct/monitor-ui
 [lnk-storybook]: https://mtes-mct.github.io/monitor-ui/

package/index.js

@@ -2350,7 +2350,9 @@ function Item({ accent, Icon, ...originalProps }) {
 const SecondaryDropdownItem = styled(Dropdown$1.Item) `
   background-color: ${p => p.theme.color.cultured};
   border: 1px solid ${p => p.theme.color.lightGray};
-  padding: 5px 7px;
+  padding: 4px;
+  width: 30px;
+  height: 30px;
   :hover {
     background-color: ${p => p.theme.color.cultured};
     border: 1px solid ${p => p.theme.color.lightGray};
@@ -35985,28 +35987,44 @@ function getDMSCoordinates(transformedCoordinates) {
 }
 function getDMDFromDecimal(dd, latitudeOrLongitude) {
     const hemisphere = getHemisphere(dd, latitudeOrLongitude);
-    const absDD = Math.abs(dd);
-    const degrees = truncate(absDD);
-    const minutes = truncate((absDD - degrees) * 60);
-    let decimal = (absDD - degrees) * 60;
-    decimal -= Math.floor(decimal);
-    decimal = Math.round(decimal * 1000);
+    // Get the decimal degrees as an absolute value
+    const absoluteDecimalDegrees = Math.abs(dd);
+    const degrees = truncate(absoluteDecimalDegrees);
+    const [minutesInteger, minuteDecimals] = getMinutes(absoluteDecimalDegrees, degrees);
     const formattedDegrees = getPaddedDegrees(degrees, latitudeOrLongitude);
-    const formattedMinutes = minutes.toString().padStart(2, '0');
-    const formattedDecimal = decimal.toString().padStart(3, '0').substring(0, 3);
+    const formattedMinutes = minutesInteger.padStart(2, '0');
+    const formattedDecimal = minuteDecimals.padStart(3, '0').substring(0, 3);
     return `${formattedDegrees}° ${formattedMinutes}.${formattedDecimal}′ ${hemisphere}`;
 }
 function getDMSFromDecimal(dd, latitudeOrLongitude) {
     const hemisphere = getHemisphere(dd, latitudeOrLongitude);
-    const absDD = Math.abs(dd);
-    const degrees = truncate(absDD);
-    const minutes = truncate((absDD - degrees) * 60);
-    const seconds = (Math.round((((absDD - degrees) * 60 - minutes) * 60 + Number.EPSILON) * 100) / 100).toFixed(0);
+    // Get the decimal degrees as an absolute value
+    const absoluteDecimalDegrees = Math.abs(dd);
+    const degrees = truncate(absoluteDecimalDegrees);
+    const [minutesInteger, minutesDecimal] = getMinutes(absoluteDecimalDegrees, degrees);
+    // Get the seconds by multiplying the decimal part by 60
+    const seconds = (Number(minutesDecimal) * 1e-3 * 60).toFixed(0);
     const formattedDegrees = getPaddedDegrees(degrees, latitudeOrLongitude);
-    const formattedMinutes = minutes.toString().padStart(2, '0');
+    const formattedMinutes = minutesInteger.padStart(2, '0');
     const formattedSeconds = seconds.toString().padStart(2, '0');
     return `${formattedDegrees}° ${formattedMinutes}′ ${formattedSeconds}″${hemisphere ? ` ${hemisphere}` : ''}`;
 }
+/**
+ * Get the minutes
+ * @return - the minutes as an array of [minutesInteger, minuteDecimals]
+ */
+const getMinutes = (absoluteDecimalDegrees, degrees) => {
+    // Get the minutes by multiplying the decimal part by 60
+    let minutes = Number((absoluteDecimalDegrees - degrees) * 60).toFixed(3);
+    if (minutes.split('.').length < 1) {
+        minutes += '.000';
+    }
+    const [minutesInteger, minuteDecimals] = minutes.split('.');
+    if (!minutesInteger || !minuteDecimals) {
+        throw new Error('`minutesInteger` or `minuteDecimals` are undefined.');
+    }
+    return [minutesInteger, minuteDecimals];
+};
 const getHemisphere = (dd, latitudeOrLongitude) => {
     if (dd === 0) {
         return '';
@@ -36034,6 +36052,12 @@ const getPaddedDegrees = (degrees, latitudeOrLongitude) => {
             return '';
     }
 };
+/**
+ * If n > 0
+ * - Get the largest integer less than or equal to n
+ * - Else, rounds n to the next largest integer.
+ * @param n - number
+ */
 function truncate(n) {
     return n > 0 ? Math.floor(n) : Math.ceil(n);
 }
@@ -36637,11 +36661,15 @@ function getOptionsFromIdAndName(collection) {
     }));
 }
 
-function getOptionsFromLabelledEnum(labelledEnum) {
-    return fp.sortBy(['label'], Object.entries(labelledEnum).map(([value, label]) => ({
+function getOptionsFromLabelledEnum(labelledEnum, mustSort = false) {
+    const formattedOptions = Object.entries(labelledEnum).map(([value, label]) => ({
         label,
         value
-    })));
+    }));
+    if (mustSort) {
+        return fp.sortBy(['label'], formattedOptions);
+    }
+    return formattedOptions;
 }
 
 function isArray(value) {