geoblacklight 5.4.0 → 6.0.0.pre.alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (461) hide show
  1. checksums.yaml +4 -4
  2. data/.engine_cart.yml +14 -0
  3. data/.github/workflows/ruby.yml +24 -25
  4. data/.gitignore +0 -9
  5. data/.prettierignore +4 -0
  6. data/.prettierrc +5 -0
  7. data/CONTRIBUTING.md +2 -4
  8. data/Gemfile +4 -2
  9. data/README.md +4 -4
  10. data/Rakefile +0 -22
  11. data/app/assets/stylesheets/geoblacklight/global.css +7 -0
  12. data/app/assets/stylesheets/geoblacklight/home.css +22 -0
  13. data/app/assets/stylesheets/geoblacklight/index_maps.css +36 -0
  14. data/app/assets/stylesheets/geoblacklight/record.css +39 -0
  15. data/app/assets/stylesheets/geoblacklight/search.css +56 -0
  16. data/app/assets/stylesheets/geoblacklight/viewers.css +50 -0
  17. data/app/assets/stylesheets/geoblacklight.css +14 -0
  18. data/app/components/blacklight/icons/web_services_component.rb +3 -3
  19. data/app/components/geoblacklight/accordion_component.html.erb +3 -3
  20. data/app/components/geoblacklight/accordion_component.rb +4 -0
  21. data/app/components/geoblacklight/arcgis_component.html.erb +1 -1
  22. data/app/components/geoblacklight/arcgis_component.rb +1 -1
  23. data/app/components/geoblacklight/attribute_table_component.html.erb +3 -3
  24. data/app/components/geoblacklight/data_dictionary_download_component.html.erb +1 -1
  25. data/app/components/geoblacklight/display_note_component.html.erb +1 -1
  26. data/app/components/geoblacklight/display_note_component.rb +2 -1
  27. data/app/components/geoblacklight/document/citation_component.html.erb +1 -1
  28. data/app/components/geoblacklight/document/sidebar_component.html.erb +1 -4
  29. data/app/components/geoblacklight/document/sidebar_component.rb +0 -8
  30. data/app/components/geoblacklight/document_component.html.erb +1 -2
  31. data/app/components/geoblacklight/download_links_component.html.erb +0 -3
  32. data/app/components/geoblacklight/download_links_component.rb +1 -1
  33. data/app/components/geoblacklight/header_component.html.erb +4 -4
  34. data/app/components/geoblacklight/header_icons_component.rb +4 -2
  35. data/app/components/geoblacklight/homepage_feature_facet_component.html.erb +3 -7
  36. data/app/components/geoblacklight/homepage_feature_facet_component.rb +12 -3
  37. data/app/components/geoblacklight/iiif_drag_drop_component.html.erb +2 -2
  38. data/app/components/geoblacklight/iiif_drag_drop_component.rb +2 -2
  39. data/app/components/geoblacklight/index_map_inspect_component.html.erb +3 -3
  40. data/app/components/geoblacklight/index_map_legend_component.html.erb +7 -7
  41. data/app/components/geoblacklight/index_map_legend_component.rb +7 -0
  42. data/app/components/geoblacklight/item_map_viewer_component.rb +9 -5
  43. data/app/components/geoblacklight/location_leaflet_map_component.rb +28 -15
  44. data/app/components/geoblacklight/relations_component.html.erb +2 -2
  45. data/app/components/geoblacklight/search_result_component.html.erb +28 -26
  46. data/app/components/geoblacklight/search_result_component.rb +2 -2
  47. data/app/components/geoblacklight/static_map_component.rb +6 -5
  48. data/app/components/geoblacklight/viewer_help_text_component.html.erb +1 -1
  49. data/app/components/geoblacklight/viewer_help_text_component.rb +1 -1
  50. data/app/components/geoblacklight/web_services_component.html.erb +1 -1
  51. data/app/components/geoblacklight/web_services_component.rb +1 -1
  52. data/app/components/geoblacklight/web_services_default_component.html.erb +6 -6
  53. data/app/components/geoblacklight/web_services_link_component.rb +12 -9
  54. data/app/components/geoblacklight/web_services_wfs_component.html.erb +4 -4
  55. data/app/components/geoblacklight/web_services_wms_component.html.erb +4 -4
  56. data/app/controllers/download_controller.rb +0 -7
  57. data/app/controllers/relation_controller.rb +1 -1
  58. data/app/controllers/wms_controller.rb +1 -1
  59. data/app/helpers/geoblacklight_helper.rb +0 -43
  60. data/app/javascript/geoblacklight/controllers/clipboard_controller.js +6 -6
  61. data/app/javascript/geoblacklight/controllers/downloads_controller.js +37 -29
  62. data/app/javascript/geoblacklight/controllers/leaflet_viewer_controller.js +110 -134
  63. data/app/javascript/geoblacklight/controllers/oembed_viewer_controller.js +5 -5
  64. data/app/javascript/geoblacklight/controllers/openlayers_viewer_controller.js +27 -61
  65. data/app/javascript/geoblacklight/controllers/search_results_controller.js +18 -18
  66. data/app/javascript/geoblacklight/core.js +35 -36
  67. data/app/javascript/geoblacklight/index.js +10 -10
  68. data/app/javascript/geoblacklight/initializers/metadata_download.js +23 -25
  69. data/app/javascript/geoblacklight/initializers/popovers.js +4 -4
  70. data/app/javascript/geoblacklight/initializers/relations.js +20 -20
  71. data/app/javascript/geoblacklight/initializers/tooltips.js +19 -23
  72. data/app/javascript/geoblacklight/initializers/truncation.js +18 -18
  73. data/app/javascript/geoblacklight/leaflet/basemaps.js +34 -3
  74. data/app/javascript/geoblacklight/leaflet/constants.js +7 -7
  75. data/app/javascript/geoblacklight/leaflet/controls/geosearch.js +80 -74
  76. data/app/javascript/geoblacklight/leaflet/controls/layer_opacity.js +74 -73
  77. data/app/javascript/geoblacklight/leaflet/controls/sidebar.js +31 -29
  78. data/app/javascript/geoblacklight/leaflet/controls/sleep.js +54 -51
  79. data/app/javascript/geoblacklight/leaflet/inspection.js +79 -71
  80. data/app/javascript/geoblacklight/leaflet/layer_index_map.js +74 -69
  81. data/app/javascript/geoblacklight/leaflet/layer_wmts.js +14 -16
  82. data/app/javascript/geoblacklight/leaflet/layers.js +59 -66
  83. data/app/javascript/geoblacklight/leaflet/utils.js +37 -43
  84. data/app/javascript/geoblacklight/openlayers/basemaps.js +43 -15
  85. data/app/javascript/geoblacklight/openlayers/inspection.js +23 -23
  86. data/app/javascript/geoblacklight/openlayers/layers.js +12 -12
  87. data/app/models/concerns/geoblacklight/bbox_filter_query.rb +7 -9
  88. data/app/models/concerns/geoblacklight/solr_document.rb +17 -57
  89. data/app/models/concerns/geoblacklight/suppressed_records_search_behavior.rb +3 -3
  90. data/app/views/catalog/_document_split.html.erb +3 -3
  91. data/app/views/catalog/_home_text.html.erb +22 -14
  92. data/app/views/catalog/_metadata.html.erb +1 -4
  93. data/app/views/catalog/_relations_container.html.erb +1 -1
  94. data/app/views/catalog/index.html.erb +0 -1
  95. data/app/views/catalog/metadata/_markup.html.erb +1 -2
  96. data/app/views/catalog/metadata/_missing.html.erb +2 -2
  97. data/app/views/catalog/web_services.html.erb +1 -1
  98. data/app/views/relation/index.html.erb +1 -1
  99. data/app/views/relation/index.json.jbuilder +1 -1
  100. data/config/initializers/rails_config.rb +0 -3
  101. data/config/locales/geoblacklight.en.yml +79 -78
  102. data/geoblacklight.gemspec +3 -4
  103. data/lib/generators/geoblacklight/assets_generator.rb +35 -26
  104. data/lib/generators/geoblacklight/install_generator.rb +6 -11
  105. data/lib/generators/geoblacklight/templates/assets/customizations.css +6 -0
  106. data/lib/generators/geoblacklight/templates/catalog_controller.rb +102 -77
  107. data/lib/generators/geoblacklight/templates/settings.yml +97 -132
  108. data/lib/geoblacklight/configuration/default_settings_builder.rb +18 -0
  109. data/lib/geoblacklight/configuration/display_note_shown_config.rb +13 -0
  110. data/lib/geoblacklight/configuration/fields_config.rb +51 -0
  111. data/lib/geoblacklight/configuration/leaflet_config.rb +73 -0
  112. data/lib/geoblacklight/configuration/leaflet_layers_config.rb +21 -0
  113. data/lib/geoblacklight/configuration/leaflet_sleep_config.rb +20 -0
  114. data/lib/geoblacklight/configuration/legacy_settings_builder.rb +94 -0
  115. data/lib/geoblacklight/configuration.rb +148 -0
  116. data/lib/geoblacklight/download.rb +2 -5
  117. data/lib/geoblacklight/engine.rb +7 -18
  118. data/lib/geoblacklight/metadata/base.rb +0 -2
  119. data/lib/geoblacklight/metadata_transformer.rb +0 -2
  120. data/lib/geoblacklight/references.rb +6 -10
  121. data/lib/geoblacklight/relation/ancestors.rb +3 -5
  122. data/lib/geoblacklight/relation/descendants.rb +2 -4
  123. data/lib/geoblacklight/relation/relation_response.rb +5 -8
  124. data/lib/geoblacklight/version.rb +1 -1
  125. data/lib/geoblacklight/wms_layer.rb +3 -3
  126. data/lib/geoblacklight.rb +5 -15
  127. data/lib/tasks/geoblacklight.rake +0 -9
  128. data/package.json +10 -31
  129. data/schema/geoblacklight-schema-aardvark.json +1 -9
  130. data/schema/readme.md +3 -4
  131. data/solr/conf/_rest_managed.json +3 -2
  132. data/solr/conf/schema.xml +1 -1
  133. data/solr/conf/solrconfig.xml +10 -10
  134. data/spec/components/geoblacklight/arcgis_component_spec.rb +6 -6
  135. data/spec/components/geoblacklight/attribute_table_component_spec.rb +6 -7
  136. data/spec/components/geoblacklight/citation_component_spec.rb +7 -4
  137. data/spec/components/geoblacklight/display_note_component_spec.rb +8 -8
  138. data/spec/components/geoblacklight/document_component_spec.rb +13 -13
  139. data/spec/components/geoblacklight/download_links_component_spec.rb +17 -14
  140. data/spec/components/geoblacklight/header_icons_component_spec.rb +6 -11
  141. data/spec/components/geoblacklight/homepage_feature_facet_component_spec.rb +22 -30
  142. data/spec/components/geoblacklight/iiif_drag_drop_component_spec.rb +3 -3
  143. data/spec/components/geoblacklight/index_map_legend_component_spec.rb +5 -18
  144. data/spec/components/geoblacklight/item_map_viewer_component_spec.rb +5 -5
  145. data/spec/components/geoblacklight/login_link_component_spec.rb +4 -5
  146. data/spec/components/geoblacklight/search_result_component_spec.rb +2 -6
  147. data/spec/components/geoblacklight/static_map_component_spec.rb +2 -2
  148. data/spec/components/geoblacklight/viewer_help_text_component_spec.rb +4 -6
  149. data/spec/components/geoblacklight/web_services_component_spec.rb +11 -10
  150. data/spec/controllers/catalog_controller_spec.rb +7 -7
  151. data/spec/controllers/download_controller_spec.rb +1 -1
  152. data/spec/controllers/relation_controller_spec.rb +1 -1
  153. data/spec/controllers/wms_controller_spec.rb +1 -1
  154. data/spec/features/axe_spec.rb +4 -4
  155. data/spec/features/bookmarks_spec.rb +1 -1
  156. data/spec/features/citations_spec.rb +1 -1
  157. data/spec/features/configurable_basemap_spec.rb +1 -69
  158. data/spec/features/data_dictionary_download_spec.rb +1 -1
  159. data/spec/features/download_layer_spec.rb +1 -1
  160. data/spec/features/empty_search_spec.rb +1 -1
  161. data/spec/features/esri_viewer_spec.rb +1 -1
  162. data/spec/features/exports_spec.rb +1 -1
  163. data/spec/features/full_screen_control_spec.rb +3 -10
  164. data/spec/features/help_text_spec.rb +1 -1
  165. data/spec/features/home_page_spec.rb +1 -1
  166. data/spec/features/index_map_spec.rb +3 -3
  167. data/spec/features/index_view_spec.rb +7 -7
  168. data/spec/features/layer_inspection_spec.rb +1 -1
  169. data/spec/features/layer_opacity_spec.rb +1 -1
  170. data/spec/features/layer_preview_spec.rb +1 -1
  171. data/spec/features/layer_with_no_references_spec.rb +1 -1
  172. data/spec/features/linkified_attribute_table_spec.rb +1 -1
  173. data/spec/features/metadata_panel_spec.rb +1 -1
  174. data/spec/features/missing_metadata_spec.rb +1 -1
  175. data/spec/features/multiple_downloads_spec.rb +1 -1
  176. data/spec/features/oembed_spec.rb +1 -1
  177. data/spec/features/relations_spec.rb +5 -4
  178. data/spec/features/saved_searches_spec.rb +1 -1
  179. data/spec/features/search_bar_spec.rb +1 -1
  180. data/spec/features/search_results_complex_geometry_spec.rb +1 -1
  181. data/spec/features/search_results_icons_spec.rb +3 -4
  182. data/spec/features/search_results_map_spec.rb +1 -1
  183. data/spec/features/search_results_overlap_ratio_spec.rb +3 -3
  184. data/spec/features/search_spec.rb +1 -1
  185. data/spec/features/show_page_download_spec.rb +1 -1
  186. data/spec/features/show_page_metadata_spec.rb +2 -2
  187. data/spec/features/show_page_sidebar_static_map_spec.rb +1 -1
  188. data/spec/features/sms_spec.rb +1 -1
  189. data/spec/features/suppressed_records_spec.rb +1 -1
  190. data/spec/features/tilejson_spec.rb +1 -1
  191. data/spec/features/tms_spec.rb +1 -1
  192. data/spec/features/web_services_modal_spec.rb +1 -1
  193. data/spec/features/wmts_spec.rb +1 -1
  194. data/spec/features/xyz_spec.rb +1 -1
  195. data/spec/fixtures/manifests/tilejson.json +10 -19
  196. data/spec/fixtures/metadata/fgdc.html +1 -1
  197. data/spec/fixtures/metadata/iso.html +1 -1
  198. data/spec/fixtures/solr_documents/README.md +0 -1
  199. data/spec/fixtures/solr_documents/actual-papermap1.json +9 -28
  200. data/spec/fixtures/solr_documents/actual-point1.json +12 -39
  201. data/spec/fixtures/solr_documents/actual-polygon1.json +10 -30
  202. data/spec/fixtures/solr_documents/actual-raster1.json +14 -46
  203. data/spec/fixtures/solr_documents/all-relationships.json +12 -36
  204. data/spec/fixtures/solr_documents/b1g_iiif_manifest.json +33 -62
  205. data/spec/fixtures/solr_documents/b1g_wabash_child_15.json +13 -40
  206. data/spec/fixtures/solr_documents/b1g_wabash_child_16.json +13 -40
  207. data/spec/fixtures/solr_documents/b1g_wabash_child_17.json +13 -40
  208. data/spec/fixtures/solr_documents/b1g_wabash_child_18.json +13 -40
  209. data/spec/fixtures/solr_documents/b1g_wabash_parent.json +13 -40
  210. data/spec/fixtures/solr_documents/baruch_ancestor1.json +13 -40
  211. data/spec/fixtures/solr_documents/baruch_ancestor2.json +13 -40
  212. data/spec/fixtures/solr_documents/baruch_documentation_download.json +14 -46
  213. data/spec/fixtures/solr_documents/bbox-spans-180.json +7 -21
  214. data/spec/fixtures/solr_documents/complex-geom.json +11 -37
  215. data/spec/fixtures/solr_documents/cornell_html_metadata.json +12 -37
  216. data/spec/fixtures/solr_documents/display-note.json +11 -33
  217. data/spec/fixtures/solr_documents/esri-dynamic-layer-all-layers.json +13 -39
  218. data/spec/fixtures/solr_documents/esri-dynamic-layer-single-layer.json +13 -40
  219. data/spec/fixtures/solr_documents/esri-feature-layer.json +13 -39
  220. data/spec/fixtures/solr_documents/esri-image-map-layer.json +13 -40
  221. data/spec/fixtures/solr_documents/esri-tiled_map_layer.json +16 -54
  222. data/spec/fixtures/solr_documents/esri-wms-layer.json +12 -36
  223. data/spec/fixtures/solr_documents/harvard_raster.json +12 -37
  224. data/spec/fixtures/solr_documents/iiif-eastern-hemisphere.json +9 -27
  225. data/spec/fixtures/solr_documents/index-map-polygon-no-downloadurl.json +12 -41
  226. data/spec/fixtures/solr_documents/index-map-polygon.json +12 -41
  227. data/spec/fixtures/solr_documents/index-map-stanford.json +14 -45
  228. data/spec/fixtures/solr_documents/index-map-v1-complex.json +13 -38
  229. data/spec/fixtures/solr_documents/index_map_point.json +13 -42
  230. data/spec/fixtures/solr_documents/metadata_no_geom.json +4 -14
  231. data/spec/fixtures/solr_documents/metadata_no_provider.json +8 -25
  232. data/spec/fixtures/solr_documents/multiple-downloads.json +6 -18
  233. data/spec/fixtures/solr_documents/no_locn_geometry.json +4 -12
  234. data/spec/fixtures/solr_documents/no_spatial.json +4 -12
  235. data/spec/fixtures/solr_documents/oembed.json +8 -25
  236. data/spec/fixtures/solr_documents/princeton-child1.json +9 -29
  237. data/spec/fixtures/solr_documents/princeton-child2.json +9 -29
  238. data/spec/fixtures/solr_documents/princeton-child3.json +9 -29
  239. data/spec/fixtures/solr_documents/princeton-child4.json +9 -29
  240. data/spec/fixtures/solr_documents/princeton-parent.json +10 -33
  241. data/spec/fixtures/solr_documents/public_cog_princeton.json +9 -27
  242. data/spec/fixtures/solr_documents/public_iiif_princeton.json +13 -43
  243. data/spec/fixtures/solr_documents/public_pmtiles_princeton.json +29 -39
  244. data/spec/fixtures/solr_documents/public_polygon_mit.json +9 -30
  245. data/spec/fixtures/solr_documents/restricted-line.json +14 -47
  246. data/spec/fixtures/solr_documents/the-related-record.json +4 -12
  247. data/spec/fixtures/solr_documents/tilejson.json +23 -46
  248. data/spec/fixtures/solr_documents/tms.json +7 -21
  249. data/spec/fixtures/solr_documents/umn_metro_result1.json +13 -41
  250. data/spec/fixtures/solr_documents/umn_state_result1.json +13 -39
  251. data/spec/fixtures/solr_documents/umn_state_result2.json +13 -39
  252. data/spec/fixtures/solr_documents/uva_slug_colon.json +10 -30
  253. data/spec/fixtures/solr_documents/wmts-multiple.json +23 -39
  254. data/spec/fixtures/solr_documents/wmts-single-layer.json +23 -46
  255. data/spec/fixtures/solr_documents/xyz.json +10 -33
  256. data/spec/helpers/geoblacklight_helper_spec.rb +5 -50
  257. data/spec/javascripts/geoblacklight_spec.js +10 -10
  258. data/spec/javascripts/metadata_download_button_spec.js +14 -13
  259. data/spec/lib/geoblacklight/bounding_box_spec.rb +1 -1
  260. data/spec/lib/geoblacklight/configuration/default_settings_builder_spec.rb +9 -0
  261. data/spec/lib/geoblacklight/configuration_spec.rb +13 -0
  262. data/spec/lib/geoblacklight/download/csv_download_spec.rb +2 -2
  263. data/spec/lib/geoblacklight/download/geojson_download_spec.rb +2 -2
  264. data/spec/lib/geoblacklight/download/geotiff_download_spec.rb +5 -2
  265. data/spec/lib/geoblacklight/download/kmz_download_spec.rb +2 -2
  266. data/spec/lib/geoblacklight/download/shapefile_download_spec.rb +2 -2
  267. data/spec/lib/geoblacklight/download_spec.rb +15 -6
  268. data/spec/lib/geoblacklight/geometry_spec.rb +1 -1
  269. data/spec/lib/geoblacklight/item_viewer_spec.rb +2 -2
  270. data/spec/lib/geoblacklight/metadata/base_spec.rb +1 -1
  271. data/spec/lib/geoblacklight/metadata/html_spec.rb +1 -1
  272. data/spec/lib/geoblacklight/metadata_spec.rb +1 -1
  273. data/spec/lib/geoblacklight/metadata_transformer/base_spec.rb +1 -1
  274. data/spec/lib/geoblacklight/metadata_transformer/fgdc_spec.rb +1 -1
  275. data/spec/lib/geoblacklight/metadata_transformer/iso19139_spec.rb +1 -1
  276. data/spec/lib/geoblacklight/metadata_transformer_spec.rb +1 -1
  277. data/spec/lib/geoblacklight/reference_spec.rb +1 -1
  278. data/spec/lib/geoblacklight/references_spec.rb +6 -4
  279. data/spec/lib/geoblacklight/relation/ancestors_spec.rb +10 -4
  280. data/spec/lib/geoblacklight/relation/descendants_spec.rb +9 -4
  281. data/spec/lib/geoblacklight/relation/relation_response_spec.rb +12 -15
  282. data/spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb +1 -1
  283. data/spec/lib/geoblacklight/wms_layer_spec.rb +1 -1
  284. data/spec/models/concerns/geoblacklight/bbox_filter_query_spec.rb +20 -11
  285. data/spec/models/concerns/geoblacklight/solr_document/citation_spec.rb +1 -1
  286. data/spec/models/concerns/geoblacklight/solr_document/finder_spec.rb +1 -1
  287. data/spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb +1 -1
  288. data/spec/models/concerns/geoblacklight/solr_document_spec.rb +4 -39
  289. data/spec/models/concerns/geoblacklight/suppressed_records_search_behavior_spec.rb +2 -2
  290. data/spec/routing/catalog_routing_spec.rb +1 -1
  291. data/spec/spec_helper.rb +4 -16
  292. data/spec/tasks/geoblacklight_spec.rb +1 -1
  293. data/spec/test_app_templates/lib/generators/test_app_generator.rb +4 -3
  294. metadata +40 -194
  295. data/Procfile.dev +0 -3
  296. data/app/assets/stylesheets/geoblacklight/geoblacklight.scss +0 -2
  297. data/app/assets/stylesheets/geoblacklight/modules/_base.scss +0 -31
  298. data/app/assets/stylesheets/geoblacklight/modules/_blacklight_overrides.scss +0 -40
  299. data/app/assets/stylesheets/geoblacklight/modules/_styles.scss +0 -9
  300. data/app/assets/stylesheets/geoblacklight/modules/downloads.scss +0 -62
  301. data/app/assets/stylesheets/geoblacklight/modules/geosearch.scss +0 -23
  302. data/app/assets/stylesheets/geoblacklight/modules/home.scss +0 -13
  303. data/app/assets/stylesheets/geoblacklight/modules/icon-customization.scss +0 -116
  304. data/app/assets/stylesheets/geoblacklight/modules/index_maps.scss +0 -61
  305. data/app/assets/stylesheets/geoblacklight/modules/item.scss +0 -78
  306. data/app/assets/stylesheets/geoblacklight/modules/layer_opacity.scss +0 -87
  307. data/app/assets/stylesheets/geoblacklight/modules/leaflet.scss +0 -4
  308. data/app/assets/stylesheets/geoblacklight/modules/metadata.scss +0 -31
  309. data/app/assets/stylesheets/geoblacklight/modules/metadata_content.scss +0 -43
  310. data/app/assets/stylesheets/geoblacklight/modules/metadata_markup.scss +0 -9
  311. data/app/assets/stylesheets/geoblacklight/modules/metadata_missing.scss +0 -7
  312. data/app/assets/stylesheets/geoblacklight/modules/modal.scss +0 -5
  313. data/app/assets/stylesheets/geoblacklight/modules/results.scss +0 -60
  314. data/app/assets/stylesheets/geoblacklight/modules/search_widgets.scss +0 -5
  315. data/app/assets/stylesheets/geoblacklight/modules/sidebar.scss +0 -42
  316. data/app/assets/stylesheets/geoblacklight/modules/toolbar.scss +0 -34
  317. data/app/assets/stylesheets/geoblacklight/modules/web_services.scss +0 -5
  318. data/app/components/blacklight/icons/american_geographical_society_library_uwm_libraries_component.rb +0 -46
  319. data/app/components/blacklight/icons/arizona_component.rb +0 -24
  320. data/app/components/blacklight/icons/baruch_cuny_component.rb +0 -23
  321. data/app/components/blacklight/icons/bookmark_component.rb +0 -23
  322. data/app/components/blacklight/icons/circle_info_solid_component.rb +0 -23
  323. data/app/components/blacklight/icons/columbia_component.rb +0 -23
  324. data/app/components/blacklight/icons/cornell_component.rb +0 -25
  325. data/app/components/blacklight/icons/george_mason_component.rb +0 -24
  326. data/app/components/blacklight/icons/harvard_component.rb +0 -23
  327. data/app/components/blacklight/icons/indiana_component.rb +0 -23
  328. data/app/components/blacklight/icons/lewis_clark_component.rb +0 -25
  329. data/app/components/blacklight/icons/massgis_component.rb +0 -23
  330. data/app/components/blacklight/icons/michigan_state_university_component.rb +0 -25
  331. data/app/components/blacklight/icons/mit_component.rb +0 -23
  332. data/app/components/blacklight/icons/northwestern_university_component.rb +0 -24
  333. data/app/components/blacklight/icons/nyu_component.rb +0 -26
  334. data/app/components/blacklight/icons/pennsylvania_state_university_component.rb +0 -25
  335. data/app/components/blacklight/icons/princeton_component.rb +0 -23
  336. data/app/components/blacklight/icons/purdue_university_component.rb +0 -25
  337. data/app/components/blacklight/icons/rutgers_component.rb +0 -25
  338. data/app/components/blacklight/icons/sms_component.rb +0 -23
  339. data/app/components/blacklight/icons/stanford_component.rb +0 -23
  340. data/app/components/blacklight/icons/texas_component.rb +0 -23
  341. data/app/components/blacklight/icons/the_ohio_state_university_component.rb +0 -26
  342. data/app/components/blacklight/icons/tufts_component.rb +0 -23
  343. data/app/components/blacklight/icons/ucla_component.rb +0 -23
  344. data/app/components/blacklight/icons/university_of_california_berkeley_component.rb +0 -24
  345. data/app/components/blacklight/icons/university_of_chicago_component.rb +0 -25
  346. data/app/components/blacklight/icons/university_of_colorado_boulder_component.rb +0 -26
  347. data/app/components/blacklight/icons/university_of_illinois_urbana_champaign_component.rb +0 -25
  348. data/app/components/blacklight/icons/university_of_iowa_component.rb +0 -24
  349. data/app/components/blacklight/icons/university_of_maryland_component.rb +0 -24
  350. data/app/components/blacklight/icons/university_of_michigan_component.rb +0 -24
  351. data/app/components/blacklight/icons/university_of_minnesota_component.rb +0 -24
  352. data/app/components/blacklight/icons/university_of_nebraska_lincoln_component.rb +0 -27
  353. data/app/components/blacklight/icons/university_of_wisconsin_madison_component.rb +0 -24
  354. data/app/components/blacklight/icons/uva_component.rb +0 -23
  355. data/app/components/geoblacklight/icon_facet_item_component.rb +0 -33
  356. data/app/components/geoblacklight/web_services_link_component.html.erb +0 -3
  357. data/bin/vite +0 -29
  358. data/config/initializers/new_gbl_settings_defaults_4.1.yml +0 -104
  359. data/lib/generators/geoblacklight/assets/importmap_generator.rb +0 -73
  360. data/lib/generators/geoblacklight/assets/vite_generator.rb +0 -89
  361. data/lib/generators/geoblacklight/templates/assets/_customizations.scss +0 -23
  362. data/lib/generators/geoblacklight/templates/assets/application.js +0 -17
  363. data/lib/generators/geoblacklight/templates/assets/application.scss +0 -9
  364. data/lib/generators/geoblacklight/templates/assets/geoblacklight.scss +0 -11
  365. data/lib/generators/geoblacklight/templates/base.html.erb +0 -46
  366. data/lib/generators/geoblacklight/templates/vite.config.ts +0 -23
  367. data/lib/generators/geoblacklight/templates/vite.json +0 -16
  368. data/lib/geoblacklight/deprecated_configuration.rb +0 -665
  369. data/schema/geoblacklight-schema-1.0.json +0 -214
  370. data/solr/conf/xslt/example.xsl +0 -132
  371. data/solr/conf/xslt/example_atom.xsl +0 -67
  372. data/solr/conf/xslt/example_rss.xsl +0 -66
  373. data/solr/conf/xslt/luke.xsl +0 -337
  374. data/spec/components/blacklight/icons/american_geographical_society_library_uwm_libraries_component_spec.rb +0 -15
  375. data/spec/components/blacklight/icons/arizona_component_spec.rb +0 -15
  376. data/spec/components/blacklight/icons/arrow_circle_down_component_spec.rb +0 -15
  377. data/spec/components/blacklight/icons/baruch_cuny_component_spec.rb +0 -15
  378. data/spec/components/blacklight/icons/book_component_spec.rb +0 -15
  379. data/spec/components/blacklight/icons/bookmark_component_spec.rb +0 -15
  380. data/spec/components/blacklight/icons/cd_rom_component_spec.rb +0 -15
  381. data/spec/components/blacklight/icons/child_item_component_spec.rb +0 -15
  382. data/spec/components/blacklight/icons/circle_info_solid_component_spec.rb +0 -15
  383. data/spec/components/blacklight/icons/citation_component_spec.rb +0 -15
  384. data/spec/components/blacklight/icons/collection_component_spec.rb +0 -15
  385. data/spec/components/blacklight/icons/collections_component_spec.rb +0 -15
  386. data/spec/components/blacklight/icons/columbia_component_spec.rb +0 -15
  387. data/spec/components/blacklight/icons/cornell_component_spec.rb +0 -15
  388. data/spec/components/blacklight/icons/datasets_component_spec.rb +0 -15
  389. data/spec/components/blacklight/icons/dvd_rom_component_spec.rb +0 -15
  390. data/spec/components/blacklight/icons/email_component_spec.rb +0 -15
  391. data/spec/components/blacklight/icons/esri_globe_component_spec.rb +0 -15
  392. data/spec/components/blacklight/icons/fire_solid_component_spec.rb +0 -15
  393. data/spec/components/blacklight/icons/george_mason_component_spec.rb +0 -15
  394. data/spec/components/blacklight/icons/globe_component_spec.rb +0 -15
  395. data/spec/components/blacklight/icons/harvard_component_spec.rb +0 -15
  396. data/spec/components/blacklight/icons/home_component_spec.rb +0 -15
  397. data/spec/components/blacklight/icons/iiif_drag_drop_component_spec.rb +0 -15
  398. data/spec/components/blacklight/icons/image_component_spec.rb +0 -15
  399. data/spec/components/blacklight/icons/imagery_component_spec.rb +0 -15
  400. data/spec/components/blacklight/icons/indiana_component_spec.rb +0 -15
  401. data/spec/components/blacklight/icons/leaf_component_spec.rb +0 -15
  402. data/spec/components/blacklight/icons/lewis_clark_component_spec.rb +0 -15
  403. data/spec/components/blacklight/icons/lightbulb_solid_component_spec.rb +0 -15
  404. data/spec/components/blacklight/icons/line_component_spec.rb +0 -15
  405. data/spec/components/blacklight/icons/map_component_spec.rb +0 -15
  406. data/spec/components/blacklight/icons/map_marker_component_spec.rb +0 -15
  407. data/spec/components/blacklight/icons/maps_component_spec.rb +0 -15
  408. data/spec/components/blacklight/icons/massgis_component_spec.rb +0 -15
  409. data/spec/components/blacklight/icons/metadata_component_spec.rb +0 -15
  410. data/spec/components/blacklight/icons/michigan_state_university_component_spec.rb +0 -15
  411. data/spec/components/blacklight/icons/mit_component_spec.rb +0 -15
  412. data/spec/components/blacklight/icons/mixed_component_spec.rb +0 -15
  413. data/spec/components/blacklight/icons/multilinestring_component_spec.rb +0 -15
  414. data/spec/components/blacklight/icons/multipoint_component_spec.rb +0 -15
  415. data/spec/components/blacklight/icons/multipolygon_component_spec.rb +0 -15
  416. data/spec/components/blacklight/icons/northwestern_university_component_spec.rb +0 -15
  417. data/spec/components/blacklight/icons/nyu_component_spec.rb +0 -15
  418. data/spec/components/blacklight/icons/pagelines_brands_component_spec.rb +0 -15
  419. data/spec/components/blacklight/icons/paper_map_component_spec.rb +0 -15
  420. data/spec/components/blacklight/icons/parent_item_component_spec.rb +0 -15
  421. data/spec/components/blacklight/icons/pennsylvania_state_university_component_spec.rb +0 -15
  422. data/spec/components/blacklight/icons/point_component_spec.rb +0 -15
  423. data/spec/components/blacklight/icons/polygon_component_spec.rb +0 -15
  424. data/spec/components/blacklight/icons/polyline_component_spec.rb +0 -15
  425. data/spec/components/blacklight/icons/princeton_component_spec.rb +0 -15
  426. data/spec/components/blacklight/icons/public_component_spec.rb +0 -15
  427. data/spec/components/blacklight/icons/purdue_university_component_spec.rb +0 -15
  428. data/spec/components/blacklight/icons/raster_component_spec.rb +0 -15
  429. data/spec/components/blacklight/icons/restricted_component_spec.rb +0 -15
  430. data/spec/components/blacklight/icons/rutgers_component_spec.rb +0 -15
  431. data/spec/components/blacklight/icons/sms_component_spec.rb +0 -15
  432. data/spec/components/blacklight/icons/stanford_component_spec.rb +0 -15
  433. data/spec/components/blacklight/icons/table_component_spec.rb +0 -15
  434. data/spec/components/blacklight/icons/tags_component_spec.rb +0 -15
  435. data/spec/components/blacklight/icons/texas_component_spec.rb +0 -15
  436. data/spec/components/blacklight/icons/the_ohio_state_university_component_spec.rb +0 -15
  437. data/spec/components/blacklight/icons/triangle_exclamation_solid_component_spec.rb +0 -15
  438. data/spec/components/blacklight/icons/tufts_component_spec.rb +0 -15
  439. data/spec/components/blacklight/icons/ucla_component_spec.rb +0 -15
  440. data/spec/components/blacklight/icons/university_of_california_berkeley_component_spec.rb +0 -15
  441. data/spec/components/blacklight/icons/university_of_chicago_component_spec.rb +0 -15
  442. data/spec/components/blacklight/icons/university_of_colorado_boulder_component_spec.rb +0 -15
  443. data/spec/components/blacklight/icons/university_of_illinois_urbana_champaign_component_spec.rb +0 -15
  444. data/spec/components/blacklight/icons/university_of_iowa_component_spec.rb +0 -15
  445. data/spec/components/blacklight/icons/university_of_maryland_component_spec.rb +0 -15
  446. data/spec/components/blacklight/icons/university_of_michigan_component_spec.rb +0 -15
  447. data/spec/components/blacklight/icons/university_of_minnesota_component_spec.rb +0 -15
  448. data/spec/components/blacklight/icons/university_of_nebraska_lincoln_component_spec.rb +0 -15
  449. data/spec/components/blacklight/icons/university_of_wisconsin_madison_component_spec.rb +0 -15
  450. data/spec/components/blacklight/icons/uva_component_spec.rb +0 -15
  451. data/spec/components/blacklight/icons/web_services_component_spec.rb +0 -15
  452. data/spec/components/blacklight/icons/websites_component_spec.rb +0 -15
  453. data/spec/components/geoblacklight/icon_facet_item_component_spec.rb +0 -18
  454. data/spec/config/initializers/rails_config_spec.rb +0 -16
  455. data/spec/fixtures/solr_documents/public_direct_download.json +0 -62
  456. data/spec/lib/geoblacklight/deprecated_configuration_spec.rb +0 -680
  457. data/spec/solr_config_spec.rb +0 -41
  458. data/spec/support/backport_test_helpers.rb +0 -47
  459. data/spec/support/view_component_capybara_test_helpers.rb +0 -8
  460. data/vite.config.ts +0 -32
  461. /data/app/assets/images/{blacklight → geoblacklight}/logo.svg +0 -0
