Merge pull request #881 from oceanzus/master_1911_MAB

Changes to support Coastal Pioneer MAB deployment
oceanobservatories · Apr 3, 2024 · ed30f1f · ed30f1f
2 parents 209ca25 + 9647778
commit ed30f1f
Show file tree

Hide file tree

Showing 19 changed files with 120 additions and 70 deletions.
diff --git a/ooiui/static/img/home/coastal_pioneer/Pioneer_MAB_SSSEA_Final_Fig_1.png b/ooiui/static/img/home/coastal_pioneer/Pioneer_MAB_SSSEA_Final_Fig_1.png
diff --git a/ooiui/static/js/core/science/map.js b/ooiui/static/js/core/science/map.js
@@ -76,11 +76,11 @@ function addMarkers(map,markers){
 	$.getJSON( "/gettoc/?", function( data ) {  
 
       /* TOC Menu  */           	
-      buildtocmenu(data['CP']);
+      buildtocmenu(data['CP0']);
 
 	  var markerList = [];    
       $.each( data, function( array, list ) {        
-        if (array == "CP"){
+        if (array == "CP0"){
             $.each( list, function( platform_idx, platform_ob ) {
 
                 lat = platform_ob['lat']

diff --git a/ooiui/static/js/models/asset_management/PlatformModel.js b/ooiui/static/js/models/asset_management/PlatformModel.js
@@ -105,7 +105,7 @@ var PlatformCollection = Backbone.Collection.extend({
         var filtered = this.filter(function (platform) {
             if (platform.get('reference_designator') !== "" && (platform.get('reference_designator').length === 14 ||
                 platform.get('reference_designator').indexOf('GL') > -1) || platform.get('reference_designator').length === 8) {
-                return platform.get('reference_designator').substr(0,2) === array;
+                return platform.get('reference_designator').substr(0,3) === array;
             }
         });
         return new PlatformCollection(filtered);

diff --git a/ooiui/static/js/models/asset_management/PlatformsStatusModel.js b/ooiui/static/js/models/asset_management/PlatformsStatusModel.js
@@ -164,7 +164,7 @@ var PlatformsStatusCollection = Backbone.Collection.extend({
     var filtered = this.filter(function (platform) {
       if (platform.get('reference_designator') !== "" && (platform.get('reference_designator').length === 14 ||
         platform.get('reference_designator').indexOf('GL') > -1) || platform.get('reference_designator').length === 8) {
-        return platform.get('reference_designator').substr(0,2) === array;
+        return platform.get('reference_designator').substr(0,3) === array;
       }
     });
     return new PlatformCollection(filtered);

diff --git a/ooiui/static/js/models/science/GliderTrackModel.js b/ooiui/static/js/models/science/GliderTrackModel.js
@@ -3,13 +3,14 @@ var GliderTrackModel = Backbone.Model.extend({
   defaults: {
         enabled: false,
         arrayCodes:{
-            "CP":"Coastal Pioneer",
-            "CE":"Coastal Endurance",
-            "RS":"Cabled Array",
-            "GP":"Station Papa",
-            "GI":"Irminger Sea",
-            "GA":"Argentine Basin",
-            "GS":"Southern Ocean"
+            "CP0":"Coastal Pioneer NES",
+            "CP1":"Coastal Pioneer MAB",
+            "CE0":"Coastal Endurance",
+            "RS0":"Cabled Array",
+            "GP0":"Station Papa",
+            "GI0":"Irminger Sea",
+            "GA0":"Argentine Basin",
+            "GS0":"Southern Ocean"
         }
   }
 });

diff --git a/ooiui/static/js/partials/StreamQuickView.html b/ooiui/static/js/partials/StreamQuickView.html
@@ -14,13 +14,14 @@
                 <h4>Data Stream Quick View</h4>
                 <em>Data are sorted by end date, most recent first</em>
                 <div class="array-select">
-                    <span data-value="CE" class="active">Endurance</span>
-                    <span data-value="GP">Station Papa</span>
-                    <span data-value="CP">Pioneer</span>
-                    <span data-value="GA">Argentine Basin</span>
-                    <span data-value="GI">Irminger Sea</span>
-                    <span data-value="GS">Southern Ocean</span>
-                    <span data-value="RS">Cabled Array</span>
+                    <span data-value="CE0" class="active">Endurance</span>
+                    <span data-value="GP0">Station Papa</span>
+                    <span data-value="CP0">Pioneer NES</span>
+                    <span data-value="CP1">Pioneer MAB</span>
+                    <span data-value="GA0">Argentine Basin</span>
+                    <span data-value="GI0">Irminger Sea</span>
+                    <span data-value="GS0">Southern Ocean</span>
+                    <span data-value="RS0">Cabled Array</span>
                 </div>
                 <div class="time-filter">
                     <div><input id="isEngChkBox"

diff --git a/...js/partials/data_catalog/search_sidebar/components/filters/asset_filters/ArrayFilter.html b/...js/partials/data_catalog/search_sidebar/components/filters/asset_filters/ArrayFilter.html
@@ -11,22 +11,25 @@
                     <label><input type="checkbox" value="RS01">Cabled Array - Continental Margin</label>
                 </div>
                 <div class="checkbox">
-                    <label><input type="checkbox" value="CE">Coastal Endurance</label>
+                    <label><input type="checkbox" value="CE0">Coastal Endurance</label>
                 </div>
                 <div class="checkbox">
-                    <label><input type="checkbox" value="CP">Coastal Pioneer</label>
+                    <label><input type="checkbox" value="CP0">Coastal Pioneer NES</label>
                 </div>
                 <div class="checkbox">
-                    <label><input type="checkbox" value="GA">Global Argentine Basin</label>
+                    <label><input type="checkbox" value="CP1">Coastal Pioneer MAB</label>
                 </div>
                 <div class="checkbox">
-                    <label><input type="checkbox" value="GI">Global Irminger Sea</label>
+                    <label><input type="checkbox" value="GA0">Global Argentine Basin</label>
                 </div>
                 <div class="checkbox">
-                    <label><input type="checkbox" value="GS">Global Southern Ocean</label>
+                    <label><input type="checkbox" value="GI0">Global Irminger Sea</label>
                 </div>
                 <div class="checkbox">
-                    <label><input type="checkbox" value="GP">Global Station Papa</label>
+                    <label><input type="checkbox" value="GS0">Global Southern Ocean</label>
+                </div>
+                <div class="checkbox">
+                    <label><input type="checkbox" value="GP0">Global Station Papa</label>
                 </div>
             </div>
         </div>

diff --git a/ooiui/static/js/partials/home/array_content/ArrayContentSummaryItem.html b/ooiui/static/js/partials/home/array_content/ArrayContentSummaryItem.html
@@ -22,7 +22,7 @@ <h4 id="<%= properties.code %>" class="js-expand">
                 </ul>
             </div>
 
-            <% if (properties.code === 'CE') { %>
+            <% if (properties.code === 'CE0') { %>
             <p>
             <img style="width: 40%; float: right" src="/img/home/coastal_endurance/endurance_1.jpg"uThe Endurance Array is a multi-scaled array utilizing fixed and mobile assets to observe cross-shelf and along-shelf variability in the coastal upwelling region of the Oregon and Washington coasts. The array also provides an extensive spatial footprint that encompasses a prototypical eastern boundary current regime and connectivity with the Cabled Array.
             <br><br>
@@ -40,7 +40,7 @@ <h4 id="<%= properties.code %>" class="js-expand">
             </div>
             <% } %>
 
-            <% if (properties.code === 'GP') { %>
+            <% if (properties.code === 'GP0') { %>
             <div>
                 <p>
                 <img style="float:right; width: 40%;" src="/img/home/station_papa/papa_2.png">
@@ -58,21 +58,35 @@ <h4 id="<%= properties.code %>" class="js-expand">
             </div>
             <% } %>
 
-            <% if (properties.code === 'CP') { %>
+            <% if (properties.code === 'CP0') { %>
             <div>
                 <p>
                 <img style="float:left; width: 30%; padding: 10px;" src="/img/home/coastal_pioneer/pioneer_4.png">
                 <img style="float:right;" src="/img/home/coastal_pioneer/pioneer_2.jpeg">
-                The Pioneer Array is located off the coast of New England, south of Martha’s Vineyard. The Continental Shelf-Slope area off the New England coast is a highly productive area and one that is located at a dynamic intersection where ocean currents meet in weather-like “fronts,” and where nutrients, pollutants, and other properties are exchanged between the coast and the deep ocean. Data from the inshore shelf area helps to examine exchanges between the shelf and slope and the shelf ecosystem, as well as providing broader insight into the issues of air-sea gas exchange, including carbon dioxide.
-                <br></br>
+                The Pioneer New England Shelf (NES) Array is located off the coast of New England, south of Martha’s Vineyard. The Continental Shelf-Slope area off the New England coast is a highly productive area and one that is located at a dynamic intersection where ocean currents meet in weather-like “fronts,” and where nutrients, pollutants, and other properties are exchanged between the coast and the deep ocean. Data from the inshore shelf area helps to examine exchanges between the shelf and slope and the shelf ecosystem, as well as providing broader insight into the issues of air-sea gas exchange, including carbon dioxide.
+                <br><br>
                 The backbone of the Pioneer Array is a frontal-scale moored array with three electro-mechanical surface moorings and seven profiler moorings. Each surface mooring incorporates a surface buoy with multiple sources of power generation and multiple surface and subsurface communications systems. Each surface mooring is anchored by a Multi-Function Node (MFN) on the seafloor. All three MFNs are capable of supporting multiple onboard (e.g., frame-mounted) sensors as well as external sensor packages attached by wet-mate connectors. Five profiler moorings with surface expressions for data telemetry support wire-following profiling packages with a multidisciplinary sensor suite. Two surface piercing profiler moorings use a buoyant instrument package capable of profiling from a few meters above the bottom up to the air-sea interface.
                 <br><br>
                 In order to provide synoptic, multi-scale observations of the outer continental shelf, shelf break region, and continental slope, the moored array is supplemented by eight mobile platforms – six Coastal Gliders and two AUVs. The role of the Coastal Gliders is to monitor the mesoscale field of the slope sea and outer shelf, resolving rings, eddies and meanders from the Gulf Stream as they impinge on the shelf break front. The AUVs are the primary tools for resolving cross- and along-front “eddy fluxes” due to frontal instabilities, wind forcing, and mesoscale variability.
                 </p>
             </div>
             <% } %>
 
-            <% if (properties.code === 'GA') { %>
+            <% if (properties.code === 'CP1') { %>
+            <div>
+                <p>
+                <img style="float:left; width: 30%; padding: 10px;" src="/img/home/coastal_pioneer/pioneer_4.png">
+                <img style="float:right;" src="/img/home/coastal_pioneer/Pioneer_MAB_SSSEA_Final_Fig_1.png">
+                    The Pioneer Mid-Atlantic Bight (MAB) Array, located off the coast of North Carolina, consists of a mooring array supplemented by glider and AUV transects. The MAB continental shelf north of Cape Hatteras is characterized by a persistent equator-ward current originating from the north, a shelfbreak front separating shelf and slope waters, distributed buoyancy inputs from rivers, variable wind forcing, and intermittent offshore forcing by Gulf Stream rings and meanders. The Pioneer MAB Array would be designed to resolve transport processes and ecosystem dynamics in the vicinity of the shelfbreak front, which is a region of complex oceanographic dynamics, intermittent mesoscale variability, and enhanced biological productivity. The Array collects high-resolution, multidisciplinary, measurements spanning the continental shelf and slope on horizontal scales from a few kilometers to about one hundred kilometers.
+                <br><br>
+                    The backbone of the Pioneer Array is a frontal-scale, T-shaped moored array located off the coast of Nags Head, North Carolina, starting ~25 km offshore and extending ~50 km east/west and ~50 km north/south across the continental shelf, centered near the shelf-break front. Three electro-mechanical surface moorings and seven profiler moorings occupy the array. Each surface mooring incorporates a surface buoy with multiple sources of power generation and multiple surface and subsurface communications systems. The surface moorings support a Near-Surface Instrument Frame (NSIF) and are anchored by an instrumented Multi-Function Node (MFN) on the seafloor. Five profiler moorings with surface expressions for data telemetry support wire-following profiling packages with a multidisciplinary sensor suite. Two shallow-water profiler moorings support a wave-powered profiler capable of sampling the upper 80% of the water column, to within a few meters of the air-sea interface. The ten moorings occupy seven sites; three sites contain both a surface mooring and a profiler mooring.
+                <br><br>
+                    In order to provide synoptic, multi-scale observations of the outer continental shelf, shelf break region, and continental slope, the moored array is supplemented by six mobile platforms – four Coastal Gliders and two AUVs. The role of the gliders is to provide transects along and across the shelf, and to monitor the mesoscale field of the slope sea, resolving rings, eddies and meanders from the Gulf Stream as they impinge on the shelfbreak front. The AUVs provide synoptic across- and along-front transects – “snap shots” of the front on time scales shorter than those on which the system changes.
+
+            </div>
+            <% } %>
+
+            <% if (properties.code === 'GA0') { %>
             <div>
                 <p>
                 <img style="float:left; width: 100%; padding: 0 10px 20px 10px;" src="/img/home/argentine/argentine_2.png">
@@ -87,7 +101,7 @@ <h4 id="<%= properties.code %>" class="js-expand">
             </div>
             <% } %>
 
-            <% if (properties.code === 'GI') { %>
+            <% if (properties.code === 'GI0') { %>
             <div>
                 <p>
                 <img style="float:right; width: 40%" src="/img/home/irminger/irminger_3.png" alt="Irminger">The global component of the OOI design includes a network of moorings at critical, yet under-sampled, high-latitude locations such as within the Irminger Sea in the North Atlantic. Moorings located in the Irminger Sea support sensors for measurement of air-sea fluxes of heat, moisture, and momentum, and physical, biological, and chemical properties throughout the water column.
@@ -100,7 +114,7 @@ <h4 id="<%= properties.code %>" class="js-expand">
             </div>
             <% } %>
 
-            <% if (properties.code === 'GS') { %>
+            <% if (properties.code === 'GS0') { %>
             <div>
                 <p>
                 <img style="float:right; width: 40%;" src="/img/home/southern_ocean/southern_1.png">
@@ -115,7 +129,7 @@ <h4 id="<%= properties.code %>" class="js-expand">
             </div>
             <% } %>
 
-            <% if (properties.code === 'RS') { %>
+            <% if (properties.code === 'RS0') { %>
             <div>
                 <p>
                 <img style="float:right; width: 100%; padding-bottom: 5px;" src="/img/home/cabled_array/cabled_1.png">

diff --git a/ooiui/static/js/partials/home/array_content/ArrayStatusSummaryItem.html b/ooiui/static/js/partials/home/array_content/ArrayStatusSummaryItem.html
@@ -28,7 +28,7 @@ <h4 id="<%= properties.code %>" class="js-expand"><%= properties.description %>
                 </ul>
             </div>
 
-            <% if (properties.code === 'CE') { %>
+            <% if (properties.code === 'CE0') { %>
             <p>
             <img style="width: 40%; float: right" src="/img/home/coastal_endurance/endurance_1.jpg"uThe Endurance Array is a multi-scaled array utilizing fixed and mobile assets to observe cross-shelf and along-shelf variability in the coastal upwelling region of the Oregon and Washington coasts. The array also provides an extensive spatial footprint that encompasses a prototypical eastern boundary current regime and connectivity with the Cabled Array.
             <br><br>
@@ -46,7 +46,7 @@ <h4 id="<%= properties.code %>" class="js-expand"><%= properties.description %>
             </div>
             <% } %>
 
-            <% if (properties.code === 'GP') { %>
+            <% if (properties.code === 'GP0') { %>
             <div>
                 <p>
                 <img style="float:right; width: 40%;" src="/img/home/station_papa/papa_2.png">
@@ -64,7 +64,7 @@ <h4 id="<%= properties.code %>" class="js-expand"><%= properties.description %>
             </div>
             <% } %>
 
-            <% if (properties.code === 'CP') { %>
+            <% if (properties.code === 'CP0') { %>
             <div>
                 <p>
                 <img style="float:left; width: 30%; padding: 10px;" src="/img/home/coastal_pioneer/pioneer_4.png">
@@ -78,7 +78,16 @@ <h4 id="<%= properties.code %>" class="js-expand"><%= properties.description %>
             </div>
             <% } %>
 
-            <% if (properties.code === 'GA') { %>
+            <% if (properties.code === 'CP1') { %>
+            <div>
+                <p>
+                <img style="float:left; width: 30%; padding: 10px;" src="/img/home/coastal_pioneer/pioneer_4.png">
+                <img style="float:right;" src="/img/home/coastal_pioneer/pioneer_2.jpeg">
+                The Pioneer Array MAB
+            </div>
+            <% } %>
+
+            <% if (properties.code === 'GA0') { %>
             <div>
                 <img style="float:left; width: 100%; padding: 0 10px 20px 10px;" src="/img/home/argentine/argentine_2.png">
                 <p>
@@ -93,7 +102,7 @@ <h4 id="<%= properties.code %>" class="js-expand"><%= properties.description %>
             </div>
             <% } %>
 
-            <% if (properties.code === 'GI') { %>
+            <% if (properties.code === 'GI0') { %>
             <div>
                 <p>
                 <img style="float:right; width: 40%" src="/img/home/irminger/irminger_3.png">The global component of the OOI design includes a network of moorings at critical, yet under-sampled, high-latitude locations such as within the Irminger Sea in the North Atlantic. Moorings located in the Irminger Sea support sensors for measurement of air-sea fluxes of heat, moisture, and momentum, and physical, biological, and chemical properties throughout the water column.
@@ -106,7 +115,7 @@ <h4 id="<%= properties.code %>" class="js-expand"><%= properties.description %>
             </div>
             <% } %>
 
-            <% if (properties.code === 'GS') { %>
+            <% if (properties.code === 'GS0') { %>
             <div>
                 <p>
                 <img style="float:right; width: 40%;" src="/img/home/southern_ocean/southern_1.png">
@@ -121,7 +130,7 @@ <h4 id="<%= properties.code %>" class="js-expand"><%= properties.description %>
             </div>
             <% } %>
 
-            <% if (properties.code === 'RS') { %>
+            <% if (properties.code === 'RS0') { %>
             <div>
                 <img style="float:right; width: 100%; padding-bottom: 5px;" src="/img/home/cabled_array/cabled_1.png">
 

diff --git a/ooiui/static/js/views/common/MapView.js b/ooiui/static/js/views/common/MapView.js
@@ -786,12 +786,13 @@ var ASSET_ARRAY = (function() {
             "southern":[200,250]
         },
         arrayCodes =   {
-            "CP":"Coastal Pioneer",
-            "CE":"Endurance & Cabled Array",
-            "GP":"Station Papa",
-            "GI":"Irminger Sea",
-            "GA":"Argentine Basin",
-            "GS":"Southern Ocean"
+            "CP0":"Coastal Pioneer NES",
+            "CP1":"Coastal Pioneer MAB",
+            "CE0":"Endurance & Cabled Array",
+            "GP0":"Station Papa",
+            "GI0":"Irminger Sea",
+            "GA0":"Argentine Basin",
+            "GS0":"Southern Ocean"
         };
     return {
         getArrayTitle :     function(key) { return (key) ? arrayTitle[key] : arrayTitle; },

diff --git a/ooiui/static/js/views/common/TOCView.js b/ooiui/static/js/views/common/TOCView.js
@@ -47,7 +47,7 @@ var TOCView = Backbone.View.extend({
         filteredPlatforms.map(function(model) {
             try {
                 // get the array code from the reference designator
-                arrayCode = model.get('ref_des').substr(0,2);
+                arrayCode = model.get('ref_des').substr(0,3);
                 // set the target to where this item will be inserted.
                 arrayTarget = '#array_'+ arrayCode;
                 if ( document.getElementById( model.get('ref_des').substring(0,8)) === null ) {

diff --git a/...atic/js/views/data_catalog/search_sidebar/components/filters/asset_filters/ArrayFilter.js b/...atic/js/views/data_catalog/search_sidebar/components/filters/asset_filters/ArrayFilter.js
@@ -38,7 +38,7 @@ var ArrayFilterView = FilterParentView.extend({
         var initialFilter = vobj.hash || location.hash;
 
         if (initialFilter.length > 0) {
-            var arrayCode = initialFilter.substr(0,2);
+            var arrayCode = initialFilter.substr(0,3);
             var selector = '[value="'+arrayCode+'"]';
             $(selector).prop('checked', true);
             this.addToArrayFilters(arrayCode);