geoblacklight 0.0.2 → 0.0.3

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

@@ -0,0 +1,4 @@
+[data-map="item"][data-available="true"] {
+  cursor: crosshair;
+  height: 440px;
+}

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

@@ -0,0 +1,29 @@
+[data-map="index"] {
+  height: 480px;
+}
+
+.more-info-area {
+  max-height: 100px;
+}
+
+.text-span{
+  width:80%;
+  float:left;
+}
+
+.hide-overflow {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display:block
+}
+
+.status-icons {
+  float: right;
+  margin-right: 10px;
+}
+
+.index_title {
+  @extend .text-span;
+  @extend .hide-overflow;
+}

data/app/controllers/download_controller.rb

@@ -1,107 +1,35 @@
-require 'nokogiri'
-require 'httparty'
-require 'net/http'
-
-class Layer
-  include HTTParty
-  format :json
+class DownloadController < ApplicationController
+  include Blacklight::SolrHelper
 
-  def self.getInfo(params)
-    url = params['URL']
-    params['BBOX'] = formatLatLng(params['BBOX'])
-    puts params
-    get(url, :query => params.except('URL'))
+  def show
+    @response, @document = get_solr_response_for_doc_id
+    response = check_type
+    validate response
+    respond_to do |format|
+      format.json { render json: flash, response: response }
+      format.html { render json: flash, response: response }
+    end
   end
-end
 
-class DownloadController < ApplicationController
   def file
-    
-    send_file "tmp/data/#{params['q']}", :type=>"application/zip", :x_sendfile=>true 
-
+    send_file "tmp/downloads/#{params[:id]}.#{params[:format]}", type: 'application/zip', x_sendfile: true
   end
 
-  def shapefile
- 
-    puts session['session_id']
-    uuid = params['layer_slug_s']
-    layername = params['layer_id_s']
-    wfsurl = params['solr_wfs_url']
-    
-    params = {:service => 'wfs', :version => '2.0.0', :request => 'GetFeature', :srsName => 'EPSG:4326', :outputformat => 'SHAPE-ZIP', :typeName => layername}
-    
-    # token = SecureRandom.base64(8).tr('+/=lIO0', 'abc123')
-    error = ''
-
-    if !Dir.exists?('tmp/data')
-      Dir.mkdir('tmp/data')
-    end
-    if (!File.file?("tmp/data/#{uuid}-shapefile.zip"))
-      File.open("tmp/data/#{uuid}-shapefile.zip", 'wb')  do |f|
-          puts "#{uuid}-shapefile.zip created"
-          dl = HTTParty.get(wfsurl, :query => params)
-          if dl.headers['content-type'] == 'application/zip'
-            f.write dl.parsed_response
-          else
-            error = dl.parsed_response
-          end
-      end
-    else
-      puts "#{uuid}-shapefile.zip already exists"
-    end
-    respond_to do |format|
-      if error.length > 0
-         puts 'error!'
-        format.json { render :json => {:error => error}}
-        File.delete("tmp/data/#{uuid}-shapefile.zip")
-        puts "#{uuid}-shapefile.zip deleted"
-      else
-        format.json { render :json => {:data => "#{uuid}-shapefile.zip"}}
-      end
+  def check_type
+    case params[:type]
+    when 'shapefile'
+      response = ShapefileDownload.new(@document).get
+    when 'kmz'
+      response = KmzDownload.new(@document).get
     end
-
+    response
   end
 
-  def kml
-    layername = params['layer_id_s']
-    puts layername
-    bbox = [params['solr_sw_pt_1_d'], params['solr_sw_pt_0_d'], params['solr_ne_pt_1_d'], params['solr_ne_pt_0_d']]
-    bbox = bbox.join(',')
-    wmsurl = params['solr_wms_url']
-    uuid = params['layer_slug_s']
-    puts bbox
-
-    params = {:service => 'wms', :version => '1.1.0', :request => 'GetMap', :srsName => 'EPSG:900913', :format => 'application/vnd.google-earth.kmz', :layers => layername, :bbox => bbox, :width => 2000, :height => 2000}
-    
-    error = ''
-
-    if !Dir.exists?('tmp/data')
-      Dir.mkdir('tmp/data')
-    end
-    if (!File.file?("tmp/data/#{uuid}.kmz"))
-      File.open("tmp/data/#{uuid}.kmz", 'wb')  do |f|
-          puts "#{uuid}.kmz created"
-          dl = HTTParty.get(wmsurl, :query => params)
-          puts dl.headers.inspect
-          puts dl.request.inspect
-          if dl.headers['content-type'] == 'application/vnd.google-earth.kmz'
-            f.write dl.parsed_response
-          else
-            error = dl.parsed_response
-          end
-      end
+  def validate(response)
+    if response.nil?
+      flash[:danger] = t 'geoblacklight.download.error'
     else
