blacklight-maps 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6bffe02f056bdbd0cddc8b63f3f30b1ff7d08d9
-  data.tar.gz: 99876fe750aebda63112736254ea34d893f4c294
+  metadata.gz: c9a4c9d51a9b188233f983469e290609fead6e4f
+  data.tar.gz: 3d61ff5d65da2592b37515f3c62b773425f2fac0
 SHA512:
-  metadata.gz: e37de7d922821ede6726b35bd1b2139fc72ca804000940c8411f40b1ec8320d95de79e1bc41315ecb50f10b70020da6ee02fca4b73096022734567777602be95
-  data.tar.gz: e7ffbbb907a95830329d2cbbc004bb0320c6a842e1adf5d9da9a2646fc4cae0d3ea36dfc5c349671e87d4416fe67a1f9399b1f3db1688033f0b4550e8caded55
+  metadata.gz: 2ba42a84d843b12148894593e41a705f0ac85d7dd5abc84eeb906ea4f9d28468a4d5d6b717a2be00d08662f0d1e476723969fb1451c9c08edfa2744cc90a00c7
+  data.tar.gz: 44d3a6067b0cc5465089318211b47fa2e00fdb9a241a8d87b309dab01afe8595baf0f58ec6a33086981ded5da4b24189c5cd525785589a9c85d9be1797849c78

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -1,6 +1,5 @@
 notifications:
   email: false
-cache: bundler
 language: ruby
 sudo: false
 rvm:
@@ -23,3 +22,4 @@ env:
 matrix:
   allow_failures:
     - rvm: jruby-19mode
+    - rvm: 1.9.3

data/CONTRIBUTING.md

