geoblacklight 2.3.0

data/app/assets/stylesheets/geoblacklight/modules/modal.scss

@@ -0,0 +1,14 @@
+.modal-header, .modal-body, .modal-footer {
+  .hide-without-js {
+    display: none;
+  }
+}
+
+#ajax-modal {
+  .modal-header, .modal-body, .modal-footer {
+    .hide-without-js {
+      display: inline-block; 
+    }
+  }
+
+}

data/app/assets/stylesheets/geoblacklight/modules/relations.scss

@@ -0,0 +1,15 @@
+.relations {
+  @include sidebar-children;
+
+  .list-group {
+    .relations-ancestors {
+      padding-left: 16px;
+      padding-right: 16px;
+    }
+
+    .relations-descendants {
+      padding-left: 16px;
+      padding-right: 16px;
+    }
+  }
+}

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

@@ -0,0 +1,68 @@
+[data-map="index"] {
+  height: 480px;
+}
+
+.more-info-area {
+  float: left;
+  order:3;
+  max-height: 100px;
+  overflow:hidden;
+}
+
+.text-span{
+  width:80%;
+  float:left;
+}
+
+.hide-overflow {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display:block
+}
+
+.status-icons {
+  order: 2;
+  margin-left: 0.5rem;
+}
+
+.index_title {
+  order: 1;
+  @extend .text-span;
+  @extend .hide-overflow;
+  @extend h5;
+  font-size:1rem;
+  width:80%;
+}
+
+.caret-toggle {
+  @extend .fa, .fa-caret-right;
+  cursor: pointer;
+  width: 10px;
+
+  &.open {
+    @extend .fa, .fa-caret-down;
+  }
+}
+
+#main-container {
+  .category-block {
+    min-height: 240px;
+
+    .category-icon {
+      font-size: 6em;
+    }
+  }
+
+  [data-map="index"] {
+    height: 400px;
+
+    .leaflet-control-container {
+      .search-control {
+        a {
+          color: $white;
+        }
+      }
+    }
+  }
+}

data/app/assets/stylesheets/geoblacklight/modules/search_widgets.scss

@@ -0,0 +1,5 @@
+.search-widgets {
+  .dropdown-menu {
+    z-index: 10000;
+  }
+}

data/app/assets/stylesheets/geoblacklight/modules/sidebar.scss

@@ -0,0 +1,60 @@
+// Mixins and shared properties for sidebar elements
+
+@mixin sidebar-children {
+  %list-group-item-children {
+    padding: 10px 15px;
+  }
+
+  %list-group-item-anchors {
+    text-align: center;
+    width: 1.4em;
+  }
+
+  margin-top: 16px;
+  margin-bottom: 16px;
+
+  .card-header {
+    h2 {
+      display: inline-block;
+      padding-top: 8px;
+      padding-bottom: 8px;
+      margin-bottom: 0px;
+      font-size: 1rem;
+    }
+  }
+
+  .card-subtitle {
+    margin: 1rem 0 .2rem;
+    font-size: .9rem;
+    font-weight: normal;
+    color: $gray-600;
+  }
+
+  .list-group {
+    padding-top: 24px;
+    padding-bottom: 24px;
+    padding-left: 4px;
+    padding-right: 4px;
+
+    .list-group-item {
+      border-color: $white;
+      padding: 8px 16px;
+
+      a {
+        @extend %list-group-item-children;
+
+        .geoblacklight {
+          color: $gray-600;
+        }
+      }
+    }
+
+    &-nested {
+      padding: 0;
+
+      .list-group-item {
+        padding: 8px 0;
+      }
+    }
+  }
+}

data/app/assets/stylesheets/geoblacklight/modules/toolbar.scss

@@ -0,0 +1,70 @@
+.show-tools {
+  @include sidebar-children;
+
+  .list-group {
+
+    .list-group-item.exports {
+      margin-top:0px;
+    }
+
+    .list-group-item {
+
+      form {
+        @extend %list-group-item-children;
+
+        .checkbox {
+          margin-left: 4px;
+          margin-right: 4px;
+
+          label {
+            margin-bottom: inherit;
+          }
+        }
+      }
+
+      a {
+
+        .geoblacklight {
+
+          &-citation {
+            @extend %list-group-item-anchors;
+          }
+
+          &-data-dictionary {
+            @extend %list-group-item-anchors;
+          }
+
+          &-sms {
+            @extend %list-group-item-anchors;
+          }
+
+          &-email {
+            @extend %list-group-item-anchors;
+          }
+
+          &-web_services {
+            @extend %list-group-item-anchors;
+          }
+
+          &-metadata {
+            @extend %list-group-item-anchors;
+          }
+
+          &-carto {
+            @extend %list-group-item-anchors;
+          }
+
+          // DEPRECATED: Will be removed in GeoBlacklight v2.0
+          &-cartodb {
+            @extend %list-group-item-anchors;
+          }
+        }
+      }
+    }
+
+    .downloads {
+      margin-left: 4px;
+      margin-right: 4px;
+    }
+  }
+}

data/app/assets/stylesheets/geoblacklight/modules/web_services.scss

@@ -0,0 +1,5 @@
+.web-services-form {
+  .form-control[readonly] {
+    cursor: text;
+  }
+}

data/app/controllers/download_controller.rb

