Check format from config.

oskariorg · Aug 8, 2023 · daf1fd2 · daf1fd2
1 parent d6dbd74
commit daf1fd2
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/bundles/framework/coordinatetool/plugin/CoordinatePluginHandler.js b/bundles/framework/coordinatetool/plugin/CoordinatePluginHandler.js
@@ -104,11 +104,16 @@ class UIHandler extends StateHandler {
             }
         };
 
-        // Special treatment for these degree format projections to allow coordinates in decimal format as well
-        if (this.state.selectedProjection === 'EPSG:4258' || this.state.selectedProjection === 'LATLON:kkj') {
-            const regexp = /^\d+(\.|,)\d+$/;
-            if (regexp.test(data.lonlat.lon)) data.lonlat.lon = data.lonlat.lon + '°';
-            if (regexp.test(data.lonlat.lat)) data.lonlat.lat = data.lonlat.lat + '°';
+        // Check if format should be degrees and add '°' symbol if needed
+        let isDegrees = false;
+        if (this.config.projectionShowFormat[this.state.selectedProjection]) {
+            isDegrees = this.config.projectionShowFormat[this.state.selectedProjection].format === 'degrees';
+        } else {
+            isDegrees = this.config.projectionShowFormat.format === 'degrees';
+        }
+        if (isDegrees) {
+            if (data.lonlat.lon.indexOf('°') < 0) data.lonlat.lon = data.lonlat.lon + '°';
+            if (data.lonlat.lat.indexOf('°') < 0) data.lonlat.lat = data.lonlat.lat + '°';
         }
 
         const converted = await this.convertCoordinates(data, this.state.selectedProjection, this.originalProjection);