Merge pull request #106 from griidc/release/5.9.0

Release/5.9.0
griidc · Dec 4, 2018 · 55a8f9f · 55a8f9f
2 parents 3664eb3 + 903e1ce
commit 55a8f9f
Show file tree

Hide file tree

Showing 7 changed files with 119 additions and 38 deletions.
diff --git a/src/Pelagos/Bundle/AppBundle/Controller/UI/DatalandController.php b/src/Pelagos/Bundle/AppBundle/Controller/UI/DatalandController.php
@@ -73,6 +73,19 @@ public function defaultAction($udi)
             $downloadCount = $query->getSingleScalarResult();
         }
 
+        if ($dataset->getAvailabilityStatus() === DatasetSubmission::AVAILABILITY_STATUS_PUBLICLY_AVAILABLE) {
+            $data = array(
+                '#type' => 'markup',
+                '#markup' => $this->render(
+                    'PelagosAppBundle:Dataland:metadata.markup.twig',
+                    array(
+                        'dataset' => $dataset,
+                    )
+                )->getContent()
+            );
+            drupal_add_html_head($data, 'json-ld');
+        }
+
         return $this->render(
             'PelagosAppBundle:Dataland:index.html.twig',
             $twigData = array(

diff --git a/src/Pelagos/Bundle/AppBundle/Controller/UI/DatasetReviewController.php b/src/Pelagos/Bundle/AppBundle/Controller/UI/DatasetReviewController.php
@@ -589,23 +589,33 @@ private function reviewMode(Request $request, DatasetSubmission $datasetSubmissi
             }
             return $datasetSubmission;
         } elseif ('review' === $this->mode) {
-            switch (true) {
-                case ($datasetSubmissionStatus === DatasetSubmission::STATUS_COMPLETE and $datasetSubmissionDatasetStatus !== Dataset::DATASET_STATUS_BACK_TO_SUBMITTER):
-                    $datasetSubmission = $this->createNewDatasetSubmission($datasetSubmission);
-                    break;
-
-                case ($datasetSubmissionStatus === DatasetSubmission::STATUS_IN_REVIEW and ($datasetSubmissionDatasetStatus === Dataset::DATASET_STATUS_IN_REVIEW or $datasetSubmissionDatasetStatus === Dataset::DATASET_STATUS_SUBMITTED)):
-                    $datasetSubmissionReview = $datasetSubmission->getDatasetSubmissionReview();
-                    switch (true) {
-                        case (empty($datasetSubmissionReview) || $datasetSubmissionReview->getReviewEndDateTime()):
-                            $datasetSubmission = $this->createNewDatasetSubmission($datasetSubmission);
-                            break;
-                        case (empty($datasetSubmissionReview->getReviewEndDateTime()) and $datasetSubmissionReview->getReviewedBy() !== $this->getUser()->getPerson()):
-                            $reviewerUserName  = $this->entityHandler->get(Account::class, $datasetSubmissionReview->getReviewedBy())->getUserId();
-                            $this->addToWarningDisplayQueue($request, $udi, 'locked', $reviewerUserName);
-                            break;
-                    }
-                    break;
+            if ($datasetSubmissionDatasetStatus === $datasetSubmission->getDatasetStatus()) {
+                switch (true) {
+                    case ($datasetSubmissionStatus === DatasetSubmission::STATUS_COMPLETE and $datasetSubmissionDatasetStatus !== Dataset::DATASET_STATUS_BACK_TO_SUBMITTER):
+                        $datasetSubmission = $this->createNewDatasetSubmission($datasetSubmission);
+                        break;
+                    case ($datasetSubmissionStatus === DatasetSubmission::STATUS_IN_REVIEW
+                        and ($datasetSubmissionDatasetStatus === Dataset::DATASET_STATUS_IN_REVIEW
+                            or $datasetSubmissionDatasetStatus === Dataset::DATASET_STATUS_SUBMITTED)):
+                        $datasetSubmissionReview = $datasetSubmission->getDatasetSubmissionReview();
+                        switch (true) {
+                            case (empty($datasetSubmissionReview) || $datasetSubmissionReview->getReviewEndDateTime()):
+                                $datasetSubmission = $this->createNewDatasetSubmission($datasetSubmission);
+                                break;
+                            case (empty($datasetSubmissionReview->getReviewEndDateTime())
+                                and $datasetSubmissionReview->getReviewedBy() !== $this->getUser()->getPerson()):
+                                $reviewerUserName  = $this->entityHandler->get(Account::class, $datasetSubmissionReview->getReviewedBy())->getUserId();
+                                $this->addToWarningDisplayQueue($request, $udi, 'locked', $reviewerUserName);
+                                break;
+                        }
+                        break;
+                }
+            } else {
+                if ($datasetSubmissionDatasetStatus === Dataset::DATASET_STATUS_IN_REVIEW
+                    and $datasetSubmissionDatasetStatus !== $datasetSubmission->getDatasetStatus()
+                    and $datasetSubmission->getDatasetStatus() === Dataset::DATASET_STATUS_BACK_TO_SUBMITTER) {
+                    $datasetSubmission = $this->createNewDatasetSubmission($dataset->getDatasetSubmission());
+                }
             }
         }
         return $datasetSubmission;

diff --git a/src/Pelagos/Bundle/AppBundle/Controller/UI/SearchTermsReportController.php b/src/Pelagos/Bundle/AppBundle/Controller/UI/SearchTermsReportController.php
@@ -54,10 +54,11 @@ protected function getData()
     {
         //prepare labels
         $labels = array('labels' => array(
-            'SESSION ID', 'TIMESTAMP', 'SEARCH TERMS', 'NUMBER OF RESULTS',
+            'SESSION ID', 'TIMESTAMP', 'SEARCH TERMS', 'GEOFILTER USED', 'NUMBER OF RESULTS',
             '1ST SCORE', '2ND SCORE',
             '1ST UDI', '1ST TITLE', '1ST LINK',
-            '2ND UDI', '2ND TITLE', '2ND LINK'
+            '2ND UDI', '2ND TITLE', '2ND LINK',
+            'GEOFILTER WKT'
             )
         );
 
@@ -131,9 +132,14 @@ protected function getData()
                     'sessionID' => $result['payLoad']['clientInfo']['sessionId'],
                     'timeStamp' => $result['creationTimeStamp']->format(parent::INREPORT_TIMESTAMPFORMAT),
                     'searchTerms' => $result['payLoad']['filters']['textFilter'],
+                    'geofilterUsed' => $result['payLoad']['filters']['geoFilter'] !== null ? 1 : 0,
                     'numResults' => $numResults
                 ),
-                $searchResults
+                $searchResults,
+                array
+                (
+                    'geofilterWkt' => $result['payLoad']['filters']['geoFilter'] !== null ? $result['payLoad']['filters']['geoFilter'] : ''
+                )
             );
         }
         return array_merge($labels, $dataArray);

