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

Rename _ol_Feature_ to Feature

Browse Source
This commit is contained in:
Tim Schaub
2018-01-08 09:35:02 -07:00
parent 6934e148ca
commit 22fce4f97b
79 changed files with 630 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/format/EsriJSON.js
View File

@@ -2,7 +2,7 @@
* @module ol/format/EsriJSON
*/
import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js';
import Feature from '../Feature.js';
import {assert} from '../asserts.js';
import {containsExtent} from '../extent.js';
import {transformWithOptions} from '../format/Feature.js';
@@ -464,7 +464,7 @@ EsriJSON.prototype.readFeatureFromObject = function(
var esriJSONFeature = /** @type {EsriJSONFeature} */ (object);
var geometry = EsriJSON.readGeometry_(esriJSONFeature.geometry,
opt_options);
var feature = new _ol_Feature_();
var feature = new Feature();
if (this.geometryName_) {
feature.setGeometryName(this.geometryName_);
}

4
src/ol/format/GMLBase.js
View File

@@ -6,7 +6,7 @@
// envelopes/extents, only geometries!
import {inherits} from '../index.js';
import {extend} from '../array.js';
import _ol_Feature_ from '../Feature.js';
import Feature from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js';
import XMLFeature from '../format/XMLFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js';
@@ -244,7 +244,7 @@ GMLBase.prototype.readFeatureElement = function(node, objectStack) {
values[localName] = this.readGeometryElement(n, objectStack);
}
}
var feature = new _ol_Feature_(values);
var feature = new Feature(values);
if (geometryName) {
feature.setGeometryName(geometryName);
}

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

@@ -2,7 +2,7 @@
* @module ol/format/GPX
*/
import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js';
import Feature from '../Feature.js';
import {includes} from '../array.js';
import {transformWithOptions} from '../format/Feature.js';
import XMLFeature from '../format/XMLFeature.js';
@@ -542,7 +542,7 @@ function readRte(node, objectStack) {
var geometry = new LineString(null);
geometry.setFlatCoordinates(layout, flatCoordinates);
transformWithOptions(geometry, false, options);
var feature = new _ol_Feature_(geometry);
var feature = new Feature(geometry);
feature.setProperties(values);
return feature;
}
@@ -574,7 +574,7 @@ function readTrk(node, objectStack) {
var geometry = new MultiLineString(null);
geometry.setFlatCoordinates(layout, flatCoordinates, ends);
transformWithOptions(geometry, false, options);
var feature = new _ol_Feature_(geometry);
var feature = new Feature(geometry);
feature.setProperties(values);
return feature;
}
@@ -596,7 +596,7 @@ function readWpt(node, objectStack) {
var layout = GPX.applyLayoutOptions_(layoutOptions, coordinates);
var geometry = new Point(coordinates, layout);
transformWithOptions(geometry, false, options);
var feature = new _ol_Feature_(geometry);
var feature = new Feature(geometry);
feature.setProperties(values);
return feature;
}

4
src/ol/format/GeoJSON.js
View File