@@ -0,0 +1,114 @@
+class DownloadController < ApplicationController
+  # include Blacklight::SearchHelper
+  include Blacklight::Catalog
+
+  rescue_from Geoblacklight::Exceptions::ExternalDownloadFailed do |exception|
+    Geoblacklight.logger.error exception.message + ' ' + exception.url
+    flash[:danger] = view_context
+                     .content_tag(:span,
+                                  flash_error_message(exception),
+                                  data: {
+                                    download: 'error',
+                                    download_id: params[:id],
+                                    download_type: "generated-#{params[:type]}"
+                                  })
+    respond_to do |format|
+      format.json { render json: flash, response: response }
+      format.html { render json: flash, response: response }
+    end
+  end
+
+  def show
+    @response, @document = search_service.fetch params[:id]
+    restricted_should_authenticate
+    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
+
+  def file
+    # Grab the solr document to check if it should be public or not
+    @response, @document = search_service.fetch(file_name_to_id(params[:id]))
+    restricted_should_authenticate
+    send_file download_file_path_and_name, x_sendfile: true
+  end
+
+  def hgl
+    @response, @document = search_service.fetch params[:id]
+    if params[:email]
+      response = Geoblacklight::HglDownload.new(@document, params[:email]).get
+      if response.nil?
+        flash[:danger] = t 'geoblacklight.download.error'
+      else
+        flash[:success] = t 'geoblacklight.download.hgl_success'
+      end
+      respond_to do |format|
+        format.json { render json: flash, response: response }
+        format.html { render json: flash, response: response }
+      end
+    else
+      render layout: false
+    end
+  end
+
+  protected
+
+  ##
+  # Creates an error flash message with failed download url
+  # @param [Geoblacklight::Exceptions::ExternalDownloadFailed] Download failed
+  # exception
+  # @return [String] error message to display in flash
+  def flash_error_message(exception)
+    if exception.url.present?
+      message = t('geoblacklight.download.error_with_url',
+                  link: view_context
+                        .link_to(exception.url,
+                                 exception.url,
+                                 target: 'blank'))
+                .html_safe
+    else
+      message = t('geoblacklight.download.error')
+    end
+    message
+  end
+
+  private
+
+  def download_file_path_and_name
+    "#{Geoblacklight::Download.file_path}/#{params[:id]}.#{params[:format]}"
+  end
+
+  def check_type
+    response = case params[:type]
+               when 'shapefile'
+                 Geoblacklight::ShapefileDownload.new(@document).get
+               when 'kmz'
+                 Geoblacklight::KmzDownload.new(@document).get
+               when 'geojson'
+                 Geoblacklight::GeojsonDownload.new(@document).get
+               when 'geotiff'
+                 Geoblacklight::GeotiffDownload.new(@document).get
+               end
+    response
+  end
+
+  def validate(response)
+    flash[:success] = view_context.link_to(t('geoblacklight.download.success', title: response),
+                                           download_file_path(response),
+                                           data: { download: 'trigger',
+                                                   download_id: params[:id],
+                                                   download_type: "generated-#{params[:type]}" })
+  end
+
+  # Checks whether a document is public, if not require user to authenticate
+  def restricted_should_authenticate
+    authenticate_user! unless @document.public?
+  end
+
+  def file_name_to_id(file_name)
+    file_name.split('-')[0..-2].join('-')
+  end
+end

data/app/controllers/relation_controller.rb

@@ -0,0 +1,20 @@
+class RelationController < ApplicationController
+  include Blacklight::Configurable
+  # include Blacklight::SearchHelper
+  copy_blacklight_config_from(CatalogController)
+
+  def index
+    @relations = Geoblacklight::Relation::RelationResponse.new(params[:id], repository)
+    render layout: !request.xhr?
+  end
+
+  private
+
+  def repository_class
+    blacklight_config.repository_class
+  end
+
+  def repository
+    @repository ||= repository_class.new(blacklight_config)
+  end
+end

data/app/controllers/wms_controller.rb

@@ -0,0 +1,15 @@
+class WmsController < ApplicationController
+  def handle
+    response = Geoblacklight::WmsLayer.new(wms_params).feature_info
+
+    respond_to do |format|
+      format.json { render json: response }
+    end
+  end
+
+  private
+
+  def wms_params
+    params.permit('URL', 'LAYERS', 'BBOX', 'WIDTH', 'HEIGHT', 'QUERY_LAYERS', 'X', 'Y')
+  end
+end

data/app/helpers/arcgis_helper.rb

@@ -0,0 +1,12 @@
+module ArcgisHelper
+  ##
+  # Generates an ArcGIS.com viewer url with params that can open content
+  # directly
+  # See: https://doc.arcgis.com/en/arcgis-online/reference/use-url-parameters.htm
+  def arcgis_link(arcgis_urls)
+    params = URI.encode_www_form(
+      urls: arcgis_urls
+    )
+    Settings.ARCGIS_BASE_URL + '?' + params
+  end
+end

data/app/helpers/blacklight_helper.rb

@@ -0,0 +1,9 @@
+module BlacklightHelper
+  include Blacklight::BlacklightHelperBehavior
+  include Geoblacklight::GeoblacklightHelperBehavior
+  include Blacklight::CatalogHelperBehavior
+
+  def render_document_sidebar_partial(document = @document)
+    super(document) + (render 'relations_container', document: document)
+  end
+end

data/app/helpers/carto_helper.rb

@@ -0,0 +1,29 @@
+module CartoHelper
+  ##
+  # Creates a Carto OneClick link, using the configuration link
+  # @param [String] file_link
+  # @return [String]
+  def carto_link(file_link)
+    params = URI.encode_www_form(
+      file: file_link,
+      provider: carto_provider,
+      logo: Settings.APPLICATION_LOGO_URL
+    )
+    carto_oneclick_host + '?' + params
+  end
+
+  ##
+  # Removes blank space from provider to accomodate Carto OneClick
+  #
+  def carto_provider
+    application_name.delete(' ')
+  end
+
+  private
+
+  ##
+  # Method used to access setting and provide deprecation warnings to migrate
+  def carto_oneclick_host
+    Settings.CARTO_ONECLICK_LINK
+  end
+end