blacklight-maps 0.5.2 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (74) hide show
  1. checksums.yaml +5 -5
  2. data/.gitignore +2 -0
  3. data/.rubocop.yml +99 -0
  4. data/.solr_wrapper.yml +7 -0
  5. data/.travis.yml +19 -16
  6. data/Gemfile +40 -7
  7. data/README.md +13 -12
  8. data/Rakefile +35 -32
  9. data/app/assets/images/blacklight/maps.svg +1 -0
  10. data/app/assets/javascripts/blacklight-maps.js +1 -4
  11. data/app/assets/javascripts/blacklight-maps/blacklight-maps-browse.js +7 -8
  12. data/app/assets/stylesheets/blacklight_maps/blacklight-maps.scss +1 -2
  13. data/app/assets/stylesheets/blacklight_maps/default.scss +7 -10
  14. data/app/helpers/blacklight/blacklight_maps_helper_behavior.rb +81 -86
  15. data/app/helpers/blacklight_maps_helper.rb +2 -0
  16. data/app/views/catalog/_show_maplet_default.html.erb +8 -9
  17. data/app/views/catalog/map.html.erb +2 -2
  18. data/blacklight-maps.gemspec +27 -26
  19. data/config/locales/blacklight-maps-zh.yml +7 -7
  20. data/config/locales/blacklight-maps.ar.yml +21 -0
  21. data/config/locales/blacklight-maps.de.yml +21 -0
  22. data/config/locales/blacklight-maps.en.yml +1 -1
  23. data/config/locales/blacklight-maps.es.yml +21 -0
  24. data/config/locales/blacklight-maps.fr.yml +8 -8
  25. data/config/locales/blacklight-maps.hu.yml +21 -0
  26. data/config/locales/blacklight-maps.it.yml +8 -8
  27. data/config/locales/blacklight-maps.nl.yml +21 -0
  28. data/config/locales/blacklight-maps.pt-BR.yml +21 -0
  29. data/config/locales/blacklight-maps.sq.yml +21 -0
  30. data/config/routes.rb +3 -2
  31. data/lib/blacklight/maps.rb +8 -2
  32. data/lib/blacklight/maps/controller.rb +27 -0
  33. data/lib/blacklight/maps/engine.rb +12 -13
  34. data/lib/blacklight/maps/export.rb +112 -93
  35. data/lib/blacklight/maps/geometry.rb +30 -18
  36. data/lib/blacklight/maps/maps_search_builder.rb +4 -3
  37. data/lib/blacklight/maps/render_constraints_override.rb +63 -29
  38. data/lib/blacklight/maps/version.rb +3 -1
  39. data/lib/generators/blacklight_maps/install_generator.rb +38 -31
  40. data/lib/generators/blacklight_maps/templates/search_history_controller.rb +2 -0
  41. data/{solr_conf → lib/generators/blacklight_maps/templates/solr}/conf/schema.xml +0 -0
  42. data/{solr_conf → lib/generators/blacklight_maps/templates/solr}/conf/solrconfig.xml +0 -0
  43. data/lib/railties/blacklight_maps.rake +10 -7
  44. data/spec/controllers/catalog_controller_spec.rb +20 -10
  45. data/spec/fixtures/sample_solr_documents.yml +909 -906
  46. data/spec/helpers/blacklight_maps_helper_spec.rb +60 -108
  47. data/spec/lib/blacklight/maps/export_spec.rb +109 -143
  48. data/spec/lib/blacklight/maps/geometry_spec.rb +34 -21
  49. data/spec/lib/blacklight/maps/maps_search_builder_spec.rb +17 -21
  50. data/spec/lib/blacklight/maps/render_constraints_override_spec.rb +42 -69
  51. data/spec/spec_helper.rb +19 -21
  52. data/spec/system/index_view_spec.rb +127 -0
  53. data/spec/system/initial_view_spec.rb +28 -0
  54. data/spec/system/map_view_spec.rb +50 -0
  55. data/spec/system/show_view_maplet_spec.rb +78 -0
  56. data/spec/test_app_templates/lib/generators/test_app_generator.rb +6 -21
  57. data/vendor/assets/images/layers-2x.png +0 -0
  58. data/vendor/assets/images/layers.png +0 -0
  59. data/vendor/assets/images/marker-icon-2x.png +0 -0
  60. data/vendor/assets/images/marker-icon.png +0 -0
  61. data/vendor/assets/images/marker-shadow.png +0 -0
  62. data/vendor/assets/javascripts/leaflet.js.erb +13922 -0
  63. data/vendor/assets/javascripts/leaflet.markercluster.js +3 -0
  64. data/vendor/assets/stylesheets/MarkerCluster.Default.css +60 -0
  65. data/vendor/assets/stylesheets/MarkerCluster.css +14 -0
  66. data/vendor/assets/stylesheets/leaflet.css +635 -0
  67. metadata +86 -91
  68. data/config/jetty.yml +0 -7
  69. data/lib/blacklight/maps/controller_override.rb +0 -20
  70. data/lib/generators/blacklight_maps/templates/saved_searches_controller.rb +0 -5
  71. data/spec/features/initial_view_spec.rb +0 -21
  72. data/spec/features/maps_spec.rb +0 -202
  73. data/spec/features/show_view_maplet_spec.rb +0 -93
  74. data/spec/test_app_templates/Gemfile.extra +0 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 0d727312e568bc1dde35d3d9ad7554630068b087
