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

Remove private static members from GPX format

Browse Source
This commit is contained in:
Tim Schaub
2018-02-09 16:14:36 -07:00
parent 1140c22164
commit 1c1b8d3919
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ol/format/GPX.js
View File

@@ -413,7 +413,7 @@ function appendCoordinate(flatCoordinates, layoutOptions, node, values) {
* @param {Array.<number>=} ends Ends. * @param {Array.<number>=} ends Ends.
* @return {ol.geom.GeometryLayout} Layout. * @return {ol.geom.GeometryLayout} Layout.
*/ */
GPX.applyLayoutOptions_ = function(layoutOptions, flatCoordinates, ends) { function applyLayoutOptions(layoutOptions, flatCoordinates, ends) {
let layout = GeometryLayout.XY; let layout = GeometryLayout.XY;
let stride = 2; let stride = 2;
if (layoutOptions.hasZ && layoutOptions.hasM) { if (layoutOptions.hasZ && layoutOptions.hasM) {
@@ -446,7 +446,7 @@ GPX.applyLayoutOptions_ = function(layoutOptions, flatCoordinates, ends) {
} }
} }
return layout; return layout;
}; }
/** /**
@@ -541,7 +541,7 @@ function readRte(node, objectStack) {
delete values['flatCoordinates']; delete values['flatCoordinates'];
const layoutOptions = /** @type {ol.LayoutOptions} */ (values['layoutOptions']); const layoutOptions = /** @type {ol.LayoutOptions} */ (values['layoutOptions']);
delete values['layoutOptions']; delete values['layoutOptions'];
const layout = GPX.applyLayoutOptions_(layoutOptions, flatCoordinates); const layout = applyLayoutOptions(layoutOptions, flatCoordinates);
const geometry = new LineString(null); const geometry = new LineString(null);
geometry.setFlatCoordinates(layout, flatCoordinates); geometry.setFlatCoordinates(layout, flatCoordinates);
transformWithOptions(geometry, false, options); transformWithOptions(geometry, false, options);
@@ -573,7 +573,7 @@ function readTrk(node, objectStack) {
delete values['ends']; delete values['ends'];
const layoutOptions = /** @type {ol.LayoutOptions} */ (values['layoutOptions']); const layoutOptions = /** @type {ol.LayoutOptions} */ (values['layoutOptions']);
delete values['layoutOptions']; delete values['layoutOptions'];
const layout = GPX.applyLayoutOptions_(layoutOptions, flatCoordinates, ends); const layout = applyLayoutOptions(layoutOptions, flatCoordinates, ends);
const geometry = new MultiLineString(null); const geometry = new MultiLineString(null);
geometry.setFlatCoordinates(layout, flatCoordinates, ends); geometry.setFlatCoordinates(layout, flatCoordinates, ends);
transformWithOptions(geometry, false, options); transformWithOptions(geometry, false, options);
@@ -596,7 +596,7 @@ function readWpt(node, objectStack) {
} }
const layoutOptions = /** @type {ol.LayoutOptions} */ ({}); const layoutOptions = /** @type {ol.LayoutOptions} */ ({});
const coordinates = appendCoordinate([], layoutOptions, node, values); const coordinates = appendCoordinate([], layoutOptions, node, values);
const layout = GPX.applyLayoutOptions_(layoutOptions, coordinates); const layout = applyLayoutOptions(layoutOptions, coordinates);
const geometry = new Point(coordinates, layout); const geometry = new Point(coordinates, layout);
transformWithOptions(geometry, false, options); transformWithOptions(geometry, false, options);
const feature = new Feature(geometry); const feature = new Feature(geometry);