diff --git a/src/ol/format/EsriJSON.js b/src/ol/format/EsriJSON.js index 598e76b4f2..f91049d7fb 100644 --- a/src/ol/format/EsriJSON.js +++ b/src/ol/format/EsriJSON.js @@ -6,7 +6,7 @@ import _ol_Feature_ from '../Feature.js'; import _ol_asserts_ from '../asserts.js'; import {containsExtent} from '../extent.js'; import FeatureFormat from '../format/Feature.js'; -import _ol_format_JSONFeature_ from '../format/JSONFeature.js'; +import JSONFeature from '../format/JSONFeature.js'; import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryType from '../geom/GeometryType.js'; import LineString from '../geom/LineString.js'; @@ -34,7 +34,7 @@ var EsriJSON = function(opt_options) { var options = opt_options ? opt_options : {}; - _ol_format_JSONFeature_.call(this); + JSONFeature.call(this); /** * Name of the geometry attribute for features. @@ -45,7 +45,7 @@ var EsriJSON = function(opt_options) { }; -inherits(EsriJSON, _ol_format_JSONFeature_); +inherits(EsriJSON, JSONFeature); /** diff --git a/src/ol/format/GeoJSON.js b/src/ol/format/GeoJSON.js index e44df4dda3..bd9c4eeb79 100644 --- a/src/ol/format/GeoJSON.js +++ b/src/ol/format/GeoJSON.js @@ -8,7 +8,7 @@ import {inherits} from '../index.js'; import _ol_asserts_ from '../asserts.js'; import _ol_Feature_ from '../Feature.js'; import FeatureFormat from '../format/Feature.js'; -import _ol_format_JSONFeature_ from '../format/JSONFeature.js'; +import JSONFeature from '../format/JSONFeature.js'; import GeometryCollection from '../geom/GeometryCollection.js'; import LineString from '../geom/LineString.js'; import MultiLineString from '../geom/MultiLineString.js'; @@ -32,7 +32,7 @@ var GeoJSON = function(opt_options) { var options = opt_options ? opt_options : {}; - _ol_format_JSONFeature_.call(this); + JSONFeature.call(this); /** * @inheritDoc @@ -62,7 +62,7 @@ var GeoJSON = function(opt_options) { }; -inherits(GeoJSON, _ol_format_JSONFeature_); +inherits(GeoJSON, JSONFeature); /** diff --git a/src/ol/format/JSONFeature.js b/src/ol/format/JSONFeature.js index b1a1ada243..802c59d83c 100644 --- a/src/ol/format/JSONFeature.js +++ b/src/ol/format/JSONFeature.js @@ -15,11 +15,11 @@ import _ol_format_FormatType_ from '../format/FormatType.js'; * @abstract * @extends {ol.format.Feature} */ -var _ol_format_JSONFeature_ = function() { +var JSONFeature = function() { FeatureFormat.call(this); }; -inherits(_ol_format_JSONFeature_, FeatureFormat); +inherits(JSONFeature, FeatureFormat); /** @@ -27,7 +27,7 @@ inherits(_ol_format_JSONFeature_, FeatureFormat); * @private * @return {Object} Object. */ -_ol_format_JSONFeature_.prototype.getObject_ = function(source) { +JSONFeature.prototype.getObject_ = function(source) { if (typeof source === 'string') { var object = JSON.parse(source); return object ? /** @type {Object} */ (object) : null; @@ -42,7 +42,7 @@ _ol_format_JSONFeature_.prototype.getObject_ = function(source) { /** * @inheritDoc */ -_ol_format_JSONFeature_.prototype.getType = function() { +JSONFeature.prototype.getType = function() { return _ol_format_FormatType_.JSON; }; @@ -50,7 +50,7 @@ _ol_format_JSONFeature_.prototype.getType = function() { /** * @inheritDoc */ -_ol_format_JSONFeature_.prototype.readFeature = function(source, opt_options) { +JSONFeature.prototype.readFeature = function(source, opt_options) { return this.readFeatureFromObject( this.getObject_(source), this.getReadOptions(source, opt_options)); }; @@ -59,7 +59,7 @@ _ol_format_JSONFeature_.prototype.readFeature = function(source, opt_options) { /** * @inheritDoc */ -_ol_format_JSONFeature_.prototype.readFeatures = function(source, opt_options) { +JSONFeature.prototype.readFeatures = function(source, opt_options) { return this.readFeaturesFromObject( this.getObject_(source), this.getReadOptions(source, opt_options)); }; @@ -72,7 +72,7 @@ _ol_format_JSONFeature_.prototype.readFeatures = function(source, opt_options) { * @protected * @return {ol.Feature} Feature. */ -_ol_format_JSONFeature_.prototype.readFeatureFromObject = function(object, opt_options) {}; +JSONFeature.prototype.readFeatureFromObject = function(object, opt_options) {}; /** @@ -82,13 +82,13 @@ _ol_format_JSONFeature_.prototype.readFeatureFromObject = function(object, opt_o * @protected * @return {Array.