From 11c8b996024678cb465e330562f309898f9f5a08 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Mon, 29 Aug 2016 09:14:39 +0200
Subject: [PATCH] Rename ol.format.IGCZ to ol.format.IGC.Z

---
 changelog/upgrade-notes.md |  1 +
 externs/olx.js             |  4 ++--
 src/ol/format/igc.js       | 35 +++++++++++++++++------------------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/changelog/upgrade-notes.md b/changelog/upgrade-notes.md
index 8dfb9f6df5..750115fce4 100644
--- a/changelog/upgrade-notes.md
+++ b/changelog/upgrade-notes.md
@@ -10,6 +10,7 @@ A number of internal types have been renamed.  This will not affect those who us
 
  * rename `ol.style.IconAnchorUnits` to `ol.style.Icon.AnchorUnits`
  * rename `ol.style.IconOrigin` to `ol.style.Icon.Origin`
+ * rename `ol.format.IGCZ` to `ol.format.IGC.Z`
 
 ### v3.18.0
 
diff --git a/externs/olx.js b/externs/olx.js
index 84cbb9e7af..36d31e7ba9 100644
--- a/externs/olx.js
+++ b/externs/olx.js
@@ -1791,7 +1791,7 @@ olx.format.TopoJSONOptions.prototype.defaultDataProjection;
 
 
 /**
- * @typedef {{altitudeMode: (ol.format.IGCZ|undefined)}}
+ * @typedef {{altitudeMode: (ol.format.IGC.Z|undefined)}}
  */
 olx.format.IGCOptions;
 
@@ -1799,7 +1799,7 @@ olx.format.IGCOptions;
 /**
  * Altitude mode. Possible values are `barometric`, `gps`, and `none`. Default
  * is `none`.
- * @type {ol.format.IGCZ|undefined}
+ * @type {ol.format.IGC.Z|undefined}
  * @api
  */
 olx.format.IGCOptions.prototype.altitudeMode;
diff --git a/src/ol/format/igc.js b/src/ol/format/igc.js
index be9fb6a3c1..ccfae500ba 100644
--- a/src/ol/format/igc.js
+++ b/src/ol/format/igc.js
@@ -1,5 +1,4 @@
 goog.provide('ol.format.IGC');
-goog.provide('ol.format.IGCZ');
 
 goog.require('ol');
 goog.require('ol.Feature');
@@ -10,17 +9,6 @@ goog.require('ol.geom.LineString');
 goog.require('ol.proj');
 
 
-/**
- * IGC altitude/z. One of 'barometric', 'gps', 'none'.
- * @enum {string}
- */
-ol.format.IGCZ = {
-  BAROMETRIC: 'barometric',
-  GPS: 'gps',
-  NONE: 'none'
-};
-
-
 /**
  * @classdesc
  * Feature format for `*.igc` flight recording files.
@@ -43,10 +31,10 @@ ol.format.IGC = function(opt_options) {
 
   /**
    * @private
-   * @type {ol.format.IGCZ}
+   * @type {ol.format.IGC.Z}
    */
   this.altitudeMode_ = options.altitudeMode ?
-      options.altitudeMode : ol.format.IGCZ.NONE;
+      options.altitudeMode : ol.format.IGC.Z.NONE;
 
 };
 ol.inherits(ol.format.IGC, ol.format.TextFeature);
@@ -147,11 +135,11 @@ ol.format.IGC.prototype.readFeatureFromText = function(text, opt_options) {
           x = -x;
         }
         flatCoordinates.push(x, y);
-        if (altitudeMode != ol.format.IGCZ.NONE) {
+        if (altitudeMode != ol.format.IGC.Z.NONE) {
           var z;
-          if (altitudeMode == ol.format.IGCZ.GPS) {
+          if (altitudeMode == ol.format.IGC.Z.GPS) {
             z = parseInt(m[11], 10);
-          } else if (altitudeMode == ol.format.IGCZ.BAROMETRIC) {
+          } else if (altitudeMode == ol.format.IGC.Z.BAROMETRIC) {
             z = parseInt(m[12], 10);
           } else {
             ol.DEBUG && console.assert(false, 'Unknown altitude mode.');
@@ -185,7 +173,7 @@ ol.format.IGC.prototype.readFeatureFromText = function(text, opt_options) {
     return null;
   }
   var lineString = new ol.geom.LineString(null);
-  var layout = altitudeMode == ol.format.IGCZ.NONE ?
+  var layout = altitudeMode == ol.format.IGC.Z.NONE ?
       ol.geom.GeometryLayout.XYM : ol.geom.GeometryLayout.XYZM;
   lineString.setFlatCoordinates(layout, flatCoordinates);
   var feature = new ol.Feature(ol.format.Feature.transformWithOptions(
@@ -230,3 +218,14 @@ ol.format.IGC.prototype.readFeaturesFromText = function(text, opt_options) {
  * @api
  */
 ol.format.IGC.prototype.readProjection;
+
+
+/**
+ * IGC altitude/z. One of 'barometric', 'gps', 'none'.
+ * @enum {string}
+ */
+ol.format.IGC.Z = {
+  BAROMETRIC: 'barometric',
+  GPS: 'gps',
+  NONE: 'none'
+};