geoblacklight 1.9.1 → 2.0.0

data/app/assets/javascripts/geoblacklight/viewers/esri/dynamic_map_layer.js

@@ -63,18 +63,18 @@ GeoBlacklight.Viewer.DynamicMapLayer = GeoBlacklight.Viewer.Esri.extend({
           url: layer.options.url,
           useCors: true
       })
-        .tolerance(0)
+        .tolerance(2)
         .returnGeometry(false)
         .on(_this.map)
         .at(e.latlng);
 
       // query specific layer if dynamicLayerId is set
       if (_this.dynamicLayerId) {
-        identify.layers('ID: ' + _this.dynamicLayerId);
+        identify.layers('all: ' + _this.dynamicLayerId);
       }
 
       identify.run(function(error, featureCollection, response){
-        if (error) {
+        if (error || response['results'] < 1) {
           _this.appendErrorMessage();
         } else {
           _this.populateAttributeTable(featureCollection.features[0]);

data/app/assets/javascripts/geoblacklight/viewers/esri/feature_layer.js

@@ -56,14 +56,16 @@ GeoBlacklight.Viewer.FeatureLayer = GeoBlacklight.Viewer.Esri.extend({
 
     // inspect on click
     featureLayer.on('click', function(e) {
+      var distance = 3000 / (1 + _this.map.getZoom());
+
       _this.appendLoadingMessage();
 
       // query layer at click location
       featureLayer.query()
       .returnGeometry(false)
-      .intersects(e.latlng)
+      .nearby(e.latlng, distance)
       .run(function(error, featureCollection, response) {
-        if (error) {
+        if (error || response['features'] < 1) {
           _this.appendErrorMessage();
         } else {
           _this.populateAttributeTable(featureCollection.features[0]);

data/app/assets/javascripts/geoblacklight/viewers/index_map.js

@@ -12,25 +12,22 @@ GeoBlacklight.Viewer.IndexMap = GeoBlacklight.Viewer.Map.extend({
     }
   },
   availabilityStyle: function(availability) {
-    var style = {
-      radius: 4,
-      weight: 1,
-    }
-    // Style the colors based on availability
-    if (typeof(availability) === 'undefined') {
-      return style; // default Leaflet style colorings
-    }
+    var style = {};
+    var options = this.data.leafletOptions;
 
-    if (availability) {
-      style.color = '#1eb300';
+    // Style the colors based on availability
+    if (availability || typeof(availability) === 'undefined') {
+      style = options.LAYERS.INDEX.DEFAULT;
     } else {
-      style.color = '#b3001e';
+      style = options.LAYERS.INDEX.UNAVAILABLE;
     }
     return style
   },
   addPreviewLayer: function() {
     var _this = this;
     var geoJSONLayer;
+    var prevLayer = null;
+    var options = this.data.leafletOptions;
     $.getJSON(this.data.url, function(data) {
       geoJSONLayer = L.geoJson(data,
         {
@@ -45,9 +42,20 @@ GeoBlacklight.Viewer.IndexMap = GeoBlacklight.Viewer.Map.extend({
             // If it is available add clickable info
             if (feature.properties.available !== null) {
               layer.on('click', function(e) {
+                // Change currently selected layer color
+                layer.setStyle(options.LAYERS.INDEX.SELECTED);
+                // Change previously selected layer color to original color
+                if (prevLayer !== null) {
+                  geoJSONLayer.resetStyle(prevLayer);
+                }
+                prevLayer = layer;
                 GeoBlacklight.Util.indexMapTemplate(feature.properties, function(html) {
                   $('.viewer-information').html(html);
                 });
+                GeoBlacklight.Util.indexMapDownloadTemplate(feature.properties, function(html) {
+                  $('.js-index-map-feature').remove();
+                  $('.js-download-list').append(html);
+                });
               });
             }
           },
@@ -59,4 +67,4 @@ GeoBlacklight.Viewer.IndexMap = GeoBlacklight.Viewer.Map.extend({
         _this.map.fitBounds(geoJSONLayer.getBounds());
     });
   }
-});
+});

data/app/assets/javascripts/geoblacklight/viewers/map.js

@@ -1,12 +1,13 @@
 //= require geoblacklight/viewers/viewer
 
 GeoBlacklight.Viewer.Map = GeoBlacklight.Viewer.extend({
+
   options: {
     /**
     * Initial bounds of map
     * @type {L.LatLngBounds}
     */
-    bbox: [[-80, -195], [80, 185]],
+    bbox: [[-82, -144], [77, 161]],
     opacity: 0.75
   },
 

data/app/assets/javascripts/geoblacklight/viewers/wms.js

@@ -46,16 +46,12 @@ GeoBlacklight.Viewer.Wms = GeoBlacklight.Viewer.Map.extend({
         X: Math.round(e.containerPoint.x),
         Y: Math.round(e.containerPoint.y)
       };
-      
-      // Set a ujs adapter to support both rails-ujs and jquery-ujs
-      var ujs = typeof Rails === 'undefined' ? $.rails : Rails;
-
 
       $.ajax({
         type: 'POST',
         url: '/wms/handle',
         beforeSend: function(xhr) {
-          xhr.setRequestHeader('X-CSRF-Token', ujs.csrfToken());
+          xhr.setRequestHeader('X-CSRF-Token', Rails.csrfToken());
         },
         data: wmsoptions,
         success: function(data) {

data/app/assets/stylesheets/geoblacklight/_blacklight_overrides.scss

@@ -0,0 +1,43 @@
+/**
+  Stylesheet for overriding styles inherited from Blacklight proper
+**/
+
+// Begin - Addresses GBL issue #634
+// Emulates font-size for SVG icons and aligns to baseline
+.blacklight-icons {
+  display: inline-flex;
+  height: $font-size-base;
+  width: $font-size-base;
+}
+
+.blacklight-icons svg {
+  height: 1rem;
+  width: 1rem;
+  top: .125rem;
+  position: relative;
+}
+// End - Addresses GBL issue #634
+
+// Begin - Addresses GBL issue #639
+.facet-limit {
+  margin-bottom:0;
+}
+
+.facets-collapse .card+.card {
+  margin-top: 0.5rem;
+}
+
+.documents-list .document {
+  margin-top:0.5rem;
+  padding-top:0.5rem;
+}
+// End - Addresses GBL issue #639
+
+
+// Begin - Addresses GBL issue #766 - removes flex from display
+.modal-header {
+  display: block;
+  padding: 15px;
+  border-bottom: 1px solid #e9ecef;
+}
+// End - Addresses GBL issue #766

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

@@ -17,6 +17,7 @@
 @import 'modules/mixins';
 @import 'modules/icon-customization';
 @import 'modules/home';
+@import 'modules/index_maps';
 @import 'modules/item';
 @import 'modules/layer_opacity';
 @import 'modules/metadata';
@@ -27,7 +28,9 @@
 @import 'modules/results';
 @import 'modules/geosearch';
 @import 'modules/search_widgets';
+@import 'modules/sidebar';
 @import 'modules/toolbar';
+@import 'modules/relations';
 @import 'modules/web_services';
-@import 'modules/twitter-typeahead';
+@import 'blacklight_overrides';
 @import 'modules/downloads';

data/app/assets/stylesheets/geoblacklight/application.scss

@@ -1,3 +1,2 @@
-@import 'bootstrap-sprockets';
 @import 'bootstrap';
 @import 'geoblacklight/geoblacklight';

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

@@ -5,15 +5,28 @@
   }
 }
 
+%download-export-links {
+  a {
+    width: 100%;
+    font-weight: 600;
+    background-color: $link-color;
+    color: #ffffff;
+    border-color: darken($link-color, 6.5%);
+    white-space: inherit;
+  }
+}
+
 @mixin download-export {
   &-link {
     &-container {
-      padding: 4px 15px;
+      text-align: center;
+      @extend %download-export-links;
     }
   }
 }
 
 .downloads {
+  @include sidebar-children;
   @extend %downloads-exports;
 
   .download {
@@ -21,17 +34,23 @@
   }
 }
 
+.authentication {
+  @include sidebar-children;
+  .card-header {
+    background-color: inherit;
+    border-bottom: inherit;
+
+    @extend %download-export-links;
+  }
+}
+
 .exports {
+  @include sidebar-children;
   @extend %downloads-exports;
 
-  .panel-heading {
-    h3 {
-      display: inline;
-    }
-
+  .card-header {
     .fa-spinner {
-      padding-left: 8px;
-      padding-right: 8px;
+      float: right;
     }
   }
 
@@ -41,15 +60,16 @@
     padding-left: 0px;
     padding-right: 0px;
     text-align: center;
+    width: 100%;
 
-    @media (min-width: $screen-lg-min) {
+    @include media-breakpoint-up(xl) {
       text-align: left;
     }
 
     &-label {
-      padding: 10px 12px;
+      padding: 6px 12px;
 
-      @media (min-width: $screen-lg-min) {
+      @include media-breakpoint-up(xl) {
         display: inline-block;
       }
     }
@@ -57,13 +77,13 @@
     &-link {
       &-container {
 
-        @media (min-width: $screen-lg-min) {
+        @include media-breakpoint-up(xl) {
           display: inline-block;
           float: right;
         }
 
         a {
-          @media (min-width: $screen-lg-min) {
+          @include media-breakpoint-up(xl) {
             width: inherit;
           }
         }

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

@@ -1,25 +1,28 @@
-[data-map="home"] {
-  height: 400px;
-}
 
-.home-search-area {
-  
-  h2,
-  h3 {
-    text-align: center;
-  }
-  
-  .input-group.search-input-group {
-    width: 100%;
+.geobl-homepage-masthead {
+  .search-query-form {
+    max-width: 100%;
   }
 }
 
-.category-block {
-  @extend .col-md-6;
-  @extend .text-center;
-  min-height: 240px;
-  
-  .category-icon {
-    font-size: 6em;
+#main-container {
+  .category-block {
+    min-height: 240px;
+
+    .category-icon {
+      font-size: 6em;
+    }
+  }
+
+  [data-map="home"] {
+    height: 400px;
+
+    .leaflet-control-container {
+      .search-control {
+        a {
+          color: $white;
+        }
+      }
+    }
   }
 }

data/app/assets/stylesheets/geoblacklight/modules/icon-customization.scss

@@ -1,7 +1,7 @@
 // Additional customizations beyond generated FontCustom styles
 
 .geoblacklight-icon {
-  color: $gray-light;
+  color: $gray-600;
   font-size: 1.2em;
 }
 

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

@@ -0,0 +1,7 @@
+.index-map-info {
+  margin-top: 20px;
+
+  dl, dt, dd {
+    margin: 5px 0;
+  }
+}

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

@@ -1,10 +1,13 @@
 #document {
-  .row {
-    margin-top: 24px;
-    margin-bottom: 24px;
+  .document-metadata.dl-invert {
+     dt {
+      font-weight: bold;
+    }
+  }
 
+  #viewer-container {
     [data-map="item"] {
-      height: 440px;
+      height: 27.5rem;
     }
 
     [data-inspect="true"][data-available="true"] {
@@ -15,9 +18,5 @@
         cursor: crosshair;
       }
     }
-
-    .download-element {
-      padding-bottom: 10px;
-    }
   }
 }

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

@@ -18,5 +18,14 @@
         display: inline-block;
       }
     }
+
+    // Begin - Addresses GBL issue #766 - adds space betwwen the links in the metadata modal
+    .nav>li>a {
+      position: relative;
+      display: block;
+      padding: 10px 15px;
+    }
+    //End - Addresses GBL issue #766
+
   }
 }

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

@@ -4,7 +4,9 @@
 
 .more-info-area {
   float: left;
+  order:3;
   max-height: 100px;
+  overflow:hidden;
 }
 
 .text-span{
@@ -20,14 +22,17 @@
 }
 
 .status-icons {
-  float: right;
-  margin-right: 10px;
+  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 {