@@ -0,0 +1,14 @@
+# Contributing to Blacklight-Maps
+
+## To submit a patch or feature
+
+1. Fork it ( http://github.com/<my-github-username>/blacklight-maps/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Make some changes (with [tests](https://github.com/projectblacklight/blacklight/wiki/testing), please)
+4. Commit your changes (`git commit -am 'Add some feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create new Pull Request
+
+## Style preferences
+
+From version 0.3.2 forward, Blacklight-Maps will be using the [AirBnb JavaScript Style guide](https://github.com/airbnb/javascript) for JavaScript. Ruby code uses the community [Ruby Style Guide](https://github.com/bbatsov/ruby-style-guide).

data/README.md

@@ -1,6 +1,6 @@
 # Blacklight::Maps
 
-[![Build Status](https://travis-ci.org/sul-dlss/blacklight-maps.png?branch=master)](https://travis-ci.org/sul-dlss/blacklight-maps)
+[![Build Status](https://travis-ci.org/projectblacklight/blacklight-maps.png?branch=master)](https://travis-ci.org/sul-dlss/blacklight-maps) | [![Coverage Status](https://coveralls.io/repos/projectblacklight/blacklight-maps/badge.svg?branch=master)](https://coveralls.io/r/projectblacklight/blacklight-maps?branch=master)
 
 Provides map views for Blacklight for items with geospatial coordinate (latitude/longitude) metadata.
 
@@ -110,6 +110,11 @@ Blacklight-Maps expects you to provide these configuration options:
     + `placename_field` = the name of the Solr field containing the location names
 + `coordinates_field` = the name of the Solr `location_rpt` type field containing geospatial coordinate data
 
+In addition, you must add the geospatial facet field to the list of facet fields:
+```ruby
+config.add_facet_field 'geojson_field', :limit => -2, :label => 'Coordinates', :show => false
+```
+
 #### Optional
 
 - `show_initial_zoom` = the zoom level to be used in the catalog#show view map (zoom levels for catalog#map and catalog#index map views are computed automatically)
@@ -137,6 +142,8 @@ All of these options can easily be configured in `CatalogController.rb` in the `
     config.view.maps.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>'
     config.view.maps.maxzoom = 18
     config.view.maps.show_initial_zoom = 5
+
+    config.add_facet_field 'geojson', :limit => -2, :label => 'Coordinates', :show => false
 ...
 
 ```
@@ -167,24 +174,22 @@ However, the catalog#show maplet widget must be included manually, via one of tw
 
 The ```blacklight_map_tag``` helper takes an options hash as one of its arguments that can be used to provide customization options for the Leaflet map functionality via data attributes. (See ```app/views/catalog/index_map``` for an example.) The available options include:
 
-- ```viewpoint``` = the center point of the map (```[lat,long]```)
-- ```searchcontrol``` = whether to display the search control on the map (```boolean```)
-- ```catalogpath``` = the search path for the search control (e.g. ```catalog_index_path```)
-- ```placenamefield``` =  the name of the Solr field containing the location names (e.g. ```"placename_field"```)
-- ```searchctrlcue``` = the hover text to display when the mouse hovers over the search control
-- ```singlemarkermode``` = whether locations should be clustered (```boolean```)
-- ```clustercount``` = whether clusters should display the location count or the number of hits (```"hits" || "locations"```)
-- ```maxzoom``` = the maxZoom [property of the map](http://leafletjs.com/reference.html#map-maxzoom)
-- ```tileurl``` = a [tileLayer url](http://leafletjs.com/reference.html#tilelayer-l.tilelayer) to change the basemap
-- ```mapattribution``` = an [attribution string](http://leafletjs.com/reference.html#tilelayer-attribution) to describe the basemap layer
-- ```nodata``` = a message to display in the Leaflet popup when the "popup" member is not present in the properties hash in the GeoJSON Feature for a location.
+Option | Type | Default | Description
+------ | ---- | ------- | -----------
+`initialview` | Array | `null` | the initial extend of the map as a 2d Array (e.g. `[[minLat, minLng], [maxLat, maxLng]]`)
+`searchcontrol` | Boolean | `false` | display the search control on the map
+`catalogpath` | String | `'catalog'` | the search path for the search control
+`placenamefield` | String | `'placename_field'` | the name of the Solr field containing the location names
+`searchctrlcue` | String | `'Search for all items within the current map window'` | the hover text to display when the mouse hovers over the ![search control](docs/blacklight-maps_search-control.png) search control
+`searchresultsview` | String | `'list'` | the view type for the search results on the catalog#index page after the ![search control](docs/blacklight-maps_search-control.png) search control is used
+`singlemarkermode` | Boolean | `true` | whether locations should be clustered
+`clustercount` | String | `'locations'` | whether clusters should display the location count or the number of hits (`'hits'` or `'locations'`)
+`maxzoom` | Integer | 18 | the maxZoom [property of the map](http://leafletjs.com/reference.html#map-maxzoom)
+`tileurl` | String | `'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'` | a [tileLayer url](http://leafletjs.com/reference.html#tilelayer-l.tilelayer) to change the basemap
+`mapattribution` | String | ``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>'` | an [attribution string](http://leafletjs.com/reference.html#tilelayer-attribution) to describe the basemap layer
+`nodata` | String | `'Sorry, there is no data for this location.'` | a message to display in the Leaflet popup when the "popup" member is not present in the properties hash in the GeoJSON Feature for a location.
 
 
 ## Contributing
 
-1. Fork it ( http://github.com/<my-github-username>/blacklight-maps/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Make some changes (with [tests](https://github.com/projectblacklight/blacklight/wiki/testing), please)
-4. Commit your changes (`git commit -am 'Add some feature'`)
-5. Push to the branch (`git push origin my-new-feature`)
-6. Create new Pull Request
+We encourage you to contribute to Blacklight-Maps. Please see the [contributing guide](/CONTRIBUTING.md) for more information on contributing to the project.

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

@@ -7,15 +7,15 @@
     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>',
-      viewpoint: [0,0],
-      initialzoom: 2,
+      initialZoom: 2,
       singlemarkermode: true,
       searchcontrol: false,
       catalogpath: 'catalog',
       searchctrlcue: 'Search for all items within the current map window',
       placenamefield: 'placename_field',
       nodata: 'Sorry, there is no data for this location.',
-      clustercount:'locations'
+      clustercount:'locations',
+      searchresultsview: 'list'
     }, arg_opts );
 
     // Extend options from data-attributes
@@ -27,6 +27,8 @@
 
     var sortAndPerPage = $('#sortAndPerPage');
 
+    var markers;
+
     // Update page links with number of mapped items, disable sort, per_page, pagination
     if (sortAndPerPage.length) { // catalog#index and #map view
       var page_links = sortAndPerPage.find('.page_links');
@@ -64,18 +66,10 @@
       options.id = this.id;
 
       // Setup Leaflet map
-      map = L.map(this.id);
-
-      // set the viewpoint and zoom
-      if (options.viewpoint[0].constructor === Array) {
-        map.fitBounds(options.viewpoint,
-          {
-            padding:[10,10],
-            maxZoom:options.maxzoom
-          });
-      } else {
-        map.setView(options.viewpoint, options.initialzoom);
-      }
+      map = L.map(this.id, {
+        center: [0, 0],
+        zoom: options.initialZoom
+      });
 
       L.tileLayer(options.tileurl, {
         attribution: options.mapattribution,
@@ -104,6 +98,9 @@
       // Add markers to map
       map.addLayer(markers);
 
+      // Fit bounds of map
+      setMapBounds(map);
+
       // create overlay for search control hover
       var searchHoverLayer = L.rectangle([[0,0], [0,0]], {
         color: "#0033ff",
@@ -148,6 +145,46 @@
 
     });
 
+    /**
+    * Sets the view of the map, based off of the map bounds
+    */
+    function setMapBounds() {
+      map.fitBounds(mapBounds(), {
+        padding: [10, 10],
+        maxZoom: options.maxzoom
+      });
+    }
+
+    /**
+    * Returns the bounds of the map based off of initialview being set or gets
+    * the bounds of the markers object
+    */
+    function mapBounds() {
+      if (options.initialview) {
+        return options.initialview;
+      } else {
+        return markerBounds();
+      }
+    }
+
+    /**
+    * Returns the bounds of markers, if there are not any return
+    */
+    function markerBounds() {
+      if (hasAnyFeatures()) {
+        return markers.getBounds();
+      } else {
+        return [[90, 180], [-90, -180]];
+      }
+    }
+
+    /**
+    * Checks to see if there are any features in the markers MarkerClusterGroup
+    */
+    function hasAnyFeatures() {
+      return !$.isEmptyObject(markers._featureGroup._layers);
+    }
+
     // remove stale params, add new params, and run a new search
     function _search() {
       var params = filterParams(['view', 'spatial_search_type', 'coordinates', 'f%5B' + options.placenamefield + '%5D%5B%5D']),
@@ -160,7 +197,7 @@
             return Math.round(parseFloat(coord) * 1000000) / 1000000;
           }),
           coordinate_params = '[' + bounds[1] + ',' + bounds[0] + ' TO ' + bounds[3] + ',' + bounds[2] + ']';
-      params.push('coordinates=' + encodeURIComponent(coordinate_params), 'spatial_search_type=bbox');
+      params.push('coordinates=' + encodeURIComponent(coordinate_params), 'spatial_search_type=bbox', 'view=' + options.searchresultsview);
       $(location).attr('href', options.catalogpath + '?' + params.join('&'));
     }
 

data/app/helpers/blacklight/blacklight_maps_helper_behavior.rb

@@ -27,7 +27,8 @@ module Blacklight::BlacklightMapsHelperBehavior
     coords_for_search = bbox_coordinates.map { |v| v.to_s }
     link_to(t('blacklight.maps.interactions.bbox_search'),
             catalog_index_path(spatial_search_type: "bbox",
-                               coordinates: "[#{coords_for_search[1]},#{coords_for_search[0]} TO #{coords_for_search[3]},#{coords_for_search[2]}]"))
+                               coordinates: "[#{coords_for_search[1]},#{coords_for_search[0]} TO #{coords_for_search[3]},#{coords_for_search[2]}]",
+                               view: default_document_index_view_type))
   end
 
   # create a link to a location name facet value
@@ -37,8 +38,9 @@ module Blacklight::BlacklightMapsHelperBehavior
     else
       new_params = add_facet_params(field, field_value)
     end
+    new_params[:view] = default_document_index_view_type
     link_to(displayvalue.presence || field_value,
-            catalog_index_path(new_params.except(:view, :id, :spatial_search_type, :coordinates)))
+            catalog_index_path(new_params.except(:id, :spatial_search_type, :coordinates)))
   end
 
   # create a link to a spatial search for a set of point coordinates
