@@ -40,7 +40,7 @@
@@ -40,7 +40,7 @@
@@ -58,13 +58,13 @@
- 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.
-
+ 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.
+
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.
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.
@@ -72,7 +72,21 @@
+
+ 
+ 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.
+
+ 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.
+
+ 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.
+
+
@@ -87,7 +101,7 @@
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 @@
@@ -115,7 +129,7 @@
diff --git a/ooiui/static/js/partials/home/array_content/ArrayStatusSummaryItem.html b/ooiui/static/js/partials/home/array_content/ArrayStatusSummaryItem.html
index 356db2631..a8847f69a 100644
--- a/ooiui/static/js/partials/home/array_content/ArrayStatusSummaryItem.html
+++ b/ooiui/static/js/partials/home/array_content/ArrayStatusSummaryItem.html
@@ -28,7 +28,7 @@
@@ -46,7 +46,7 @@
@@ -64,7 +64,7 @@
@@ -78,7 +78,16 @@
+
+
+ The Pioneer Array MAB
+
@@ -93,7 +102,7 @@
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 @@
@@ -121,7 +130,7 @@
diff --git a/ooiui/static/js/views/common/MapView.js b/ooiui/static/js/views/common/MapView.js
index d773d00c1..897214b46 100644
--- 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
index 9bb9e9a3b..eca421fd9 100644
--- 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/ooiui/static/js/views/data_catalog/search_sidebar/components/filters/asset_filters/ArrayFilter.js b/ooiui/static/js/views/data_catalog/search_sidebar/components/filters/asset_filters/ArrayFilter.js
index 5233fc9ce..66798adf5 100644
--- a/ooiui/static/js/views/data_catalog/search_sidebar/components/filters/asset_filters/ArrayFilter.js
+++ b/ooiui/static/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);
diff --git a/ooiui/static/js/views/home/array_content/array_content.js b/ooiui/static/js/views/home/array_content/array_content.js
index cb8de7409..fea979936 100644
--- a/ooiui/static/js/views/home/array_content/array_content.js
+++ b/ooiui/static/js/views/home/array_content/array_content.js
@@ -403,7 +403,7 @@ var ArrayContentSummaryItem = ParentView.extend({
var mBoundsCenter = mBounds.getCenter();
- if (code === 'CE') {
+ if (code === 'CE0') {
// if ( !_compareGeoLoc(map.getCenter(), loc) ) {
// flyFlyContext.originalZoom = map.getZoom();
// map.setLayoutProperty('rsArray', 'visibility', 'none');
@@ -416,7 +416,7 @@ var ArrayContentSummaryItem = ParentView.extend({
// } else {
// this._flyBye(flyFlyContext.originalZoom);
// }
- } else if (code === 'RS') {
+ } else if (code === 'RS0') {
// if ( !_compareGeoLoc(map.getCenter(), loc) ) {
// flyFlyContext.originalZoom = map.getZoom();
// map.setLayoutProperty('ceArray', 'visibility', 'none');
@@ -429,35 +429,42 @@ var ArrayContentSummaryItem = ParentView.extend({
// } else {
// this._flyBye(flyFlyContext.originalZoom);
// }
- } else if (code === 'CP') {
+ } else if (code === 'CP0') {
// if ( !_compareGeoLoc(map.getCenter(), loc) ) {
// flyFlyContext.originalZoom = map.getZoom();
map.setView(mBoundsCenter, 8, {animate: false});
// } else {
// this._flyBye(flyFlyContext.originalZoom);
// }
- } else if (code === 'GS') {
+ } else if (code === 'CP1') {
+ // if ( !_compareGeoLoc(map.getCenter(), loc) ) {
+ // flyFlyContext.originalZoom = map.getZoom();
+ map.setView(mBoundsCenter, 8, {animate: false});
+ // } else {
+ // this._flyBye(flyFlyContext.originalZoom);
+ // }
+ } else if (code === 'GS0') {
// if ( !_compareGeoLoc(map.getCenter(), loc) ) {
// flyFlyContext.originalZoom = map.getZoom();
map.setView(mBoundsCenter, 6, {animate: false});
// } else {
// this._flyBye(flyFlyContext.originalZoom);
// }
- } else if (code === 'GI') {
+ } else if (code === 'GI0') {
// if ( !_compareGeoLoc(map.getCenter(), loc) ) {
// flyFlyContext.originalZoom = map.getZoom();
map.setView(mBoundsCenter, 7, {animate: false});
// } else {
// this._flyBye(flyFlyContext.originalZoom);
// }
- } else if (code === 'GA') {
+ } else if (code === 'GA0') {
// if ( !_compareGeoLoc(map.getCenter(), loc) ) {
// flyFlyContext.originalZoom = map.getZoom();
map.setView(mBoundsCenter, 6, {animate: false});
// } else {
// this._flyBye(flyFlyContext.originalZoom);
// }
- } else if (code === 'GP') {
+ } else if (code === 'GP0') {
// if ( !_compareGeoLoc(map.getCenter(), loc) ) {
// flyFlyContext.originalZoom = map.getZoom();
// map.setLayoutProperty('rsArray', 'visibility', 'none');
diff --git a/ooiui/static/js/views/home/array_content/status_content.js b/ooiui/static/js/views/home/array_content/status_content.js
index 76bc7e2c3..55e64e292 100644
--- a/ooiui/static/js/views/home/array_content/status_content.js
+++ b/ooiui/static/js/views/home/array_content/status_content.js
@@ -284,7 +284,7 @@ var ArrayContentSummaryItem = ParentView.extend({
} else {
this._flyBye(flyFlyContext.originalZoom);
}
- } else if (code === 'RS') {
+ } else if (code === 'RS0') {
if ( !_compareGeoLoc(map.getCenter(), loc) ) {
flyFlyContext.originalZoom = map.getZoom();
// map.setLayoutProperty('ceArray', 'visibility', 'none');
@@ -292,35 +292,42 @@ var ArrayContentSummaryItem = ParentView.extend({
} else {
this._flyBye(flyFlyContext.originalZoom);
}
- } else if (code === 'CP') {
+ } else if (code === 'CP0') {
if ( !_compareGeoLoc(map.getCenter(), loc) ) {
flyFlyContext.originalZoom = map.getZoom();
map.setView([loc[0], loc[1]],8);
} else {
this._flyBye(flyFlyContext.originalZoom);
}
- } else if (code === 'GS') {
+ } else if (code === 'CP1') {
+ if ( !_compareGeoLoc(map.getCenter(), loc) ) {
+ flyFlyContext.originalZoom = map.getZoom();
+ map.setView([loc[0], loc[1]],8);
+ } else {
+ this._flyBye(flyFlyContext.originalZoom);
+ }
+ } else if (code === 'GS0') {
if ( !_compareGeoLoc(map.getCenter(), loc) ) {
flyFlyContext.originalZoom = map.getZoom();
map.setView([loc[0], loc[1]],6);
} else {
this._flyBye(flyFlyContext.originalZoom);
}
- } else if (code === 'GI') {
+ } else if (code === 'GI0') {
if ( !_compareGeoLoc(map.getCenter(), loc) ) {
flyFlyContext.originalZoom = map.getZoom();
map.setView([loc[0], loc[1]],7);
} else {
this._flyBye(flyFlyContext.originalZoom);
}
- } else if (code === 'GA') {
+ } else if (code === 'GA0') {
if ( !_compareGeoLoc(map.getCenter(), loc) ) {
flyFlyContext.originalZoom = map.getZoom();
map.setView([loc[0], loc[1]],6);
} else {
this._flyBye(flyFlyContext.originalZoom);
}
- } else if (code === 'GP') {
+ } else if (code === 'GP0') {
if ( !_compareGeoLoc(map.getCenter(), loc) ) {
flyFlyContext.originalZoom = map.getZoom();
// map.setLayoutProperty('rsArray', 'visibility', 'none');
diff --git a/ooiui/static/js/views/home/tile_map/tile_map.js b/ooiui/static/js/views/home/tile_map/tile_map.js
index a1286078e..722d1f1c1 100644
--- a/ooiui/static/js/views/home/tile_map/tile_map.js
+++ b/ooiui/static/js/views/home/tile_map/tile_map.js
@@ -355,13 +355,13 @@ var TileMap = Backbone.View.extend({
// console.log('platform.feature.properties.code.length');
// console.log(platform.feature.properties.code.length);
- if(platform._icon && platform.feature.properties.code.length > 2){
+ if(platform._icon && platform.feature.properties.code.length > 3){
$(platform._icon).show();
platform._icon.style.opacity = 1;
platform._icon.style.zIndexOffset = 10000000;
// platform._icon.className = "leaflet-marker-icon mydivicon leaflet-zoom-animated leaflet-clickable"
}
- if(platform._icon && platform.feature.properties.code.length < 3){
+ if(platform._icon && platform.feature.properties.code.length < 4){
// console.log('Are we turning off the arrays or not?');
$(platform._icon).hide();
platform._icon.style.opacity = 0;
@@ -384,13 +384,13 @@ var TileMap = Backbone.View.extend({
if(!_.isUndefined(platform.feature)) {
// console.log('platform.feature.properties.code.length');
// console.log(platform.feature.properties.code.length);
- if (platform._icon && platform.feature.properties.code.length > 2) {
+ if (platform._icon && platform.feature.properties.code.length > 3) {
$(platform._icon).hide();
platform._icon.style.opacity = 0;
platform._icon.style.zIndex = -1;
// platform._icon.className = "leaflet-marker-icon mydivicon-nopointer leaflet-zoom-animated"
}
- if (platform._icon && platform.feature.properties.code.length < 3) {
+ if (platform._icon && platform.feature.properties.code.length < 4) {
$(platform._icon).show();
platform._icon.style.opacity = 1;
platform._icon.style.zIndexOffset = 10000000;
@@ -481,7 +481,7 @@ var TileMap = Backbone.View.extend({
// console.log(map._isArrayView);
if(!map._isArrayView) {
// Set table row with an orange border
- $('#' + feature.properties.code.substring(0, 2) + ' table tbody tr[data-code="' + feature.properties.code + '"]').css("border", "4px solid orange");
+ $('#' + feature.properties.code.substring(0, 3) + ' table tbody tr[data-code="' + feature.properties.code + '"]').css("border", "4px solid orange");
// Adds pop-up info on each point
content = '' + feature.properties.title + " (" + feature.properties.code + ")" + '
' + 'Latitude: ' + JSON.stringify(Number(event.latlng.lat.toFixed(4))) + '
Longitude: ' + JSON.stringify(Number(event.latlng.lng.toFixed(4))) + '';
@@ -497,7 +497,7 @@ var TileMap = Backbone.View.extend({
// Hide the pop-up info for a point
layer.on('mouseout', function (event) {
if(!map._isArrayView) {
- $('#' + feature.properties.code.substring(0, 2) + ' table tbody tr[data-code="' + feature.properties.code + '"]').css("border", "");
+ $('#' + feature.properties.code.substring(0, 3) + ' table tbody tr[data-code="' + feature.properties.code + '"]').css("border", "");
$('pre.infoInner').replaceWith('');
$('#infoArrayMap').css({"display": "none"}).fadeOut(10);
}
diff --git a/ooiui/static/js/views/platforms/tile_map/tile_map.js b/ooiui/static/js/views/platforms/tile_map/tile_map.js
index 6d64cb5fc..93b01acc4 100644
--- a/ooiui/static/js/views/platforms/tile_map/tile_map.js
+++ b/ooiui/static/js/views/platforms/tile_map/tile_map.js
@@ -191,7 +191,7 @@ var TileMap = Backbone.View.extend({
var otherSitesIcon = new L.divIcon({className: 'otherSitesIcon', iconSize: [20, 20]});
var referencePlatforms = [];
- var primaryArray = renderContext.platformId.substr(0,2);
+ var primaryArray = renderContext.platformId.substr(0,3);
_.each(renderContext.collection.toGeoJSON(), function(geoJSON) {
referencePlatforms.push(geoJSON);
});
diff --git a/ooiui/static/js/views/platforms/vector_map/vector_map.js b/ooiui/static/js/views/platforms/vector_map/vector_map.js
index adc8201eb..7c2130f14 100644
--- a/ooiui/static/js/views/platforms/vector_map/vector_map.js
+++ b/ooiui/static/js/views/platforms/vector_map/vector_map.js
@@ -89,7 +89,7 @@ var VectorMap = Backbone.View.extend({
}));
var referencePlatforms = [];
- var primaryArray = renderContext.platformId.substr(0,2);
+ var primaryArray = renderContext.platformId.substr(0,3);
_.each(renderContext.collection.byArray(primaryArray).toGeoJSON(), function(geoJSON) {
referencePlatforms.push(geoJSON);
});
diff --git a/ooiui/static/json/uiPatchNotes.json b/ooiui/static/json/uiPatchNotes.json
index b91209679..d06799c8e 100644
--- a/ooiui/static/json/uiPatchNotes.json
+++ b/ooiui/static/json/uiPatchNotes.json
@@ -1,4 +1,11 @@
[
+ {
+ "VersionNumber": "1.9.11",
+ "VersionDate": "2024-04-03",
+ "VersionDescription": [
+ "General: Updates to support MAB reference designators."
+ ]
+ },
{
"VersionNumber": "1.9.10",
"VersionDate": "2023-05-30",
diff --git a/ooiui/templates/common/platformStatus.html b/ooiui/templates/common/platformStatus.html
index 279156a96..ccf8e76f5 100644
--- a/ooiui/templates/common/platformStatus.html
+++ b/ooiui/templates/common/platformStatus.html
@@ -121,7 +121,7 @@
var siteData;
var siteStatusCollection = new SiteStatusCollection();
- siteStatusCollection.fetch({async: false, url: '/api/uframe/status/sites/'+atob(platformId).substr(0,2)}).done(function() {
+ siteStatusCollection.fetch({async: false, url: '/api/uframe/status/sites/'+atob(platformId).substr(0,3)}).done(function() {
//console.log('siteStatusCollection');
//console.log(siteStatusCollection);
//console.log('siteStatusCollection.toGeoJSON()');