Use importmap for the geo viewer

sul-dlss · Jan 30, 2025 · 7117795 · 7117795
1 parent a5925b8
commit 7117795
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 23 deletions.
diff --git a/app/components/embed/geo_component.html.erb b/app/components/embed/geo_component.html.erb
@@ -6,7 +6,6 @@
     <%= content_tag :div, viewer.map_element_options do %>
 
     <% end %>
-    <%= javascript_pack_tag('geo') %>
   </div>
 
   <%= render 'embed/metadata_panel', viewer: viewer %>

diff --git a/app/javascript/geo.js b/app/javascript/geo.js
@@ -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

diff --git a/app/javascript/packs/geo.js b/app/javascript/packs/geo.js
diff --git a/app/javascript/src/modules/geo_viewer.js b/app/javascript/src/modules/geo_viewer.js
@@ -1,4 +1,5 @@
-import './leaflet_opacity'
+import 'src/modules/leaflet_opacity'
+
 export default {
   isDefined: function (object) {
     return typeof object !== 'undefined'

diff --git a/app/viewers/embed/viewer/geo.rb b/app/viewers/embed/viewer/geo.rb
@@ -7,6 +7,10 @@ def component
         GeoComponent
       end
 
+      def importmap
+        'geo'
+      end
+
       ##
       # Options for the map element tag
       # @return [Hash]

diff --git a/app/views/embed/iframe.html.erb b/app/views/embed/iframe.html.erb
@@ -17,6 +17,7 @@
       });
     </script>
     <%= render 'analytics' %>
+    <!-- DOOOD -->
     <%= javascript_importmap_tags @embed_response.viewer.importmap if @embed_response.viewer.importmap %>
     <%= stylesheet_link_tag @embed_response.viewer.stylesheet %>
     <%= stylesheet_link_tag 'sul_icons.css' %>

diff --git a/app/views/layouts/preview/geo.html.erb b/app/views/layouts/preview/geo.html.erb
@@ -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 %>

diff --git a/config/importmap.rb b/config/importmap.rb
@@ -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
@@ -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"
diff --git a/...ets/javascripts/Leaflet.Control.Custom.js → vendor/javascript/Leaflet.Control.Custom.js b/...ets/javascripts/Leaflet.Control.Custom.js → vendor/javascript/Leaflet.Control.Custom.js
diff --git a/vendor/javascript/leaflet.js b/vendor/javascript/leaflet.js