@@ -46,6 +48,7 @@ module Blacklight::BlacklightMapsHelperBehavior
     new_params = params.except(:controller, :action, :view, :id, :spatial_search_type, :coordinates)
     new_params[:spatial_search_type] = "point"
     new_params[:coordinates] = "#{point_coordinates[1]},#{point_coordinates[0]}"
+    new_params[:view] = default_document_index_view_type
     link_to(t('blacklight.maps.interactions.point_search'), catalog_index_path(new_params))
   end
 
@@ -95,32 +98,4 @@ module Blacklight::BlacklightMapsHelperBehavior
                                                options)
     export.to_geojson
   end
-
-  # determine the best viewpoint for the map so all markers are visible
-  def set_viewpoint(geojson_features)
-    viewpoint = nil
-    geojson_docs = JSON.parse(geojson_features)["features"]
-    if !geojson_docs.blank?
-      if geojson_docs.length == 1
-        viewpoint = geojson_docs[0]["bbox"] ? nil : geojson_docs[0]["geometry"]["coordinates"].reverse
-      end
-      if geojson_docs.length > 1 || !viewpoint
-        longs, lats = [[],[]]
-        geojson_docs.each do |feature|
-          if feature["bbox"]
-            feature["bbox"].values_at(0,2).each {|long| longs << long }
-            feature["bbox"].values_at(1,3).each {|lat| lats << lat }
-          else
-            longs << feature["geometry"]["coordinates"][0]
-            lats << feature["geometry"]["coordinates"][1]
-          end
-        end
-        sorted_longs, sorted_lats = longs.sort, lats.sort
-        viewpoint = [[sorted_lats.first,sorted_longs.first],[sorted_lats.last,sorted_longs.last]]
-      end
-    end
-    viewpoint = [0,0] if !viewpoint
-    viewpoint
-  end
-
-end
+end