4
- data.tar.gz: 7c787f41b27472dd2d8acf2fdbe17759e8d6cb75
2
+ SHA256:
3
+ metadata.gz: b23c73a0ba75175cfe101746f9ff1ae0592a42556a34c9d1e4fe8cc2c42b8081
4
+ data.tar.gz: ce938a6f2884faccb3051985ab84fe0bf40505f1246fe56ca1d2621ca823b2a9
5
5
  SHA512:
6
- metadata.gz: dff809b08e8d1902b722fbc7c0bace9104143eef9f9c9a6df25af10d4bb8fbb6091722878053870a6a6eb19992b15f43033d0fce3959098b46b5cf6bffa777fb
7
- data.tar.gz: 8693ef1963f5c98b21c3b334b407ca00a69eca9888697c8c6e6d1601fd3628f85cf474c51c68711b2185aa169876c0b90eb1790120b22a4b65777f7b28cb9f0a
6
+ metadata.gz: c83862d2c315629f8610d15978b386aa7f9e6d889a82fd70ef540870f6b7e80bb6c0cd2b507bbf06019f31b39a68f34970721d90bffb1bc747b86fec433c8607
7
+ data.tar.gz: e1de2250bbe1f18826ff9ab17f814ef3e2ce53e745fd0c66e3f19c2de7f45e13bff72224da8d042ca91ae0546ad87c673e93cd136fe84d3abb8927b98f374b2c
data/.gitignore CHANGED
@@ -19,3 +19,5 @@ spec/internal
19
19
  jetty
20
20
  .DS_Store
21
21
  .idea/
22
+ .rakeTasks
23
+ .internal_test_app
@@ -0,0 +1,99 @@
1
+ require: rubocop-rspec
2
+
3
+ AllCops:
4
+ DisplayCopNames: true
5
+ TargetRubyVersion: 2.3
6
+ Exclude:
7
+ - "lib/generators/blacklight_maps/templates/**/*"
8
+ - "blacklight-maps.gemspec"
9
+
10
+ # engine_cart block includes conditional, not duplication
11
+ Bundler/DuplicatedGem:
12
+ Exclude:
13
+ - 'Gemfile'
14
+
15
+ # engine_cart block is following default Rails order
16
+ Bundler/OrderedGems:
17
+ Exclude:
18
+ - 'Gemfile'
19
+
20
+ Layout/IndentationConsistency:
21
+ EnforcedStyle: normal
22
+
23
+ Metrics/AbcSize:
24
+ Max: 20
25
+ Exclude:
26
+ - 'lib/blacklight/maps/maps_search_builder.rb'
27
+
28
+ Metrics/BlockLength:
29
+ Exclude:
30
+ - "spec/**/*"
31
+
32
+ Metrics/ClassLength:
33
+ Exclude:
34
+ - 'lib/blacklight/maps/export.rb'
35
+
36
+ Metrics/LineLength:
37
+ Max: 200
38
+ Exclude:
39
+ - 'lib/blacklight/maps/engine.rb'
40
+ - 'spec/**/*'
41
+
42
+ Metrics/MethodLength:
43
+ Max: 15
44
+
45
+ Naming/HeredocDelimiterNaming:
46
+ Enabled: false
47
+
48
+ Naming/PredicateName:
49
+ NamePrefixBlacklist:
50
+ - is_
51
+
52
+ Rails:
53
+ Enabled: true
54
+
55
+ Rails/OutputSafety:
56
+ Enabled: false
57
+
58
+ RSpec/AnyInstance:
59
+ Exclude:
60
+ - 'spec/system/initial_view_spec.rb'
61
+
62
+ RSpec/BeforeAfterAll:
63
+ Enabled: false
64
+
65
+ RSpec/DescribeClass:
66
+ Exclude:
67
+ - 'spec/system/*'
68
+
69
+ RSpec/FilePath:
70
+ Exclude:
71
+ - 'spec/lib/blacklight/maps/*'
72
+
73
+ RSpec/MessageSpies:
74
+ EnforcedStyle: receive
75
+
76
+ RSpec/MultipleExpectations:
77
+ Max: 4
78
+
79
+ RSpec/NestedGroups:
80
+ Max: 5
81
+
82
+ RSpec/PredicateMatcher:
83
+ Exclude:
84
+ - 'spec/lib/blacklight/maps/render_constraints_override_spec.rb'
85
+
86
+ # https://github.com/rubocop-hq/rubocop/issues/6439
87
+ Style/AccessModifierDeclarations:
88
+ Enabled: false
89
+
90
+ Style/BracesAroundHashParameters:
91
+ Exclude:
92
+ - 'spec/lib/blacklight/maps/export_spec.rb'
93
+
94
+ Style/Documentation:
95
+ Enabled: false
96
+
97
+ Style/SignalException:
98
+ Exclude:
99
+ - 'spec/**/*'
@@ -0,0 +1,7 @@
1
+ # Place any default configuration for solr_wrapper here
2
+ # you must first run 'rake engine_cart:generate' to create the test app
3
+ # before running 'solr_wrapper' from project root
4
+ # port: 8983
5
+ collection:
6
+ dir: ./.internal_test_app/solr/conf/
7
+ name: blacklight-core
@@ -1,25 +1,28 @@
1
- notifications:
2
- email: false
3
1
  language: ruby
