geoblacklight 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 567c21f3752e5b7c91f8dcb100a2c0d93333b48b
-  data.tar.gz: a5cbdded6456236c0f516dafe9e76d34042ebc68
+  metadata.gz: 16b55f272d121ee2d812f798e81bb54c81c6cd26
+  data.tar.gz: 50704f9e6eed51f0c8ef30d349a8985ba5a12b64
 SHA512:
-  metadata.gz: fa9384f5fdf9c6c19ae43789c79afb6bafb92ed2fe3425ef2694a81887f60d9e1ae833faa437c92f8052ec3065d728094884ab355da264fa74c1614809f2207d
-  data.tar.gz: bcc7b6e80ae7ee42d17ec94b5c448c488ea2c5b266f10568638b3639b0b1716e8fca9f78bd690b79c6e594ee8303cb0bc12963ff2b879f36967c8f62d239e7ce
+  metadata.gz: 292aab24138e8c5d7ac59a8daae5075cdb8d7c4d381472093ca54153deb9847b22161206665a83e46b80c4da85ae086af490e29b413f30e986032715a370e9b1
+  data.tar.gz: 562da646f3e4e8d7507de4007b896e0c52b7310b9551deb4f8e6d7fc318c898d13e7ae629b6d1cf7cb1c0bf20d2efa625dbf0e415efc11cd1815f49d0a46cfb9

data/Rakefile

@@ -1,4 +1,9 @@
-require "bundler/gem_tasks"
+begin
+  require 'bundler/gem_tasks'
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
 
 BLACKLIGHT_JETTY_VERSION = '4.10.0'
 ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v#{BLACKLIGHT_JETTY_VERSION}.zip"
@@ -16,6 +21,7 @@ desc "Load fixtures"
 task :fixtures => ['engine_cart:generate'] do
   EngineCart.within_test_app do
     system "rake geoblacklight:solr:seed RAILS_ENV=test"
+    system 'rake geoblacklight:downloads:mkdir'
   end
 end
 

data/app/assets/fonts/geoblacklight.svg

