geoblacklight 3.8.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 (162) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ruby.yml +98 -22
  3. data/.gitignore +0 -1
  4. data/.rubocop.yml +5 -1
  5. data/.solr_wrapper +0 -1
  6. data/README.md +1 -1
  7. data/app/assets/images/blacklight/geoblacklight-icons.json +66 -102
  8. data/app/assets/images/blacklight/michigan-state-university.svg +1 -0
  9. data/app/assets/images/blacklight/pennsylvania-state-university.svg +1 -0
  10. data/app/assets/images/blacklight/purdue-university.svg +1 -0
  11. data/app/assets/images/blacklight/the-ohio-state-university.svg +1 -0
  12. data/app/assets/images/blacklight/university-of-chicago.svg +1 -0
  13. data/app/assets/images/blacklight/university-of-illinois-urbana-champaign.svg +1 -0
  14. data/app/assets/images/blacklight/university-of-iowa.svg +1 -0
  15. data/app/assets/images/blacklight/university-of-maryland.svg +1 -0
  16. data/app/assets/images/blacklight/university-of-michigan.svg +1 -0
  17. data/app/assets/images/blacklight/university-of-minnesota.svg +1 -0
  18. data/app/assets/images/blacklight/university-of-nebraska-lincoln.svg +1 -0
  19. data/app/assets/images/blacklight/university-of-wisconsin-madison.svg +1 -0
  20. data/app/assets/javascripts/geoblacklight/viewers/tms.js +2 -2
  21. data/app/assets/javascripts/geoblacklight/viewers/wms.js +2 -2
  22. data/app/models/concerns/geoblacklight/solr_document/citation.rb +2 -2
  23. data/app/models/concerns/geoblacklight/solr_document.rb +4 -4
  24. data/app/models/concerns/geoblacklight/spatial_search_behavior.rb +3 -3
  25. data/app/views/catalog/_header_icons.html.erb +1 -1
  26. data/app/views/catalog/_home_text.html.erb +2 -2
  27. data/app/views/relation/_relations.html.erb +15 -0
  28. data/app/views/relation/index.html.erb +4 -16
  29. data/app/views/relation/index.json.jbuilder +6 -2
  30. data/bin/coverage.rb +36 -0
  31. data/config/initializers/rails_config.rb +0 -8
  32. data/config/locales/geoblacklight.en.yml +8 -8
  33. data/geoblacklight.gemspec +4 -4
  34. data/lib/generators/geoblacklight/assets_generator.rb +1 -1
  35. data/lib/generators/geoblacklight/templates/catalog_controller.rb +78 -36
  36. data/lib/generators/geoblacklight/templates/settings.gbl_v1.yml +195 -0
  37. data/lib/generators/geoblacklight/templates/settings.yml +81 -25
  38. data/lib/geoblacklight/constants.rb +0 -3
  39. data/lib/geoblacklight/download/geojson_download.rb +1 -1
  40. data/lib/geoblacklight/download/geotiff_download.rb +1 -1
  41. data/lib/geoblacklight/download/hgl_download.rb +1 -1
  42. data/lib/geoblacklight/download/kmz_download.rb +1 -1
  43. data/lib/geoblacklight/download/shapefile_download.rb +1 -1
  44. data/lib/geoblacklight/engine.rb +3 -4
  45. data/lib/geoblacklight/item_viewer.rb +1 -13
  46. data/lib/geoblacklight/metadata/base.rb +1 -2
  47. data/lib/geoblacklight/references.rb +1 -1
  48. data/lib/geoblacklight/relation/ancestors.rb +4 -3
  49. data/lib/geoblacklight/relation/descendants.rb +4 -3
  50. data/lib/geoblacklight/relation/relation_response.rb +21 -6
  51. data/lib/geoblacklight/version.rb +1 -1
  52. data/schema/{geoblacklight-schema.json → geoblacklight-schema-1.0.json} +1 -1
  53. data/schema/geoblacklight-schema-aardvark.json +211 -0
  54. data/solr/conf/schema.xml +38 -30
  55. data/solr/conf/solrconfig.xml +18 -18
  56. data/spec/components/geoblacklight/homepage_feature_facet_component_spec.rb +1 -1
  57. data/spec/config/initializers/rails_config_spec.rb +5 -8
  58. data/spec/controllers/catalog_controller_spec.rb +6 -6
  59. data/spec/features/download_layer_spec.rb +1 -1
  60. data/spec/features/esri_viewer_spec.rb +0 -1
  61. data/spec/features/home_page_spec.rb +4 -4
  62. data/spec/features/missing_metadata_spec.rb +2 -2
  63. data/spec/features/relations_spec.rb +2 -2
  64. data/spec/features/search_results_map_spec.rb +2 -1
  65. data/spec/features/search_results_overlap_ratio_spec.rb +2 -2
  66. data/spec/features/split_view.html.erb_spec.rb +16 -12
  67. data/spec/features/tms_spec.rb +1 -1
  68. data/spec/features/web_services_modal_spec.rb +0 -33
  69. data/spec/fixtures/solr_documents/README.md +48 -36
  70. data/spec/fixtures/solr_documents/actual-papermap1.json +41 -18
  71. data/spec/fixtures/solr_documents/actual-point1.json +47 -27
  72. data/spec/fixtures/solr_documents/actual-polygon1.json +43 -18
  73. data/spec/fixtures/solr_documents/actual-raster1.json +52 -23
  74. data/spec/fixtures/solr_documents/all-relationships.json +48 -0
  75. data/spec/fixtures/solr_documents/baruch_ancestor1.json +62 -37
  76. data/spec/fixtures/solr_documents/baruch_ancestor2.json +62 -37
  77. data/spec/fixtures/solr_documents/baruch_documentation_download.json +60 -34
  78. data/spec/fixtures/solr_documents/bbox-spans-180.json +34 -16
  79. data/spec/fixtures/solr_documents/cornell_html_metadata.json +46 -26
  80. data/spec/fixtures/solr_documents/esri-dynamic-layer-all-layers.json +43 -25
  81. data/spec/fixtures/solr_documents/esri-dynamic-layer-single-layer.json +45 -28
  82. data/spec/fixtures/solr_documents/esri-feature-layer.json +44 -34
  83. data/spec/fixtures/solr_documents/esri-image-map-layer.json +45 -31
  84. data/spec/fixtures/solr_documents/esri-tiled_map_layer.json +42 -17
  85. data/spec/fixtures/solr_documents/esri-wms-layer.json +46 -21
  86. data/spec/fixtures/solr_documents/harvard_raster.json +55 -36
  87. data/spec/fixtures/solr_documents/iiif-eastern-hemisphere.json +35 -22
  88. data/spec/fixtures/solr_documents/index-map-polygon-no-downloadurl.json +48 -27
  89. data/spec/fixtures/solr_documents/index-map-polygon.json +48 -27
  90. data/spec/fixtures/solr_documents/index-map-stanford.json +54 -25
  91. data/spec/fixtures/solr_documents/index_map_point.json +54 -26
  92. data/spec/fixtures/solr_documents/metadata_no_geom.json +27 -0
  93. data/spec/fixtures/solr_documents/metadata_no_provider.json +39 -0
  94. data/spec/fixtures/solr_documents/multiple-downloads.json +33 -20
  95. data/spec/fixtures/solr_documents/no_locn_geometry.json +25 -0
  96. data/spec/fixtures/solr_documents/no_spatial.json +37 -19
  97. data/spec/fixtures/solr_documents/oembed.json +34 -17
  98. data/spec/fixtures/solr_documents/princeton-child1.json +45 -28
  99. data/spec/fixtures/solr_documents/princeton-child2.json +45 -28
  100. data/spec/fixtures/solr_documents/princeton-child3.json +45 -28
  101. data/spec/fixtures/solr_documents/princeton-child4.json +45 -28
  102. data/spec/fixtures/solr_documents/princeton-parent.json +46 -23
  103. data/spec/fixtures/solr_documents/public_direct_download.json +48 -21
  104. data/spec/fixtures/solr_documents/public_iiif_princeton.json +49 -24
  105. data/spec/fixtures/solr_documents/public_polygon_mit.json +31 -15
  106. data/spec/fixtures/solr_documents/restricted-line.json +52 -21
  107. data/spec/fixtures/solr_documents/the-related-record.json +27 -0
  108. data/spec/fixtures/solr_documents/tms.json +33 -17
  109. data/spec/fixtures/solr_documents/umn_metro_result1.json +44 -28
  110. data/spec/fixtures/solr_documents/umn_state_result1.json +44 -26
  111. data/spec/fixtures/solr_documents/umn_state_result2.json +45 -24
  112. data/spec/fixtures/solr_documents/uva_slug_colon.json +43 -20
  113. data/spec/lib/geoblacklight/download/geojson_download_spec.rb +1 -1
  114. data/spec/lib/geoblacklight/download/geotiff_download_spec.rb +1 -1
  115. data/spec/lib/geoblacklight/download/hgl_download_spec.rb +1 -1
  116. data/spec/lib/geoblacklight/download/kmz_download_spec.rb +1 -1
  117. data/spec/lib/geoblacklight/download/shapefile_download_spec.rb +1 -1
  118. data/spec/lib/geoblacklight/download_spec.rb +1 -1
  119. data/spec/lib/geoblacklight/metadata/base_spec.rb +0 -18
  120. data/spec/lib/geoblacklight/references_spec.rb +2 -2
  121. data/spec/lib/geoblacklight/relation/ancestors_spec.rb +3 -3
  122. data/spec/lib/geoblacklight/relation/descendants_spec.rb +3 -3
  123. data/spec/lib/geoblacklight/relation/relation_response_spec.rb +32 -17
  124. data/spec/models/concerns/geoblacklight/solr_document_spec.rb +4 -4
  125. data/spec/spec_helper.rb +0 -5
  126. data/spec/test_app_templates/Gemfile.extra +0 -1
  127. data/spec/views/catalog/_results_pagination.html.erb_spec.rb +1 -1
  128. data/spec/views/catalog/_show_downloads.html.erb_spec.rb +1 -1
  129. metadata +43 -74
  130. data/app/assets/images/blacklight/american-geographical-society-library-uwm-libraries.svg +0 -26
  131. data/app/assets/images/blacklight/arizona.svg +0 -4
  132. data/app/assets/images/blacklight/george-mason.svg +0 -4
  133. data/app/assets/images/blacklight/nebraska.svg +0 -4
  134. data/app/assets/images/blacklight/rutgers.svg +0 -5
  135. data/app/assets/javascripts/geoblacklight/viewers/tilejson.js +0 -33
  136. data/app/assets/javascripts/geoblacklight/viewers/wmts.js +0 -85
  137. data/app/assets/javascripts/geoblacklight/viewers/xyz.js +0 -10
  138. data/app/views/relation/_ancestors.html.erb +0 -8
  139. data/app/views/relation/_descendants.html.erb +0 -15
  140. data/config/initializers/new_gbl_settings_defaults_3_3.yml +0 -10
  141. data/lib/geoblacklight/faraday_middleware/follow_redirects.rb +0 -176
  142. data/schema/format-values.md +0 -50
  143. data/schema/geoblacklight-schema-deprecated.md +0 -39
  144. data/schema/geoblacklight-schema.md +0 -323
  145. data/schema/geometry-type-values.md +0 -11
  146. data/schema/references.md +0 -23
  147. data/schema/schema-commentary.md +0 -198
  148. data/schema/subjects.md +0 -41
  149. data/schema/type-values.md +0 -10
  150. data/spec/features/tilejson_spec.rb +0 -22
  151. data/spec/features/wmts_spec.rb +0 -34
  152. data/spec/features/xyz_spec.rb +0 -10
  153. data/spec/fixtures/manifests/tilejson.json +0 -21
  154. data/spec/fixtures/manifests/wmts-multiple.xml +0 -813
  155. data/spec/fixtures/manifests/wmts-single.xml +0 -126
  156. data/spec/fixtures/solr_documents/metadata_no_dct_provenance_s.json +0 -30
  157. data/spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json +0 -17
  158. data/spec/fixtures/solr_documents/metadata_no_solr_geom.json +0 -23
  159. data/spec/fixtures/solr_documents/tilejson.json +0 -38
  160. data/spec/fixtures/solr_documents/wmts-multiple.json +0 -32
  161. data/spec/fixtures/solr_documents/wmts-single-layer.json +0 -38
  162. data/spec/fixtures/solr_documents/xyz.json +0 -29
