Skip to content

Commit b2133ff

Browse files
authored
Fix #11455: Removed inline css, removed cameraposition plugin from localconfig, updated package.json. (#11915)
1 parent e84e47f commit b2133ff

10 files changed

Lines changed: 43 additions & 21 deletions

File tree

build/docma-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
"web/client/plugins/BackgroundSelector.jsx",
236236
"web/client/plugins/BurgerMenu.jsx",
237237
"web/client/plugins/CRSSelector.jsx",
238-
"web/client/plugins/CameraPosition.jsx",
238+
"web/client/plugins/CameraPosition/CameraPosition.jsx",
239239
"web/client/plugins/Context.jsx",
240240
"web/client/plugins/ContextCreator.jsx",
241241
"web/client/plugins/ContextExport.jsx",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
"@mapbox/geojsonhint": "3.3.0",
114114
"@mapbox/togeojson": "0.16.2",
115115
"@mapstore/patcher": "https://github.com/geosolutions-it/Patcher/tarball/master",
116-
"@math.gl/geoid": "^4.1.0",
116+
"@math.gl/geoid": "4.1.0",
117117
"@turf/along": "6.5.0",
118118
"@turf/area": "6.5.0",
119119
"@turf/bbox": "4.1.0",

project/standard/templates/configs/pluginsConfig.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,13 @@
333333
"additionalCRS": {}
334334
}
335335
},
336+
{
337+
"name": "CameraPosition",
338+
"glyph": "camera",
339+
"title": "plugins.CameraPosition.title",
340+
"description": "plugins.CameraPosition.description",
341+
"dependencies": ["MapFooter"]
342+
},
336343
{
337344
"name": "CRSSelector",
338345
"glyph": "crs",

web/client/components/mapcontrols/mouseposition/CRSSelector.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ const CRSSelector = (props) => {
8888
centerChildrenVertically
8989
gap="sm"
9090
>
91-
<ControlLabel style={{ margin: 0, fontWeight: 'normal', minWidth: 'max-content' }}>
91+
<ControlLabel className="selector-label">
9292
{label}
9393
</ControlLabel>
9494
<FormControl
@@ -97,7 +97,7 @@ const CRSSelector = (props) => {
9797
value={crs}
9898
onChange={launchNewCRSAction}
9999
bsSize="small"
100-
style={{ borderRadius: 4 }}
100+
className="selector-control"
101101
>
102102
{options}
103103
</FormControl>

web/client/components/mapcontrols/mouseposition/HeightTypeSelector.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const HeightTypeSelector = (props, context) => {
4646

4747
return (
4848
<FlexBox component={FormGroup} centerChildrenVertically gap="sm">
49-
<ControlLabel style={{ margin: 0, fontWeight: 'normal', minWidth: 'max-content' }}>
49+
<ControlLabel className="selector-label" >
5050
{label}
5151
</ControlLabel>
5252
<FormControl
@@ -55,7 +55,7 @@ const HeightTypeSelector = (props, context) => {
5555
value={heightType}
5656
onChange={(e) => onHeightTypeChange(e.target.value)}
5757
bsSize="small"
58-
style={{ borderRadius: 4 }}
58+
className="selector-control"
5959
>
6060
{options}
6161
</FormControl>

web/client/components/mapcontrols/mouseposition/mousePosition.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,13 @@
108108
width: 90px !important;
109109
font-size: 11px;
110110
padding: 2px;
111+
}
112+
113+
.selector-label{
114+
margin: 0;
115+
font-weight: normal;
116+
min-width: max-content;
117+
}
118+
.selector-control{
119+
border-radius: 4px;
111120
}

web/client/configs/localConfig.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,6 @@
576576
"additionalCRS": {}
577577
}
578578
},
579-
{
580-
"name": "CameraPosition"
581-
},
582579
{
583580
"name": "CRSSelector",
584581
"cfg": {

web/client/plugins/CameraPosition.jsx renamed to web/client/plugins/CameraPosition/CameraPosition.jsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ import { Tooltip } from 'react-bootstrap';
1313
import PropTypes from 'prop-types';
1414
import axios from 'axios';
1515

16-
import { createPlugin } from '../utils/PluginsUtils';
17-
import ToggleButton from '../components/buttons/ToggleButton';
18-
import Message from '../components/I18N/Message';
19-
import MousePositionComponent from '../components/mapcontrols/mouseposition/MousePosition';
20-
import { getTemplate } from '../components/mapcontrols/mouseposition/templates';
21-
import { mapSelector, projectionDefsSelector } from '../selectors/map';
22-
import { getCameraPositionCrs, getCameraPositionHeightType, getShowCameraPosition } from './CameraPosition/selectors/cameraPosition';
23-
import { showCameraPosition, hideCameraPosition, changeCameraPositionCrs, changeCameraPositionHeightType } from './CameraPosition/actions/cameraPosition';
24-
import cameraPosition from './CameraPosition/reducers/cameraPosition';
25-
import './CameraPosition/cameraPosition.css';
16+
import { createPlugin } from '../../utils/PluginsUtils';
17+
import ToggleButton from '../../components/buttons/ToggleButton';
18+
import Message from '../../components/I18N/Message';
19+
import MousePositionComponent from '../../components/mapcontrols/mouseposition/MousePosition';
20+
import { getTemplate } from '../../components/mapcontrols/mouseposition/templates';
21+
import { mapSelector, projectionDefsSelector } from '../../selectors/map';
22+
import { getCameraPositionCrs, getCameraPositionHeightType, getShowCameraPosition } from './selectors/cameraPosition';
23+
import { showCameraPosition, hideCameraPosition, changeCameraPositionCrs, changeCameraPositionHeightType } from './actions/cameraPosition';
24+
import cameraPosition from './reducers/cameraPosition';
25+
import './cameraPosition.css';
2626

2727
const selector = createSelector([
2828
(state) => state,

web/client/plugins/CameraPosition/cameraPosition.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
border-width: 1px !important;
88
border-style: solid !important;
99
line-height: 30px;
10-
background-color: var(--ms-main-variant-color,#e6e6e6);
10+
background-color: var(--ms-main-variant-bg,#e6e6e6);
1111
}
1212
#mapstore-heightselector-cameraposition{
1313
border-radius: 4px;
@@ -18,5 +18,5 @@
1818
border-width: 1px !important;
1919
border-style: solid !important;
2020
line-height: 30px;
21-
background-color: var(--ms-main-variant-color,#e6e6e6);
21+
background-color: var(--ms-main-variant-bg,#e6e6e6);
2222
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/*
2+
* Copyright 2025, GeoSolutions Sas.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the BSD-style license found in the
6+
* LICENSE file in the root directory of this source tree.
7+
*/
8+
9+
export { default } from './CameraPosition';

0 commit comments

Comments
 (0)