ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move IGCZ enum to src/ol/format/IGC.js

Browse Source
This commit is contained in:
Frederic Junod
2018-01-08 11:40:36 +01:00
parent eb734c9f98
commit bb954e7e2c
3 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
externs/olx.js
+2 -2
View File
@@ -1538,7 +1538,7 @@ olx.format.TopoJSONOptions.prototype.layers;
/** /**
* @typedef {{altitudeMode: (ol.format.IGCZ|undefined)}} * @typedef {{altitudeMode: (ol.format.IGCZ|string|undefined)}}
*/ */
olx.format.IGCOptions; olx.format.IGCOptions;
@@ -1546,7 +1546,7 @@ olx.format.IGCOptions;
/** /**
* Altitude mode. Possible values are `barometric`, `gps`, and `none`. Default * Altitude mode. Possible values are `barometric`, `gps`, and `none`. Default
* is `none`. * is `none`.
* @type {ol.format.IGCZ|undefined} * @type {ol.format.IGCZ|string|undefined}
* @api * @api
*/ */
olx.format.IGCOptions.prototype.altitudeMode; olx.format.IGCOptions.prototype.altitudeMode;
src/ol/format/IGC.js
+15 -9
View File
@@ -4,12 +4,21 @@
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js'; import _ol_Feature_ from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js'; import {transformWithOptions} from '../format/Feature.js';
import _ol_format_IGCZ_ from '../format/IGCZ.js';
import TextFeature from '../format/TextFeature.js'; import TextFeature from '../format/TextFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryLayout from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js'; import LineString from '../geom/LineString.js';
import {get as getProjection} from '../proj.js'; import {get as getProjection} from '../proj.js';
/**
* IGC altitude/z. One of 'barometric', 'gps', 'none'.
* @enum {string}
*/
var IGCZ = {
BAROMETRIC: 'barometric',
GPS: 'gps',
NONE: 'none'
};
/** /**
* @classdesc * @classdesc
* Feature format for `*.igc` flight recording files. * Feature format for `*.igc` flight recording files.
@@ -34,9 +43,7 @@ var IGC = function(opt_options) {
* @private * @private
* @type {ol.format.IGCZ} * @type {ol.format.IGCZ}
*/ */
this.altitudeMode_ = options.altitudeMode ? this.altitudeMode_ = options.altitudeMode ? options.altitudeMode : IGCZ.NONE;
options.altitudeMode : _ol_format_IGCZ_.NONE;
}; };
inherits(IGC, TextFeature); inherits(IGC, TextFeature);
@@ -121,11 +128,11 @@ IGC.prototype.readFeatureFromText = function(text, opt_options) {
x = -x; x = -x;
} }
flatCoordinates.push(x, y); flatCoordinates.push(x, y);
if (altitudeMode != _ol_format_IGCZ_.NONE) { if (altitudeMode != IGCZ.NONE) {
var z; var z;
if (altitudeMode == _ol_format_IGCZ_.GPS) { if (altitudeMode == IGCZ.GPS) {
z = parseInt(m[11], 10); z = parseInt(m[11], 10);
} else if (altitudeMode == _ol_format_IGCZ_.BAROMETRIC) { } else if (altitudeMode == IGCZ.BAROMETRIC) {
z = parseInt(m[12], 10); z = parseInt(m[12], 10);
} else { } else {
z = 0; z = 0;
@@ -158,8 +165,7 @@ IGC.prototype.readFeatureFromText = function(text, opt_options) {
return null; return null;
} }
var lineString = new LineString(null); var lineString = new LineString(null);
var layout = altitudeMode == _ol_format_IGCZ_.NONE ? var layout = altitudeMode == IGCZ.NONE ? GeometryLayout.XYM : GeometryLayout.XYZM;
GeometryLayout.XYM : GeometryLayout.XYZM;
lineString.setFlatCoordinates(layout, flatCoordinates); lineString.setFlatCoordinates(layout, flatCoordinates);
var feature = new _ol_Feature_(transformWithOptions(lineString, false, opt_options)); var feature = new _ol_Feature_(transformWithOptions(lineString, false, opt_options));
feature.setProperties(properties); feature.setProperties(properties);
src/ol/format/IGCZ.js
-13
View File
@@ -1,13 +0,0 @@
/**
* @module ol/format/IGCZ
*/
/**
* IGC altitude/z. One of 'barometric', 'gps', 'none'.
* @enum {string}
*/
export default {
BAROMETRIC: 'barometric',
GPS: 'gps',
NONE: 'none'
};