@@ -2,7 +2,7 @@
2
2
  require 'spec_helper'
3
3
 
4
4
  describe Geoblacklight::KmzDownload do
5
- let(:document) { SolrDocument.new(Settings.FIELDS.UNIQUE_KEY => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.GEOMETRY => 'ENVELOPE(-180, 180, 90, -90)') }
5
+ let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-180, 180, 90, -90)') }
6
6
  let(:download) { described_class.new(document) }
7
7
  describe '#initialize' do
8
8
  it 'initializes as a KmzDownload object with specific options' do
@@ -2,7 +2,7 @@
2
2
  require 'spec_helper'
3
3
 
4
4
  describe Geoblacklight::ShapefileDownload do
5
- let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
5
+ let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-180, 180, 90, -90)') }
6
6
  let(:download) { described_class.new(document) }
7
7
  describe '#initialize' do
8
8
  it 'initializes as a ShapefileDownload object with specific options' do
@@ -7,7 +7,7 @@ describe Geoblacklight::Download do
7
7
  let(:faraday_connection) { instance_double(Faraday::Connection) }
8
8
  let(:faraday_response) { instance_double(Faraday::Response) }
9
9
  let(:references_field) { Settings.FIELDS.REFERENCES }
10
- let(:document) { SolrDocument.new("#{Settings.FIELDS.UNIQUE_KEY}": 'test', references_field => { 'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms' }.to_json) }
10
+ let(:document) { SolrDocument.new("#{Settings.FIELDS.ID}": 'test', references_field => { 'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms' }.to_json) }
11
11
  let(:options) { { type: 'shapefile', extension: 'zip', service_type: 'wms', content_type: 'application/zip' } }
