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

Closes #2010, Adds simple popup to assist with color recognition #2027

Merged
merged 6 commits into from
Jan 27, 2025
Merged

Closes #2010, Adds simple popup to assist with color recognition #2027

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7fb977f
Closes #2010, Adds simple popup to assist with color recognition
MuchQuak Jan 6, 2025
fd08b9e
Filling about the popup with desired info
MuchQuak Jan 7, 2025
5cbce09
External linking on strat_names
MuchQuak Jan 7, 2025
7dcfb83
style adjustments
MuchQuak Jan 10, 2025
2fbf226
better error handling on popup construction
MuchQuak Jan 10, 2025
f69f861
Word adjustment for strat_names label
MuchQuak Jan 10, 2025
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
16 changes: 8 additions & 8 deletions js/symb/leafletMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,21 +176,21 @@ class LeafletMap {
L.popup()
.setLatLng([lat, lon])
.setContent(`
<div>
<div style="font-size:1rem">
<div>
<span><b>Unit: </b></span>
<span style="font-weight:bold">Unit: </span>
<span>${macro_strat_data.mapData[0].name}</span>
</div>
<div>
<span><b>Age: </b></span>
<span style="font-weight:bold">Age: </span>
<span>${macro_strat_data.mapData[0].age}</span>
</div>
<div>
<span><b>Source:</b></span>
<div style="font-size:0.8rem">
<span style="font-weight:bold">Source:</span>
${macro_strat_data.mapData[0].ref.authors}, ${macro_strat_data.mapData[0].ref.ref_title}: ${macro_strat_data.mapData[0].ref.ref_source}, ${macro_strat_data.mapData[0].ref.isbn_doi} ${macro_strat_data.mapData[0].ref.source_id} / ${macro_strat_data.mapData[0].map_id}
</div>
<div>
<span><b>Macrostrat ID: </b></span>
<div style="margin-top:1rem">
<span style="font-weight:bold">Macrostrat matched names: </span>
Copy link
Collaborator

Choose a reason for hiding this comment

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

"names" --> "units"

${loop_strat_names(macro_strat_data.mapData[0])}
</div>
</div>`)
Expand Down Expand Up @@ -248,7 +248,7 @@ class LeafletMap {
"Satellite": Esri_WorldImagery,
};
const overlays = {
"Macro Strat": L.layerGroup([macro_strat])
"Macrostrat": L.layerGroup([macro_strat])
}
L.control.layers(layers, overlays).addTo(this.mapLayer);
}
Expand Down