-      puts "#{uuid}.kmz already exists"
-    end
-    respond_to do |format|
-      if error.length > 0
-         puts 'error!'
-        format.json { render :json => {:error => error}}
-        File.delete("tmp/data/#{uuid}.kmz")
-        puts "#{uuid}.kmz deleted"
-      else
-        format.json { render :json => {:data => "#{uuid}.kmz"}}
-      end
+      flash[:success] = view_context.link_to(t('geoblacklight.download.success', title: response), download_file_path(response))
     end
   end
 end

data/app/controllers/wms_controller.rb

@@ -1,81 +1,9 @@
-require 'nokogiri'
-
-class Layer
-  include HTTParty
-  format :json
-
-  def self.getInfo(params)
-    url = params['URL']
-    params['BBOX'] = formatLatLng(params['BBOX'])
-    # puts 'hallo'
-    # params.delete "URL"
-    params.delete "action"
-    params.delete "controller"
-    puts params
-    get(url, :query => params.except('URL'))
-  end
-end
-
-# Refactor to a helper later on
-def formatLatLng(val)
-  formated_val = []
-  val.split(',').each do |v|
-    vFloat = v.to_f
-    if vFloat > 180 || vFloat < -180
-      while vFloat > 180
-        vFloat -= 360
-      end
-      while vFloat < -180
-        vFloat += 360
-      end
-      formated_val.push(vFloat)
-    else
-      formated_val.push(v)
-    end
-  end
-  return formated_val.join(',')
-end
-
 class WmsController < ApplicationController
   def handle
-    params["info_format"] = "text/html"
-    response = Layer.getInfo(params)
-    # puts response.inspect
-    puts response.body
-    puts response.request.inspect
-    
-
-    page = Nokogiri::HTML(response.body)
-    table = {:values => []}
-    page.css('th').each_with_index do |th|
-      table[:values].push([th.text])
-    end
-    page.css('td').each_with_index do |td, i|
-      table[:values][i].push(td.text)
-    end
-
-    errorresponse = {}
-
-    if response.headers["content-type"].slice(0,8) == "text/xml"
-      puts response.body.to_s
-      errorresponse = Hash.from_xml(response.body).to_json
-    end
+    response = WmsLayer.new(params).get_feature_info
 
     respond_to do |format|
-      if response.headers["content-type"].slice(0,9) == "text/html"
-        format.json { render :json => table}
-      else
-        format.json { render :json => errorresponse}
-      end
-      # if response.headers["content-type"] == "application/json"
-    #     format.json { render :json => response }
-    #   else
-    #       if response.headers["content-type"] == "text/html"
-    #         puts 'should be called'
-    #         format.json { render :json => table}
-    #       end
-      #     # format.json { render :json => {"code" => "fail"}}
-    #   end
+      format.json { render json: response }
     end
   end
 end

data/app/helpers/geoblacklight_helper.rb

@@ -5,15 +5,15 @@ module GeoblacklightHelper
   end
 
   def sms_helper()
-    content_tag(:i, '', :class => 'fa fa-li fa-mobile') + t('blacklight.tools.sms')
+    content_tag(:i, '', :class => 'fa fa-mobile fa-fw') + ' ' + t('blacklight.tools.sms')
   end
 
   def email_helper
-    content_tag(:i, '', :class => 'fa fa-li fa-envelope') + t('blacklight.tools.email')
+    content_tag(:i, '', :class => 'fa fa-envelope fa-fw') + ' ' + t('blacklight.tools.email')
   end
 
   def metadata_helper
-    content_tag(:i, '', :class => 'fa fa-li fa-download') + t('Metadata')
+    content_tag(:i, '', :class => 'fa fa-download fa-fw') + ' ' + t('Metadata')
   end
 
   def abstract_truncator(abstract)
@@ -40,47 +40,17 @@ module GeoblacklightHelper
   end
 
   def layer_type_image(type)
