blacklight-maps 0.0.1 → 0.1.0

data/solr_conf/conf/solrconfig.xml

@@ -17,8 +17,8 @@
 -->
 
 <!--
- This is a stripped down config file used for a simple example...  
- It is *not* a good example to work from. 
+ This is a stripped down config file used for a simple example...
+ It is *not* a good example to work from.
 -->
 <config>
   <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
@@ -31,18 +31,18 @@
   <lib dir="../lib/contrib/analysis-extras/lucene-libs" />
 
   <dataDir>${solr.blacklight-core.data.dir:}</dataDir>
-  
-  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> 
+
+  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
 
   <requestDispatcher handleSelect="true" >
     <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
-  
+
   <requestHandler name="standard" class="solr.StandardRequestHandler" />
   <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
   <requestHandler name="/update" class="solr.UpdateRequestHandler"  />
   <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-     
+
   <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
     <lst name="invariants">
       <str name="q">solrpingquery</str>
@@ -51,8 +51,8 @@
       <str name="echoParams">all</str>
     </lst>
   </requestHandler>
-   
-  <!-- config for the admin interface --> 
+
+  <!-- config for the admin interface -->
   <admin>
     <defaultQuery>solr</defaultQuery>
   </admin>
@@ -80,7 +80,7 @@
 
        <!-- this qf and pf are used by default, if not otherwise specified by
             client. The default blacklight_config will use these for the
-            "keywords" search. See the author_qf/author_pf, title_qf, etc 
+            "keywords" search. See the author_qf/author_pf, title_qf, etc
             below, which the default blacklight_config will specify for
             those searches. You may also be interested in:
             http://wiki.apache.org/solr/LocalParams
@@ -185,21 +185,21 @@
          subject_addl_unstem_search^100
          subject_addl_t^10
        </str>
-       
+
        <int name="ps">3</int>
        <float name="tie">0.01</float>
 
        <!-- NOT using marc_display because it is large and will slow things down for search results -->
        <str name="fl">
-         id, 
+         id,
          score,
          author_display,
-         author_vern_display, 
-         format, 
-         isbn_t, 
-         language_facet, 
+         author_vern_display,
+         format,
+         isbn_t,
+         language_facet,
          lc_callnum_display,
-         material_type_display, 
+         material_type_display,
          published_display,
          published_vern_display,
          pub_date,
@@ -212,7 +212,8 @@
          subtitle_vern_display,
          url_fulltext_display,
          url_suppl_display,
-         placename_coords
+         placename_coords,
+         place_bbox
        </str>
 
        <str name="facet">true</str>
@@ -290,7 +291,7 @@
     <arr name="last-components">
       <str>spellcheck</str>
     </arr>
-      
+
   </requestHandler>
 
   <!-- for requests to get a single document; use id=666 instead of q=id:666 -->
@@ -308,16 +309,16 @@
     <lst name="defaults">
       <str name="defType">lucene</str>
       <str name="echoParams">explicit</str>
-      <str name="sort">score desc, pub_date_sort desc, title_sort asc</str>   
-      <str name="df">text</str> 
-      <str name="q.op">AND</str> 
+      <str name="sort">score desc, pub_date_sort desc, title_sort asc</str>
+      <str name="df">text</str>
+      <str name="q.op">AND</str>
       <str name="qs">1</str>
 
       <!-- used for dismax query parser -->
-      <str name="mm">1</str> 
-      <str name="ps">3</str> 
+      <str name="mm">1</str>
+      <str name="ps">3</str>
       <float name="tie">0.01</float>
-      
+
       <!-- for user query terms in author text box -->
       <str name="qf_author">
         author_unstem_search^200
@@ -331,7 +332,7 @@
         author_t^200
         author_addl_t^10
       </str>
-      
+
       <!-- for user query terms in title text box -->
       <str name="qf_title">
         title_unstem_search^50000
@@ -357,7 +358,7 @@
         title_series_t^50
         title_series_unstem_search^10
       </str>
-      
+
       <!-- for user query terms in subject text box -->
       <str name="qf_subject">
         subject_topic_unstem_search^200
@@ -375,25 +376,25 @@
         subject_addl_unstem_search^100
         subject_addl_t^10
       </str>
-      
+
       <!-- for user query terms in number text box -->
       <str name="qf_number">isbn_t</str>
-      
+
       <!-- for user query terms in keyword text box -->
       <str name="qf_keyword">text</str>
       <str name="pf_keyword">text^10</str>
