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

Changed option name to extractGeometryName

Browse Source
This commit is contained in:
Alexandre Silva
2017-11-07 10:24:10 +00:00
parent 260327341c
commit cd5e5039e9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
externs/olx.js
View File

@@ -1994,7 +1994,7 @@ olx.format.WriteOptions.prototype.decimals;
/** /**
* @typedef {{defaultDataProjection: ol.ProjectionLike, * @typedef {{defaultDataProjection: ol.ProjectionLike,
* geometryName: (string|undefined), * geometryName: (string|undefined),
* readGeometryNameFromGeoJSON: (boolean|undefined), * extractGeometryName: (boolean|undefined),
* featureProjection: ol.ProjectionLike}} * featureProjection: ol.ProjectionLike}}
*/ */
olx.format.GeoJSONOptions; olx.format.GeoJSONOptions;
@@ -2034,7 +2034,7 @@ olx.format.GeoJSONOptions.prototype.geometryName;
* @type {boolean|undefined} * @type {boolean|undefined}
* @api * @api
*/ */
olx.format.GeoJSONOptions.prototype.readGeometryNameFromGeoJSON; olx.format.GeoJSONOptions.prototype.extractGeometryName;
/** /**

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

@@ -58,7 +58,7 @@ ol.format.GeoJSON = function(opt_options) {
* @type {boolean|undefined} * @type {boolean|undefined}
* @private * @private
*/ */
this.readGeometryNameFromGeoJSON_ = options.readGeometryNameFromGeoJSON; this.extractGeometryName_ = options.extractGeometryName;
}; };
ol.inherits(ol.format.GeoJSON, ol.format.JSONFeature); ol.inherits(ol.format.GeoJSON, ol.format.JSONFeature);
@@ -384,7 +384,7 @@ ol.format.GeoJSON.prototype.readFeatureFromObject = function(
var feature = new ol.Feature(); var feature = new ol.Feature();
if (this.geometryName_) { if (this.geometryName_) {
feature.setGeometryName(this.geometryName_); feature.setGeometryName(this.geometryName_);
} else if (this.readGeometryNameFromGeoJSON_ && geoJSONFeature.geometry_name !== undefined) { } else if (this.extractGeometryName_ && geoJSONFeature.geometry_name !== undefined) {
feature.setGeometryName(geoJSONFeature.geometry_name); feature.setGeometryName(geoJSONFeature.geometry_name);
} }
feature.setGeometry(geometry); feature.setGeometry(geometry);