-    case type
-    when "Polygon"
-      image_tag('geoblacklight/type_polygon.png', 'data-toggle' => 'tooltip', title: 'Polygon', :class => 'tooltip-icon')
-    when "Line"
-      image_tag('geoblacklight/type_arc.png', 'data-toggle' => 'tooltip', title: 'Line', :class => 'tooltip-icon')
-    when "Point"
-      image_tag('geoblacklight/type_dot.png', 'data-toggle' => 'tooltip', title: 'Point', :class => 'tooltip-icon')
-    when "Raster"
-      image_tag('geoblacklight/type_raster.png', 'data-toggle' => 'tooltip', title: 'Raster', :class => 'tooltip-icon')
-    when "Paper Map"
-      image_tag('geoblacklight/type_map.png', 'data-toggle' => 'tooltip', title: 'Paper Map', :class => 'tooltip-icon')
-    when "LibraryRecord"
-      content_tag(:i, '', class: 'fa fa-book fa-lg text-muted tooltip-icon',  'data-toggle' => 'tooltip', title: 'Library Record')
-    else
-      ""
-    end
+    content_tag :span, '', class: "geoblacklight-icon geoblacklight-#{type.downcase}"
   end
 
   def layer_institution_image(institution)
-    case institution
-    when /Stanford/
-      image_tag('geoblacklight/src_stanford.png', 'data-toggle' => 'tooltip', title: 'Stanford', :class => 'tooltip-icon')
-    when /Berkeley/
-      image_tag('geoblacklight/src_berkeley.png', 'data-toggle' => 'tooltip', title: 'UC Berkeley', :class => 'tooltip-icon')
-    when /Harvard/
-      image_tag('geoblacklight/src_harvard.png', 'data-toggle' => 'tooltip', title: 'Harvard', :class => 'tooltip-icon')
-    when /MIT/
-      image_tag('geoblacklight/src_mit.png', 'data-toggle' => 'tooltip', title: 'MIT', :class => 'tooltip-icon')
-    when /Tufts/
-      image_tag('geoblacklight/src_tufts.png', 'data-toggle' => 'tooltip', title: 'Tufts', :class => 'tooltip-icon')
-    when /MassGIS/
-      image_tag('geoblacklight/src_massgis.png', 'data-toggle' => 'tooltip', title: 'MassGIS', :class => 'tooltip-icon')
-    else
-      ""
-    end
+    content_tag :span, '', class: "geoblacklight-icon geoblacklight-#{institution.downcase}"
   end
 
   def layer_access_image(access)
     case access
     when 'Restricted'
-      content_tag(:i, '', class: 'fa fa-lock fa-lg text-muted  tooltip-icon', 'data-toggle' => 'tooltip', title: 'Restricted')
+      content_tag(:i, '', class: 'fa fa-lock fa-lg text-muted  tooltip-icon', 'data-toggle' => 'tooltip', title: 'Restricted', style: 'width: 17px;')
     when 'Public'
       content_tag(:i, '', class: 'fa fa-unlock fa-lg text-muted tooltip-icon',  'data-toggle' => 'tooltip', title: 'Public')
     else

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

@@ -0,0 +1,4 @@
+<div id="documents" class="docView col-md-6">
+  <%= render documents, :as => :document %>
+</div>
+<%= content_tag :div, '', id: 'map', data: { map: 'index', 'catalog-path'=> catalog_index_path , 'map-bbox' => params[:bbox] } %>

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

@@ -1,40 +1,3 @@
-<div class="row">
-  <div class="col-md-6">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h4><%= t('blacklight.welcome') %></h4>
-      </div>
-      <div class="panel-body">
-        <p>
-          Find GIS data!
-        </p>
-        <p>
-          Discover Maps!
-        </p>
-      </div>
-    </div>
-  </div>
-  <div class="col-md-6">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h4>Featured Datasets</h4>
-      </div>
-      <div class="panel-body">
-        <ul>
-          <li>
-            <a href="#">Amazing Data 1</a>
-          </li>
-          <li>
-            <a href="#">Amazing Data 2</a>
-          </li>
-          <li>
-            <a href="#">Amazing Data 3</a>
-          </li>
-        </ul>
-      </div>
-    </div>
-  </div>
-</div>
-<div id='geoblacklight-map-home'>
-  <div id='map' class='mapview-map'></div>
+<div id='row'>
+  <%= content_tag :div, '', id: 'map', data: { map: 'home', 'catalog-path'=> catalog_index_path , 'map-bbox' => params[:bbox]} %>
 </div>

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

