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

Store user logos locally to avoid missing markers in map #862

Merged
merged 6 commits into from
Aug 5, 2024

Conversation

XinShen-CHN
Copy link
Contributor

Proposed changes

Store user logos locally to avoid missing markers in map.

Types of changes

What types of changes does your code introduce to FESTIM?

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Code refactoring
  • Documentation Update (if none of the other choices apply)
  • New tests

Checklist

  • Black formatted
  • Unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

Further comments

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...

@XinShen-CHN XinShen-CHN changed the title #824 Store user logos locally to avoid missing markers in map Aug 2, 2024
Copy link

codecov bot commented Aug 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 99.56%. Comparing base (21591ed) to head (2a53526).
Report is 47 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #862   +/-   ##
=======================================
  Coverage   99.56%   99.56%           
=======================================
  Files          61       61           
  Lines        2750     2750           
=======================================
  Hits         2738     2738           
  Misses         12       12           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

@RemDelaporteMathurin RemDelaporteMathurin left a comment

Choose a reason for hiding this comment

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

Thanks @XinShen-CHN

Could you add all the logos in a subdirectory within images please?

images/user_logos/

Also have a few requests about the code.

docs/source/map.py Show resolved Hide resolved
docs/source/map.py Show resolved Hide resolved
docs/source/images/ENEA.png Outdated Show resolved Hide resolved
docs/source/images/digiLab_UK.png Outdated Show resolved Hide resolved
docs/source/images/MIT_Cambridge_MA_USA.png Outdated Show resolved Hide resolved
docs/source/images/University_Wisconsin_Madison_USA.png Outdated Show resolved Hide resolved
@RemDelaporteMathurin RemDelaporteMathurin linked an issue Aug 2, 2024 that may be closed by this pull request
Copy link
Collaborator

@RemDelaporteMathurin RemDelaporteMathurin left a comment

Choose a reason for hiding this comment

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

Thanks Xin! Could you please format your code with black?

Install black:

pip install black

Format your script:

black map.py

@KulaginVladimir
Copy link
Collaborator

Hi @XinShen-CHN, could you please add this logo for MEPhI?
С конём и дескриптором

The source file can be downloaded with this link: https://mephi.ru/content/public/uploads/files/angl.zip
or this: https://logowik.com/national-research-nuclear-university-mephi-logo-vector-svg-pdf-ai-eps-cdr-free-download-16416.html

@XinShen-CHN
Copy link
Contributor Author

Hi @XinShen-CHN, could you please add this logo for MEPhI? С конём и дескриптором

The source file can be downloaded with this link: https://mephi.ru/content/public/uploads/files/angl.zip or this: https://logowik.com/national-research-nuclear-university-mephi-logo-vector-svg-pdf-ai-eps-cdr-free-download-16416.html

Sure.

@XinShen-CHN
Copy link
Contributor Author

XinShen-CHN commented Aug 4, 2024

Thanks Xin! Could you please format your code with black?

Install black:

pip install black

Format your script:

black map.py

I'd love to, but I'm stuck with formatting the code with black.

@RemDelaporteMathurin
Copy link
Collaborator

I'd love to, but I'm stuck with formatting the code with black.

I can help. What is your issue?

@XinShen-CHN
Copy link
Contributor Author

I'd love to, but I'm stuck with formatting the code with black.

I can help. What is your issue?

Thank you! No worries. I think I've settled it.

@XinShen-CHN
Copy link
Contributor Author

New problem. It has been loading for hours after I clicked the commit.
image

@RemDelaporteMathurin
Copy link
Collaborator

New problem. It has been loading for hours after I clicked the commit. ![image](https://private-user-

Have you entered a commit message before clicking "Commit"?

@XinShen-CHN
Copy link
Contributor Author

New problem. It has been loading for hours after I clicked the commit. ![image](https://private-user-

Have you entered a commit message before clicking "Commit"?

Thanks! I'm not familar with the desktop version of VS Code for using it first time.

Copy link
Collaborator

@RemDelaporteMathurin RemDelaporteMathurin left a comment

Choose a reason for hiding this comment

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

Thanks @XinShen-CHN for this improvement! 🚀🚀

General feedback: you should try to have commits message that are specific to the changes in each commit. Here all the commits have the same message. A specific message would be for example "formatted code with black" or "moved files to subdirectory", "changed variable names" etc.

@XinShen-CHN
Copy link
Contributor Author

Thanks @XinShen-CHN for this improvement! 🚀🚀

General feedback: you should try to have commits message that are specific to the changes in each commit. Here all the commits have the same message. A specific message would be for example "formatted code with black" or "moved files to subdirectory", "changed variable names" etc.

Got it!

@RemDelaporteMathurin
Copy link
Collaborator

@XinShen-CHN I just pushed to your branch to add the changes added by @iamryo on #853

@RemDelaporteMathurin RemDelaporteMathurin merged commit a4efa23 into festim-dev:main Aug 5, 2024
6 checks passed
@XinShen-CHN XinShen-CHN deleted the #824 branch August 8, 2024 11:42
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.

Store user logos locally to avoid missing markers in map
3 participants