geoblacklight 3.7.0 → 4.0.0.pre.alpha

Sign up to get free protection for your applications and to get access to all the features.
Files changed (150) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ruby.yml +75 -28
  3. data/.gitignore +0 -1
  4. data/.rubocop.yml +5 -1
  5. data/.solr_wrapper +0 -1
  6. data/app/assets/images/blacklight/michigan-state-university.svg +1 -0
  7. data/app/assets/images/blacklight/pennsylvania-state-university.svg +1 -0
  8. data/app/assets/images/blacklight/purdue-university.svg +1 -0
  9. data/app/assets/images/blacklight/the-ohio-state-university.svg +1 -0
  10. data/app/assets/images/blacklight/university-of-chicago.svg +1 -0
  11. data/app/assets/images/blacklight/university-of-illinois-urbana-champaign.svg +1 -0
  12. data/app/assets/images/blacklight/university-of-iowa.svg +1 -0
  13. data/app/assets/images/blacklight/university-of-maryland.svg +1 -0
  14. data/app/assets/images/blacklight/university-of-michigan.svg +1 -0
  15. data/app/assets/images/blacklight/university-of-minnesota.svg +1 -0
  16. data/app/assets/images/blacklight/university-of-nebraska-lincoln.svg +1 -0
  17. data/app/assets/images/blacklight/university-of-wisconsin-madison.svg +1 -0
  18. data/app/assets/javascripts/geoblacklight/viewers/tms.js +2 -2
  19. data/app/assets/javascripts/geoblacklight/viewers/wms.js +2 -2
  20. data/app/models/concerns/geoblacklight/solr_document/citation.rb +2 -2
  21. data/app/models/concerns/geoblacklight/solr_document.rb +4 -4
  22. data/app/models/concerns/geoblacklight/spatial_search_behavior.rb +3 -3
  23. data/app/views/catalog/_header_icons.html.erb +1 -1
  24. data/app/views/catalog/_home_text.html.erb +2 -2
  25. data/app/views/relation/_relations.html.erb +15 -0
  26. data/app/views/relation/index.html.erb +4 -16
  27. data/app/views/relation/index.json.jbuilder +6 -2
  28. data/config/initializers/rails_config.rb +0 -8
  29. data/config/locales/geoblacklight.en.yml +8 -3
  30. data/geoblacklight.gemspec +1 -2
  31. data/lib/generators/geoblacklight/assets_generator.rb +1 -1
  32. data/lib/generators/geoblacklight/templates/catalog_controller.rb +78 -36
  33. data/lib/generators/geoblacklight/templates/settings.gbl_v1.yml +195 -0
  34. data/lib/generators/geoblacklight/templates/settings.yml +81 -25
  35. data/lib/geoblacklight/constants.rb +0 -3
  36. data/lib/geoblacklight/download/geojson_download.rb +1 -1
  37. data/lib/geoblacklight/download/geotiff_download.rb +1 -1
  38. data/lib/geoblacklight/download/hgl_download.rb +1 -1
  39. data/lib/geoblacklight/download/kmz_download.rb +1 -1
  40. data/lib/geoblacklight/download/shapefile_download.rb +1 -1
  41. data/lib/geoblacklight/engine.rb +2 -4
  42. data/lib/geoblacklight/item_viewer.rb +1 -13
  43. data/lib/geoblacklight/references.rb +1 -1
  44. data/lib/geoblacklight/relation/ancestors.rb +4 -3
  45. data/lib/geoblacklight/relation/descendants.rb +4 -3
  46. data/lib/geoblacklight/relation/relation_response.rb +21 -6
  47. data/lib/geoblacklight/version.rb +1 -1
  48. data/schema/{geoblacklight-schema.json → geoblacklight-schema-1.0.json} +1 -1
  49. data/schema/geoblacklight-schema-aardvark.json +211 -0
  50. data/solr/conf/schema.xml +38 -30
  51. data/solr/conf/solrconfig.xml +18 -18
  52. data/spec/components/geoblacklight/homepage_feature_facet_component_spec.rb +1 -1
  53. data/spec/config/initializers/rails_config_spec.rb +5 -8
  54. data/spec/controllers/catalog_controller_spec.rb +6 -6
  55. data/spec/features/download_layer_spec.rb +1 -1
  56. data/spec/features/esri_viewer_spec.rb +0 -1
  57. data/spec/features/home_page_spec.rb +4 -4
  58. data/spec/features/missing_metadata_spec.rb +2 -2
  59. data/spec/features/relations_spec.rb +2 -2
  60. data/spec/features/search_results_map_spec.rb +2 -1
  61. data/spec/features/search_results_overlap_ratio_spec.rb +2 -2
  62. data/spec/features/split_view.html.erb_spec.rb +16 -12
  63. data/spec/features/tms_spec.rb +1 -1
  64. data/spec/features/web_services_modal_spec.rb +0 -33
  65. data/spec/fixtures/solr_documents/README.md +48 -36
  66. data/spec/fixtures/solr_documents/actual-papermap1.json +41 -18
  67. data/spec/fixtures/solr_documents/actual-point1.json +47 -27
  68. data/spec/fixtures/solr_documents/actual-polygon1.json +43 -18
  69. data/spec/fixtures/solr_documents/actual-raster1.json +52 -23
  70. data/spec/fixtures/solr_documents/all-relationships.json +48 -0
  71. data/spec/fixtures/solr_documents/baruch_ancestor1.json +62 -37
  72. data/spec/fixtures/solr_documents/baruch_ancestor2.json +62 -37
  73. data/spec/fixtures/solr_documents/baruch_documentation_download.json +60 -34
  74. data/spec/fixtures/solr_documents/bbox-spans-180.json +34 -16
  75. data/spec/fixtures/solr_documents/cornell_html_metadata.json +46 -26
  76. data/spec/fixtures/solr_documents/esri-dynamic-layer-all-layers.json +43 -25
  77. data/spec/fixtures/solr_documents/esri-dynamic-layer-single-layer.json +45 -28
  78. data/spec/fixtures/solr_documents/esri-feature-layer.json +44 -34
  79. data/spec/fixtures/solr_documents/esri-image-map-layer.json +45 -31
  80. data/spec/fixtures/solr_documents/esri-tiled_map_layer.json +42 -17
  81. data/spec/fixtures/solr_documents/esri-wms-layer.json +46 -21
  82. data/spec/fixtures/solr_documents/harvard_raster.json +55 -36
  83. data/spec/fixtures/solr_documents/iiif-eastern-hemisphere.json +35 -22
  84. data/spec/fixtures/solr_documents/index-map-polygon-no-downloadurl.json +48 -27
  85. data/spec/fixtures/solr_documents/index-map-polygon.json +48 -27
  86. data/spec/fixtures/solr_documents/index-map-stanford.json +54 -25
  87. data/spec/fixtures/solr_documents/index_map_point.json +54 -26
  88. data/spec/fixtures/solr_documents/metadata_no_geom.json +27 -0
  89. data/spec/fixtures/solr_documents/metadata_no_provider.json +39 -0
  90. data/spec/fixtures/solr_documents/multiple-downloads.json +33 -20
  91. data/spec/fixtures/solr_documents/no_locn_geometry.json +25 -0
  92. data/spec/fixtures/solr_documents/no_spatial.json +37 -19
  93. data/spec/fixtures/solr_documents/oembed.json +34 -17
  94. data/spec/fixtures/solr_documents/princeton-child1.json +45 -28
  95. data/spec/fixtures/solr_documents/princeton-child2.json +45 -28
  96. data/spec/fixtures/solr_documents/princeton-child3.json +45 -28
  97. data/spec/fixtures/solr_documents/princeton-child4.json +45 -28
  98. data/spec/fixtures/solr_documents/princeton-parent.json +46 -23
  99. data/spec/fixtures/solr_documents/public_direct_download.json +48 -21
  100. data/spec/fixtures/solr_documents/public_iiif_princeton.json +49 -24
  101. data/spec/fixtures/solr_documents/public_polygon_mit.json +31 -15
  102. data/spec/fixtures/solr_documents/restricted-line.json +52 -21
  103. data/spec/fixtures/solr_documents/the-related-record.json +27 -0
  104. data/spec/fixtures/solr_documents/tms.json +33 -17
  105. data/spec/fixtures/solr_documents/umn_metro_result1.json +44 -28
  106. data/spec/fixtures/solr_documents/umn_state_result1.json +44 -26
  107. data/spec/fixtures/solr_documents/umn_state_result2.json +45 -24
  108. data/spec/fixtures/solr_documents/uva_slug_colon.json +43 -20
  109. data/spec/lib/geoblacklight/download/geojson_download_spec.rb +1 -1
  110. data/spec/lib/geoblacklight/download/geotiff_download_spec.rb +1 -1
  111. data/spec/lib/geoblacklight/download/hgl_download_spec.rb +1 -1
  112. data/spec/lib/geoblacklight/download/kmz_download_spec.rb +1 -1
  113. data/spec/lib/geoblacklight/download/shapefile_download_spec.rb +1 -1
  114. data/spec/lib/geoblacklight/download_spec.rb +1 -1
  115. data/spec/lib/geoblacklight/references_spec.rb +2 -2
  116. data/spec/lib/geoblacklight/relation/ancestors_spec.rb +3 -3
  117. data/spec/lib/geoblacklight/relation/descendants_spec.rb +3 -3
  118. data/spec/lib/geoblacklight/relation/relation_response_spec.rb +32 -17
  119. data/spec/models/concerns/geoblacklight/solr_document_spec.rb +4 -4
  120. data/spec/spec_helper.rb +0 -4
  121. data/spec/views/catalog/_results_pagination.html.erb_spec.rb +1 -1
  122. data/spec/views/catalog/_show_downloads.html.erb_spec.rb +1 -1
  123. metadata +22 -63
  124. data/app/assets/javascripts/geoblacklight/viewers/tilejson.js +0 -33
  125. data/app/assets/javascripts/geoblacklight/viewers/wmts.js +0 -85
  126. data/app/assets/javascripts/geoblacklight/viewers/xyz.js +0 -10
  127. data/app/views/relation/_ancestors.html.erb +0 -8
  128. data/app/views/relation/_descendants.html.erb +0 -15
  129. data/config/initializers/new_gbl_settings_defaults_3_3.yml +0 -10
  130. data/schema/format-values.md +0 -50
  131. data/schema/geoblacklight-schema-deprecated.md +0 -39
  132. data/schema/geoblacklight-schema.md +0 -323
  133. data/schema/geometry-type-values.md +0 -11
  134. data/schema/references.md +0 -23
  135. data/schema/schema-commentary.md +0 -198
  136. data/schema/subjects.md +0 -41
  137. data/schema/type-values.md +0 -10
  138. data/spec/features/tilejson_spec.rb +0 -22
  139. data/spec/features/wmts_spec.rb +0 -34
  140. data/spec/features/xyz_spec.rb +0 -10
  141. data/spec/fixtures/manifests/tilejson.json +0 -21
  142. data/spec/fixtures/manifests/wmts-multiple.xml +0 -813
  143. data/spec/fixtures/manifests/wmts-single.xml +0 -126
  144. data/spec/fixtures/solr_documents/metadata_no_dct_provenance_s.json +0 -30
  145. data/spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json +0 -17
  146. data/spec/fixtures/solr_documents/metadata_no_solr_geom.json +0 -23
  147. data/spec/fixtures/solr_documents/tilejson.json +0 -38
  148. data/spec/fixtures/solr_documents/wmts-multiple.json +0 -32
  149. data/spec/fixtures/solr_documents/wmts-single-layer.json +0 -38
  150. data/spec/fixtures/solr_documents/xyz.json +0 -29