@@ -11,7 +11,7 @@ module Geoblacklight
11
11
  end
12
12
 
13
13
  def render?
14
- Geoblacklight.deprecation.silence { downloadable? && (document.direct_download.present? || document.iiif_download.present? || document.download_types.present?) }
14
+ downloadable? && (document.direct_download.present? || document.iiif_download.present? || document.download_types.present?)
15
15
  end
16
16
 
17
17
  def downloadable?
@@ -1,14 +1,14 @@
1
1
  <header>
2
2
  <%= top_bar %>
3
3
  <% if landing_page? %>
4
- <div class='p-5 bg-light jumbotron'>
5
- <div class='d-flex justify-content-center'>
4
+ <div class="p-5 bg-light jumbotron">
5
+ <div class="d-flex justify-content-center">
6
6
  <%= content_tag :h1, t('geoblacklight.home.headline'), class: 'text-center display-5 fw-bold' %>
7
7
  </div>
8
- <div class='d-flex justify-content-center'>
8
+ <div class="d-flex justify-content-center">
9
9
  <%= content_tag :h2, t('geoblacklight.home.search_heading'), class: 'text-center fs-4' %>
10
10
  </div>
11
11
  </div>
12
- <% end %>
12
+ <% end %>
13
13
  <%= search_bar %>