@@ -1,13 +1,13 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <!--
-2014-11-14: Created.
+2014-11-26: Created.
 -->
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
-Created by FontForge 20120731 at Fri Nov 14 11:24:15 2014
- By Eliot Jordan
-Created by Eliot Jordan with FontForge 2.0 (http://fontforge.sf.net)
+Created by FontForge 20120731 at Wed Nov 26 11:31:08 2014
+ By Jack Reed
+Created by Jack Reed with FontForge 2.0 (http://fontforge.sf.net)
 </metadata>
 <defs>
 <font id="geoblacklight" horiz-adv-x="512" >
@@ -22,9 +22,19 @@ Created by Eliot Jordan with FontForge 2.0 (http://fontforge.sf.net)
     bbox="-0.12793 -82.7842 512.128 487.36"
     underline-thickness="25.6"
     underline-position="-51.2"
-    unicode-range="U+F101-F111"
+    unicode-range="U+F101-F117"
   />
     <missing-glyph />
+    <glyph glyph-name="uniF113" unicode="&#xf113;" 
+d="M170.666 213.334c0 35.3428 28.6455 64 64 64c35.3535 0 64 -28.6572 64 -64c0 -35.3438 -28.6465 -64 -64 -64c-35.3545 0 -64 28.6562 -64 64zM277.332 213.334c0 23.5312 -19.1465 42.666 -42.666 42.666s-42.666 -19.1348 -42.666 -42.666
+c0 -23.5332 19.1445 -42.668 42.666 -42.668c23.5195 0 42.666 19.1348 42.666 42.668zM276.187 334.312c37.25 -12.7812 66.667 -42.208 79.458 -79.458l-21.875 -2.73926c-10.834 27.5947 -32.7285 49.4893 -60.3115 60.3223zM398.646 260.229l-21.335 -2.66699
+c-14.5615 46.833 -51.5811 83.8652 -98.415 98.417l2.66797 21.3438c56.5176 -16.1338 100.957 -60.583 117.082 -117.094zM170.666 -12.2715c-98.458 27.8857 -170.666 118.22 -170.666 225.605c0 129.604 105.062 234.666 234.666 234.666
+c129.604 0 234.668 -105.062 234.668 -234.666c0 -22.2188 -3.29297 -43.625 -9.0625 -64h-44.8125c7.12305 20.0518 11.207 41.5303 11.207 64c0 105.864 -86.125 192 -192 192c-105.874 0 -192 -86.1357 -192 -192c0 -83.3975 53.542 -154.354 128 -180.803v-44.8027v0z
+M185.916 119.386c-4.39648 -5.82422 -7.91602 -12.2412 -10.458 -19.209c-28.7295 15.0635 -51.1045 40.5322 -61.7715 71.6143l21.875 2.74023c9.45801 -24.0723 27.627 -43.3125 50.3545 -55.1455zM92.0215 169.092c12.4785 -40.1328 41.5205 -72.9355 79.0205 -90.6953
+c-0.0615234 -1.26074 -0.375 -2.44922 -0.375 -3.72949v-19.2178c-48.2285 19.5723 -85.5 60.333 -99.9785 110.968zM458.541 20.0098c0 -14.5918 -6.18848 -25.5605 -19.542 -25.5605h-15.3545v53.7705h12.291c16.4805 -0.000976562 22.6055 -10.376 22.6055 -28.21z
+M308.124 20.0098c0 -14.6758 -6.22949 -25.5605 -19.5205 -25.5605h-15.376v53.7705h12.3125c16.501 -0.000976562 22.584 -10.376 22.584 -28.21zM480 106.666c17.666 0 32 -14.3213 32 -32v-106.666c0 -17.6768 -14.334 -32 -32 -32h-234.666
+c-17.667 0 -32 14.3232 -32 32v106.666c0 17.6787 14.333 32 32 32h234.666zM289.813 -21.332c23.167 0 35.54 17.5605 35.54 43.1455c0 27.2061 -14.375 42.1865 -35.54 42.1865h-33.8135v-85.332h33.8135zM373.729 -21.332l25.9805 85.332h-17.7285l-17.709 -60h-0.166016
+l-17.459 60h-17.6875l25.3545 -85.332h19.415zM440.209 -21.332c23.166 0 35.541 17.5605 35.541 43.1455c0 27.2061 -14.3535 42.1865 -35.541 42.1865h-33.793v-85.332h33.793z" />
     <glyph glyph-name="uniF10D" unicode="&#xf10d;" 
 d="M0 448zM437.024 373.024c48.3516 -48.3525 74.9756 -112.641 74.9756 -181.024s-26.624 -132.672 -74.9756 -181.024c-48.3525 -48.3516 -112.641 -74.9756 -181.024 -74.9756s-132.672 26.624 -181.024 74.9756c-48.3516 48.3525 -74.9756 112.641 -74.9756 181.024
 s26.624 132.672 74.9756 181.024c48.3525 48.3516 112.641 74.9756 181.024 74.9756s132.672 -26.624 181.024 -74.9756zM414.384 33.5996c31.5361 31.5361 52.4961 70.8008 61.1357 113.536c-6.73535 -9.91992 -13.1836 -13.5996 -17.168 8.6084
@@ -35,6 +45,22 @@ c14.9756 6.54395 -24.4326 25.5039 -3.13672 22.0635c10.4648 0.576172 45.6641 12.9
 c7.95215 3.4082 15.5684 5.26367 21.376 4.73633c12.0322 -13.8887 34.2725 -16.3047 35.4404 1.66406c-29.792 14.2715 -62.6406 21.8076 -96.6406 21.8076c-48.8154 0 -95.2314 -15.5039 -133.647 -44.1924c10.3203 -4.73535 16.1914 -10.624 6.24023 -18.1436
 c-7.72852 -23.0244 -39.0889 -53.9365 -66.6084 -49.5684c-14.2881 -24.6396 -23.7119 -51.8076 -27.7275 -80.2715c23.0557 -7.63184 28.3672 -22.7207 23.4238 -27.7764c-11.7441 -10.2402 -18.96 -24.7676 -22.6885 -40.6562
 c7.50391 -45.9199 29.0879 -88.2393 62.6406 -121.792c42.3037 -42.3037 98.5596 -65.5996 158.384 -65.5996s116.08 23.2959 158.384 65.5996h-0.0322266z" />
+    <glyph glyph-name="uniF115" unicode="&#xf115;" 
+d="M510.24 200.88c9.75195 -56.752 -31.0322 -100.376 -50.7998 -148.544c-6.28809 -15.208 -11.792 -35.6318 -10.8008 -53.2236c0 0 -161.655 0 -190.456 -0.0166016h-2.19141h-2.2002c-28.7998 0.0166016 -190.472 0.0166016 -190.472 0.0166016
+c1 17.5918 -4.49609 38.0156 -10.7686 53.2236c-19.7842 48.168 -60.5518 91.7842 -50.8076 148.528c5.42383 31.5117 30.8877 53.4639 62.0479 55.9678c55.6719 4.48828 103.736 -25.3203 157.728 -34.8477c4.32812 -0.744141 10.1367 8.43945 15.3926 13.6953
+c-25.0557 18.8887 -21.6562 55.8799 7.35156 71.8721c2.00879 2.2959 1.27246 23.6006 0.136719 24.5684c-2.36816 1.96777 -20.8564 -1.58398 -23.4961 0.704102c-2.61621 2.2793 -2.08789 24.4717 -0.416016 26.6074c1.6875 2.13672 22.5273 -0.151367 23.7041 1.27246
+c1.17578 1.45605 -0.576172 21.3994 1.3916 22.9844c1.40039 1.12793 7.19238 1.23926 10.416 1.21582c3.21582 0.03125 9 -0.0878906 10.3916 -1.21582c1.95996 -1.57617 0.216797 -21.5283 1.38477 -22.9844c1.19141 -1.42383 22.0312 0.864258 23.7119 -1.27246
+c1.67969 -2.12793 2.21582 -24.3281 -0.416016 -26.584c-2.64062 -2.30371 -21.1201 1.26465 -23.5039 -0.704102c-1.14453 -0.967773 -1.87207 -22.2871 0.12793 -24.5752c29.0156 -15.9844 32.4238 -52.9922 7.38379 -71.8721
+c5.22363 -5.24805 11.04 -14.4482 15.3604 -13.6963c54.0156 9.55176 102.071 39.3359 157.752 34.8477c31.168 -2.51953 56.6152 -24.4561 62.0479 -55.9678zM232.968 75.2236c3.48047 19.8887 -4.8877 59.3447 -13.2715 77.8721
+c-17.9521 39.7842 -7.07227 37.3359 -12.04 40.4082c-20.2402 12.5762 -54.5762 23.0322 -80.6162 30.7764c-24.8564 7.37598 -49.0957 12.3594 -72.1836 3.55176c-37.8965 -14.4561 -29.1924 -62.6719 -14.7529 -92.1523
+c19.6484 -40.0801 52.7441 -97.9756 79.4404 -105.472c14.3125 -4 23.2881 1.94434 23.248 13.5039c-0.0244141 9.0957 -1.53613 17.9844 -7.25586 22.3359c0 0 -27.584 0.175781 -30.4082 2.64062c-2.83984 2.46387 -5.04785 19.0156 -4.53613 22.3516
+c0.520508 3.32031 30.0566 -2.7041 31.624 0.496094c1.56836 3.20801 -7.5918 22.04 -5.95215 25.248c1.6084 3.16016 23.9199 -0.167969 23.9199 -0.167969c2.88867 -1.38379 5.52051 -23.9365 8.32031 -26.248c2.83203 -2.32812 23.9277 0.807617 26.5605 -1.49609
+c2.64746 -2.36816 7.15918 -20.5918 5.49512 -22.8799c-1.66309 -2.33594 -25.0234 1.23145 -26.9434 -1.26465c-2.27246 -7.35938 4.80762 -19.8633 13.4873 -27.4316c6.28027 -5.52832 13.2246 -8.80762 21.8564 -8.75977
+c13.1602 0.103516 28.9922 18.1914 34.0078 46.6875zM392.448 30.2002c-14.3203 -4 -23.2881 1.94336 -23.2646 13.5039c0.0400391 9.0957 1.53613 17.9844 7.27246 22.3359c0 0 27.584 0.175781 30.4082 2.63965c2.81543 2.46387 5.04004 19.0166 4.52734 22.3604
+c-0.511719 3.31152 -30.0713 -2.71191 -31.624 0.496094c-1.55957 3.20801 7.59277 22.04 5.97656 25.248c-1.65625 3.16016 -23.9365 -0.167969 -23.9365 -0.167969c-2.8877 -1.38379 -5.51172 -23.9365 -8.33594 -26.248
+c-2.82324 -2.30371 -23.9121 0.832031 -26.5596 -1.49609c-2.63965 -2.36816 -7.13574 -20.5918 -5.48047 -22.8799c1.64844 -2.33594 25.0166 1.22363 26.9521 -1.26465c2.26465 -7.35938 -4.81543 -19.8555 -13.5039 -27.4316
+c-6.28027 -5.51953 -13.2002 -8.80762 -21.8477 -8.75977c-13.168 0.103516 -28.9844 18.1914 -33.9922 46.6875c-3.50391 19.8799 4.87207 59.3447 13.2158 77.8643c17.9766 39.7842 7.08789 37.3359 12.04 40.4082c20.248 12.5762 54.6006 23.0322 80.624 30.7764
+c24.8643 7.36719 49.0879 12.376 72.2002 3.55176c37.8799 -14.4561 29.168 -62.6719 14.7363 -92.1523c-19.6328 -40.0801 -52.7363 -97.9756 -79.4082 -105.472z" />
     <glyph glyph-name="uniF107" unicode="&#xf107;" 
 d="M24.3184 346.672v77.0098h77.0098v-77.0098h-77.0098zM0 322.354h125.646v125.646h-125.646v-125.646zM410.671 346.672v77.0098h77.0117v-77.0098h-77.0117zM386.353 322.354h125.648v125.646h-125.648v-125.646zM24.3184 -39.6807v77.0117h77.0098v-77.0117h-77.0098z
 M0 -63.999h125.646v125.648h-125.646v-125.648zM410.671 -39.6807v77.0098h77.0117v-77.0098h-77.0117zM386.353 -63.999h125.648v125.646h-125.648v-125.646zM113.487 409.495v-48.6367h285.024v48.6367h-285.024zM113.487 8.23633v-48.6367h285.024v48.6367h-285.024z
@@ -44,8 +70,16 @@ d="M323.564 341.075c0 20.1901 -7.1429 37.4281 -21.4287 51.7139s-31.5241 21.4287
 c14.2858 -14.2852 31.5238 -21.4277 51.7139 -21.4277c20.1908 0 37.429 7.14258 51.7148 21.4277c14.2858 14.2858 21.4287 31.5241 21.4287 51.7148zM396.707 341.075c0 -20.7617 -3.1429 -37.8092 -9.42871 -51.1426l-104 -221.144
 c-3.04753 -6.28581 -7.57129 -11.238 -13.5713 -14.8564c-6 -3.61914 -12.4287 -5.42871 -19.2861 -5.42871c-6.85677 0 -13.2852 1.80957 -19.2852 5.42871c-6 3.61849 -10.4287 8.57064 -13.2861 14.8564l-104.285 221.144
 c-6.28581 13.3333 -9.42871 30.3809 -9.42871 51.1426c0 40.3809 14.2858 74.8571 42.8574 103.429c28.571 28.571 63.0469 42.8564 103.428 42.8564c40.3815 0 74.8577 -14.2855 103.429 -42.8564c28.5716 -28.5716 42.8574 -63.0479 42.8574 -103.429z" />
-    <glyph glyph-name="uniF10A" unicode="&#xf10a;" 
-d="M0 448zM0 384h512v-416h-512v416zM480 0v352h-448v-352h448zM352 272c0 26.5117 21.4883 48 48 48s48 -21.4883 48 -48s-21.4883 -48 -48 -48s-48 21.4883 -48 48zM448 32h-384l96 256l128 -160l64 48z" />
+    <glyph glyph-name="uniF112" unicode="&#xf112;" 
+d="M185.916 119.387c-4.39648 -5.8252 -7.91602 -12.2422 -10.458 -19.209c-28.7295 15.0625 -51.1045 40.5303 -61.7715 71.6133l21.875 2.74023c9.45801 -24.0723 27.627 -43.3125 50.3545 -55.1445zM92.0215 169.093c12.4785 -40.1338 41.5205 -72.9365 79.0205 -90.6963
+c-0.0615234 -1.26074 -0.375 -2.4502 -0.375 -3.73047v-19.2178c-48.2285 19.5732 -85.5 60.333 -99.9785 110.969zM398.646 260.229l-21.333 -2.66504c-14.5625 46.833 -51.582 83.8643 -98.417 98.417l2.66699 21.3428c56.5205 -16.1367 100.955 -60.584 117.083 -117.095
+zM276.188 334.312c37.25 -12.7803 66.665 -42.2061 79.458 -79.458l-21.875 -2.73926c-10.835 27.5947 -32.7305 49.4893 -60.3125 60.3223zM234.667 149.334c-35.3555 0 -64 28.6562 -64 64s28.6445 64 64 64c35.3545 0 64 -28.6562 64 -64
+c-0.000976562 -35.3438 -28.6455 -64 -64 -64zM234.667 170.666c23.5215 0 42.667 19.1348 42.667 42.667c0 23.5303 -19.1455 42.667 -42.667 42.667c-23.5225 0 -42.667 -19.1357 -42.667 -42.667c0 -23.5322 19.1465 -42.667 42.667 -42.667zM403.875 46.9805
+c16.3535 0 25.0215 -7.80273 25.0215 -26.959c0 -14.377 -7.14648 -24.4492 -21.6465 -24.4492h-17v51.4082h13.625zM512 74.666v-106.666c0 -17.6768 -14.334 -32 -32 -32h-234.667c-17.666 0 -32 14.3232 -32 32v106.666c0 17.6787 14.334 32 32 32h234.667
+c17.666 0 32 -14.3213 32 -32zM358.146 11.9062h-18.4609c-1.45703 -10.9062 -7.9375 -18.2812 -19.7051 -18.2812c-15.7295 0 -23.5645 11.8438 -23.5645 27.3018c0 15.9287 7.5625 27.9883 23.5645 27.9883c10.123 0 17.7705 -6.82129 18.9775 -14.2705h18.46
+c-2.27148 18.9912 -18.5439 29.3555 -37.4395 29.3555c-26.3965 0 -42.6455 -18.4688 -42.6455 -43.0732c0 -24.5293 16.6475 -42.2598 42.6455 -42.2598c22.4385 0 36.418 13.7402 38.168 33.2393zM448 21.7402c0 25.8525 -15.791 40.3105 -39.3965 40.3105h-37.4375
+v-81.5615h37.4375c25.0215 0.000976562 39.3965 16.167 39.3965 41.251zM42.667 213.333c0 -83.3965 53.541 -154.354 128 -180.802v-44.8027c-98.459 27.8848 -170.667 118.219 -170.667 225.604c0 129.605 105.062 234.667 234.667 234.667
+c129.604 0 234.667 -105.062 234.668 -234.667c0 -22.2188 -3.29199 -43.626 -9.0625 -64h-44.8125c7.12402 20.0527 11.207 41.5312 11.207 64c0 105.865 -86.125 192 -192 192s-192 -86.1348 -192 -192z" />
     <glyph glyph-name="uniF111" unicode="&#xf111;" 
 d="M236.241 -53.5957c-39.2422 19.7959 -84 51.4355 -114.856 81.1934c-67.5645 65.1572 -106.971 141.55 -119.299 231.273c-2.74121 19.9512 -1.61914 107.34 1.52637 118.825l1.40332 5.12305l15.5615 -5.44434c30.9717 -10.8359 71.543 -14.4951 101.728 -9.1748
 c43.5264 7.67285 86.2246 31.6787 117.77 66.2139c6.83691 7.4834 13.2295 13.6074 14.207 13.6074s4.1875 -2.86133 7.13184 -6.3584c10.2627 -12.1855 32.1816 -31.8555 45.915 -41.2041c39.8291 -27.1123 85.4346 -38.8242 131.687 -33.8174
@@ -61,6 +95,14 @@ c3.10742 0 9.52832 11.0459 17.7236 26.1514c17.0039 31.3496 27.6318 59.1309 36.16
 M160.501 -0.358398c28.1416 -21.1934 53.5537 -37.5586 77.5508 -49.9316c7.70117 -3.97168 14.251 -7.27832 15.9443 -7.27832c2.50488 0 15.248 6.43652 30.0918 14.5684c28.1689 15.4277 61.5088 39.1455 92.6777 65.9229l8.38379 7.2041l-131.033 94.418
 l-64.5205 -46.4805c-34.7969 -25.0664 -64.3545 -45.7471 -64.2881 -47.8936c0.105469 -3.06934 18.708 -18.1143 35.1934 -30.5293zM161.964 1.58398c-14.8516 11.1846 -31.0029 24.9629 -33.8848 28.3955c5.11133 4.125 31.376 23.375 62.9375 46.1113l63.0996 45.457
 l127.106 -91.5889l-6.04199 -5.19141c-31.0557 -26.6807 -64.2979 -50.3193 -92.2607 -65.6357c-14.2607 -7.81152 -26.8184 -13.8145 -28.8838 -14.2617c-1.31836 0.357422 -7.87695 3.39355 -14.8701 7.00098c-23.8408 12.2939 -49.1416 28.5801 -77.2021 49.7129z" />
+    <glyph glyph-name="uniF116" unicode="&#xf116;" 
+d="M479.392 117.504h31.96v-77.6475h-152.151v77.6475h27.3359l-46.6963 77.624l-18.1035 -30.1123h17.3594v-77.6318h-166.823v77.6318h17.3594l-18.1035 30.1123l-46.6963 -77.624h27.3359v-77.6475h-152.168v77.6475h31.9756l89.6406 148.992h-24.6885v77.6475h149.2
+v-77.6475h-24.6875l34.2314 -56.9199l34.2559 56.9199h-24.6875v77.6475h149.2v-77.6475h-24.6885zM404.472 334.192h-129.279v-57.752h32.3438l-51.8643 -86.168l-51.8398 86.168h32.3359v57.752h-129.288v-57.752h32.3359l-101.624 -168.904h-27.6396v-57.7363h132.264
+v57.7363h-34.9922l64.2959 106.88l35.7129 -59.3682h-25.0244v-57.7275h146.928v57.7275h-25.0078l35.7119 59.3682l64.2881 -106.88h-34.9844v-57.7363h132.265v57.7363h-27.6484l-101.616 168.904h32.3281v57.752zM394.512 324.24v-37.8398h-39.9834l113.6 -188.816
+h23.3203v-37.832h-112.36v37.832h42.6396l-81.8955 136.144l-53.3125 -88.624h32.6562v-37.8154h-127.016v37.8154h32.6719l-53.3125 88.624l-81.9033 -136.144h42.6396v-37.832h-112.352v37.832h23.3115l113.592 188.816h-39.9756v37.8398h109.376v-37.8398h-39.9922
+l69.4482 -115.44l69.4639 115.44h-39.9922v37.8398h109.376z" />
+    <glyph glyph-name="uniF104" unicode="&#xf104;" 
+d="M107.952 448h-107.952v-512h107.952v512zM283.759 448h-107.951v-348.53h107.951v348.53zM459.566 448h-107.952v-512h107.952v512z" />
     <glyph glyph-name="uniF106" unicode="&#xf106;" 
 d="M88.1523 256.52h41.7598l6.42383 -225.407h-53.7998l5.61621 225.407v0zM48.7842 23.0078h414.432v-29.0234h24.832v-28.9766h24.0801v-29.0078h-512.256v28.9922h24.0801v28.9922h24.832v29.0234v0zM484.824 319.456v0v-17.7285h-457.664v17.7285l228.824 108.424z
 M71.2725 293.632h369.447v-29h-369.447v29v0zM381.272 256.52h41.7754l6.42383 -225.407h-53.8154zM283.56 256.52h41.7686l6.42383 -225.407h-53.8076l5.61523 225.407v0zM185.856 256.52h41.7676l6.42383 -225.424h-53.8076z" />
@@ -69,6 +111,9 @@ d="M0 448zM0 352l160 64v-384l-160 -64v384zM352 352v-384l-160 53.3281v384zM512 41
     <glyph glyph-name="uniF103" unicode="&#xf103;" 
 d="M18.7842 429.216h216.285h216.285v-162.951c0 -215.741 -136.625 -302.743 -216.285 -349.049c-79.6611 46.3057 -216.285 133.308 -216.285 349.049v162.951zM120.218 383.598v-45.082h14.9609v-215.748h-14.9609v-45.082h77.2832v45.082h-14.9609v84.1934h105.057
 v-84.1934h-14.959v-45.082h77.2822v45.082h-14.96v215.748h14.96v45.082h-77.2822v-45.082h14.96v-84.1934h-105.057v84.1934h14.96v45.082h-77.2832z" />
+    <glyph glyph-name="uniF117" unicode="&#xf117;" 
+d="M47.7275 91.7842c-1.33594 17.9199 0 43.3682 0 55.6875l26.1602 300.528h98.3604l-27.376 -302.848c-5.87207 -66.168 20.168 -112.336 85.3359 -112.336c66.5518 0 102.832 47.1279 108.48 105.664l27.7031 309.52h98.4805l-27.5039 -305.6
+c-10.168 -118.152 -88.5039 -206.4 -214.376 -206.4c-98.5205 0 -162.128 63.8076 -175.265 155.784z" />
     <glyph glyph-name="uniF101" unicode="&#xf101;" 
 d="M7.83594 46.3564c0.90625 2.98145 3.26367 7.5498 5.60938 10.5586c4.52148 5.7959 11.9014 12.0781 21.9326 18.6719c15.4697 10.168 29.9355 16.6025 48.3701 21.5117c26.7402 7.12305 55.084 7.71973 79.5498 7.71973l1.30664 -0.00195312
 c32.5635 -0.0292969 102.191 -4.13379 153.03 -7.13184c26.6807 -1.57031 47.7539 -2.81445 55.0947 -2.96484l1.31348 -0.03125c2.14844 -0.0556641 5.73926 -0.149414 10.0479 -0.149414c31.0244 0 41.6182 4.85645 46.4004 7.60254
@@ -96,22 +141,13 @@ c0 -0.00195312 5.03711 11.5781 0.0878906 14.3076z" />
     <glyph glyph-name="uniF108" unicode="&#xf108;" 
 d="M410.671 346.672v77.0098h77.0117v-77.0098h-77.0117zM386.353 322.354h125.648v125.646h-125.648v-125.646zM24.3184 -39.6807v77.0117h77.0098v-77.0117h-77.0098zM0 -63.999h125.646v125.648h-125.646v-125.648zM96.291 66.6865l34.3926 -34.3926l285.022 285.022
 l-34.3926 34.3926z" />
-    <glyph glyph-name="uniF104" unicode="&#xf104;" 
-d="M107.952 448h-107.952v-512h107.952v512zM283.759 448h-107.951v-348.53h107.951v348.53zM459.566 448h-107.952v-512h107.952v512z" />
+    <glyph glyph-name="uniF10A" unicode="&#xf10a;" 
+d="M0 448zM0 384h512v-416h-512v416zM480 0v352h-448v-352h448zM352 272c0 26.5117 21.4883 48 48 48s48 -21.4883 48 -48s-21.4883 -48 -48 -48s-48 21.4883 -48 48zM448 32h-384l96 256l128 -160l64 48z" />
     <glyph glyph-name="uniF102" unicode="&#xf102;" 
-d="M92.2803 367.832l71.1113 70.6562h187.185l69.1436 -70.7207l-0.015625 -99.8477h-123.456v46.6396h-75.0078v-67.6875h135.527l62.9521 -60.7998v-183.864l-61.7998 -61.7119h-203.464l-62.04 62.5283v99.3438h133.392v-41.1602h75.9121v63.1123l-147.655 -0.0166016
-l-61.7842 61.7998v181.729zM100.272 364.168v-174.848l56.9512 -56.9766s137.712 0 152.48 0.0078125v-79.5596c-12.9043 0 -79.4404 0 -92.3604 -0.0244141v41.168h-116.943v-87.6396l57.1279 -57.7842h196.783l56.9521 56.96v177.08l-58.2637 55.9121h-140.24
-c0.0078125 12.6318 0.0078125 71.4883 0 84.1279h91.4727v-46.6396h107.031v88.168l-64.3115 65.9355h-180.488zM169.832 421.232h173.776l59.4561 -61.1602l-0.0166016 -76.4805h-90.5518v46.6406h-107.937l0.00878906 -100.601h144.976l53.5205 -51l-0.0166016 -170.296
-l-52.0635 -52.1758h-190.088l-52.2324 53.0234v75.9199h100.479v-41.1514h108.824l0.0166016 96.0322h-157.312l-52.1201 52.1357v167.952zM287.544 162.936c0 -0.03125 -0.0634766 -0.167969 -0.328125 -0.463867c0.12793 0.152344 0.255859 0.320312 0.328125 0.463867z
-M92.2803 367.832l71.1201 70.6562h187.176l69.1436 -70.7207l-0.015625 -99.8477h-123.464v46.6396h-75v-67.6875h135.527l62.9521 -60.7998v-183.864l-61.792 -61.7119h-203.472l-62.04 62.5283v99.3438h133.392v-41.1602h75.9199v63.1123l-147.663 -0.0166016
-l-61.7842 61.7998v181.729zM100.264 364.168v-174.848l56.9521 -56.9766s137.72 0 152.488 0.0078125v-79.5596c-12.9121 0 -79.4404 0 -92.3604 -0.0244141v41.168h-116.943v-87.6396l57.1279 -57.7842h196.792l56.9434 56.96v177.08l-58.2559 55.9121h-140.24
-c0.00878906 12.6318 0.00878906 71.4883 0 84.1279h91.4805v-46.6396h107.024v88.168l-64.3125 65.9355h-180.496zM169.832 421.232h173.768l59.4561 -61.1602l-0.015625 -76.4805h-90.5361v46.6406h-107.944l0.00878906 -100.601h144.976l53.5117 -51l-0.015625 -170.296
-l-52.0557 -52.1758h-190.088l-52.2402 53.0234v75.9199h100.487v-41.1514h108.824l0.0166016 96.0322h-157.312l-52.1279 52.1357v167.952zM287.552 162.936c0 -0.03125 -0.0634766 -0.167969 -0.34375 -0.463867c0.143555 0.152344 0.272461 0.320312 0.34375 0.463867z
-M92.2803 367.832l71.1113 70.6562h187.185l69.1436 -70.7207l-0.015625 -99.8477h-123.456v46.6396h-75.0078v-67.6875h135.527l62.9521 -60.7998v-183.864l-61.7998 -61.7119h-203.464l-62.04 62.5283v99.3438h133.392v-41.1602h75.9121v63.1123l-147.655 -0.0166016
-l-61.7842 61.7998v181.729zM100.272 364.168v-174.848l56.9512 -56.9766s137.712 0 152.48 0.0078125v-79.5596c-12.9043 0 -79.4404 0 -92.3604 -0.0244141v41.168h-116.943v-87.6396l57.1279 -57.7842h196.783l56.9521 56.96v177.08l-58.2637 55.9121h-140.24
+d="M92.2803 367.832l71.1113 70.6562h187.185l69.1436 -70.7207l-0.015625 -99.8477h-123.456v46.6396h-75.0078v-67.6875h135.527l62.9521 -60.7998v-183.872l-61.7998 -61.7041h-203.464l-62.04 62.5283v99.3438h133.392v-41.168h75.9121v63.1201l-147.655 -0.0166016
+l-61.7842 61.8086v181.72zM100.272 364.168v-174.848l56.9512 -56.9766s137.712 0 152.48 0.0078125v-79.5518c-12.9043 0 -79.4404 0 -92.3604 -0.0322266v41.168h-116.943v-87.6396l57.1279 -57.7842h196.783l56.9521 56.9521v177.08l-58.2637 55.9199h-140.24
 c0.0078125 12.6318 0.0078125 71.4883 0 84.1279h91.4727v-46.6396h107.031v88.168l-64.3115 65.9355h-180.488zM169.832 421.232h173.776l59.4561 -61.1602l-0.0166016 -76.4805h-90.5518v46.6406h-107.937l0.00878906 -100.601h144.976l53.5205 -51l-0.0166016 -170.296
-l-52.0635 -52.1758h-190.088l-52.2324 53.0234v75.9199h100.479v-41.1514h108.824l0.0166016 96.0322h-157.312l-52.1201 52.1357v167.952zM287.544 162.936c0 -0.03125 -0.0634766 -0.167969 -0.328125 -0.463867c0.12793 0.152344 0.255859 0.320312 0.328125 0.463867z
-" />
+l-52.0635 -52.1758h-190.088l-52.2324 53.0234v75.9287h100.479v-41.1602h108.824l0.0166016 96.0322h-157.312l-52.1201 52.1357v167.952z" />
     <glyph glyph-name="uniF105" unicode="&#xf105;" 
 d="M73.3057 366.146v-116.948h-73.3057v198.802h458.019v-198.802h-72.0498v116.314h-97.7275v-357.704h78.6797v-71.8086h-276.963v71.8086h78.6846v358.338h-95.3369z" />
   </font>

data/app/assets/javascripts/geoblacklight/modules/geosearch.js

@@ -22,38 +22,71 @@
   L.Control.GeoSearch = L.Control.extend({
 
     options: {
-      button: false
+      dynamic: true,
+      baseUrl: '',
+      searcher: function() {
+        History.pushState(null, document.title, this.getSearchUrl());
+      },
+      delay: 800,
+      staticButton: '<a class="btn btn-primary">Redo Search Here <span class="glyphicon glyphicon-repeat"></span></a>',
+      dynamicButton: '<label><input type="checkbox" checked> Search When I Move the Map</label>'
     },
 
-    initialize: function(searcher, options) {
+    initialize: function(options) {
       L.Util.setOptions(this, options);
-      this._searcher = L.Util.bind(searcher, this);
+      this.$staticButton = $(this.options.staticButton);
+      this.$dynamicButton = $(this.options.dynamicButton);
     },
 
     onAdd: function(map) {
-      var container = L.DomUtil.create('div', 'leaflet-bar leaflet-control');
+      var $container = $('<div class="leaflet-control search-control"></div>'),
+          staticSearcher, dynamicSearcher;
       this._map = map;
 
-      if (this.options.button === true) {
-        this.link = L.DomUtil.create('a', 'leaflet-bar-part search-control',
-          container);
-        this.link.href = '';
-        this.icon = L.DomUtil.create('i', 'glyphicon glyphicon-search',
-          this.link);
+      staticSearcher = L.Util.bind(function() {
+        this.$staticButton.hide();
+        this.$dynamicButton.show();
+        this.options.searcher.apply(this);
+      }, this);
+
+      dynamicSearcher = GeoBlacklight.debounce(function() {
+        if (this.options.dynamic) {
+          this.options.searcher.apply(this);
+        }
+      }, this.options.delay);
+
+      this.$staticButton.on('click', staticSearcher);
+
+      $container.on("change", "input[type=checkbox]",
+        L.Util.bind(function() {
+          this.options.dynamic = !this.options.dynamic;
+        }, this)
+      );
+
+      if (this.options.dynamic) {
+        this.$staticButton.hide();
+      } else {
+        this.$dynamicButton.hide();
       }
 
-      map.on("moveend", this._search, this);
+      map.on("moveend", dynamicSearcher, this);
+      map.on("movestart", function() {
+        if (!this.options.dynamic) {
+          this.$dynamicButton.hide();
+          this.$staticButton.show();
+        }
+      }, this);
 
-      return container;
+      $container.append(this.$staticButton, this.$dynamicButton);
+      return $container.get(0);
     },
 
-    _search: function() {
+    getSearchUrl: function() {
       var params = this.filterParams(['bbox', 'page']),
           bounds = L.boundsToBbox(this._map.getBounds());
 
       params.push('bbox=' + encodeURIComponent(bounds.join(' ')));
-
-      this._searcher(params.join('&'));
+      return this.options.baseUrl + '?' + params.join('&');
     },
 
     filterParams: function(filterList) {
@@ -74,4 +107,8 @@
 
   });
 
+  L.control.geosearch = function(options) {
+    return new L.Control.GeoSearch(options);
+  };
+
 }(this);

data/app/assets/javascripts/geoblacklight/modules/home.js

@@ -1,11 +1,14 @@
 Blacklight.onLoad(function () {
   $('[data-map="home"]').each(function(i, element) {
     var geoblacklight = new GeoBlacklight(this),
-        data = $(this).data(),
-        search;
-    search = new L.Control.GeoSearch(function(querystring) {
-      this.link.href = data.catalogPath + '?' + querystring;
-    }, { button: true });
-    geoblacklight.map.addControl(search);
+        data = $(this).data();
+    geoblacklight.map.addControl(L.control.geosearch({
+      baseUrl: data.catalogPath,
+      dynamic: false,
+      searcher: function() {
+        window.location.href = this.getSearchUrl();
+      },
+      staticButton: '<a class="btn btn-primary">Search Here</a>'
+    }));
   });
 });

data/app/assets/javascripts/geoblacklight/modules/results.js

@@ -1,13 +1,17 @@
 Blacklight.onLoad(function() {
+  var historySupported = !!(window.history && window.history.pushState);
 
-  History.Adapter.bind(window, 'statechange', function() {
-    var state = History.getState();
-    updatePage(state.url);
-  });
+  if (historySupported) {
+    History.Adapter.bind(window, 'statechange', function() {
+      var state = History.getState();
+      updatePage(state.url);
+    });
+  }
 
   $('[data-map="index"]').each(function() {
     var data = $(this).data(),
-        dynamicSearcher, geoblacklight, search, bbox;
+        opts = { baseUrl: data.catalogPath },
+        geoblacklight, bbox;
 
     if (typeof data.mapBbox === "string") {
       bbox = L.bboxToBounds(data.mapBbox);
@@ -21,12 +25,17 @@ Blacklight.onLoad(function() {
       });
     }
 
-    dynamicSearcher = GeoBlacklight.debounce(function(querystring) {
-      History.pushState(null, null, data.catalogPath + '?' + querystring);
-    }, 800);
+    if (!historySupported) {
+      $.extend(opts, {
+        dynamic: false,
+        searcher: function() {
+          window.location.href = this.getSearchUrl();
+        }
+      });
+    }
+
     geoblacklight = new GeoBlacklight(this, { bbox: bbox }).setHoverListeners();
-    search = new L.Control.GeoSearch(dynamicSearcher);
-    geoblacklight.map.addControl(search);
+    geoblacklight.map.addControl(L.control.geosearch(opts));
   });
 
   function updatePage(url) {

data/app/assets/stylesheets/geoblacklight/_geoblacklight.css.scss

@@ -20,3 +20,4 @@
 @import 'modules/item';
 @import 'modules/layer_opacity';
 @import 'modules/results';
+@import 'modules/geosearch';

data/app/assets/stylesheets/geoblacklight/modules/geosearch.css.scss

@@ -0,0 +1,29 @@
+.search-control {
+  background-color: #FFF;
+  border-radius: 4px;
+  box-shadow: 0 1px 5px rgba(0,0,0,0.65);
+}
+
+.search-control a {
+  color: #FFF
+}
+
+.search-control label {
+  margin: 6px 12px;
+  font-size: 14px;
+  display: block;
+  padding-left: 15px;
+  text-indent: -15px;
+  font-weight: normal;
+  cursor: pointer;
+}
+
+.search-control input[type="checkbox"] {
+  width: 13px;
+  height: 13px;
+  padding: 0;
+  margin: 0;
+  vertical-align: middle;
+  position: relative;
+  top: -1px;
+}

data/app/assets/stylesheets/geoblacklight/modules/home.css.scss

@@ -13,7 +13,7 @@
 .category-block {
   @extend .col-md-6;
   @extend .text-center;
-  min-height: 200px;
+  min-height: 240px;
   
   .category-icon {
     font-size: 6em;

data/app/assets/stylesheets/geoblacklight/modules/icons.css.scss

@@ -7,9 +7,9 @@
   font-family: "geoblacklight";
   src: font-url("geoblacklight.eot");
   src: font-url("geoblacklight.eot?#iefix") format("embedded-opentype"),
-       font-url("geoblacklight.woff") format("woff"),
-       font-url("geoblacklight.ttf") format("truetype"),
-       font-url("geoblacklight.svg#geoblacklight") format("svg");
+  font-url("geoblacklight.woff") format("woff"),
+  font-url("geoblacklight.ttf") format("truetype"),
+  font-url("geoblacklight.svg#geoblacklight") format("svg");
   font-weight: normal;
   font-style: normal;
 }
@@ -25,10 +25,14 @@
 
 [data-icon]:before,
 .geoblacklight-berkeley:before,
+.geoblacklight-cd-rom:before,
+.geoblacklight-columbia:before,
+.geoblacklight-dvd-rom:before,
 .geoblacklight-harvard:before,
 .geoblacklight-image:before,
 .geoblacklight-line:before,
 .geoblacklight-massgis:before,
+.geoblacklight-minnesota:before,
 .geoblacklight-mit:before,
 .geoblacklight-paper-map:before,
 .geoblacklight-point:before,
@@ -36,7 +40,8 @@
 .geoblacklight-princeton:before,
 .geoblacklight-raster:before,
 .geoblacklight-stanford:before,
-.geoblacklight-tufts:before {
+.geoblacklight-tufts:before,
+.geoblacklight-ucla:before {
   display: inline-block;
   font-family: "geoblacklight";
   font-style: normal;
@@ -52,10 +57,14 @@
 }
 
 .geoblacklight-berkeley:before { content: "\f101"; }
+.geoblacklight-cd-rom:before { content: "\f112"; }
+.geoblacklight-columbia:before { content: "\f115"; }
+.geoblacklight-dvd-rom:before { content: "\f113"; }
 .geoblacklight-harvard:before { content: "\f103"; }
 .geoblacklight-image:before { content: "\f10a"; }
 .geoblacklight-line:before { content: "\f108"; }
 .geoblacklight-massgis:before { content: "\f106"; }
+.geoblacklight-minnesota:before { content: "\f116"; }
 .geoblacklight-mit:before { content: "\f104"; }
 .geoblacklight-paper-map:before { content: "\f110"; }
 .geoblacklight-point:before { content: "\f109"; }
@@ -64,12 +73,17 @@
 .geoblacklight-raster:before { content: "\f10d"; }
 .geoblacklight-stanford:before { content: "\f102"; }
 .geoblacklight-tufts:before { content: "\f105"; }
+.geoblacklight-ucla:before { content: "\f117"; }
 
 $font-geoblacklight-berkeley: "\f101";
+$font-geoblacklight-cd-rom: "\f112";
+$font-geoblacklight-columbia: "\f115";
+$font-geoblacklight-dvd-rom: "\f113";
 $font-geoblacklight-harvard: "\f103";
 $font-geoblacklight-image: "\f10a";
 $font-geoblacklight-line: "\f108";
 $font-geoblacklight-massgis: "\f106";
+$font-geoblacklight-minnesota: "\f116";
 $font-geoblacklight-mit: "\f104";
 $font-geoblacklight-paper-map: "\f110";
 $font-geoblacklight-point: "\f109";
@@ -78,3 +92,4 @@ $font-geoblacklight-princeton: "\f111";
 $font-geoblacklight-raster: "\f10d";
 $font-geoblacklight-stanford: "\f102";
 $font-geoblacklight-tufts: "\f105";
+$font-geoblacklight-ucla: "\f117";

data/app/controllers/download_controller.rb

@@ -27,6 +27,10 @@ class DownloadController < ApplicationController
       response = ShapefileDownload.new(@document).get
     when 'kmz'
       response = KmzDownload.new(@document).get
+    when 'geojson'
+      response = GeojsonDownload.new(@document).get
+    when 'geotiff'
+      response = GeotiffDownload.new(@document).get
     end
     response
   end

data/app/helpers/geoblacklight_helper.rb

@@ -69,4 +69,12 @@ module GeoblacklightHelper
       ""
     end
   end
+
+  ##
+  # Renders an unique array of search links based off of terms
+  # passed in using the facet parameter
+  #
+  def render_facet_links(facet, items)
+    items.uniq.map { |item| link_to item, catalog_index_path(f: { "#{facet}" => [item] }) }.join(', ').html_safe
+  end
 end

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

@@ -1,3 +1,3 @@
 <% display_facet.items.each do |item| %>
-  <%= link_to item.value, catalog_index_path({f: {"#{facet_field.field}" => [item.value]}}), class: 'home-facet-link' %><%= "," unless item == display_facet.items.last %>
+  <%= link_to item.value, catalog_index_path({f: {"#{facet_field.field}" => [item.value]}}), class: 'home-facet-link' %><%= "," %>
 <% end %>

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

@@ -1 +1,2 @@
-<%= yield %>
+<%= yield %>
+<%= link_to t('blacklight.search.facets.more'), catalog_facet_path(display_facet.name), class: 'more_facets_link' %>

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

@@ -6,38 +6,42 @@
   </div>
 </div>
 
-<div class='row'>
-  <div class='col-md-6'>
-    <%= content_tag :h4, t('geoblacklight.home.category_heading'), class: 'text-center' %>
-    <div class='row'>
+<div class='container'>
+  <div class='row'>
+    <div class='col-md-6'>
+      <%= content_tag :h4, t('geoblacklight.home.category_heading'), class: 'text-center' %>
       <div class='category-block'>
         <div class='category-icon'>
           <span class='glyphicon glyphicon-home'></span>
         </div>
+        <h3>Institution</h3>
         <%= render_facet_tags [:dct_provenance_s] %>
       </div>
       <div class='category-block'>
         <div class='category-icon'>
           <span class='glyphicon glyphicon-download'></span>
         </div>
+        <h3>Data type</h3>
         <%= render_facet_tags [:layer_geom_type_s] %>
       </div>
       <div class='category-block'>
         <div class='category-icon'>
           <span class='glyphicon glyphicon-globe'></span>
         </div>
+        <h3>Placename</h3>
         <%= render_facet_tags [:dct_spatial_sm] %>
       </div>
       <div class='category-block'>
         <div class='category-icon'>
           <span class='glyphicon glyphicon-tags'></span>
         </div>
+        <h3>Subject</h3>
         <%= render_facet_tags [:dc_subject_sm] %>
       </div>
     </div>
-  </div>
-  <div class='col-md-6 text-center'>
-    <%= content_tag :h4, t('geoblacklight.home.map_heading') %>
-    <%= content_tag :div, '', id: 'map', data: { map: 'home', 'catalog-path'=> catalog_index_path , 'map-bbox' => params[:bbox]} %>
+    <div class='col-md-6 text-center'>
+      <%= content_tag :h4, t('geoblacklight.home.map_heading') %>
+      <%= content_tag :div, '', id: 'map', data: { map: 'home', 'catalog-path'=> catalog_index_path , 'map-bbox' => params[:bbox]} %>
+    </div>
   </div>
 </div>

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

@@ -4,7 +4,7 @@
 
 <div class='row'>
   <div class="col-md-8">
-    <%= content_tag :div, id: 'map', data: { map: 'item', 'catalog-path'=> catalog_index_path , 'map-bbox' => document[:solr_bbox], 'layer-id' => document[:layer_id_s], 'wms-url' => document[:solr_wms_url], available: document_available? } do %>
+    <%= content_tag :div, id: 'map', data: { map: 'item', 'catalog-path'=> catalog_index_path , 'map-bbox' => document[:solr_bbox], 'layer-id' => document[:layer_id_s], 'wms-url' => document.references.wms.endpoint, available: document_available? } do %>
     <% end %>
   </div>
   <div id='table-container' class='col-md-4'><div id='attribute-table' ></div></div>

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

@@ -19,9 +19,9 @@
       </a>    
     </ul>
     <% if document_downloadable? %>
-      <div class='btn-group'>
+      <div class='btn-group' itemprop='distribution' itemscope='itemscope' itemtype='http://schema.org/DataDownload'>
         <% unless document.direct_download.blank? %>
-          <%= link_to("Download #{@document[:dc_format_s]}", document.direct_download[:download], class: 'btn btn-default') %>
+          <%= link_to("Download #{@document[:dc_format_s]}", document.direct_download[:download], class: 'btn btn-default', 'contentUrl' => document.direct_download[:download]) %>
         <% else %>
           <%= link_to("Download #{document.download_types.first[0].capitalize}", '', data: { download_path: "#{download_path(document[:layer_slug_s], type: document.download_types.first[0])}"}, class: 'btn btn-default') %>
         <% end %>
@@ -33,7 +33,7 @@
           <% unless document.direct_download.blank? %>
             <li role="presentation" class="dropdown-header">Original</li>
             <li>
-              <%= link_to("Download #{@document[:dc_format_s]}", document.direct_download[:download]) %>
+              <%= link_to("Download #{@document[:dc_format_s]}", document.direct_download[:download], 'contentUrl' => document.direct_download[:download]) %>
             </li>
           <% end %>
           <li role="presentation" class="dropdown-header">Projected</li>

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

@@ -24,11 +24,11 @@
     <% end %>
     <% unless document['dct_spatial_sm'].nil? %>
       <dt>Places</dt>
-      <dd itemprop="spatial"><%= document['dct_spatial_sm'].sort.uniq.join(', ') %>&nbsp;</dd>
+      <dd itemprop="spatial"><%= render_facet_links('dct_spatial_sm', document['dct_spatial_sm']) %>&nbsp;</dd>
     <% end %>
     <% unless document['dc_subject_sm'].nil? %>
       <dt>Subjects</dt>
-      <dd itemprop="keywords"><%= document['dc_subject_sm'].sort.uniq.join(', ') %>&nbsp;</dd>
+      <dd itemprop="keywords"><%= render_facet_links('dc_subject_sm', document['dc_subject_sm']) %>&nbsp;</dd>
     <% end %>
     <% unless document['dct_temporal_sm'].nil? %>
       <dt>Years</dt>

data/config/locales/geoblacklight.en.yml

@@ -6,7 +6,7 @@ en:
     home:
       headline: 'Explore and discover...'
       search_heading: 'Find the maps and data you need'
-      category_heading: 'Find by category'
+      category_heading: 'Find by...'
       map_heading: 'Find by location'
     tools:
       login_to_view: 'Login to view and download'

data/lib/geoblacklight.rb

@@ -4,12 +4,15 @@ module Geoblacklight
   require 'geoblacklight/config'
   require 'geoblacklight/constants'
   require 'geoblacklight/controller_override'
+  require 'geoblacklight/exceptions'
   require 'geoblacklight/view_helper_override'
   require 'geoblacklight/solr_document'
   require 'geoblacklight/wms_layer'
   require 'geoblacklight/download'
-  require 'geoblacklight/download/shapefile_download'
+  require 'geoblacklight/download/geojson_download'
+  require 'geoblacklight/download/geotiff_download'
   require 'geoblacklight/download/kmz_download'
+  require 'geoblacklight/download/shapefile_download'
   require 'geoblacklight/reference'
   require 'geoblacklight/references'
   def self.inject!
@@ -22,4 +25,8 @@ module Geoblacklight
     SavedSearchesController.send(:helper, Geoblacklight::ViewHelperOverride) unless
       SavedSearchesController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
   end
+
+  def self.logger
+    ::Rails.logger
+  end
 end

data/lib/geoblacklight/download.rb

@@ -34,30 +34,33 @@ class Download
       if download.headers['content-type'] == @options[:content_type]
         file.write download.body
       else
-        fail 'Wrong type of download'
+        fail Geoblacklight::Exceptions::WrongDownloadFormat
       end
     end
     File.rename("#{file_path}.tmp", file_path)
     file_name
-  rescue
+  rescue Geoblacklight::Exceptions::WrongDownloadFormat => error
+    Geoblacklight.logger.error "#{error} expected #{@options[:content_type]} received #{download.headers['content-type']}"
     File.delete("#{file_path}.tmp")
     nil
   end
 
   def initiate_download
-    conn = Faraday.new(url: @document[@options[:service_type]])
+    url = @document.references.send(@options[:service_type]).endpoint
+    url += '/reflect' if @options[:reflect]
+    conn = Faraday.new(url: url)
     conn.get do |request|
       request.params = @options[:request_params]
       request.options = {
-        timeout: 10,
-        open_timeout: 10
+        timeout: 16,
+        open_timeout: 16
       }
     end
   rescue Faraday::Error::ConnectionFailed => error
-    puts error
+    Geoblacklight.logger.error error
     nil
   rescue Faraday::Error::TimeoutError => error
-    puts error
+    Geoblacklight.logger.error error
     nil
   end
 end

data/lib/geoblacklight/download/geojson_download.rb

@@ -0,0 +1,20 @@
+class GeojsonDownload < Download
+  GEOJSON_DOWNLOAD_PARAMS = {
+    service: 'wfs',
+    version: '2.0.0',
+    request: 'GetFeature',
+    srsName: 'EPSG:4326',
+    outputformat: 'application/json'
+  }
+
+  def initialize(document)
+    request_params = GEOJSON_DOWNLOAD_PARAMS.merge(typeName: document[:layer_id_s])
+    super(document, {
+      type: 'geojson',
+      extension: 'json',
+      request_params: request_params,
+      content_type: 'application/json',
+      service_type: 'wfs'
+    })
+  end
+end

data/lib/geoblacklight/download/geotiff_download.rb

@@ -0,0 +1,18 @@
+class GeotiffDownload < Download
+  GEOTIFF_DOWNLOAD_PARAMS = {
+    format: 'image/geotiff',
+    width: 4096
+  }
+
+  def initialize(document)
+    request_params = GEOTIFF_DOWNLOAD_PARAMS.merge(layers: document[:layer_id_s])
+    super(document, {
+      type: 'geotiff',
+      extension: 'tif',
+      request_params: request_params,
+      content_type: 'image/geotiff',
+      service_type: 'wms',
+      reflect: true
+    })
+  end
+end

data/lib/geoblacklight/download/kmz_download.rb

@@ -8,7 +8,7 @@ class KmzDownload < Download
       extension: 'kmz',
       request_params: request_params,
       content_type: 'application/vnd.google-earth.kmz',
-      service_type: :solr_wms_url
+      service_type: 'wms'
     })
   end
 end

data/lib/geoblacklight/download/shapefile_download.rb

@@ -8,7 +8,7 @@ class ShapefileDownload < Download
       extension: 'zip',
       request_params: request_params,
       content_type: 'application/zip',
-      service_type: :solr_wfs_url
+      service_type: 'wfs'
     })
   end
 end

data/lib/geoblacklight/exceptions.rb

@@ -0,0 +1,6 @@
+module Geoblacklight
+  module Exceptions
+    class WrongDownloadFormat < StandardError
+    end
+  end
+end

data/lib/geoblacklight/references.rb

@@ -42,7 +42,9 @@ module Geoblacklight
     def downloads_by_format
       case format
       when 'Shapefile'
-        { shapefile: wfs.to_hash, kmz: wms.to_hash }
+        { shapefile: wfs.to_hash, kmz: wms.to_hash, geojson: wfs.to_hash }
+      when 'GeoTIFF'
+        { geotiff: wms.to_hash } if wms.present?
       end
     end
 

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/tasks/geoblacklight.rake

@@ -24,5 +24,9 @@ namespace :geoblacklight do
     task delete: :environment do
       FileUtils.rm_rf Dir.glob("#{Rails.root}/tmp/cache/downloads/*")
     end
+    desc 'Create download directory'
+    task mkdir: :environment do
+      FileUtils.mkdir_p Dir.glob("#{Rails.root}/tmp/cache/downloads")
+    end
   end
 end

data/spec/features/home_page_spec.rb

@@ -15,6 +15,7 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
   scenario 'find by category' do
     expect(page).to have_css '.category-block', count: 4
     expect(page).to have_css '.home-facet-link', count: 28
+    expect(page).to have_css 'a.more_facets_link', count: 4
     click_link 'Census'
     expect(page).to have_css '.filterName', text: 'Subject'
     expect(page).to have_css '.filterValue', text: 'Census'
@@ -26,9 +27,8 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
     end
   end
   scenario 'clicking map search should create a spatial search' do
-    find('#map').double_click
     within '#map' do
-      find('a.search-control').click
+      find('.search-control a').click
       expect(page.current_url).to match /bbox=/
     end
     expect(page).to have_css '#documents'

data/spec/features/saved_searches_spec.rb

@@ -3,9 +3,8 @@ require 'spec_helper'
 feature 'saved searches' do
   scenario 'list spatial search', js: true do
     visit root_path
-    find('#map').double_click
     within '#map' do
-      find('a.search-control').click
+      find('.search-control a').click
       expect(page.current_url).to match /bbox=/
     end
     visit search_history_path

data/spec/helpers/geoblacklight_helpers_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe GeoblacklightHelper do
+  include GeoblacklightHelper
+  include ActionView::Helpers::UrlHelper
+  describe '#render_facet_links' do
+    it 'should contain unique links' do
+      expect(self).to receive(:catalog_index_path).exactly(3).times.and_return("http://example.com/catalog?f[dc_subject_sm][]=category")
+      html = Capybara.string(render_facet_links('dc_subject_sm', ['Test', 'Test', 'Earth', 'Science']))
+      expect(html).to have_css 'a', count: 3
+      expect(html).to have_css 'a', text: 'Test', count: 1
+      expect(html).to have_css 'a', text: 'Earth', count: 1
+      expect(html).to have_css 'a', text: 'Science', count: 1
+    end
+  end
+end

data/spec/lib/geoblacklight/download/geojson_download_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe GeojsonDownload do
+  let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_bbox: '-180 -90 180 90') }
+  let(:download) { GeojsonDownload.new(document) }
+  describe '#initialize' do
+    it 'should initialize as a GeojsonDownload object with specific options' do
+      expect(download).to be_an GeojsonDownload
+      options = download.instance_variable_get(:@options)
+      expect(options[:content_type]).to eq 'application/json'
+      expect(options[:request_params][:typeName]).to eq 'stanford-test'
+    end
+  end
+end

data/spec/lib/geoblacklight/download/geotiff_download_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe GeotiffDownload do
+  let(:document) { SolrDocument.new(layer_slug_s: 'test', layer_id_s: 'stanford-test', solr_bbox: '-180 -90 180 90') }
+  let(:download) { GeotiffDownload.new(document) }
+  describe '#initialize' do
+    it 'should initialize as a GeotiffDownload object with specific options' do
+      expect(download).to be_an GeotiffDownload
+      options = download.instance_variable_get(:@options)
+      expect(options[:content_type]).to eq 'image/geotiff'
+      expect(options[:request_params][:layers]).to eq 'stanford-test'
+      expect(options[:reflect]).to be_truthy
+    end
+  end
+end

data/spec/lib/geoblacklight/download_spec.rb

@@ -4,8 +4,8 @@ describe Download do
   let(:response) { double('response') }
   let(:get) { double('get') }
   let(:body) { double('body') }
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wms_url: 'http://www.example.com/wms') }
-  let(:options) { { type: 'shapefile', extension: 'zip', service_type: :solr_wms_url, content_type: 'application/zip' } }
+  let(:document) { SolrDocument.new(layer_slug_s: 'test', dct_references_s: {'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms'}.to_json) }
+  let(:options) { { type: 'shapefile', extension: 'zip', service_type: 'wms', content_type: 'application/zip' } }
   let(:download) { Download.new(document, options) }
 
   describe '#initialize' do
@@ -42,14 +42,14 @@ describe Download do
       expect(download).to receive(:download_exists?).and_return(false)
       expect(download).to receive(:initiate_download).and_return('')
       expect(File).to receive(:open).with("#{download.file_path}.tmp", 'wb').and_return('')
-      expect(File).to receive(:delete).with("#{download.file_path}.tmp").and_return(nil)
-      expect(download.get).to eq nil
+      expect(File).to receive(:rename)
+      expect(download.get).to eq 'test-shapefile.zip'
     end
   end
   describe '#create_download_file' do
     it 'should create the file in fs and delete it if the content headers are not correct' do
-      expect(download).to receive(:initiate_download).and_return('')
-      expect(File).to receive(:open).with("#{download.file_path}.tmp", 'wb').and_return('')
+      bad_file = OpenStruct.new(headers: { 'content-type' => 'bad/file' })
+      expect(download).to receive(:initiate_download).and_return(bad_file)
       expect(File).to receive(:delete).with("#{download.file_path}.tmp").and_return(nil)
       expect(download.create_download_file).to eq nil
     end

data/spec/lib/geoblacklight/references_spec.rb

@@ -86,13 +86,13 @@ describe Geoblacklight::References do
     it 'should return available downloads by format' do
       types = complex_shapefile.download_types
       expect(types.first[1]).to eq wfs: 'http://hgl.harvard.edu:8080/geoserver/wfs'
-      expect(types.count).to eq 2
+      expect(types.count).to eq 3
       expect(direct_download_only.download_types).to be_nil
     end
     it 'should only return available downloads if no direct is present' do
       types = typical_ogp_shapefile.download_types
       expect(types.first[1]).to eq wfs: "http://hgl.harvard.edu:8080/geoserver/wfs"
-      expect(types.count).to eq 2
+      expect(types.count).to eq 3
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Darren Hardy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -271,6 +271,7 @@ files:
 - app/assets/stylesheets/geoblacklight/_geoblacklight.css.scss
 - app/assets/stylesheets/geoblacklight/_styles.css.scss
 - app/assets/stylesheets/geoblacklight/application.css.scss
+- app/assets/stylesheets/geoblacklight/modules/geosearch.css.scss
 - app/assets/stylesheets/geoblacklight/modules/home.css.scss
 - app/assets/stylesheets/geoblacklight/modules/icon-customization.css.scss
 - app/assets/stylesheets/geoblacklight/modules/icons.css.scss
@@ -306,9 +307,12 @@ files:
 - lib/geoblacklight/constants.rb
 - lib/geoblacklight/controller_override.rb
 - lib/geoblacklight/download.rb
+- lib/geoblacklight/download/geojson_download.rb
+- lib/geoblacklight/download/geotiff_download.rb
 - lib/geoblacklight/download/kmz_download.rb
 - lib/geoblacklight/download/shapefile_download.rb
 - lib/geoblacklight/engine.rb
+- lib/geoblacklight/exceptions.rb
 - lib/geoblacklight/reference.rb
 - lib/geoblacklight/references.rb
 - lib/geoblacklight/solr_document.rb
@@ -335,7 +339,10 @@ files:
 - spec/fixtures/test-dct-references6.json
 - spec/fixtures/test-dct-references7.json
 - spec/fixtures/test-dct-references8.json
+- spec/helpers/geoblacklight_helpers_spec.rb
 - spec/lib/geoblacklight/controller_override_spec.rb
+- spec/lib/geoblacklight/download/geojson_download_spec.rb
+- spec/lib/geoblacklight/download/geotiff_download_spec.rb
 - spec/lib/geoblacklight/download/kmz_download_spec.rb
 - spec/lib/geoblacklight/download/shapefile_download_spec.rb
 - spec/lib/geoblacklight/download_spec.rb
@@ -396,7 +403,10 @@ test_files:
 - spec/fixtures/test-dct-references6.json
 - spec/fixtures/test-dct-references7.json
 - spec/fixtures/test-dct-references8.json
+- spec/helpers/geoblacklight_helpers_spec.rb
 - spec/lib/geoblacklight/controller_override_spec.rb
+- spec/lib/geoblacklight/download/geojson_download_spec.rb
+- spec/lib/geoblacklight/download/geotiff_download_spec.rb
 - spec/lib/geoblacklight/download/kmz_download_spec.rb
 - spec/lib/geoblacklight/download/shapefile_download_spec.rb
 - spec/lib/geoblacklight/download_spec.rb