Merge pull request ngageoint#667 in WV/opensphere from ~ROTHM/opensph…

…ere:THIN-12806 to master

* commit '079c36517fe29d9c5ed39247f9571170cab8d0f6':
  fix(build): address closure build errors

externs/os.externs.js

@@ -131,7 +131,7 @@ osx.map.CameraState;
  *   altitude: (number|undefined),
  *   center: (ol.Coordinate|undefined),
  *   duration: (number|undefined),
- *   flightMode: (os.FlightMode|undefined),
+ *   flightMode: (os.map.FlightMode|undefined),
  *   positionCamera: (boolean|undefined),
  *   heading: (number|undefined),
  *   pitch: (number|undefined),

src/os/bearing/bearing.js

@@ -1,6 +1,5 @@
 goog.provide('os.bearing');
 goog.require('os.config.Settings');
-goog.require('os.geo');
 goog.require('os.net.Request');
 
 

src/os/command/layerautorefreshcmd.js

@@ -1,7 +1,12 @@
 goog.provide('os.command.LayerAutoRefresh');
 
+goog.require('ol.source.Source');
+goog.require('ol.source.UrlTile');
 goog.require('os.command.ICommand');
 goog.require('os.command.State');
+goog.require('os.metrics');
+goog.require('os.metrics.Metrics');
+goog.require('os.source.Vector');
 
 
 