-      
+
       <!-- NOT using marc_display because it is large and will slow things down for search results -->
       <str name="fl">
-        id, 
+        id,
         score,
         author_display,
-        author_vern_display, 
-        format, 
-        isbn_t, 
-        language_facet, 
+        author_vern_display,
+        format,
+        isbn_t,
+        language_facet,
         lc_callnum_display,
-        material_type_display, 
+        material_type_display,
         published_display,
         published_vern_display,
         pub_date,
@@ -407,7 +408,7 @@
         url_fulltext_display,
         url_suppl_display,
       </str>
-      
+
       <str name="facet">true</str>
       <str name="facet.mincount">1</str>
       <str name="facet.limit">10</str>
@@ -420,7 +421,7 @@
       <str name="facet.field">subject_era_facet</str>
       <str name="facet.field">subject_geo_facet</str>
       <str name="facet.field">subject_topic_facet</str>
-      
+
       <str name="spellcheck">true</str>
       <str name="spellcheck.dictionary">subject</str>
       <str name="spellcheck.onlyMorePopular">true</str>
@@ -436,7 +437,7 @@
 <!-- Spell Check
 
         The spell check component can return a list of alternative spelling
-        suggestions.  
+        suggestions.
 
         http://wiki.apache.org/solr/SpellCheckComponent
      -->
@@ -491,7 +492,7 @@
        </lst>
      -->
 
-    <!-- a spellchecker that use an alternate comparator 
+    <!-- a spellchecker that use an alternate comparator
 
          comparatorClass be one of:
           1. score (default)
@@ -520,4 +521,3 @@
   </searchComponent>
 
 </config>
-

data/spec/features/maps_spec.rb

@@ -1,79 +1,108 @@
 require 'spec_helper'
 
-describe "Map view", :js => true do
-  before { visit catalog_index_path :q => 'tibet', :view => 'maps' }
+describe "Map View", js: true do
+
+  describe "using placename coords" do
+    before do
+      CatalogController.blacklight_config = Blacklight::Configuration.new
+      CatalogController.configure_blacklight do |config|
+        config.view.maps.type = 'placename_coord'
+        config.view.maps.placename_coord_delimiter = '-|-'
+        # These fields also need to be added for some reason for the tests to pass
+        # Link in list is not being generated correctly if not passed
+        config.index.title_field = 'title_display'
+      end
+    end
 
-  it "should display results in a map" do
-    expect(page).to have_selector("#documents.map")
-  end
+    before { visit catalog_index_path :q => 'tibet', :view => 'maps' }
 
-  it "should contain map div" do
-    expect(page).to have_selector("#blacklight-map")
-  end
+    it "should display map elements" do
+      expect(page).to have_selector("#documents.map")
+      expect(page).to have_selector("#blacklight-map")
+      expect(page).to have_selector("#blacklight-map-sidebar")
+    end
 
-  it "should contain leaflet-sidebar div" do
-    expect(page).to have_selector("#blacklight-map-sidebar")
-  end
+    describe "data attributes" do
 
-  describe "Data attributes" do
+      it "maxzoom should be 8" do
+        expect(page).to have_selector("#blacklight-map[data-maxzoom='8']")
+      end
 
-    it "maxzoom should be 8" do
-      expect(page).to have_selector("#blacklight-map[data-maxzoom='8']")
-    end
+      it "type should be placename_coord" do
+        expect(page).to have_selector("#blacklight-map[data-type='placename_coord']")
+      end
 
-  end
+      it "tileurl should be OSM" do
+        expect(page).to have_selector("#blacklight-map[data-tileurl='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png']")
+      end
 
-  describe "Marker clusters" do
-    
-    it "should have marker cluster div" do
-      expect(page).to have_selector("div.marker-cluster")
     end
 
-    it "should only have one marker cluster" do
-      expect(page).to have_selector('div.marker-cluster', count: 1)
-    end
+    describe "marker clusters" do
 
-    it "should have 4 markers" do
-      expect(find("div.marker-cluster")).to have_content(4)
-    end
+      it "should have marker cluster div" do
+        expect(page).to have_selector("div.marker-cluster")
+      end
 
-    it "should display tile layer attribution" do
-      expect(find("div.leaflet-control-container")).to have_content('OpenStreetMap contributors, CC-BY-SA')
-    end
+      it "should only have one marker cluster" do
+        expect(page).to have_selector('div.marker-cluster', count: 1)
+      end
 