14
14
  </header>
@@ -4,14 +4,16 @@ module Geoblacklight
4
4
  class HeaderIconsComponent < ViewComponent::Base
5
5
  attr_reader :document, :fields
6
6
 
7
- def initialize(document:, fields: [Settings.FIELDS.RESOURCE_CLASS, Settings.FIELDS.PROVIDER, Settings.FIELDS.ACCESS_RIGHTS])
7
+ def initialize(document:,
8
+ fields: [Geoblacklight.configuration.fields.resource_class,
9
+ Geoblacklight.configuration.fields.access_rights])
8
10
  @document = document
9
11
  @fields = fields
10
12
  super()
11
13
  end
12
14
 
13
15
  def icon(field)
14
- return resource_icon if field == Settings.FIELDS.RESOURCE_CLASS
16
+ return resource_icon if field == Geoblacklight.configuration.fields.resource_class
15
17
 
16
18
  helpers.geoblacklight_icon(@document[field], classes: "svg_tooltip")
17
19
  end
@@ -1,11 +1,7 @@
1
- <div class='category-block col-sm'>
2
- <div class='category-icon'>
1
+ <div class="category-block col-md p-3">
2
+ <div class="category-icon">
3
3
  <%= helpers.geoblacklight_icon(@icon) %>
4
4
  </div>
