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

Ftr/117 remove leaflet #445

Merged
merged 6 commits into from
Nov 6, 2024
Merged

Ftr/117 remove leaflet #445

merged 6 commits into from
Nov 6, 2024

Conversation

daniel-jettka
Copy link
Contributor

@daniel-jettka daniel-jettka commented Oct 11, 2024

Description, Context and related Issue

Removed all leaflet files and content because Edirom does not support leaflet anymore.

Refs #117

How Has This Been Tested?

(...)

Types of changes

  • cleanup

@daniel-jettka daniel-jettka linked an issue Oct 11, 2024 that may be closed by this pull request
3 tasks
@daniel-jettka daniel-jettka requested a review from bwbohl October 11, 2024 10:45
@daniel-jettka
Copy link
Contributor Author

@bwbohl Could you have a look at this? I am not sure how to check if everything's working fine after removing all leaflet content - I mean it wasn't in use anyway, right?

Copy link
Member

@peterstadler peterstadler left a comment

Choose a reason for hiding this comment

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

I was trying to test this PR with the clarinet quintet data I grabbed from the pipeline build.

First I was hit by the error #443 reported by @roewenstrunk so I had to merge his fix into this branch. Then I was able to take a look and it all seemed to work (i.e. I did no systematic tests).

@peterstadler peterstadler added this to the 1.0.0 milestone Oct 15, 2024
@peterstadler peterstadler self-assigned this Oct 15, 2024
@peterstadler peterstadler force-pushed the ftr/117-remove-leaflet branch from 6162596 to c42a787 Compare October 17, 2024 15:31
@peterstadler
Copy link
Member

I rebased this branch to bring it up to date with current dev. Please make sure to

  1. do a git fetch to fetch the changes, and
  2. do a git reset --hard origin/ftr/117-remove-leaflet to point your HEAD at the force-pushed changes

@peterstadler peterstadler force-pushed the ftr/117-remove-leaflet branch from c42a787 to f1ffd99 Compare October 23, 2024 12:44
@peterstadler
Copy link
Member

I see that FacsimileLayer.js got removed now but I still found some references in

Edirom-Online/index.html

Lines 38 to 43 in 7b21287

<link rel="stylesheet" href="resources/leaflet-0.7.3/leaflet.css" />
<link rel="stylesheet" href="resources/Leaflet.tooltip-master/dist/leaflet.tooltip.css"/>
<!--<link rel="stylesheet" href="resources/leafletTooltip/Leaflet.tooltip-master/dist/leaflet.tooltip.css"/>-->
<script type="text/javascript" src="resources/leaflet-0.7.3/leaflet.js"></script>
<script type="text/javascript" src="resources/facsimileLayer/FacsimileLayer.js"></script>
<script src="resources/Leaflet.tooltip-master/dist/leaflet.tooltip.js"></script>

@peterstadler peterstadler force-pushed the ftr/117-remove-leaflet branch from 0b322c3 to 661f224 Compare November 4, 2024 12:07
Copy link
Member

@roewenstrunk roewenstrunk left a comment

Choose a reason for hiding this comment

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

Everything works with my data. The changes all seem correct.

@roewenstrunk roewenstrunk merged commit 91abe6b into develop Nov 6, 2024
3 checks passed
@roewenstrunk roewenstrunk deleted the ftr/117-remove-leaflet branch November 6, 2024 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

remove leaflet content
3 participants