4
2
  sudo: false
5
- rvm:
6
- - 2.6.0
3
+ dist: bionic
7
4
 
8
- matrix:
9
- include:
10
- env: "RAILS_VERSION=4.2.11"
5
+ addons:
6
+ chrome: stable
11
7
 
12
8
  before_install:
13
- - gem install bundler
9
+ - google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost &
14
10
 
15
11
  env:
16
- - "RAILS_VERSION=4.2.6"
17
-
18
- notifications:
19
- irc: "irc.freenode.org#blacklight"
20
- email:
21
- - blacklight-commits@googlegroups.com
22
-
23
- global_env:
12
+ global:
24
13
  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
14
+ - ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
15
+
16
+ matrix:
17
+ include:
18
+ - rvm: 2.7.0
19
+ env: "RAILS_VERSION=6.0.2.2"
20
+ - rvm: 2.6.5
21
+ env: "RAILS_VERSION=6.0.2.2"
22
+ - rvm: 2.6.5
23
+ env: "RAILS_VERSION=5.2.4.2"
24
+ - rvm: 2.5.7
25
+ env: "RAILS_VERSION=5.2.4.2"
26
+ fast_finish: true
25
27
 
28
+ jdk: openjdk11
data/Gemfile CHANGED
@@ -1,15 +1,48 @@
1
+ # frozen_string_literal: true
2
+
1
3
  source 'https://rubygems.org'
2
4
 
3
- # Specify your gem's dependencies in blacklight-maps.gemspec
4
5
  gemspec
5
6
 
6
- group :test do
7
- gem 'simplecov', require: false
7
+ group :development, :test do
8
8
  gem 'coveralls', require: false
9
9
  end
10
10
 
11
- file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
12
- if File.exists?(file)
13
- puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
14
- instance_eval File.read(file)
11
+ gem 'engine_cart'
12
+ # BEGIN ENGINE_CART BLOCK
13
+ # engine_cart: 1.2.0
14
+ # engine_cart stanza: 0.10.0
15
+ # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
16
+ file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
17
+ if File.exist?(file)
18
+ begin
19
+ eval_gemfile file
20
+ rescue Bundler::GemfileError => e
21
+ Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
22
+ Bundler.ui.warn e.message
23
+ end
24
+ else
25
+ Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
26
+
27
+ if ENV['RAILS_VERSION']
28
+ if ENV['RAILS_VERSION'] == 'edge'
29
+ gem 'rails', github: 'rails/rails'
30
+ ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
31
+ else
32
+ gem 'rails', ENV['RAILS_VERSION']
33
+ end
34
+ end
35
+
36
+ case ENV['RAILS_VERSION']
37
+ when /^5.[12]/, /^6.0/
38
+ gem 'sass-rails', '~> 5.0'
39
+ when /^4.2/
40
+ gem 'responders', '~> 2.0'
41
+ gem 'sass-rails', '>= 5.0'
42
+ gem 'coffee-rails', '~> 4.1.0'
43
+ gem 'json', '~> 1.8'
44
+ when /^4.[01]/
45
+ gem 'sass-rails', '< 5.0'
46
+ end
15
47
  end