5
5
  <%= content_tag :h4, t(@label) %>
6
- <%- facets = @response.aggregations[@facet_field].items.map { |item|
7
- link_to(item.value, search_catalog_path("f[#{@facet_field}][]": item.value), class: 'home-facet-link')
8
- } %>
9
- <%- facets << link_to('more »', facet_catalog_path(@facet_field), class: 'more_facets_link') %>
10
- <%= facets.join(', ').html_safe %>
6
+ <%= facets %>
11
7
  </div>
@@ -2,12 +2,21 @@
2
2
 
3
3
  module Geoblacklight
4
4
  class HomepageFeatureFacetComponent < ViewComponent::Base
5
- def initialize(icon:, label:, facet_field:, response:)
5
+ def initialize(icon:, label:, facet_field_presenter:, items:)
6
6
  @icon = icon
7
7
  @label = label
8
- @facet_field = facet_field
9
- @response = response
8
+ @facet_field_presenter = facet_field_presenter
9
+ @items = items
10
10
  super()
11
11
  end
12
+
13
+ def facets
14
+ links = @items.map do |item|
15
+ item_presenter = @facet_field_presenter.item_presenter(item)
16
+ link_to(item_presenter.value, item_presenter.href, class: "home-facet-link")
17
+ end
18
+ links << link_to("more »", facet_catalog_path(@facet_field_presenter.key), class: "more_facets_link")
19
+ safe_join(links, ", ")
20
+ end
12
21
  end
