Merge branch 'main' of github.com:syncpoint/ODINv2

src/renderer/components/print/index.js

@@ -37,6 +37,8 @@ const print = ({ map, services, options = {} }) => {
     const targetElement = document.getElementById('map-container')
     const display = targetElement.parentElement.getBoundingClientRect()
 
+    const centerOfMap = map.getView().getCenter()
+
     const paper = paperSizes[printSettings.paperSize][printSettings.orientation]
     const virtualPaper = {
       width: Math.round(paper.width * DEFAULT_QUALITY / INCH_TO_MM),
@@ -62,6 +64,7 @@ const print = ({ map, services, options = {} }) => {
     map.updateSize()
     const viewResolution = printSettings.scale / getPointResolution(map.getView().getProjection(), DEFAULT_QUALITY / INCH_TO_MM, map.getView().getCenter())
     map.getView().setResolution(viewResolution)
+    map.getView().setCenter(centerOfMap)
   }
 
   const removePrintStyling = targetElement => {

src/renderer/components/properties/ActivityProperties.js

@@ -11,6 +11,7 @@ import AdditionalInformation from './AdditionalInformation'
 import EvaluationRating from './EvaluationRating'
 import Status from './Status'
 import GridCols2 from './GridCols2'
+import Coordinates from './Coordinates'
 import KProperty from './KProperty'
 
 const ActivityProperties = props =>
@@ -21,6 +22,7 @@ const ActivityProperties = props =>
     </ColSpan2>
     <HostilityStatus {...props}/>
     <DateTimeGroup {...props}/>
+    <Coordinates {...props}/>
     <Speed {...props}/>
     <Direction {...props}/>
     <StaffComments {...props}/>

src/renderer/components/properties/EquipmentProperties.js

@@ -12,6 +12,7 @@ import EvaluationRating from './EvaluationRating'
 import Status from './Status'
 import Condition from './Condition'
 import GridCols2 from './GridCols2'
+import Coordinates from './Coordinates'
 import KProperty from './KProperty'
 
 const EquipmentProperties = props =>
@@ -21,6 +22,7 @@ const EquipmentProperties = props =>
     <TypeMobility {...props}/>
     <HostilityStatus {...props}/>
     <DateTimeGroup {...props}/>
+    <Coordinates {...props}/>
     <Speed {...props}/>
     <Direction {...props}/>
     <StaffComments {...props}/>

src/renderer/components/properties/InstallationProperties.js

@@ -7,6 +7,7 @@ import DateTimeGroup from './DateTimeGroup'
 import StaffComments from './StaffComments'
 import AdditionalInformation from './AdditionalInformation'
 import EvaluationRating from './EvaluationRating'
+import Coordinates from './Coordinates'
 import Status from './Status'
 import GridCols2 from './GridCols2'
 import KProperty from './KProperty'
@@ -18,6 +19,7 @@ const InstallationProperties = props =>
     <SpecialC2HQ {...props}/>
     <HostilityStatus {...props}/>
     <DateTimeGroup {...props}/>
+    <Coordinates {...props}/>
     <StaffComments {...props}/>
     <AdditionalInformation {...props}/>
     <EvaluationRating {...props}/>

src/renderer/components/properties/PointProperties.js

@@ -7,6 +7,7 @@ import EffectiveDateTime from './EffectiveDateTime'
 import Altitude from './Altitude'
 import StaffComments from './StaffComments'
 import AdditionalInformation from './AdditionalInformation'
+import Coordinates from './Coordinates'
 import Status from './Status'
 import GridCols2 from './GridCols2'
 import KProperty from './KProperty'
@@ -18,6 +19,7 @@ const PointProperties = props =>
       <UniqueDesignation {...props}/>
     </ColSpan2>
     <HostilityStatus {...props}/>
+    <Coordinates {...props}/>
     <EffectiveDateTime {...props}/>
     <Altitude {...props}/>
     <StaffComments {...props}/>

src/renderer/components/properties/SKKMCommandProperties.js

@@ -5,6 +5,7 @@ import SpecialC2HQEchelon from './SpecialC2HQEchelon'
 import DateTimeGroup from './DateTimeGroup'
 import Speed from './Speed'
 import Direction from './Direction'
+import Coordinates from './Coordinates'
 import AdditionalInformation from './AdditionalInformation'
 import GridCols2 from './GridCols2'
 
@@ -15,6 +16,7 @@ const SKKMUnitProperties = props => {
       <UniqueDesignationHigherFormation {...props}/>
       <SpecialC2HQEchelon {...props}/>
       <DateTimeGroup {...props}/>
+      <Coordinates {...props}/>
       <Speed {...props}/>
       <Direction {...props}/>
       <AdditionalInformation {...props}/>

src/renderer/components/properties/SKKMStandardProperties.js

@@ -5,6 +5,7 @@ import DateTimeGroup from './DateTimeGroup'
 import Speed from './Speed'
 import Direction from './Direction'
 import AdditionalInformation from './AdditionalInformation'
+import Coordinates from './Coordinates'
 import GridCols2 from './GridCols2'
 import ColSpan2 from './ColSpan2'
 
@@ -15,6 +16,7 @@ const SKKMStandardProperties = props => {
       <Name {...props}/>
       <ColSpan2><UniqueDesignation {...props}/></ColSpan2>
       <DateTimeGroup {...props}/>
+      <Coordinates {...props}/>
       <Speed {...props}/>
       <Direction {...props}/>
       <AdditionalInformation {...props}/>

src/renderer/components/properties/SKKMUnitProperties.js

@@ -6,6 +6,7 @@ import DateTimeGroup from './DateTimeGroup'
 import Speed from './Speed'
 import Direction from './Direction'
 import AdditionalInformation from './AdditionalInformation'
+import Coordinates from './Coordinates'
 import UnitModifiers from './UnitModifiers'
 import GridCols2 from './GridCols2'
 
@@ -16,6 +17,7 @@ const SKKMUnitProperties = props => {
       <UniqueDesignationHigherFormation {...props}/>
       <SpecialC2HQEchelon {...props}/>
       <DateTimeGroup {...props}/>
+      <Coordinates {...props}/>
       <Speed {...props}/>
       <Direction {...props}/>
       <AdditionalInformation {...props}/>

src/renderer/components/properties/UnitProperties.js

@@ -14,6 +14,7 @@ import Condition from './Condition'
 import Reinforcement from './Reinforcement'
 import UnitModifiers from './UnitModifiers'
 import GridCols2 from './GridCols2'
+import Coordinates from './Coordinates'
 import KProperty from './KProperty'
 
 const UnitProperties = props => {
@@ -24,6 +25,7 @@ const UnitProperties = props => {
       <SpecialC2HQEchelon {...props}/>
       <HostilityStatus {...props}/>
       <DateTimeGroup {...props}/>
+      <Coordinates {...props}/>
       <Speed {...props}/>
       <Direction {...props}/>
       <StaffComments {...props}/>