diff --git a/src/Pelagos/Bundle/AppBundle/Resources/public/js/gMap.js b/src/Pelagos/Bundle/AppBundle/Resources/public/js/gMap.js
@@ -1,12 +1,12 @@
 (function($) {
     "use strict";
-    
+
     $.fn.gMap = function(options) {
         return this.each(function() {
             var gml = $(this).data("extent");
-            
+
             var thisMap = this;
-            
+
             jQuery.ajax({
                 url: Routing.generate("pelagos_app_gml_towkt"),
                 type: "POST",
@@ -18,46 +18,72 @@
             });
         });
     };
-    
+
     function renderMap(map, wkt) {
         var raster = new ol.layer.Tile({
             source: new ol.source.OSM()
         });
-        
+
         var format = new ol.format.WKT();
-        
+
         var googleLayerSatellite = new ol.layer.Tile({
             title: "Google Satellite",
-            source: new ol.source.TileImage({ 
-                url: "https://mt1.google.com/vt/lyrs=s&hl=pl&&x={x}&y={y}&z={z}" 
+            source: new ol.source.TileImage({
+                url: "https://mt1.google.com/vt/lyrs=y&hl=en&&x={x}&y={y}&z={z}"
             }),
         });
 
         var feature = format.readFeature(wkt, {
             dataProjection: "EPSG:4326",
             featureProjection: "EPSG:3857"
         });
-
-        var vector = new ol.layer.Vector({
-            source: new ol.source.Vector({
-                features: [feature]
+
+        var style = new ol.style.Style({
+            fill: new ol.style.Fill({
+              color: "rgba(255, 255, 255, 0)"
+            }),
+            stroke: new ol.style.Stroke({
+              color: "rgba(255, 165, 0, 0.6)",
+              width: 2
+            }),
+            image: new ol.style.Circle({
+                radius: 8,
+                fill: new ol.style.Fill({
+                    color: "rgba(255, 255, 255, 0)"
+                }),
+                stroke: new ol.style.Stroke({
+                  color: "rgba(255, 165, 0, 0.6)",
+                  width: 2
+                })
             })
         });
 
+        var source = new ol.source.Vector({
+            features: [feature]
+        });
+
+        var vector = new ol.layer.Vector({
+            source: source,
+            style: [style]
+        });
+
         var view = new ol.View({
           center: ol.proj.fromLonLat([-90.5, 25]),
           zoom: 4,
           maxZoom: 12,
-          minZoom: 1
+          minZoom: 1,
         });
-              
+
         var map = new ol.Map({
             target: map,
             layers: [
                 googleLayerSatellite, vector
             ],
             view: view
         });
+
+        var extent = source.getExtent();
+        map.getView().fit(extent, map.getSize());
 
     };
 }(jQuery));
diff --git a/src/Pelagos/Bundle/AppBundle/Resources/views/Dataland/metadata.markup.twig b/src/Pelagos/Bundle/AppBundle/Resources/views/Dataland/metadata.markup.twig
@@ -0,0 +1,28 @@
+<script type="application/ld+json">
+{
+   "name" : "{{dataset.title}}", 
+   "alternateName" : "{{dataset.datasetSubmission.shortTitle}}",
+   "description" : "{{dataset.abstract}}",
+   "identifier " : "{{dataset.doi}}",
+   "keywords" : "{{dataset.datasetSubmission.themeKeywords | join(',')}}",
+   "license " : "https://creativecommons.org/share-your-work/public-domain/cc0",
+   "url " : "https://data.gulfresearchinitiative.org/data/{{dataset.udi}}",
+   "publisher" : {
+      "url" : "https://data.gulfresearchinitiative.org",
+      "name" : "Gulf of Mexico Research Initiative Information and Data Cooperative (GRIIDC)",
+      "contactPoint" : [
+         {
+            "email" : "[email protected]",
+            "contactType" : "technical support",
+            "availableLanguage" : "English",
+            "url" : "https://data.gulfresearchinitiative.org/",
+            "@type" : "ContactPoint"
+         }
+      ],
+      "@type" : "Organization"
+   },
+   "datePublished" : "{{dataset.acceptedDate|date('c', 'UTC') }}",
+   "@type" : "Dataset",
+   "@context" : "http://schema.org"
+}
+</script>
diff --git a/src/Pelagos/Bundle/AppBundle/Resources/views/SideBySide/extent.html.twig b/src/Pelagos/Bundle/AppBundle/Resources/views/SideBySide/extent.html.twig
@@ -15,7 +15,7 @@
                     <div id="spatial">
                         <label><span class="emRequired"/>Spatial Extent</label>
                         <div>
-                            <div style="width:500px;height:300px;" class="smallmap" data-extent="{{ form.vars.value.spatialExtent }}"/>
+                            <div style="width:90%;height:600px;" class="smallmap" data-extent="{{ form.vars.value.spatialExtent }}"/>
                         </div>
                         {{ form_row(form.spatialExtent) }}
                     </div>

diff --git a/src/Pelagos/Entity/Dataset.php b/src/Pelagos/Entity/Dataset.php
@@ -742,9 +742,7 @@ public function getSpatialExtentGeometry()
         $dif = $this->getDif();
         $spatialExtent = null;
 
-        // If there is an accepted dataset submission, use its geometry or else use the geometry from DIF.
-        if ($datasetSubmission instanceof DatasetSubmission and $this->datasetStatus === self::DATASET_STATUS_ACCEPTED
-            and $datasetSubmission->getSpatialExtent()) {
+        if ($datasetSubmission instanceof DatasetSubmission) {
             $spatialExtent = $datasetSubmission->getSpatialExtent();
         } elseif ($dif instanceof DIF and $dif->getStatus() === DIF::STATUS_APPROVED and $dif->getSpatialExtentGeometry()) {
             $spatialExtent = $dif->getSpatialExtentGeometry();