add debugging

Author: okauppinen

bundles/paikkatietoikkuna/coordinatetransformation/handler/ViewHandler.js

@@ -4,8 +4,8 @@ import { showFilePopup } from '../view/FilePopup';
 import { showConfirmPopup } from '../view/ConfirmPopup';
 import { showClipboardPopup } from '../view/ClipboardPopup';
 import { showMapSelectPopup, showMapPreviewPopup } from '../view/MapPopup';
-import { SOURCE, MAP, WATCH_JOB, WATCH_URL, FILE_DEFAULTS, ACTIONS, PAGINATION } from '../constants';
-import { stateToPTIArray, stateToTransformRequest, stateToKomuRequest, parseKomuResponse, validateFileSettings, validateTransform, validateCoordinate, parseCoordinateValue, is3DSystem, getDimension, getLabelForMarker } from '../helper';
+import { SOURCE, MAP, WATCH_JOB, WATCH_URL, FILE_DEFAULTS, ACTIONS, PAGINATION, SRS } from '../constants';
+import { stateToPTIArray, stateToTransformRequest, stateToKomuRequest, parseKomuResponse, validateFileSettings, validateTransform, validateCoordinate, parseCoordinateValue, is3DSystem, getDimension, getLabelForMarker, getCoordinatesExtent } from '../helper';
 import { parseFile, parseFileContents, parseValue } from './FileParser';
 import { exportStateToFile } from './FileWriter';
 
@@ -45,6 +45,7 @@ class UIHandler extends StateHandler {
         this.baseUrl = conf.url;
         this.transformFunction = this.getTransformFunction(conf);
         Oskari.urls.set(WATCH_JOB, WATCH_URL);
+        this.log = Oskari.log('CoordTransHandler');
     }
 
     getTransformFunction ({ url, contentType }) {
@@ -184,8 +185,8 @@ class UIHandler extends StateHandler {
                 .map(([x, y, z]) => ({ x, y, z }));
             this.addSourceToState('clipboard');
             this.updateState({ coordinates, transformed: false });
-        } catch {
-            // TODO: error handling
+        } catch (err) {
+            this.log.debug(err);
             Messaging.error(this.loc('transform.errors.paste'));
         }
     }
@@ -299,7 +300,7 @@ class UIHandler extends StateHandler {
                 import: newSettings // { ...settings, ...contents.settings }
             });
         }).catch(err => {
-            console.log(err);
+            this.log.debug(err);
             Messaging.error(this.log('transform.errors.import'));
         });
     }
@@ -517,9 +518,21 @@ class UIHandler extends StateHandler {
             this.showConfirmTransform(warnings);
             return;
         }
+        if (this.log.isDebug()) {
+            this.debugTransform();
+        }
         this.transformFunction();
     }
 
+    debugTransform () {
+        const { inputSrs, coordinates } = this.getState();
+        const { bounds = [] } = SRS.find(s => s.value === inputSrs) || {};
+        const info = getCoordinatesExtent(coordinates, inputSrs);
+        this.log.debug('Projected bounds for:', inputSrs, bounds);
+        Object.keys(info).forEach(key => this.log.debug(key, '=>', info[key]));
+    }
+
+
     importFileContentsToInputTable () {
         const errors = validateFileSettings(this.getState(), 'import');
         if (errors.length) {
@@ -549,7 +562,7 @@ class UIHandler extends StateHandler {
         try {
             exportStateToFile(state);
         } catch (err) {
-            console.log(err);
+            this.log.debug(err);
             Messaging.error(this.loc('transform.errors.export'));
         }
         this.updateState({ loading: false });
@@ -702,7 +715,6 @@ class UIHandler extends StateHandler {
     showResponseError (response) {
         const { error, info } = response || {};
         const key = info?.errorKey || error?.errorKey || 'generic';
-        Oskari.log('CoordTransHandler').error(error);
         Messaging.error(this.loc(`transform.errors.${key}`));
         this.updateState({ loading: false });
     }

bundles/paikkatietoikkuna/coordinatetransformation/helper.js

@@ -209,6 +209,46 @@ export const getLabelForMarker = (coord, srs) => {
     */
 };
 
+// Added for debugging
+export const getCoordinatesExtent = (coordinates, srs) => {
+    if (!coordinates.length) {
+        return {};
+    }
+    const swap = !isLonFirst(srs);
+    let minX = Infinity;
+    let maxX = -Infinity;
+    let minY = Infinity;
+    let maxY = -Infinity;
+    coordinates.forEach(({ x, y }, i) => {
+        const coord = swap ? [y, x] : [x, y];
+        if (coord.some(c => typeof c !== 'number' || isNaN(c))) {
+            Oskari.log('CoordTransHelper').warn('Invalid coord:', coord, 'at:', i);
+            return;
+        }
+        if (coord[0] < minX) {
+            minX = coord[0];
+        }
+        if (coord[0] > maxX) {
+            maxX = coord[0];
+        }
+        if (coord[1] < minY) {
+            minY = coord[1];
+        }
+        if (coord[1] > maxY) {
+            maxY = coord[1];
+        }
+    });
+    // wkt: left-bottom counterclockwise closed
+    return {
+        extent: [minX, minY, maxX, maxY],
+        bbox: { left: minX, bottom: minY, right: maxX, top: maxY },
+        min: { x: swap ? minY : minX, y: swap ? minX : minY},
+        max: { x: swap ? maxY : maxX, y: swap ? maxX : maxY},
+        wkt: `POLYGON ((${minX} ${minY}, ${maxX} ${minY}, ${maxX} ${maxY}, ${minX} ${maxY}, ${minX} ${minY}))`
+    };
+    // Oskari.getSandbox().postRequestByName('MapModulePlugin.AddFeaturesToMapRequest', [wkt, { layerId: 'komu', centerTo: true }]);
+};
+
 export const coordinateToMarker = (coord, isNew) => {
     const { colors, ...props } = MARKER;
     const { x, y, label } = coord;