13
22
  end
@@ -1,3 +1,3 @@
1
1
  <%= link_to @href_link, data: {manifest: @manifest}, class: 'float-end' do %>
2
- <%= helpers.geoblacklight_icon('iiif-drag-drop', classes: 'svg_tooltip iiif-icon') %>
3
- <% end %>
2
+ <%= helpers.geoblacklight_icon('iiif-drag-drop', classes: 'svg_tooltip iiif-icon') %>
3
+ <% end %>
@@ -6,11 +6,11 @@ module Geoblacklight
6
6
  super()
7
7
  manifest_ref = document.item_viewer&.iiif_manifest
8
8
  @manifest = manifest_ref&.endpoint || ""
9
- @href_link = Settings.IIIF_DRAG_DROP_LINK&.gsub("@manifest", @manifest)
9
+ @href_link = Geoblacklight.configuration.iiif_drag_drop_link.gsub("@manifest", @manifest)
10
10
  end
11
11
 
12
12
  def render?
13
- Settings.IIIF_DRAG_DROP_LINK.present? && @manifest.present?
13
+ @manifest.present? && @href_link.present?
14
14
  end
15
15
  end
16
16
  end
@@ -1,5 +1,5 @@
1
- <%= render Geoblacklight::AccordionComponent.new(id: 'index-map-attributes', title: t('geoblacklight.show.table_name')) do %>
2
- <div class='viewer-information px-3'>
1
+ <%= render Geoblacklight::AccordionComponent.new(id: 'index-map-attributes', title: t('geoblacklight.show.table_name')) do %>
2
+ <div class="viewer-information px-3">
3
3
  <em><%= t('geoblacklight.show.click_map') %></em>
