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

Transformed

Browse Source
This commit is contained in:
Tim Schaub
2017-12-11 16:29:33 -07:00
parent 1cdb6a66f0
commit 7f47883c48
737 changed files with 22216 additions and 21609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
test/rendering/ol/layer/clip.test.js
View File

@@ -1,12 +1,10 @@
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.geom.MultiPolygon');
goog.require('ol.layer.Tile');
goog.require('ol.source.XYZ');
goog.require('ol.style.Stroke');
goog.require('ol.style.Style');
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_geom_MultiPolygon_ from '../../../../src/ol/geom/MultiPolygon.js';
import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js';
import _ol_source_XYZ_ from '../../../../src/ol/source/XYZ.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
describe('layer clipping', function() {
@@ -40,10 +38,10 @@ describe('layer clipping', function() {
var map = null;
beforeEach(function() {
map = new ol.Map({
map = new _ol_Map_({
pixelRatio: 1,
target: createMapDiv(256, 256),
view: new ol.View({
view: new _ol_View_({
center: [0, 0],
zoom: 0
})
@@ -57,22 +55,22 @@ describe('layer clipping', function() {
it('clips to all parts of the MultiPolygon', function(done) {
var source = new ol.source.XYZ({
var source = new _ol_source_XYZ_({
url: 'rendering/ol/data/tiles/osm/{z}/{x}/{y}.png',
transition: 0
});
var layer = new ol.layer.Tile({
var layer = new _ol_layer_Tile_({
source: source
});
var geometry = new ol.geom.MultiPolygon([
var geometry = new _ol_geom_MultiPolygon_([
[[[-80, -40], [-40, 0], [-80, 40], [-120, 0], [-80, -40]]],
[[[80, -40], [120, 0], [80, 40], [40, 0], [80, -40]]]
]).transform('EPSG:4326', 'EPSG:3857');
var style = new ol.style.Style({
stroke: new ol.style.Stroke({
var style = new _ol_style_Style_({
stroke: new _ol_style_Stroke_({
width: 2,
color: 'blue'
})

36
test/rendering/ol/layer/image.test.js
View File

@@ -1,12 +1,10 @@
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.layer.Image');
goog.require('ol.obj');
goog.require('ol.proj');
goog.require('ol.source.ImageStatic');
goog.require('ol.tilegrid');
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_layer_Image_ from '../../../../src/ol/layer/Image.js';
import _ol_obj_ from '../../../../src/ol/obj.js';
import _ol_proj_ from '../../../../src/ol/proj.js';
import _ol_source_ImageStatic_ from '../../../../src/ol/source/ImageStatic.js';
import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js';
describe('ol.rendering.layer.Image', function() {
@@ -14,12 +12,12 @@ describe('ol.rendering.layer.Image', function() {
var map;
function createMap(renderer) {
map = new ol.Map({
map = new _ol_Map_({
pixelRatio: 1,
target: createMapDiv(50, 50),
renderer: renderer,
view: new ol.View({
center: ol.proj.transform(
view: new _ol_View_({
center: _ol_proj_.transform(
[-122.416667, 37.783333], 'EPSG:4326', 'EPSG:3857'),
zoom: 5
})
@@ -58,8 +56,8 @@ describe('ol.rendering.layer.Image', function() {
var options = {
source: source
};
ol.obj.assign(options, layerOptions);
map.addLayer(new ol.layer.Image(options));
_ol_obj_.assign(options, layerOptions);
map.addLayer(new _ol_layer_Image_(options));
});
}
@@ -67,11 +65,11 @@ describe('ol.rendering.layer.Image', function() {
var source;
beforeEach(function() {
source = new ol.source.ImageStatic({
source = new _ol_source_ImageStatic_({
url: 'rendering/ol/data/tiles/osm/5/5/12.png',
imageExtent: ol.tilegrid.createXYZ().getTileCoordExtent(
imageExtent: _ol_tilegrid_.createXYZ().getTileCoordExtent(
[5, 5, -12 - 1]),
projection: ol.proj.get('EPSG:3857')
projection: _ol_proj_.get('EPSG:3857')
});
});
@@ -97,9 +95,9 @@ describe('ol.rendering.layer.Image', function() {
var source;
beforeEach(function() {
source = new ol.source.ImageStatic({
source = new _ol_source_ImageStatic_({
url: 'rendering/ol/data/tiles/osm/5/5/12.png',
imageExtent: ol.proj.transformExtent(
imageExtent: _ol_proj_.transformExtent(
[-123, 37, -122, 38], 'EPSG:4326', 'EPSG:3857')
});
});

68
test/rendering/ol/layer/tile.test.js
View File

@@ -1,18 +1,16 @@
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.extent');
goog.require('ol.geom.Point');
goog.require('ol.layer.Tile');
goog.require('ol.obj');
goog.require('ol.proj');
goog.require('ol.source.TileImage');
goog.require('ol.source.XYZ');
goog.require('ol.style.Circle');
goog.require('ol.style.Fill');
goog.require('ol.style.Stroke');
goog.require('ol.tilegrid');
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_extent_ from '../../../../src/ol/extent.js';
import _ol_geom_Point_ from '../../../../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js';
import _ol_obj_ from '../../../../src/ol/obj.js';
import _ol_proj_ from '../../../../src/ol/proj.js';
import _ol_source_TileImage_ from '../../../../src/ol/source/TileImage.js';
import _ol_source_XYZ_ from '../../../../src/ol/source/XYZ.js';
import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js';
describe('ol.rendering.layer.Tile', function() {
@@ -22,12 +20,12 @@ describe('ol.rendering.layer.Tile', function() {
function createMap(renderer, opt_center, opt_size, opt_pixelRatio, opt_resolutions) {
var size = opt_size !== undefined ? opt_size : [50, 50];
map = new ol.Map({
map = new _ol_Map_({
pixelRatio: opt_pixelRatio || 1,
target: createMapDiv(size[0], size[1]),
renderer: renderer,
view: new ol.View({
center: opt_center !== undefined ? opt_center : ol.proj.transform(
view: new _ol_View_({
center: opt_center !== undefined ? opt_center : _ol_proj_.transform(
[-122.416667, 37.783333], 'EPSG:4326', 'EPSG:3857'),
resolutions: opt_resolutions,
zoom: 5
@@ -67,15 +65,15 @@ describe('ol.rendering.layer.Tile', function() {
var options = {
source: source
};
ol.obj.assign(options, layerOptions[i] || layerOptions);
map.addLayer(new ol.layer.Tile(options));
_ol_obj_.assign(options, layerOptions[i] || layerOptions);
map.addLayer(new _ol_layer_Tile_(options));
});
}
describe('with tile transition', function() {
it('renders correctly after the transition', function(done) {
createMap('canvas');
var source = new ol.source.XYZ({
var source = new _ol_source_XYZ_({
url: 'rendering/ol/data/tiles/osm/{z}/{x}/{y}.png'
});
waitForTiles([source], {}, function() {
@@ -91,7 +89,7 @@ describe('ol.rendering.layer.Tile', function() {
var source;
beforeEach(function() {
source = new ol.source.XYZ({
source = new _ol_source_XYZ_({
url: 'rendering/ol/data/tiles/osm/{z}/{x}/{y}.png',
transition: 0
});
@@ -119,11 +117,11 @@ describe('ol.rendering.layer.Tile', function() {
var source1, source2;
beforeEach(function() {
source1 = new ol.source.XYZ({
source1 = new _ol_source_XYZ_({
url: 'rendering/ol/data/tiles/osm/{z}/{x}/{y}.png',
transition: 0
});
source2 = new ol.source.XYZ({
source2 = new _ol_source_XYZ_({
url: 'rendering/ol/data/tiles/stamen-labels/{z}/{x}/{y}.png',
transition: 0
});
@@ -148,8 +146,8 @@ describe('ol.rendering.layer.Tile', function() {
function centerExtent(map) {
var c = map.getView().calculateExtent(map.getSize());
var qw = ol.extent.getSize(c)[0] / 4;
var qh = ol.extent.getSize(c)[1] / 4;
var qw = _ol_extent_.getSize(c)[0] / 4;
var qh = _ol_extent_.getSize(c)[1] / 4;
return [c[0] + qw, c[1] + qh, c[2] - qw, c[3] - qh];
}
@@ -193,7 +191,7 @@ describe('ol.rendering.layer.Tile', function() {
var source;
beforeEach(function() {
source = new ol.source.XYZ({
source = new _ol_source_XYZ_({
url: 'rendering/ol/data/tiles/osm/{z}/{x}/{y}.png',
transition: 0
});
@@ -220,9 +218,9 @@ describe('ol.rendering.layer.Tile', function() {
describe('tile layer with non-square tiles', function() {
function createSource(tileSize) {
return new ol.source.TileImage({
return new _ol_source_TileImage_({
url: 'rendering/ol/data/tiles/' + tileSize + '/{z}/{x}/{y}.png',
tileGrid: ol.tilegrid.createXYZ({
tileGrid: _ol_tilegrid_.createXYZ({
tileSize: tileSize.split('x')
}),
transition: 0
@@ -274,20 +272,20 @@ describe('ol.rendering.layer.Tile', function() {
var source, onAddLayer;
beforeEach(function() {
source = new ol.source.XYZ({
source = new _ol_source_XYZ_({
url: 'rendering/ol/data/tiles/osm/{z}/{x}/{y}.png',
transition: 0
});
onAddLayer = function(evt) {
evt.element.on('render', function(e) {
e.vectorContext.setImageStyle(new ol.style.Circle({
e.vectorContext.setImageStyle(new _ol_style_Circle_({
radius: 5,
snapToPixel: false,
fill: new ol.style.Fill({color: 'yellow'}),
stroke: new ol.style.Stroke({color: 'red', width: 1})
fill: new _ol_style_Fill_({color: 'yellow'}),
stroke: new _ol_style_Stroke_({color: 'red', width: 1})
}));
e.vectorContext.drawPoint(new ol.geom.Point(
ol.proj.transform([-123, 38], 'EPSG:4326', 'EPSG:3857')));
e.vectorContext.drawPoint(new _ol_geom_Point_(
_ol_proj_.transform([-123, 38], 'EPSG:4326', 'EPSG:3857')));
});
};
});

392
test/rendering/ol/layer/vector.test.js
View File

@@ -1,20 +1,18 @@
goog.require('ol.Feature');
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.format.GeoJSON');
goog.require('ol.geom.Circle');
goog.require('ol.geom.LineString');
goog.require('ol.geom.Point');
goog.require('ol.geom.Polygon');
goog.require('ol.layer.Vector');
goog.require('ol.source.Vector');
goog.require('ol.style.Circle');
goog.require('ol.style.Fill');
goog.require('ol.style.Stroke');
goog.require('ol.style.Style');
goog.require('ol.style.Text');
import _ol_Feature_ from '../../../../src/ol/Feature.js';
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_format_GeoJSON_ from '../../../../src/ol/format/GeoJSON.js';
import _ol_geom_Circle_ from '../../../../src/ol/geom/Circle.js';
import _ol_geom_LineString_ from '../../../../src/ol/geom/LineString.js';
import _ol_geom_Point_ from '../../../../src/ol/geom/Point.js';
import _ol_geom_Polygon_ from '../../../../src/ol/geom/Polygon.js';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
describe('ol.rendering.layer.Vector', function() {
@@ -23,11 +21,11 @@ describe('ol.rendering.layer.Vector', function() {
var map;
function createMap(renderer) {
map = new ol.Map({
map = new _ol_Map_({
pixelRatio: 1,
target: createMapDiv(80, 80),
renderer: renderer,
view: new ol.View({
view: new _ol_View_({
center: center,
zoom: 13
})
@@ -44,11 +42,11 @@ describe('ol.rendering.layer.Vector', function() {
var source;
function addCircle(r) {
source.addFeature(new ol.Feature(new ol.geom.Circle(center, r)));
source.addFeature(new _ol_Feature_(new _ol_geom_Circle_(center, r)));
}
function addPolygon(r) {
source.addFeature(new ol.Feature(new ol.geom.Polygon([
source.addFeature(new _ol_Feature_(new _ol_geom_Polygon_([
[
[center[0] - r, center[1] - r],
[center[0] + r, center[1] - r],
@@ -60,7 +58,7 @@ describe('ol.rendering.layer.Vector', function() {
}
function addLineString(r) {
source.addFeature(new ol.Feature(new ol.geom.LineString([
source.addFeature(new _ol_Feature_(new _ol_geom_LineString_([
[center[0] - r, center[1] - r],
[center[0] + r, center[1] - r],
[center[0] + r, center[1] + r],
@@ -72,18 +70,18 @@ describe('ol.rendering.layer.Vector', function() {
describe('vector layer', function() {
beforeEach(function() {
source = new ol.source.Vector();
source = new _ol_source_Vector_();
});
it('renders opacity correctly with the canvas renderer', function(done) {
createMap('canvas');
var smallLine = new ol.Feature(new ol.geom.LineString([
var smallLine = new _ol_Feature_(new _ol_geom_LineString_([
[center[0], center[1] - 1],
[center[0], center[1] + 1]
]));
smallLine.setStyle(new ol.style.Style({
smallLine.setStyle(new _ol_style_Style_({
zIndex: -99,
stroke: new ol.style.Stroke({width: 75, color: 'red'})
stroke: new _ol_style_Stroke_({width: 75, color: 'red'})
}));
source.addFeature(smallLine);
addPolygon(100);
@@ -92,7 +90,7 @@ describe('ol.rendering.layer.Vector', function() {
addCircle(500);
addPolygon(600);
addPolygon(720);
map.addLayer(new ol.layer.Vector({
map.addLayer(new _ol_layer_Vector_({
source: source
}));
map.once('postrender', function() {
@@ -103,13 +101,13 @@ describe('ol.rendering.layer.Vector', function() {
it('renders opacity correctly with renderMode: \'image\'', function(done) {
createMap('canvas');
var smallLine = new ol.Feature(new ol.geom.LineString([
var smallLine = new _ol_Feature_(new _ol_geom_LineString_([
[center[0], center[1] - 1],
[center[0], center[1] + 1]
]));
smallLine.setStyle(new ol.style.Style({
smallLine.setStyle(new _ol_style_Style_({
zIndex: -99,
stroke: new ol.style.Stroke({width: 75, color: 'red'})
stroke: new _ol_style_Stroke_({width: 75, color: 'red'})
}));
source.addFeature(smallLine);
addPolygon(100);
@@ -118,7 +116,7 @@ describe('ol.rendering.layer.Vector', function() {
addCircle(500);
addPolygon(600);
addPolygon(720);
map.addLayer(new ol.layer.Vector({
map.addLayer(new _ol_layer_Vector_({
renerMode: 'image',
source: source
}));
@@ -130,34 +128,34 @@ describe('ol.rendering.layer.Vector', function() {
it('renders transparent layers correctly with the canvas renderer', function(done) {
createMap('canvas');
var smallLine = new ol.Feature(new ol.geom.LineString([
var smallLine = new _ol_Feature_(new _ol_geom_LineString_([
[center[0], center[1] - 1],
[center[0], center[1] + 1]
]));
smallLine.setStyle([
new ol.style.Style({
stroke: new ol.style.Stroke({width: 75, color: 'red'})
new _ol_style_Style_({
stroke: new _ol_style_Stroke_({width: 75, color: 'red'})
}),
new ol.style.Style({
stroke: new ol.style.Stroke({width: 45, color: 'white'})
new _ol_style_Style_({
stroke: new _ol_style_Stroke_({width: 45, color: 'white'})
})
]);
source.addFeature(smallLine);
var smallLine2 = new ol.Feature(new ol.geom.LineString([
var smallLine2 = new _ol_Feature_(new _ol_geom_LineString_([
[center[0], center[1] - 1000],
[center[0], center[1] + 1000]
]));
smallLine2.setStyle([
new ol.style.Style({
stroke: new ol.style.Stroke({width: 35, color: 'blue'})
new _ol_style_Style_({
stroke: new _ol_style_Stroke_({width: 35, color: 'blue'})
}),
new ol.style.Style({
stroke: new ol.style.Stroke({width: 15, color: 'green'})
new _ol_style_Style_({
stroke: new _ol_style_Stroke_({width: 15, color: 'green'})
})
]);
source.addFeature(smallLine2);
map.addLayer(new ol.layer.Vector({
map.addLayer(new _ol_layer_Vector_({
source: source,
opacity: 0.5
}));
@@ -169,34 +167,34 @@ describe('ol.rendering.layer.Vector', function() {
it('renders transparent layers correctly with renderMode: \'image\'', function(done) {
createMap('canvas');
var smallLine = new ol.Feature(new ol.geom.LineString([
var smallLine = new _ol_Feature_(new _ol_geom_LineString_([
[center[0], center[1] - 1],
[center[0], center[1] + 1]
]));
smallLine.setStyle([
new ol.style.Style({
stroke: new ol.style.Stroke({width: 75, color: 'red'})
new _ol_style_Style_({
stroke: new _ol_style_Stroke_({width: 75, color: 'red'})
}),
new ol.style.Style({
stroke: new ol.style.Stroke({width: 45, color: 'white'})
new _ol_style_Style_({
stroke: new _ol_style_Stroke_({width: 45, color: 'white'})
})
]);
source.addFeature(smallLine);
var smallLine2 = new ol.Feature(new ol.geom.LineString([
var smallLine2 = new _ol_Feature_(new _ol_geom_LineString_([
[center[0], center[1] - 1000],
[center[0], center[1] + 1000]
]));
smallLine2.setStyle([
new ol.style.Style({
stroke: new ol.style.Stroke({width: 35, color: 'blue'})
new _ol_style_Style_({
stroke: new _ol_style_Stroke_({width: 35, color: 'blue'})
}),
new ol.style.Style({
stroke: new ol.style.Stroke({width: 15, color: 'green'})
new _ol_style_Style_({
stroke: new _ol_style_Stroke_({width: 15, color: 'green'})
})
]);
source.addFeature(smallLine2);
map.addLayer(new ol.layer.Vector({
map.addLayer(new _ol_layer_Vector_({
renderMode: 'image',
source: source,
opacity: 0.5
@@ -212,10 +210,10 @@ describe('ol.rendering.layer.Vector', function() {
map.getView().setRotation(Math.PI + Math.PI / 4);
addPolygon(300);
addCircle(500);
map.addLayer(new ol.layer.Vector({
map.addLayer(new _ol_layer_Vector_({
source: source,
style: new ol.style.Style({
stroke: new ol.style.Stroke({
style: new _ol_style_Style_({
stroke: new _ol_style_Stroke_({
width: 2,
color: 'black'
})
@@ -232,11 +230,11 @@ describe('ol.rendering.layer.Vector', function() {
map.getView().setRotation(Math.PI + Math.PI / 4);
addPolygon(300);
addCircle(500);
map.addLayer(new ol.layer.Vector({
map.addLayer(new _ol_layer_Vector_({
renderMode: 'image',
source: source,
style: new ol.style.Style({
stroke: new ol.style.Stroke({
style: new _ol_style_Style_({
stroke: new _ol_style_Stroke_({
width: 2,
color: 'black'
})
@@ -253,14 +251,14 @@ describe('ol.rendering.layer.Vector', function() {
addCircle(500);
addPolygon(300);
map.skipFeature(source.getFeatures()[1]);
map.addLayer(new ol.layer.Vector({
map.addLayer(new _ol_layer_Vector_({
renderMode: 'image',
source: source,
style: new ol.style.Style({
fill: new ol.style.Fill({
style: new _ol_style_Style_({
fill: new _ol_style_Fill_({
color: 'rgba(255,0,0,0.5)'
}),
stroke: new ol.style.Stroke({
stroke: new _ol_style_Stroke_({
width: 2,
color: 'black'
})
@@ -276,7 +274,7 @@ describe('ol.rendering.layer.Vector', function() {
it('renders fill/stroke batches correctly with the canvas renderer', function(done) {
createMap('canvas');
source = new ol.source.Vector({
source = new _ol_source_Vector_({
overlaps: false
});
addPolygon(100);
@@ -285,10 +283,10 @@ describe('ol.rendering.layer.Vector', function() {
addCircle(500);
addPolygon(600);
addPolygon(720);
map.addLayer(new ol.layer.Vector({
map.addLayer(new _ol_layer_Vector_({
source: source,
style: new ol.style.Style({
stroke: new ol.style.Stroke({
style: new _ol_style_Style_({
stroke: new _ol_style_Stroke_({
color: '#3399CC',
width: 1.25
})
@@ -302,17 +300,17 @@ describe('ol.rendering.layer.Vector', function() {
it('renders stroke batches correctly with the canvas renderer', function(done) {
createMap('canvas');
source = new ol.source.Vector({
source = new _ol_source_Vector_({
overlaps: false
});
addLineString(100);
addLineString(250);
addLineString(600);
addLineString(720);
map.addLayer(new ol.layer.Vector({
map.addLayer(new _ol_layer_Vector_({
source: source,
style: new ol.style.Style({
stroke: new ol.style.Stroke({
style: new _ol_style_Style_({
stroke: new _ol_style_Stroke_({
color: '#3399CC',
width: 1.25
})
@@ -329,7 +327,7 @@ describe('ol.rendering.layer.Vector', function() {
var color;
function createSource(overlaps) {
color = '#3399CC';
source = new ol.source.Vector({
source = new _ol_source_Vector_({
overlaps: overlaps
});
addPolygon(720);
@@ -348,16 +346,16 @@ describe('ol.rendering.layer.Vector', function() {
}
return color;
}
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
source: createSource(true),
style: function(feature) {
alternateColor();
return new ol.style.Style({
stroke: new ol.style.Stroke({
return new _ol_style_Style_({
stroke: new _ol_style_Stroke_({
color: alternateColor(),
width: 1.25
}),
fill: new ol.style.Fill({
fill: new _ol_style_Fill_({
color: alternateColor()
})
});
@@ -382,7 +380,7 @@ describe('ol.rendering.layer.Vector', function() {
var color;
function createSource(overlaps) {
color = '#3399CC';
source = new ol.source.Vector({
source = new _ol_source_Vector_({
overlaps: overlaps
});
addLineString(720);
@@ -399,16 +397,16 @@ describe('ol.rendering.layer.Vector', function() {
}
return color;
}
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
source: createSource(true),
style: function(feature) {
alternateColor();
return new ol.style.Style({
stroke: new ol.style.Stroke({
return new _ol_style_Style_({
stroke: new _ol_style_Stroke_({
color: alternateColor(),
width: 1.25
}),
fill: new ol.style.Fill({
fill: new _ol_style_Fill_({
color: alternateColor()
})
});
@@ -433,10 +431,10 @@ describe('ol.rendering.layer.Vector', function() {
var map2;
beforeEach(function() {
map2 = new ol.Map({
map2 = new _ol_Map_({
pixelRatio: 1,
target: createMapDiv(128, 128),
view: new ol.View({
view: new _ol_View_({
center: [0, 0],
zoom: 0
})
@@ -465,15 +463,15 @@ describe('ol.rendering.layer.Vector', function() {
properties: {}
};
var format = new ol.format.GeoJSON({featureProjection: 'EPSG:3857'});
var format = new _ol_format_GeoJSON_({featureProjection: 'EPSG:3857'});
var feature = format.readFeature(json);
var layer = new ol.layer.Vector({
source: new ol.source.Vector({
var layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
features: [feature]
}),
style: new ol.style.Style({
fill: new ol.style.Fill({
style: new _ol_style_Style_({
fill: new _ol_style_Fill_({
color: 'blue'
})
})
@@ -494,16 +492,16 @@ describe('ol.rendering.layer.Vector', function() {
var layer, map3;
beforeEach(function() {
var src = new ol.source.Vector({
var src = new _ol_source_Vector_({
features: [
new ol.Feature(new ol.geom.Polygon([[
new _ol_Feature_(new _ol_geom_Polygon_([[
[-22, 58],
[-22, 78],
[-9, 78],
[-9, 58],
[-22, 58]
]])),
new ol.Feature(new ol.geom.Polygon([[
new _ol_Feature_(new _ol_geom_Polygon_([[
[-9, 58],
[-9, 78],
[4, 78],
@@ -512,17 +510,17 @@ describe('ol.rendering.layer.Vector', function() {
]]))
]
});
layer = new ol.layer.Vector({
layer = new _ol_layer_Vector_({
renderBuffer: 0,
source: src
});
var view = new ol.View({
var view = new _ol_View_({
center: [-9.5, 78],
zoom: 2,
projection: 'EPSG:4326'
});
map3 = new ol.Map({
map3 = new _ol_Map_({
pixelRatio: 1,
layers: [layer],
target: createMapDiv(100, 100),
@@ -536,12 +534,12 @@ describe('ol.rendering.layer.Vector', function() {
});
it('renders partially out-of-view polygons with a fill and stroke', function(done) {
layer.setStyle(new ol.style.Style({
stroke: new ol.style.Stroke({
layer.setStyle(new _ol_style_Style_({
stroke: new _ol_style_Stroke_({
color: [0, 0, 0, 1],
width: 2
}),
fill: new ol.style.Fill({
fill: new _ol_style_Fill_({
color: [255, 0, 0, 1]
})
}));
@@ -552,8 +550,8 @@ describe('ol.rendering.layer.Vector', function() {
});
it('renders partially out-of-view polygons with a fill', function(done) {
layer.setStyle(new ol.style.Style({
fill: new ol.style.Fill({
layer.setStyle(new _ol_style_Style_({
fill: new _ol_style_Fill_({
color: [0, 0, 0, 1]
})
}));
@@ -564,8 +562,8 @@ describe('ol.rendering.layer.Vector', function() {
});
it('renders partially out-of-view polygons with a stroke', function(done) {
layer.setStyle(new ol.style.Style({
stroke: new ol.style.Stroke({
layer.setStyle(new _ol_style_Style_({
stroke: new _ol_style_Stroke_({
color: [0, 0, 0, 1],
width: 2
})
@@ -581,34 +579,34 @@ describe('ol.rendering.layer.Vector', function() {
describe('decluttering', function() {
beforeEach(function() {
source = new ol.source.Vector();
source = new _ol_source_Vector_();
});
it('declutters text', function(done) {
createMap('canvas');
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
source: source
});
map.addLayer(layer);
var centerFeature = new ol.Feature({
geometry: new ol.geom.Point(center),
var centerFeature = new _ol_Feature_({
geometry: new _ol_geom_Point_(center),
text: 'center'
});
source.addFeature(centerFeature);
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point([center[0] - 540, center[1]]),
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] - 540, center[1]]),
text: 'west'
}));
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point([center[0] + 540, center[1]]),
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] + 540, center[1]]),
text: 'east'
}));
layer.setDeclutter(true);
layer.setStyle(function(feature) {
return new ol.style.Style({
text: new ol.style.Text({
return new _ol_style_Style_({
text: new _ol_style_Text_({
text: feature.get('text'),
font: '12px sans-serif'
})
@@ -626,30 +624,30 @@ describe('ol.rendering.layer.Vector', function() {
it('declutters text with renderMode: \'image\'', function(done) {
createMap('canvas');
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
renderMode: 'image',
source: source
});
map.addLayer(layer);
var centerFeature = new ol.Feature({
geometry: new ol.geom.Point(center),
var centerFeature = new _ol_Feature_({
geometry: new _ol_geom_Point_(center),
text: 'center'
});
source.addFeature(centerFeature);
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point([center[0] - 540, center[1]]),
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] - 540, center[1]]),
text: 'west'
}));
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point([center[0] + 540, center[1]]),
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] + 540, center[1]]),
text: 'east'
}));
layer.setDeclutter(true);
layer.setStyle(function(feature) {
return new ol.style.Style({
text: new ol.style.Text({
return new _ol_style_Style_({
text: new _ol_style_Text_({
text: feature.get('text'),
font: '12px sans-serif'
})
@@ -667,32 +665,32 @@ describe('ol.rendering.layer.Vector', function() {
it('declutters text and respects z-index', function(done) {
createMap('canvas');
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
source: source
});
map.addLayer(layer);
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point(center),
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_(center),
text: 'center',
zIndex: 2
}));
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point([center[0] - 540, center[1]]),
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] - 540, center[1]]),
text: 'west',
zIndex: 3
}));
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point([center[0] + 540, center[1]]),
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] + 540, center[1]]),
text: 'east',
zIndex: 1
}));
layer.setDeclutter(true);
layer.setStyle(function(feature) {
return new ol.style.Style({
return new _ol_style_Style_({
zIndex: feature.get('zIndex'),
text: new ol.style.Text({
text: new _ol_style_Text_({
text: feature.get('text'),
font: '12px sans-serif'
})
@@ -707,28 +705,28 @@ describe('ol.rendering.layer.Vector', function() {
it('declutters images', function(done) {
createMap('canvas');
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
source: source
});
map.addLayer(layer);
var centerFeature = new ol.Feature({
geometry: new ol.geom.Point(center)
var centerFeature = new _ol_Feature_({
geometry: new _ol_geom_Point_(center)
});
source.addFeature(centerFeature);
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point([center[0] - 540, center[1]])
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] - 540, center[1]])
}));
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point([center[0] + 540, center[1]])
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] + 540, center[1]])
}));
layer.setDeclutter(true);
layer.setStyle(function(feature) {
return new ol.style.Style({
image: new ol.style.Circle({
return new _ol_style_Style_({
image: new _ol_style_Circle_({
radius: 15,
stroke: new ol.style.Stroke({
stroke: new _ol_style_Stroke_({
color: 'blue'
})
})
@@ -746,29 +744,29 @@ describe('ol.rendering.layer.Vector', function() {
it('declutters images with renderMode: \'image\'', function(done) {
createMap('canvas');
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
renderMode: 'image',
source: source
});
map.addLayer(layer);
var centerFeature = new ol.Feature({
geometry: new ol.geom.Point(center)
var centerFeature = new _ol_Feature_({
geometry: new _ol_geom_Point_(center)
});
source.addFeature(centerFeature);
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point([center[0] - 540, center[1]])
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] - 540, center[1]])
}));
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point([center[0] + 540, center[1]])
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] + 540, center[1]])
}));
layer.setDeclutter(true);
layer.setStyle(function(feature) {
return new ol.style.Style({
image: new ol.style.Circle({
return new _ol_style_Style_({
image: new _ol_style_Circle_({
radius: 15,
stroke: new ol.style.Stroke({
stroke: new _ol_style_Stroke_({
color: 'blue'
})
})
@@ -786,31 +784,31 @@ describe('ol.rendering.layer.Vector', function() {
it('declutters images and respects z-index', function(done) {
createMap('canvas');
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
source: source
});
map.addLayer(layer);
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point(center),
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_(center),
zIndex: 2
}));
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point([center[0] - 540, center[1]]),
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] - 540, center[1]]),
zIndex: 3
}));
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point([center[0] + 540, center[1]]),
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] + 540, center[1]]),
zIndex: 1
}));
layer.setDeclutter(true);
layer.setStyle(function(feature) {
return new ol.style.Style({
return new _ol_style_Style_({
zIndex: feature.get('zIndex'),
image: new ol.style.Circle({
image: new _ol_style_Circle_({
radius: 15,
stroke: new ol.style.Stroke({
stroke: new _ol_style_Stroke_({
color: 'blue'
})
})
@@ -825,34 +823,34 @@ describe('ol.rendering.layer.Vector', function() {
it('declutters image & text groups', function(done) {
createMap('canvas');
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
source: source
});
map.addLayer(layer);
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point(center),
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_(center),
text: 'center'
}));
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point([center[0] - 540, center[1]]),
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] - 540, center[1]]),
text: 'west'
}));
source.addFeature(new ol.Feature({
geometry: new ol.geom.Point([center[0] + 540, center[1]]),
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] + 540, center[1]]),
text: 'east'
}));
layer.setDeclutter(true);
layer.setStyle(function(feature) {
return new ol.style.Style({
image: new ol.style.Circle({
return new _ol_style_Style_({
image: new _ol_style_Circle_({
radius: 5,
stroke: new ol.style.Stroke({
stroke: new _ol_style_Stroke_({
color: 'blue'
})
}),
text: new ol.style.Text({
text: new _ol_style_Text_({
text: feature.get('text'),
font: '12px sans-serif',
textBaseline: 'bottom',
@@ -869,30 +867,30 @@ describe('ol.rendering.layer.Vector', function() {
it('declutters text along lines and images', function(done) {
createMap('canvas');
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
source: source
});
map.addLayer(layer);
var point = new ol.Feature(new ol.geom.Point(center));
point.setStyle(new ol.style.Style({
image: new ol.style.Circle({
var point = new _ol_Feature_(new _ol_geom_Point_(center));
point.setStyle(new _ol_style_Style_({
image: new _ol_style_Circle_({
radius: 8,
stroke: new ol.style.Stroke({
stroke: new _ol_style_Stroke_({
color: 'blue'
})
})
}));
var line = new ol.Feature(new ol.geom.LineString([
var line = new _ol_Feature_(new _ol_geom_LineString_([
[center[0] - 650, center[1] - 200],
[center[0] + 650, center[1] - 200]
]));
line.setStyle(new ol.style.Style({
stroke: new ol.style.Stroke({
line.setStyle(new _ol_style_Style_({
stroke: new _ol_style_Stroke_({
color: '#CCC',
width: 12
}),
text: new ol.style.Text({
text: new _ol_style_Text_({
placement: 'line',
text: 'east-west',
font: '12px sans-serif'
@@ -912,30 +910,30 @@ describe('ol.rendering.layer.Vector', function() {
it('declutters text along lines and images with renderMode: \'image\'', function(done) {
createMap('canvas');
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
source: source
});
map.addLayer(layer);
var point = new ol.Feature(new ol.geom.Point(center));
point.setStyle(new ol.style.Style({
image: new ol.style.Circle({
var point = new _ol_Feature_(new _ol_geom_Point_(center));
point.setStyle(new _ol_style_Style_({
image: new _ol_style_Circle_({
radius: 8,
stroke: new ol.style.Stroke({
stroke: new _ol_style_Stroke_({
color: 'blue'
})
})
}));
var line = new ol.Feature(new ol.geom.LineString([
var line = new _ol_Feature_(new _ol_geom_LineString_([
[center[0] - 650, center[1] - 200],
[center[0] + 650, center[1] - 200]
]));
line.setStyle(new ol.style.Style({
stroke: new ol.style.Stroke({
line.setStyle(new _ol_style_Style_({
stroke: new _ol_style_Stroke_({
color: '#CCC',
width: 12
}),
text: new ol.style.Text({
text: new _ol_style_Text_({
placement: 'line',
text: 'east-west',
font: '12px sans-serif'
@@ -955,32 +953,32 @@ describe('ol.rendering.layer.Vector', function() {
it('declutters text along lines and images with z-index', function(done) {
createMap('canvas');
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
source: source
});
map.addLayer(layer);
var point = new ol.Feature(new ol.geom.Point(center));
point.setStyle(new ol.style.Style({
var point = new _ol_Feature_(new _ol_geom_Point_(center));
point.setStyle(new _ol_style_Style_({
zIndex: 2,
image: new ol.style.Circle({
image: new _ol_style_Circle_({
radius: 8,
stroke: new ol.style.Stroke({
stroke: new _ol_style_Stroke_({
color: 'blue'
})
})
}));
var line = new ol.Feature(new ol.geom.LineString([
var line = new _ol_Feature_(new _ol_geom_LineString_([
[center[0] - 650, center[1] - 200],
[center[0] + 650, center[1] - 200]
]));
line.setStyle(new ol.style.Style({
line.setStyle(new _ol_style_Style_({
zIndex: 1,
stroke: new ol.style.Stroke({
stroke: new _ol_style_Stroke_({
color: '#CCC',
width: 12
}),
text: new ol.style.Text({
text: new _ol_style_Text_({
placement: 'line',
text: 'east-west',
font: '12px sans-serif'

64
test/rendering/ol/layer/vectortile.test.js
View File

@@ -1,18 +1,18 @@
goog.require('ol.Feature');
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.format.MVT');
goog.require('ol.geom.Point');
goog.require('ol.layer.Vector');
goog.require('ol.layer.VectorTile');
goog.require('ol.obj');
goog.require('ol.source.Vector');
goog.require('ol.source.VectorTile');
goog.require('ol.style.Circle');
goog.require('ol.style.Fill');
goog.require('ol.style.Style');
goog.require('ol.style.Text');
goog.require('ol.tilegrid');
import _ol_Feature_ from '../../../../src/ol/Feature.js';
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_format_MVT_ from '../../../../src/ol/format/MVT.js';
import _ol_geom_Point_ from '../../../../src/ol/geom/Point.js';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
import _ol_layer_VectorTile_ from '../../../../src/ol/layer/VectorTile.js';
import _ol_obj_ from '../../../../src/ol/obj.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
import _ol_source_VectorTile_ from '../../../../src/ol/source/VectorTile.js';
import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js';
describe('ol.rendering.layer.VectorTile', function() {
@@ -21,11 +21,11 @@ describe('ol.rendering.layer.VectorTile', function() {
function createMap(renderer, opt_pixelRatio, opt_size) {
var size = opt_size || 50;
map = new ol.Map({
map = new _ol_Map_({
pixelRatio: opt_pixelRatio || 1,
target: createMapDiv(size, size),
renderer: renderer,
view: new ol.View({
view: new _ol_View_({
center: [1825927.7316762917, 6143091.089223046],
zoom: 14
})
@@ -61,17 +61,17 @@ describe('ol.rendering.layer.VectorTile', function() {
var options = {
source: source
};
ol.obj.assign(options, layerOptions);
map.addLayer(new ol.layer.VectorTile(options));
_ol_obj_.assign(options, layerOptions);
map.addLayer(new _ol_layer_VectorTile_(options));
}
describe('vector tile layer', function() {
var source;
beforeEach(function() {
source = new ol.source.VectorTile({
format: new ol.format.MVT(),
tileGrid: ol.tilegrid.createXYZ(),
source = new _ol_source_VectorTile_({
format: new _ol_format_MVT_(),
tileGrid: _ol_tilegrid_.createXYZ(),
url: 'rendering/ol/data/tiles/mvt/{z}-{x}-{y}.vector.pbf',
transition: 0
});
@@ -96,18 +96,18 @@ describe('ol.rendering.layer.VectorTile', function() {
it('renders rotated view correctly with vector layer on top', function(done) {
createMap('canvas');
var vectorSource = new ol.source.Vector({
var vectorSource = new _ol_source_Vector_({
features: [
new ol.Feature(new ol.geom.Point([1825727.7316762917, 6143091.089223046]))
new _ol_Feature_(new _ol_geom_Point_([1825727.7316762917, 6143091.089223046]))
]
});
map.addLayer(new ol.layer.Vector({
map.addLayer(new _ol_layer_Vector_({
zIndex: 1,
source: vectorSource,
style: new ol.style.Style({
image: new ol.style.Circle({
style: new _ol_style_Style_({
image: new _ol_style_Circle_({
radius: 10,
fill: new ol.style.Fill({
fill: new _ol_style_Fill_({
color: 'red'
})
})
@@ -143,14 +143,14 @@ describe('ol.rendering.layer.VectorTile', function() {
var style = function(feature, resolution) {
var geom = feature.getGeometry();
if (geom.getType() == 'Point') {
return new ol.style.Style({
image: new ol.style.Circle({
return new _ol_style_Style_({
image: new _ol_style_Circle_({
radius: 7,
fill: new ol.style.Fill({
fill: new _ol_style_Fill_({
color: 'red'
})
}),
text: new ol.style.Text({
text: new _ol_style_Text_({
text: feature.get('name_en'),
font: '12px sans-serif',
textBaseline: 'bottom',