-    describe "Click Marker cluster" do
-      before { find("div.marker-cluster").click }
-      
-      it "should have three marker clusters" do
-        expect(page).to have_selector('div.marker-cluster', count: 3)
+      it "should have 4 markers" do
+        expect(find("div.marker-cluster")).to have_content(4)
       end
 
-      describe "Click low level marker cluster" do
-        before { find("div.marker-cluster[title='India']").click }
+      it "should display tile layer attribution" do
+        expect(find("div.leaflet-control-container")).to have_content('OpenStreetMap contributors, CC-BY-SA')
+      end
 
-        it "should show sidebar with content" do
-          expect(page).to have_content("yon")
+      describe "Click Marker cluster" do
+        before { find("div.marker-cluster").click }
+
+        it "should have three marker clusters" do
+          expect(page).to have_selector('div.marker-cluster', count: 3)
         end
 
-        describe "Navigate to catalog page" do
-          before { click_link("es yon") }
+        describe "Click low level marker cluster" do
+          before { find("div.marker-cluster[title='India']").click }
 
           it "should show sidebar with content" do
-            expect(page).to have_content("Dharamsala, Distt. Kangra, H.P.")
+            expect(page).to have_content("es yon")
           end
 
-        end
+          describe "Navigate to catalog page" do
+            before { click_link("es yon") }
 
+            it "should show page with content" do
+              expect(page).to have_content("es yon")
+            end
+          end
+        end
       end
+    end
+  end
 
+  describe "using bounding box" do
+    before do
+      CatalogController.blacklight_config = Blacklight::Configuration.new
+      CatalogController.configure_blacklight do |config|
+        config.view.maps.type = 'bbox'
+        config.view.maps.bbox_field = 'place_bbox'
+      end
     end
 
-    #TODO more tests
-  end
+    before { visit catalog_index_path :q => 'korea', :view => 'maps' }
 
-  describe "Sidebar" do
+    it "should have 4 markers" do
+      expect(find("div.marker-cluster")).to have_content(4)
+    end
 
-    #TODO more tests
+    describe "click marker cluster" do
+      before { find("div.marker-cluster").click }
 
+      it "should split into 2 markers" do
+        expect(page).to have_selector('div.marker-cluster', count: 2)
+      end
+    end
   end
-end
+end

data/spec/fixtures/sample_solr_documents.yml

@@ -252,7 +252,8 @@
   - Persian
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - Iran|32.427908|53.688046
+  - Iran-|-32.427908-|-53.688046
+  place_bbox: 44.0318907 25.0594286 63.3333366 39.7816755
 - author_t:
   - Yoshida, Hajime,
   - "吉田一"
@@ -335,7 +336,8 @@
   - Japanese
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - Japan|36.204824|138.252924
+  - Japan-|-36.204824-|-138.252924
+  place_bbox: 122.9338302 24.0460446 153.9874305 45.5227719
 - lc_1letter_facet:
   - D - World History
   author_t:
@@ -406,7 +408,8 @@
   - Russian
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - Kazakhstan|48.019573|66.923684
+  - Kazakhstan-|-48.019573-|-66.923684
+  place_bbox: 46.4936719 40.568584 87.315415 55.441984
 - lc_1letter_facet:
   - K - Law
   author_t:
@@ -570,7 +573,8 @@
   - Korean
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - Korea|35.907757|127.766922
+  - Korea-|-35.907757-|-127.766922
+  place_bbox: 124.608139 33.1061096 130.9232178 38.6169312
 - lc_1letter_facet:
   - P - Language & Literature
   author_t:
@@ -702,7 +706,8 @@
   - Urdu
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - Pakistan|30.375321|69.34511599999999
+  - Pakistan-|-30.375321-|-69.34511599999999
+  place_bbox: 60.872972 23.6946945 77.8334694 37.084107
 - lc_1letter_facet:
   - M - Music
   author_t:
@@ -1103,7 +1108,8 @@
   - Korean
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - Korea (North)|35.907757|127.766922
+  - Korea (North)-|-35.907757-|-127.766922
+  place_bbox: 124.608139 33.1061096 130.9232178 38.6169312
 - subtitle_display: ṿe-hu perush yafeh u-menupeh ʻal Shulḥan ʻarukh Oraḥ ḥayim
     asher ḥiber Yosef Ḳaro ... ʻim ḥidushe dinim she-hishmiṭ ha-gaʼon ... ṿe-himtsiʼam
     ... Mosheh Iserlish