4
4
  </div>
5
- <% end %>
5
+ <% end %>
@@ -1,14 +1,14 @@
1
- <div class="index-map-legend pb-2">
1
+ <div class="index-map-legend">
2
2
  <div class="index-map-legend-info">
3
- <span class="index-map-legend-default" style="background: <%= Settings.LEAFLET.LAYERS.INDEX.DEFAULT.color %>"></span>
4
- <p><span class="visually-hidden"><%= Settings.LEAFLET.LAYERS.INDEX.DEFAULT.sr_color_name %> tile indicates </span>Map held by collection</p>
3
+ <div class="index-map-legend-swatch" style="background: <%= index_config.dig(:DEFAULT, :color) %>"></div>
4
+ <div><span class="visually-hidden"><%= index_config.dig(:DEFAULT, :sr_color_name) %> tile indicates </span>Map held by collection</div>
5
5
  </div>
6
6
  <div class="index-map-legend-info">
7
- <span class="index-map-legend-unavailable" style="background: <%= Settings.LEAFLET.LAYERS.INDEX.UNAVAILABLE.color %>"></span>
8
- <p><span class="visually-hidden"><%= Settings.LEAFLET.LAYERS.INDEX.UNAVAILABLE.sr_color_name %> tile indicates </span>Map not held by collection</p>
7
+ <div class="index-map-legend-swatch" style="background: <%= index_config.dig(:UNAVAILABLE, :color) %>"></div>
8
+ <div><span class="visually-hidden"><%= index_config.dig(:UNAVAILABLE, :sr_color_name) %> tile indicates </span>Map not held by collection</div>
9
9
  </div>
10
10
  <div class="index-map-legend-info">
11
- <span class="index-map-legend-selected" style="background: <%= Settings.LEAFLET.LAYERS.INDEX.SELECTED.color %>"></span>
12
- <p><span class="visually-hidden"><%= Settings.LEAFLET.LAYERS.INDEX.SELECTED.sr_color_name %> tile indicates </span>Selected map tile</p>
11
+ <div class="index-map-legend-swatch" style="background: <%= index_config.dig(:SELECTED, :color) %>"></div>
12
+ <div><span class="visually-hidden"><%= index_config.dig(:SELECTED, :sr_color_name) %> tile indicates </span>Selected map tile</div>
13
13
  </div>
14
14
  </div>
@@ -13,5 +13,12 @@ module Geoblacklight
13
13
  def render?
14
14
  @document.item_viewer.index_map
15
15
  end
16
+
17
+ delegate :configuration, to: :Geoblacklight
18
+ delegate :leaflet_options, to: :configuration
19
+
20
+ def index_config
21
+ @index_config ||= leaflet_options.layers.index
22
+ end
16
23
  end
17
24
  end
@@ -46,7 +46,7 @@ module Geoblacklight
46
46
  def iiif_manifest_tag
47
47
  tag.div(nil,
48
48
  id: "mirador",
49
- class: "viewer",
49
+ class: "viewer border",
50
50
  data: {
51
51
  manifest_url: @document.viewer_endpoint
52
52
  })
@@ -57,7 +57,7 @@ module Geoblacklight
57
57
  def iiif_image_tag
58
58
  tag.div(nil,
59
59
  id: "openseadragon",
60
- class: "viewer",
60
+ class: "viewer border",
61
61
  data: {
62
62
  image_url: @document.viewer_endpoint
63
63
  })
@@ -80,19 +80,23 @@ module Geoblacklight
80
80
  viewer_name = openlayers? ? "openlayers-viewer" : "leaflet-viewer"
81
81
  tag.div(nil,
82
82
  id: viewer_name,
83
- class: "viewer",
83
+ class: "viewer border",
84
84
  data: {
85
85
  "controller" => viewer_name,
86
86
  "#{viewer_name}-available-value" => helpers.document_available?(@document),
87
- "#{viewer_name}-basemap-value" => Geoblacklight.deprecation.silence { helpers.geoblacklight_basemap },
87
+ "#{viewer_name}-basemap-value" => helpers.geoblacklight_basemap,
88
88
  "#{viewer_name}-protocol-value" => protocol,
89
89
  "#{viewer_name}-url-value" => @document.viewer_endpoint,
90
90
  "#{viewer_name}-map-geom-value" => @document.geometry.geojson,
91
91
  "#{viewer_name}-layer-id-value" => @document.wxs_identifier,
92
- "#{viewer_name}-options-value" => Geoblacklight.deprecation.silence { helpers.leaflet_options },
92
+ "#{viewer_name}-options-value" => leaflet_options.to_h,
93
93
  "#{viewer_name}-page-value" => params[:action]&.upcase,
94
94
  "#{viewer_name}-draw-initial-bounds-value" => true
95
95
  }.compact)
96
96
  end
97
+
98
+ def leaflet_options
99
+ Geoblacklight.configuration.leaflet_options
100
+ end
97
101
  end
98
102
  end
@@ -4,7 +4,7 @@ module Geoblacklight
4
4
  class LocationLeafletMapComponent < ViewComponent::Base