@@ -44,7 +49,7 @@ os.command.LayerAutoRefresh = function(layerId, value) {
 
 /**
  * Get the source from the layer id.
- * @return {os.source.Vector|ol.source.UrlTile}
+ * @return {os.source.Vector|ol.source.Source|ol.source.UrlTile}
  * @protected
  */
 os.command.LayerAutoRefresh.prototype.getSource = function() {
@@ -56,7 +61,8 @@ os.command.LayerAutoRefresh.prototype.getSource = function() {
   }
 
   var source = layer.getSource();
-  if (!(source instanceof os.source.Vector || source instanceof ol.source.UrlTile) || !source.isRefreshEnabled()) {
+  if (!(source instanceof os.source.Vector || source instanceof ol.source.UrlTile) ||
+      !(/** @type {os.source.Vector|ol.source.UrlTile} */ (source).isRefreshEnabled())) {
     this.state = os.command.State.ERROR;
     this.details = 'Source for layer with id "' + this.layerId + '" does not support refresh.';
     return null;
@@ -72,7 +78,7 @@ os.command.LayerAutoRefresh.prototype.getSource = function() {
 os.command.LayerAutoRefresh.prototype.execute = function() {
   this.state = os.command.State.EXECUTING;
 
-  var source = this.getSource();
+  var source = /** @type {os.source.Vector|ol.source.UrlTile} */ (this.getSource());
   if (source) {
     this.oldInterval = source.getRefreshInterval();
 
@@ -92,7 +98,7 @@ os.command.LayerAutoRefresh.prototype.execute = function() {
  */
 os.command.LayerAutoRefresh.prototype.revert = function() {
   this.state = os.command.State.REVERTING;
-  var source = this.getSource();
+  var source = /** @type {os.source.Vector|ol.source.UrlTile} */ (this.getSource());
   if (source) {
     source.setRefreshInterval(this.oldInterval);
 

src/os/config/config.js

@@ -28,7 +28,8 @@ os.config.EventType = {
   WILL_SAVE: 'willSave',
   CLEARED: 'cleared',
   SAVED: 'saved',
-  UPDATED: 'updated'
+  UPDATED: 'updated',
+  RELOADED: 'reloaded'
 };
 
 

src/os/config/settings.js

@@ -23,6 +23,7 @@ goog.require('os.config.storage.ISettingsStorage');
 goog.require('os.config.storage.SettingsStorageLoader');
 goog.require('os.config.storage.SettingsStorageRegistry');
 goog.require('os.events.SettingChangeEvent');
+goog.require('os.metrics.Metrics');
 goog.require('os.net.Request');
 goog.require('os.object');
 goog.require('os.storage');
@@ -41,6 +42,7 @@ goog.require('os.xt.Peer');
 os.config.SettingsMessage;
 
 
+
 /**
  * Maintains application settings which are retrieved from different storage sources,
  * (see {os.config.storage.SettingsStorageRegistry}), and merged to be accessible to the client.  Also handles
@@ -321,6 +323,7 @@ os.config.Settings.prototype.onReload_ = function(config) {
   }
 
   this.toNotifyInternal_ = [];
+  this.dispatchEvent(new goog.events.Event(os.config.EventType.RELOADED));
 };
 
 

src/os/config/storage/isettingsreadablestorage.js

@@ -25,4 +25,3 @@ os.config.storage.ISettingsReadableStorage.ID = 'os.config.storage.ISettingsRead
  * @template T
  */
 os.config.storage.ISettingsReadableStorage.prototype.getSettings;
-

src/os/config/storage/settingsstorageregistry.js

@@ -52,8 +52,11 @@ goog.addSingletonGetter(os.config.storage.SettingsStorageRegistry);
 os.config.storage.SettingsStorageRegistry.prototype.addStorage = function(storage, opt_index) {
   goog.array.insertAt(this.availableReadStorages_, storage,
       opt_index !== undefined ? opt_index : this.availableReadStorages_.length);
-  if (storage.writeType === os.config.storage.SettingsWritableStorageType.REMOTE) {
-    this.hasRemoteStorage = true;
+  if (os.implements(storage, os.config.storage.ISettingsWritableStorage.ID)) {
+    if ((/** @type {os.config.storage.ISettingsWritableStorage} */ (storage)).writeType ===
+        os.config.storage.SettingsWritableStorageType.REMOTE) {
+      this.hasRemoteStorage = true;
+    }
   }
 };
 
@@ -108,7 +111,8 @@ os.config.storage.SettingsStorageRegistry.prototype.updateWriteStorage_ = functi
   for (var i = this.availableReadStorages_.length - 1; i >= 0; i--) {
     var candidate = this.availableReadStorages_[i];
     if (os.implements(candidate, os.config.storage.ISettingsWritableStorage.ID) &&
-        candidate.writeType === this.writeToType_ && candidate.canAccess) {
+        (/** @type {os.config.storage.ISettingsWritableStorage} */ (candidate)).writeType ===
+            this.writeToType_ && candidate.canAccess) {
       writeTo = candidate;
       break;
     }
@@ -152,3 +156,14 @@ os.config.storage.SettingsStorageRegistry.prototype.getStoragesToClear = functio
   }, this);
   return /** @type {!Array.<!os.config.storage.ISettingsWritableStorage>} */ (writablesToClear);
 };
+
+
+/**
+ * Reset storage registry
+ */
+os.config.storage.SettingsStorageRegistry.prototype.reset = function() {
+  this.availableReadStorages_.length = 0;
+  this.writeToType_ = os.config.storage.SettingsWritableStorageType.LOCAL;
+  this.writeToStorage_ = null;
+  this.hasRemoteStorage = false;
+};

src/os/data/areanode.js

@@ -5,7 +5,6 @@ goog.require('ol.events');
 goog.require('os.command.AreaToggle');
 goog.require('os.data.ISearchable');
 goog.require('os.events.PropertyChangeEvent');
-goog.require('os.feature');
 goog.require('os.implements');
 goog.require('os.structs.TriState');
 goog.require('os.ui.menu.IMenuSupplier');

src/os/data/drawingfeaturenode.js

@@ -1,5 +1,6 @@
 goog.provide('os.data.DrawingFeatureNode');
 
+goog.require('os.mixin.object');
 goog.require('os.ui.menu.IMenuSupplier');
 goog.require('os.ui.menu.spatial');
 goog.require('os.ui.node.drawingFeatureNodeUIDirective');

src/os/data/drawinglayernode.js

@@ -7,6 +7,7 @@ goog.require('os.data.DrawingFeatureNode');
 goog.require('os.data.LayerNode');
 goog.require('os.events.PropertyChangeEvent');
 goog.require('os.fn');
+goog.require('os.query.AreaManager');
 
 
 

src/os/data/layernode.js

@@ -6,6 +6,7 @@ goog.require('os.data.IExtent');
 goog.require('os.data.ISearchable');
 goog.require('os.events.PropertyChangeEvent');
 goog.require('os.layer.LayerGroup');
+goog.require('os.layer.Tile');
 goog.require('os.layer.Vector');
 goog.require('os.structs.TriState');
 goog.require('os.ui.ILayerUIProvider');

src/os/feature/feature.js

@@ -10,7 +10,9 @@ goog.require('ol.geom.Point');
 goog.require('ol.geom.Polygon');
 goog.require('ol.source.Vector');
 goog.require('ol.source.VectorEventType');
+goog.require('os');
 goog.require('os.Fields');
+goog.require('os.MapContainer');
 goog.require('os.data.RecordField');
 goog.require('os.geo');
 goog.require('os.geom.Ellipse');
@@ -318,7 +320,7 @@ os.feature.createLineOfBearing = function(feature, opt_replace, opt_lobOpts) {
     var center = ol.proj.toLonLat(geom.getFirstCoordinate(), os.map.PROJECTION);
     var bearing = os.feature.getColumnValue(feature, opt_lobOpts.bearingColumn);
     var length = opt_lobOpts.lengthType == 'column' ? // get from column unless manual
-      os.feature.getColumnValue(feature, opt_lobOpts.lengthColumn, 0) : 1;
+        os.feature.getColumnValue(feature, opt_lobOpts.lengthColumn, 0) : 1;
     if (center && bearing != null && !isNaN(bearing) && length) {
       // sanitize
       bearing = bearing % 360;
@@ -394,7 +396,7 @@ os.feature.createLineOfBearing = function(feature, opt_replace, opt_lobOpts) {
           lengthError = 1;
         }
         var cLengthError = os.math.convertUnits(lengthError, os.style.DEFAULT_UNITS, lengthErrorUnits) *
-          lengthErrorMultiplier;
+            lengthErrorMultiplier;
         if (bearingError > 0 && bearingErrorMultiplier > 0) {
           var plusPts = os.geo.interpolateArc(center, effectiveLength + cLengthError,
               Math.min(bearingError * bearingErrorMultiplier * 2, 360), bearing);

src/os/file/file.js

@@ -7,6 +7,7 @@ goog.require('goog.net.jsloader');
 goog.require('goog.userAgent');
 goog.require('os.IPersistable');
 goog.require('os.defines');
+goog.require('os.file.mime.text');
 goog.require('os.file.mime.zip');
 
 

src/os/fn/fn.js

@@ -7,7 +7,6 @@ goog.provide('os.fn');
 goog.require('ol.extent');
 goog.require('ol.layer.Layer');
 goog.require('os.extent');
-goog.require('os.geo');
 
 
 /**
@@ -39,7 +38,7 @@ os.fn.reduceExtentFromLayers = function(extent, layer) {
 
       if (source instanceof ol.source.Vector ||
           source instanceof ol.source.UrlTile) {
-        ex = source.getExtent();
+        ex = (/** @type {ol.source.Vector|ol.source.UrlTile} */ (source)).getExtent();
       }
     }
 
@@ -88,7 +87,6 @@ os.fn.mapFeatureToGeometry = function(feature) {
 };
 
 
-
 /**
  * Map a tree node to a layer.
  * @param {undefined|null|os.structs.ITreeNode} node The tree node.

src/os/geo/geo.js

@@ -1,7 +1,6 @@
 goog.provide('os.geo');
 goog.provide('os.geo.ParseConf');
 
-goog.require('goog.math');
 goog.require('goog.string');
 goog.require('ol.geom.GeometryType');
 goog.require('ol.geom.LineString');
@@ -10,6 +9,7 @@ goog.require('os.array');
 goog.require('os.extent');
 goog.require('os.geom.GeometryField');
 goog.require('os.mixin.geometry');
+goog.require('os.query.utils');
 
 
 /**
@@ -2016,7 +2016,7 @@ os.geo.normalizePolygons = function(polys, opt_to) {
  */
 os.geo.normalizeGeometryCoordinates = function(geometry, opt_to) {
   if (geometry) {
-    if (geometry.get(os.geom.GeometryField.NORMALIZED) || os.query.isWorldQuery(geometry)) {
+    if (geometry.get(os.geom.GeometryField.NORMALIZED) || os.query.utils.isWorldQuery(geometry)) {
       return false;
     }
 

src/os/geo/jsts.js

@@ -125,6 +125,7 @@ os.geo.jsts.convertFromCoordinate = function(coord) {
 };
 
 
+
 /**
  * Utility class to translate between OL3 and JSTS geometries. This was copied from JSTS so the instanceof calls would
  * still work with compiled code.

src/os/geom/ellipse.js

@@ -4,6 +4,7 @@ goog.require('ol.geom.Polygon');
 goog.require('os.geo');
 
 
+
 /**
  * Ellipse geometry.
  *

src/os/im/importer.js

@@ -10,7 +10,8 @@ goog.require('os.alert.AlertEventSeverity');
 goog.require('os.alertManager');
 goog.require('os.events.EventType');
 goog.require('os.im.IImporter');
-goog.require('os.im.mapping.AltMapping');
+goog.require('os.im.mapping.AltMappingId');
+goog.require('os.implements');
 goog.require('os.parse.AsyncParser');
 goog.require('os.parse.IParser');
 goog.require('os.thread.EventType');
@@ -553,7 +554,7 @@ os.im.Importer.prototype.addMapping_ = function(mapping) {
     this.mappings = [mapping];
   } else {
     var endIndex = this.mappings.length - 1;
-    if (this.mappings[endIndex] instanceof os.im.mapping.AltMapping) {
+    if (os.implements(this.mappings[endIndex], os.im.mapping.AltMappingId)) {
       // if alt mapping is already at the end, leave it there
       this.mappings.splice(endIndex, 0, mapping);
     } else {

src/os/im/mapping/altmapping.js

@@ -4,12 +4,14 @@ goog.require('os.Fields');
 goog.require('os.feature');
 goog.require('os.geo');
 goog.require('os.im.mapping');
+goog.require('os.im.mapping.AltMappingId');
 goog.require('os.im.mapping.MappingRegistry');
 goog.require('os.im.mapping.RenameMapping');
 goog.require('os.math');
 goog.require('os.math.Units');
 
 
+
 /**
  * Altitude mapping.
  * @extends {os.im.mapping.RenameMapping<ol.Feature>}
@@ -93,7 +95,7 @@ goog.inherits(os.im.mapping.AltMapping, os.im.mapping.RenameMapping);
  * @type {string}
  * @const
  */
-os.im.mapping.AltMapping.ID = 'Altitude';
+os.im.mapping.AltMapping.ID = os.im.mapping.AltMappingId;
 
 
 // Register the mapping.

src/os/im/mapping/altmappingid.js

@@ -0,0 +1,8 @@
+goog.provide('os.im.mapping.AltMappingId');
+
+
+/**
+ * @type {string}
+ * @const
+ */
+os.im.mapping.AltMappingId = 'Altitude';

src/os/im/mapping/radiusmapping.js

@@ -1,6 +1,5 @@
 goog.provide('os.im.mapping.RadiusMapping');
 goog.require('os.Fields');
-goog.require('os.geo');
 goog.require('os.im.mapping.MappingRegistry');
 goog.require('os.im.mapping.RenameMapping');
 goog.require('os.math.Units');

src/os/layer/drawinglayer.js

@@ -4,6 +4,7 @@ goog.require('os.data.AreaNode');
 goog.require('os.data.DrawingLayerNode');
 goog.require('os.layer.ILayer');
 goog.require('os.layer.Vector');
+goog.require('os.mixin.layerbase');
 goog.require('os.structs.ITreeNodeSupplier');