12
12
 
13
13
  describe '#initialize' do
@@ -27,24 +27,6 @@ describe Geoblacklight::Metadata::Base do
27
27
  end
28
28
  end
29
29
 
30
- context "when there's a redirect" do
31
- before do
32
- allow(Faraday).to receive(:new).and_call_original
33
- WebMock.disable_net_connect!(allow_localhost: true, allow: 'chromedriver.storage.googleapis.com')
34
- stub_request(:get, 'http://purl.stanford.edu/cg357zz0321.mods').to_return(status: 301, headers: { location: 'https://purl.stanford.edu/cg357zz0321.mods' })
35
- stub_request(:get, 'https://purl.stanford.edu/cg357zz0321.mods').to_return(status: 200, headers: { 'content-type' => 'application/xml' }, body: '<test>data</test>')
36
- end
37
-
38
- after do
39
- WebMock.allow_net_connect!(net_http_connect_on_start: true)
40
- end
41
-
42
- it 'follows the redirect' do
43
- expect(metadata.document).to be_a Nokogiri::XML::Document
44
- expect(metadata.document.text).to eq 'data'
45
- end
46
- end
47
-
48
30
  context 'when attempts to connect to an endpoint URL fail' do
49
31
  subject { metadata.document }
50
32
 
@@ -3,7 +3,7 @@ require 'spec_helper'
3
3
 
4
4
  describe Geoblacklight::References do
5
5
  let(:references_field) { Settings.FIELDS.REFERENCES }
6
- let(:file_format_field) { Settings.FIELDS.FILE_FORMAT }
6
+ let(:file_format_field) { Settings.FIELDS.FORMAT }
7
7
  let(:typical_ogp_shapefile) do