data/app/views/catalog/_index_map.html.erb

@@ -1,8 +1,8 @@
 <%= blacklight_map_tag('blacklight-index-map',
-                       {data:{viewpoint: set_viewpoint(geojson_features),
-                              searchcontrol: true,
+                       {data:{searchcontrol: true,
                               catalogpath: catalog_index_path,
                               placenamefield: blacklight_config.view.maps.placename_field,
-                              clustercount:'hits'
+                              clustercount:'hits',
+                              searchresultsview: default_document_index_view_type
                        }}) %>
 <%= javascript_tag "$('#blacklight-index-map').blacklight_leaflet_map(#{geojson_features});" %>

data/app/views/catalog/_show_maplet_default.html.erb

@@ -3,8 +3,7 @@
     <% if @document[blacklight_config.view.maps.geojson_field.to_sym] || @document[blacklight_config.view.maps.coordinates_field.to_sym] %>
         <% geojson_features = serialize_geojson(@document) %>
         <%= blacklight_map_tag('blacklight-show-map',
-                               {data:{viewpoint: set_viewpoint(geojson_features),
-                                      initialzoom:blacklight_config.view.maps.show_initial_zoom,
+                               {data:{initialzoom:blacklight_config.view.maps.show_initial_zoom,
                                       singlemarkermode:false}}) %>
         <%= javascript_tag "$('#blacklight-show-map').blacklight_leaflet_map(#{geojson_features});" %>
     <% end %>

data/lib/blacklight/maps/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Maps
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -9,12 +9,12 @@ describe CatalogController do
     before { get :map }
 
     it "should respond to the #map action" do
-      response.should be_success
-      assigns(:document_list).should_not be_nil
+      expect(response).to be_success
+      expect(assigns(:document_list)).to_not be_nil
     end
 
     it "should render the '/map' page" do
-      response.body.should have_selector("body.blacklight-catalog-map")
+      expect(response.body).to have_css 'body.blacklight-catalog-map'
     end
 
   end

data/spec/features/initial_view_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+feature 'Initial view parameter', js: true do
+  before :all do
+    CatalogController.configure_blacklight do |config|
+      config.view.maps.facet_mode = 'coordinates'
+      config.view.maps.coordinates_facet_field = 'coordinates_facet'
+      config.add_facet_field 'coordinates_facet', :limit => -2, :label => 'Coordinates', :show => false
+    end
+  end
+  scenario 'defaults to zoom area of markers' do
+    visit catalog_index_path f: { format: ['Book'] }, view: 'maps'
+    expect(page).to have_css '.leaflet-marker-icon.marker-cluster', count: 8
+  end
+  scenario 'when provided sets map to its view' do
+    map_tag = '<div id="blacklight-index-map" data-initialview="[[37.65, -122.56],[37.89, -122.27]]" data-maxzoom="18" data-tileurl="http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" data-mapattribution="Map data &amp;copy; &lt;a href=&quot;http://openstreetmap.org&quot;&gt;OpenStreetMap&lt;/a&gt; contributors, &lt;a href=&quot;http://creativecommons.org/licenses/by-sa/2.0/&quot;&gt;CC-BY-SA&lt;/a&gt;" data-searchcontrol="true" data-catalogpath="/catalog" data-placenamefield="placename_field" data-clustercount="hits" />'.html_safe
+    expect_any_instance_of(Blacklight::BlacklightMapsHelperBehavior).to receive(:blacklight_map_tag).and_return(map_tag)
+    visit catalog_index_path f: { format: ['Book'] }, view: 'maps'
+    expect(page).to_not have_css '.leaflet-marker-icon.marker-cluster'
+  end
+end

data/spec/features/maps_spec.rb

@@ -91,8 +91,9 @@ describe "Map View", js: true do
       end
 
       describe "marker popups" do
-
-        before { find(".marker-cluster:first-child").click }
+        before do
+          find('.marker-cluster', text: '1', match: :first).click
+        end
 
         it "should show a popup with correct content" do
           expect(page).to have_selector("div.leaflet-popup-content-wrapper")
@@ -107,6 +108,10 @@ describe "Map View", js: true do
             expect(page).to have_selector(".constraint-value .filterValue", text: "Seoul (Korea)")
           end
 
+          it "should use the default view type" do
+            expect(current_url).to include("view=list")
+          end
+
         end
 
       end
@@ -133,6 +138,7 @@ describe "Map View", js: true do
 
           it "should run a new search" do
             expect(page).to have_selector(".constraint.coordinates")
+            expect(current_url).to include("view=list")
           end
 
         end
@@ -182,6 +188,7 @@ describe "Map View", js: true do
 
           it "should run a new search" do
             expect(page).to have_selector(".constraint-value .filterValue", text: "35.86166,104.195397")
+            expect(current_url).to include("view=list")
           end
 
         end

data/spec/helpers/blacklight_maps_helper_spec.rb

@@ -11,19 +11,19 @@ describe BlacklightMapsHelper do
   end
 
   let(:r) { create_response }
+  let(:geojson_hash) { { type: 'Feature', geometry: { type: 'Point', coordinates: [91.117212, 29.646923] }, properties: { placename: 'Tibet' } } }
+  let(:coords) { [91.117212, 29.646923] }
+  let(:bbox) { [78.3955448, 26.8548157, 99.116241, 36.4833345] }
 
   before :each do
+    allow(helper).to receive_messages(blacklight_config: blacklight_config)
     CatalogController.blacklight_config = Blacklight::Configuration.new
-    helper.stub(blacklight_config: blacklight_config)
     @request = ActionDispatch::TestRequest.new
     @catalog = CatalogController.new
     @catalog.request = @request
     @catalog.action_name = "index"
     helper.instance_variable_set(:@_controller, @catalog)
     @docs = r.facet_by_field_name(blacklight_config.view.maps.geojson_field).items
-    @geojson_hash = {type:"Feature", geometry:{type:"Point",coordinates:[91.117212, 29.646923]},properties:{placename:"Tibet"}}
-    @coords = [91.117212,29.646923]
-    @bbox = [78.3955448,26.8548157,99.116241,36.4833345]
   end
 
   describe "blacklight_map_tag" do
@@ -59,20 +59,20 @@ describe BlacklightMapsHelper do
   describe "placename_value" do
 
     it "should return the placename value" do
-      expect(helper.placename_value(@geojson_hash)).to eq('Tibet')
+      expect(helper.placename_value(geojson_hash)).to eq('Tibet')
     end
 
   end
 
   describe "link_to_bbox_search" do
 
-    before do
-      @bbox = [78.3955448,26.8548157,99.116241,36.4833345]
+    it "should create a spatial search link" do
+      expect(helper.link_to_bbox_search(bbox)).to include('catalog?coordinates')
+      expect(helper.link_to_bbox_search(bbox)).to include('spatial_search_type=bbox')
     end
 
-    it "should create a spatial search link" do
-      expect(helper.link_to_bbox_search(@bbox)).to include('catalog?coordinates')
-      expect(helper.link_to_bbox_search(@bbox)).to include('spatial_search_type=bbox')
+    it "should include the default_document_index_view_type in the params" do
+      expect(helper.link_to_bbox_search(bbox)).to include('view=list')
     end
 
   end
@@ -87,17 +87,21 @@ describe BlacklightMapsHelper do
       expect(helper.link_to_placename_field('Tibet', blacklight_config.view.maps.placename_field, 'foo')).to include('">foo</a>')
     end
 
+    it "should include the default_document_index_view_type in the params" do
+      expect(helper.link_to_placename_field('Tibet', blacklight_config.view.maps.placename_field)).to include('view=list')
+    end
+
   end
 
   describe "link_to_point_search" do
 
-    before do
-      @coords = [91.117212,29.646923]
+    it "should create a link to a coordinate point" do
+      expect(helper.link_to_point_search(coords)).to include('catalog?coordinates')
+      expect(helper.link_to_point_search(coords)).to include('spatial_search_type=point')
     end
 
-    it "should create a link to a coordinate point" do
-      expect(helper.link_to_point_search(@coords)).to include('catalog?coordinates')
-      expect(helper.link_to_point_search(@coords)).to include('spatial_search_type=point')
+    it "should include the default_document_index_view_type in the params" do
+      expect(helper.link_to_point_search(coords)).to include('view=list')
     end
 
   end
@@ -127,7 +131,7 @@ describe BlacklightMapsHelper do
   describe "render_placename_heading" do
 
     it "should return the placename heading" do
-      expect(helper.render_placename_heading(@geojson_hash)).to eq('Tibet')
+      expect(helper.render_placename_heading(geojson_hash)).to eq('Tibet')
     end
 
   end
@@ -147,36 +151,15 @@ describe BlacklightMapsHelper do
   describe "render_spatial_search_link" do
 
     it "should return link_to_bbox_search if bbox coordinates are passed" do
-      expect(helper.render_spatial_search_link(@bbox)).to include('spatial_search_type=bbox')
+      expect(helper.render_spatial_search_link(bbox)).to include('spatial_search_type=bbox')
     end
 
     it "should return link_to_point_search if point coordinates are passed" do
-      expect(helper.render_spatial_search_link(@coords)).to include('spatial_search_type=point')
-    end
-
-  end
-
-  describe "set_viewpoint" do
-
-    describe "map with a single point" do
-
-      it "should return a coordinate array matching the point" do
-        expect(helper.set_viewpoint(helper.serialize_geojson([@docs.first]))).to eq([29.646923, 91.117212])
-      end
-
-    end
-
-    describe "map with multiple points" do
-
-      it "should return an array of coordinates with the max lat-long of the range of points" do
-        expect(helper.set_viewpoint(helper.serialize_geojson(@docs))).to eq([[20.593684, 78.96288], [35.86166, 104.195397]])
-      end
-
+      expect(helper.render_spatial_search_link(coords)).to include('spatial_search_type=point')
     end
 
   end
 
-
   def mock_query_response
     %({"responseHeader"=>{"status"=>0, "QTime"=>14, "params"=>{"q"=>"tibet", "spellcheck.q"=>"tibet", "qt"=>"search", "wt"=>"ruby", "rows"=>"10"}}, "response"=>{"numFound"=>2, "start"=>0, "maxScore"=>0.016135123, "docs"=>[{"published_display"=>["Dharamsala, H.P."], "author_display"=>"Thub-bstan-yar-ʼphel, Rnam-grwa", "lc_callnum_display"=>["DS785 .T475 2005"], "pub_date"=>["2005"], "format"=>"Book", "material_type_display"=>["a-e, iv, ii, 407 p."], "title_display"=>"Bod gaṅs can gyi rgyal rabs mdor bsdus dris lan brgya pa rab gsal śel gyi me loṅ źes bya ba bźugs so", "id"=>"2008308202", "subject_geo_facet"=>["Tibet"], "language_facet"=>["Tibetan"], "geojson"=>["{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[91.117212, 29.646923]},\\"properties\\":{\\"placename\\":\\"Tibet\\"}}", "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Polygon\\",\\"coordinates\\":[[[78.3955448, 26.8548157], [99.116241, 26.8548157], [99.116241, 36.4833345], [78.3955448, 36.4833345], [78.3955448, 26.8548157]]]},\\"bbox\\":[78.3955448,26.8548157,99.116241,36.4833345]}"], "coordinates"=>["91.117212 29.646923", "78.3955448 26.8548157 99.116241 36.4833345"], "score"=>0.016135123}, {"published_display"=>["Dharamsala, Distt. Kangra, H.P."], "pub_date"=>["2007"], "format"=>"Book", "title_display"=>"Ses yon", "material_type_display"=>["xii, 419 p."], "id"=>"2008308478", "subject_geo_facet"=>["China", "Tibet", "India"], "subject_topic_facet"=>["Education and state", "Tibetans", "Tibetan language", "Teaching"], "language_facet"=>["Tibetan"], "geojson"=>["{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[104.195397,35.86166]},\\"properties\\":{\\"placename\\":\\"China\\"}}", "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[91.117212,29.646923]},\\"properties\\":{\\"placename\\":\\"Tibet\\"}}", "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[78.96288,20.593684]},\\"properties\\":{\\"placename\\":\\"India\\"}}","{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Polygon\\",\\"coordinates\\":[[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]]},\\"bbox\\":[68.162386,6.7535159,97.395555,35.5044752]}"], "coordinates"=>["68.162386 6.7535159 97.395555 35.5044752", "104.195397 35.86166", "91.117212 29.646923", "78.96288 20.593684"], "score"=>0.0026767207}]}, "facet_counts"=>{"facet_queries"=>{}, "facet_fields"=>{"format"=>["Book", 2], "lc_1letter_facet"=>["D - World History", 1], "lc_alpha_facet"=>["DS", 1], "lc_b4cutter_facet"=>["DS785", 1], "language_facet"=>["Tibetan", 2], "pub_date"=>["2005", 1, "2007", 1], "subject_era_facet"=>[], "subject_geo_facet"=>["China", 1, "India", 1, "Tibet", 1, "Tibet (China)", 1], "coordinates"=>["91.117212 29.646923", 2, "78.3955448 26.8548157 99.116241 36.4833345", 1, "68.162386 6.7535159 97.395555 35.5044752", 1, "104.195397 35.86166", 1, "78.96288 20.593684", 1], "geojson"=>["{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[91.117212, 29.646923]},\\"properties\\":{\\"placename\\":\\"Tibet\\"}}", 2, "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Polygon\\",\\"coordinates\\":[[[78.3955448, 26.8548157], [99.116241, 26.8548157], [99.116241, 36.4833345], [78.3955448, 36.4833345], [78.3955448, 26.8548157]]]},\\"bbox\\":[78.3955448,26.8548157,99.116241,36.4833345]}", 1, "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[104.195397,35.86166]},\\"properties\\":{\\"placename\\":\\"China\\"}}", 1, "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[78.96288,20.593684]},\\"properties\\":{\\"placename\\":\\"India\\"}}", 1, "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Polygon\\",\\"coordinates\\":[[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]]},\\"bbox\\":[68.162386,6.7535159,97.395555,35.5044752]}", 1], "subject_topic_facet"=>["Education and state", 1, "Teaching", 1, "Tibetan language", 1, "Tibetans", 1]}, "facet_dates"=>{}, "facet_ranges"=>{}}, "spellcheck"=>{"suggestions"=>["tibet", {"numFound"=>1, "startOffset"=>0, "endOffset"=>5, "origFreq"=>2, "suggestion"=>[{"word"=>"tibetan", "freq"=>6}]}, "correctlySpelled", true]}})
   end

