Rename _ol_Feature_ to Feature

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

View File

@@ -1,5 +1,5 @@
import {getUid} from '../../../../../src/ol/index.js';
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import Feature from '../../../../../src/ol/Feature.js';
import Map from '../../../../../src/ol/Map.js';
import _ol_View_ from '../../../../../src/ol/View.js';
import Point from '../../../../../src/ol/geom/Point.js';
@@ -53,7 +53,7 @@ describe('ol.renderer.canvas.Map', function() {
layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
features: [
new _ol_Feature_({
new Feature({
geometry: new Point([0, 0])
})
]

View File

@@ -1,5 +1,5 @@
import {getUid} from '../../../../../src/ol/index.js';
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import Feature from '../../../../../src/ol/Feature.js';
import GeometryCollection from '../../../../../src/ol/geom/GeometryCollection.js';
import LineString from '../../../../../src/ol/geom/LineString.js';
import MultiLineString from '../../../../../src/ol/geom/MultiLineString.js';
@@ -29,13 +29,13 @@ describe('ol.render.canvas.ReplayGroup', function() {
beforeEach(function() {
transform = _ol_transform_.create();
replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 1, false);
feature0 = new _ol_Feature_(new Polygon(
feature0 = new Feature(new Polygon(
[[[-90, 0], [-45, 45], [0, 0], [1, 1], [0, -45], [-90, 0]]]));
feature1 = new _ol_Feature_(new Polygon(
feature1 = new Feature(new Polygon(
[[[-90, -45], [-90, 0], [0, 0], [0, -45], [-90, -45]]]));
feature2 = new _ol_Feature_(new Polygon(
feature2 = new Feature(new Polygon(
[[[90, 45], [90, 0], [0, 0], [0, 45], [90, 45]]]));
feature3 = new _ol_Feature_(new Polygon(
feature3 = new Feature(new Polygon(
[[[-90, -45], [-90, 45], [90, 45], [90, -45], [-90, -45]]]));
fill0 = new _ol_style_Style_({
fill: new _ol_style_Fill_({color: 'black'})
@@ -229,17 +229,17 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
}
});
var point = new _ol_Feature_(new Point([45, 90]));
var multipoint = new _ol_Feature_(new MultiPoint(
var point = new Feature(new Point([45, 90]));
var multipoint = new Feature(new MultiPoint(
[[45, 90], [90, 45]]));
var linestring = new _ol_Feature_(new LineString(
var linestring = new Feature(new LineString(
[[45, 90], [45, 45], [90, 45]]));
var multilinestring = new _ol_Feature_(new MultiLineString(
var multilinestring = new Feature(new MultiLineString(
[linestring.getGeometry().getCoordinates(), linestring.getGeometry().getCoordinates()]));
var polygon = feature1;
var multipolygon = new _ol_Feature_(new MultiPolygon(
var multipolygon = new Feature(new MultiPolygon(
[polygon.getGeometry().getCoordinates(), polygon.getGeometry().getCoordinates()]));
var geometrycollection = new _ol_Feature_(new GeometryCollection(
var geometrycollection = new Feature(new GeometryCollection(
[point.getGeometry(), linestring.getGeometry(), polygon.getGeometry()]));
replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 1, true);
_ol_renderer_vector_.renderFeature(replay, point, style, 1);

View File

@@ -1,5 +1,5 @@
import {getUid} from '../../../../../src/ol/index.js';
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import Feature from '../../../../../src/ol/Feature.js';
import Map from '../../../../../src/ol/Map.js';
import _ol_View_ from '../../../../../src/ol/View.js';
import * as _ol_extent_ from '../../../../../src/ol/extent.js';
@@ -66,8 +66,8 @@ describe('ol.renderer.canvas.VectorLayer', function() {
text: 'feature'
})
})];
var feature1 = new _ol_Feature_(new Point([0, 0]));
var feature2 = new _ol_Feature_(new Point([0, 0]));
var feature1 = new Feature(new Point([0, 0]));
var feature2 = new Feature(new Point([0, 0]));
feature2.setStyle(featureStyle);
var layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
@@ -100,7 +100,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
})
});
var feature = new _ol_Feature_(new Point([0, 0]));
var feature = new Feature(new Point([0, 0]));
var layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
features: [feature]
@@ -131,7 +131,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
})
});
var feature = new _ol_Feature_(new Point([0, 0]));
var feature = new Feature(new Point([0, 0]));
var layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
features: [feature]
@@ -163,7 +163,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
})
});
var feature = new _ol_Feature_(new Point([0, 0]));
var feature = new Feature(new Point([0, 0]));
var layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
features: [feature]
@@ -193,7 +193,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
renderer.replayGroup_ = replayGroup;
replayGroup.forEachFeatureAtCoordinate = function(coordinate,
resolution, rotation, hitTolerance, skippedFeaturesUids, callback) {
var feature = new _ol_Feature_();
var feature = new Feature();
callback(feature);
callback(feature);
};

View File

@@ -1,6 +1,6 @@
import {getUid, inherits} from '../../../../../src/ol/index.js';
import _ol_obj_ from '../../../../../src/ol/obj.js';
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import Feature from '../../../../../src/ol/Feature.js';
import Map from '../../../../../src/ol/Map.js';
import TileState from '../../../../../src/ol/TileState.js';
import VectorImageTile from '../../../../../src/ol/VectorImageTile.js';
@@ -55,8 +55,8 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
text: 'feature'
})
})];
feature1 = new _ol_Feature_(new Point([1, -1]));
feature2 = new _ol_Feature_(new Point([0, 0]));
feature1 = new Feature(new Point([1, -1]));
feature2 = new Feature(new Point([0, 0]));
feature3 = new _ol_render_Feature_('Point', [1, -1], []);
feature2.setStyle(featureStyle);
var TileClass = function() {
@@ -317,7 +317,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
renderer = new _ol_renderer_canvas_VectorTileLayer_(layer);
replayGroup.forEachFeatureAtCoordinate = function(coordinate,
resolution, rotation, hitTolerance, skippedFeaturesUids, callback) {
var feature = new _ol_Feature_();
var feature = new Feature();
callback(feature);
callback(feature);
};