Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#9241 profile en long #9242

Closed
wants to merge 10 commits into from
Closed

#9241 profile en long #9242

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e7d1db3
Proposal to enhance eslint config, plus fixing current configuration
MV88 May 22, 2023
656e54d
Merge branch 'master' of https://github.com/geosolutions-it/MapStore2
MV88 Jun 1, 2023
749130f
Merge branch 'master' of https://github.com/geosolutions-it/MapStore2
MV88 Jun 21, 2023
6cc17b7
Longitudinal profile
MV88 Jun 21, 2023
4862031
#9241 Longitudinal profile
MV88 Jun 21, 2023
99802b0
clean up
MV88 Jun 21, 2023
df18a37
fix build
MV88 Jun 21, 2023
05924e8
fix typo
MV88 Jun 21, 2023
7ec23f3
fix icons
MV88 Jun 21, 2023
844a7d3
Fixed review changes
MV88 Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build/devServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

const port = process.env.MAPSTORE_BACKEND_PORT || 8080;
const protocol = process.env.MAPSTORE_BACKEND_PROTOCOL || "http";
const host = process.env.MAPSTORE_BACKEND_HOST || "localhost";
Expand Down
1 change: 1 addition & 0 deletions build/docma-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@
"web/client/plugins/LayerInfo.jsx",
"web/client/plugins/Locate.jsx",
"web/client/plugins/Login.jsx",
"web/client/plugins/LongitudinalProfileTool.jsx",
"web/client/plugins/Map.jsx",
"web/client/plugins/MapCatalog.jsx",
"web/client/plugins/MapEditor.jsx",
Expand Down
104 changes: 104 additions & 0 deletions java/printing/resources/geoserver/print/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,110 @@ layouts:
maxSize: 200
type: 'bar sub'
intervals: 5
A4_long_profile :
#===========================================================================
mainPage:
rotation: true
pageSize: 595 842
landscape: false
items:
- !columns
absoluteX: 30
absoluteY: 800
width: 550
items:
- !image
maxWidth: 550
url: '${base64}'
- !map
height: 600
width: 400
absoluteX: 30
absoluteY: 670
#legend panel
- !columns
config:
borderWidth: 1
cells:
- borderWidth: 2
borderWidthLeft: 1
borderColor: black
padding: 4
backgroundColor: white
vertAlign: bottom
widths: [155]
absoluteX: 435
absoluteY: 670
width: 155
items:
- !legends
horizontalAlignment: left
#iconMaxWidth: 150
maxWidth: 150
iconMaxHeight: 0
layerSpace: 5
layerFontSize: 12
classIndentation: 5
classFontSize: 8
classSpace: 4
backgroundColor: #ffffff
failOnBrokenUrl: false
- !columns
absoluteX: 370
absoluteY: 140
width: 40
items:
- !image
maxWidth: 40
maxHeight: 40
url: 'file://${configDir}/Arrow_North_CFCF.svg'
rotation: '${rotation}'
- !columns
absoluteX: 30
absoluteY: 740
width: 395
widths: [395]
items:
- !text
align: left
vertAlign: middle
fontSize: 14
text: '${mapTitle}'
- !columns
absoluteX: 30
absoluteY: 710
width: 395
widths: [395]
items:
- !text
width: 300
text: '${comment}'
fontEncoding: Cp1252
fontSize: 9
align: left
vertAlign: middle
- !columns
absoluteX: 30
absoluteY: 55
width: 395
widths: [240, 240]
items:
- !columns
nbColumns: 1
items:
- !text
width: 300
text: '${now MM.dd.yyyy}'
fontEncoding: Cp1252
fontSize: 9
align: left
vertAlign: middle
- !scalebar
align: right
vertAlign: middle
maxSize: 200
type: 'bar sub'
intervals: 5
#=======A4 landscape with legend============================================
A4_landscape :
#===========================================================================
Expand Down
4 changes: 4 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@
"@turf/convex": "6.5.0",
"@turf/difference": "6.5.0",
"@turf/great-circle": "5.1.5",
"@turf/helpers": "6.5.0",
"@turf/inside": "4.1.0",
"@turf/line-intersect": "4.1.0",
"@turf/point-on-surface": "4.1.0",
Expand Down Expand Up @@ -173,6 +174,7 @@
"draft-js-plugins-editor": "2.1.1",
"draft-js-side-toolbar-plugin": "3.0.1",
"draftjs-to-html": "0.8.4",
"dxf-parser": "1.1.2",
"element-closest": "2.0.2",
"embed-video": "2.0.4",
"es6-object-assign": "1.1.0",
Expand All @@ -184,6 +186,7 @@
"git-revision-webpack-plugin": "5.0.0",
"history": "4.6.1",
"html-to-draftjs": "npm:@geosolutions/html-to-draftjs@1.5.1",
"html-to-image": "1.11.11",
"html2canvas": "0.5.0-beta4",
"immutable": "4.0.0-rc.12",
"intersection-observer": "0.7.0",
Expand Down Expand Up @@ -217,6 +220,7 @@
"object-fit-images": "3.2.4",
"ogc-schemas": "2.6.1",
"ol": "5.3.0",
"pdfmake": "0.2.7",
"pdfviewer": "0.3.2",
"plotly.js-cartesian-dist": "2.5.1",
"prop-types": "15.7.2",
Expand Down
100 changes: 56 additions & 44 deletions utility/eslint/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change seems related to a different PR #9188.
I think if we are not publishing the new package this should be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think i have to recreate my master branch to fix this