data/spec/lib/blacklight/maps/export_spec.rb

@@ -9,7 +9,7 @@ describe "BlacklightMaps::GeojsonExport" do
     @request = ActionDispatch::TestRequest.new
     @controller.request = @request
     @response = ActionDispatch::TestResponse.new
-    @response.stub(:docs) {[{ "published_display"=>["Dharamsala, Distt. Kangra, H.P."], "pub_date"=>["2007"], "format"=>"Book", "title_display"=>"Ses yon", "material_type_display"=>["xii, 419 p."], "id"=>"2008308478", "placename_field"=>["China", "Tibet", "India"], "subject_topic_facet"=>["Education and state", "Tibetans", "Tibetan language", "Teaching"], "language_facet"=>["Tibetan"], "geojson"=>["{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[104.195397,35.86166]},\"properties\":{\"placename\":\"China\"}}", "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[91.117212,29.646923]},\"properties\":{\"placename\":\"Tibet\"}}", "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[78.96288,20.593684]},\"properties\":{\"placename\":\"India\"}}"], "coordinates"=>["68.162386 6.7535159 97.395555 35.5044752", "104.195397 35.86166", "91.117212 29.646923", "20.593684,78.96288"], "score"=>0.0026767207 }]}
+    expect(@response).to receive(:docs).and_return([{ "published_display"=>["Dharamsala, Distt. Kangra, H.P."], "pub_date"=>["2007"], "format"=>"Book", "title_display"=>"Ses yon", "material_type_display"=>["xii, 419 p."], "id"=>"2008308478", "placename_field"=>["China", "Tibet", "India"], "subject_topic_facet"=>["Education and state", "Tibetans", "Tibetan language", "Teaching"], "language_facet"=>["Tibetan"], "geojson"=>["{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[104.195397,35.86166]},\"properties\":{\"placename\":\"China\"}}", "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[91.117212,29.646923]},\"properties\":{\"placename\":\"Tibet\"}}", "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[78.96288,20.593684]},\"properties\":{\"placename\":\"India\"}}"], "coordinates"=>["68.162386 6.7535159 97.395555 35.5044752", "104.195397 35.86166", "91.117212 29.646923", "20.593684,78.96288"], "score"=>0.0026767207 }])
   end
 
   # TODO: use @response.facet_by_field_name('geojson').items instead of @response

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 ENV["RAILS_ENV"] ||= 'test'
 
 require 'engine_cart'
