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

Fix broken image in KML Sandcastle #9579

Merged
merged 19 commits into from
Jun 2, 2021
Merged

Fix broken image in KML Sandcastle #9579

merged 19 commits into from
Jun 2, 2021

Conversation

j9liu
Copy link
Contributor

@j9liu j9liu commented Jun 1, 2021

Fixes issue in #9527.

Downloaded the AGI logo so it is stored in SampleData; the page uses a local path to reference the image.

@ebogo1 for review.

@cesium-concierge
Copy link

Thank you so much for the pull request @j9liu! I noticed this is your first pull request and I wanted to say welcome to the Cesium community!

The Pull Request Guidelines is a handy reference for making sure your PR gets accepted quickly, so make sure to skim that.

  • ❌ Missing CONTRIBUTORS.md entry.
  • ✔️ Signed CLA found.
  • CHANGES.md was not updated.
    • If this change updates the public API in any way, please add a bullet point to CHANGES.md.
  • ❔ Unit tests were not updated.
    • Make sure you've updated tests to reflect your changes, added tests for any new code, and ran the code coverage tool.

Reviewers, don't forget to make sure that:

  • Cesium Viewer works.
  • Works in 2D/CV.
  • Works (or fails gracefully) in IE11.

@ebogo1
Copy link
Contributor

ebogo1 commented Jun 2, 2021

@j9liu This looks good, I confirmed this fixes the broken image in Sandcastle. Like in the previous PR, could you please move the CHANGES.md line to the new 1.83 section? It's probably easiest if you merge the latest master changes into this branch and then move the line over.

@j9liu
Copy link
Contributor Author

j9liu commented Jun 2, 2021

@ebogo1 Done!

@ebogo1 ebogo1 merged commit 2147ffc into master Jun 2, 2021
@ebogo1 ebogo1 deleted the fix-broken-image branch June 2, 2021 18:43
@ebogo1
Copy link
Contributor

ebogo1 commented Jun 2, 2021

@j9liu Thanks - I closed #9527 but like Sean mentioned, if you use the "Fixes #XXXX" syntax it should do so automatically.

@lilleyse
Copy link
Contributor

lilleyse commented Jun 3, 2021

@ebogo1 @j9liu Something might have went wrong when merging master into this branch since there are a bunch of extraneous commits in this PR.

I think it's ok, but in the future if you see anything suspicious like that definitely reach out.

Otherwise, thanks for the fix @j9liu!

@ebogo1
Copy link
Contributor

ebogo1 commented Jun 3, 2021

@lilleyse I noticed that but the diff looked correct to me; I did a squash+merge on this one to keep the commit history cleaner since this is a simpler PR. Do we usually do something different for things like this?

@lilleyse
Copy link
Contributor

lilleyse commented Jun 3, 2021

Squash+merge can be fine depending on the situation and the commands that are used. Let's talk offline about the process you went through.

@j9liu
Copy link
Contributor Author

j9liu commented Jun 3, 2021

@lilleyse when I did "git pull origin master" on my branch, it started a rebase as opposed to a merge, so that's my bad! I'll be more careful about it next time

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

Successfully merging this pull request may close these issues.

5 participants