48
+ # END ENGINE_CART BLOCK
data/README.md CHANGED
@@ -53,11 +53,11 @@ Blacklight-Maps requires that your Solr index include at least one (but preferab
53
53
 
54
54
  ```
55
55
  # coordinates: lon lat or lat,lon
56
- # bounding box: minX minY maxX maxY
57
- coordinates_field:
56
+ # bounding box: ENVELOPE(minX, maxX, maxY, minY)
57
+ coordinates_srpt:
58
58
  - 78.96288 20.593684
59
59
  - 20.593684,78.96288
60
- - 68.162386 6.7535159 97.395555 35.5044752
60
+ - ENVELOPE(68.162386, 97.395555, 35.5044752, 6.7535159)
61
61
  ```
62
62
 
63
63
  2. An indexed, stored string field containing a properly-formatted [GeoJSON](http://geojson.org) feature object for a point or bounding box that includes the coordinates and (preferably) location name. This field can be multivalued.
@@ -74,7 +74,7 @@ Blacklight-Maps requires that your Solr index include at least one (but preferab
74
74
  3. An indexed, stored text or string field containing location names. This field can be multivalued.
75
75
 
76
76
  ```
77
- placename_field: India
77
+ subject_geo_ssim: India
78
78
  ```
79
79
 
80
80
  ##### Why so complicated?
@@ -88,10 +88,10 @@ Blacklight-Maps can be used with either field type (#1 or #2), however to take a
88
88
  **Important:** If you are NOT using the geojson field (#2), you should create a `copyField` in your Solr schema.xml to copy the coordinates from the `location_rpt` field to a string field that is stored, indexed, and multivalued to allow for proper faceting of the coordinate values in the catalog#map and catalog#index views.
89
89
 
90
90
  ```
91
- <!-- Solr4 location_rpt field for coordinates, shapes, etc. -->
92
- <dynamicField name="geospatial" type="location_rpt" indexed="true" stored="true" multiValued="true" />
91
+ <!-- Solr location_rpt field for coordinates, shapes, etc. -->
92
+ <dynamicField name="*_srpt" type="location_rpt" indexed="true" stored="true" multiValued="true" />
93
93
  <!-- copy geospatial to string field for faceting -->
94
- <copyField source="geospatial" dest="geospatial_facet" />
94
+ <copyField source="coordinates_srpt" dest="coordinates_ssim" />
95
95
  ```
96
96
 
97
97
  Support for additional field types may be added in the future.
@@ -112,9 +112,9 @@ Blacklight-Maps expects you to provide these configuration options:
112
112
  + `placename_field` = the name of the Solr field containing the location names
113
113
  + `coordinates_field` = the name of the Solr `location_rpt` type field containing geospatial coordinate data
114
114
 
115
- In addition, you must add the geospatial facet field to the list of facet fields:
115
+ In addition, you must add the geospatial facet field to the list of facet fields in `app/controllers/catalog_controller.rb`, for example:
116
116
  ```ruby
117
- config.add_facet_field 'geojson_field', :limit => -2, :label => 'Coordinates', :show => false
117
+ config.add_facet_field 'geojson_ssim', :limit => -2, :label => 'Coordinates', :show => false
118
118
  ```
119
119
 
120
120
  #### Optional
@@ -196,9 +196,10 @@ The table below indicates which versions of Blacklight Maps are compatible with
196
196
 
197
197
  Blacklight Maps version | works with Blacklight version
198
198
  ----------------------- | ---------------------
199
- 0.5.0 | >= 6.1.0
200
- 0.4.0 | >= 5.12.0 to < 6.*
201
- <= 0.3.3 | >= 5.1 to <= 5.11.2
199
+ 1.1.* | >= 7.8.0, < 8
200
+ 0.5.* | >= 6.1.0, < 7
201
+ 0.4.* | >= 5.12.0, < 6.*
202
+ <= 0.3.3 | >= 5.1, <= 5.11.2
202
203
 
203
204
  ## Contributing
204
205
 
data/Rakefile CHANGED
@@ -1,43 +1,46 @@
1
- require "bundler/gem_tasks"
1
+ # frozen_string_literal: true
2
2
 
3
- ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.6.0.zip"
4
- APP_ROOT = File.dirname(__FILE__)
5
-
6
- require 'rspec/core/rake_task'
7
- require 'engine_cart/rake_task'
3
+ begin
4
+ require 'bundler/setup'
5
+ rescue LoadError
6
+ puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
7
+ end
8
8
 
9
- require 'jettywrapper'
9
+ require 'rdoc/task'
10
+ RDoc::Task.new(:rdoc) do |rdoc|
11
+ rdoc.rdoc_dir = 'rdoc'
12
+ rdoc.title = 'BlacklightMaps'
13
+ rdoc.options << '--line-numbers'
14
+ rdoc.rdoc_files.include('README.rdoc')
15
+ rdoc.rdoc_files.include('lib/**/*.rb')
16
+ end
10
17
 
11
- task default: :ci
18
+ Bundler::GemHelper.install_tasks
12
19
 
13
- RSpec::Core::RakeTask.new(:spec)
20
+ Rake::Task.define_task(:environment)
14
21
 
15
- desc "Load fixtures"
16
- task :fixtures => ['engine_cart:generate'] do
17
- EngineCart.within_test_app do
18
- system "rake blacklight_maps:solr:seed RAILS_ENV=test"
19
- end
20
- end
22
+ load 'lib/railties/blacklight_maps.rake'
21
23
 
22
- desc "Execute Continuous Integration build"
23
- task :ci => ['engine_cart:generate', 'jetty:clean', 'blacklight_maps:configure_jetty'] do
24
-
25
- require 'jettywrapper'
26
- jetty_params = Jettywrapper.load_config('test')
24
+ task default: :ci
27
25
 
28
- error = Jettywrapper.wrap(jetty_params) do
29
- Rake::Task['fixtures'].invoke
30
- Rake::Task['spec'].invoke
31
- end
32
- raise "test failures: #{error}" if error
33
- end
26
+ require 'engine_cart/rake_task'
34
27
 
28
+ require 'solr_wrapper'
35
29
 
36
- namespace :blacklight_maps do
37
- desc "Copies the default SOLR config for the bundled Testing Server"
38
- task :configure_jetty do
39
- FileList['solr_conf/conf/*'].each do |f|
40
- cp("#{f}", 'jetty/solr/blacklight-core/conf/', :verbose => true)
30
+ require 'rspec/core/rake_task'
31
+ RSpec::Core::RakeTask.new
32
+
33
+ require 'rubocop/rake_task'
34
+ RuboCop::RakeTask.new(:rubocop)
35
+
36
+ desc 'Run test suite'
37
+ task ci: [:rubocop, 'engine_cart:generate'] do
38
+ SolrWrapper.wrap do |solr|
39
+ solr.with_collection do
40
+ within_test_app do
41
+ system 'RAILS_ENV=test rake blacklight_maps:index:seed'
42
+ end
43
+ Rake::Task['spec'].invoke
41
44
  end
42
45
  end
43
- end
46
+ end
@@ -0,0 +1 @@
1
+ <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M16,12a5.11,5.11,0,0,0,.8-1.6ZM8,12l-.8-1.6A4.72,4.72,0,0,0,8,12Z"/><path d="M12,4A5,5,0,0,0,7,9a4.71,4.71,0,0,0,.1,1c0,.13.06.26.1.39L8,12l4,8,4-8,.8-1.6L16.9,10A4.71,4.71,0,0,0,17,9,5,5,0,0,0,12,4Zm0,7a2,2,0,1,1,1.73-1A2,2,0,0,1,12,11Z"/><path d="M7.1,10c0,.13.06.26.1.39L7,10Z"/><path d="M17,10l-.19.39L16.9,10Z"/></svg>
@@ -1,7 +1,4 @@
1
- // for Blacklight.onLoad:
2
- //= require blacklight/core
3
-
4
1
  //= require leaflet
5
2
  //= require leaflet.markercluster
6
3
 
7
- //= require_tree .
4
+ //= require_tree .
@@ -5,8 +5,8 @@
5
5
 
6
6
  // Configure default options and those passed via the constructor options
7
7
  var options = $.extend({
8
- tileurl : 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
9
- mapattribution : 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
8
+ tileurl : 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
9
+ mapattribution : 'Map data &copy; <a href="https://openstreetmap.org">OpenStreetMap</a> contributors, <a' + ' href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA</a>',
10
10
  initialzoom: 2,
11
11
  singlemarkermode: true,
12
12
  searchcontrol: false,
@@ -21,7 +21,7 @@
21
21
  // Extend options from data-attributes
22
22
  $.extend(options, this.data());
23
23
 
24
- var mapped_items = '<span class="mapped-count"><span class="badge">' + geojson_docs.features.length + '</span> location' + (geojson_docs.features.length !== 1 ? 's' : '') + ' mapped</span>';
24
+ var mapped_items = '<span class="mapped-count"><span class="badge badge-secondary">' + geojson_docs.features.length + '</span>' + ' location' + (geojson_docs.features.length !== 1 ? 's' : '') + ' mapped</span>';
25
25
 
26
26
  var mapped_caveat = '<span class="mapped-caveat">Only items with location data are shown below</span>';
27
27
 
@@ -31,12 +31,12 @@
31
31
 
32
32
  // Update page links with number of mapped items, disable sort, per_page, pagination
33
33
  if (sortAndPerPage.length) { // catalog#index and #map view
34
- var page_links = sortAndPerPage.find('.page_links');
35
- var result_count = page_links.find('.page_entries').find('strong').last().html();
36
- page_links.html('<span class="page_entries"><strong>' + result_count + '</strong> items found</span>' + mapped_items + mapped_caveat);
34
+ var page_links = sortAndPerPage.find('.page-links');
35
+ var result_count = page_links.find('.page-entries').find('strong').last().html();
36
+ page_links.html('<span class="page-entries"><strong>' + result_count + '</strong> items found</span>' + mapped_items + mapped_caveat);
37
37
  sortAndPerPage.find('.dropdown-toggle').hide();
38
38
  } else { // catalog#show view
39
- $(this.selector).before(mapped_items);
39
+ $(this).before(mapped_items);
40
40
  }
41
41
 
42
42
  // determine whether to use item location or result count in cluster icon display
@@ -119,7 +119,6 @@
119
119
  var container = L.DomUtil.create('div', 'leaflet-bar leaflet-control');
120
120
  this.link = L.DomUtil.create('a', 'leaflet-bar-part search-control', container);
121
121
  this.link.title = options.searchctrlcue;
122
- this.icon = L.DomUtil.create('i', 'glyphicon glyphicon-search', this.link);
123
122
 
124
123
  L.DomEvent.addListener(this.link, 'click', _search);
125
124
 
@@ -1,8 +1,7 @@
1
+ @charset "UTF-8";
1
2
  /* Master manifest file for engine, so local app can require
2
3
  * this one file, but get all our files -- and local app
3
4
  * require does not need to change if we change file list.
4
5
  */
5
6
 
6
- @charset "UTF-8";
7
-
8
7
  @import 'default';
@@ -1,6 +1,6 @@
1
1
  @import 'leaflet';
2
- @import 'leaflet.markercluster';
3
- @import 'leaflet.markercluster.default';
2
+ @import 'MarkerCluster';
3
+ @import 'MarkerCluster.Default';
4
4
 
5
5
  body.blacklight-catalog-map {
6
6
 
@@ -14,21 +14,17 @@ body.blacklight-catalog-map {
14
14
 
15
15
  }
16
16
 
17
- .view-icon-maps {
18
- &:before { content: "\e135"; }
19
- }
20
-
21
17
  #sortAndPerPage {
22
18
 
23
- .page_links {
19
+ .page-links {
24
20
 
25
21
  .mapped-count {
26
- margin-left: 7px;
22
+ margin-left: 10px;
27
23
  color: dimgray;
28
24
  }
29
25
 
30
26
  .mapped-caveat {
31
- margin-left: 7px;
27
+ margin-left: 10px;
32
28
  font-size: 12px;
33
29
  color: darkgray;
34
30
  }
@@ -45,7 +41,7 @@ body.blacklight-catalog-map {
45
41
 
46
42
  & ~ div.record-padding {
47
43
 
48
- div.pagination {
44
+ nav.pagination {
49
45
  display: none;
50
46
  }
51
47
 
@@ -65,6 +61,7 @@ body.blacklight-catalog-map {
65
61
 
66
62
  a.leaflet-bar-part.search-control {
67
63
  cursor: pointer;
64
+ &:before { content: "\1F50D"; }
68
65
  }
69
66
 
70
67
  /* Portrait tablet to landscape and desktop */