@@ -0,0 +1,24 @@
+<% # header bar for doc items in index view -%>
+<%= content_tag :div, class: 'documentHeader row', data: { layer_id: document[:uuid], bbox: document[:solr_bbox], geom: document[:solr_geom] } do %>
+  <div class='status-icons'>
+    <%= layer_type_image(document['layer_geom_type_s']) %>
+    <%= layer_institution_image(document['dct_provenance_s']) %>
+    <%= layer_access_image(document['dc_rights_s']) %>
+  </div>
+  <h5 class="index_title col-sm-9s cosl-lg-10 text-span">
+    <% counter = document_counter_with_offset(document_counter) %>
+    <span class="document-counter">
+      <%= t('blacklight.search.documents.counter', :counter => counter) if counter %>
+    </span>
+    <%= link_to_document document, :label=>document_show_link_field(document), :counter => counter, :title => document['dc_title_s'] %>
+  </h5>
+
+  <div class='col-md-12 more-info-area'>
+    <div class='collapse' data-collapse-target="<%= document['uuid'] %>">
+      <small>
+        <%= document['solr_year_i'] %>. <i><%= document['dc_creator_sm'].nil?? '' : document['dc_creator_sm'].join(', ') %></i>. <%= snippit(document['dc_description_s']) %>. <%= document['dc_publisher_s'] %>. Score: <%= document['score'] %>
+      </small>
+    </div>
+  </div>
+<% end %>
+

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

@@ -1,68 +1,15 @@
-<div class="geoblacklight-view-panel">
-<small>
-  <%= layer_type_image(document['layer_geom_type_s']) %>
-  <%= layer_institution_image(document['dct_provenance_s']) %>
-  <%= layer_access_image(document['dc_rights_s']) %>
-</small>
+<% document ||= @document %>
 
-  <dl class="dl-horizontal">
-    <% unless document['dc_creator_sm'].nil? %>
-      <dt>Author</dt>
-      <dd><%= document['dc_creator_sm'].join(', ') %>&nbsp;</dd>
-	<% end %>
-    <% unless document['dc_publisher_s'].nil? %>
-      <dt>Publisher</dt>
-      <dd><%= document['dc_publisher_s'] %>&nbsp;</dd>
-	<% end %>
-    <dt>Year</dt>
-    <dd><%= document['solr_year_i'] %>&nbsp;</dd>
-    <dt>Abstract</dt>
-    <dd id=""><%= abstract_truncator(document['dc_description_s']) %>&nbsp;</dd>
-    <% unless document['dct_isPartOf_sm'].nil? %>
-      <dt>Collection</dt>
-      <dd><%= document['dct_isPartOf_sm'].sort.join(', ') %>&nbsp;</dd>
-    <% end %>
-    <% if document['dct_provenance_s'] == 'Stanford' and not document['dc_identifier_s'].nil? %>
-      <dt>Citation</dt>
-      <dd><%= link_to document['dc_identifier_s'], document['dc_identifier_s'] %>&nbsp;</dd>
-    <% end %>
-    <% unless document['dct_spatial_sm'].nil? %>
-      <dt>Places</dt>
-      <dd><%= document['dct_spatial_sm'].sort.join(', ') %>&nbsp;</dd>
-    <% end %>
-    <% unless document['dc_subject_sm'].nil? %>
-      <dt>Subjects</dt>
-      <dd><%= document['dc_subject_sm'].sort.join(', ') %>&nbsp;</dd>
-    <% end %>
-    <% unless document['dct_temporal_sm'].nil? %>
-      <dt>Years</dt>
-      <dd><%= document['dct_temporal_sm'].sort.join(', ') %>&nbsp;</dd>
-    <% end %>
-  </dl>
-</div>
+<%= render 'upper_metadata', locals: { document: document} %>
 
 <div class='row'>
   <div class="col-md-8">
-    <div id='geoblacklight-map-view'>
-      <div id='map' class='mapview-map'></div>
+    <%= 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 %>
       <div id='control'>
         <div id='handle'></div>
         <div id='bottom'></div>
       </div>
-    </div>
+    <% end %>
   </div>
   <div id='table-container' class='col-md-4'><div id='attribute-table' ></div></div>
 </div>
-<% if @document['dct_provenance_s'] == 'Stanford' %>
-<div class='geoblacklight-view-panel-footer'>
-  <br>
-  <br>
-  <hr/>
-  <p align="right">
-    <small>
-      <a href="<%= @document['dc_identifier_s'] %>.mods">Librarian View</a>
-    </small>
-  </p>
-</div>
-<% end %>
-<%= javascript_tag "var solrDoc = #{@document.to_json};" %>