@@ -6,7 +6,7 @@
import {inherits} from '../index.js';
import {assert} from '../asserts.js';
import _ol_Feature_ from '../Feature.js';
import Feature from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js';
import JSONFeature from '../format/JSONFeature.js';
import GeometryCollection from '../geom/GeometryCollection.js';
@@ -360,7 +360,7 @@ GeoJSON.prototype.readFeatureFromObject = function(object, opt_options) {
}
var geometry = readGeometry(geoJSONFeature.geometry, opt_options);
var feature = new _ol_Feature_();
var feature = new Feature();
if (this.geometryName_) {
feature.setGeometryName(this.geometryName_);
} else if (this.extractGeometryName_ && geoJSONFeature.geometry_name !== undefined) {

4
src/ol/format/IGC.js
View File

@@ -2,7 +2,7 @@
* @module ol/format/IGC
*/
import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js';
import Feature from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js';
import TextFeature from '../format/TextFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js';
@@ -163,7 +163,7 @@ IGC.prototype.readFeatureFromText = function(text, opt_options) {
var lineString = new LineString(null);
var layout = altitudeMode == IGCZ.NONE ? GeometryLayout.XYM : GeometryLayout.XYZM;
lineString.setFlatCoordinates(layout, flatCoordinates);
var feature = new _ol_Feature_(transformWithOptions(lineString, false, opt_options));
var feature = new Feature(transformWithOptions(lineString, false, opt_options));
feature.setProperties(properties);
return feature;
};

4
src/ol/format/KML.js
View File

@@ -2,7 +2,7 @@
* @module ol/format/KML
*/
import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js';
import Feature from '../Feature.js';
import {extend, includes} from '../array.js';
import {assert} from '../asserts.js';
import {asArray} from '../color.js';
@@ -1700,7 +1700,7 @@ KML.prototype.readPlacemark_ = function(node, objectStack) {
if (!object) {
return undefined;
}
var feature = new _ol_Feature_();
var feature = new Feature();
var id = node.getAttribute('id');
if (id !== null) {
feature.setId(id);

6
src/ol/format/OSMXML.js
View File

@@ -4,7 +4,7 @@
// FIXME add typedef for stack state objects
import {inherits} from '../index.js';
import {extend} from '../array.js';
import _ol_Feature_ from '../Feature.js';
import Feature from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js';
import XMLFeature from '../format/XMLFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js';
@@ -58,7 +58,7 @@ OSMXML.readNode_ = function(node, objectStack) {
if (!_ol_obj_.isEmpty(values.tags)) {
var geometry = new Point(coordinates);
transformWithOptions(geometry, false, options);
var feature = new _ol_Feature_(geometry);
var feature = new Feature(geometry);
feature.setId(id);
feature.setProperties(values.tags);
state.features.push(feature);
@@ -193,7 +193,7 @@ OSMXML.prototype.readFeaturesFromNode = function(node, opt_options) {
geometry.setFlatCoordinates(GeometryLayout.XY, flatCoordinates);
}
transformWithOptions(geometry, false, options);
var feature = new _ol_Feature_(geometry);
var feature = new Feature(geometry);
feature.setId(values.id);
feature.setProperties(values.tags);
state.features.push(feature);

4
src/ol/format/Polyline.js
View File

@@ -3,7 +3,7 @@
*/
import {inherits} from '../index.js';
import {assert} from '../asserts.js';
import _ol_Feature_ from '../Feature.js';
import Feature from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js';
import TextFeature from '../format/TextFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js';
@@ -282,7 +282,7 @@ Polyline.prototype.readFeature;
*/
Polyline.prototype.readFeatureFromText = function(text, opt_options) {
var geometry = this.readGeometryFromText(text, opt_options);
return new _ol_Feature_(geometry);
return new Feature(geometry);
};

4
src/ol/format/TopoJSON.js
View File

@@ -2,7 +2,7 @@
* @module ol/format/TopoJSON
*/
import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js';
import Feature from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js';
import JSONFeature from '../format/JSONFeature.js';
import LineString from '../geom/LineString.js';
@@ -260,7 +260,7 @@ function readFeatureFromGeometry(object, arcs, scale, translate, property, name,
} else {
geometry = geometryReader(object, arcs);
}
var feature = new _ol_Feature_();
var feature = new Feature();
feature.setGeometry(/** @type {ol.geom.Geometry} */ (
transformWithOptions(geometry, false, opt_options)));
if (object.id !== undefined) {

6
src/ol/format/WKT.js
View File

@@ -2,7 +2,7 @@
* @module ol/format/WKT
*/
import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js';
import Feature from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js';
import TextFeature from '../format/TextFeature.js';
import GeometryCollection from '../geom/GeometryCollection.js';
@@ -269,7 +269,7 @@ WKT.prototype.readFeature;
WKT.prototype.readFeatureFromText = function(text, opt_options) {
var geom = this.readGeometryFromText(text, opt_options);
if (geom) {
var feature = new _ol_Feature_();
var feature = new Feature();
feature.setGeometry(geom);
return feature;
}
@@ -304,7 +304,7 @@ WKT.prototype.readFeaturesFromText = function(text, opt_options) {
}
var feature, features = [];
for (var i = 0, ii = geometries.length; i < ii; ++i) {
feature = new _ol_Feature_();
feature = new Feature();
feature.setGeometry(geometries[i]);
features.push(feature);
}