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.

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

Map / Add scale. #7967

Merged
merged 2 commits into from
May 6, 2024
Merged

Map / Add scale. #7967

merged 2 commits into from
May 6, 2024

Conversation

fxprunayre
Copy link
Member

image

Configure it from the admin

image

Checklist

  • I have read the contribution guidelines
  • Pull request provided for main branch, backports managed with label
  • Good housekeeping of code, cleaning up comments, tests, and documentation
  • Clean commit history broken into understandable chucks, avoiding big commits with hundreds of files, cautious of reformatting and whitespace changes
  • Clean commit messages, longer verbose messages are encouraged
  • API Changes are identified in commit messages
  • Testing provided for features or enhancements using automatic tests
  • User documentation provided for new features or enhancements in manual
  • Build documentation provided for development instructions in README.md files
  • Library management using pom.xml dependency management. Update build documentation with intended library use and library tutorials or documentation

Funded by Ifremer

@fxprunayre fxprunayre added this to the 4.4.5 milestone Apr 18, 2024
Copy link
Member

@josegar74 josegar74 left a comment

Choose a reason for hiding this comment

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

The scale for me overlaps a bit with the OpenStreetMap panel:

scale-overlap

Copy link

sonarqubecloud bot commented May 6, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@josegar74 josegar74 merged commit f20b83a into main May 6, 2024
9 checks passed
@fxprunayre fxprunayre deleted the 44-mapscale branch May 6, 2024 11:46
@geonetworkbuild
Copy link
Collaborator

The backport to 4.2.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply a70a3c3e60... Map / Add scale.
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging web-ui/src/main/resources/catalog/components/viewer/ViewerDirective.js
Auto-merging web-ui/src/main/resources/catalog/components/viewer/wps/WpsDirective.js
CONFLICT (content): Merge conflict in web-ui/src/main/resources/catalog/components/viewer/wps/WpsDirective.js
Auto-merging web-ui/src/main/resources/catalog/js/CatController.js
Auto-merging web-ui/src/main/resources/catalog/locales/en-v4.json

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.2.x 4.2.x
# Navigate to the new working tree
cd .worktrees/backport-4.2.x
# Create a new branch
git switch --create backport-7967-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a70a3c3e6074076d9a3252ee16b7b018c3239899,a5d4ea86db719c1bfe11a3fe48921da7306a7478
# Push it to GitHub
git push --set-upstream origin backport-7967-to-4.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.2.x

Then, create a pull request where the base branch is 4.2.x and the compare/head branch is backport-7967-to-4.2.x.

josegar74 pushed a commit that referenced this pull request May 20, 2024
* Map / Add scale.

* Update gn_map_default.less
josegar74 added a commit that referenced this pull request May 22, 2024
* Map / Add scale.

* Update gn_map_default.less

Co-authored-by: François Prunayre <fx.prunayre@gmail.com>
fxprunayre added a commit to SPW-DIG/metawal-core-geonetwork that referenced this pull request Jul 18, 2024
* Map / Add scale.

* Update gn_map_default.less
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants