Parsing for different degree units

ZakarFin · ZakarFin · commit e27f7be14fde · 2025-08-29T10:58:31.000+03:00
diff --git a/bundles/paikkatietoikkuna/coordinatetransformation/components/FilePreview.jsx b/bundles/paikkatietoikkuna/coordinatetransformation/components/FilePreview.jsx
@@ -2,6 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { Message, Card, WarningIcon } from 'oskari-ui';
 import { ErrorBoundary } from 'oskari-ui/util';
+import { parseValue } from '../handler/FileParser';
 
 const MAX_COLUMNS = 4;
 
@@ -24,7 +25,7 @@ const RawPreviewNode = styled.pre`
 `;
 
 const ParseHeaderRow = ({ fileContents }) => {
-    if (!fileContents.headers) {
+    if (!fileContents.headers?.length || !fileContents.headerLines?.length) {
         return null;
     }
     const headerLineCount = fileContents.headerLines.length;
@@ -45,8 +46,8 @@ const ParseHeaderRow = ({ fileContents }) => {
         </thead>)
 }
 
-const PreviewCell = ({ data }) => {
-    const numberValue = parseFloat(data);
+const PreviewCell = ({ data, dataFormat }) => {
+    const numberValue = parseValue(data, dataFormat);
     if (isNaN(numberValue)) {
         // show raw value
         return (<PreviewCellStyle className={'invalid'}>{data} <WarningIcon/></PreviewCellStyle>);
@@ -55,8 +56,8 @@ const PreviewCell = ({ data }) => {
     return (<PreviewCellStyle>{numberValue}</PreviewCellStyle>);
 };
 
-const ParseDataRow = ({ fileContents }) => {
-    if (!fileContents.data) {
+const ParseDataRow = ({ fileContents, dataFormat }) => {
+    if (!fileContents.data || !fileContents.data.length) {
         return null;
     }
     // only show max 2 rows and 4 columns of data
@@ -71,9 +72,9 @@ const ParseDataRow = ({ fileContents }) => {
         previewData = previewData.map(data => data.slice(0, MAX_COLUMNS));
         colCount = MAX_COLUMNS;
     }
-    const previewRows = previewData.map(data => (
-            <tr>
-                { data.map(cell => (<PreviewCell data={ cell } />)) }
+    const previewRows = previewData.map((data, i) => (
+            <tr key={ 'data_' + i }>
+                { data.map(cell => (<PreviewCell key={i + '_' + cell} data={ cell } dataFormat={ dataFormat } />)) }
             </tr>
         ));
     let extraMessages = [];
@@ -87,7 +88,7 @@ const ParseDataRow = ({ fileContents }) => {
         extraMessages.push(<React.Fragment>{colCountOriginal - colCount} <Message messageKey='fileSettings.columns' /></React.Fragment>);
     }
     if (extraMessages.length) {
-        previewRows.push(<tr>
+        previewRows.push(<tr key='metadata'>
                 <HasMoreCell colSpan={ colCount }>
                     + {extraMessages}
                 </HasMoreCell>
@@ -102,7 +103,7 @@ const RawPreviewRow = ({ fileContents }) => {
     return (<RawPreviewNode>{ previewLines.join('\r\n') + '\r\n...' }</RawPreviewNode>);
 };
 
-export const FilePreview = ({ fileContents }) => {
+export const FilePreview = ({ fileContents, dataFormat }) => {
     if (!fileContents) {
         return null;
     }
@@ -113,7 +114,7 @@ export const FilePreview = ({ fileContents }) => {
                 <table>
                     <ParseHeaderRow fileContents={fileContents} />
                     <tbody>
-                        <ParseDataRow fileContents={fileContents} />
+                        <ParseDataRow fileContents={fileContents} dataFormat={dataFormat} />
                     </tbody>
                 </table>
                 <RawPreviewRow fileContents={fileContents} />
diff --git a/bundles/paikkatietoikkuna/coordinatetransformation/components/FileSettings.jsx b/bundles/paikkatietoikkuna/coordinatetransformation/components/FileSettings.jsx
@@ -16,15 +16,13 @@ const FILE_INPUT_PROPS = {
 };
 
 const OPTIONS = {
-    importSelect: ['decimalSeparator', 'coordinateSeparator'],
-    importCheckbox: ['prefixId', 'axisFlip'],
+    importSelect: ['coordinateSeparator', 'decimalSeparator'],
+    importCheckbox: ['prefixId' /*, 'axisFlip' */],
     exportSelect: ['decimalCount', 'decimalSeparator', 'coordinateSeparator', 'lineSeparator'],
     exportCheckbox: ['prefixId', 'axisFlip', 'writeHeader', 'writeLineEndings', 'writeCardinals'],
     options: {...SEPARATORS, decimalCount: DECIMAL, unit: DEGREE }
 };
 
-const IMPORT = ['headerLineCount', 'prefixId', 'axisFlip'];
-
 const Content = styled.div`
     display: flex;
     flex-direction: column;
@@ -63,10 +61,10 @@ export const ImportFile = ({ import: values, inputSrs, files, fileContents, cont
         <Content>
             <FileInput mandatory onFiles={controller.setFiles} files={files} { ...FILE_INPUT_PROPS } />
             <LabeledInput number min={0} label='fileSettings.options.headerLineCount' value={values.headerLineCount} onChange={value => onChange('headerLineCount', value)} controller={controller}/>
-            { showDegreeUnit(inputSrs) && <SelectOption id='unit' controller={controller} onChange={onChange} value={values.unit}/> }
             { OPTIONS.importSelect.map(id => <SelectOption key={id} id={id} controller={controller} onChange={onChange} value={values[id]}/>)}
+            { showDegreeUnit(inputSrs) && <SelectOption id='unit' controller={controller} onChange={onChange} value={values.unit}/> }
             { OPTIONS.importCheckbox.map(id => <CheckboxOption key={id} id={id} controller={controller} onChange={onChange} checked={values[id]}/>)}
-            <FilePreview fileContents={fileContents} />
+            <FilePreview fileContents={fileContents} dataFormat={values.unit} />
         </Content>
     );
 };
diff --git a/bundles/paikkatietoikkuna/coordinatetransformation/handler/FileParser.js b/bundles/paikkatietoikkuna/coordinatetransformation/handler/FileParser.js
@@ -1,4 +1,4 @@
-import { SEPARATORS } from '../constants';
+import { DEGREE, SEPARATORS } from '../constants';
 
 export const parseFile = (file) => {
     return new Promise((resolve, reject) => {
@@ -49,6 +49,63 @@ export const parseFileContents = (lines = [], delimiter = ';', headerLineCount =
     };
 };
 
+const HOUR_TO_MIN = 60;
+const HOUR_TO_SEC = 3600;
+// 2 * pi =~ 6.283185307179586476925286766559
+const PI2 = Math.PI * 2;
+const DEC_TO_GRAD = 10 / 9;
+const DEC_TO_RAD = PI2 / 360;
+
+// https://github.com/nls-oskari/kartta.paikkatietoikkuna.fi/blob/master/service-coordtransform/src/main/java/fi/nls/paikkatietoikkuna/coordtransform/CoordTransService.java#L25-L26
+export const parseValue = (value, format = 'default') => {
+    if (typeof value === 'undefined') {
+        return NaN;
+    }
+    const asNumber = parseFloat(value);
+    const unitItem = DEGREE.find(unit => unit.value === format);
+    if (!unitItem) {
+        return parseFloat(value);
+    }
+    if (format === 'gradian') {
+        return asNumber / DEC_TO_GRAD;
+    } else if (format === 'radian') {
+        return asNumber / DEC_TO_RAD;
+    } else if (!format?.startsWith('DD')) {
+        return asNumber;
+    }
+    // parsing the degree format
+    const degreeValue = value.replaceAll(' ', '');
+    const degreeFormat = format.replaceAll(' ', '');
+    if (degreeFormat === 'DD') {
+        return asNumber;
+    } else if (degreeFormat === 'DDMM') {
+        // value should be a string of length 4+
+        if (degreeValue.length < 4) {
+            return NaN;
+        }
+        const dd = parseFloat(degreeValue.substring(0, 2));
+        const mm = parseFloat(degreeValue.substring(2));
+        if (isNaN(dd) || isNaN(mm)) {
+            return NaN;
+        }
+        return dd + mm / HOUR_TO_MIN;
+    } else if (degreeFormat === 'DDMMSS') {
+        // value should be a string of length 5+
+        if (degreeValue.length < 5) {
+            return NaN;
+        }
+        const dd = parseFloat(degreeValue.substring(0, 2));
+        const mm = parseFloat(degreeValue.substring(2, 4));
+        const ss = parseFloat(degreeValue.substring(4));
+        if (isNaN(dd) || isNaN(mm) || isNaN(ss)) {
+            return NaN;
+        }
+        return dd + (mm / HOUR_TO_MIN) + (ss / HOUR_TO_SEC);
+    }
+
+    return asNumber;
+};
+
 const interpretFileContents = (lines = []) => {
     const delimiter = detectDelimiter(lines[0]);
     const headerLineCount = countHeaders(lines, delimiter);
diff --git a/bundles/paikkatietoikkuna/coordinatetransformation/handler/ViewHandler.js b/bundles/paikkatietoikkuna/coordinatetransformation/handler/ViewHandler.js
@@ -5,7 +5,7 @@ import { showConfirmPopup } from '../view/ConfirmPopup';
 import { showMapSelectPopup, showMapPreviewPopup } from '../view/MapPopup';
 import { SOURCE, MAP, WATCH_JOB, WATCH_URL, TRANSFORM, FILE_DEFAULTS, SEPARATORS } from '../constants';
 import { stateToPTIArray, loadFile, validateTransform, validateFileSettings, parseCoordinateValue, is3DSystem } from '../helper';
-import { parseFile, parseFileContents } from './FileParser';
+import { parseFile, parseFileContents, parseValue } from './FileParser';
 
 const getInitialState = () => ({
     loading: false,
@@ -357,7 +357,8 @@ class UIHandler extends StateHandler {
     }
 
     importFileContentsToInputTable () {
-        const { fileContents } = this.getState();
+        const { fileContents, import: importSettings } = this.getState();
+        const { unit } = importSettings;
         /* {
             delimiter,
             // TODO: we don't need this when we don't send the file to backend
@@ -374,7 +375,11 @@ class UIHandler extends StateHandler {
             alert('NOPE');
             return;
         }
-        const coordinates = fileContents.data.map(([x, y, z]) => ({ x, y, z }));
+        const coordinates = fileContents.data.map(([x, y, z]) => ({
+            x: parseValue(x, unit),
+            y: parseValue(y, unit),
+            z: parseValue(z, unit)
+        }));
         this.updateState({ coordinates });
     }
 