will force push without it

module.exports = {
"parser": "@babel/eslint-parser", // https://github.com/babel/babel-eslint
"parserOptions": {
Expand All @@ -7,6 +8,11 @@ module.exports = {
"jsx": true
}
},
"settings": {
"react": {
"version": "detect"
}
},
"plugins": [
"@babel",
"no-only-tests", // https://github.com/levibuzolic/eslint-plugin-no-only-tests
Expand Down Expand Up @@ -199,54 +205,60 @@ module.exports = {
"react/no-did-update-set-state": 2, // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-did-update-set-state.md
"react/no-multi-comp": 0, // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-multi-comp.md
"react/no-unknown-property": 2, // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-unknown-property.md
"react/prop-types": [2, { "ignore": ["children"] }], // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/prop-types.md
"react/no-unused-prop-types": 2, // https://github.com/jsx-eslint/eslint-plugin-react/blob/master/docs/rules/no-unused-prop-types.md
"react/prop-types": [0, { "ignore": ["children"] }], // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/prop-types.md
"react/react-in-jsx-scope": 2, // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/react-in-jsx-scope.md
"react/self-closing-comp": 2, // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/self-closing-comp.md
"react/wrap-multilines": 2, // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/wrap-multilines.md
"react/sort-comp": [2, { // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/sort-comp.md
"react/sort-comp": [2, {
"order": [
"displayName",
"propTypes",
"inheritedPropTypes",
"contextTypes",
"childContextTypes",
"mixins",
"statics",
"defaultProps",
"constructor",
"getDefaultProps",
"/^state$/",
"getInitialState",
"getChildContext",
"UNSAFE_componentWillMount",
"componentWillMount",
"componentDidMount",
"UNSAFE_componentWillReceiveProps",
"componentWillReceiveProps",
"shouldComponentUpdate",
"UNSAFE_componentWillUpdate",
"componentWillUpdate",
"componentDidUpdate",
"componentWillUnmount",
"/^on.+$/",
"/^get.+$/",
"/^render.+$/",
"render"
],
// CUSTOM
// prevent to `import _ from 'lodash';`. Allows `import {get} from 'lodash';` or `import get from 'lodash/get';`
// for bundle size
"no-restricted-imports": [2,
{
"name": "lodash",
"importNames": ["default"],
"message": "Please use the default import from 'lodash/functionName' instead."
}
'static-methods',
'lifecycle',
'everything-else',
'render'
],
// prevent to `const _ = require('lodash')`. Allows `const get = require('lodash/get');`
// for bundle size
"no-restricted-modules": [2, { "paths": ["lodash", "!lodash/*"] }]
}]
"groups": {
"lifecycle": [
'displayName',
'propTypes',
'contextTypes',
'childContextTypes',
'mixins',
'statics',
'defaultProps',
'constructor',
'getDefaultProps',
'state',
'getInitialState',
'getChildContext',
'getDerivedStateFromProps',
'componentWillMount',
'UNSAFE_componentWillMount',
'componentDidMount',
'componentWillReceiveProps',
'UNSAFE_componentWillReceiveProps',
'shouldComponentUpdate',
'componentWillUpdate',
'UNSAFE_componentWillUpdate',
'getSnapshotBeforeUpdate',
'componentDidUpdate',
'componentDidCatch',
'componentWillUnmount'
]
}
}],
// CUSTOM
// prevent to `import _ from 'lodash';`. Allows `import {get} from 'lodash';` or `import get from 'lodash/get';`
// for bundle size
"no-restricted-imports": [2,
{
"name": "lodash",
"importNames": ["default"],
"message": "Please use the default import from 'lodash/functionName' instead."
}
],
// prevent to `const _ = require('lodash')`. Allows `const get = require('lodash/get');`
// for bundle size
"no-restricted-modules": [2, { "paths": ["lodash"], "patterns": ["!lodash/*"]}]
}
};

4 changes: 2 additions & 2 deletions utility/eslint/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mapstore/eslint-config-mapstore",
"version": "1.0.5",
"version": "1.0.6",
"private": false,
"description": "ESLint Configuration for MapStore project",
"author": "GeoSolutions S.a.s.",
Expand Down Expand Up @@ -29,6 +29,6 @@
"eslint": ">= 7.5.0",
"eslint-plugin-import": ">= 2.20.2",
"eslint-plugin-no-only-tests": ">= 2.3.1",
"eslint-plugin-react": ">= 3.3.2"
"eslint-plugin-react": ">= 7.31.11"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sime for this file:

This change seems related to a different PR #9188.
I think if we are not publishing the new package this should be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correct, going to remove

}
}
Loading