@@ -1364,8 +1370,11 @@
   - Korean
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - Seoul (Korea)|37.566535|126.9779692
-  - Korea (South)|35.907757|127.766922
+  - Seoul (Korea)-|-37.566535-|-126.9779692
+  - Korea (South)-|-35.907757-|-127.766922
+  place_bbox:
+  - 126.7645827 37.4259627 127.18359 37.7017495
+  - 124.608139 33.1061096 130.9232178 38.6169312
 - subtitle_display: dar khiradvarzī-i siyāsī va huvīyat-i mā Īrānīyān
   author_vern_display: "‏رجايى، فرهنگ ."
   subject_addl_t:
@@ -1475,7 +1484,8 @@
   - Persian
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - Iran|32.427908|53.688046
+  - Iran-|-32.427908-|-53.688046
+  place_bbox: 44.0318907 25.0594286 63.3333366 39.7816755
 - lc_1letter_facet:
   - P - Language & Literature
   author_t:
@@ -1987,7 +1997,8 @@
   - Hebrew
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - Israel|31.046051|34.851612
+  - Israel-|-31.046051-|-34.851612
+  place_bbox: 34.267387 29.47969999999999 35.896244 33.33280500000001
 - lc_1letter_facet:
   - E - History of the Americas (General)
   author_t:
@@ -2097,8 +2108,9 @@
   - 'a Native American elder has her say : an oral history /'
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - New Jersey|40.0583238|-74.4056612
-  - Bridgeton|39.427337|-75.2340768
+  - New Jersey-|-40.0583238-|--74.4056612
+  - Bridgeton-|-39.427337-|--75.2340768
+  place_bbox: "-75.25303300000002 39.4027581 -75.20384 39.455303"
 - lc_1letter_facet:
   - B - Philosophy, Psychology, Religion
   author_t:
@@ -2286,7 +2298,8 @@
   - Tibetan
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - India|20.593684|78.96288
+  - India-|-20.593684-|-78.96288
+  place_bbox: 68.162386 6.7535159 97.395555 35.5044752
 - lc_1letter_facet:
   - B - Philosophy, Psychology, Religion
   author_t:
@@ -2446,7 +2459,8 @@
   - Tibetan
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - Tibet (China)|29.646923|91.117212
+  - Tibet (China)-|-29.646923-|-91.117212
+  place_bbox: 78.3955448 26.8548157 99.116241 36.4833345
 - marc_display: "<?xml version=\"1.0\" encoding=\"UTF-8\"?><collection xmlns=\"http://www.loc.gov/MARC21/slim\"><record><leader>01127cam
     a22002895a 4500</leader><controlfield tag=\"001\">  2008308478</controlfield><controlfield
     tag=\"003\">DLC</controlfield><controlfield tag=\"005\">20090123131001.0</controlfield><controlfield
@@ -2522,9 +2536,11 @@
   - Tibetan
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - China|35.86166|104.195397
-  - Tibet|29.646923|91.117212
-  - India|20.593684|78.96288
+  - China-|-35.86166-|-104.195397
+  - Tibet-|-29.646923-|-91.117212
+  - India-|-20.593684-|-78.96288
+  - India-|-20.593684-|-78.96288
+  place_bbox: 68.162386 6.7535159 97.395555 35.5044752
 - author_vern_display: "吉田一, 1934-"
   subject_addl_t:
   - 20th century History and criticism
@@ -2631,7 +2647,8 @@
   - Japanese
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - Japan|36.204824|138.252924
+  - Japan-|-36.204824-|-138.252924
+  place_bbox: 122.9338302 24.0460446 153.9874305 45.5227719
 - author_vern_display: "林行止"
   subject_addl_t:
   - 1990-
@@ -2737,6 +2754,7 @@
   - Chinese
   timestamp: '2014-02-03T18:42:53.056Z'
   placename_coords:
-  - Economic history|41.3137481|-72.9231485
-  - World politics|38.910504|-77.03605999999999
-  - Hong Kong (China)|22.396428|114.109497
+  - Economic history-|-41.3137481-|--72.9231485
+  - World politics-|-38.910504-|--77.03605999999999
+  - Hong Kong (China)-|-22.396428-|-114.109497
+  place_bbox: 113.835078 22.1533884 114.4069561 22.561968