5
5
  def initialize(
6
6
  id: "leaflet-viewer",
7
- map_geometry: Settings.HOMEPAGE_MAP_GEOM,
7
+ map_geometry: config.homepage_map_geom,
8
8
  classes: "",
9
9
  page: nil,
10
10
  geosearch: nil
@@ -26,24 +26,37 @@ module Geoblacklight
26
26
 
27
27
  # Add top-level geosearch control to leaflet options if configured
28
28
  def leaflet_options
29
- options = Geoblacklight.deprecation.silence { helpers.leaflet_options }.deep_dup
30
- options["CONTROLS"] = {"Geosearch" => @geosearch} if @geosearch
31
- options.to_json
29
+ config.leaflet_options.deep_dup.tap do |options|
30
+ options.controls = {"Geosearch" => @geosearch} if @geosearch
31
+ end
32
+ end
33
+
34
+ def config
35
+ Geoblacklight.configuration
36
+ end
37
+
38
+ # We don't want turbo-permanent on the home page.
39
+ def data_permanent
40
+ return {} unless helpers.has_search_parameters?
41
+ {turbo_permanent: true}
32
42
  end
33
43
 
34
44
  def viewer_tag
35
- tag.div(nil,
36
- id: @id,
45
+ tag.div(id: @id,
37
46
  class: @classes,
38
- data: {
39
- "controller" => "leaflet-viewer",
40
- "leaflet-viewer-basemap-value" => Geoblacklight.deprecation.silence { helpers.geoblacklight_basemap },
41
- "leaflet-viewer-map-geom-value" => search_bbox || @map_geometry,
42
- "leaflet-viewer-data-map-value" => @data_map,
43
- "leaflet-viewer-page-value" => params[:action]&.upcase,
44
- "leaflet-viewer-options-value" => leaflet_options,
45
- "leaflet-viewer-catalog-base-url-value" => (helpers.search_catalog_url if @geosearch)
46
- }.compact)
47
+ data: data_permanent.merge(leaflet_viewer_data_attributes))
48
+ end
49
+
50
+ def leaflet_viewer_data_attributes
51
+ {
52
+ "controller" => "leaflet-viewer",
53
+ "leaflet-viewer-basemap-value" => helpers.geoblacklight_basemap,
54
+ "leaflet-viewer-map-geom-value" => search_bbox || @map_geometry,
55
+ "leaflet-viewer-data-map-value" => @data_map,
56
+ "leaflet-viewer-page-value" => params[:action]&.upcase,
57
+ "leaflet-viewer-options-value" => leaflet_options.to_h,
58
+ "leaflet-viewer-catalog-base-url-value" => (helpers.search_action_path if @geosearch)
59
+ }.compact
47
60
  end
48
61
  end
49
62
  end
@@ -7,14 +7,14 @@
7
7
  <% relationship_type_results['docs'][0..2].map { |hash| SolrDocument.new(hash) }.each do |doc| %>
8
8
  <li class="list-group-item border-bottom-0">
9
9
  <%= link_to solr_document_path(doc) do %>
10
- <%= Geoblacklight.deprecation.silence { helpers.relations_icon(doc, rel_type_info.icon) } unless rel_type_info.icon.nil? %>
10
+ <%= helpers.geoblacklight_icon(rel_type_info.icon) unless rel_type_info.icon.nil? %>
11
11
  <%= doc.title %>
12
12
  <% end %>
13
13
  </li>
14
14
  <% end %>
15
15
  <% unless (relationship_type_results['numFound'].to_i <= 3) %>
16
16
  <li class="list-group-item border-bottom-0">
17
- <%= link_to search_catalog_path({f: {"#{Settings.RELATIONSHIPS_SHOWN.public_send(relationship_type).field}" => [relations.link_id]}}) do %>
17
+ <%= link_to search_catalog_path({f: {"#{Geoblacklight.configuration.relationships_shown.public_send(relationship_type).field}" => [relations.link_id]}}) do %>
18
18
  <%= t('geoblacklight.relations.browse_all', count: relationship_type_results['numFound']) %>
19
19
  <% end %>
20
20
  </li>
@@ -1,4 +1,4 @@
1
- <%# This template copies from Blacklight's components/document_component.html.erb
1
+ <%# This template copies from Blacklight's components/document_component.html.erb
2
2
  # for the wrapping `content_tag @component` structure
3
3
  # and adds custom layout within for the document header, status-icons and more-info areas %>
4
4
 
@@ -14,31 +14,33 @@
14
14
  itemtype: @document.itemtype,
15
15
  class: classes.flatten.join(' ') do %>
16
16
 
17
- <%= content_tag :div, class: 'documentHeader index-split d-flex flex-grow-1', data: { layer_id: @document.id, geom: @document.geometry.geojson } do %>
18
- <h3 class="index_title d-flex flex-grow-1">
19
- <span class="document-counter">
20
- <%= t('blacklight.search.documents.counter', :counter => @counter) if @counter %>
21
- </span>
22
- <%= helpers.link_to_document(@document, counter: @counter, itemprop: "name") %>
23
- </h3>
17
+ <%= content_tag :div, class: 'documentHeader index-split', data: { layer_id: @document.id, geom: @document.geometry.geojson } do %>
18
+ <div class="document-counter">
19
+ <%= t('blacklight.search.documents.counter', :counter => @counter) if @counter %>
20
+ </div>
24
21
 
25
- <span class='status-icons'>
26
- <%= render Geoblacklight::HeaderIconsComponent.new(document: @document) %>
27
- <button
28
- class="btn dropdown-toggle collapsed"
29
- data-bs-toggle="collapse"
30
- data-bs-target="#doc-<%= @document.id %>-fields-collapse"
31
- aria-label="<%= t('geoblacklight.metadata.toggle_summary') %>"
32
- aria-expanded="false"
33
- aria-controls="doc-<%= @document.id %>-fields-collapse">
34
- </button>
35
- </span>
36
- <% end %>
37
- <% end %>
38
- <div class='more-info-area border-bottom'>
39
- <div id="doc-<%= @document.id %>-fields-collapse" class='collapse'>
40
- <small itemprop="description">
41
- <%= index_fields_display %>
42
- </small>
22
+ <h3 class="index_title">
23
+ <%= helpers.link_to_document(@document, counter: @counter, itemprop: "name") %>
24
+ </h3>
25
+
26
+ <div class="status-icons">
27
+ <%= render Geoblacklight::HeaderIconsComponent.new(document: @document) %>
28
+ <button
29
+ class="btn dropdown-toggle collapsed"
30
+ data-bs-toggle="collapse"
31
+ data-bs-target="#doc-<%= @document.id %>-fields-collapse"
32
+ aria-label="<%= t('geoblacklight.metadata.toggle_summary') %>"
33
+ aria-expanded="false"
34
+ aria-controls="doc-<%= @document.id %>-fields-collapse">
35
+ </button>
43
36
  </div>
37
+
38
+ <% end %>
39
+ <% end %>
40
+ <div class="more-info-area border-bottom">
41
+ <div id="doc-<%= @document.id %>-fields-collapse" class="collapse">
42
+ <small itemprop="description">
43
+ <%= index_fields_display %>
44
+ </small>
44
45
  </div>
46
+ </div>
@@ -15,8 +15,8 @@ module Geoblacklight
15
15
  # @return [String]
16
16
  def index_fields_display
17
17
  fields_values = []
18
- @presenter.configuration.index_fields.each do |_field_name, field_config|
19
- val = @presenter.field_value(field_config).to_s
18
+ @presenter.configuration.index_fields.each_value do |field_config|
19
+ val = @presenter.field_value(field_config).to_sentence
20
20
  if val.present?
21
21
  val += "." unless val.end_with?(".")
22
22
  fields_values << val
@@ -10,7 +10,7 @@ module Geoblacklight
10
10
  end
11
11
 
12
12
  def render?
13
- Settings.SIDEBAR_STATIC_MAP&.any? { |vp| @document.viewer_protocol == vp }
13
+ Geoblacklight.configuration.sidebar_static_map&.any? { |vp| @document.viewer_protocol == vp }
14
14
  end
15
15
 
16
16
  def before_render
@@ -18,16 +18,17 @@ module Geoblacklight
18
18
  end
19
19
 
20
20
  def viewer_tag
21
- leaflet_options = Geoblacklight.deprecation.silence { helpers.leaflet_options }.deep_dup
22
- leaflet_options.SLEEP.SLEEP = false
21
+ leaflet_options = Geoblacklight.configuration.leaflet_options.deep_dup
22
+ leaflet_options.sleep.sleep = false
23
23
  tag.div(nil,
24
24
  id: "static-map",
25
+ class: "viewer border",
25
26
  data: {
26
27
  "controller" => "leaflet-viewer",
27
- "leaflet-viewer-basemap-value" => Geoblacklight.deprecation.silence { helpers.geoblacklight_basemap },
28
+ "leaflet-viewer-basemap-value" => helpers.geoblacklight_basemap,
28
29
  "leaflet-viewer-page-value" => "STATIC_MAP",
29
30
  "leaflet-viewer-map-geom-value" => @document.geometry.geojson,
30
- "leaflet-viewer-options-value" => leaflet_options,
31
+ "leaflet-viewer-options-value" => leaflet_options.to_h,
31
32
  "leaflet-viewer-draw-initial-bounds-value" => true
32
33
  })
33
34
  end
@@ -1 +1 @@
1
- <%= display_text %>
1
+ <%= display_text %>
@@ -40,7 +40,7 @@ module Geoblacklight
40
40
  end
41
41
 
42
42
  def render?
43
- Settings&.HELP_TEXT&.public_send(@feature)&.include?(@key)
43
+ Geoblacklight.configuration.help_text.fetch(@feature.to_sym, []).include?(@key)
44
44
  end
45
45
  end
46
46
  end
@@ -1 +1 @@
1
- <%= render_web_services %>
1
+ <%= render_web_services %>
@@ -12,7 +12,7 @@ module Geoblacklight
12
12
  end
13
13
 
14
14
  def render?
15
- Settings.WEBSERVICES_SHOWN.include? @type
15
+ Geoblacklight.configuration.webservices_shown.include? @type
16
16
  end
17
17
 
18
18
  def render_web_services
@@ -1,11 +1,11 @@
1
- <div class='mb-3 web-services-form'>
2
- <label for='<%= reference.type%>_webservice'>
3
- <%= "#{helpers.formatted_name_reference(reference.type)}" %>
1
+ <div class="mb-3 web-services-form">
2
+ <label for="<%= reference.type %>_webservice">
3
+ <%= helpers.formatted_name_reference(reference.type) %>
4
4
  </label>
5
- <div class='input-group'>
6
- <input type='text' id='<%= reference.type%>_webservice' value='<%= reference.endpoint %>' class='form-control'>
5
+ <div class="input-group">
6
+ <input type="text" id="<%= reference.type %>_webservice" value="<%= reference.endpoint %>" class="form-control">
7
7
  <div class="input-group-append">
8
- <button button type="button" class="btn btn-primary" data-action="clipboard#copyToClipboard" data-clipboard-value-param='<%= reference.endpoint %>'><%= t('blacklight.modal.copy') %></button>
8
+ <button button type="button" class="btn btn-primary" data-action="clipboard#copyToClipboard" data-clipboard-value-param="<%= reference.endpoint %>"><%= t('blacklight.modal.copy') %></button>
9
9
  </div>
10
10
  </div>
11
11
  </div>
@@ -2,21 +2,24 @@
2
2
 
3
3
  module Geoblacklight
4
4
  class WebServicesLinkComponent < ViewComponent::Base
5
- def initialize(document:)
5
+ attr_reader :document
6
+
7
+ def initialize(document:, **)
6
8
  @document = document
7
9
  super()
8
10
  end
9
11
 
10
- def render?
11
- (Settings.WEBSERVICES_SHOWN & @document.references.refs.map(&:type).map(&:to_s)).any?
12
+ def call
13
+ link_to(
14
+ "Web services",
15
+ helpers.web_services_solr_document_path(id: document.id),
16
+ class: "nav-link",
17
+ data: {blacklight_modal: "trigger"}
18
+ )
12
19
  end
13
20
 
14
- def web_services_link
15
- link_to "Web services",
16
- helpers.web_services_solr_document_path(id: @document.id),
17
- class: ["btn", "btn-primary", "sidebar-btn"],
18
- id: "web-services-button",
19
- data: {blacklight_modal: "trigger"}
21
+ def key
22
+ "web_services"
20
23
  end
21
24
  end
22
25
  end
@@ -1,10 +1,10 @@
1
1
  <%= render Geoblacklight::WebServicesDefaultComponent.new(reference:) %>
2
2
  <div class="mb-3 d-flex align-items-center">
3
- <label for="wfs_abv_webservice" class="me-2"><%= t('geoblacklight.references.wfs_abv')%> <code><%= t('geoblacklight.references.wfs_label')%></code></label>
4
- <div class='input-group'>
5
- <input id="wfs_abv_webservice" type='text' value='<%= document.wxs_identifier %>' readonly='readonly' class="form-control">
3
+ <label for="wfs_abv_webservice" class="me-2"><%= t('geoblacklight.references.wfs_abv') %> <code><%= t('geoblacklight.references.wfs_label') %></code></label>
4
+ <div class="input-group">
5
+ <input id="wfs_abv_webservice" type="text" value="<%= document.wxs_identifier %>" readonly class="form-control">
6
6
  <div class="input-group-append">
7
- <button button type="button" class="btn btn-primary" data-action="clipboard#copyToClipboard" data-clipboard-value-param='<%= document.wxs_identifier %>'><%= t('blacklight.modal.copy') %></button>
7
+ <button button type="button" class="btn btn-primary" data-action="clipboard#copyToClipboard" data-clipboard-value-param="<%= document.wxs_identifier %>"><%= t('blacklight.modal.copy') %></button>
8
8
  </div>
9
9
  </div>
10
10
  </div>
@@ -1,10 +1,10 @@
1
1
  <%= render Geoblacklight::WebServicesDefaultComponent.new(reference:) %>
2
2
  <div class="mb-3 d-flex align-items-center">
3
- <label for="wms_abv_webservice" class="me-2"><%= t('geoblacklight.references.wms_abv')%> <code><%= t('geoblacklight.references.wms_label')%></code></label>
4
- <div class='input-group'>
5
- <input id="wms_abv_webservice" type='text' value='<%= document.wxs_identifier %>' class="form-control">
3
+ <label for="wms_abv_webservice" class="me-2"><%= t('geoblacklight.references.wms_abv') %> <code><%= t('geoblacklight.references.wms_label') %></code></label>
4
+ <div class="input-group">
5
+ <input id="wms_abv_webservice" type="text" value="<%= document.wxs_identifier %>" class="form-control">
6
6
  <div class="input-group-append">
7
- <button button type="button" class="btn btn-primary" data-action="clipboard#copyToClipboard" data-clipboard-value-param='<%= document.wxs_identifier %>'><%= t('blacklight.modal.copy') %></button>
7
+ <button button type="button" class="btn btn-primary" data-action="clipboard#copyToClipboard" data-clipboard-value-param="<%= document.wxs_identifier %>"><%= t('blacklight.modal.copy') %></button>
8
8
  </div>
9
9
  </div>
10
10
  </div>
@@ -1,13 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class DownloadController < ApplicationController
4
- before_action do
5
- Geoblacklight.deprecation.warn(
6
- "DownloadController is deprecated; GeoBlacklight 6 removes the generated download subsystem: downloads are direct links only, rendered by Geoblacklight::Document::DownloadLinksComponent"
7
- )
8
- end
9
-
10
- # include Blacklight::SearchHelper
11
4
  include Blacklight::Catalog
12
5
 
13
6
  rescue_from Geoblacklight::Exceptions::ExternalDownloadFailed do |exception|
@@ -6,7 +6,7 @@ class RelationController < ApplicationController
6
6
  copy_blacklight_config_from(CatalogController)
7
7
 
8
8
  def index
9
- @relations = Geoblacklight.deprecation.silence { Geoblacklight::Relation::RelationResponse.new(params[:id], repository) }
9
+ @relations = Geoblacklight::Relation::RelationResponse.new(params[:id], repository)
10
10
  render layout: !request.xhr?
11
11
  end
12
12
 
@@ -12,6 +12,6 @@ class WmsController < ApplicationController
12
12
  private
13
13
 
14
14
  def wms_params
15
- params.permit(Settings.GBL_PARAMS)
15
+ params.permit(Geoblacklight.configuration.gbl_params)
16
16
  end
17
17
  end