blacklight-maps 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc71dc7dfe0b126d989b4076ee3caf03f16b319c
-  data.tar.gz: 94a0708fa6cab6c59b73e5c6519b95addc33efdf
+  metadata.gz: 05ca6bf4dd78fffb3431ac91f5d282355335687c
+  data.tar.gz: cf7ac2c7cffdb72e9dd5ab495dd312645dabb813
 SHA512:
-  metadata.gz: 1e9c2ca3243093244412d93dd265bd8b06ecaacd15892fdc9a92e2fbf15535df24205d56e81d9d46b77468e8d13ce61ff5d1556c24610eec1798c384302278de
-  data.tar.gz: de5b485da3d27a1b3b7d59db34bb62c47dedffd0db6e6ce91baf73e8d7becf8628c03d06ed050cf261e736d104f9859b5e482e7b38e65bc5866ca5217ddf32c7
+  metadata.gz: 9d39e9f34cf2f0a89b65dca8b8052c2aa594649a2ed8bb5c0ce7627b34523e4ce54c69d77adf4933a0e3d53b07e82992371045d58597a48efe3cd002e5e19a60
+  data.tar.gz: f2d009514030f8e4e44512812a385569148507ba7b094d9759e5b59d8214908ee6224ffac3a9e0a78992e1ef8c89c27516b2f28947ccfba1d2de5f57fde7dc88

data/app/assets/javascripts/blacklight-maps/blacklight-maps-browse.js

@@ -7,7 +7,7 @@
     var options = $.extend({
       tileurl : 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
       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>',
-      initialZoom: 2,
+      initialzoom: 2,
       singlemarkermode: true,
       searchcontrol: false,
       catalogpath: 'catalog',
@@ -68,7 +68,6 @@
       // Setup Leaflet map
       map = L.map(this.id, {
         center: [0, 0],
-        zoom: options.initialZoom
       });
 
       L.tileLayer(options.tileurl, {
@@ -147,12 +146,18 @@
 
     /**
     * Sets the view of the map, based off of the map bounds
+    * options.initialzoom is invoked for catalog#show views (unless it would obscure features)
     */
     function setMapBounds() {
       map.fitBounds(mapBounds(), {
         padding: [10, 10],
         maxZoom: options.maxzoom
       });
+      if ($('#document').length) {
+        if (map.getZoom() > options.initialzoom) {
+          map.setZoom(options.initialzoom)
+        }
+      }
     }
 
     /**

data/blacklight-maps.gemspec

@@ -6,21 +6,21 @@ require 'blacklight/maps/version'
 Gem::Specification.new do |spec|
   spec.name          = "blacklight-maps"
   spec.version       = Blacklight::Maps::VERSION
-  spec.authors       = ["Chris Beer", "Jack Reed"]
-  spec.email         = ["cabeer@stanford.edu", "pjreed@stanford.edu"]
+  spec.authors       = ["Chris Beer", "Jack Reed", "Eben English"]
+  spec.email         = ["cabeer@stanford.edu", "pjreed@stanford.edu", "eenglish@bpl.org"]
   spec.summary       = %q{Maps for Blacklight}
-  spec.homepage      = ""
-  spec.license       = "Apache 2.0"
+  spec.homepage      = "https://github.com/projectblacklight/blacklight-maps"
+  spec.license       = "Apache-2.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails"
-  spec.add_dependency "blacklight", ">= 6.1.0"
+  spec.add_dependency "rails", "< 6"
+  spec.add_dependency "blacklight", ">= 6.1.0", "< 7.0.0"
   spec.add_dependency "bootstrap-sass", "~> 3.2"
-  spec.add_dependency "leaflet-rails"
+  spec.add_dependency "leaflet-rails", "0.7.7"
   spec.add_dependency "leaflet-markercluster-rails"
 
   spec.add_development_dependency "bundler", "~> 1.5"

data/config/jetty.yml

@@ -3,5 +3,5 @@ development:
   jetty_port: 8983 
 test:
   startup_wait: 60
-  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %>
+  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8983 %>
   <%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>

data/config/locales/blacklight-maps-zh.yml

@@ -0,0 +1,20 @@
+zh:
+  blacklight:
+
+    maps:
+      interactions:
+        bbox_search: 'View items that intersect with this bounding box'
+        placename_search: 'View items from this location'
+        item: '资料'
+        point_search: 'View items from this location'
+        search_ctrl_cue: 'Search for all items within the current map window'
+      title: '地图'
+      leader: 'Click on a marker to search for items from that location.'
+
+    search:
+      filters:
+        coordinates:
+          bbox: 'Bounding Box'
+          point: 'Coordinates'
+      view:
+        maps: '地图'

data/config/locales/blacklight-maps.it.yml

@@ -0,0 +1,20 @@
+it:
+  blacklight:
+
+    maps:
+      interactions:
+        bbox_search: 'View items that intersect with this bounding box'
+        placename_search: 'View items from this location'
+        item: 'item'
+        point_search: 'View items from this location'
+        search_ctrl_cue: 'Search for all items within the current map window'
+      title: 'Mappa'
+      leader: 'Click on a marker to search for items from that location.'
+
+    search:
+      filters:
+        coordinates:
+          bbox: 'Bounding Box'
+          point: 'Coordinates'
+      view:
+        maps: 'Mappa'

data/lib/blacklight/maps/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Maps
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/spec/features/show_view_maplet_spec.rb

@@ -72,8 +72,9 @@ describe "catalog#show view", js: true do
 
     before :each do
       CatalogController.configure_blacklight do |config|
-        # set maxzoom so we can test whether initial zoom is correct
+        # set zoom config so we can test whether setMapBounds() is correct
         config.view.maps.maxzoom = 8
+        config.view.maps.show_initial_zoom = 10
       end
       visit solr_document_path("2009373514")
     end
@@ -83,7 +84,7 @@ describe "catalog#show view", js: true do
     end
 
     it "should zoom to the correct map bounds" do
-      # if initial zoom >= maxzoom, zoom-in control will be disabled
+      # if setMapBounds() zoom >= maxzoom, zoom-in control will be disabled
       expect(page).to have_selector(".leaflet-control-zoom-in.leaflet-disabled")
     end
 

metadata

@@ -1,30 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-maps
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Chris Beer
 - Jack Reed
+- Eben English
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -32,6 +33,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -39,6 +43,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -57,16 +64,16 @@ dependencies:
   name: leaflet-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: leaflet-markercluster-rails
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +190,7 @@ description:
 email:
 - cabeer@stanford.edu
 - pjreed@stanford.edu
+- eenglish@bpl.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -209,7 +217,9 @@ files:
 - app/views/catalog/map.html.erb
 - blacklight-maps.gemspec
 - config/jetty.yml
+- config/locales/blacklight-maps-zh.yml
 - config/locales/blacklight-maps.en.yml
+- config/locales/blacklight-maps.it.yml
 - config/routes.rb
 - docs/blacklight-maps_index-view.png
 - docs/blacklight-maps_map-view.png
@@ -243,9 +253,9 @@ files:
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
-homepage: ''
+homepage: https://github.com/projectblacklight/blacklight-maps
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -263,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Maps for Blacklight