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

Use importmap for the geo viewer #2312

Merged
merged 1 commit into from
Jan 31, 2025
Merged

Use importmap for the geo viewer #2312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion app/components/embed/geo_component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<%= content_tag :div, viewer.map_element_options do %>

<% end %>
<%= javascript_pack_tag('geo') %>
</div>

<%= render 'embed/metadata_panel', viewer: viewer %>
Expand Down
10 changes: 5 additions & 5 deletions app/javascript/geo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import EmbedThis from "../src/modules/embed_this"
import PopupPanels from "../src/modules/popup_panels"
import GeoViewer from "../src/modules/geo_viewer"
import { trackView } from "../src/modules/metrics"
import EmbedThis from "src/modules/embed_this"
import PopupPanels from "src/modules/popup_panels"
import GeoViewer from "src/modules/geo_viewer"
import { trackView } from "src/modules/metrics"

import "leaflet"
import "../../../vendor/assets/javascripts/Leaflet.Control.Custom"
import "Leaflet.Control.Custom"

document.addEventListener("DOMContentLoaded", () => {
document.getElementById("sul-embed-object").hidden = false
Expand Down
15 changes: 0 additions & 15 deletions app/javascript/packs/geo.js
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion app/javascript/src/modules/geo_viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import './leaflet_opacity'
import 'src/modules/leaflet_opacity'

export default {
isDefined: function (object) {
return typeof object !== 'undefined'
Expand Down
4 changes: 4 additions & 0 deletions app/viewers/embed/viewer/geo.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ def component
GeoComponent
end

def importmap
'geo'
end

##
# Options for the map element tag
# @return [Hash]
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/preview/geo.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
crossorigin="anonymous"></script>
<%= stylesheet_link_tag 'geo.css' %>
<%= stylesheet_link_tag 'sul_icons.css' %>
<%#= javascript_importmap_tags 'document' %>
<%= javascript_importmap_tags 'geo' %>
</head>
<body>
<%= yield %>
Expand Down
3 changes: 3 additions & 0 deletions config/importmap.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
pin "file", preload: true
pin "document", preload: true
pin "3d", preload: true
pin "geo", preload: true

pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
Expand Down Expand Up @@ -40,3 +41,5 @@
pin "fscreen", to: "https://ga.jspm.io/npm:fscreen@1.2.0/dist/fscreen.cjs.js"
pin "@google/model-viewer", to: "https://cdn.jsdelivr.net/npm/@google/model-viewer@3.5.0/dist/model-viewer-module.min.js"
pin "three", to: "https://ga.jspm.io/npm:three@0.163.0/build/three.module.js"
pin "leaflet" # @1.9.4
pin "Leaflet.Control.Custom"
0 ...ets/javascripts/Leaflet.Control.Custom.js → vendor/javascript/Leaflet.Control.Custom.js
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions vendor/javascript/leaflet.js
View file
Open in desktop

Large diffs are not rendered by default.