Change location of the new 'map centering' section

riatelab · Sep 4, 2024 · 20b9d4c · 20b9d4c
1 parent e2433ac
commit 20b9d4c
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 38 deletions.
diff --git a/src/components/LeftMenu/LayoutFeatures.tsx b/src/components/LeftMenu/LayoutFeatures.tsx
@@ -38,10 +38,7 @@ import {
   makeDefaultGraticule,
   makeDefaultSphere,
 } from '../../helpers/layers';
-import {
-  Mabs, Msqrt,
-  parseEnRepresentation, toPrecisionAfterDecimalPoint,
-} from '../../helpers/math';
+import { Mabs, Msqrt } from '../../helpers/math';
 import { getTargetSvg } from '../../helpers/svg';
 import {
   addTemporaryPoint,
@@ -79,7 +76,6 @@ import {
   ScaleBarBehavior, ScaleBarStyle,
   ScaleBarMeasureLocation,
 } from '../../global.d';
-import DetailsSummary from '../DetailsSummary.tsx';
 
 const makeDrawingInstructions = (
   LL: Accessor<TranslationFunctions>,
@@ -1066,37 +1062,5 @@ export default function LayoutFeatures(): JSX.Element {
         </button>
       </div>
     </div>
-    <DetailsSummary summaryContent={'Centrage de la carte'} initialOpen={false}>
-      <InputFieldNumber
-        label={'Centrage de la carte (x)'}
-        value={parseEnRepresentation(toPrecisionAfterDecimalPoint(mapStore.translate[0], 2, 'en'))}
-        onChange={(v) => {
-          setMapStore('translate', [v, mapStore.translate[1]]);
-        }}
-        min={-Infinity}
-        max={Infinity}
-        step={1}
-      />
-      <InputFieldNumber
-        label={'Centrage de la carte (y)'}
-        value={parseEnRepresentation(toPrecisionAfterDecimalPoint(mapStore.translate[1], 2, 'en'))}
-        onChange={(v) => {
-          setMapStore('translate', [mapStore.translate[0], v]);
-        }}
-        min={-Infinity}
-        max={Infinity}
-        step={1}
-      />
-      <InputFieldNumber
-        label={'Zoom de la carte'}
-        value={parseEnRepresentation(toPrecisionAfterDecimalPoint(mapStore.scale, 2, 'en'))}
-        onChange={(v) => {
-          setMapStore('scale', v);
-        }}
-        min={-Infinity}
-        max={Infinity}
-        step={1}
-      />
-    </DetailsSummary>
   </div>;
 }
diff --git a/src/components/LeftMenu/MapConfiguration.tsx b/src/components/LeftMenu/MapConfiguration.tsx
@@ -3,6 +3,7 @@ import { JSX, Show } from 'solid-js';
 
 // Helpers
 import { useI18nContext } from '../../i18n/i18n-solid';
+import { parseEnRepresentation, toPrecisionAfterDecimalPoint } from '../../helpers/math';
 
 // Stores
 import { globalStore } from '../../store/GlobalStore';
@@ -12,6 +13,7 @@ import { mapStore, setMapStore } from '../../store/MapStore';
 import InputFieldCheckbox from '../Inputs/InputCheckbox.tsx';
 import InputFieldNumber from '../Inputs/InputNumber.tsx';
 import InputFieldColor from '../Inputs/InputColor.tsx';
+import DetailsSummary from '../DetailsSummary.tsx';
 
 export default function MapConfiguration(): JSX.Element {
   const { LL } = useI18nContext();
@@ -74,7 +76,7 @@ export default function MapConfiguration(): JSX.Element {
         });
       }}
     />
-    <div>
+    <div class={'mb-5'}>
       <label class="label">{LL().LayoutFeatures.MapMargins()}</label>
       <div>
         <div class="is-flex is-justify-content-space-around">
@@ -156,5 +158,37 @@ export default function MapConfiguration(): JSX.Element {
         </Show>
       </div>
     </div>
+    <DetailsSummary summaryContent={'Centrage de la carte'} initialOpen={false}>
+      <InputFieldNumber
+        label={LL().MapConfiguration.MapCenterX()}
+        value={parseEnRepresentation(toPrecisionAfterDecimalPoint(mapStore.translate[0], 2, 'en'))}
+        onChange={(v) => {
+          setMapStore('translate', [v, mapStore.translate[1]]);
+        }}
+        min={-Infinity}
+        max={Infinity}
+        step={1}
+      />
+      <InputFieldNumber
+        label={LL().MapConfiguration.MapCenterY()}
+        value={parseEnRepresentation(toPrecisionAfterDecimalPoint(mapStore.translate[1], 2, 'en'))}
+        onChange={(v) => {
+          setMapStore('translate', [mapStore.translate[0], v]);
+        }}
+        min={-Infinity}
+        max={Infinity}
+        step={1}
+      />
+      <InputFieldNumber
+        label={LL().MapConfiguration.ZoomFactor()}
+        value={parseEnRepresentation(toPrecisionAfterDecimalPoint(mapStore.scale, 2, 'en'))}
+        onChange={(v) => {
+          setMapStore('scale', v);
+        }}
+        min={-Infinity}
+        max={Infinity}
+        step={1}
+      />
+    </DetailsSummary>
   </div>;
 }
diff --git a/src/i18n/en/index.ts b/src/i18n/en/index.ts
@@ -420,6 +420,10 @@ const en = {
     ProjectionCenterGamma: 'γ-axis rotation',
     StandardParallel: 'Standard parallel',
     StandardParallels: 'Standard parallels',
+    MapCentering: 'Map centering',
+    MapCenterX: 'Map center (x)',
+    MapCenterY: 'Map center (y)',
+    ZoomFactor: 'Zoom factor',
   },
   LayoutFeatures: {
     BackgroundColor: 'Background color',

diff --git a/src/i18n/fr/index.ts b/src/i18n/fr/index.ts
@@ -420,6 +420,10 @@ const fr = {
     ProjectionCenterGamma: 'Rotation de l\'axe γ',
     StandardParallel: 'Parallèle standard',
     StandardParallels: 'Parallèles standards',
+    MapCentering: 'Centrage de la carte',
+    MapCenterX: 'Centrage de la carte (x)',
+    MapCenterY: 'Centrage de la carte (y)',
+    ZoomFactor: 'Zoom de la carte',
   },
   LayoutFeatures: {
     BackgroundColor: 'Couleur de fond',

diff --git a/src/i18n/i18n-types.ts b/src/i18n/i18n-types.ts
@@ -1393,6 +1393,22 @@ type RootTranslation = {
 		 * Standard parallels
 		 */
 		StandardParallels: string
+		/**
+		 * Map centering
+		 */
+		MapCentering: string
+		/**
+		 * Map center (x)
+		 */
+		MapCenterX: string
+		/**
+		 * Map center (y)
+		 */
+		MapCenterY: string
+		/**
+		 * Zoom factor
+		 */
+		ZoomFactor: string
 	}
 	LayoutFeatures: {
 		/**
@@ -5709,6 +5725,22 @@ export type TranslationFunctions = {
 		 * Standard parallels
 		 */
 		StandardParallels: () => LocalizedString
+		/**
+		 * Map centering
+		 */
+		MapCentering: () => LocalizedString
+		/**
+		 * Map center (x)
+		 */
+		MapCenterX: () => LocalizedString
+		/**
+		 * Map center (y)
+		 */
+		MapCenterY: () => LocalizedString
+		/**
+		 * Zoom factor
+		 */
+		ZoomFactor: () => LocalizedString
 	}
 	LayoutFeatures: {
 		/**