8
8
  described_class.new(
9
9
  SolrDocument.new(
@@ -135,7 +135,7 @@ describe Geoblacklight::References do
135
135
  let(:settings_klass) { class_double('Settings').as_stubbed_const }
136
136
  before do
137
137
  allow(settings_klass).to receive(:METADATA_SHOWN).and_return %w[iso19139 mods]
138
- allow(settings_klass).to receive(:FIELDS).and_return OpenStruct.new(FILE_FORMAT: 'dc_format_s')
138
+ allow(settings_klass).to receive(:FIELDS).and_return OpenStruct.new(FORMAT: 'dc_format_s')
139
139
  end
140
140
  it 'is ordered by the configuration' do
141
141
  expect(complex_shapefile.shown_metadata_refs.first.type.to_s).to eq 'iso19139'
@@ -3,12 +3,12 @@ require 'spec_helper'
3
3
 
4
4
  describe Geoblacklight::Relation::Ancestors do
5
5
  let(:repository) { Blacklight::Solr::Repository.new(CatalogController.blacklight_config) }
6
- let(:ancestors) { described_class.new('nyu_2451_34502', repository) }
7
- let(:empty_ancestors) { described_class.new('harvard-g7064-s2-1834-k3', repository) }
6
+ let(:ancestors) { described_class.new('nyu_2451_34502', Settings.FIELDS.SOURCE, repository) }
7
+ let(:empty_ancestors) { described_class.new('harvard-g7064-s2-1834-k3', Settings.FIELDS.SOURCE, repository) }
8
8
 
9
9
  describe '#create_search_params' do
10
10
  it 'assembles the correct search params for finding ancestor documents' do
11
- expect(ancestors.create_search_params).to eq(fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=#{Settings.FIELDS.UNIQUE_KEY}}#{Settings.FIELDS.UNIQUE_KEY}:nyu_2451_34502"], fl: [Settings.FIELDS.TITLE.to_s, Settings.FIELDS.UNIQUE_KEY, Settings.FIELDS.GEOM_TYPE])
11
+ expect(ancestors.create_search_params).to eq(fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=#{Settings.FIELDS.ID}}#{Settings.FIELDS.ID}:nyu_2451_34502"], fl: [Settings.FIELDS.TITLE.to_s, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE])
12
12
  end
13
13
  end
14
14
 
@@ -3,12 +3,12 @@ require 'spec_helper'
3
3
 
4
4
  describe Geoblacklight::Relation::Descendants do
5
5
  let(:repository) { Blacklight::Solr::Repository.new(CatalogController.blacklight_config) }
6
- let(:descendants) { described_class.new('nyu_2451_34636', repository) }
7
- let(:empty_descendants) { described_class.new('harvard-g7064-s2-1834-k3', repository) }
6
+ let(:descendants) { described_class.new('nyu_2451_34636', Settings.FIELDS.SOURCE, repository) }
7
+ let(:empty_descendants) { described_class.new('harvard-g7064-s2-1834-k3', Settings.FIELDS.SOURCE, repository) }
8
8
 
9
9
  describe '#create_search_params' do
10
10
  it 'assembles the correct search params for finding descendant documents' do
11
- expect(descendants.create_search_params).to eq(fq: "#{Settings.FIELDS.SOURCE}:nyu_2451_34636", fl: [Settings.FIELDS.TITLE.to_s, Settings.FIELDS.UNIQUE_KEY, Settings.FIELDS.GEOM_TYPE])
11
+ expect(descendants.create_search_params).to eq(fq: "#{Settings.FIELDS.SOURCE}:nyu_2451_34636", fl: [Settings.FIELDS.TITLE.to_s, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE])
12
12
  end
13
13
  end
14
14
 
@@ -11,34 +11,49 @@ describe Geoblacklight::Relation::RelationResponse do
11
11
  end
12
12
  end
13
13
 
14
- describe '#ancestors' do
14
+ describe '#method_missing' do
15
15
  it 'returns a hash of ancestor documents' do
16
- expect(relation_resp.ancestors).to include('numFound')
17
- expect(relation_resp.ancestors).to include('docs')
16
+ expect(relation_resp.SOURCE_ANCESTORS).to include('numFound')
17
+ expect(relation_resp.SOURCE_ANCESTORS).to include('docs')
18
18
  end
19
- end
20
19
 
21
- describe '#descendants' do
22
20
  it 'returns a hash of descendant documents' do
23
- expect(relation_resp.ancestors).to include('numFound')
24
- expect(relation_resp.ancestors).to include('docs')
21
+ expect(relation_resp.SOURCE_DESCENDANTS).to include('numFound')
22
+ expect(relation_resp.SOURCE_DESCENDANTS).to include('docs')
23
+ end
24
+
25
+ it 'raises no method error' do
26
+ expect { relation_resp.FAIL }.to raise_error NoMethodError
25
27
  end
26
28
  end
27
29
 
28
- describe '#empty?' do
29
- it 'returns false if document has ancestors or descendants' do
30
- expect(relation_resp.empty?).to be false
30
+ describe '#respond_to_missing?' do
31
+ it 'returns true for configured relationships' do
32
+ Settings.RELATIONSHIPS_SHOWN.each_key do |key|
33
+ expect(relation_resp).to respond_to(key)
34
+ end
31
35
  end
32
- it 'returns true if document has neither ancestors nor descendants' do
33
- expect(empty_relation_resp.empty?).to be true
36
+
37
+ it 'returns false for non-configured options' do
38
+ expect(relation_resp).not_to respond_to('fail')
34
39
  end
40
+ end
35
41
 
36
- context 'with a layer slug containing a colon' do
37
- let(:empty_relation_resp) { described_class.new('uva-Norfolk:police_point', repository) }
42
+ describe '#query_type' do
43
+ it 'fails for a bad query type request' do
44
+ Settings.add_source!({
45
+ RELATIONSHIPS_SHOWN: {
46
+ BAD: {
47
+ field: 'dct_source_sm',
48
+ query_type: 'bad_query_type',
49
+ icon: 'pagelines-brands',
50
+ label: 'geoblacklight.relations.ancestor'
51
+ }
52
+ }
53
+ })
54
+ Settings.reload!
38
55
 
39
- it 'returns true if document has neither ancestors nor descendants' do
40
- expect(empty_relation_resp.empty?).to be true
41
- end
56
+ expect { relation_resp.BAD }.to raise_error(ArgumentError)
42
57
  end
43
58
  end
44
59
  end
@@ -3,8 +3,8 @@ require 'spec_helper'
3
3
 
4
4
  describe Geoblacklight::SolrDocument do
5
5
  let(:document) { SolrDocument.new(document_attributes) }
6
- let(:rights_field) { Settings.FIELDS.RIGHTS }
7
- let(:provenance_field) { Settings.FIELDS.PROVENANCE }
6
+ let(:rights_field) { Settings.FIELDS.ACCESS_RIGHTS }
7
+ let(:provider_field) { Settings.FIELDS.PROVIDER }
8
8
  let(:references_field) { Settings.FIELDS.REFERENCES }
9
9
  describe '#available?' do
10
10
  let(:document_attributes) { {} }
@@ -80,7 +80,7 @@ describe Geoblacklight::SolrDocument do
80
80
  end
81
81
  describe '#same_institution?' do
82
82
  describe 'within the same institution' do
83
- let(:document_attributes) { { provenance_field => 'STANFORD' } }
83
+ let(:document_attributes) { { provider_field => 'STANFORD' } }
84
84
  it 'is true' do
85
85
  allow(Settings).to receive('Institution').and_return('Stanford')
86
86
  expect(document.same_institution?).to be_truthy
@@ -91,7 +91,7 @@ describe Geoblacklight::SolrDocument do
91
91
  end
92
92
  end
93
93
  describe 'within a different institution' do
94
- let(:document_attributes) { { provenance_field => 'MIT' } }
94
+ let(:document_attributes) { { provider_field => 'MIT' } }
95
95
  it 'is false' do
96
96
  allow(Settings).to receive('Institution').and_return('Stanford')
97
97
  expect(document.same_institution?).to be_falsey
data/spec/spec_helper.rb CHANGED
@@ -16,7 +16,6 @@ SimpleCov.start 'rails' do
16
16
  add_filter 'lib/tasks/geoblacklight.rake'
17
17
  add_filter '/spec'
18
18
  add_filter '.internal_test_app/'
19
- minimum_coverage 100
20
19
  end
21
20
 
22
21
  require 'factory_bot'
@@ -31,10 +30,6 @@ require 'capybara/rspec'
31
30
  require 'selenium-webdriver'
32
31
  require 'webdrivers'
33
32
 
34
- # Setup webmock for specific tests
35
- require 'webmock/rspec'
36
- WebMock.allow_net_connect!
37
-
38
33
  Capybara.register_driver(:headless_chrome) do |app|
39
34
  Capybara::Selenium::Driver.load_selenium
40
35
  browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
@@ -1,3 +1,2 @@
1
1
  gem 'sprockets', '< 4'
2
2
  gem 'view_component', '!= 2.26.0'
3
- gem 'faraday', ENV["FARADAY_VERSION"].to_s != "" ? ENV["FARADAY_VERSION"] : '>= 1.0'
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
  require 'spec_helper'
3
3
 
4
- describe 'catalog/_results_pagination', type: :view do
4
+ describe 'catalog/_results_pagination.html.erb', type: :view do
5
5
  it 'will have a #pagination wrapping div' do
6
6
  allow(view).to receive_messages(show_pagination?: false)
7
7
  render
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
  require 'spec_helper'
3
3
 
4
- describe 'catalog/_show_downloads', type: :view do
4
+ describe 'catalog/_show_downloads.html.erb', type: :view do
5
5
  context 'document is downloadable' do
6
6
  let(:document) { instance_double(SolrDocument) }
7
7
  before do
metadata CHANGED
@@ -1,17 +1,17 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: geoblacklight
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.8.0
4
+ version: 4.0.0.pre.alpha
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mike Graves
8
8
  - Darren Hardy
9
9
  - Eliot Jordan
10
10
  - Jack Reed
11
- autorequire:
11
+ autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2023-04-07 00:00:00.000000000 Z
14
+ date: 2021-09-03 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rails
@@ -22,7 +22,7 @@ dependencies:
22
22
  version: 5.2.4
23
23
  - - "<"
24
24
  - !ruby/object:Gem::Version
25
- version: '7.1'
25
+ version: '6.2'
26
26
  type: :runtime
27
27
  prerelease: false
28
28
  version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
32
32
  version: 5.2.4
33
33
  - - "<"
34
34
  - !ruby/object:Gem::Version
35
- version: '7.1'
35
+ version: '6.2'
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: blacklight
38
38
  requirement: !ruby/object:Gem::Requirement
@@ -65,16 +65,30 @@ dependencies:
65
65
  name: faraday
66
66
  requirement: !ruby/object:Gem::Requirement
67
67
  requirements:
68
- - - ">="
68
+ - - "~>"
69
69
  - !ruby/object:Gem::Version
70
70
  version: '1.0'
71
71
  type: :runtime
72
72
  prerelease: false
73
73
  version_requirements: !ruby/object:Gem::Requirement
74
74
  requirements:
75
- - - ">="
75
+ - - "~>"
76
76
  - !ruby/object:Gem::Version
77
77
  version: '1.0'
78
+ - !ruby/object:Gem::Dependency
79
+ name: faraday_middleware
80
+ requirement: !ruby/object:Gem::Requirement
81
+ requirements:
82
+ - - "~>"
83
+ - !ruby/object:Gem::Version
84
+ version: 1.0.0.rc1
85
+ type: :runtime
86
+ prerelease: false
87
+ version_requirements: !ruby/object:Gem::Requirement
88
+ requirements:
89
+ - - "~>"
90
+ - !ruby/object:Gem::Version
91
+ version: 1.0.0.rc1
78
92
  - !ruby/object:Gem::Dependency
79
93
  name: coderay
80
94
  requirement: !ruby/object:Gem::Requirement
@@ -109,14 +123,14 @@ dependencies:
109
123
  requirements:
110
124
  - - "~>"
111
125
  - !ruby/object:Gem::Version
112
- version: '0.8'
126
+ version: '0.4'
113
127
  type: :runtime
114
128
  prerelease: false
115
129
  version_requirements: !ruby/object:Gem::Requirement
116
130
  requirements:
117
131
  - - "~>"
118
132
  - !ruby/object:Gem::Version
119
- version: '0.8'
133
+ version: '0.4'
120
134
  - !ruby/object:Gem::Dependency
121
135
  name: mime-types
122
136
  requirement: !ruby/object:Gem::Requirement
@@ -341,20 +355,6 @@ dependencies:
341
355
  - - "~>"
342
356
  - !ruby/object:Gem::Version
343
357
  version: '2.2'
344
- - !ruby/object:Gem::Dependency
345
- name: webmock
346
- requirement: !ruby/object:Gem::Requirement
347
- requirements:
348
- - - "~>"
349
- - !ruby/object:Gem::Version
350
- version: '3.14'
351
- type: :development
352
- prerelease: false
353
- version_requirements: !ruby/object:Gem::Requirement
354
- requirements:
355
- - - "~>"
356
- - !ruby/object:Gem::Version
357
- version: '3.14'
358
358
  description: GeoBlacklight provides a world-class discovery platform for geospatial
359
359
  (GIS) holdings. It is an open collaborative project aiming to build off of the successes
360
360
  of the Blacklight Solr-powered discovery interface and the multi-institutional OpenGeoportal
@@ -364,7 +364,8 @@ email:
364
364
  - drh@stanford.edu
365
365
  - eliotj@princeton.edu
366
366
  - pjreed@stanford.edu
367
- executables: []
367
+ executables:
368
+ - coverage.rb
368
369
  extensions: []
369
370
  extra_rdoc_files: []
370
371
  files:
@@ -384,8 +385,6 @@ files:
384
385
  - LICENSE.txt
385
386
  - README.md
386
387
  - Rakefile
387
- - app/assets/images/blacklight/american-geographical-society-library-uwm-libraries.svg
388
- - app/assets/images/blacklight/arizona.svg
389
388
  - app/assets/images/blacklight/arrow-circle-down.svg
390
389
  - app/assets/images/blacklight/baruch-cuny.svg
391
390
  - app/assets/images/blacklight/berkeley.svg
@@ -401,7 +400,6 @@ files:
401
400
  - app/assets/images/blacklight/email.svg
402
401
  - app/assets/images/blacklight/esri-globe.svg
403
402
  - app/assets/images/blacklight/geoblacklight-icons.json
404
- - app/assets/images/blacklight/george-mason.svg
405
403
  - app/assets/images/blacklight/globe.svg
406
404
  - app/assets/images/blacklight/harvard.svg
407
405
  - app/assets/images/blacklight/home.svg
@@ -427,7 +425,6 @@ files:
427
425
  - app/assets/images/blacklight/multilinestring.svg
428
426
  - app/assets/images/blacklight/multipoint.svg
429
427
  - app/assets/images/blacklight/multipolygon.svg
430
- - app/assets/images/blacklight/nebraska.svg
431
428
  - app/assets/images/blacklight/nyu.svg
432
429
  - app/assets/images/blacklight/ohio-state.svg
433
430
  - app/assets/images/blacklight/pagelines-brands.svg
@@ -443,7 +440,6 @@ files:
443
440
  - app/assets/images/blacklight/purdue.svg
444
441
  - app/assets/images/blacklight/raster.svg
445
442
  - app/assets/images/blacklight/restricted.svg
446
- - app/assets/images/blacklight/rutgers.svg
447
443
  - app/assets/images/blacklight/sms.svg
448
444
  - app/assets/images/blacklight/stanford.svg
449
445
  - app/assets/images/blacklight/table.svg
@@ -497,12 +493,9 @@ files:
497
493
  - app/assets/javascripts/geoblacklight/viewers/index_map.js
498
494
  - app/assets/javascripts/geoblacklight/viewers/map.js
499
495
  - app/assets/javascripts/geoblacklight/viewers/oembed.js
500
- - app/assets/javascripts/geoblacklight/viewers/tilejson.js
501
496
  - app/assets/javascripts/geoblacklight/viewers/tms.js
502
497
  - app/assets/javascripts/geoblacklight/viewers/viewer.js
503
498
  - app/assets/javascripts/geoblacklight/viewers/wms.js
504
- - app/assets/javascripts/geoblacklight/viewers/wmts.js
505
- - app/assets/javascripts/geoblacklight/viewers/xyz.js
506
499
  - app/assets/stylesheets/geoblacklight/geoblacklight.scss
507
500
  - app/assets/stylesheets/geoblacklight/modules/_base.scss
508
501
  - app/assets/stylesheets/geoblacklight/modules/_blacklight_overrides.scss
@@ -578,13 +571,12 @@ files:
578
571
  - app/views/catalog/metadata/_missing.html.erb
579
572
  - app/views/catalog/web_services.html.erb
580
573
  - app/views/download/hgl.html.erb
581
- - app/views/relation/_ancestors.html.erb
582
- - app/views/relation/_descendants.html.erb
574
+ - app/views/relation/_relations.html.erb
583
575
  - app/views/relation/index.html.erb
584
576
  - app/views/relation/index.json.jbuilder
585
577
  - app/views/shared/_header_navbar.html.erb
586
578
  - babel.config.json
587
- - config/initializers/new_gbl_settings_defaults_3_3.yml
579
+ - bin/coverage.rb
588
580
  - config/initializers/new_gbl_settings_defaults_3_4.yml
589
581
  - config/initializers/rails_config.rb
590
582
  - config/locales/geoblacklight.en.yml
@@ -600,6 +592,7 @@ files:
600
592
  - lib/generators/geoblacklight/templates/assets/geoblacklight.js
601
593
  - lib/generators/geoblacklight/templates/catalog_controller.rb
602
594
  - lib/generators/geoblacklight/templates/package.json
595
+ - lib/generators/geoblacklight/templates/settings.gbl_v1.yml
603
596
  - lib/generators/geoblacklight/templates/settings.yml
604
597
  - lib/generators/geoblacklight/templates/webpacker.yml
605
598
  - lib/generators/geoblacklight/webpacker_generator.rb
@@ -615,7 +608,6 @@ files:
615
608
  - lib/geoblacklight/download/shapefile_download.rb
616
609
  - lib/geoblacklight/engine.rb
617
610
  - lib/geoblacklight/exceptions.rb
618
- - lib/geoblacklight/faraday_middleware/follow_redirects.rb
619
611
  - lib/geoblacklight/geometry.rb
620
612
  - lib/geoblacklight/item_viewer.rb
621
613
  - lib/geoblacklight/metadata.rb
@@ -642,15 +634,8 @@ files:
642
634
  - lib/geoblacklight/wms_layer/feature_info_response.rb
643
635
  - lib/tasks/geoblacklight.rake
644
636
  - package.json
645
- - schema/format-values.md
646
- - schema/geoblacklight-schema-deprecated.md
647
- - schema/geoblacklight-schema.json
648
- - schema/geoblacklight-schema.md
649
- - schema/geometry-type-values.md
650
- - schema/references.md
651
- - schema/schema-commentary.md
652
- - schema/subjects.md
653
- - schema/type-values.md
637
+ - schema/geoblacklight-schema-1.0.json
638
+ - schema/geoblacklight-schema-aardvark.json
654
639
  - setupJest.js
655
640
  - solr/conf/_rest_managed.json
656
641
  - solr/conf/admin-extra.html
@@ -706,16 +691,10 @@ files:
706
691
  - spec/features/sms_spec.rb
707
692
  - spec/features/split_view.html.erb_spec.rb
708
693
  - spec/features/suppressed_records_spec.rb
709
- - spec/features/tilejson_spec.rb
710
694
  - spec/features/tms_spec.rb
711
695
  - spec/features/web_services_modal_spec.rb
712
- - spec/features/wmts_spec.rb
713
- - spec/features/xyz_spec.rb
714
696
  - spec/fixtures/fgdc/harvard-g7064-s2-1834-k3.xml
715
697
  - spec/fixtures/iso19139/stanford-cg357zz0321.xml
716
- - spec/fixtures/manifests/tilejson.json
717
- - spec/fixtures/manifests/wmts-multiple.xml
718
- - spec/fixtures/manifests/wmts-single.xml
719
698
  - spec/fixtures/mods/fb897vt9938.mods
720
699
  - spec/fixtures/mods/stanford-cg357zz0321.mods
721
700
  - spec/fixtures/solr_documents/README.md
@@ -723,6 +702,7 @@ files:
723
702
  - spec/fixtures/solr_documents/actual-point1.json
724
703
  - spec/fixtures/solr_documents/actual-polygon1.json
725
704
  - spec/fixtures/solr_documents/actual-raster1.json
705
+ - spec/fixtures/solr_documents/all-relationships.json
726
706
  - spec/fixtures/solr_documents/baruch_ancestor1.json
727
707
  - spec/fixtures/solr_documents/baruch_ancestor2.json
728
708
  - spec/fixtures/solr_documents/baruch_documentation_download.json
@@ -740,10 +720,10 @@ files:
740
720
  - spec/fixtures/solr_documents/index-map-polygon.json
741
721
  - spec/fixtures/solr_documents/index-map-stanford.json
742
722
  - spec/fixtures/solr_documents/index_map_point.json
743
- - spec/fixtures/solr_documents/metadata_no_dct_provenance_s.json
744
- - spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json
745
- - spec/fixtures/solr_documents/metadata_no_solr_geom.json
723
+ - spec/fixtures/solr_documents/metadata_no_geom.json
724
+ - spec/fixtures/solr_documents/metadata_no_provider.json
746
725
  - spec/fixtures/solr_documents/multiple-downloads.json
726
+ - spec/fixtures/solr_documents/no_locn_geometry.json
747
727
  - spec/fixtures/solr_documents/no_spatial.json
748
728
  - spec/fixtures/solr_documents/oembed.json
749
729
  - spec/fixtures/solr_documents/princeton-child1.json
@@ -755,15 +735,12 @@ files:
755
735
  - spec/fixtures/solr_documents/public_iiif_princeton.json
756
736
  - spec/fixtures/solr_documents/public_polygon_mit.json
757
737
  - spec/fixtures/solr_documents/restricted-line.json
758
- - spec/fixtures/solr_documents/tilejson.json
738
+ - spec/fixtures/solr_documents/the-related-record.json
759
739
  - spec/fixtures/solr_documents/tms.json
760
740
  - spec/fixtures/solr_documents/umn_metro_result1.json
761
741
  - spec/fixtures/solr_documents/umn_state_result1.json
762
742
  - spec/fixtures/solr_documents/umn_state_result2.json
763
743
  - spec/fixtures/solr_documents/uva_slug_colon.json
764
- - spec/fixtures/solr_documents/wmts-multiple.json
765
- - spec/fixtures/solr_documents/wmts-single-layer.json
766
- - spec/fixtures/solr_documents/xyz.json
767
744
  - spec/helpers/arcgis_helper_spec.rb
768
745
  - spec/helpers/carto_helper_spec.rb
769
746
  - spec/helpers/geoblacklight/geoblacklight_helper_behavior_spec.rb
@@ -840,7 +817,7 @@ homepage: http://github.com/geoblacklight/geoblacklight
840
817
  licenses:
841
818
  - Apache 2.0
842
819
  metadata: {}
843
- post_install_message:
820
+ post_install_message:
844
821
  rdoc_options: []
845
822
  require_paths:
846
823
  - lib
@@ -855,8 +832,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
855
832
  - !ruby/object:Gem::Version
856
833
  version: 2.5.2
857
834
  requirements: []
858
- rubygems_version: 3.2.22
859
- signing_key:
835
+ rubygems_version: 3.2.15
836
+ signing_key:
860
837
  specification_version: 4
861
838
  summary: A discovery platform for geospatial holdings
862
839
  test_files:
@@ -897,16 +874,10 @@ test_files:
897
874
  - spec/features/sms_spec.rb
898
875
  - spec/features/split_view.html.erb_spec.rb
899
876
  - spec/features/suppressed_records_spec.rb
900
- - spec/features/tilejson_spec.rb
901
877
  - spec/features/tms_spec.rb
902
878
  - spec/features/web_services_modal_spec.rb
903
- - spec/features/wmts_spec.rb
904
- - spec/features/xyz_spec.rb
905
879
  - spec/fixtures/fgdc/harvard-g7064-s2-1834-k3.xml
906
880
  - spec/fixtures/iso19139/stanford-cg357zz0321.xml
907
- - spec/fixtures/manifests/tilejson.json
908
- - spec/fixtures/manifests/wmts-multiple.xml
909
- - spec/fixtures/manifests/wmts-single.xml
910
881
  - spec/fixtures/mods/fb897vt9938.mods
911
882
  - spec/fixtures/mods/stanford-cg357zz0321.mods
912
883
  - spec/fixtures/solr_documents/README.md
@@ -914,6 +885,7 @@ test_files:
914
885
  - spec/fixtures/solr_documents/actual-point1.json
915
886
  - spec/fixtures/solr_documents/actual-polygon1.json
916
887
  - spec/fixtures/solr_documents/actual-raster1.json
888
+ - spec/fixtures/solr_documents/all-relationships.json
917
889
  - spec/fixtures/solr_documents/baruch_ancestor1.json
918
890
  - spec/fixtures/solr_documents/baruch_ancestor2.json
919
891
  - spec/fixtures/solr_documents/baruch_documentation_download.json
@@ -931,10 +903,10 @@ test_files:
931
903
  - spec/fixtures/solr_documents/index-map-polygon.json
932
904
  - spec/fixtures/solr_documents/index-map-stanford.json
933
905
  - spec/fixtures/solr_documents/index_map_point.json
934
- - spec/fixtures/solr_documents/metadata_no_dct_provenance_s.json
935
- - spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json
936
- - spec/fixtures/solr_documents/metadata_no_solr_geom.json
906
+ - spec/fixtures/solr_documents/metadata_no_geom.json
907
+ - spec/fixtures/solr_documents/metadata_no_provider.json
937
908
  - spec/fixtures/solr_documents/multiple-downloads.json
909
+ - spec/fixtures/solr_documents/no_locn_geometry.json
938
910
  - spec/fixtures/solr_documents/no_spatial.json
939
911
  - spec/fixtures/solr_documents/oembed.json
940
912
  - spec/fixtures/solr_documents/princeton-child1.json
@@ -946,15 +918,12 @@ test_files:
946
918
  - spec/fixtures/solr_documents/public_iiif_princeton.json
947
919
  - spec/fixtures/solr_documents/public_polygon_mit.json
948
920
  - spec/fixtures/solr_documents/restricted-line.json
949
- - spec/fixtures/solr_documents/tilejson.json
921
+ - spec/fixtures/solr_documents/the-related-record.json
950
922
  - spec/fixtures/solr_documents/tms.json
951
923
  - spec/fixtures/solr_documents/umn_metro_result1.json
952
924
  - spec/fixtures/solr_documents/umn_state_result1.json
953
925
  - spec/fixtures/solr_documents/umn_state_result2.json
954
926
  - spec/fixtures/solr_documents/uva_slug_colon.json
955
- - spec/fixtures/solr_documents/wmts-multiple.json
956
- - spec/fixtures/solr_documents/wmts-single-layer.json
957
- - spec/fixtures/solr_documents/xyz.json
958
927
  - spec/helpers/arcgis_helper_spec.rb
959
928
  - spec/helpers/carto_helper_spec.rb
960
929
  - spec/helpers/geoblacklight/geoblacklight_helper_behavior_spec.rb
@@ -1,26 +0,0 @@
1
- <?xml version="1.0" encoding="utf-8"?>
2
- <!-- Generator: Adobe Illustrator 27.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
3
- <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
4
- viewBox="0 0 201 141.2" style="enable-background:new 0 0 201 141.2;" xml:space="preserve">
5
- <style type="text/css">
6
- .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#6c757d;}
7
- .st1{fill-rule:evenodd;clip-rule:evenodd;stroke:#6c757d;stroke-width:0.1;fill:#6c757d;}
8
- .st2{fill:#6c757d;}
9
- </style>
10
- <path class="st0" d="M115.7,69.9h21.1l2.6-29.6c0.2-2.8,0.4-5.6,0.6-8.4h0.7c0.2,2.9,0.7,5.7,1.4,8.6l7.8,29.3h12.7l8.7-31
11
- c0.6-2.2,1-4.6,1.4-6.9h0.4L176,70h21.1l-9.9-69.3H165l-6.8,27.2c-0.7,2.9-1.1,6.2-1.5,9.2h-0.6l-8.3-36.4h-22.5L115.7,69.9z"/>
12
- <path class="st1" d="M197.1,98.5c-5-1.7-11-2.7-17.5-2.7c-23.3,0-37.2,15.4-65.7,13.3c-1.8,0-3.3-1.5-3.3-3.3c0-0.3,0-0.6,0.1-0.9
13
- l-1.1,7.5c-0.1,0.3-0.1,0.6-0.1,0.9c0,1.8,1.5,3.3,3.3,3.3c28.5,2.1,43.4-13.3,66.8-13.3c6.5,0,12.5,1,17.5,2.7v20.8
14
- c-5-1.7-11-2.7-17.5-2.7c-23.3,0-39.3,15.2-67.8,13.1c-2.6,0-4.8-2.1-4.8-4.8c0-0.3,0-0.6,0.1-0.8l1.9-13.1L5,130.2v-21.1l106.5-7.7
15
- l0.8-5.7L5,99.9V78.8h104c2.6,0,4.7,2.1,4.7,4.8l-0.1,0.8c-0.1,0.3-0.1,0.6-0.1,0.9c0,1.8,1.5,3.3,3.3,3.3
16
- c28.5,2.1,39.4-13.1,62.8-13.1c6.5,0,12.5,1,17.5,2.7L197.1,98.5L197.1,98.5z"/>
17
- <path class="st2" d="M78.2,0.7C78.9,0.7,79,1,79,1.6v3.3c0,0.3-0.1,0.6-0.1,0.7c-0.1,0.1-2.2,0.2-2.4,0.2c-1.9,0.1-4,0.8-4,3.7
18
- c0,1.6,0.3,2.8,1.6,8l8.3,34.8c5-19,10.9-44,13-51.3c0.3-0.3,0.4-0.3,0.7-0.3c1.9,0,2.7-0.2,2.9,0.4l15,54.8c0,0-1.4,9.8-1.9,13.2
19
- c-0.1,0.8-0.4,0.8-1,0.8h-4.4c-0.6,0-0.7-0.2-0.9-0.9c-1.6-7.7-2.2-10.4-4.7-19.4c-2.6-9.5-5-20.5-6.8-28.8
20
- c-2.4,10.3-2.9,12.6-8.3,33.5c-1.9,7.2-2.4,9.5-3.7,14.9c-0.2,0.6-0.3,0.7-0.9,0.7H76c-0.5,0-0.6-0.3-0.7-1
21
- c-1.5-6.1-12.6-49.3-12.9-50.6C60.9,12.4,60,6.6,56.6,6.6c-2,0-2.4,2.7-2.4,6.4v28.1c-0.1,6.5-0.1,16.1-6.3,23.5
22
- c-1.7,2.1-7.1,7.7-18,7.7C25,72.4,18.7,71,14,66.1c-5.9-6.2-6.2-13.9-6.3-20.9V14.6c0-7-0.7-9-6.2-9C1.1,5.6,1.1,5.5,1,4.9V1.6
23
- c0-0.7,0-1.1,0.8-1.1c1.8,0,19.2,0.1,23.5,0c0.2,0,0.5,0.1,0.5,0.7v3.7c-0.1,0.7-0.2,0.7-1.1,0.7c-6.1,0-5.8,2.5-5.8,9.7v22.1
24
- l0.1,7.9c0.2,4,0.5,7.7,2.2,11.7c1.2,2.7,4.9,8.4,12.2,8.4c4,0,7.9-1.7,10.8-5.1c4.3-5.1,4.9-12,5-19.5V14.3c0-6.9-0.6-8.6-7.5-9
25
- c-0.5,0-0.6-0.1-0.6-0.6V1.4c0-0.6,0-0.7,0.5-0.7C41.8,0.7,77.2,0.7,78.2,0.7z"/>
26
- </svg>
@@ -1,4 +0,0 @@
1
- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 34 32">
2
- <path fill="#6c757d" d="M 17.03125 3.980469 L 23.546875 3.980469 L 23.546875 6.632812 L 20.839844 6.632812 L 27.957031 25.300781 L 30.058594 25.300781 L 30.058594 28.046875 L 21.242188 28.046875 L 21.242188 25.375 L 18.765625 25.375 L 18.765625 30.613281 L 32.683594 30.613281 L 32.683594 22.800781 L 29.558594 22.808594 L 24.546875 9.210938 L 26.121094 9.210938 L 26.121094 1.402344 L 7.941406 1.402344 L 7.941406 9.210938 L 9.515625 9.210938 L 4.503906 22.789062 L 1.378906 22.800781 L 1.378906 30.613281 L 15.300781 30.613281 L 15.300781 25.375 L 12.824219 25.375 L 12.824219 28.046875 L 4.003906 28.046875 L 4.003906 25.300781 L 6.109375 25.300781 L 13.222656 6.632812 L 10.515625 6.632812 L 10.515625 3.980469 Z M 17.03125 3.980469"/>
3
- <path fill="#6c757d" d="M 17.027344 4.003906 L 24.25 23.074219 C 24.25 23.074219 25.175781 25.394531 26.679688 25.394531 L 21.417969 25.394531 C 21.417969 25.394531 21.683594 25.433594 21.945312 24.988281 C 22.097656 24.734375 21.96875 24.351562 21.96875 24.351562 L 20.34375 20.09375 L 13.722656 20.09375 L 12.09375 24.351562 C 12.09375 24.351562 11.96875 24.734375 12.117188 24.988281 C 12.378906 25.433594 12.644531 25.394531 12.644531 25.394531 L 7.382812 25.394531 C 8.886719 25.394531 9.8125 23.074219 9.8125 23.074219 L 17.027344 4.003906 M 17.019531 18.070312 L 19.566406 18.070312 L 17.070312 11.382812 L 14.488281 18.070312 Z M 17.019531 18.070312"/>
4
- </svg>
@@ -1,4 +0,0 @@
1
- <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
2
- <path fill="#6c757d" d="M32.088 0.6l2.545-4.6c-0.605 0.567-0.9 0.745-1.47 1.13-3.077 2.112-6.864 2.615-10.668 5.744-2.58 2.124-3.773 5.202-3.773 5.202s3.464-3.9 8.703-5.832c2.113-0.783 3.587-1.213 4.663-1.632z"></path>
3
- <path fill="#6c757d" d="M30.73 3.072c-2.758 0.88-6.042 1.716-9.407 3.987-2.62 1.77-4.143 4.787-4.143 4.787s3.696-3.696 9.068-4.958l2.75-0.642 1.734-3.174zM27.66 8.796c-1.32 0.12-4.078 0.366-7.303 2.162-2.122 1.18-3.795 2.797-3.795 2.797l-0.005 0.010-0.003-0.002c-0.63 1.182-1.502 3.147-2.357 5.26l-4.253-7.763h-5.577l1.782 1.784v13.136l-1.782 1.78h6.1l-1.812-1.782v-10.2l3.983 7.13-1.257 4.135 1.283-1.5s1.040-4.955 5.142-9.82v10.393l-1.783 1.684h7.064l-1.536-1.784v-13.88c3.714-2.944 6.115-3.54 6.1-3.54z"></path>
4
- </svg>
@@ -1,4 +0,0 @@
1
- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 152 152">
2
- <path d="M89.818,3.455v38h10.364V76L53.545,3.455H3.455v38H13.818v69.091H3.455v38H62.182v-38H51.818V76l46.636,72.545h50.091v-38H138.182V41.455h10.364v-38ZM58.727,114v31.091H6.909V114H17.273V38H6.909V6.909H51.818l51.818,79.455V38H93.273V6.909h51.818V38H134.727v76h10.364v31.091H100.182L48.364,65.636V114Z" fill="#6c757d"></path>
3
- <path d="M147.008,0H86.364V44.909H96.727V65.636L55.273,0H0V44.909H10.364v62.182H0V152H65.636V107.091H55.273V86.364L96.727,152H152V107.091H141.636V44.909H152V0Zm1.537,41.455H138.182v69.091h10.364v38H98.455L51.818,76v34.545H62.182v38H3.455v-38H13.818V41.455H3.455v-38H53.545L100.182,76V41.455H89.818v-38h58.727ZM103.636,86.364,51.818,6.909H6.909V38H17.273v76H6.909v31.091H58.727V114H48.364V65.636l51.818,79.455h44.909V114H134.727V38h10.364V6.909H93.273V38h10.364Z" fill="#6c757d"></path>
4
- </svg>
@@ -1,5 +0,0 @@
1
- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 246.005 217.375">
2
- <path fill="#6c757d" d="m223.76,176.25l-39.62-60.16c28.72-11.67,43.32-29.88,43.32-54.14,0-17.61-6.99-31.95-21.43-43.84C191.2,6.08,171.06,0,146.13,0H0v41.14h16.35v135.11H0v41.13h107.09v-41.13h-16.9v-51.74h25.93l32.59,51.74h-17.74v41.13h115.03v-41.13h-22.24Zm16.57,35.45h-103.71v-29.8h22.29l-39.71-63.09h-34.71v63.09h16.94v29.8H5.67v-29.8h16.35V35.47H5.67V5.61h140.43c23.59,0,42.54,5.66,56.32,16.84,13.01,10.72,19.33,23.62,19.33,39.44,0,22.86-13.98,39.25-42.73,50.08l-3.47,1.3,45.17,68.63h19.61v29.8Z"/>
3
- <path fill="#6c757d" d="m220.72,181.9l-45.17-68.63,3.47-1.3c28.75-10.83,42.73-27.22,42.73-50.08,0-15.82-6.32-28.72-19.33-39.44-13.78-11.18-32.73-16.84-56.32-16.84H5.67v29.86h16.35v146.43H5.67v29.8h95.76v-29.8h-16.94v-63.09h34.71l39.71,63.09h-22.29v29.8h103.71v-29.8h-19.61Zm-72.53-100.13l-.07.06c-7.4,5.78-18.3,8.71-32.43,8.71h-31.2v-55.07h38.5c12.04,0,21.34,3.36,27.68,9.94,2.28,2.24,4.09,4.93,5.29,7.9,1.21,2.97,1.79,6.16,1.71,9.36-.01,7.39-3.2,13.82-9.48,19.1Z"/>
4
- <path fill="#6c757d" d="m155.96,53.31c-1.2-2.97-3.01-5.66-5.29-7.9-6.34-6.58-15.64-9.94-27.68-9.94h-38.5v55.07h31.2c14.13,0,25.03-2.93,32.43-8.71l.07-.06c6.28-5.28,9.47-11.71,9.48-19.1.08-3.2-.5-6.39-1.71-9.36Zm-11.32,24.07c-6.36,4.98-16.09,7.51-28.87,7.51h-25.58v-43.75h32.8c10.39,0,18.35,2.77,23.63,8.22l.08.08c1.76,1.72,3.13,3.79,4.05,6.06.91,2.28,1.35,4.73,1.27,7.18-.03,5.68-2.44,10.48-7.38,14.7Z"/>
5
- </svg>