+require 'coveralls'
+Coveralls.wear!('rails')
 EngineCart.load_application!
 
 require 'capybara/poltergeist'
@@ -16,7 +18,6 @@ end
 
 if ENV["COVERAGE"] or ENV["CI"]
   require 'simplecov'
-  require 'coveralls'
 
   SimpleCov.formatter = Coveralls::SimpleCov::Formatter
   SimpleCov.start do
@@ -24,12 +25,9 @@ if ENV["COVERAGE"] or ENV["CI"]
   end
 end
 
-
-require 'blacklight'
 require 'blacklight/maps'
 
 require 'rspec/rails'
-require 'rspec/autorun'
 require 'capybara/rspec'
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-maps
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Chris Beer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -187,8 +187,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -226,6 +228,7 @@ files:
 - solr_conf/conf/schema.xml
 - solr_conf/conf/solrconfig.xml
 - spec/controllers/catalog_controller_spec.rb
+- spec/features/initial_view_spec.rb
 - spec/features/maps_spec.rb
 - spec/fixtures/sample_solr_documents.yml
 - spec/helpers/blacklight_maps_helper_spec.rb
@@ -262,6 +265,7 @@ specification_version: 4
 summary: Maps for Blacklight
 test_files:
 - spec/controllers/catalog_controller_spec.rb
+- spec/features/initial_view_spec.rb
 - spec/features/maps_spec.rb
 - spec/fixtures/sample_solr_documents.yml
 - spec/helpers/blacklight_maps_helper_spec.rb