data/schema/subjects.md DELETED
@@ -1,41 +0,0 @@
1
- These charts lists the most common terms and spellings for Subjects
2
- in the GeoBlacklight community.
3
-
4
- ## Geospatial Data
5
-
6
- Common spelling | Related terms
7
- |----|-------------
8
- Farming | Agriculture
9
- Biota | Biology |ISO Topic Category
10
- Boundaries | Administrative and political boundaries; Cities and towns
11
- Climatology, Meteorology, and Atmosphere | Climate
12
- Economy
13
- Elevation
14
- Environment |
15
- Geoscientific Information | Geology
16
- Health ||
17
- Imagery and Base Maps | Imagery; Basemaps; Landcover
18
- Intelligence and Military |
19
- Inland Waters |
20
- Location |
21
- Oceans |
22
- Planning and Cadastral | Property
23
- Society |
24
- Structure | Facilities and Structures
25
- Transportation |
26
- Utilities and Communications | Utilities
27
-
28
- ## Maps
29
-
30
- Common spelling | Related terms
31
- |:---- |:------------- |
32
- Aeronautical charts
33
- Atlases
34
- Bathymetric maps
35
- Cadastral maps
36
- Fire insurance maps
37
- Geological maps
38
- Road maps
39
- Thematic maps
40
- Topographic maps
41
- Tourist maps
@@ -1,10 +0,0 @@
1
- ## GeoBlacklight Type Values
2
-
3
- | Label | Dublin Core Link | Definition|
4
- |:----------------------------|:-------------|:---------------------------------------------------------|
5
- |Dataset|[DCMI Link](http://dublincore.org/documents/dcmi-terms/#dcmitype-Dataset)|Data encoded in a defined structure. Includes geospatial formats as vector, raster, and tabular data.|
6
- |Image|[DCMI Link](http://dublincore.org/documents/dcmi-terms/#dcmitype-Image)|A visual representation other than text. Includes static born-digital maps, scanned map images, and aerial photography.|
7
- |Collection|[DCMI Link](http://dublincore.org/documents/dcmi-terms/#dcmitype-Collection)|An aggregation of resources. Describes a group of resources that may or may not be separately described.|
8
- |Interactive Resource|[DCMI Link](http://dublincore.org/documents/dcmi-terms/#dcmitype-InteractiveResource)|External web applications that require the user to input information to generate a filtered dataset|
9
- |Collection|[DCMI Link](http://dublincore.org/documents/dcmi-terms/#dcmitype-Collection)|An aggregation of resources. Describes a group of resources that may or may not be separately described.|
10
- |Physical Object|[DCMI Link](http://dublincore.org/documents/dcmi-terms/#dcmitype-PhysicalObject)|Non-digital resource, such as a paper map or a globe|
@@ -1,22 +0,0 @@
1
- # frozen_string_literal: true
2
- require 'spec_helper'
3
-
4
- feature 'tilejson layer' do
5
- before do
6
- WebMock.disable_net_connect!(allow_localhost: true, allow: 'chromedriver.storage.googleapis.com')
7
- end
8
-
9
- after do
10
- WebMock.allow_net_connect!
11
- end
12
-
13
- scenario 'displays tilejson layer', js: true do
14
- # Mock tilejson manifest url
15
- stub_request(:get, 'https://map-tiles-staging.princeton.edu/mosaicjson/tilejson.json?id=2a91d82c541c426cb787cc62afe8f248')
16
- .to_return(status: 200, body: read_fixture('manifests/tilejson.json'))
17
-
18
- visit solr_document_path('princeton-fk4544658v-tilejson')
19
- expect(page).to have_css '.leaflet-control-zoom', visible: :visible
20
- expect(page).to have_css "img[src*='https://map-tiles-staging.princeton.edu/mosaicjson/tiles/WebMercatorQuad']"
21
- end
22
- end
@@ -1,34 +0,0 @@
1
- # frozen_string_literal: true
2
- require 'spec_helper'
3
-
4
- feature 'wmts layer' do
5
- before do
6
- WebMock.disable_net_connect!(allow_localhost: true, allow: 'chromedriver.storage.googleapis.com')
7
- end
8
-
9
- after do
10
- WebMock.allow_net_connect!
11
- end
12
-
13
- context 'when referencing a WMTSCapabilities document with a single layer' do
14
- scenario 'displays the layer', js: true do
15
- # Mock wmts manifest url
16
- stub_request(:get, 'https://map-tiles-staging.princeton.edu/mosaicjson/WMTSCapabilities.xml?id=2a91d82c541c426cb787cc62afe8f248')
17
- .to_return(status: 200, body: read_fixture('manifests/wmts-single.xml'))
18
-
19
- visit solr_document_path('princeton-fk4544658v-wmts')
20
- expect(page).to have_css '.leaflet-control-zoom', visible: :visible
21
- expect(page).to have_css "img[src*='map-tiles-staging.princeton.edu/mosaicjson/tiles/WebMercatorQuad']"
22
- end
23
- end
24
- context 'when referencing a WMTSCapabilities document with a multiple layers' do
25
- scenario 'displays the layer referenced in the layer_id field', js: true do
26
- # Mock wmts manifest url
27
- stub_request(:get, 'https://maps.wien.gv.at/wmts/1.0.0/WMTSCapabilities.xml')
28
- .to_return(status: 200, body: read_fixture('manifests/wmts-multiple.xml'))
29
- visit solr_document_path('princeton-fk4db9hn29')
30
- expect(page).to have_css '.leaflet-control-zoom', visible: :visible
31
- expect(page).to have_css "img[src*='http://maps1.wien.gv.at/wmts/lb2016/farbe/google3857']"
32
- end
33
- end
34
- end
@@ -1,10 +0,0 @@
1
- # frozen_string_literal: true
2
- require 'spec_helper'
3
-
4
- feature 'xyz layer' do
5
- scenario 'displays tms layer', js: true do
6
- visit solr_document_path('6f47b103-9955-4bbe-a364-387039623106-xyz')
7
- expect(page).to have_css '.leaflet-control-zoom', visible: :visible
8
- expect(page).to have_css "img[src*='earthquake.usgs.gov']"
9
- end
10
- end
@@ -1,21 +0,0 @@
1
- {
2
- "tilejson": "2.2.0",
3
- "version": "1.0.0",
4
- "scheme": "xyz",
5
- "tiles": [
6
- "https://map-tiles-staging.princeton.edu/mosaicjson/tiles/WebMercatorQuad/{z}/{x}/{y}@1x?url=s3%3A%2F%2Ffiggy-geo-staging%2F2a%2F91%2Fd8%2F2a91d82c541c426cb787cc62afe8f248%2Fmosaic-6c5b32bfe4cb8e4fb07d32cd6656d024.json&rescale=0%2C255"
7
- ],
8
- "minzoom": 8,
9
- "maxzoom": 13,
10
- "bounds": [
11
- 19.22222222200001,
12
- 39.74997750505241,
13
- 29.356941715411907,
14
- 43.083333000050004
15
- ],
16
- "center": [
17
- 24.28958196870596,
18
- 41.41665525255121,
19
- 8
20
- ]
21
- }